Skip to content

Commit 6864490

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes-sigs#4974 from mboersma/bump-capi-1.7.4
Bump CAPI to v1.7.4
2 parents 21479a9 + c2959a5 commit 6864490

File tree

6 files changed

+30
-30
lines changed

6 files changed

+30
-30
lines changed

‎Makefile

Lines changed: 3 additions & 3 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.29.0
36+
export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.30.0
3737
export KUBEBUILDER_CONTROLPLANE_START_TIMEOUT ?= 60s
3838
export KUBEBUILDER_CONTROLPLANE_STOP_TIMEOUT ?= 60s
3939

@@ -101,7 +101,7 @@ RELEASE_NOTES_VER := v0.16.6-0.20240222112346-71feb57b59a4
101101
RELEASE_NOTES_BIN := release-notes
102102
RELEASE_NOTES := $(TOOLS_BIN_DIR)/$(RELEASE_NOTES_BIN)-$(RELEASE_NOTES_VER)
103103

104-
KPROMO_VER := v4.0.4
104+
KPROMO_VER := v4.0.5
105105
KPROMO_BIN := kpromo
106106
KPROMO := $(TOOLS_BIN_DIR)/$(KPROMO_BIN)-$(KPROMO_VER)
107107

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

316316
# Deploy CAPI
317-
timeout --foreground 300 bash -c "until curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.3/cluster-api-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f -; do sleep 5; done"
317+
timeout --foreground 300 bash -c "until curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.4/cluster-api-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f -; do sleep 5; done"
318318

319319
# Deploy CAAPH
320320
timeout --foreground 300 bash -c "until 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 -; do sleep 5; done"

