Skip to content

Commit 75de002

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #4464 from mboersma/bump-capi-1.5.5
[release-1.12] Bump CAPI to v1.5.5
2 parents e9de99b + 9e95e8e commit 75de002

File tree

6 files changed

+31
-31
lines changed

6 files changed

+31
-31
lines changed

‎Makefile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export GOPROXY
3333
export GO111MODULE=on
3434

3535
# Kubebuilder.
36-
export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.27
36+
export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.28.0
3737
export KUBEBUILDER_CONTROLPLANE_START_TIMEOUT ?= 60s
3838
export KUBEBUILDER_CONTROLPLANE_STOP_TIMEOUT ?= 60s
3939

@@ -73,7 +73,7 @@ CONTROLLER_GEN_VER := v0.9.2
7373
CONTROLLER_GEN_BIN := controller-gen
7474
CONTROLLER_GEN := $(TOOLS_BIN_DIR)/$(CONTROLLER_GEN_BIN)-$(CONTROLLER_GEN_VER)
7575

76-
CONVERSION_GEN_VER := v0.23.1
76+
CONVERSION_GEN_VER := v0.27.1
7777
CONVERSION_GEN_BIN := conversion-gen
7878
CONVERSION_GEN := $(TOOLS_BIN_DIR)/$(CONVERSION_GEN_BIN)-$(CONVERSION_GEN_VER)
7979

@@ -97,7 +97,7 @@ RELEASE_NOTES_VER := v0.12.0
9797
RELEASE_NOTES_BIN := release-notes
9898
RELEASE_NOTES := $(TOOLS_BIN_DIR)/$(RELEASE_NOTES_BIN)-$(RELEASE_NOTES_VER)
9999

100-
KPROMO_VER := v3.5.1
100+
KPROMO_VER := v3.6.0
101101
KPROMO_BIN := kpromo
102102
KPROMO := $(TOOLS_BIN_DIR)/$(KPROMO_BIN)-$(KPROMO_VER)
103103

@@ -301,7 +301,7 @@ create-management-cluster: $(KUSTOMIZE) $(ENVSUBST) $(KUBECTL) $(KIND) ## Create
301301
./hack/create-custom-cloud-provider-config.sh
302302

303303
# Deploy CAPI
304-
curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.4/cluster-api-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f -
304+
curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.5/cluster-api-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f -
305305

306306
# Deploy CAAPH
307307
curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api-addon-provider-helm/releases/download/v0.1.0-alpha.10/addon-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f -

