Skip to content

WIP: OCPBUGS-59768: add kube-rbac-proxy sidecars to olm and catalog operators #1061

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

WIP: OCPBUGS-59768: add kube-rbac-proxy sidecars to olm and catalog operators #1061

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions manifests/0000_50_olm_03-services.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
- name: https-metrics
port: 8443
protocol: TCP
targetPort: 8443
targetPort: 9443
selector:
app: olm-operator
---
Expand All @@ -40,6 +40,6 @@ spec:
- name: https-metrics
port: 8443
protocol: TCP
targetPort: 8443
targetPort: 9443
selector:
app: catalog-operator
34 changes: 34 additions & 0 deletions manifests/0000_50_olm_07-olm-operator.deployment.ibm-cloud-managed.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ spec:
secretName: pprof-cert
- name: tmpfs
emptyDir: {}
- name: olm-operator-serving-cert
secret:
secretName: olm-operator-serving-cert
containers:
- name: olm-operator
securityContext:
Expand Down Expand Up @@ -100,6 +103,37 @@ spec:
requests:
cpu: 10m
memory: 160Mi
- args:
- --secure-listen-address=0.0.0.0:9443
- --upstream=https://127.0.0.1:8443/
- --tls-cert-file=/etc/tls/private/tls.crt
- --tls-private-key-file=/etc/tls/private/tls.key
- --upstream-ca-file=/srv-cert/tls.crt
- --logtostderr=true
image: quay.io/openshift/origin-kube-rbac-proxy:latest
imagePullPolicy: IfNotPresent
name: kube-rbac-proxy
securityContext:
allowPrivilegeEscalation: false
readOnlyRootFilesystem: true
capabilities:
drop: ["ALL"]
ports:
- containerPort: 9443
name: metrics
protocol: TCP
resources:
requests:
memory: 20Mi
cpu: 10m
terminationMessagePath: /dev/termination-log
terminationMessagePolicy: FallbackToLogsOnError
volumeMounts:
- mountPath: /etc/tls/private
name: olm-operator-serving-cert
- mountPath: /srv-cert
name: srv-cert
readOnly: true
nodeSelector:
kubernetes.io/os: linux
tolerations:
Expand Down
34 changes: 34 additions & 0 deletions manifests/0000_50_olm_07-olm-operator.deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ spec:
secretName: pprof-cert
- name: tmpfs
emptyDir: {}
- name: olm-operator-serving-cert
secret:
secretName: olm-operator-serving-cert
containers:
- name: olm-operator
securityContext:
Expand Down Expand Up @@ -99,6 +102,37 @@ spec:
requests:
cpu: 10m
memory: 160Mi
- args:
- --secure-listen-address=0.0.0.0:9443
- --upstream=https://127.0.0.1:8443/
- --tls-cert-file=/etc/tls/private/tls.crt
- --tls-private-key-file=/etc/tls/private/tls.key
- --upstream-ca-file=/srv-cert/tls.crt
- --logtostderr=true
image: quay.io/openshift/origin-kube-rbac-proxy:latest
imagePullPolicy: IfNotPresent
name: kube-rbac-proxy
securityContext:
allowPrivilegeEscalation: false
readOnlyRootFilesystem: true
capabilities:
drop: ["ALL"]
ports:
- containerPort: 9443
name: metrics
protocol: TCP
resources:
requests:
memory: 20Mi
cpu: 10m
terminationMessagePath: /dev/termination-log
terminationMessagePolicy: FallbackToLogsOnError
volumeMounts:
- mountPath: /etc/tls/private
name: olm-operator-serving-cert
- mountPath: /srv-cert
name: srv-cert
readOnly: true
nodeSelector:
kubernetes.io/os: linux
node-role.kubernetes.io/master: ""
Expand Down
34 changes: 34 additions & 0 deletions manifests/0000_50_olm_08-catalog-operator.deployment.ibm-cloud-managed.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ spec:
secretName: pprof-cert
- name: tmpfs
emptyDir: {}
- name: catalog-operator-serving-cert
secret:
secretName: catalog-operator-serving-cert
containers:
- name: catalog-operator
securityContext:
Expand Down Expand Up @@ -95,6 +98,37 @@ spec:
env:
- name: RELEASE_VERSION
value: "0.0.1-snapshot"
- args:
- --secure-listen-address=0.0.0.0:9443
- --upstream=https://127.0.0.1:8443/
- --tls-cert-file=/etc/tls/private/tls.crt
- --tls-private-key-file=/etc/tls/private/tls.key
- --upstream-ca-file=/srv-cert/tls.crt
- --logtostderr=true
image: quay.io/openshift/origin-kube-rbac-proxy:latest
imagePullPolicy: IfNotPresent
name: kube-rbac-proxy
securityContext:
allowPrivilegeEscalation: false
readOnlyRootFilesystem: true
capabilities:
drop: ["ALL"]
ports:
- containerPort: 9443
name: metrics
protocol: TCP
resources:
requests:
memory: 20Mi
cpu: 10m
terminationMessagePath: /dev/termination-log
terminationMessagePolicy: FallbackToLogsOnError
volumeMounts:
- mountPath: /etc/tls/private
name: catalog-operator-serving-cert
- mountPath: /srv-cert
name: srv-cert
readOnly: true
nodeSelector:
kubernetes.io/os: linux
tolerations:
Expand Down
34 changes: 34 additions & 0 deletions manifests/0000_50_olm_08-catalog-operator.deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ spec:
secretName: pprof-cert
- name: tmpfs
emptyDir: {}
- name: catalog-operator-serving-cert
secret:
secretName: catalog-operator-serving-cert
containers:
- name: catalog-operator
securityContext:
Expand Down Expand Up @@ -94,6 +97,37 @@ spec:
env:
- name: RELEASE_VERSION
value: "0.0.1-snapshot"
- args:
- --secure-listen-address=0.0.0.0:9443
- --upstream=https://127.0.0.1:8443/
- --tls-cert-file=/etc/tls/private/tls.crt
- --tls-private-key-file=/etc/tls/private/tls.key
- --upstream-ca-file=/srv-cert/tls.crt
- --logtostderr=true
image: quay.io/openshift/origin-kube-rbac-proxy:latest
imagePullPolicy: IfNotPresent
name: kube-rbac-proxy
securityContext:
allowPrivilegeEscalation: false
readOnlyRootFilesystem: true
capabilities:
drop: ["ALL"]
ports:
- containerPort: 9443
name: metrics
protocol: TCP
resources:
requests:
memory: 20Mi
cpu: 10m
terminationMessagePath: /dev/termination-log
terminationMessagePolicy: FallbackToLogsOnError
volumeMounts:
- mountPath: /etc/tls/private
name: catalog-operator-serving-cert
- mountPath: /srv-cert
name: srv-cert
readOnly: true
nodeSelector:
kubernetes.io/os: linux
node-role.kubernetes.io/master: ""
Expand Down
4 changes: 2 additions & 2 deletions microshift-manifests/0000_50_olm_03-services.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
- name: https-metrics
port: 8443
protocol: TCP
targetPort: 8443
targetPort: 9443
selector:
app: olm-operator
---
Expand All @@ -40,6 +40,6 @@ spec:
- name: https-metrics
port: 8443
protocol: TCP
targetPort: 8443
targetPort: 9443
selector:
app: catalog-operator
34 changes: 34 additions & 0 deletions microshift-manifests/0000_50_olm_07-olm-operator.deployment.ibm-cloud-managed.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ spec:
secretName: pprof-cert
- name: tmpfs
emptyDir: {}
- name: olm-operator-serving-cert
secret:
secretName: olm-operator-serving-cert
containers:
- name: olm-operator
securityContext:
Expand Down Expand Up @@ -100,6 +103,37 @@ spec:
requests:
cpu: 10m
memory: 160Mi
- args:
- --secure-listen-address=0.0.0.0:9443
- --upstream=https://127.0.0.1:8443/
- --tls-cert-file=/etc/tls/private/tls.crt
- --tls-private-key-file=/etc/tls/private/tls.key
- --upstream-ca-file=/srv-cert/tls.crt
- --logtostderr=true
image: quay.io/openshift/origin-kube-rbac-proxy:latest
imagePullPolicy: IfNotPresent
name: kube-rbac-proxy
securityContext:
allowPrivilegeEscalation: false
readOnlyRootFilesystem: true
capabilities:
drop: ["ALL"]
ports:
- containerPort: 9443
name: metrics
protocol: TCP
resources:
requests:
memory: 20Mi
cpu: 10m
terminationMessagePath: /dev/termination-log
terminationMessagePolicy: FallbackToLogsOnError
volumeMounts:
- mountPath: /etc/tls/private
name: olm-operator-serving-cert
- mountPath: /srv-cert
name: srv-cert
readOnly: true
nodeSelector:
kubernetes.io/os: linux
tolerations:
Expand Down
34 changes: 34 additions & 0 deletions microshift-manifests/0000_50_olm_07-olm-operator.deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ spec:
secretName: pprof-cert
- name: tmpfs
emptyDir: {}
- name: olm-operator-serving-cert
secret:
secretName: olm-operator-serving-cert
containers:
- name: olm-operator
securityContext:
Expand Down Expand Up @@ -95,6 +98,37 @@ spec:
requests:
cpu: 10m
memory: 160Mi
- args:
- --secure-listen-address=0.0.0.0:9443
- --upstream=https://127.0.0.1:8443/
- --tls-cert-file=/etc/tls/private/tls.crt
- --tls-private-key-file=/etc/tls/private/tls.key
- --upstream-ca-file=/srv-cert/tls.crt
- --logtostderr=true
image: quay.io/openshift/origin-kube-rbac-proxy:latest
imagePullPolicy: IfNotPresent
name: kube-rbac-proxy
securityContext:
allowPrivilegeEscalation: false
readOnlyRootFilesystem: true
capabilities:
drop: ["ALL"]
ports:
- containerPort: 9443
name: metrics
protocol: TCP
resources:
requests:
memory: 20Mi
cpu: 10m
terminationMessagePath: /dev/termination-log
terminationMessagePolicy: FallbackToLogsOnError
volumeMounts:
- mountPath: /etc/tls/private
name: olm-operator-serving-cert
- mountPath: /srv-cert
name: srv-cert
readOnly: true
nodeSelector:
kubernetes.io/os: linux
node-role.kubernetes.io/master: ""
Expand Down
34 changes: 34 additions & 0 deletions microshift-manifests/0000_50_olm_08-catalog-operator.deployment.ibm-cloud-managed.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ spec:
secretName: pprof-cert
- name: tmpfs
emptyDir: {}
- name: catalog-operator-serving-cert
secret:
secretName: catalog-operator-serving-cert
containers:
- name: catalog-operator
securityContext:
Expand Down Expand Up @@ -95,6 +98,37 @@ spec:
env:
- name: RELEASE_VERSION
value: "0.0.1-snapshot"
- args:
- --secure-listen-address=0.0.0.0:9443
- --upstream=https://127.0.0.1:8443/
- --tls-cert-file=/etc/tls/private/tls.crt
- --tls-private-key-file=/etc/tls/private/tls.key
- --upstream-ca-file=/srv-cert/tls.crt
- --logtostderr=true
image: quay.io/openshift/origin-kube-rbac-proxy:latest
imagePullPolicy: IfNotPresent
name: kube-rbac-proxy
securityContext:
allowPrivilegeEscalation: false
readOnlyRootFilesystem: true
capabilities:
drop: ["ALL"]
ports:
- containerPort: 9443
name: metrics
protocol: TCP
resources:
requests:
memory: 20Mi
cpu: 10m
terminationMessagePath: /dev/termination-log
terminationMessagePolicy: FallbackToLogsOnError
volumeMounts:
- mountPath: /etc/tls/private
name: catalog-operator-serving-cert
- mountPath: /srv-cert
name: srv-cert
readOnly: true
nodeSelector:
kubernetes.io/os: linux
tolerations:
Expand Down
Loading