Skip to content

Commit 86ac2e7

Browse files
committed
Update provider metadata and API upgrade test versions
1 parent 7194cbd commit 86ac2e7

File tree

5 files changed

+20
-17
lines changed

5 files changed

+20
-17
lines changed

test/e2e/config/azure-dev.yaml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -83,37 +83,37 @@ providers:
8383
- name: azure
8484
type: InfrastructureProvider
8585
versions:
86-
- name: v1.18.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.18.5/infrastructure-components.yaml
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
8888
type: url
8989
contract: v1beta1
9090
files:
9191
- sourcePath: "../data/shared/v1beta1_provider/metadata.yaml"
92-
- sourcePath: "../data/infrastructure-azure/v1.18.5/cluster-template-prow.yaml"
92+
- sourcePath: "../data/infrastructure-azure/v1.19.4/cluster-template-prow.yaml"
9393
targetName: "cluster-template.yaml"
94-
- sourcePath: "../data/infrastructure-azure/v1.18.5/cluster-template-prow-machine-and-machine-pool.yaml"
94+
- sourcePath: "../data/infrastructure-azure/v1.19.4/cluster-template-prow-machine-and-machine-pool.yaml"
9595
targetName: "cluster-template-machine-and-machine-pool.yaml"
96-
- sourcePath: "../data/infrastructure-azure/v1.18.5/cluster-template-aks.yaml"
96+
- sourcePath: "../data/infrastructure-azure/v1.19.4/cluster-template-aks.yaml"
9797
targetName: "cluster-template-aks.yaml"
9898
replacements:
9999
- old: "imagePullPolicy: Always"
100100
new: "imagePullPolicy: IfNotPresent"
101-
- name: v1.19.4 # 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.19.4/infrastructure-components.yaml
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
103103
type: url
104104
contract: v1beta1
105105
files:
106106
- sourcePath: "../data/shared/v1beta1_provider/metadata.yaml"
107-
- sourcePath: "../data/infrastructure-azure/v1.19.4/cluster-template-prow.yaml"
107+
- sourcePath: "../data/infrastructure-azure/v1.20.0/cluster-template-prow.yaml"
108108
targetName: "cluster-template.yaml"
109-
- sourcePath: "../data/infrastructure-azure/v1.19.4/cluster-template-prow-machine-and-machine-pool.yaml"
109+
- sourcePath: "../data/infrastructure-azure/v1.20.0/cluster-template-prow-machine-and-machine-pool.yaml"
110110
targetName: "cluster-template-machine-and-machine-pool.yaml"
111-
- sourcePath: "../data/infrastructure-azure/v1.19.4/cluster-template-aks.yaml"
111+
- sourcePath: "../data/infrastructure-azure/v1.20.0/cluster-template-aks.yaml"
112112
targetName: "cluster-template-aks.yaml"
113113
replacements:
114114
- old: "imagePullPolicy: Always"
115115
new: "imagePullPolicy: IfNotPresent"
116-
- name: v1.20.99 # "vNext"; use manifests from local source files
116+
- name: v1.21.99 # "vNext"; use manifests from local source files
117117
value: "${PWD}/config/default"
118118
contract: v1beta1
119119
files:
@@ -244,8 +244,8 @@ variables:
244244
AZURE_CNI_V1_MANIFEST_PATH: "${PWD}/templates/addons/azure-cni-v1.yaml"
245245
OLD_CAPI_UPGRADE_VERSION: "v1.9.7"
246246
LATEST_CAPI_UPGRADE_VERSION: "v1.10.2"
247-
OLD_PROVIDER_UPGRADE_VERSION: "v1.18.5"
248-
LATEST_PROVIDER_UPGRADE_VERSION: "v1.19.4"
247+
OLD_PROVIDER_UPGRADE_VERSION: "v1.19.4"
248+
LATEST_PROVIDER_UPGRADE_VERSION: "v1.20.0"
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}"

test/e2e/data/infrastructure-azure/v1.18.5/cluster-template-aks.yaml renamed to test/e2e/data/infrastructure-azure/v1.20.0/cluster-template-aks.yaml

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/e2e/data/shared/v1beta1_provider/metadata.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,6 @@ releaseSeries:
3737
- major: 1
3838
minor: 20
3939
contract: v1beta1
40+
- major: 1
41+
minor: 21
42+
contract: v1beta1

0 commit comments

Comments
 (0)