Skip to content

Commit 1cd0a4d

Browse files
camilamacedo86camilamacedo86
committed
✨ upgrade k8s deps from 1.24 to 1.24.2, controller-tools from v0.9.0 to v0.9.2 and controller-runtime from v0.12.1 to v0.12.2
1 parent ac091b4 commit 1cd0a4d

File tree

68 files changed

+134
-127
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+134
-127
lines changed

‎go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ require (
1313
github.com/spf13/pflag v1.0.5
1414
golang.org/x/text v0.3.7
1515
golang.org/x/tools v0.1.10-0.20220218145154-897bd77cd717
16-
k8s.io/apimachinery v0.24.0 // for `kubebuilder alpha config-gen`
17-
sigs.k8s.io/controller-runtime v0.12.1
18-
sigs.k8s.io/controller-tools v0.9.0 // for `kubebuilder alpha config-gen`
16+
k8s.io/apimachinery v0.24.2 // for `kubebuilder alpha config-gen`
17+
sigs.k8s.io/controller-runtime v0.12.2 // for `kubebuilder alpha config-gen`
18+
sigs.k8s.io/controller-tools v0.9.2 // for `kubebuilder alpha config-gen`
1919
sigs.k8s.io/kustomize/kyaml v0.13.6 // for `kubebuilder alpha config-gen`
2020
sigs.k8s.io/yaml v1.3.0
2121
)
@@ -62,8 +62,8 @@ require (
6262
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
6363
gopkg.in/yaml.v2 v2.4.0 // indirect
6464
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
65-
k8s.io/api v0.24.0 // indirect
66-
k8s.io/apiextensions-apiserver v0.24.0 // indirect
65+
k8s.io/api v0.24.2 // indirect
66+
k8s.io/apiextensions-apiserver v0.24.2 // indirect
6767
k8s.io/klog/v2 v2.60.1 // indirect
6868
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
6969
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect

‎go.sum‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -992,16 +992,23 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
992992
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
993993
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
994994
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
995-
k8s.io/api v0.24.0 h1:J0hann2hfxWr1hinZIDefw7Q96wmCBx6SSB8IY0MdDg=
996995
k8s.io/api v0.24.0/go.mod h1:5Jl90IUrJHUJYEMANRURMiVvJ0g7Ax7r3R1bqO8zx8I=
997-
k8s.io/apiextensions-apiserver v0.24.0 h1:JfgFqbA8gKJ/uDT++feAqk9jBIwNnL9YGdQvaI9DLtY=
996+
k8s.io/api v0.24.2 h1:g518dPU/L7VRLxWfcadQn2OnsiGWVOadTLpdnqgY2OI=
997+
k8s.io/api v0.24.2/go.mod h1:AHqbSkTm6YrQ0ObxjO3Pmp/ubFF/KuM7jU+3khoBsOg=
998998
k8s.io/apiextensions-apiserver v0.24.0/go.mod h1:iuVe4aEpe6827lvO6yWQVxiPSpPoSKVjkq+MIdg84cM=
999-
k8s.io/apimachinery v0.24.0 h1:ydFCyC/DjCvFCHK5OPMKBlxayQytB8pxy8YQInd5UyQ=
999+
k8s.io/apiextensions-apiserver v0.24.2 h1:/4NEQHKlEz1MlaK/wHT5KMKC9UKYz6NZz6JE6ov4G6k=
1000+
k8s.io/apiextensions-apiserver v0.24.2/go.mod h1:e5t2GMFVngUEHUd0wuCJzw8YDwZoqZfJiGOW6mm2hLQ=
10001001
k8s.io/apimachinery v0.24.0/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM=
1002+
k8s.io/apimachinery v0.24.2 h1:5QlH9SL2C8KMcrNJPor+LbXVTaZRReml7svPEh4OKDM=
1003+
k8s.io/apimachinery v0.24.2/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM=
10011004
k8s.io/apiserver v0.24.0/go.mod h1:WFx2yiOMawnogNToVvUYT9nn1jaIkMKj41ZYCVycsBA=
1005+
k8s.io/apiserver v0.24.2/go.mod h1:pSuKzr3zV+L+MWqsEo0kHHYwCo77AT5qXbFXP2jbvFI=
10021006
k8s.io/client-go v0.24.0/go.mod h1:VFPQET+cAFpYxh6Bq6f4xyMY80G6jKKktU6G0m00VDw=
1007+
k8s.io/client-go v0.24.2/go.mod h1:zg4Xaoo+umDsfCWr4fCnmLEtQXyCNXCvJuSsglNcV30=
10031008
k8s.io/code-generator v0.24.0/go.mod h1:dpVhs00hTuTdTY6jvVxvTFCk6gSMrtfRydbhZwHI15w=
1009+
k8s.io/code-generator v0.24.2/go.mod h1:dpVhs00hTuTdTY6jvVxvTFCk6gSMrtfRydbhZwHI15w=
10041010
k8s.io/component-base v0.24.0/go.mod h1:Dgazgon0i7KYUsS8krG8muGiMVtUZxG037l1MKyXgrA=
1011+
k8s.io/component-base v0.24.2/go.mod h1:ucHwW76dajvQ9B7+zecZAP3BVqvrHoOxm8olHEg0nmM=
10051012
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
10061013
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
10071014
k8s.io/gengo v0.0.0-20211129171323-c02415ce4185/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
@@ -1019,10 +1026,10 @@ rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8
10191026
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
10201027
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
10211028
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.30/go.mod h1:fEO7lRTdivWO2qYVCVG7dEADOMo/MLDCVr8So2g88Uw=
1022-
sigs.k8s.io/controller-runtime v0.12.1 h1:4BJY01xe9zKQti8oRjj/NeHKRXthf1YkYJAgLONFFoI=
1023-
sigs.k8s.io/controller-runtime v0.12.1/go.mod h1:BKhxlA4l7FPK4AQcsuL4X6vZeWnKDXez/vp1Y8dxTU0=
1024-
sigs.k8s.io/controller-tools v0.9.0 h1:b/vSEPpA8hiMiyzDfLbZdCn3hoAcy3/868OHhYtHY9w=
1025-
sigs.k8s.io/controller-tools v0.9.0/go.mod h1:NUkn8FTV3Sad3wWpSK7dt/145qfuQ8CKJV6j4jHC5rM=
1029+
sigs.k8s.io/controller-runtime v0.12.2 h1:nqV02cvhbAj7tbt21bpPpTByrXGn2INHRsi39lXy9sE=
1030+
sigs.k8s.io/controller-runtime v0.12.2/go.mod h1:qKsk4WE6zW2Hfj0G4v10EnNB2jMG1C+NTb8h+DwCoU0=
1031+
sigs.k8s.io/controller-tools v0.9.2 h1:AkTE3QAdz9LS4iD3EJvHyYxBkg/g9fTbgiYsrcsFCcM=
1032+
sigs.k8s.io/controller-tools v0.9.2/go.mod h1:NUkn8FTV3Sad3wWpSK7dt/145qfuQ8CKJV6j4jHC5rM=
10261033
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 h1:kDi4JBNAsJWfz1aEXhO8Jg87JJaPNLh5tIzYHgStQ9Y=
10271034
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2/go.mod h1:B+TnT182UBxE84DiCz4CVE26eOSDAeYCpfDnC2kdKMY=
10281035
sigs.k8s.io/kustomize/kyaml v0.13.6 h1:eF+wsn4J7GOAXlvajv6OknSunxpcOBQQqsnPxObtkGs=

‎pkg/plugins/golang/v3/commons.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ manifests: controller-gen`
7878
}
7979

8080
if err := util.ReplaceInFile("Makefile",
81-
"ENVTEST_K8S_VERSION = 1.24.1",
81+
"ENVTEST_K8S_VERSION = 1.24.2",
8282
"ENVTEST_K8S_VERSION = 1.21"); err != nil {
8383
log.Warnf("unable to update the Makefile with %s: %s", "ENVTEST_K8S_VERSION = 1.21", err)
8484
}
@@ -94,39 +94,39 @@ manifests: controller-gen`
9494
}
9595

