From 0fa96c731213a2a221453d79b480c63d410ab6d8 Mon Sep 17 00:00:00 2001 From: Christian Schlotter Date: Wed, 6 Dec 2023 15:04:06 +0100 Subject: [PATCH] bump capi v1.5 and v1.4 --- test/e2e/clusterctl_upgrade_test.go | 16 ++++++++-------- test/e2e/config/vsphere-ci.yaml | 24 ++++++++++++------------ test/e2e/config/vsphere-dev.yaml | 24 ++++++++++++------------ 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/test/e2e/clusterctl_upgrade_test.go b/test/e2e/clusterctl_upgrade_test.go index 013716da02..1e588ae866 100644 --- a/test/e2e/clusterctl_upgrade_test.go +++ b/test/e2e/clusterctl_upgrade_test.go @@ -33,10 +33,10 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (CAPV 1.8= SkipCleanup: skipCleanup, InitWithProvidersContract: "v1beta1", MgmtFlavor: "remote-management", - InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.3/clusterctl-{OS}-{ARCH}", - InitWithCoreProvider: "cluster-api:v1.5.3", - InitWithBootstrapProviders: []string{"kubeadm:v1.5.3"}, - InitWithControlPlaneProviders: []string{"kubeadm:v1.5.3"}, + InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.4/clusterctl-{OS}-{ARCH}", + InitWithCoreProvider: "cluster-api:v1.5.4", + InitWithBootstrapProviders: []string{"kubeadm:v1.5.4"}, + InitWithControlPlaneProviders: []string{"kubeadm:v1.5.4"}, InitWithInfrastructureProviders: []string{"vsphere:v1.8.4"}, InitWithRuntimeExtensionProviders: []string{}, InitWithKubernetesVersion: "v1.28.0", @@ -56,10 +56,10 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (CAPV 1.7= SkipCleanup: skipCleanup, InitWithProvidersContract: "v1beta1", MgmtFlavor: "remote-management", - InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.7/clusterctl-{OS}-{ARCH}", - InitWithCoreProvider: "cluster-api:v1.4.7", - InitWithBootstrapProviders: []string{"kubeadm:v1.4.7"}, - InitWithControlPlaneProviders: []string{"kubeadm:v1.4.7"}, + InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.9/clusterctl-{OS}-{ARCH}", + InitWithCoreProvider: "cluster-api:v1.4.9", + InitWithBootstrapProviders: []string{"kubeadm:v1.4.9"}, + InitWithControlPlaneProviders: []string{"kubeadm:v1.4.9"}, InitWithInfrastructureProviders: []string{"vsphere:v1.7.4"}, InitWithRuntimeExtensionProviders: []string{}, InitWithKubernetesVersion: "v1.27.3", diff --git a/test/e2e/config/vsphere-ci.yaml b/test/e2e/config/vsphere-ci.yaml index bc4a31e547..4d6a37b303 100644 --- a/test/e2e/config/vsphere-ci.yaml +++ b/test/e2e/config/vsphere-ci.yaml @@ -38,9 +38,9 @@ providers: replacements: - old: "imagePullPolicy: Always" new: "imagePullPolicy: IfNotPresent" - - name: v1.5.3 + - name: v1.5.4 # Use manifest from source files - value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.3/core-components.yaml" + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.4/core-components.yaml" type: "url" contract: v1beta1 files: @@ -48,9 +48,9 @@ providers: replacements: - old: "imagePullPolicy: Always" new: "imagePullPolicy: IfNotPresent" - - name: v1.4.7 + - name: v1.4.9 # Use manifest from source files - value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.7/core-components.yaml" + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.9/core-components.yaml" type: "url" contract: v1beta1 files: @@ -72,9 +72,9 @@ providers: replacements: - old: "imagePullPolicy: Always" new: "imagePullPolicy: IfNotPresent" - - name: v1.5.3 + - name: v1.5.4 # Use manifest from source files - value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.3/bootstrap-components.yaml" + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.4/bootstrap-components.yaml" type: "url" contract: v1beta1 files: @@ -82,9 +82,9 @@ providers: replacements: - old: "imagePullPolicy: Always" new: "imagePullPolicy: IfNotPresent" - - name: v1.4.7 + - name: v1.4.9 # Use manifest from source files - value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.7/bootstrap-components.yaml" + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.9/bootstrap-components.yaml" type: "url" contract: v1beta1 files: @@ -106,9 +106,9 @@ providers: replacements: - old: "imagePullPolicy: Always" new: "imagePullPolicy: IfNotPresent" - - name: v1.5.3 + - name: v1.5.4 # Use manifest from source files - value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.3/control-plane-components.yaml" + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.4/control-plane-components.yaml" type: "url" contract: v1beta1 files: @@ -116,9 +116,9 @@ providers: replacements: - old: "imagePullPolicy: Always" new: "imagePullPolicy: IfNotPresent" - - name: v1.4.7 + - name: v1.4.9 # Use manifest from source files - value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.7/control-plane-components.yaml" + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.9/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 33f5762ceb..dbc5caa752 100644 --- a/test/e2e/config/vsphere-dev.yaml +++ b/test/e2e/config/vsphere-dev.yaml @@ -41,9 +41,9 @@ providers: replacements: - old: "imagePullPolicy: Always" new: "imagePullPolicy: IfNotPresent" - - name: v1.5.3 + - name: v1.5.4 # Use manifest from source files - value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.3/core-components.yaml" + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.4/core-components.yaml" type: "url" contract: v1beta1 files: @@ -51,9 +51,9 @@ providers: replacements: - old: "imagePullPolicy: Always" new: "imagePullPolicy: IfNotPresent" - - name: v1.4.7 + - name: v1.4. # Use manifest from source files - value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.7/core-components.yaml" + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4./core-components.yaml" type: "url" contract: v1beta1 files: @@ -75,9 +75,9 @@ providers: replacements: - old: "imagePullPolicy: Always" new: "imagePullPolicy: IfNotPresent" - - name: v1.5.3 + - name: v1.5.4 # Use manifest from source files - value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.3/bootstrap-components.yaml" + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.4/bootstrap-components.yaml" type: "url" contract: v1beta1 files: @@ -85,9 +85,9 @@ providers: replacements: - old: "imagePullPolicy: Always" new: "imagePullPolicy: IfNotPresent" - - name: v1.4.7 + - name: v1.4. # Use manifest from source files - value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.7/bootstrap-components.yaml" + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4./bootstrap-components.yaml" type: "url" contract: v1beta1 files: @@ -109,9 +109,9 @@ providers: replacements: - old: "imagePullPolicy: Always" new: "imagePullPolicy: IfNotPresent" - - name: v1.5.3 + - name: v1.5.4 # Use manifest from source files - value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.3/control-plane-components.yaml" + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.4/control-plane-components.yaml" type: "url" contract: v1beta1 files: @@ -119,9 +119,9 @@ providers: replacements: - old: "imagePullPolicy: Always" new: "imagePullPolicy: IfNotPresent" - - name: v1.4.7 + - name: v1.4. # Use manifest from source files - value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.7/control-plane-components.yaml" + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4./control-plane-components.yaml" type: "url" contract: v1beta1 files: