Skip to content

Commit cc16ce1

Browse files
authored
Merge pull request kubernetes-sigs#476 from CecileRobertMichon/capi-v0.3.3
Update to cluster-api version v0.3.3
2 parents 6b74372 + cf1baea commit cc16ce1

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ create-management-cluster: $(ENVSUBST)
300300
kubectl wait --for=condition=Available --timeout=5m apiservice v1beta1.webhook.cert-manager.io
301301

302302
# Deploy CAPI
303-
kubectl apply -f https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.2/cluster-api-components.yaml
303+
kubectl apply -f https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.3/cluster-api-components.yaml
304304

305305
# Deploy CAPZ
306306
kustomize build config | $(ENVSUBST) | kubectl apply -f -

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ require (
2525
k8s.io/klog v1.0.0
2626
k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c // indirect
2727
k8s.io/utils v0.0.0-20200229041039-0a110f9eb7ab
28-
sigs.k8s.io/cluster-api v0.3.2
29-
sigs.k8s.io/controller-runtime v0.5.1
28+
sigs.k8s.io/cluster-api v0.3.3
29+
sigs.k8s.io/controller-runtime v0.5.2
3030
)
3131

3232
replace github.com/Azure/go-autorest => github.com/Azure/go-autorest v13.4.0+incompatible

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -692,10 +692,10 @@ modernc.org/strutil v1.0.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs
692692
modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I=
693693
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
694694
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
695-
sigs.k8s.io/cluster-api v0.3.2 h1:+oiclIxk1PthGCBbYLEdfZi1u2qFTjK+wwIrtLNlBXA=
696-
sigs.k8s.io/cluster-api v0.3.2/go.mod h1:PkmtV10dmmSmBSpR28c5UxDvWRszTxj+p9KLrb8JVZ8=
697-
sigs.k8s.io/controller-runtime v0.5.1 h1:TNidCfVoU/cs2i+9xoTcL/l7yhl0bDhYXU0NCG6wmiE=
698-
sigs.k8s.io/controller-runtime v0.5.1/go.mod h1:Uojny7gvg55YLQnEGnPzRE3dC4ik2tRlZJgOUCWXAV4=
695+
sigs.k8s.io/cluster-api v0.3.3 h1:pNuvC6cm67SbxOaPriK8ZfLl1RSjmu/KX2GJiNQH3dU=
696+
sigs.k8s.io/cluster-api v0.3.3/go.mod h1:lgztyeCWCve8YB4DN6QeLR0blNYBvFX9+ATHrxs+zKU=
697+
sigs.k8s.io/controller-runtime v0.5.2 h1:pyXbUfoTo+HA3jeIfr0vgi+1WtmNh0CwlcnQGLXwsSw=
698+
sigs.k8s.io/controller-runtime v0.5.2/go.mod h1:JZUwSMVbxDupo0lTJSSFP5pimEyxGynROImSsqIOx1A=
699699
sigs.k8s.io/kind v0.7.1-0.20200303021537-981bd80d3802 h1:L6/8hETA7jvdx3xBcbDifrIN2xaYHE7tA58n+Kdp2Zw=
700700
sigs.k8s.io/kind v0.7.1-0.20200303021537-981bd80d3802/go.mod h1:HIZ3PWUezpklcjkqpFbnYOqaqsAE1JeCTEwkgvPLXjk=
701701
sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=

test/e2e/azure_suite_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,8 @@ var _ = BeforeSuite(func() {
116116
waitDeployment(c, "cert-manager", "cert-manager-webhook")
117117

118118
// Deploy the CAPI and CABPK components from Cluster API repository,
119-
capi := &generators.ClusterAPI{Version: "v0.3.2"}
120-
cabpk := &generators.Bootstrap{Version: "v0.3.2"}
119+
capi := &generators.ClusterAPI{Version: "v0.3.3"}
120+
cabpk := &generators.Bootstrap{Version: "v0.3.3"}
121121
infra := &generators.Infra{Creds: creds}
122122

123123
framework.InstallComponents(ctx, mgmt, capi, cabpk, infra)

0 commit comments

Comments
 (0)