Skip to content

Commit 517e260

Browse files
openshift-merge-bot[bot]anik120
openshift-merge-bot[bot]
authored and
anik120
committed
Merge pull request #1032 from lance5890/rm_deleted_yamls
NO-JIRA: Remove deleted yamls
2 parents a4d6a86 + 97b01a6 commit 517e260

18 files changed

+328
-107
lines changed

‎manifests/0000_50_olm_07-olm-operator.deployment.ibm-cloud-managed.yaml‎

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ spec:
3838
secretName: pprof-cert
3939
- name: tmpfs
4040
emptyDir: {}
41+
- name: olm-operator-serving-cert
42+
secret:
43+
secretName: olm-operator-serving-cert
4144
containers:
4245
- name: olm-operator
4346
securityContext:
@@ -75,7 +78,7 @@ spec:
7578
imagePullPolicy: IfNotPresent
7679
ports:
7780
- containerPort: 8443
78-
name: metrics
81+
name: https
7982
livenessProbe:
8083
httpGet:
8184
path: /healthz
@@ -100,6 +103,33 @@ spec:
100103
requests:
101104
cpu: 10m
102105
memory: 160Mi
106+
- args:
107+
- --secure-listen-address=0.0.0.0:8443
108+
- --upstream=https://127.0.0.1:8443/
109+
- --tls-cert-file=/etc/tls/private/tls.crt
110+
- --tls-private-key-file=/etc/tls/private/tls.key
111+
- --logtostderr=true
112+
image: quay.io/openshift/origin-kube-rbac-proxy:latest
113+
imagePullPolicy: IfNotPresent
114+
name: kube-rbac-proxy
115+
securityContext:
116+
allowPrivilegeEscalation: false
117+
readOnlyRootFilesystem: true
118+
capabilities:
119+
drop: ["ALL"]
120+
ports:
121+
- containerPort: 8443
122+
name: https
123+
protocol: TCP
124+
resources:
125+
requests:
126+
memory: 20Mi
127+
cpu: 10m
128+
terminationMessagePath: /dev/termination-log
129+
terminationMessagePolicy: FallbackToLogsOnError
130+
volumeMounts:
131+
- mountPath: /etc/tls/private
132+
name: olm-operator-serving-cert
103133
nodeSelector:
104134
kubernetes.io/os: linux
105135
tolerations:

‎manifests/0000_50_olm_07-olm-operator.deployment.yaml‎

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ spec:
3737
secretName: pprof-cert
3838
- name: tmpfs
3939
emptyDir: {}
40+
- name: olm-operator-serving-cert
41+
secret:
42+
secretName: olm-operator-serving-cert
4043
containers:
4144
- name: olm-operator
4245
securityContext:
@@ -74,7 +77,7 @@ spec:
7477
imagePullPolicy: IfNotPresent
7578
ports:
7679
- containerPort: 8443
77-
name: metrics
80+
name: https
7881
livenessProbe:
7982
httpGet:
8083
path: /healthz
@@ -99,6 +102,33 @@ spec:
99102
requests:
100103
cpu: 10m
101104
memory: 160Mi
105+
- args:
106+
- --secure-listen-address=0.0.0.0:8443
107+
- --upstream=https://127.0.0.1:8443/
108+
- --tls-cert-file=/etc/tls/private/tls.crt
109+
- --tls-private-key-file=/etc/tls/private/tls.key
110+
- --logtostderr=true
111+
image: quay.io/openshift/origin-kube-rbac-proxy:latest
112+
imagePullPolicy: IfNotPresent
113+
name: kube-rbac-proxy
114+
securityContext:
115+
allowPrivilegeEscalation: false
116+
readOnlyRootFilesystem: true
117+
capabilities:
118+
drop: ["ALL"]
119+
ports:
120+
- containerPort: 8443
121+
name: https
122+
protocol: TCP
123+
resources:
124+
requests:
125+
memory: 20Mi
126+
cpu: 10m
127+
terminationMessagePath: /dev/termination-log
128+
terminationMessagePolicy: FallbackToLogsOnError
129+
volumeMounts:
130+
- mountPath: /etc/tls/private
131+
name: olm-operator-serving-cert
102132
nodeSelector:
103133
kubernetes.io/os: linux
104134
node-role.kubernetes.io/master: ""