9696
if err := util.ReplaceInFile("go.mod",
97-
"k8s.io/api v0.24.0",
97+
"k8s.io/api v0.24.2",
9898
"k8s.io/api v0.21.2"); err != nil {
9999
log.Warnf("unable to update the go.mod with k8s.io/api v0.21.2: %s", err)
100100
}
101101

102102
if err := util.ReplaceInFile("go.mod",
103-
"k8s.io/apimachinery v0.24.0",
103+
"k8s.io/apimachinery v0.24.2",
104104
"k8s.io/apimachinery v0.21.2"); err != nil {
105105
log.Warnf("unable to update the go.mod with k8s.io/apimachinery v0.21.2: %s", err)
106106
}
107107

108108
if err := util.ReplaceInFile("go.mod",
109-
"k8s.io/client-go v0.24.0",
109+
"k8s.io/client-go v0.24.2",
110110
"k8s.io/client-go v0.21.2"); err != nil {
111111
log.Warnf("unable to update the go.mod with k8s.io/client-go v0.21.2: %s", err)
112112
}
113113

114114
// During the scaffolding phase, this gets added to go.mod file, running go mod tidy bumps back
115115
// the version from 21.2 to the latest
116116
if err := util.ReplaceInFile("go.mod",
117-
"k8s.io/api v0.24.0",
117+
"k8s.io/api v0.24.2",
118118
"k8s.io/api v0.21.2"); err != nil {
119119
log.Warnf("unable to update the go.mod with k8s.io/api v0.21.2: %s", err)
120120
}
121121

