Skip to content

Commit 2e38cb4

Browse files
tamalsahatamalsaha
authored
Update deps (#3)
Signed-off-by: Tamal Saha <tamal@appscode.com>
1 parent 98a7644 commit 2e38cb4

File tree

13 files changed

+71
-45
lines changed

13 files changed

+71
-45
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,5 @@ _testmain.go
3232
/hack/config/.env
3333
/test/e2e/junit.xml
3434
/test/e2e/report.xml
35+
36+
docker-machine

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ TAG := $(VERSION)_$(OS)_$(ARCH)
7777
TAG_PROD := $(TAG)
7878
TAG_DBG := $(VERSION)-dbg_$(OS)_$(ARCH)
7979

80-
GO_VERSION ?= 1.20
80+
GO_VERSION ?= 1.21
8181
BUILD_IMAGE ?= ghcr.io/appscode/golang-dev:$(GO_VERSION)
8282
CHART_TEST_IMAGE ?= quay.io/helmpack/chart-testing:v3.5.1
8383

‎go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ require (
99
github.com/onsi/gomega v1.27.4
1010
github.com/spf13/cobra v1.6.0
1111
go.bytebuilders.dev/license-verifier v0.13.3
12-
gomodules.xyz/logs v0.0.6
12+
gomodules.xyz/logs v0.0.7
1313
gomodules.xyz/x v0.0.14
1414
k8s.io/api v0.25.3
1515
k8s.io/apimachinery v0.25.3
1616
k8s.io/client-go v0.25.3
1717
k8s.io/klog/v2 v2.90.1
18-
kmodules.xyz/client-go v0.25.27
18+
kmodules.xyz/client-go v0.25.30
1919
sigs.k8s.io/controller-runtime v0.13.1
2020
)
2121

@@ -87,7 +87,7 @@ require (
8787
golang.org/x/tools v0.9.1 // indirect
8888
gomodules.xyz/clock v0.0.0-20200817085942-06523dba733f // indirect
8989
gomodules.xyz/flags v0.1.3 // indirect
90-
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
90+
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
9191
gomodules.xyz/password-generator v0.2.7 // indirect
9292
gomodules.xyz/sets v0.2.1 // indirect
9393
gomodules.xyz/wait v0.2.0 // indirect

‎go.sum

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9
9898
github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
9999
github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
100100
github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
101-
github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
102101
github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
102+
github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
103103
github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
104104
github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
105105
github.com/go-logr/zapr v1.2.4 h1:QHVo+6stLbfJmYGkQ7uGHUCu5hnAFAj6mDe6Ea0SeOo=
@@ -315,6 +315,7 @@ github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B
315315
github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
316316
github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
317317
github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo=
318+
github.com/spf13/cobra v1.5.0/go.mod h1:dWXEIy2H428czQCjInthrTRUg7yKbok+2Qi/yBIJoUM=
318319
github.com/spf13/cobra v1.6.0 h1:42a0n6jwCot1pUmomAp4T7DeMD+20LFv4Q54pxLf2LI=
319320
github.com/spf13/cobra v1.6.0/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY=
320321
github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
@@ -502,10 +503,10 @@ gomodules.xyz/clock v0.0.0-20200817085942-06523dba733f h1:hTyhR4r+tj1Uq7/PpFxLTz
502503
gomodules.xyz/clock v0.0.0-20200817085942-06523dba733f/go.mod h1:K3m7N+nBOlf91/tpv8REUGwsAgaKFwElQCuiLhm12AQ=
503504
gomodules.xyz/flags v0.1.3 h1:jQ06+EfmoMv5NvjXvJon03dOhLU+FF0TQMWN7I6qpzs=
504505
gomodules.xyz/flags v0.1.3/go.mod h1:e+kvBLnqdEWGG670SKOYag1CXStM2Slrxq01OIK3tFs=
505-
gomodules.xyz/jsonpatch/v2 v2.3.0 h1:8NFhfS6gzxNqjLIYnZxg319wZ5Qjnx4m/CcX+Klzazc=
506-
gomodules.xyz/jsonpatch/v2 v2.3.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY=
507-
gomodules.xyz/logs v0.0.6 h1:8+9Wkud5yBPtIvkVszubyTeFxNII30lWODom0+GZD8U=
508-
gomodules.xyz/logs v0.0.6/go.mod h1:Q+fFtZFLEB5q86KmDehXCGuMP72Rv+Rwz0KuVxK+Gi4=
506+
gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw=
507+
gomodules.xyz/jsonpatch/v2 v2.4.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY=
508+
gomodules.xyz/logs v0.0.7 h1:dkhpdQuzj+pOS3S7VaOq+JV7BVU7f68/k3uDYufhPow=
509+
gomodules.xyz/logs v0.0.7/go.mod h1:IEIZbRl9zua2jb35NU4KoqxUEDPmKvem3PhfRHqQI54=
509510
gomodules.xyz/password-generator v0.2.4/go.mod h1:TvwYYTx9+P1pPwKQKfZgB/wr2Id9MqAQ3B5auY7reNg=
510511
gomodules.xyz/password-generator v0.2.7 h1:xUCiIKji8JYOkyTsvi/2nArbVevsHMOnoJVMaShbzqI=
511512
gomodules.xyz/password-generator v0.2.7/go.mod h1:TvwYYTx9+P1pPwKQKfZgB/wr2Id9MqAQ3B5auY7reNg=
@@ -596,15 +597,15 @@ k8s.io/client-go v0.25.3 h1:oB4Dyl8d6UbfDHD8Bv8evKylzs3BXzzufLiO27xuPs0=
596597
k8s.io/client-go v0.25.3/go.mod h1:t39LPczAIMwycjcXkVc+CB+PZV69jQuNx4um5ORDjQA=
597598
k8s.io/component-base v0.25.3 h1:UrsxciGdrCY03ULT1h/S/gXFCOPnLhUVwSyx+hM/zq4=
598599
k8s.io/component-base v0.25.3/go.mod h1:WYoS8L+IlTZgU7rhAl5Ctpw0WdMxDfCC5dkxcEFa/TI=
599-
k8s.io/klog/v2 v2.8.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec=
600+
k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
600601
k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
601602
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
602603
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f h1:2kWPakN3i/k81b0gvD5C5FJ2kxm1WrQFanWchyKuqGg=
603604
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f/go.mod h1:byini6yhqGC14c3ebc/QwanvYwhuMWF6yz2F8uwW8eg=
604605
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
605606
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
606-
kmodules.xyz/client-go v0.25.27 h1:Ivl054xbXSvMNMKAJtK7TkS0iZX0AHvVQzxtsrIk9ik=
607-
kmodules.xyz/client-go v0.25.27/go.mod h1:PYfJtJs+AhgfkJNIeUObU4SqAkY85ARTlXxC+2gAsgo=
607+
kmodules.xyz/client-go v0.25.30 h1:4qOhs1kX0oNl9tcY98PEtiUlD6TZqK9CRfqzfhZApsk=
608+
kmodules.xyz/client-go v0.25.30/go.mod h1:r/Va2Y6t1G8X1sPRjrQC6FWB3oh/i6rjssmlfJnbCmg=
608609
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
609610
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
610611
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=

‎pkg/controller/machine_controller.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,7 @@ type MachineReconciler struct {
5353
func (r *MachineReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
5454
r.log = log.FromContext(ctx)
5555

56-
commit := committer.NewStatusCommitter[*api.Machine, *api.MachineSpec, *api.MachineStatus](
57-
func(ns string) committer.Patcher[*api.Machine] {
58-
return r.Client.Status()
59-
},
60-
)
56+
commit := committer.NewStatusCommitter[*api.Machine, *api.MachineStatus](r.Client.Status())
6157

6258
var machine api.Machine
6359
if err := r.Get(ctx, req.NamespacedName, &machine); err != nil {

‎vendor/gomodules.xyz/jsonpatch/v2/jsonpatch.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package jsonpatch
22

33
import (
4+
"bytes"
45
"encoding/json"
56
"fmt"
67
"reflect"
@@ -64,6 +65,9 @@ func NewOperation(op, path string, value interface{}) Operation {
6465
//
6566
// An error will be returned if any of the two documents are invalid.
6667
func CreatePatch(a, b []byte) ([]Operation, error) {
68+
if bytes.Equal(a, b) {
69+
return []Operation{}, nil
70+
}
6771
var aI interface{}
6872
var bI interface{}
6973
err := json.Unmarshal(a, &aI)

‎vendor/gomodules.xyz/logs/lib.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,12 @@ const logFlushFreqFlagName = "log-flush-frequency"
3737

3838
var logFlushFreq = pflag.Duration(logFlushFreqFlagName, 5*time.Second, "Maximum number of seconds between log flushes")
3939

40-
func init() {
41-
_ = flag.Set("stderrthreshold", "INFO")
42-
}
40+
/*
41+
panic: flag stderrthreshold set before being defined
42+
*/
43+
// func init() {
44+
// _ = flag.Set("stderrthreshold", "INFO")
45+
// }
4346

4447
// AddFlags registers this package's flags on arbitrary FlagSets, such that they point to the
4548
// same value as the global flags.

‎vendor/kmodules.xyz/client-go/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ gen-crd-protos:
154154
--packages=-k8s.io/api/core/v1,kmodules.xyz/client-go/api/v1
155155

156156
.PHONY: gen-enum
157-
gen-enum:
157+
gen-enum: $(BUILD_DIRS)
158158
@docker run \
159159
-i \
160160
--rm \

‎vendor/kmodules.xyz/client-go/api/v1/object.go

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,14 @@ func ParseObjectID(key OID) (*ObjectID, error) {
144144
return &id, nil
145145
}
146146

147+
func MustParseObjectID(key OID) *ObjectID {
148+
oid, err := ParseObjectID(key)
149+
if err != nil {
150+
panic(err)
151+
}
152+
return oid
153+
}
154+
147155
func ObjectIDMap(key OID) (map[string]interface{}, error) {
148156
id := map[string]interface{}{
149157
"group": "",
@@ -208,8 +216,8 @@ type ObjectInfo struct {
208216
Ref ObjectReference `json:"ref" protobuf:"bytes,2,opt,name=ref"`
209217
}
210218

211-
// +kubebuilder:validation:Enum=backup_via;catalog;cert_issuer;config;connect_via;exposed_by;id;located_on;monitored_by;offshoot;ops;policy;recommended_for;restore_into;scaled_by;view
212-
// ENUM(backup_via,catalog,cert_issuer,config,connect_via,exposed_by,id,located_on,monitored_by,offshoot,ops,policy,recommended_for,restore_into,scaled_by,view)
219+
// +kubebuilder:validation:Enum=authn;authz;backup_via;catalog;cert_issuer;config;connect_via;exposed_by;located_on;monitored_by;ocm_bind;offshoot;ops;placed_into;policy;recommended_for;restore_into;scaled_by;storage;view
220+
// ENUM(authn,authz,backup_via,catalog,cert_issuer,config,connect_via,exposed_by,located_on,monitored_by,ocm_bind,offshoot,ops,placed_into,policy,recommended_for,restore_into,scaled_by,storage,view)
213221
type EdgeLabel string
214222

215223
func (e EdgeLabel) Direct() bool {

‎vendor/kmodules.xyz/client-go/api/v1/object_enum.go

Lines changed: 25 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)