‎manifests/0000_50_olm_08-catalog-operator.deployment.ibm-cloud-managed.yaml‎

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ spec:
3838
secretName: pprof-cert
3939
- name: tmpfs
4040
emptyDir: {}
41+
- name: catalog-operator-serving-cert
42+
secret:
43+
secretName: catalog-operator-serving-cert
4144
containers:
4245
- name: catalog-operator
4346
securityContext:
@@ -76,7 +79,7 @@ spec:
7679
imagePullPolicy: IfNotPresent
7780
ports:
7881
- containerPort: 8443
79-
name: metrics
82+
name: https
8083
livenessProbe:
8184
httpGet:
8285
path: /healthz
@@ -95,6 +98,33 @@ spec:
9598
env:
9699
- name: RELEASE_VERSION
97100
value: "0.0.1-snapshot"
101+
- args:
102+
- --secure-listen-address=0.0.0.0:8443
103+
- --upstream=https://127.0.0.1:8443/
104+
- --tls-cert-file=/etc/tls/private/tls.crt
105+
- --tls-private-key-file=/etc/tls/private/tls.key
106+
- --logtostderr=true
107+
image: quay.io/openshift/origin-kube-rbac-proxy:latest
108+
imagePullPolicy: IfNotPresent
109+
name: kube-rbac-proxy
110+
securityContext:
111+
allowPrivilegeEscalation: false
112+
readOnlyRootFilesystem: true
113+
capabilities:
114+
drop: ["ALL"]
115+
ports:
116+
- containerPort: 8443
117+
name: https
118+
protocol: TCP
119+
resources:
120+
requests:
121+
memory: 20Mi
122+
cpu: 10m
123+
terminationMessagePath: /dev/termination-log
124+
terminationMessagePolicy: FallbackToLogsOnError
125+
volumeMounts:
126+
- mountPath: /etc/tls/private
127+
name: catalog-operator-serving-cert
98128
nodeSelector:
99129
kubernetes.io/os: linux
100130
tolerations:

‎manifests/0000_50_olm_08-catalog-operator.deployment.yaml‎

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ spec:
3737
secretName: pprof-cert
3838
- name: tmpfs
3939
emptyDir: {}
40+
- name: catalog-operator-serving-cert
41+
secret:
42+
secretName: catalog-operator-serving-cert
4043
containers:
4144
- name: catalog-operator
4245
securityContext:
@@ -75,7 +78,7 @@ spec:
7578
imagePullPolicy: IfNotPresent
7679
ports:
7780
- containerPort: 8443
78-
name: metrics
81+
name: https
7982
livenessProbe:
8083
httpGet:
8184
path: /healthz
@@ -94,6 +97,33 @@ spec:
9497
env:
9598
- name: RELEASE_VERSION
9699
value: "0.0.1-snapshot"
100+
- args:
101+
- --secure-listen-address=0.0.0.0:8443
102+
- --upstream=https://127.0.0.1:8443/
103+
- --tls-cert-file=/etc/tls/private/tls.crt
104+
- --tls-private-key-file=/etc/tls/private/tls.key
105+
- --logtostderr=true
106+
image: quay.io/openshift/origin-kube-rbac-proxy:latest
107+
imagePullPolicy: IfNotPresent
108+
name: kube-rbac-proxy
109+
securityContext:
110+
allowPrivilegeEscalation: false
111+
readOnlyRootFilesystem: true
112+
capabilities:
113+
drop: ["ALL"]
114+
ports:
115+
- containerPort: 8443
116+
name: https
117+
protocol: TCP
118+
resources:
119+
requests:
120+
memory: 20Mi
121+
cpu: 10m
122+
terminationMessagePath: /dev/termination-log
123+
terminationMessagePolicy: FallbackToLogsOnError
124+
volumeMounts:
125+
- mountPath: /etc/tls/private
126+
name: catalog-operator-serving-cert
97127
nodeSelector:
98128
kubernetes.io/os: linux
99129
node-role.kubernetes.io/master: ""

