Merge pull request #1480 from CecileRobertMichon/capi-v0.4.0

Update CAPI to v0.4.0

Author: k8s-ci-robot

Makefile

@@ -473,7 +473,7 @@ create-management-cluster: $(KUSTOMIZE) $(ENVSUBST)
 	./hack/install-cert-manager.sh
 
 	# Deploy CAPI
-	curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.4.0-rc.0/cluster-api-components.yaml | $(ENVSUBST) | kubectl apply -f -
+	curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.4.0/cluster-api-components.yaml | $(ENVSUBST) | kubectl apply -f -
 
 	# Deploy CAPZ
 	kind load docker-image $(CONTROLLER_IMG)-$(ARCH):$(TAG) --name=capz

Tiltfile

@@ -16,7 +16,7 @@ settings = {
     "deploy_cert_manager": True,
     "preload_images_for_kind": True,
     "kind_cluster_name": "capz",
-    "capi_version": "v0.4.0-rc.0",
+    "capi_version": "v0.4.0",
     "cert_manager_version": "v1.1.0",
     "kubernetes_version": "v1.19.11",
     "aks_kubernetes_version": "v1.20.5"

go.mod

@@ -40,10 +40,10 @@ require (
 	k8s.io/klog/v2 v2.9.0
 	k8s.io/kubectl v0.21.2
 	k8s.io/utils v0.0.0-20210527160623-6fdb442a123b
-	sigs.k8s.io/cluster-api v0.4.0-rc.0
-	sigs.k8s.io/cluster-api/test v0.4.0-rc.0
+	sigs.k8s.io/cluster-api v0.4.0
+	sigs.k8s.io/cluster-api/test v0.4.0
 	sigs.k8s.io/controller-runtime v0.9.1
 	sigs.k8s.io/kind v0.11.1
 )
 
-replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v0.4.0-rc.0
+replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v0.4.0

go.sum

@@ -1626,10 +1626,10 @@ rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.14/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg=
 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg=
 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.19/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg=
-sigs.k8s.io/cluster-api v0.4.0-rc.0 h1:E52O4W62snVvlGneSUtsvPM/+sfR4+TwcVMbhrkc5No=
-sigs.k8s.io/cluster-api v0.4.0-rc.0/go.mod h1:9ALETQ/6KGZ/kYiqvQGfjOx0CfVGE39d4VP3UrS5B24=
-sigs.k8s.io/cluster-api/test v0.4.0-rc.0 h1:M0TOVHbbz88ZM//LmQbxVnaQyWqJVy57lmm/FP8omSw=
-sigs.k8s.io/cluster-api/test v0.4.0-rc.0/go.mod h1:Smn0J1FPtwLmd4ipXLb42RSXhKW+ur46qHWXoOAfpgw=
+sigs.k8s.io/cluster-api v0.4.0 h1:y9MxtU1uW9r9JtDyOQ/9BRXZEau2PGl2yOIozaxXO0E=
+sigs.k8s.io/cluster-api v0.4.0/go.mod h1:9ALETQ/6KGZ/kYiqvQGfjOx0CfVGE39d4VP3UrS5B24=
+sigs.k8s.io/cluster-api/test v0.4.0 h1:iD9WWGPQWCk85xRWNIdLYKvaZvk3wYD+rTzyqFg7yAg=
+sigs.k8s.io/cluster-api/test v0.4.0/go.mod h1:Smn0J1FPtwLmd4ipXLb42RSXhKW+ur46qHWXoOAfpgw=
 sigs.k8s.io/controller-runtime v0.9.1 h1:+LAqHAhkVW4lt/jLlrKmnGPA7OORMw/xEUH3Ey1h1Bs=
 sigs.k8s.io/controller-runtime v0.9.1/go.mod h1:cTqsgnwSOsYS03XwySYZj8k6vf0+eC4FJRcCgQ9elb4=
 sigs.k8s.io/kind v0.11.1 h1:pVzOkhUwMBrCB0Q/WllQDO3v14Y+o2V0tFgjTqIUjwA=

test/e2e/config/azure-dev.yaml

@@ -9,7 +9,7 @@ providers:
     type: CoreProvider
     versions:
     - name: v0.4.0
-      value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.4.0-rc.0/core-components.yaml
+      value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.4.0/core-components.yaml
       type: url
       files:
       - sourcePath: "../data/shared/v1alpha4/metadata.yaml"
@@ -22,7 +22,7 @@ providers:
     type: BootstrapProvider
     versions:
     - name: v0.4.0
-      value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.4.0-rc.0/bootstrap-components.yaml
+      value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.4.0/bootstrap-components.yaml
       type: url
       files:
       - sourcePath: "../data/shared/v1alpha4/metadata.yaml"
@@ -35,7 +35,7 @@ providers:
     type: ControlPlaneProvider
     versions:
     - name: v0.4.0
-      value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.4.0-rc.0/control-plane-components.yaml
+      value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.4.0/control-plane-components.yaml
       type: url
       files:
       - sourcePath: "../data/shared/v1alpha4/metadata.yaml"