Skip to content

Commit dcf6cb6

Browse files
authored
Merge pull request #5739 from mboersma/bump-test-versions
Update CAPI and CAPZ versions in e2e testing
2 parents 2acf550 + 98cb775 commit dcf6cb6

7 files changed

+19
-19
lines changed

test/e2e/config/azure-dev.yaml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ providers:
1616
- name: cluster-api
1717
type: CoreProvider
1818
versions:
19-
- name: v1.9.7 # latest patch of earliest minor in supported v1beta1 releases; this is used for v1beta1 old --> v1beta1 latest clusterctl upgrades test only.
20-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.7/core-components.yaml"
19+
- name: v1.9.9 # latest patch of earliest minor in supported v1beta1 releases; this is used for v1beta1 old --> v1beta1 latest clusterctl upgrades test only.
20+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.9/core-components.yaml"
2121
type: "url"
2222
contract: v1beta1
2323
replacements:
@@ -39,8 +39,8 @@ providers:
3939
- name: kubeadm
4040
type: BootstrapProvider
4141
versions:
42-
- name: v1.9.7 # latest patch of earliest minor in supported v1beta1 releases; this is used for v1beta1 old --> v1beta1 latest clusterctl upgrades test only.
43-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.7/bootstrap-components.yaml"
42+
- name: v1.9.9 # latest patch of earliest minor in supported v1beta1 releases; this is used for v1beta1 old --> v1beta1 latest clusterctl upgrades test only.
43+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.9/bootstrap-components.yaml"
4444
type: "url"
4545
contract: v1beta1
4646
replacements:
@@ -61,8 +61,8 @@ providers:
6161
- name: kubeadm
6262
type: ControlPlaneProvider
6363
versions:
64-
- name: v1.9.7 # latest patch of earliest minor in supported v1beta1 releases; this is used for v1beta1 old --> v1beta1 latest clusterctl upgrades test only.
65-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.7/control-plane-components.yaml"
64+
- name: v1.9.9 # latest patch of earliest minor in supported v1beta1 releases; this is used for v1beta1 old --> v1beta1 latest clusterctl upgrades test only.
65+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.9/control-plane-components.yaml"
6666
type: "url"
6767
contract: v1beta1
6868
replacements:
@@ -83,32 +83,32 @@ providers:
8383
- name: azure
8484
type: InfrastructureProvider
8585
versions:
86-
- name: v1.19.4 # latest patch of earliest minor in supported v1beta1 releases; this is used for v1beta1 old --> v1beta1 latest clusterctl upgrades test only.
87-
value: https://github.com/kubernetes-sigs/cluster-api-provider-azure/releases/download/v1.19.4/infrastructure-components.yaml
86+
- name: v1.19.5 # latest patch of earliest minor in supported v1beta1 releases; this is used for v1beta1 old --> v1beta1 latest clusterctl upgrades test only.
87+
value: https://github.com/kubernetes-sigs/cluster-api-provider-azure/releases/download/v1.19.5/infrastructure-components.yaml
8888
type: url
8989
contract: v1beta1
9090
files:
9191
- sourcePath: "../data/shared/v1beta1_provider/metadata.yaml"
92-
- sourcePath: "../data/infrastructure-azure/v1.19.4/cluster-template-prow.yaml"
92+
- sourcePath: "../data/infrastructure-azure/v1.19.5/cluster-template-prow.yaml"
9393
targetName: "cluster-template.yaml"
94-
- sourcePath: "../data/infrastructure-azure/v1.19.4/cluster-template-prow-machine-and-machine-pool.yaml"
94+
- sourcePath: "../data/infrastructure-azure/v1.19.5/cluster-template-prow-machine-and-machine-pool.yaml"
9595
targetName: "cluster-template-machine-and-machine-pool.yaml"
96-
- sourcePath: "../data/infrastructure-azure/v1.19.4/cluster-template-aks.yaml"
96+
- sourcePath: "../data/infrastructure-azure/v1.19.5/cluster-template-aks.yaml"
9797
targetName: "cluster-template-aks.yaml"
9898
replacements:
9999
- old: "imagePullPolicy: Always"
100100
new: "imagePullPolicy: IfNotPresent"
101-
- name: v1.20.0 # latest patch of latest minor in supported v1beta1 releases; this is used for v1beta1 latest --> v1beta1 current clusterctl upgrades test only.
102-
value: https://github.com/kubernetes-sigs/cluster-api-provider-azure/releases/download/v1.20.0/infrastructure-components.yaml
101+
- name: v1.20.1 # latest patch of latest minor in supported v1beta1 releases; this is used for v1beta1 latest --> v1beta1 current clusterctl upgrades test only.
102+
value: https://github.com/kubernetes-sigs/cluster-api-provider-azure/releases/download/v1.20.1/infrastructure-components.yaml
103103
type: url
104104
contract: v1beta1
105105
files:
106106
- sourcePath: "../data/shared/v1beta1_provider/metadata.yaml"
107-
- sourcePath: "../data/infrastructure-azure/v1.20.0/cluster-template-prow.yaml"
107+
- sourcePath: "../data/infrastructure-azure/v1.20.1/cluster-template-prow.yaml"
108108
targetName: "cluster-template.yaml"
109-
- sourcePath: "../data/infrastructure-azure/v1.20.0/cluster-template-prow-machine-and-machine-pool.yaml"
109+
- sourcePath: "../data/infrastructure-azure/v1.20.1/cluster-template-prow-machine-and-machine-pool.yaml"
110110
targetName: "cluster-template-machine-and-machine-pool.yaml"
111-
- sourcePath: "../data/infrastructure-azure/v1.20.0/cluster-template-aks.yaml"
111+
- sourcePath: "../data/infrastructure-azure/v1.20.1/cluster-template-aks.yaml"
112112
targetName: "cluster-template-aks.yaml"
113113
replacements:
114114
- old: "imagePullPolicy: Always"
@@ -242,10 +242,10 @@ variables:
242242
KUBETEST_CONFIGURATION: "./data/kubetest/conformance.yaml"
243243
WINDOWS_CONTAINERD_URL: "${WINDOWS_CONTAINERD_URL:-}"
244244
AZURE_CNI_V1_MANIFEST_PATH: "${PWD}/templates/addons/azure-cni-v1.yaml"
245-
OLD_CAPI_UPGRADE_VERSION: "v1.9.7"
245+
OLD_CAPI_UPGRADE_VERSION: "v1.9.9"
246246
LATEST_CAPI_UPGRADE_VERSION: "v1.10.3"
247-
OLD_PROVIDER_UPGRADE_VERSION: "v1.19.4"
248-
LATEST_PROVIDER_UPGRADE_VERSION: "v1.20.0"
247+
OLD_PROVIDER_UPGRADE_VERSION: "v1.19.5"
248+
LATEST_PROVIDER_UPGRADE_VERSION: "v1.20.1"
249249
OLD_CAAPH_UPGRADE_VERSION: "v0.1.0-alpha.10"
250250
LATEST_CAAPH_UPGRADE_VERSION: "v0.2.5"
251251
CI_RG: "${CI_RG:-capz-ci}"

0 commit comments

Comments
 (0)