From 9fdeab9c2fc0d963ccd51d793610c83737cfd175 Mon Sep 17 00:00:00 2001 From: Christian Schlotter Date: Wed, 6 Dec 2023 08:55:26 +0100 Subject: [PATCH] Bump CAPI to v1.6.0 --- Makefile | 2 +- go.mod | 4 ++-- go.sum | 8 ++++---- test/e2e/config/vsphere-ci.yaml | 18 +++++++++--------- test/e2e/config/vsphere-dev.yaml | 18 +++++++++--------- test/integration/integration-dev.yaml | 18 +++++++++--------- 6 files changed, 34 insertions(+), 34 deletions(-) diff --git a/Makefile b/Makefile index a93698e0f8..495fa190da 100644 --- a/Makefile +++ b/Makefile @@ -179,7 +179,7 @@ IMPORT_BOSS_VER := v0.28.1 IMPORT_BOSS := $(abspath $(TOOLS_BIN_DIR)/$(IMPORT_BOSS_BIN)) IMPORT_BOSS_PKG := k8s.io/code-generator/cmd/import-boss -CAPI_HACK_TOOLS_VER := cb515e4bfa8a8550b92bff579ac644e0144fedb9 # Note: this is the commit ID of the dependend CAPI release tag, currently v1.6.0-rc.1 +CAPI_HACK_TOOLS_VER := 14efefeb46dbe8d0cd0f5b7d1718e00ec58fc079 # Note: this is the commit ID of the dependend CAPI release tag, currently v1.6.0 CONVERSION_VERIFIER_VER := $(CAPI_HACK_TOOLS_VER) CONVERSION_VERIFIER_BIN := conversion-verifier diff --git a/go.mod b/go.mod index 6ce7d88b40..77dcd0a9ec 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module sigs.k8s.io/cluster-api-provider-vsphere go 1.20 -replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.6.0-rc.1 +replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.6.0 require ( github.com/blang/semver/v4 v4.0.0 @@ -33,7 +33,7 @@ require ( k8s.io/klog/v2 v2.100.1 k8s.io/utils v0.0.0-20230505201702-9f6742963106 sigs.k8s.io/cluster-api v0.0.0-00010101000000-000000000000 - sigs.k8s.io/cluster-api/test v1.6.0-rc.1 + sigs.k8s.io/cluster-api/test v1.6.0 sigs.k8s.io/controller-runtime v0.16.3 sigs.k8s.io/kind v0.20.0 sigs.k8s.io/kustomize/api v0.15.0 diff --git a/go.sum b/go.sum index 347baebbdb..67e6ee0e43 100644 --- a/go.sum +++ b/go.sum @@ -1241,10 +1241,10 @@ rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 h1:trsWhjU5jZrx6UvFu4WzQDrN7Pga4a7Qg+zcfcj64PA= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2/go.mod h1:+qG7ISXqCDVVcyO8hLn12AKVYYUjM7ftlqsqmrhMZE0= -sigs.k8s.io/cluster-api v1.6.0-rc.1 h1:Mnp73o0L++Ev1BB9Cpaxv0Hfq0puEm/E19wJdPRU3z0= -sigs.k8s.io/cluster-api v1.6.0-rc.1/go.mod h1:LB7u/WxiWj4/bbpHNOa1oQ8nq0MQ5iYlD0pGfRSBGLI= -sigs.k8s.io/cluster-api/test v1.6.0-rc.1 h1:NnWz+kiB67vOA7hsmtR6d08pRUmY4JUiLTL2EDTHMw8= -sigs.k8s.io/cluster-api/test v1.6.0-rc.1/go.mod h1:DJtbkrnrH77cd3PnXeKCQDMtCGVCrHZHPOjMvEsLB2U= +sigs.k8s.io/cluster-api v1.6.0 h1:2bhVSnUbtWI8taCjd9lGiHExsRUpKf7Z1fXqi/IwYx4= +sigs.k8s.io/cluster-api v1.6.0/go.mod h1:LB7u/WxiWj4/bbpHNOa1oQ8nq0MQ5iYlD0pGfRSBGLI= +sigs.k8s.io/cluster-api/test v1.6.0 h1:hvqUpSYxXCvs4FiEfsDpFZAfZ7i4kkP/59mVdFHlzSI= +sigs.k8s.io/cluster-api/test v1.6.0/go.mod h1:DJtbkrnrH77cd3PnXeKCQDMtCGVCrHZHPOjMvEsLB2U= sigs.k8s.io/controller-runtime v0.9.0/go.mod h1:TgkfvrhhEw3PlI0BRL/5xM+89y3/yc0ZDfdbTl84si8= sigs.k8s.io/controller-runtime v0.16.3 h1:2TuvuokmfXvDUamSx1SuAOO3eTyye+47mJCigwG62c4= sigs.k8s.io/controller-runtime v0.16.3/go.mod h1:j7bialYoSn142nv9sCOJmQgDXQXxnroFU4VnX/brVJ0= diff --git a/test/e2e/config/vsphere-ci.yaml b/test/e2e/config/vsphere-ci.yaml index 6c435d18d9..f348896a07 100644 --- a/test/e2e/config/vsphere-ci.yaml +++ b/test/e2e/config/vsphere-ci.yaml @@ -8,11 +8,11 @@ # For creating local images, run ./hack/e2e.sh images: - - name: registry.k8s.io/cluster-api/cluster-api-controller:v1.6.0-rc.1 + - name: registry.k8s.io/cluster-api/cluster-api-controller:v1.6.0 loadBehavior: tryLoad - - name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.6.0-rc.1 + - name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.6.0 loadBehavior: tryLoad - - name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.6.0-rc.1 + - name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.6.0 loadBehavior: tryLoad - name: gcr.io/k8s-staging-cluster-api/capv-manager:e2e loadBehavior: mustLoad @@ -28,9 +28,9 @@ providers: - name: cluster-api type: CoreProvider versions: - - name: v1.6.0-rc.1 + - name: v1.6.0 # Use manifest from source files - value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.0-rc.1/core-components.yaml" + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.0/core-components.yaml" type: "url" contract: v1beta1 files: @@ -64,9 +64,9 @@ providers: - name: kubeadm type: BootstrapProvider versions: - - name: v1.6.0-rc.1 + - name: v1.6.0 # Use manifest from source files - value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.0-rc.1/bootstrap-components.yaml" + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.0/bootstrap-components.yaml" type: "url" contract: v1beta1 files: @@ -98,9 +98,9 @@ providers: - name: kubeadm type: ControlPlaneProvider versions: - - name: v1.6.0-rc.1 + - name: v1.6.0 # Use manifest from source files - value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.0-rc.1/control-plane-components.yaml" + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.0/control-plane-components.yaml" type: "url" contract: v1beta1 files: diff --git a/test/e2e/config/vsphere-dev.yaml b/test/e2e/config/vsphere-dev.yaml index efeb9b9c3e..e2ca53b417 100644 --- a/test/e2e/config/vsphere-dev.yaml +++ b/test/e2e/config/vsphere-dev.yaml @@ -11,11 +11,11 @@ # - from the CAPV repository root, `make e2e` to build the vsphere provider image and run e2e tests. images: - - name: registry.k8s.io/cluster-api/cluster-api-controller:v1.6.0-rc.1 + - name: registry.k8s.io/cluster-api/cluster-api-controller:v1.6.0 loadBehavior: tryLoad - - name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.6.0-rc.1 + - name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.6.0 loadBehavior: tryLoad - - name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.6.0-rc.1 + - name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.6.0 loadBehavior: tryLoad - name: gcr.io/k8s-staging-cluster-api/capv-manager:e2e loadBehavior: mustLoad @@ -31,9 +31,9 @@ providers: - name: cluster-api type: CoreProvider versions: - - name: v1.6.0-rc.1 + - name: v1.6.0 # Use manifest from source files - value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.0-rc.1/core-components.yaml" + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.0/core-components.yaml" type: "url" contract: v1beta1 files: @@ -67,9 +67,9 @@ providers: - name: kubeadm type: BootstrapProvider versions: - - name: v1.6.0-rc.1 + - name: v1.6.0 # Use manifest from source files - value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.0-rc.1/bootstrap-components.yaml" + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.0/bootstrap-components.yaml" type: "url" contract: v1beta1 files: @@ -101,9 +101,9 @@ providers: - name: kubeadm type: ControlPlaneProvider versions: - - name: v1.6.0-rc.1 + - name: v1.6.0 # Use manifest from source files - value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.0-rc.1/control-plane-components.yaml" + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.0/control-plane-components.yaml" type: "url" contract: v1beta1 files: diff --git a/test/integration/integration-dev.yaml b/test/integration/integration-dev.yaml index a3bd83b698..380c72a8d6 100644 --- a/test/integration/integration-dev.yaml +++ b/test/integration/integration-dev.yaml @@ -11,11 +11,11 @@ # - from the CAPV repository root, `make e2e` to build the vsphere provider image and run e2e tests. images: - - name: registry.k8s.io/cluster-api/cluster-api-controller:v1.6.0-rc.1 + - name: registry.k8s.io/cluster-api/cluster-api-controller:v1.6.0 loadBehavior: tryLoad - - name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.6.0-rc.1 + - name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.6.0 loadBehavior: tryLoad - - name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.6.0-rc.1 + - name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.6.0 loadBehavior: tryLoad - name: gcr.io/k8s-staging-cluster-api/capv-manager:e2e loadBehavior: mustLoad @@ -30,9 +30,9 @@ providers: - name: cluster-api type: CoreProvider versions: - - name: v1.6.0-rc.1 + - name: v1.6.0 # Use manifest from source files - value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.0-rc.1/core-components.yaml" + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.0/core-components.yaml" type: "url" contract: v1beta1 files: @@ -44,9 +44,9 @@ providers: - name: kubeadm type: BootstrapProvider versions: - - name: v1.6.0-rc.1 + - name: v1.6.0 # Use manifest from source files - value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.0-rc.1/bootstrap-components.yaml" + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.0/bootstrap-components.yaml" type: "url" contract: v1beta1 files: @@ -58,9 +58,9 @@ providers: - name: kubeadm type: ControlPlaneProvider versions: - - name: v1.6.0-rc.1 + - name: v1.6.0 # Use manifest from source files - value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.0-rc.1/control-plane-components.yaml" + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.0/control-plane-components.yaml" type: "url" contract: v1beta1 files: