Skip to content

Commit 611bdb7

Browse files
nader-ziadanader-ziada
committed
bump capi to v0.3.10
1 parent 5392d74 commit 611bdb7

File tree

8 files changed

+282
-39
lines changed

8 files changed

+282
-39
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ create-management-cluster: $(KUSTOMIZE) $(ENVSUBST)
419419
kubectl wait --for=condition=Available --timeout=5m -n cert-manager deployment/cert-manager-webhook
420420

421421
# Deploy CAPI
422-
curl -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.9/cluster-api-components.yaml | $(ENVSUBST) | kubectl apply -f -
422+
curl -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.10/cluster-api-components.yaml | $(ENVSUBST) | kubectl apply -f -
423423

424424
# Deploy CAPZ
425425
kind load docker-image $(CONTROLLER_IMG)-$(ARCH):$(TAG) --name=capz

‎Tiltfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ settings = {
1212
"deploy_cert_manager": True,
1313
"preload_images_for_kind": True,
1414
"kind_cluster_name": "capz",
15-
"capi_version": "v0.3.9",
15+
"capi_version": "v0.3.10",
1616
"cert_manager_version": "v0.16.1",
1717
"kubernetes_version": "v1.18.8",
1818
"aks_kubernetes_version": "v1.17.7"

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ require (
2828
k8s.io/klog v1.0.0
2929
k8s.io/kubectl v0.17.11
3030
k8s.io/utils v0.0.0-20200821003339-5e75c0163111
31-
sigs.k8s.io/cluster-api v0.3.9
32-
sigs.k8s.io/controller-runtime v0.5.10
31+
sigs.k8s.io/cluster-api v0.3.10
32+
sigs.k8s.io/controller-runtime v0.5.11
3333
)
3434

3535
replace github.com/Azure/go-autorest => github.com/Azure/go-autorest v14.2.0+incompatible

‎go.sum‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,8 @@ github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+
219219
github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA=
220220
github.com/go-openapi/validate v0.19.5/go.mod h1:8DJv2CVJQ6kGNpFW6eV9N3JviE1C85nY1c2z52x1Gk4=
221221
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
222+
github.com/gobuffalo/flect v0.2.2 h1:PAVD7sp0KOdfswjAw9BpLCU9hXo7wFSzgpQ+zNeks/A=
223+
github.com/gobuffalo/flect v0.2.2/go.mod h1:vmkQwuZYhN5Pc4ljYQZzP+1sq+NEkK+lh20jmEmX3jc=
222224
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
223225
github.com/gogo/protobuf v1.2.1 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE=
224226
github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
@@ -729,16 +731,12 @@ gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81
729731
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
730732
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
731733
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
732-
k8s.io/api v0.17.8 h1:8JHlbqJ3A6sGhoacXfu/sASSD+HWWqVq67qt9lyB0kU=
733-
k8s.io/api v0.17.8/go.mod h1:N++Llhs8kCixMUoCaXXAyMMPbo8dDVnh+IQ36xZV2/0=
734734
k8s.io/api v0.17.9/go.mod h1:avJJAA1fSV6tnbCGW2K+S+ilDFW7WpNr5BScoiZ1M1U=
735735
k8s.io/api v0.17.11 h1:FAO+RMv/JhjBawixa33qZNZ2Yb5lNjgGuK8IjN2Ac3s=
736736
k8s.io/api v0.17.11/go.mod h1:WR3CbTwCAxtfMcEB6c92W3l5aZw09unPCyxmxjYV3xg=
737737
k8s.io/apiextensions-apiserver v0.17.9 h1:GWtUr9LErCZBV7QEUIF7wiICPG6wzPukFRrwDv/AIdM=
738738
k8s.io/apiextensions-apiserver v0.17.9/go.mod h1:p2C9cDflVAUPMl5/QOMHxnSzQWF/cDqu7AP2KUXHHMA=
739739
k8s.io/apimachinery v0.17.0/go.mod h1:b9qmWdKlLuU9EBh+06BtLcSf/Mu89rWL33naRxs1uZg=
740-
k8s.io/apimachinery v0.17.8 h1:zXvd8rYMAjRJXpILP9tdAiUnFIENM9EmHuE81apIoms=
741-
k8s.io/apimachinery v0.17.8/go.mod h1:Lg8zZ5iC/O8UjCqW6DNhcQG2m4TdjF9kwG3891OWbbA=
742740
k8s.io/apimachinery v0.17.9/go.mod h1:Lg8zZ5iC/O8UjCqW6DNhcQG2m4TdjF9kwG3891OWbbA=
743741
k8s.io/apimachinery v0.17.11 h1:hgMFLIR+ofBpaPb27lZkf44v3bLn3MLqcbnw32PgoGA=
744742
k8s.io/apimachinery v0.17.11/go.mod h1:q+iFxLyaMeWIBhSlQ4OMkvdwbwrb8Ux0ALl90XD9paU=
@@ -748,8 +746,8 @@ k8s.io/cli-runtime v0.17.11/go.mod h1:2bPKmyTY4YnSmuuO3V70aYS0++YehwJFKT7QTQhztw
748746
k8s.io/client-go v0.17.9/go.mod h1:3cM92qAd1XknA5IRkRfpJhl9OQjkYy97ZEUio70wVnI=
749747
k8s.io/client-go v0.17.11 h1:IswaAabeyBFGzKjz2eFm4QKXgSwBoWLaRolWXLkaY/M=
750748
k8s.io/client-go v0.17.11/go.mod h1:gCpWJ1+skW2CjzFGChniiXrX2e51gflrCsDsbykZLLQ=
751-
k8s.io/cluster-bootstrap v0.17.8 h1:qee9dmkOVwngBf98zbwrij1s898EZ2aHg+ymXw1UBLU=
752-
k8s.io/cluster-bootstrap v0.17.8/go.mod h1:SC9J2Lt/MBOkxcCB04+5mYULLfDQL5kdM0BjtKaVCVU=
749+
k8s.io/cluster-bootstrap v0.17.9 h1:IH/MwGor5/7bwHClz0PO/8pKq+SU1eSB1rs645pGu8Y=
750+
k8s.io/cluster-bootstrap v0.17.9/go.mod h1:Q6nXn/sqVfMvT1VIJVPxFboYAoqH06PCjZnaYzbpZC0=
753751
k8s.io/code-generator v0.17.9/go.mod h1:iiHz51+oTx+Z9D0vB3CH3O4HDDPWrvZyUgUYaIE9h9M=
754752
k8s.io/code-generator v0.17.11/go.mod h1:iiHz51+oTx+Z9D0vB3CH3O4HDDPWrvZyUgUYaIE9h9M=
755753
k8s.io/component-base v0.17.9/go.mod h1:Wg22ePDK0mfTa+bEFgZHGwr0h40lXnYy6D7D+f7itFk=
@@ -779,10 +777,10 @@ modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk=
779777
modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k=
780778
modernc.org/strutil v1.0.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs=
781779
modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I=
782-
sigs.k8s.io/cluster-api v0.3.9 h1:WongQFeW+vbII9Karc3nIarxMfuUuTr33QU9aSyiKfs=
783-
sigs.k8s.io/cluster-api v0.3.9/go.mod h1:A7Om/um/j7hvqTvm+KEMEjDOn6fHKRhcVtBiuAH+tYQ=
784-
sigs.k8s.io/controller-runtime v0.5.10 h1:IJ2zO+BeNvTJEo2W1Kho1+X756QroQjYCKIzEYYqsI8=
785-
sigs.k8s.io/controller-runtime v0.5.10/go.mod h1:OTqxLuz7gVcrq+BHGUgedRu6b2VIKCEc7Pu4Jbwui0A=
780+
sigs.k8s.io/cluster-api v0.3.10 h1:iUbnDdFQjp406hclEV1/rRMO7/NpyJ7IxozAaAA9Zns=
781+
sigs.k8s.io/cluster-api v0.3.10/go.mod h1:XBBDBiaczcyNlH4D7FNjSKc5bBofYRppfg0ZgaP2x1U=
782+
sigs.k8s.io/controller-runtime v0.5.11 h1:U/FjGJ61aR2T2mCrdlBCxEcWgLEwLmK6YZKf0NC0a24=
783+
sigs.k8s.io/controller-runtime v0.5.11/go.mod h1:OTqxLuz7gVcrq+BHGUgedRu6b2VIKCEc7Pu4Jbwui0A=
786784
sigs.k8s.io/kind v0.7.1-0.20200303021537-981bd80d3802 h1:L6/8hETA7jvdx3xBcbDifrIN2xaYHE7tA58n+Kdp2Zw=
787785
sigs.k8s.io/kind v0.7.1-0.20200303021537-981bd80d3802/go.mod h1:HIZ3PWUezpklcjkqpFbnYOqaqsAE1JeCTEwkgvPLXjk=
788786
sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5QeXV4WCbnt/PEpU=

‎test/e2e/azure_test.go‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ var _ = Describe("Workload cluster creation", func() {
7777

7878
Context("Creating a single control-plane cluster", func() {
7979
It("With 1 worker node", func() {
80-
cluster, _, _ = clusterctl.ApplyClusterTemplateAndWait(ctx, clusterctl.ApplyClusterTemplateAndWaitInput{
80+
result := clusterctl.ApplyClusterTemplateAndWait(ctx, clusterctl.ApplyClusterTemplateAndWaitInput{
8181
ClusterProxy: bootstrapClusterProxy,
8282
ConfigCluster: clusterctl.ConfigClusterInput{
8383
LogFolder: filepath.Join(artifactFolder, "clusters", bootstrapClusterProxy.GetName()),
@@ -95,12 +95,13 @@ var _ = Describe("Workload cluster creation", func() {
9595
WaitForControlPlaneIntervals: e2eConfig.GetIntervals(specName, "wait-control-plane"),
9696
WaitForMachineDeployments: e2eConfig.GetIntervals(specName, "wait-worker-nodes"),
9797
})
98+
cluster = result.Cluster
9899
})
99100
})
100101

101102
Context("Creating a highly available control-plane cluster", func() {
102103
It("With 3 control-plane nodes and 2 worker nodes", func() {
103-
cluster, _, _ = clusterctl.ApplyClusterTemplateAndWait(ctx, clusterctl.ApplyClusterTemplateAndWaitInput{
104+
result := clusterctl.ApplyClusterTemplateAndWait(ctx, clusterctl.ApplyClusterTemplateAndWaitInput{
104105
ClusterProxy: bootstrapClusterProxy,
105106
ConfigCluster: clusterctl.ConfigClusterInput{
106107
LogFolder: filepath.Join(artifactFolder, "clusters", bootstrapClusterProxy.GetName()),
@@ -118,12 +119,13 @@ var _ = Describe("Workload cluster creation", func() {
118119
WaitForControlPlaneIntervals: e2eConfig.GetIntervals(specName, "wait-control-plane"),
119120
WaitForMachineDeployments: e2eConfig.GetIntervals(specName, "wait-worker-nodes"),
120121
})
122+
cluster = result.Cluster
121123

122124
Context("Validating failure domains", func() {
123125
AzureFailureDomainsSpec(ctx, func() AzureFailureDomainsSpecInput {
124126
return AzureFailureDomainsSpecInput{
125127
BootstrapClusterProxy: bootstrapClusterProxy,
126-
Cluster: cluster,
128+
Cluster: result.Cluster,
127129
Namespace: namespace,
128130
ClusterName: clusterName,
129131
}
@@ -164,7 +166,7 @@ var _ = Describe("Workload cluster creation", func() {
164166

165167
Context("Creating a ipv6 control-plane cluster", func() {
166168
It("With ipv6 worker node", func() {
167-
cluster, _, _ = clusterctl.ApplyClusterTemplateAndWait(ctx, clusterctl.ApplyClusterTemplateAndWaitInput{
169+
result := clusterctl.ApplyClusterTemplateAndWait(ctx, clusterctl.ApplyClusterTemplateAndWaitInput{
168170
ClusterProxy: bootstrapClusterProxy,
169171
ConfigCluster: clusterctl.ConfigClusterInput{
170172
LogFolder: filepath.Join(artifactFolder, "clusters", bootstrapClusterProxy.GetName()),
@@ -182,6 +184,7 @@ var _ = Describe("Workload cluster creation", func() {
182184
WaitForControlPlaneIntervals: e2eConfig.GetIntervals(specName, "wait-control-plane"),
183185
WaitForMachineDeployments: e2eConfig.GetIntervals(specName, "wait-worker-nodes"),
184186
})
187+
cluster = result.Cluster
185188

186189
Context("Creating an accessible ipv6 load balancer", func() {
187190
AzureLBSpec(ctx, func() AzureLBSpecInput {

‎test/e2e/config/azure-dev.yaml‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ providers:
88
- name: cluster-api
99
type: CoreProvider
1010
versions:
11-
- name: v0.3.9
12-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.9/core-components.yaml
11+
- name: v0.3.10
12+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.10/core-components.yaml
1313
type: url
1414
replacements:
1515
- old: "imagePullPolicy: Always"
@@ -19,8 +19,8 @@ providers:
1919
- name: kubeadm
2020
type: BootstrapProvider
2121
versions:
22-
- name: v0.3.9
23-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.9/bootstrap-components.yaml
22+
- name: v0.3.10
23+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.10/bootstrap-components.yaml
2424
type: url
2525
replacements:
2626
- old: "imagePullPolicy: Always"
@@ -30,8 +30,8 @@ providers:
3030
- name: kubeadm
3131
type: ControlPlaneProvider
3232
versions:
33-
- name: v0.3.9
34-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.9/control-plane-components.yaml
33+
- name: v0.3.10
34+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.10/control-plane-components.yaml
3535
type: url
3636
replacements:
3737
- old: "imagePullPolicy: Always"
@@ -50,6 +50,8 @@ providers:
5050
targetName: "cluster-template-kcp-adoption.yaml"
5151
- sourcePath: "${PWD}/templates/test/cluster-template-prow-ipv6.yaml"
5252
targetName: "cluster-template-ipv6.yaml"
53+
- sourcePath: "../data/infrastructure-azure/cluster-template-mhc.yaml"
54+
targetName: "cluster-template-mhc.yaml"
5355

5456
variables:
5557
KUBERNETES_VERSION: "${KUBERNETES_VERSION:-v1.18.8}"
@@ -70,7 +72,7 @@ intervals:
7072
default/wait-control-plane: ["20m", "10s"]
7173
default/wait-worker-nodes: ["20m", "10s"]
7274
default/wait-delete-cluster: ["30m", "10s"]
73-
default/wait-machine-upgrade: ["50m", "10s"]
75+
default/wait-machine-upgrade: ["60m", "10s"]
7476
default/wait-machine-remediation: ["30m", "10s"]
7577
default/wait-deployment: ["5m", "10s"]
7678
default/wait-job: ["5m", "10s"]

‎test/e2e/data/infrastructure-azure/cluster-template-kcp-adoption.yaml‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
##
22
# these resources are sequenced by label:
3-
# 1. initial: just the resources to bootstrap an initial controlplane
3+
# 1. kcp-adoption.step1: just the resources to bootstrap an kcp-adoption.step1 controlplane
44
# 2. kcp: the KCP resources (note the duplicated Cluster to associate the control plane)
55
##
66
###
7-
# 1. initial
7+
# 1. kcp-adoption.step1
88
###
99

1010
apiVersion: cluster.x-k8s.io/v1alpha3
1111
kind: Cluster
1212
metadata:
1313
name: ${CLUSTER_NAME}
1414
labels:
15-
initial: ''
15+
kcp-adoption.step1: ''
1616
cni: "${CLUSTER_NAME}-crs-0"
1717
spec:
1818
clusterNetwork:
@@ -29,7 +29,7 @@ kind: AzureCluster
2929
metadata:
3030
name: ${CLUSTER_NAME}
3131
labels:
32-
initial: ''
32+
kcp-adoption.step1: ''
3333
spec:
3434
additionalTags:
3535
creationTimestamp: ${TIMESTAMP}
@@ -46,7 +46,7 @@ kind: AzureMachine
4646
metadata:
4747
name: ${CLUSTER_NAME}-control-plane-0
4848
labels:
49-
initial: ''
49+
kcp-adoption.step1: ''
5050
spec:
5151
dataDisks:
5252
- diskSizeGB: 256
@@ -66,7 +66,7 @@ kind: Machine
6666
metadata:
6767
name: ${CLUSTER_NAME}-control-plane-0
6868
labels:
69-
initial: ''
69+
kcp-adoption.step1: ''
7070
cluster.x-k8s.io/control-plane: "true"
7171
spec:
7272
version: ${KUBERNETES_VERSION}
@@ -86,7 +86,7 @@ kind: KubeadmConfig
8686
metadata:
8787
name: ${CLUSTER_NAME}-control-plane-0
8888
labels:
89-
initial: ''
89+
kcp-adoption.step1: ''
9090
spec:
9191
useExperimentalRetryJoin: true
9292
initConfiguration:
@@ -162,7 +162,7 @@ kind: Cluster
162162
metadata:
163163
name: ${CLUSTER_NAME}
164164
labels:
165-
kcp: ''
165+
kcp-adoption.step2: ""
166166
cni: "${CLUSTER_NAME}-crs-0"
167167
spec:
168168
clusterNetwork:
@@ -184,7 +184,7 @@ metadata:
184184
name: ${CLUSTER_NAME}-control-plane
185185
labels:
186186
cluster.x-k8s.io/cluster-name: "${ CLUSTER_NAME }"
187-
kcp: ''
187+
kcp-adoption.step2: ""
188188
spec:
189189
infrastructureTemplate:
190190
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
@@ -265,7 +265,7 @@ kind: AzureMachineTemplate
265265
metadata:
266266
name: ${CLUSTER_NAME}-control-plane
267267
labels:
268-
kcp: ''
268+
kcp-adoption.step2: ""
269269
spec:
270270
template:
271271
spec:
@@ -287,17 +287,15 @@ kind: ConfigMap
287287
metadata:
288288
name: "cni-${CLUSTER_NAME}-crs-0"
289289
labels:
290-
initial: ''
291-
kcp: ''
290+
kcp-adoption.step1: ''
292291
data: ${CNI_RESOURCES}
293292
---
294293
apiVersion: addons.cluster.x-k8s.io/v1alpha3
295294
kind: ClusterResourceSet
296295
metadata:
297296
name: "${CLUSTER_NAME}-crs-0"
298297
labels:
299-
initial: ''
300-
kcp: ''
298+
kcp-adoption.step1: ''
301299
spec:
302300
strategy: ApplyOnce
303301
clusterSelector:

0 commit comments

Comments
 (0)