122122
if err := util.ReplaceInFile("go.mod",
123-
"k8s.io/apiextensions-apiserver v0.24.0",
123+
"k8s.io/apiextensions-apiserver v0.24.2",
124124
"k8s.io/apiextensions-apiserver v0.21.2"); err != nil {
125125
log.Warnf("unable to update the go.mod with k8s.io/apiextensions-apiserver v0.21.2: %s", err)
126126
}
127127

128128
if err := util.ReplaceInFile("go.mod",
129-
"k8s.io/component-base v0.24.0",
129+
"k8s.io/component-base v0.24.2",
130130
"k8s.io/component-base v0.21.2"); err != nil {
131131
log.Warnf("unable to update the go.mod with k8s.io/component-base v0.21.2: %s", err)
132132
}

‎pkg/plugins/golang/v3/scaffolds/init.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ import (
3434

3535
const (
3636
// ControllerRuntimeVersion is the kubernetes-sigs/controller-runtime version to be used in the project
37-
ControllerRuntimeVersion = "v0.12.1"
37+
ControllerRuntimeVersion = "v0.12.2"
3838
// ControllerToolsVersion is the kubernetes-sigs/controller-tools version to be used in the project
39-
ControllerToolsVersion = "v0.9.0"
39+
ControllerToolsVersion = "v0.9.2"
4040

4141
imageName = "controller:latest"
4242
)

‎pkg/plugins/golang/v3/scaffolds/internal/templates/makefile.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ const makefileTemplate = `
6161
# Image URL to use all building/pushing image targets
6262
IMG ?= {{ .Image }}
6363
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
64-
ENVTEST_K8S_VERSION = 1.24.1
64+
ENVTEST_K8S_VERSION = 1.24.2
6565
6666
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
6767
ifeq (,$(shell go env GOBIN))

‎testdata/project-v3-addon/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Image URL to use all building/pushing image targets
33
IMG ?= controller:latest
44
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
5-
ENVTEST_K8S_VERSION = 1.24.1
5+
ENVTEST_K8S_VERSION = 1.24.2
66

77
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
88
ifeq (,$(shell go env GOBIN))
@@ -114,7 +114,7 @@ ENVTEST ?= $(LOCALBIN)/setup-envtest
114114

115115
## Tool Versions
116116
KUSTOMIZE_VERSION ?= v3.8.7
117-
CONTROLLER_TOOLS_VERSION ?= v0.9.0
117+
CONTROLLER_TOOLS_VERSION ?= v0.9.2
118118

119119
KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
120120
.PHONY: kustomize

‎testdata/project-v3-addon/config/crd/bases/crew.testproject.org_admirals.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.9.0
6+
controller-gen.kubebuilder.io/version: v0.9.2
77
creationTimestamp: null
88
name: admirals.crew.testproject.org
99
spec:

‎testdata/project-v3-addon/config/crd/bases/crew.testproject.org_captains.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.9.0
6+
controller-gen.kubebuilder.io/version: v0.9.2
77
creationTimestamp: null
88
name: captains.crew.testproject.org
99
spec:

‎testdata/project-v3-addon/config/crd/bases/crew.testproject.org_firstmates.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.9.0
6+
controller-gen.kubebuilder.io/version: v0.9.2
77
creationTimestamp: null
88
name: firstmates.crew.testproject.org
99
spec:

‎testdata/project-v3-addon/go.mod‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ require (
66
github.com/go-logr/logr v1.2.0
77
github.com/onsi/ginkgo v1.16.5
88
github.com/onsi/gomega v1.18.1
9-
k8s.io/apimachinery v0.24.0
10-
k8s.io/client-go v0.24.0
11-
sigs.k8s.io/controller-runtime v0.12.1
9+
k8s.io/apimachinery v0.24.2
10+
k8s.io/client-go v0.24.2
11+
sigs.k8s.io/controller-runtime v0.12.2
1212
sigs.k8s.io/kubebuilder-declarative-pattern v0.11.20220513-0.20220602225619-fe5be9431eae
1313
)
1414

@@ -108,10 +108,10 @@ require (
108108
gopkg.in/warnings.v0 v0.1.2 // indirect
109109
gopkg.in/yaml.v2 v2.4.0 // indirect
110110
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
111-
k8s.io/api v0.24.0 // indirect
112-
k8s.io/apiextensions-apiserver v0.24.0 // indirect
111+
k8s.io/api v0.24.2 // indirect
112+
k8s.io/apiextensions-apiserver v0.24.2 // indirect
113113
k8s.io/cli-runtime v0.24.0 // indirect
114-
k8s.io/component-base v0.24.0 // indirect
114+
k8s.io/component-base v0.24.2 // indirect
115115
k8s.io/klog/v2 v2.60.1 // indirect
116116
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
117117
k8s.io/kubectl v0.24.0 // indirect

0 commit comments

Comments
 (0)