Skip to content

Commit d6e711f

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #3497 from sedefsavas/publish-e2e-templates
Publish e2e templates
2 parents 59f0587 + c075051 commit d6e711f

27 files changed

+11801
-0
lines changed

‎hack/gen-test-flavors.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ test_dir_path="test/e2e/data/infrastructure-aws"
2525
test_dir="${root}/${test_dir_path}"
2626
src_dir="${test_dir}/kustomize_sources/"
2727
generated_dir="${test_dir}/generated"
28+
test_templates="${test_dir}/e2e_test_templates"
2829

2930
echo Checking for template sources in "$test_dir"
3031

@@ -36,3 +37,4 @@ find "${src_dir}"* -maxdepth 1 -type d \
3637

3738
## move the default template to the default file expected by clusterctl
3839
mv "${generated_dir}/cluster-template-default.yaml" "${generated_dir}/cluster-template.yaml"
40+
cp -r ${generated_dir} ${test_templates}

‎test/e2e/data/infrastructure-aws/e2e_test_templates/cluster-template-csimigration-off.yaml

Lines changed: 142 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,142 @@
1+
apiVersion: cluster.x-k8s.io/v1beta1
2+
kind: Cluster
3+
metadata:
4+
labels:
5+
cni: ${CLUSTER_NAME}-crs-0
6+
name: ${CLUSTER_NAME}
7+
spec:
8+
clusterNetwork:
9+
pods:
10+
cidrBlocks:
11+
- 192.168.0.0/16
12+
controlPlaneRef:
13+
apiVersion: controlplane.cluster.x-k8s.io/v1beta1
14+
kind: KubeadmControlPlane
15+
name: ${CLUSTER_NAME}-control-plane
16+
infrastructureRef:
17+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
18+
kind: AWSCluster
19+
name: ${CLUSTER_NAME}
20+
---
21+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
22+
kind: AWSCluster
23+
metadata:
24+
name: ${CLUSTER_NAME}
25+
spec:
26+
network:
27+
vpc:
28+
availabilityZoneUsageLimit: 1
29+
region: ${AWS_REGION}
30+
sshKeyName: ${AWS_SSH_KEY_NAME}
31+
---
32+
apiVersion: controlplane.cluster.x-k8s.io/v1beta1
33+
kind: KubeadmControlPlane
34+
metadata:
35+
name: ${CLUSTER_NAME}-control-plane
36+
spec:
37+
kubeadmConfigSpec:
38+
clusterConfiguration:
39+
apiServer:
40+
extraArgs:
41+
cloud-provider: aws
42+
controllerManager:
43+
extraArgs:
44+
cloud-provider: aws
45+
feature-gates: CSIMigrationAWS=false
46+
initConfiguration:
47+
nodeRegistration:
48+
kubeletExtraArgs:
49+
cloud-provider: aws
50+
feature-gates: CSIMigrationAWS=false
51+
name: '{{ ds.meta_data.local_hostname }}'
52+
joinConfiguration:
53+
nodeRegistration:
54+
kubeletExtraArgs:
55+
cloud-provider: aws
56+
feature-gates: CSIMigrationAWS=false
57+
name: '{{ ds.meta_data.local_hostname }}'
58+
machineTemplate:
59+
infrastructureRef:
60+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
61+
kind: AWSMachineTemplate
62+
name: ${CLUSTER_NAME}-control-plane
63+
replicas: ${CONTROL_PLANE_MACHINE_COUNT}
64+
version: ${KUBERNETES_VERSION}
65+
---
66+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
67+
kind: AWSMachineTemplate
68+
metadata:
69+
name: ${CLUSTER_NAME}-control-plane
70+
spec:
71+
template:
72+
spec:
73+
iamInstanceProfile: control-plane.cluster-api-provider-aws.sigs.k8s.io
74+
instanceType: ${AWS_CONTROL_PLANE_MACHINE_TYPE}
75+
sshKeyName: ${AWS_SSH_KEY_NAME}
76+
---
77+
apiVersion: cluster.x-k8s.io/v1beta1
78+
kind: MachineDeployment
79+
metadata:
80+
name: ${CLUSTER_NAME}-md-0
81+
spec:
82+
clusterName: ${CLUSTER_NAME}
83+
replicas: ${WORKER_MACHINE_COUNT}
84+
selector:
85+
matchLabels: null
86+
template:
87+
spec:
88+
bootstrap:
89+
configRef:
90+
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
91+
kind: KubeadmConfigTemplate
92+
name: ${CLUSTER_NAME}-md-0
93+
clusterName: ${CLUSTER_NAME}
94+
infrastructureRef:
95+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
96+
kind: AWSMachineTemplate
97+
name: ${CLUSTER_NAME}-md-0
98+
version: ${KUBERNETES_VERSION}
99+
---
100+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
101+
kind: AWSMachineTemplate
102+
metadata:
103+
name: ${CLUSTER_NAME}-md-0
104+
spec:
105+
template:
106+
spec:
107+
iamInstanceProfile: nodes.cluster-api-provider-aws.sigs.k8s.io
108+
instanceType: ${AWS_NODE_MACHINE_TYPE}
109+
sshKeyName: ${AWS_SSH_KEY_NAME}
110+
---
111+
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
112+
kind: KubeadmConfigTemplate
113+
metadata:
114+
name: ${CLUSTER_NAME}-md-0
115+
spec:
116+
template:
117+
spec:
118+
joinConfiguration:
119+
nodeRegistration:
120+
kubeletExtraArgs:
121+
cloud-provider: aws
122+
feature-gates: CSIMigrationAWS=false
123+
name: '{{ ds.meta_data.local_hostname }}'
124+
---
125+
apiVersion: v1
126+
data: ${CNI_RESOURCES}
127+
kind: ConfigMap
128+
metadata:
129+
name: cni-${CLUSTER_NAME}-crs-0
130+
---
131+
apiVersion: addons.cluster.x-k8s.io/v1beta1
132+
kind: ClusterResourceSet
133+
metadata:
134+
name: ${CLUSTER_NAME}-crs-0
135+
spec:
136+
clusterSelector:
137+
matchLabels:
138+
cni: ${CLUSTER_NAME}-crs-0
139+
resources:
140+
- kind: ConfigMap
141+
name: cni-${CLUSTER_NAME}-crs-0
142+
strategy: ApplyOnce

0 commit comments

Comments
 (0)