Removed kube-rbac-proxy from cluster-api

kubernetes-sigs · May 19, 2021 · fc5f975 · fc5f975
1 parent a10e659
commit fc5f975
Show file tree

Hide file tree

Showing 27 changed files with 1 addition and 295 deletions.
diff --git a/bootstrap/kubeadm/config/default/kustomization.yaml b/bootstrap/kubeadm/config/default/kustomization.yaml
@@ -20,10 +20,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.

diff --git a/bootstrap/kubeadm/config/default/manager_auth_proxy_patch.yaml b/bootstrap/kubeadm/config/default/manager_auth_proxy_patch.yaml
diff --git a/bootstrap/kubeadm/config/rbac/auth_proxy_role.yaml b/bootstrap/kubeadm/config/rbac/auth_proxy_role.yaml
diff --git a/bootstrap/kubeadm/config/rbac/auth_proxy_role_binding.yaml b/bootstrap/kubeadm/config/rbac/auth_proxy_role_binding.yaml
diff --git a/bootstrap/kubeadm/config/rbac/auth_proxy_service.yaml b/bootstrap/kubeadm/config/rbac/auth_proxy_service.yaml
diff --git a/bootstrap/kubeadm/config/rbac/kustomization.yaml b/bootstrap/kubeadm/config/rbac/kustomization.yaml
@@ -4,6 +4,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
diff --git a/cmd/clusterctl/client/init_test.go b/cmd/clusterctl/client/init_test.go
@@ -80,7 +80,6 @@ func Test_clusterctlClient_InitImages(t *testing.T) {
 				kubeconfigContext:      "mgmt-context",
 			},
 			expectedImages: []string{
-				"gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0",
 				"k8s.gcr.io/cluster-api-aws/cluster-api-aws-controller:v0.5.3",
 			},
 			wantErr: false,
@@ -828,8 +827,6 @@ spec:
   template:
     spec:
       containers:
-      - image: gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0
-        name: kube-rbac-proxy
       - image: k8s.gcr.io/cluster-api-aws/cluster-api-aws-controller:v0.5.3
         name: manager
         volumeMounts:

diff --git a/cmd/clusterctl/internal/util/objs_test.go b/cmd/clusterctl/internal/util/objs_test.go
@@ -78,10 +78,6 @@ func Test_inspectImages(t *testing.T) {
 												"name":  controllerContainerName,
 												"image": "gcr.io/k8s-staging-cluster-api/cluster-api-controller:master",
 											},
-											{
-												"name":  "kube-rbac-proxy",
-												"image": "gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0",
-											},
 										},
 									},
 								},
@@ -90,7 +86,7 @@ func Test_inspectImages(t *testing.T) {
 					},
 				},
 			},
-			want:    []string{"gcr.io/k8s-staging-cluster-api/cluster-api-controller:master", "gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0"},
+			want:    []string{"gcr.io/k8s-staging-cluster-api/cluster-api-controller:master"},
 			wantErr: false,
 		},
 		{

diff --git a/config/default/kustomization.yaml b/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.

diff --git a/config/default/manager_auth_proxy_patch.yaml b/config/default/manager_auth_proxy_patch.yaml
diff --git a/config/rbac/auth_proxy_role.yaml b/config/rbac/auth_proxy_role.yaml
diff --git a/config/rbac/auth_proxy_role_binding.yaml b/config/rbac/auth_proxy_role_binding.yaml
diff --git a/config/rbac/auth_proxy_service.yaml b/config/rbac/auth_proxy_service.yaml
diff --git a/config/rbac/kustomization.yaml b/config/rbac/kustomization.yaml
@@ -7,6 +7,3 @@ resources:
 - leader_election_role.yaml
 - leader_election_role_binding.yaml
 - aggregated_role.yaml
-- auth_proxy_service.yaml
-- auth_proxy_role.yaml
-- auth_proxy_role_binding.yaml
diff --git a/controlplane/kubeadm/config/default/kustomization.yaml b/controlplane/kubeadm/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.

diff --git a/controlplane/kubeadm/config/default/manager_auth_proxy_patch.yaml b/controlplane/kubeadm/config/default/manager_auth_proxy_patch.yaml
diff --git a/controlplane/kubeadm/config/rbac/auth_proxy_role.yaml b/controlplane/kubeadm/config/rbac/auth_proxy_role.yaml
diff --git a/controlplane/kubeadm/config/rbac/auth_proxy_role_binding.yaml b/controlplane/kubeadm/config/rbac/auth_proxy_role_binding.yaml
diff --git a/controlplane/kubeadm/config/rbac/auth_proxy_service.yaml b/controlplane/kubeadm/config/rbac/auth_proxy_service.yaml
diff --git a/controlplane/kubeadm/config/rbac/kustomization.yaml b/controlplane/kubeadm/config/rbac/kustomization.yaml
@@ -4,10 +4,4 @@ resources:
 - service_account.yaml
 - leader_election_role.yaml
 - leader_election_role_binding.yaml
-# Comment the following 3 lines if you want to disable
-# the auth proxy (https://github.com/brancz/kube-rbac-proxy)
-# which protects your /metrics endpoint.
-- auth_proxy_service.yaml
-- auth_proxy_role.yaml
-- auth_proxy_role_binding.yaml
 - aggregated_role.yaml
diff --git a/docs/book/src/developer/providers/implementers-guide/configure.md b/docs/book/src/developer/providers/implementers-guide/configure.md
@@ -43,15 +43,6 @@ And then, we have to add that patch to [`config/kustomization.yaml`][kustomizeya
 ```yaml
 patchesStrategicMerge
 - manager_image_patch.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
-# If you want your controller-manager to expose the /metrics
-# endpoint w/o any authn/z, uncomment the following line and
-# comment manager_auth_proxy_patch.yaml.
-# Only one of manager_auth_proxy_patch.yaml and
-# manager_prometheus_metrics_patch.yaml should be enabled.
 - manager_config.yaml
 ```
 

diff --git a/test/infrastructure/docker/config/default/kustomization.yaml b/test/infrastructure/docker/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.

diff --git a/test/infrastructure/docker/config/default/manager_auth_proxy_patch.yaml b/test/infrastructure/docker/config/default/manager_auth_proxy_patch.yaml
diff --git a/test/infrastructure/docker/config/rbac/auth_proxy_role.yaml b/test/infrastructure/docker/config/rbac/auth_proxy_role.yaml
diff --git a/test/infrastructure/docker/config/rbac/auth_proxy_role_binding.yaml b/test/infrastructure/docker/config/rbac/auth_proxy_role_binding.yaml
diff --git a/test/infrastructure/docker/config/rbac/auth_proxy_service.yaml b/test/infrastructure/docker/config/rbac/auth_proxy_service.yaml
diff --git a/test/infrastructure/docker/config/rbac/kustomization.yaml b/test/infrastructure/docker/config/rbac/kustomization.yaml
@@ -6,9 +6,3 @@ resources:
 - service_account.yaml
 - leader_election_role.yaml
 - leader_election_role_binding.yaml
-# Comment the following 3 lines if you want to disable
-# the auth proxy (https://github.com/brancz/kube-rbac-proxy)
-# which protects your /metrics endpoint.
-- auth_proxy_service.yaml
-- auth_proxy_role.yaml
-- auth_proxy_role_binding.yaml