Skip to content

Commit e0e361b

Browse files
authored
Merge pull request #372 from jimmidyson/remove-kube-rbac-proxy
✨ Replace deprecated gcr.io/kubebuilder/kube-rbac-proxy
2 parents e8734ea + 7e120ab commit e0e361b

8 files changed

+9
-54
lines changed

config/default/manager_auth_proxy_patch.yaml

-42
This file was deleted.

config/manager/controller_manager_config.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: ControllerManagerConfig
33
health:
44
healthProbeBindAddress: :8081
55
metrics:
6-
bindAddress: 127.0.0.1:8080
6+
bindAddress: :8443
77
webhook:
88
port: 9443
99
leaderElection:

config/manager/kustomization.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
resources:
22
- manager.yaml
3+
- metrics_service.yaml
34

45
generatorOptions:
56
disableNameSuffixHash: true

config/rbac/auth_proxy_service.yaml renamed to config/manager/metrics_service.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ spec:
1010
- name: https
1111
port: 8443
1212
protocol: TCP
13-
targetPort: https
13+
targetPort: 8443
1414
selector:
1515
control-plane: controller-manager

config/rbac/kustomization.yaml

+3-7
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@ resources:
99
- role_binding.yaml
1010
- leader_election_role.yaml
1111
- leader_election_role_binding.yaml
12-
# Comment the following 4 lines if you want to disable
13-
# the auth proxy (https://github.com/brancz/kube-rbac-proxy)
14-
# which protects your /metrics endpoint.
15-
- auth_proxy_service.yaml
16-
- auth_proxy_role.yaml
17-
- auth_proxy_role_binding.yaml
18-
- auth_proxy_client_clusterrole.yaml
12+
- metrics_reader_role.yaml
13+
- metrics_auth_role.yaml
14+
- metrics_auth_role_binding.yaml

config/rbac/auth_proxy_role.yaml renamed to config/rbac/metrics_auth_role.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: rbac.authorization.k8s.io/v1
22
kind: ClusterRole
33
metadata:
4-
name: proxy-role
4+
name: metrics-auth-role
55
rules:
66
- apiGroups:
77
- authentication.k8s.io

config/rbac/auth_proxy_role_binding.yaml renamed to config/rbac/metrics_auth_role_binding.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
apiVersion: rbac.authorization.k8s.io/v1
22
kind: ClusterRoleBinding
33
metadata:
4-
name: proxy-rolebinding
4+
name: metrics-auth-rolebinding
55
roleRef:
66
apiGroup: rbac.authorization.k8s.io
77
kind: ClusterRole
8-
name: proxy-role
8+
name: metrics-auth-role
99
subjects:
1010
- kind: ServiceAccount
1111
name: controller-manager

0 commit comments

Comments
 (0)