Skip to content

Commit 1757600

Browse files
committed
remove kube-rbac-proxy container from manifests
Signed-off-by: Rohan Kumar <[email protected]>
1 parent a7285de commit 1757600

File tree

8 files changed

+19
-75
lines changed

8 files changed

+19
-75
lines changed

deploy/bundle/manifests/devworkspace-operator.clusterserviceversion.yaml

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

deploy/deployment/kubernetes/combined.yaml

Lines changed: 3 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

deploy/deployment/kubernetes/objects/devworkspace-controller-manager.Deployment.yaml

Lines changed: 3 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

deploy/deployment/openshift/combined.yaml

Lines changed: 3 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

deploy/deployment/openshift/objects/devworkspace-controller-manager.Deployment.yaml

Lines changed: 3 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

deploy/templates/base/manager_image_patch.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,5 @@ spec:
1414
env:
1515
- name: RELATED_IMAGE_devworkspace_webhook_server
1616
value: ${DWO_IMG}
17-
- name: RELATED_IMAGE_kube_rbac_proxy
18-
value: ${RBAC_PROXY_IMAGE}
1917
- name: RELATED_IMAGE_project_clone
20-
value: ${PROJECT_CLONE_IMG}
21-
- name: kube-rbac-proxy
22-
image: ${RBAC_PROXY_IMAGE}
18+
value: ${PROJECT_CLONE_IMG}

deploy/templates/components/csv/clusterserviceversion.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,6 @@ spec:
9999
relatedImages:
100100
- image: quay.io/devfile/devworkspace-controller:next
101101
name: devworkspace_webhook_server
102-
- image: quay.io/brancz/kube-rbac-proxy:v0.13.1
103-
name: kube_rbac_proxy
104102
- image: quay.io/devfile/project-clone:next
105103
name: project_clone
106104
- image: registry.access.redhat.com/ubi9/ubi-micro:9.5-1733126338

deploy/templates/components/manager/manager.yaml

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,6 @@ spec:
1010
terminationGracePeriodSeconds: 10
1111
serviceAccountName: $(CONTROLLER_SERVICE_ACCOUNT)
1212
containers:
13-
- name: kube-rbac-proxy
14-
image: gcr.io/kubebuilder/kube-rbac-proxy:v0.13.1
15-
args:
16-
- "--secure-listen-address=0.0.0.0:8443"
17-
- "--upstream=http://127.0.0.1:8080/"
18-
- "--logtostderr=true"
19-
- "--v=10"
20-
ports:
21-
- name: metrics
22-
containerPort: 8443
2313
- name: devworkspace-controller
2414
image: quay.io/devfile/devworkspace-controller:next
2515
ports:
@@ -28,6 +18,8 @@ spec:
2818
- name: conversion
2919
protocol: TCP
3020
containerPort: 9443
21+
- containerPort: 8443
22+
name: metrics
3123
livenessProbe:
3224
failureThreshold: 5
3325
httpGet:
@@ -51,7 +43,7 @@ spec:
5143
args:
5244
- /usr/local/bin/devworkspace-controller
5345
- --enable-leader-election
54-
- "--metrics-addr=127.0.0.1:8080"
46+
- "--metrics-addr=127.0.0.1:8443"
5547
resources:
5648
limits:
5749
cpu: 3000m
@@ -92,5 +84,3 @@ spec:
9284
value: "quay.io/eclipse/che-sidecar-workspace-data-sync:0.0.1"
9385
- name: RELATED_IMAGE_project_clone
9486
value: "quay.io/devfile/project-clone:next"
95-
- name: RELATED_IMAGE_kube_rbac_proxy
96-
value: gcr.io/kubebuilder/kube-rbac-proxy:v0.13.1

0 commit comments

Comments
 (0)