Skip to content

Commit fee302e

Browse files
chrischdichrischdi
authored
e2e: fix config metadata and contract version pinning (#6)
1 parent 1685b5e commit fee302e

File tree

5 files changed

+69
-18
lines changed

5 files changed

+69
-18
lines changed

‎test/e2e/data/e2e_conf.yaml‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
---
22
# E2E test scenario using local dev images and manifests built from the source tree for following providers:
33
# - cluster-api
4-
# - bootstrap kubeadm
5-
# - control-plane kubeadm
6-
# - aws
4+
# - infrastructure aws
75

86
# To run tests, run the following from the root of this repository.
97
# `AWS_REGION=eu-west-1 make e2e GINKGO_ARGS=-stream E2E_ARGS=-skip-cloudformation-deletion`
8+
# The -stream flag will make Ginkgo print results to the screen in real-time.
109
# -skip-cloudformation-deletion reduces the time taken to set up AWS CloudFormation prior to cluster start.
1110

1211
# AWS credentials must be present for running tests
@@ -42,7 +41,7 @@ providers:
4241
type: "url"
4342
contract: v1beta1
4443
files:
45-
- sourcePath: "./shared/v1beta1/metadata.yaml"
44+
- sourcePath: "./shared/capi/v1.2/metadata.yaml"
4645
replacements:
4746
- old: "imagePullPolicy: Always"
4847
new: "imagePullPolicy: IfNotPresent"
@@ -53,7 +52,7 @@ providers:
5352
type: "url"
5453
contract: v1beta2
5554
files:
56-
- sourcePath: "./shared/v1beta1/metadata.yaml"
55+
- sourcePath: "./shared/capi/v1.11/metadata.yaml"
5756
replacements:
5857
- old: "imagePullPolicy: Always"
5958
new: "imagePullPolicy: IfNotPresent"
@@ -62,14 +61,14 @@ providers:
6261
- name: kubeadm
6362
type: BootstrapProvider
6463
files:
65-
- sourcePath: "./shared/v1beta1/metadata.yaml"
64+
- sourcePath: "./shared/capi/v1.2/metadata.yaml"
6665
versions:
6766
- name: v1.2.0 # earliest published release in the v1beta1 series; this is used for v1beta1 old --> v1beta1 latest clusterctl upgrades test only.
6867
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.0/bootstrap-components.yaml"
6968
type: "url"
7069
contract: v1beta1
7170
files:
72-
- sourcePath: "./shared/v1beta1/metadata.yaml"
71+
- sourcePath: "./shared/capi/v1.2/metadata.yaml"
7372
replacements:
7473
- old: "imagePullPolicy: Always"
7574
new: "imagePullPolicy: IfNotPresent"
@@ -80,7 +79,7 @@ providers:
8079
type: "url"
8180
contract: v1beta2
8281
files:
83-
- sourcePath: "./shared/v1beta1/metadata.yaml"
82+
- sourcePath: "./shared/capi/v1.11/metadata.yaml"
8483
replacements:
8584
- old: "imagePullPolicy: Always"
8685
new: "imagePullPolicy: IfNotPresent"
@@ -89,14 +88,14 @@ providers:
8988
- name: kubeadm
9089
type: ControlPlaneProvider
9190
files:
92-
- sourcePath: "./shared/v1beta1/metadata.yaml"
91+
- sourcePath: "./shared/capi/v1.2/metadata.yaml"
9392
versions:
9493
- name: v1.2.0 # earliest published release in the v1beta1 series; this is used for v1beta1 old --> main clusterctl upgrades test only.
9594
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.0/control-plane-components.yaml"
9695
type: "url"
9796
contract: v1beta1
9897
files:
99-
- sourcePath: "./shared/v1beta1/metadata.yaml"
98+
- sourcePath: "./shared/capi/v1.2/metadata.yaml"
10099
replacements:
101100
- old: "imagePullPolicy: Always"
102101
new: "imagePullPolicy: IfNotPresent"
@@ -107,7 +106,7 @@ providers:
107106
type: "url"
108107
contract: v1beta2
109108
files:
110-
- sourcePath: "./shared/v1beta1/metadata.yaml"
109+
- sourcePath: "./shared/capi/v1.11/metadata.yaml"
111110
replacements:
112111
- old: "imagePullPolicy: Always"
113112
new: "imagePullPolicy: IfNotPresent"
@@ -136,7 +135,7 @@ providers:
136135
- name: v9.9.99
137136
# Use manifest from source files
138137
value: ../../../config/default
139-
contract: v1beta2
138+
contract: v1beta1
140139
files:
141140
- sourcePath: "./infrastructure-aws/withoutclusterclass/generated/cluster-template-efs-support.yaml"
142141
- sourcePath: "./infrastructure-aws/withoutclusterclass/generated/cluster-template-external-csi.yaml"

‎test/e2e/data/e2e_eks_conf.yaml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ images:
1616
- name: gcr.io/k8s-staging-cluster-api/capa-manager:e2e
1717
loadBehavior: mustLoad
1818

19-
## PLEASE KEEP THESE UP TO DATE WITH THE COMPONENTS
19+
## PLEASE KEEP THESE UP TO DATE WITH THE COMPONENTS
20+
21+
# Cluster API v1beta1 Preloads
2022
- name: quay.io/jetstack/cert-manager-cainjector:v1.17.2
2123
loadBehavior: tryLoad
2224
- name: quay.io/jetstack/cert-manager-webhook:v1.17.2
@@ -39,7 +41,7 @@ providers:
3941
type: "url"
4042
contract: v1beta2
4143
files:
42-
- sourcePath: "./shared/v1beta1/metadata.yaml"
44+
- sourcePath: "./shared/capi/v1.11/metadata.yaml"
4345
replacements:
4446
- old: "imagePullPolicy: Always"
4547
new: "imagePullPolicy: IfNotPresent"
@@ -55,7 +57,7 @@ providers:
5557
type: "url"
5658
contract: v1beta2
5759
files:
58-
- sourcePath: "./shared/v1beta1/metadata.yaml"
60+
- sourcePath: "./shared/capi/v1.11/metadata.yaml"
5961
replacements:
6062
- old: "imagePullPolicy: Always"
6163
new: "imagePullPolicy: IfNotPresent"
@@ -64,14 +66,14 @@ providers:
6466
- name: kubeadm
6567
type: ControlPlaneProvider
6668
files:
67-
- sourcePath: "./shared/v1beta1/metadata.yaml"
69+
- sourcePath: "./shared/capi/v1.11/metadata.yaml"
6870
versions:
6971
- name: v1.11.1
7072
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.1/control-plane-components.yaml"
7173
type: "url"
7274
contract: v1beta2
7375
files:
74-
- sourcePath: "./shared/v1beta1/metadata.yaml"
76+
- sourcePath: "./shared/capi/v1.11/metadata.yaml"
7577
replacements:
7678
- old: "imagePullPolicy: Always"
7779
new: "imagePullPolicy: IfNotPresent"
@@ -83,7 +85,7 @@ providers:
8385
- name: v9.9.99
8486
# Use manifest from source files
8587
value: ../../../config/default
86-
contract: v1beta2
88+
contract: v1beta1
8789
files:
8890
- sourcePath: "./shared/v1beta2_provider/metadata.yaml"
8991
replacements:

‎test/e2e/data/shared/capi/v1.11/metadata.yaml‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# maps release series of major.minor to cluster-api contract version
2+
# the contract version may change between minor or major versions, but *not*
3+
# between patch versions.
4+
#
5+
# update this file only when a new major or minor version is released
6+
apiVersion: clusterctl.cluster.x-k8s.io/v1alpha3
7+
kind: Metadata
8+
releaseSeries:
9+
- major: 1
10+
minor: 11
11+
contract: v1beta2
12+
- major: 1
13+
minor: 10
14+
contract: v1beta1
15+
- major: 1
16+
minor: 9
17+
contract: v1beta1
18+
- major: 1
19+
minor: 8
20+
contract: v1beta1
21+
- major: 1
22+
minor: 7
23+
contract: v1beta1
24+
- major: 1
25+
minor: 6
26+
contract: v1beta1
27+
- major: 1
28+
minor: 5
29+
contract: v1beta1
30+
- major: 1
31+
minor: 4
32+
contract: v1beta1
33+
- major: 1
34+
minor: 3
35+
contract: v1beta1
36+
- major: 1
37+
minor: 2
38+
contract: v1beta1
39+
- major: 1
40+
minor: 1
41+
contract: v1beta1
42+
- major: 1
43+
minor: 0
44+
contract: v1beta1

‎test/e2e/data/shared/v1beta1/metadata.yaml‎ renamed to ‎test/e2e/data/shared/capi/v1.2/metadata.yaml‎

File renamed without changes.

‎test/e2e/data/shared/v1beta2_provider/metadata.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,12 @@ releaseSeries:
6363
- major: 2
6464
minor: 7
6565
contract: v1beta1
66+
- major: 2
67+
minor: 8
68+
contract: v1beta1
69+
- major: 2
70+
minor: 9
71+
contract: v1beta1
6672
- major: 9
6773
minor: 9
6874
contract: v1beta1

0 commit comments

Comments
 (0)