From a7cfd139a8c7d9369b74091c79b981140f679249 Mon Sep 17 00:00:00 2001 From: Christian Schlotter Date: Mon, 29 Jul 2024 09:09:18 +0200 Subject: [PATCH] Bump CAPV to from v1.8.10 and v1.7.7 for upgrade tests --- test/e2e/clusterctl_upgrade_test.go | 4 ++-- test/e2e/config/vsphere-ci.yaml | 26 +++++++++++++------------- test/e2e/config/vsphere-dev.yaml | 26 +++++++++++++------------- test/integration/integration-dev.yaml | 18 +++++++++--------- 4 files changed, 37 insertions(+), 37 deletions(-) diff --git a/test/e2e/clusterctl_upgrade_test.go b/test/e2e/clusterctl_upgrade_test.go index 45ed636c32..36039be424 100644 --- a/test/e2e/clusterctl_upgrade_test.go +++ b/test/e2e/clusterctl_upgrade_test.go @@ -37,7 +37,7 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (CAPV 1.8= InitWithCoreProvider: "cluster-api:v1.5.4", InitWithBootstrapProviders: []string{"kubeadm:v1.5.4"}, InitWithControlPlaneProviders: []string{"kubeadm:v1.5.4"}, - InitWithInfrastructureProviders: []string{"vsphere:v1.8.4"}, + InitWithInfrastructureProviders: []string{"vsphere:v1.8.10"}, InitWithRuntimeExtensionProviders: []string{}, // InitWithKubernetesVersion should be the highest kubernetes version supported by the init Cluster API version. // This is to guarantee that both, the old and new CAPI version, support the defined version. @@ -63,7 +63,7 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (CAPV 1.7= InitWithCoreProvider: "cluster-api:v1.4.9", InitWithBootstrapProviders: []string{"kubeadm:v1.4.9"}, InitWithControlPlaneProviders: []string{"kubeadm:v1.4.9"}, - InitWithInfrastructureProviders: []string{"vsphere:v1.7.4"}, + InitWithInfrastructureProviders: []string{"vsphere:v1.7.7"}, InitWithRuntimeExtensionProviders: []string{}, // InitWithKubernetesVersion should be the highest kubernetes version supported by the init Cluster API version. // This is to guarantee that both, the old and new CAPI version, support the defined version. diff --git a/test/e2e/config/vsphere-ci.yaml b/test/e2e/config/vsphere-ci.yaml index fcc29c57fd..1340bb2a6f 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.1 + - 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.1 + - 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.1 + - name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.6.7 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.1 + - name: v1.6.7 # Use manifest from source files - value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.1/core-components.yaml" + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.7/core-components.yaml" type: "url" contract: v1beta1 files: @@ -62,9 +62,9 @@ providers: - name: kubeadm type: BootstrapProvider versions: - - name: v1.6.1 + - name: v1.6.7 # Use manifest from source files - value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.1/bootstrap-components.yaml" + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.7/bootstrap-components.yaml" type: "url" contract: v1beta1 files: @@ -96,9 +96,9 @@ providers: - name: kubeadm type: ControlPlaneProvider versions: - - name: v1.6.1 + - name: v1.6.7 # Use manifest from source files - value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.1/control-plane-components.yaml" + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.7/control-plane-components.yaml" type: "url" contract: v1beta1 files: @@ -156,9 +156,9 @@ providers: - sourcePath: "../../../test/e2e/data/infrastructure-vsphere/main/cluster-template.yaml" - sourcePath: "../../../test/e2e/data/infrastructure-vsphere/main/clusterclass-quick-start.yaml" - sourcePath: "../data/shared/main/v1beta1_provider/metadata.yaml" - - name: v1.8.4 + - name: v1.8.10 # Use manifest from source files - value: "https://github.com/kubernetes-sigs/cluster-api-provider-vsphere/releases/download/v1.8.4/infrastructure-components.yaml" + value: "https://github.com/kubernetes-sigs/cluster-api-provider-vsphere/releases/download/v1.8.10/infrastructure-components.yaml" type: "url" contract: v1beta1 files: @@ -166,9 +166,9 @@ providers: - sourcePath: "../../../test/e2e/data/infrastructure-vsphere/v1.8/cluster-template-workload.yaml" - sourcePath: "../../../test/e2e/data/infrastructure-vsphere/v1.8/clusterclass-quick-start.yaml" - sourcePath: "../data/shared/v1.8/v1beta1_provider/metadata.yaml" - - name: v1.7.4 + - name: v1.7.7 # Use manifest from source files - value: "https://github.com/kubernetes-sigs/cluster-api-provider-vsphere/releases/download/v1.7.4/infrastructure-components.yaml" + value: "https://github.com/kubernetes-sigs/cluster-api-provider-vsphere/releases/download/v1.7.7/infrastructure-components.yaml" type: "url" contract: v1beta1 files: diff --git a/test/e2e/config/vsphere-dev.yaml b/test/e2e/config/vsphere-dev.yaml index f553f6cdb2..7bae3e516f 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.1 + - 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.1 + - 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.1 + - name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.6.7 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.1 + - name: v1.6.7 # Use manifest from source files - value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.1/core-components.yaml" + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.7/core-components.yaml" type: "url" contract: v1beta1 files: @@ -65,9 +65,9 @@ providers: - name: kubeadm type: BootstrapProvider versions: - - name: v1.6.1 + - name: v1.6.7 # Use manifest from source files - value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.1/bootstrap-components.yaml" + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.7/bootstrap-components.yaml" type: "url" contract: v1beta1 files: @@ -99,9 +99,9 @@ providers: - name: kubeadm type: ControlPlaneProvider versions: - - name: v1.6.1 + - name: v1.6.7 # Use manifest from source files - value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.1/control-plane-components.yaml" + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.7/control-plane-components.yaml" type: "url" contract: v1beta1 files: @@ -159,9 +159,9 @@ providers: - sourcePath: "../../../test/e2e/data/infrastructure-vsphere/main/cluster-template.yaml" - sourcePath: "../../../test/e2e/data/infrastructure-vsphere/main/clusterclass-quick-start.yaml" - sourcePath: "../data/shared/main/v1beta1_provider/metadata.yaml" - - name: v1.8.4 + - name: v1.8.10 # Use manifest from source files - value: "https://github.com/kubernetes-sigs/cluster-api-provider-vsphere/releases/download/v1.8.4/infrastructure-components.yaml" + value: "https://github.com/kubernetes-sigs/cluster-api-provider-vsphere/releases/download/v1.8.10/infrastructure-components.yaml" type: "url" contract: v1beta1 files: @@ -169,9 +169,9 @@ providers: - sourcePath: "../../../test/e2e/data/infrastructure-vsphere/v1.8/cluster-template-workload.yaml" - sourcePath: "../../../test/e2e/data/infrastructure-vsphere/v1.8/clusterclass-quick-start.yaml" - sourcePath: "../data/shared/v1.8/v1beta1_provider/metadata.yaml" - - name: v1.7.4 + - name: v1.7.7 # Use manifest from source files - value: "https://github.com/kubernetes-sigs/cluster-api-provider-vsphere/releases/download/v1.7.4/infrastructure-components.yaml" + value: "https://github.com/kubernetes-sigs/cluster-api-provider-vsphere/releases/download/v1.7.7/infrastructure-components.yaml" type: "url" contract: v1beta1 files: diff --git a/test/integration/integration-dev.yaml b/test/integration/integration-dev.yaml index e4198b6ac6..cc3c386fa8 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.1 + - 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.1 + - 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.1 + - name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.6.7 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.1 + - name: v1.6.7 # Use manifest from source files - value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.1/core-components.yaml" + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.7/core-components.yaml" type: "url" contract: v1beta1 files: @@ -44,9 +44,9 @@ providers: - name: kubeadm type: BootstrapProvider versions: - - name: v1.6.1 + - name: v1.6.7 # Use manifest from source files - value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.1/bootstrap-components.yaml" + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.7/bootstrap-components.yaml" type: "url" contract: v1beta1 files: @@ -58,9 +58,9 @@ providers: - name: kubeadm type: ControlPlaneProvider versions: - - name: v1.6.1 + - name: v1.6.7 # Use manifest from source files - value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.1/control-plane-components.yaml" + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.7/control-plane-components.yaml" type: "url" contract: v1beta1 files: