Skip to content

Commit b0d0e4a

Browse files
gianlucam76gianlucam76
authored
Merge pull request #196 from gianlucam76/main
Merge dev to main
2 parents 9e726c1 + 27c13fb commit b0d0e4a

File tree

5 files changed

+24
-24
lines changed

5 files changed

+24
-24
lines changed

‎Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,14 @@ GOLANGCI_LINT_VERSION := "v1.57.2"
7171
CLUSTERCTL_VERSION := "v1.7.2"
7272

7373

74-
KUSTOMIZE_VER := v4.5.2
74+
KUSTOMIZE_VER := v5.3.0
7575
KUSTOMIZE_BIN := kustomize
7676
KUSTOMIZE := $(abspath $(TOOLS_BIN_DIR)/$(KUSTOMIZE_BIN)-$(KUSTOMIZE_VER))
77-
KUSTOMIZE_PKG := sigs.k8s.io/kustomize/kustomize/v4
77+
KUSTOMIZE_PKG := sigs.k8s.io/kustomize/kustomize/v5
7878
$(KUSTOMIZE): # Build kustomize from tools folder.
7979
CGO_ENABLED=0 GOBIN=$(TOOLS_BIN_DIR) $(GO_INSTALL) $(KUSTOMIZE_PKG) $(KUSTOMIZE_BIN) $(KUSTOMIZE_VER)
8080

81-
SETUP_ENVTEST_VER := v0.0.0-20240215143116-d0396a3d6f9f
81+
SETUP_ENVTEST_VER := v0.0.0-20240522175850-2e9781e9fc60
8282
SETUP_ENVTEST_BIN := setup-envtest
8383
SETUP_ENVTEST := $(abspath $(TOOLS_BIN_DIR)/$(SETUP_ENVTEST_BIN)-$(SETUP_ENVTEST_VER))
8484
SETUP_ENVTEST_PKG := sigs.k8s.io/controller-runtime/tools/setup-envtest

‎go.mod

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,21 @@ require (
1212
github.com/onsi/ginkgo/v2 v2.19.0
1313
github.com/onsi/gomega v1.33.1
1414
github.com/pkg/errors v0.9.1
15-
github.com/projectsveltos/addon-controller v0.31.1-0.20240529115954-7f7677fa9454
16-
github.com/projectsveltos/libsveltos v0.31.1-0.20240529102610-6e5624878b89
15+
github.com/projectsveltos/addon-controller v0.32.1-0.20240611173725-4d8403710b08
16+
github.com/projectsveltos/libsveltos v0.32.1-0.20240611141238-c8675b616482
1717
github.com/prometheus/client_golang v1.19.1
1818
github.com/slack-go/slack v0.13.0
1919
github.com/spf13/pflag v1.0.5
20-
golang.org/x/text v0.15.0
20+
golang.org/x/text v0.16.0
2121
k8s.io/api v0.30.1
2222
k8s.io/apiextensions-apiserver v0.30.1
2323
k8s.io/apimachinery v0.30.1
2424
k8s.io/client-go v0.30.1
2525
k8s.io/component-base v0.30.1
2626
k8s.io/klog/v2 v2.120.1
2727
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0
28-
sigs.k8s.io/cluster-api v1.7.2
29-
sigs.k8s.io/controller-runtime v0.18.3
28+
sigs.k8s.io/cluster-api v1.7.3
29+
sigs.k8s.io/controller-runtime v0.18.4
3030
)
3131

