Skip to content

Commit b632343

Browse files
authored
Merge pull request #5400 from willie-yao/update-test-1.18
Update provider metadata and API upgrade test versions
2 parents 896543f + 00809a6 commit b632343

File tree

6 files changed

+14
-11
lines changed

6 files changed

+14
-11
lines changed

test/e2e/config/azure-dev.yaml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -83,33 +83,33 @@ providers:
8383
- name: azure
8484
type: InfrastructureProvider
8585
versions:
86-
- name: v1.16.3 # 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.16.3/infrastructure-components.yaml
86+
- name: v1.17.3 # 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.17.3/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.16.3/cluster-template-prow.yaml"
92+
- sourcePath: "../data/infrastructure-azure/v1.17.3/cluster-template-prow.yaml"
9393
targetName: "cluster-template.yaml"
94-
- sourcePath: "../data/infrastructure-azure/v1.16.3/cluster-template-prow-machine-and-machine-pool.yaml"
94+
- sourcePath: "../data/infrastructure-azure/v1.17.3/cluster-template-prow-machine-and-machine-pool.yaml"
9595
targetName: "cluster-template-machine-and-machine-pool.yaml"
9696
replacements:
9797
- old: "imagePullPolicy: Always"
9898
new: "imagePullPolicy: IfNotPresent"
99-
- name: v1.17.1 # latest patch of latest minor in supported v1beta1 releases; this is used for v1beta1 latest --> v1beta1 current clusterctl upgrades test only.
100-
value: https://github.com/kubernetes-sigs/cluster-api-provider-azure/releases/download/v1.17.1/infrastructure-components.yaml
99+
- name: v1.18.0 # latest patch of latest minor in supported v1beta1 releases; this is used for v1beta1 latest --> v1beta1 current clusterctl upgrades test only.
100+
value: https://github.com/kubernetes-sigs/cluster-api-provider-azure/releases/download/v1.18.0/infrastructure-components.yaml
101101
type: url
102102
contract: v1beta1
103103
files:
104104
- sourcePath: "../data/shared/v1beta1_provider/metadata.yaml"
105-
- sourcePath: "../data/infrastructure-azure/v1.17.1/cluster-template-prow.yaml"
105+
- sourcePath: "../data/infrastructure-azure/v1.18.0/cluster-template-prow.yaml"
106106
targetName: "cluster-template.yaml"
107-
- sourcePath: "../data/infrastructure-azure/v1.17.1/cluster-template-prow-machine-and-machine-pool.yaml"
107+
- sourcePath: "../data/infrastructure-azure/v1.18.0/cluster-template-prow-machine-and-machine-pool.yaml"
108108
targetName: "cluster-template-machine-and-machine-pool.yaml"
109109
replacements:
110110
- old: "imagePullPolicy: Always"
111111
new: "imagePullPolicy: IfNotPresent"
112-
- name: v1.18.99 # "vNext"; use manifests from local source files
112+
- name: v1.19.99 # "vNext"; use manifests from local source files
113113
value: "${PWD}/config/default"
114114
contract: v1beta1
115115
files:
@@ -236,8 +236,8 @@ variables:
236236
AZURE_CNI_V1_MANIFEST_PATH: "${PWD}/templates/addons/azure-cni-v1.yaml"
237237
OLD_CAPI_UPGRADE_VERSION: "v1.8.9"
238238
LATEST_CAPI_UPGRADE_VERSION: "v1.9.4"
239-
OLD_PROVIDER_UPGRADE_VERSION: "v1.16.3"
240-
LATEST_PROVIDER_UPGRADE_VERSION: "v1.17.1"
239+
OLD_PROVIDER_UPGRADE_VERSION: "v1.17.3"
240+
LATEST_PROVIDER_UPGRADE_VERSION: "v1.18.0"
241241
OLD_CAAPH_UPGRADE_VERSION: "v0.1.0-alpha.10"
242242
LATEST_CAAPH_UPGRADE_VERSION: "v0.2.5"
243243
CI_RG: capz-ci

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,6 @@ releaseSeries:
3131
- major: 1
3232
minor: 18
3333
contract: v1beta1
34+
- major: 1
35+
minor: 19
36+
contract: v1beta1

0 commit comments

Comments
 (0)