‎Tiltfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ settings = {
2020
"deploy_cert_manager": True,
2121
"preload_images_for_kind": True,
2222
"kind_cluster_name": "capz",
23-
"capi_version": "v1.7.3",
23+
"capi_version": "v1.7.4",
2424
"caaph_version": "v0.2.1",
25-
"cert_manager_version": "v1.15.0",
25+
"cert_manager_version": "v1.15.1",
2626
"kubernetes_version": "v1.28.3",
2727
"aks_kubernetes_version": "v1.28.3",
2828
"flatcar_version": "3374.2.1",

‎go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ require (
5252
k8s.io/kubectl v0.29.3
5353
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
5454
sigs.k8s.io/cloud-provider-azure v1.29.3
55-
sigs.k8s.io/cluster-api v1.7.3
56-
sigs.k8s.io/cluster-api/test v1.7.3
55+
sigs.k8s.io/cluster-api v1.7.4
56+
sigs.k8s.io/cluster-api/test v1.7.4
5757
sigs.k8s.io/controller-runtime v0.17.3
5858
sigs.k8s.io/kind v0.23.0
5959
)
@@ -216,7 +216,7 @@ require (
216216
sigs.k8s.io/yaml v1.4.0 // indirect
217217
)
218218

219-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.7.3
219+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.7.4
220220

221221
// kube-openapi should match the version imported by CAPI.
222222
replace k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00

‎go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -718,10 +718,10 @@ sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.0.2 h1:9Zp+uWnxdUOoy/FaQK1DjPfL
718718
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.0.2/go.mod h1:JKWYkoOyET3wsN0Kk9WxA+zpopkuCy+v4+mrnJ60Yyk=
719719
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.0.1 h1:Lp0nALZmvMJoiVeVV6XjnZv1uClfArnThhuDAjaqE5A=
720720
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.0.1/go.mod h1:pPkJPx/eMVWP3R+LhPoOYGoY7lywcMJev5L2uSfH+Jo=
721-
sigs.k8s.io/cluster-api v1.7.3 h1:DsSRxsA+18jxLqPAo29abZ9kOPK1/xwhSuQb/MROzSs=
722-
sigs.k8s.io/cluster-api v1.7.3/go.mod h1:V9ZhKLvQtsDODwjXOKgbitjyCmC71yMBwDcMyNNIov0=
723-
sigs.k8s.io/cluster-api/test v1.7.3 h1:Nl1IOF03MZzjr6x45IJOFWlV4cNHpJ45qsn3A+1Tf98=
724-
sigs.k8s.io/cluster-api/test v1.7.3/go.mod h1:KbK8+zZEmSopCm6IGd9Vk+573sQ+HL6hnPvqelJEYi4=
721+
sigs.k8s.io/cluster-api v1.7.4 h1:gT9WGbLXKE19pNR6s/cTLRqK2G0EbwxxQrUrw7/w5P4=
722+
sigs.k8s.io/cluster-api v1.7.4/go.mod h1:V9ZhKLvQtsDODwjXOKgbitjyCmC71yMBwDcMyNNIov0=
723+
sigs.k8s.io/cluster-api/test v1.7.4 h1:yBeWaQoPcAbLMF/ddgz0IWJiFgfJe+QfZJ4QWexMVOw=
724+
sigs.k8s.io/cluster-api/test v1.7.4/go.mod h1:KbK8+zZEmSopCm6IGd9Vk+573sQ+HL6hnPvqelJEYi4=
725725
sigs.k8s.io/controller-runtime v0.17.3 h1:65QmN7r3FWgTxDMz9fvGnO1kbf2nu+acg9p2R9oYYYk=
726726
sigs.k8s.io/controller-runtime v0.17.3/go.mod h1:N0jpP5Lo7lMTF9aL56Z/B2oWBJjey6StQM0jRbKQXtY=
727727
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=

‎hack/install-cert-manager.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ source "${REPO_ROOT}/hack/common-vars.sh"
5454
make --directory="${REPO_ROOT}" "${KUBECTL##*/}"
5555

5656
## Install cert manager and wait for availability
57-
"${KUBECTL}" apply -f https://github.com/jetstack/cert-manager/releases/download/v1.15.0/cert-manager.yaml
57+
"${KUBECTL}" apply -f https://github.com/jetstack/cert-manager/releases/download/v1.15.1/cert-manager.yaml
5858
"${KUBECTL}" wait --for=condition=Available --timeout=5m -n cert-manager deployment/cert-manager
5959
"${KUBECTL}" wait --for=condition=Available --timeout=5m -n cert-manager deployment/cert-manager-cainjector
6060
"${KUBECTL}" wait --for=condition=Available --timeout=5m -n cert-manager deployment/cert-manager-webhook

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ managementClusterName: capz-e2e
33
images:
44
- name: ${MANAGER_IMAGE}
55
loadBehavior: mustLoad
6-
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.7.3
6+
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.7.4
77
loadBehavior: tryLoad
8-
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.7.3
8+
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.7.4
99
loadBehavior: tryLoad
10-
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.7.3
10+
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.7.4
1111
loadBehavior: tryLoad
1212
- name: registry.k8s.io/cluster-api-helm/cluster-api-helm-controller:v0.1.1-alpha.1
1313
loadBehavior: tryLoad
@@ -16,17 +16,17 @@ providers:
1616
- name: cluster-api
1717
type: CoreProvider
1818
versions:
19-
- name: v1.6.6 # 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.6.6/core-components.yaml"
19+
- name: v1.6.7 # 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.6.7/core-components.yaml"
2121
type: "url"
2222
contract: v1beta1
2323
replacements:
2424
- old: --metrics-addr=127.0.0.1:8080
2525
new: --metrics-addr=:8080
2626
files:
2727
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
28-
- name: v1.7.3
29-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.3/core-components.yaml
28+
- name: v1.7.4
29+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.4/core-components.yaml
3030
type: url
3131
contract: v1beta1
3232
files:
@@ -39,17 +39,17 @@ providers:
3939
- name: kubeadm
4040
type: BootstrapProvider
4141
versions:
42-
- name: v1.6.6 # 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.6.6/bootstrap-components.yaml"
42+
- name: v1.6.7 # 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.6.7/bootstrap-components.yaml"
4444
type: "url"
4545
contract: v1beta1
4646
replacements:
4747
- old: --metrics-addr=127.0.0.1:8080
4848
new: --metrics-addr=:8080
4949
files:
5050
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
51-
- name: v1.7.3
52-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.3/bootstrap-components.yaml
51+
- name: v1.7.4
52+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.4/bootstrap-components.yaml
5353
type: url
5454
contract: v1beta1
5555
files:
@@ -61,17 +61,17 @@ providers:
6161
- name: kubeadm
6262
type: ControlPlaneProvider
6363
versions:
64-
- name: v1.6.6 # 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.6.6/control-plane-components.yaml"
64+
- name: v1.6.7 # 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.6.7/control-plane-components.yaml"
6666
type: "url"
6767
contract: v1beta1
6868
replacements:
6969
- old: --metrics-addr=127.0.0.1:8080
7070
new: --metrics-addr=:8080
7171
files:
7272
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
73-
- name: v1.7.3
74-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.3/control-plane-components.yaml
73+
- name: v1.7.4
74+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.4/control-plane-components.yaml
7575
type: url
7676
contract: v1beta1
7777
files:
@@ -224,8 +224,8 @@ variables:
224224
SECURITY_SCAN_FAIL_THRESHOLD: "${SECURITY_SCAN_FAIL_THRESHOLD:-100}"
225225
SECURITY_SCAN_CONTAINER: "${SECURITY_SCAN_CONTAINER:-quay.io/armosec/kubescape:v2.0.167}"
226226
AZURE_CNI_V1_MANIFEST_PATH: "${PWD}/templates/addons/azure-cni-v1.yaml"
227-
OLD_CAPI_UPGRADE_VERSION: "v1.6.6"
228-
LATEST_CAPI_UPGRADE_VERSION: "v1.7.3"
227+
OLD_CAPI_UPGRADE_VERSION: "v1.6.7"
228+
LATEST_CAPI_UPGRADE_VERSION: "v1.7.4"
229229
OLD_PROVIDER_UPGRADE_VERSION: "v1.14.5"
230230
LATEST_PROVIDER_UPGRADE_VERSION: "v1.15.1"
231231
OLD_CAAPH_UPGRADE_VERSION: "v0.1.0-alpha.10"

0 commit comments

Comments
 (0)