3232
require (
@@ -168,7 +168,7 @@ require (
168168
golang.org/x/sys v0.20.0 // indirect
169169
golang.org/x/term v0.20.0 // indirect
170170
golang.org/x/time v0.5.0 // indirect
171-
golang.org/x/tools v0.21.0 // indirect
171+
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
172172
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
173173
google.golang.org/appengine v1.6.7 // indirect
174174
google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect

‎go.sum

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -384,10 +384,10 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI
384384
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
385385
github.com/poy/onpar v1.1.2 h1:QaNrNiZx0+Nar5dLgTVp5mXkyoVFIbepjyEoGSnhbAY=
386386
github.com/poy/onpar v1.1.2/go.mod h1:6X8FLNoxyr9kkmnlqpK6LSoiOtrO6MICtWwEuWkLjzg=
387-
github.com/projectsveltos/addon-controller v0.31.1-0.20240529115954-7f7677fa9454 h1:RM1z0VTXeXlNBXYfMiyAn+S6FrHaWv4u+8w//2D9eHk=
388-
github.com/projectsveltos/addon-controller v0.31.1-0.20240529115954-7f7677fa9454/go.mod h1:1Arh8lu9uRFQO4Mf+URiZVKd71HrRnm6h4loW5ZKqDM=
389-
github.com/projectsveltos/libsveltos v0.31.1-0.20240529102610-6e5624878b89 h1:FpLAS3y+/dH7uCVNxgNYv7Gu56W21E+G+NPTZbZOw+U=
390-
github.com/projectsveltos/libsveltos v0.31.1-0.20240529102610-6e5624878b89/go.mod h1:APYCWXBZ/+RhCKq/uetAW99CcJVxL1g0/Kh5GZlvIHk=
387+
github.com/projectsveltos/addon-controller v0.32.1-0.20240611173725-4d8403710b08 h1:/7DEMm00hnLaqPrV9sNY7BKqnXU2dQGPk8XzoE9AFdE=
388+
github.com/projectsveltos/addon-controller v0.32.1-0.20240611173725-4d8403710b08/go.mod h1:VP2FHId1gPANxpBIrN3b6qMcV5HcjVnNuJQI22xspwk=
389+
github.com/projectsveltos/libsveltos v0.32.1-0.20240611141238-c8675b616482 h1:FSLwV0I/Z4mzcfY+iP46bz1CT07AMzK34xXdPm7Fahs=
390+
github.com/projectsveltos/libsveltos v0.32.1-0.20240611141238-c8675b616482/go.mod h1:z6avfRqeHbzqkThyqqqoGcCWMI0JBeAjdeZlbJ7P8TI=
391391
github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
392392
github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
393393
github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g=
@@ -583,8 +583,8 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
583583
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
584584
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
585585
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
586-
golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
587-
golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
586+
golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
587+
golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
588588
golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
589589
golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
590590
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -596,8 +596,8 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn
596596
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
597597
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
598598
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
599-
golang.org/x/tools v0.21.0 h1:qc0xYgIbsSDt9EyWz05J5wfa7LOVW0YTLOXrqdLAWIw=
600-
golang.org/x/tools v0.21.0/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
599+
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg=
600+
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
601601
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
602602
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
603603
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -684,10 +684,10 @@ oras.land/oras-go v1.2.4 h1:djpBY2/2Cs1PV87GSJlxv4voajVOMZxqqtq9AB8YNvY=
684684
oras.land/oras-go v1.2.4/go.mod h1:DYcGfb3YF1nKjcezfX2SNlDAeQFKSXmf+qrFmrh4324=
685685
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 h1:/U5vjBbQn3RChhv7P11uhYvCSm5G2GaIi5AIGBS6r4c=
686686
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0/go.mod h1:z7+wmGM2dfIiLRfrC6jb5kV2Mq/sK1ZP303cxzkV5Y4=
687-
sigs.k8s.io/cluster-api v1.7.2 h1:bRE8zoao7ajuLC0HijqfZVcubKQCPlZ04HMgcA53FGE=
688-
sigs.k8s.io/cluster-api v1.7.2/go.mod h1:V9ZhKLvQtsDODwjXOKgbitjyCmC71yMBwDcMyNNIov0=
689-
sigs.k8s.io/controller-runtime v0.18.3 h1:B5Wmmo8WMWK7izei+2LlXLVDGzMwAHBNLX68lwtlSR4=
690-
sigs.k8s.io/controller-runtime v0.18.3/go.mod h1:TVoGrfdpbA9VRFaRnKgk9P5/atA0pMwq+f+msb9M8Sg=
687+
sigs.k8s.io/cluster-api v1.7.3 h1:DsSRxsA+18jxLqPAo29abZ9kOPK1/xwhSuQb/MROzSs=
688+
sigs.k8s.io/cluster-api v1.7.3/go.mod h1:V9ZhKLvQtsDODwjXOKgbitjyCmC71yMBwDcMyNNIov0=
689+
sigs.k8s.io/controller-runtime v0.18.4 h1:87+guW1zhvuPLh1PHybKdYFLU0YJp4FhJRmiHvm5BZw=
690+
sigs.k8s.io/controller-runtime v0.18.4/go.mod h1:TVoGrfdpbA9VRFaRnKgk9P5/atA0pMwq+f+msb9M8Sg=
691691
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
692692
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
693693
sigs.k8s.io/kustomize/api v0.17.2 h1:E7/Fjk7V5fboiuijoZHgs4aHuexi5Y2loXlVOAVAG5g=

‎hack/tools/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.22.0
55
require (
66
github.com/a8m/envsubst v1.4.2
77
github.com/onsi/ginkgo/v2 v2.19.0
8-
golang.org/x/oauth2 v0.20.0
8+
golang.org/x/oauth2 v0.21.0
99
k8s.io/client-go v0.30.1
1010
sigs.k8s.io/controller-tools v0.15.0
1111
sigs.k8s.io/kind v0.23.0

‎hack/tools/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,8 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL
121121
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
122122
golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
123123
golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
124-
golang.org/x/oauth2 v0.20.0 h1:4mQdhULixXKP1rwYBW0vAijoXnkTG0BLCDRzfe1idMo=
125-
golang.org/x/oauth2 v0.20.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
124+
golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs=
125+
golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
126126
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
127127
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
128128
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

0 commit comments

Comments
 (0)