‎manifests/0000_50_olm_11-olm-operators.configmap.removed.yaml‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎manifests/0000_50_olm_12-olm-operators.catalogsource.removed.yaml‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎manifests/0000_50_olm_14-packageserver.subscription.removed.yaml‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎microshift-manifests/0000_50_olm_07-olm-operator.deployment.ibm-cloud-managed.yaml‎

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ spec:
3838
secretName: pprof-cert
3939
- name: tmpfs
4040
emptyDir: {}
41+
- name: olm-operator-serving-cert
42+
secret:
43+
secretName: olm-operator-serving-cert
4144
containers:
4245
- name: olm-operator
4346
securityContext:
@@ -75,7 +78,7 @@ spec:
7578
imagePullPolicy: IfNotPresent
7679
ports:
7780
- containerPort: 8443
78-
name: metrics
81+
name: https
7982
livenessProbe:
8083
httpGet:
8184
path: /healthz
@@ -100,6 +103,33 @@ spec:
100103
requests:
101104
cpu: 10m
102105
memory: 160Mi
106+
- args:
107+
- --secure-listen-address=0.0.0.0:8443
108+
- --upstream=https://127.0.0.1:8443/
109+
- --tls-cert-file=/etc/tls/private/tls.crt
110+
- --tls-private-key-file=/etc/tls/private/tls.key
111+
- --logtostderr=true
112+
image: quay.io/openshift/origin-kube-rbac-proxy:latest
113+
imagePullPolicy: IfNotPresent
114+
name: kube-rbac-proxy
115+
securityContext:
116+
allowPrivilegeEscalation: false
117+
readOnlyRootFilesystem: true
118+
capabilities:
119+
drop: ["ALL"]
120+
ports:
121+
- containerPort: 8443
122+
name: https
123+
protocol: TCP
124+
resources:
125+
requests:
126+
memory: 20Mi
127+
cpu: 10m
128+
terminationMessagePath: /dev/termination-log
129+
terminationMessagePolicy: FallbackToLogsOnError
130+
volumeMounts:
131+
- mountPath: /etc/tls/private
132+
name: olm-operator-serving-cert
103133
nodeSelector:
104134
kubernetes.io/os: linux
105135
tolerations:

‎microshift-manifests/0000_50_olm_07-olm-operator.deployment.yaml‎

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ spec:
3737
secretName: pprof-cert
3838
- name: tmpfs
3939
emptyDir: {}
40+
- name: olm-operator-serving-cert
41+
secret:
42+
secretName: olm-operator-serving-cert
4043
containers:
4144
- name: olm-operator
4245
securityContext:
@@ -70,7 +73,7 @@ spec:
7073
imagePullPolicy: IfNotPresent
7174
ports:
7275
- containerPort: 8443
73-
name: metrics
76+
name: https
7477
livenessProbe:
7578
httpGet:
7679
path: /healthz
@@ -95,6 +98,33 @@ spec:
9598
requests:
9699
cpu: 10m
97100
memory: 160Mi
101+
- args:
102+
- --secure-listen-address=0.0.0.0:8443
103+
- --upstream=https://127.0.0.1:8443/
104+
- --tls-cert-file=/etc/tls/private/tls.crt
105+
- --tls-private-key-file=/etc/tls/private/tls.key
106+
- --logtostderr=true
107+
image: quay.io/openshift/origin-kube-rbac-proxy:latest
108+
imagePullPolicy: IfNotPresent
109+
name: kube-rbac-proxy
110+
securityContext:
111+
allowPrivilegeEscalation: false
112+
readOnlyRootFilesystem: true
113+
capabilities:
114+
drop: ["ALL"]
115+
ports:
116+
- containerPort: 8443
117+
name: https
118+
protocol: TCP
119+
resources:
120+
requests:
121+
memory: 20Mi
122+
cpu: 10m
123+
terminationMessagePath: /dev/termination-log
124+
terminationMessagePolicy: FallbackToLogsOnError
125+
volumeMounts:
126+
- mountPath: /etc/tls/private
127+
name: olm-operator-serving-cert
98128
nodeSelector:
99129
kubernetes.io/os: linux
100130
node-role.kubernetes.io/master: ""

0 commit comments

Comments
 (0)