From 890a959e6bd866af8bd321107441cf10d9c6fdde Mon Sep 17 00:00:00 2001 From: Matt Boersma Date: Tue, 9 Jul 2024 16:27:27 -0600 Subject: [PATCH 1/2] Bump CAPI to v1.6.7 --- Makefile | 4 ++-- Tiltfile | 5 ++--- go.mod | 6 +++--- go.sum | 8 ++++---- hack/install-cert-manager.sh | 2 +- test/e2e/config/azure-dev.yaml | 18 +++++++++--------- 6 files changed, 21 insertions(+), 22 deletions(-) diff --git a/Makefile b/Makefile index b2c8eecdbf6..1893b755d7c 100644 --- a/Makefile +++ b/Makefile @@ -300,7 +300,7 @@ create-management-cluster: $(KUSTOMIZE) $(ENVSUBST) $(KUBECTL) $(KIND) ## Create ./hack/create-custom-cloud-provider-config.sh # Deploy CAPI - timeout --foreground 300 bash -c "until curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.6/cluster-api-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f -; do sleep 5; done" + timeout --foreground 300 bash -c "until curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.7/cluster-api-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f -; do sleep 5; done" # Deploy CAAPH 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" @@ -743,7 +743,7 @@ $(CONVERSION_VERIFIER): go.mod cd $(TOOLS_DIR); go build -tags=tools -o $@ sigs.k8s.io/cluster-api/hack/tools/conversion-verifier $(CONTROLLER_GEN): ## Build controller-gen from tools folder. - GOBIN=$(TOOLS_BIN_DIR) $(GO_INSTALL) sigs.k8s.io/controller-tools/cmd/controller-gen $(CONTROLLER_GEN_BIN) $(CONTROLLER_GEN_VER) + GOTOOLCHAIN=go1.21.11 GOBIN=$(TOOLS_BIN_DIR) $(GO_INSTALL) sigs.k8s.io/controller-tools/cmd/controller-gen $(CONTROLLER_GEN_BIN) $(CONTROLLER_GEN_VER) $(CONVERSION_GEN): ## Build conversion-gen from tools folder. GOBIN=$(TOOLS_BIN_DIR) $(GO_INSTALL) k8s.io/code-generator/cmd/conversion-gen $(CONVERSION_GEN_BIN) $(CONVERSION_GEN_VER) diff --git a/Tiltfile b/Tiltfile index 61444fbb02e..c1cc5fc9cc5 100644 --- a/Tiltfile +++ b/Tiltfile @@ -20,9 +20,8 @@ settings = { "deploy_cert_manager": True, "preload_images_for_kind": True, "kind_cluster_name": "capz", - "capi_version": "v1.6.6", - "cert_manager_version": "v1.15.0", - "capi_version": "v1.6.6", + "capi_version": "v1.6.7", + "cert_manager_version": "v1.15.1", "kubernetes_version": "v1.28.3", "aks_kubernetes_version": "v1.28.3", "flatcar_version": "3374.2.1", diff --git a/go.mod b/go.mod index 657162eb097..711ad5aaae2 100644 --- a/go.mod +++ b/go.mod @@ -54,8 +54,8 @@ require ( k8s.io/kubectl v0.28.4 k8s.io/utils v0.0.0-20230726121419-3b25d923346b sigs.k8s.io/cloud-provider-azure v1.28.4 - sigs.k8s.io/cluster-api v1.6.6 - sigs.k8s.io/cluster-api/test v1.6.6 + sigs.k8s.io/cluster-api v1.6.7 + sigs.k8s.io/cluster-api/test v1.6.7 sigs.k8s.io/controller-runtime v0.16.5 sigs.k8s.io/kind v0.22.0 ) @@ -219,7 +219,7 @@ require ( sigs.k8s.io/yaml v1.4.0 // indirect ) -replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.6.6 +replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.6.7 // kube-openapi should match the version imported by CAPI. replace k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 diff --git a/go.sum b/go.sum index f2f17e5d694..edda0a36d74 100644 --- a/go.sum +++ b/go.sum @@ -999,10 +999,10 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 h1:trsWhjU5jZrx6U sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2/go.mod h1:+qG7ISXqCDVVcyO8hLn12AKVYYUjM7ftlqsqmrhMZE0= sigs.k8s.io/cloud-provider-azure v1.28.4 h1:TG/N0fjnZT+T53ymdoHvl3ft6QXvHcx8U7b6lcC1tC0= sigs.k8s.io/cloud-provider-azure v1.28.4/go.mod h1:xtm6ROi1sIRLF8otWohSfrwAkVHCOk+dJ9xvB4QAXUU= -sigs.k8s.io/cluster-api v1.6.6 h1:xXUHwM+4ZENzesQQSpRRtCRlBuW9fgknbgjwr0tHSfE= -sigs.k8s.io/cluster-api v1.6.6/go.mod h1:az1S/g/6umDjmh3ZWpjJWm23peUZOqEt3vv2FuOIZ3s= -sigs.k8s.io/cluster-api/test v1.6.6 h1:Xb+mVv+Wq+R1RR7wPZOcQpcAWcTGeOPaavYG0tBmUDQ= -sigs.k8s.io/cluster-api/test v1.6.6/go.mod h1:QimdqQoykUpYpUKkpIabhj8R34wAzw7akMwlCc65xeA= +sigs.k8s.io/cluster-api v1.6.7 h1:0EnMH0jwOgRdhmfLllvHmklDJQF5FGqcogPkzDypQuo= +sigs.k8s.io/cluster-api v1.6.7/go.mod h1:az1S/g/6umDjmh3ZWpjJWm23peUZOqEt3vv2FuOIZ3s= +sigs.k8s.io/cluster-api/test v1.6.7 h1:j8By9+ehnXJmynA9fZHzYPl8nbRWy3jl1mA7aCrEFME= +sigs.k8s.io/cluster-api/test v1.6.7/go.mod h1:QimdqQoykUpYpUKkpIabhj8R34wAzw7akMwlCc65xeA= sigs.k8s.io/controller-runtime v0.16.5 h1:yr1cEJbX08xsTW6XEIzT13KHHmIyX8Umvme2cULvFZw= sigs.k8s.io/controller-runtime v0.16.5/go.mod h1:j7bialYoSn142nv9sCOJmQgDXQXxnroFU4VnX/brVJ0= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= diff --git a/hack/install-cert-manager.sh b/hack/install-cert-manager.sh index 3e07d1251b9..f3acc672f3c 100755 --- a/hack/install-cert-manager.sh +++ b/hack/install-cert-manager.sh @@ -54,7 +54,7 @@ source "${REPO_ROOT}/hack/common-vars.sh" make --directory="${REPO_ROOT}" "${KUBECTL##*/}" ## Install cert manager and wait for availability -"${KUBECTL}" apply -f https://github.com/jetstack/cert-manager/releases/download/v1.15.0/cert-manager.yaml +"${KUBECTL}" apply -f https://github.com/jetstack/cert-manager/releases/download/v1.15.1/cert-manager.yaml "${KUBECTL}" wait --for=condition=Available --timeout=5m -n cert-manager deployment/cert-manager "${KUBECTL}" wait --for=condition=Available --timeout=5m -n cert-manager deployment/cert-manager-cainjector "${KUBECTL}" wait --for=condition=Available --timeout=5m -n cert-manager deployment/cert-manager-webhook diff --git a/test/e2e/config/azure-dev.yaml b/test/e2e/config/azure-dev.yaml index 6f878c3cb2d..cf046142842 100644 --- a/test/e2e/config/azure-dev.yaml +++ b/test/e2e/config/azure-dev.yaml @@ -3,11 +3,11 @@ managementClusterName: capz-e2e images: - name: ${MANAGER_IMAGE} loadBehavior: mustLoad - - name: registry.k8s.io/cluster-api/cluster-api-controller:v1.6.6 + - name: registry.k8s.io/cluster-api/cluster-api-controller:v1.6.7 loadBehavior: tryLoad - - name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.6.6 + - name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.6.7 loadBehavior: tryLoad - - name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.6.6 + - name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.6.7 loadBehavior: tryLoad - name: registry.k8s.io/cluster-api-helm/cluster-api-helm-controller:v0.1.1-alpha.1 loadBehavior: tryLoad @@ -25,8 +25,8 @@ providers: new: --metrics-addr=:8080 files: - sourcePath: "../data/shared/v1beta1/metadata.yaml" - - name: v1.6.6 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.6/core-components.yaml + - name: v1.6.7 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.7/core-components.yaml type: url contract: v1beta1 files: @@ -48,8 +48,8 @@ providers: new: --metrics-addr=:8080 files: - sourcePath: "../data/shared/v1beta1/metadata.yaml" - - name: v1.6.6 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.6/bootstrap-components.yaml + - name: v1.6.7 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.7/bootstrap-components.yaml type: url contract: v1beta1 files: @@ -70,8 +70,8 @@ providers: new: --metrics-addr=:8080 files: - sourcePath: "../data/shared/v1beta1/metadata.yaml" - - name: v1.6.6 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.6/control-plane-components.yaml + - name: v1.6.7 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.7/control-plane-components.yaml type: url contract: v1beta1 files: From 99d09d06bdabc6940a2f8dc9879517a7ec873963 Mon Sep 17 00:00:00 2001 From: Jon Huhn Date: Mon, 24 Jun 2024 16:16:21 +0000 Subject: [PATCH 2/2] bump codecov action to v4.5.0 --- .github/workflows/cover.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cover.yaml b/.github/workflows/cover.yaml index e1a1c92d275..3cb9fdaf043 100644 --- a/.github/workflows/cover.yaml +++ b/.github/workflows/cover.yaml @@ -23,7 +23,7 @@ jobs: with: go-version: '1.20' - run: "PATH=/usr/local/go/bin:$PATH make test-cover" - - uses: codecov/codecov-action@54bcd8715eee62d40e33596ef5e8f0f48dbbccab # v4.1.0 + - uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0 env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} with: