Skip to content

Commit

Permalink
Merge pull request #8364 from killianmuldoon/pr-1-4-update-e2e-upgrad…
Browse files Browse the repository at this point in the history 
…e-versions

🌱 Update e2e upgrade test versions
  • Loading branch information
@k8s-ci-robot
k8s-ci-robot authored Mar 24, 2023
2 parents 229315e + 96a2717 commit 42a69a5
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 31 deletions.
30 changes: 15 additions & 15 deletions test/e2e/clusterctl_upgrade_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ var _ = Describe("When testing clusterctl upgrades (v1.0=>current)", func() {
SkipCleanup: skipCleanup,
InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.0.5/clusterctl-{OS}-{ARCH}",
// We have to pin the providers because with `InitWithProvidersContract` the test would
// use the latest version for the contract (which is v1.3.0 for v1beta1).
// use the latest version for the contract (which is v1.3.X for v1beta1).
InitWithCoreProvider: "cluster-api:v1.0.5",
InitWithBootstrapProviders: []string{"kubeadm:v1.0.5"},
InitWithControlPlaneProviders: []string{"kubeadm:v1.0.5"},
Expand Down Expand Up @@ -131,13 +131,13 @@ var _ = Describe("When testing clusterctl upgrades (v1.2=>current)", func() {
BootstrapClusterProxy: bootstrapClusterProxy,
ArtifactFolder: artifactFolder,
SkipCleanup: skipCleanup,
InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.7/clusterctl-{OS}-{ARCH}",
InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.11/clusterctl-{OS}-{ARCH}",
// We have to pin the providers because with `InitWithProvidersContract` the test would
// use the latest version for the contract (which is v1.3.0 for v1beta1).
InitWithCoreProvider: "cluster-api:v1.2.8",
InitWithBootstrapProviders: []string{"kubeadm:v1.2.8"},
InitWithControlPlaneProviders: []string{"kubeadm:v1.2.8"},
InitWithInfrastructureProviders: []string{"docker:v1.2.8"},
// use the latest version for the contract (which is v1.3.X for v1beta1).
InitWithCoreProvider: "cluster-api:v1.2.11",
InitWithBootstrapProviders: []string{"kubeadm:v1.2.11"},
InitWithControlPlaneProviders: []string{"kubeadm:v1.2.11"},
InitWithInfrastructureProviders: []string{"docker:v1.2.11"},
// We have to set this to an empty array as clusterctl v1.2 doesn't support
// runtime extension providers. If we don't do this the test will automatically
// try to deploy the latest version of our test-extension from docker.yaml.
Expand Down Expand Up @@ -170,13 +170,13 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.2=>cur
BootstrapClusterProxy: bootstrapClusterProxy,
ArtifactFolder: artifactFolder,
SkipCleanup: skipCleanup,
InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.7/clusterctl-{OS}-{ARCH}",
InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.11/clusterctl-{OS}-{ARCH}",
// We have to pin the providers because with `InitWithProvidersContract` the test would
// use the latest version for the contract (which is v1.3.0 for v1beta1).
InitWithCoreProvider: "cluster-api:v1.2.8",
InitWithBootstrapProviders: []string{"kubeadm:v1.2.8"},
InitWithControlPlaneProviders: []string{"kubeadm:v1.2.8"},
InitWithInfrastructureProviders: []string{"docker:v1.2.8"},
// use the latest version for the contract (which is v1.3.X for v1beta1).
InitWithCoreProvider: "cluster-api:v1.2.11",
InitWithBootstrapProviders: []string{"kubeadm:v1.2.11"},
InitWithControlPlaneProviders: []string{"kubeadm:v1.2.11"},
InitWithInfrastructureProviders: []string{"docker:v1.2.11"},
// We have to set this to an empty array as clusterctl v1.2 doesn't support
// runtime extension providers. If we don't do this the test will automatically
// try to deploy the latest version of our test-extension from docker.yaml.
Expand Down Expand Up @@ -209,7 +209,7 @@ var _ = Describe("When testing clusterctl upgrades (v1.3=>current)", func() {
BootstrapClusterProxy: bootstrapClusterProxy,
ArtifactFolder: artifactFolder,
SkipCleanup: skipCleanup,
InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.0/clusterctl-{OS}-{ARCH}",
InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.5/clusterctl-{OS}-{ARCH}",
InitWithProvidersContract: "v1beta1",
InitWithKubernetesVersion: "v1.26.0",
MgmtFlavor: "topology",
Expand Down Expand Up @@ -237,7 +237,7 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.3=>cur
BootstrapClusterProxy: bootstrapClusterProxy,
ArtifactFolder: artifactFolder,
SkipCleanup: skipCleanup,
InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.0/clusterctl-{OS}-{ARCH}",
InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.5/clusterctl-{OS}-{ARCH}",
InitWithProvidersContract: "v1beta1",
InitWithKubernetesVersion: "v1.26.0",
MgmtFlavor: "topology",
Expand Down
32 changes: 16 additions & 16 deletions test/e2e/config/docker.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,17 +58,17 @@ providers:
new: --metrics-addr=:8080
files:
- sourcePath: "../data/shared/v1.0/metadata.yaml"
- name: v1.2.8 # supported release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.8/core-components.yaml"
- name: v1.2.11 # supported release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.11/core-components.yaml"
type: "url"
contract: v1beta1
replacements:
- old: --metrics-addr=127.0.0.1:8080
new: --metrics-addr=:8080
files:
- sourcePath: "../data/shared/v1.2/metadata.yaml"
- name: v1.3.0 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.0/core-components.yaml"
- name: v1.3.5 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.5/core-components.yaml"
type: "url"
contract: v1beta1
replacements:
Expand Down Expand Up @@ -114,17 +114,17 @@ providers:
new: --metrics-addr=:8080
files:
- sourcePath: "../data/shared/v1.0/metadata.yaml"
- name: v1.2.8 # supported release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.8/bootstrap-components.yaml"
- name: v1.2.11 # supported release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.11/bootstrap-components.yaml"
type: "url"
contract: v1beta1
replacements:
- old: --metrics-addr=127.0.0.1:8080
new: --metrics-addr=:8080
files:
- sourcePath: "../data/shared/v1.2/metadata.yaml"
- name: v1.3.0 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.0/bootstrap-components.yaml"
- name: v1.3.5 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.5/bootstrap-components.yaml"
type: "url"
contract: v1beta1
replacements:
Expand Down Expand Up @@ -170,17 +170,17 @@ providers:
new: --metrics-addr=:8080
files:
- sourcePath: "../data/shared/v1.0/metadata.yaml"
- name: v1.2.8 # supported release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.8/control-plane-components.yaml"
- name: v1.2.11 # supported release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.11/control-plane-components.yaml"
type: "url"
contract: v1beta1
replacements:
- old: --metrics-addr=127.0.0.1:8080
new: --metrics-addr=:8080
files:
- sourcePath: "../data/shared/v1.2/metadata.yaml"
- name: v1.3.0 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.0/control-plane-components.yaml"
- name: v1.3.5 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.5/control-plane-components.yaml"
type: "url"
contract: v1beta1
replacements:
Expand Down Expand Up @@ -229,8 +229,8 @@ providers:
files:
- sourcePath: "../data/shared/v1.0/metadata.yaml"
- sourcePath: "../data/infrastructure-docker/v1.0/cluster-template.yaml"
- name: v1.2.8 # supported release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.8/infrastructure-components-development.yaml"
- name: v1.2.11 # supported release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.11/infrastructure-components-development.yaml"
type: "url"
contract: v1beta1
replacements:
Expand All @@ -241,8 +241,8 @@ providers:
- sourcePath: "../data/infrastructure-docker/v1.2/cluster-template.yaml"
- sourcePath: "../data/infrastructure-docker/v1.2/cluster-template-topology.yaml"
- sourcePath: "../data/infrastructure-docker/v1.2/clusterclass-quick-start.yaml"
- name: v1.3.0 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.0/infrastructure-components-development.yaml"
- name: v1.3.5 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.5/infrastructure-components-development.yaml"
type: "url"
contract: v1beta1
replacements:
Expand Down

0 comments on commit 42a69a5

Please sign in to comment.