‎Tiltfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ settings = {
1919
"deploy_cert_manager": True,
2020
"preload_images_for_kind": True,
2121
"kind_cluster_name": "capz",
22-
"capi_version": "v1.5.4",
22+
"capi_version": "v1.5.5",
2323
"cert_manager_version": "v1.13.2",
2424
"kubernetes_version": "v1.28.0",
2525
"aks_kubernetes_version": "v1.26.3",

‎go.mod‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ require (
3939
go.opentelemetry.io/otel/sdk/metric v1.20.0
4040
go.opentelemetry.io/otel/trace v1.20.0
4141
go.uber.org/mock v0.3.0
42-
golang.org/x/crypto v0.15.0
42+
golang.org/x/crypto v0.17.0
4343
golang.org/x/exp v0.0.0-20231006140011-7918f672742d
4444
golang.org/x/mod v0.14.0
4545
golang.org/x/text v0.14.0
@@ -54,8 +54,8 @@ require (
5454
k8s.io/kubectl v0.27.2
5555
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
5656
sigs.k8s.io/cloud-provider-azure v1.27.7
57-
sigs.k8s.io/cluster-api v1.5.4
58-
sigs.k8s.io/cluster-api/test v1.5.4
57+
sigs.k8s.io/cluster-api v1.5.5
58+
sigs.k8s.io/cluster-api/test v1.5.5
5959
sigs.k8s.io/controller-runtime v0.16.3
6060
sigs.k8s.io/kind v0.20.0
6161
)
@@ -186,8 +186,8 @@ require (
186186
golang.org/x/net v0.17.0 // indirect
187187
golang.org/x/oauth2 v0.13.0 // indirect
188188
golang.org/x/sync v0.4.0 // indirect
189-
golang.org/x/sys v0.14.0 // indirect
190-
golang.org/x/term v0.14.0 // indirect
189+
golang.org/x/sys v0.15.0 // indirect
190+
golang.org/x/term v0.15.0 // indirect
191191
golang.org/x/time v0.4.0 // indirect
192192
golang.org/x/tools v0.14.0 // indirect
193193
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
@@ -214,7 +214,7 @@ require (
214214
sigs.k8s.io/yaml v1.4.0 // indirect
215215
)
216216

217-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.5.4
217+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.5.5
218218

219219
// All of these below are necessary until CAPI is updated to v1.6.0.
220220
// After that, this kube-openapi one will still be necessary, replacing

‎go.sum‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -706,8 +706,8 @@ golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0
706706
golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw=
707707
golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
708708
golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
709-
golang.org/x/crypto v0.15.0 h1:frVn1TEaCEaZcn3Tmd7Y2b5KKPaZ+I32Q2OA3kYp5TA=
710-
golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g=
709+
golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k=
710+
golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
711711
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
712712
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
713713
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -868,15 +868,15 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc
868868
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
869869
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
870870
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
871-
golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
872-
golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
871+
golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
872+
golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
873873
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
874874
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
875875
golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
876876
golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
877877
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
878-
golang.org/x/term v0.14.0 h1:LGK9IlZ8T9jvdy6cTdfKUCltatMFOehAQo9SRC46UQ8=
879-
golang.org/x/term v0.14.0/go.mod h1:TySc+nGkYR6qt8km8wUhuFRTVSMIX3XPR58y2lC8vww=
878+
golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4=
879+
golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
880880
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
881881
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
882882
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -1138,10 +1138,10 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 h1:trsWhjU5jZrx6U
11381138
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2/go.mod h1:+qG7ISXqCDVVcyO8hLn12AKVYYUjM7ftlqsqmrhMZE0=
11391139
sigs.k8s.io/cloud-provider-azure v1.27.7 h1:X6DdOA1aUlnBfSffTdq1zGWph7L62VY6ZS1ErwR5bVY=
11401140
sigs.k8s.io/cloud-provider-azure v1.27.7/go.mod h1:ytwtCpVGJFvIc+n9q6CB14QD+AiiuXnsqz3DkWG7bBI=
1141-
sigs.k8s.io/cluster-api v1.5.4 h1:pRrMLjpDJeCon5Ho7AeS4IoyhQbW9QdP7U5LvsaYsGg=
1142-
sigs.k8s.io/cluster-api v1.5.4/go.mod h1:zKwkrqJGhylj8AQGXS8rqZP0mGOuwS4wNWHxMogjPD4=
1143-
sigs.k8s.io/cluster-api/test v1.5.4 h1:mfcLkR2V+QiHApTz+cp+fNTRBJ+NWpJzJwMWCso0+ts=
1144-
sigs.k8s.io/cluster-api/test v1.5.4/go.mod h1:nFOKT1A4/9Ut2XSmUo3LBnpEnl2fBM1LI49UTZjYL8w=
1141+
sigs.k8s.io/cluster-api v1.5.5 h1:MmxTGE8bJvALrJzzuTA2YEP+qKPrpxg7u8AecU93fwc=
1142+
sigs.k8s.io/cluster-api v1.5.5/go.mod h1:T50/vFznHz409V1XS74DIiPl9JDH4r2+xHiCYpYRTmc=
1143+
sigs.k8s.io/cluster-api/test v1.5.5 h1:7paIrbvMM+CHlFTD9sMvuxV7NvEgujVuAkJkAM88taU=
1144+
sigs.k8s.io/cluster-api/test v1.5.5/go.mod h1:aoUTgVdZhgZ0DSuEHK0yM1VP8OXc/XzgU9DcYbzs3aI=
11451145
sigs.k8s.io/controller-runtime v0.16.3 h1:2TuvuokmfXvDUamSx1SuAOO3eTyye+47mJCigwG62c4=
11461146
sigs.k8s.io/controller-runtime v0.16.3/go.mod h1:j7bialYoSn142nv9sCOJmQgDXQXxnroFU4VnX/brVJ0=
11471147
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=

‎test/e2e/capi_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -260,10 +260,10 @@ var _ = Describe("Running the Cluster API E2E tests", func() {
260260
WaitForControlPlaneInitialized: EnsureControlPlaneInitialized,
261261
},
262262
InitWithKubernetesVersion: "v1.26.12",
263-
InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.4/clusterctl-{OS}-{ARCH}",
264-
InitWithCoreProvider: "cluster-api:v1.5.4",
265-
InitWithBootstrapProviders: []string{"kubeadm:v1.5.4"},
266-
InitWithControlPlaneProviders: []string{"kubeadm:v1.5.4"},
263+
InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.5/clusterctl-{OS}-{ARCH}",
264+
InitWithCoreProvider: "cluster-api:v1.5.5",
265+
InitWithBootstrapProviders: []string{"kubeadm:v1.5.5"},
266+
InitWithControlPlaneProviders: []string{"kubeadm:v1.5.5"},
267267
InitWithInfrastructureProviders: []string{"azure:v1.10.8"},
268268
}
269269
})

‎test/e2e/config/azure-dev.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ providers:
1616
- name: cluster-api
1717
type: CoreProvider
1818
versions:
19-
- name: v1.5.4 # latest patch of earliest minor in supported v1beta1 releases; this is used for v1beta1 old --> v1beta1 latest clusterctl upgrades test only.
20-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.4/core-components.yaml"
19+
- name: v1.5.5 # latest patch of earliest minor in supported v1beta1 releases; this is used for v1beta1 old --> v1beta1 latest clusterctl upgrades test only.
20+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.5/core-components.yaml"
2121
type: "url"
2222
contract: v1beta1
2323
replacements:
@@ -39,8 +39,8 @@ providers:
3939
- name: kubeadm
4040
type: BootstrapProvider
4141
versions:
42-
- name: v1.5.4 # latest patch of earliest minor in supported v1beta1 releases; this is used for v1beta1 old --> v1beta1 latest clusterctl upgrades test only.
43-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.4/bootstrap-components.yaml"
42+
- name: v1.5.5 # latest patch of earliest minor in supported v1beta1 releases; this is used for v1beta1 old --> v1beta1 latest clusterctl upgrades test only.
43+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.5/bootstrap-components.yaml"
4444
type: "url"
4545
contract: v1beta1
4646
replacements:
@@ -61,8 +61,8 @@ providers:
6161
- name: kubeadm
6262
type: ControlPlaneProvider
6363
versions:
64-
- name: v1.5.4 # latest patch of earliest minor in supported v1beta1 releases; this is used for v1beta1 old --> v1beta1 latest clusterctl upgrades test only.
65-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.4/control-plane-components.yaml"
64+
- name: v1.5.5 # latest patch of earliest minor in supported v1beta1 releases; this is used for v1beta1 old --> v1beta1 latest clusterctl upgrades test only.
65+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.5/control-plane-components.yaml"
6666
type: "url"
6767
contract: v1beta1
6868
replacements:

0 commit comments

Comments
 (0)