upgrade CAPI to v0.4.0-beta.0

Author: sbueringer

config/default/kustomization.yaml

@@ -19,10 +19,6 @@ patchesStrategicMerge:
 # Provide customizable hook for make targets.
 - manager_image_patch.yaml
 - manager_pull_policy.yaml
-# Protect the /metrics endpoint by putting it behind auth.
-# Only one of manager_auth_proxy_patch.yaml and
-# manager_prometheus_metrics_patch.yaml should be enabled.
-- manager_auth_proxy_patch.yaml
   # Enable webhook.
 - manager_webhook_patch.yaml
   # Inject certificate in the webhook definition.

config/default/manager_auth_proxy_patch.yaml

@@ -21,7 +21,6 @@ spec:
         - /manager
         args:
         - "--leader-elect"
-        - "--metrics-bind-addr=127.0.0.1:8080"
         - "--v=2"
         image: controller:latest
         imagePullPolicy: Always

config/manager/manager.yaml

@@ -6,6 +6,3 @@ resources:
 - service_account.yaml
 - leader_election_role.yaml
 - leader_election_role_binding.yaml
-- auth_proxy_service.yaml
-- auth_proxy_role.yaml
-- auth_proxy_role_binding.yaml

config/rbac/auth_proxy_role.yaml

@@ -6,20 +6,23 @@ require (
 	github.com/go-logr/logr v0.4.0
 	github.com/gophercloud/gophercloud v0.16.0
 	github.com/gophercloud/utils v0.0.0-20210323225332-7b186010c04f
-	github.com/onsi/ginkgo v1.16.1
-	github.com/onsi/gomega v1.11.0
+	github.com/onsi/ginkgo v1.16.4
+	github.com/onsi/gomega v1.13.0
 	github.com/pkg/errors v0.9.1
-	github.com/prometheus/client_golang v1.9.0
+	github.com/prometheus/client_golang v1.11.0
 	github.com/spf13/pflag v1.0.5
 	golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83
 	gopkg.in/ini.v1 v1.62.0
-	k8s.io/api v0.21.0
-	k8s.io/apimachinery v0.21.0
-	k8s.io/client-go v0.21.0
-	k8s.io/component-base v0.21.0
-	k8s.io/klog/v2 v2.8.0
-	k8s.io/utils v0.0.0-20210305010621-2afb4311ab10
-	sigs.k8s.io/cluster-api v0.3.11-0.20210506151717-6dda08f83614
-	sigs.k8s.io/controller-runtime v0.9.0-beta.1
+	k8s.io/api v0.21.1
+	k8s.io/apimachinery v0.21.1
+	k8s.io/client-go v0.21.1
+	k8s.io/component-base v0.21.1
+	k8s.io/klog/v2 v2.9.0
+	k8s.io/utils v0.0.0-20210527160623-6fdb442a123b
+	sigs.k8s.io/cluster-api v0.4.0-beta.0
+	sigs.k8s.io/cluster-api/test v0.4.0-beta.0
+	sigs.k8s.io/controller-runtime v0.9.0
 	sigs.k8s.io/yaml v1.2.0
 )
+
+replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v0.4.0-beta.0

config/rbac/auth_proxy_role_binding.yaml

@@ -12,10 +12,9 @@ require (
 	github.com/onsi/ginkgo v1.16.1
 	github.com/onsi/gomega v1.11.0 // indirect
 	k8s.io/apiextensions-apiserver v0.21.0 // indirect
-	k8s.io/code-generator v0.21.0
-	k8s.io/utils v0.0.0-20210305010621-2afb4311ab10 // indirect
+	k8s.io/code-generator v0.21.1
 	sigs.k8s.io/cluster-api/hack/tools v0.0.0-20210402170612-77093e2350cd
 	sigs.k8s.io/controller-tools v0.5.0
-	sigs.k8s.io/kind v0.10.0
+	sigs.k8s.io/kind v0.11.0
 	sigs.k8s.io/kustomize/kustomize/v4 v4.1.2
 )