Skip to content

Commit 7f5d2f7

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request openshift#703 from liouk/required-scc
AUTH-482: set required-scc for openshift workloads
2 parents 773439e + e27e51b commit 7f5d2f7

19 files changed

+29
-6
lines changed

‎manifests/0000_50_olm_06-psm-operator.deployment.ibm-cloud-managed.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ spec:
2020
metadata:
2121
annotations:
2222
target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
23+
openshift.io/required-scc: restricted-v2
2324
labels:
2425
app: package-server-manager
2526
spec:

‎manifests/0000_50_olm_06-psm-operator.deployment.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ spec:
1919
metadata:
2020
annotations:
2121
target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
22+
openshift.io/required-scc: restricted-v2
2223
labels:
2324
app: package-server-manager
2425
spec:

‎manifests/0000_50_olm_07-collect-profiles.cronjob.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ spec:
1717
metadata:
1818
annotations:
1919
target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
20+
openshift.io/required-scc: restricted-v2
2021
spec:
2122
securityContext:
2223
runAsNonRoot: true

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

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ spec:
2222
app: olm-operator
2323
annotations:
2424
target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
25+
openshift.io/required-scc: restricted-v2
2526
spec:
2627
securityContext:
2728
runAsNonRoot: true

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

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ spec:
2121
app: olm-operator
2222
annotations:
2323
target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
24+
openshift.io/required-scc: restricted-v2
2425
spec:
2526
securityContext:
2627
runAsNonRoot: true

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

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ spec:
2222
app: catalog-operator
2323
annotations:
2424
target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
25+
openshift.io/required-scc: restricted-v2
2526
spec:
2627
securityContext:
2728
runAsNonRoot: true

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

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ spec:
2121
app: catalog-operator
2222
annotations:
2323
target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
24+
openshift.io/required-scc: restricted-v2
2425
spec:
2526
securityContext:
2627
runAsNonRoot: true

‎microshift-manifests/0000_50_olm_06-psm-operator.deployment.ibm-cloud-managed.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ spec:
2020
metadata:
2121
annotations:
2222
target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
23+
openshift.io/required-scc: restricted-v2
2324
labels:
2425
app: package-server-manager
2526
spec:

‎microshift-manifests/0000_50_olm_06-psm-operator.deployment.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ spec:
1919
metadata:
2020
annotations:
2121
target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
22+
openshift.io/required-scc: restricted-v2
2223
labels:
2324
app: package-server-manager
2425
spec:

‎microshift-manifests/0000_50_olm_07-collect-profiles.cronjob.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ spec:
1717
metadata:
1818
annotations:
1919
target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
20+
openshift.io/required-scc: restricted-v2
2021
spec:
2122
securityContext:
2223
runAsNonRoot: true

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

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ spec:
2222
app: olm-operator
2323
annotations:
2424
target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
25+
openshift.io/required-scc: restricted-v2
2526
spec:
2627
securityContext:
2728
runAsNonRoot: true

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

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ spec:
2121
app: olm-operator
2222
annotations:
2323
target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
24+
openshift.io/required-scc: restricted-v2
2425
spec:
2526
securityContext:
2627
runAsNonRoot: true

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

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ spec:
2222
app: catalog-operator
2323
annotations:
2424
target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
25+
openshift.io/required-scc: restricted-v2
2526
spec:
2627
securityContext:
2728
runAsNonRoot: true

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

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ spec:
2121
app: catalog-operator
2222
annotations:
2323
target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
24+
openshift.io/required-scc: restricted-v2
2425
spec:
2526
securityContext:
2627
runAsNonRoot: true

‎pkg/manifests/csv.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ spec:
8787
app: packageserver
8888
annotations:
8989
target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
90+
openshift.io/required-scc: restricted-v2
9091
creationTimestamp: null
9192
spec:
9293
securityContext:

‎scripts/catalog-deployment.patch.yaml

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
- command: update
2-
path: spec.template.metadata.annotations."target.workload.openshift.io/management"
3-
value: '{"effect": "PreferredDuringScheduling"}'
2+
path: spec.template.metadata.annotations
3+
value:
4+
target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
5+
openshift.io/required-scc: restricted-v2
46
- command: update
57
path: spec.template.spec.priorityClassName
68
value: system-cluster-critical

‎scripts/generate_crds_manifests.sh

+2
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ spec:
136136
metadata:
137137
annotations:
138138
target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
139+
openshift.io/required-scc: restricted-v2
139140
labels:
140141
app: package-server-manager
141142
spec:
@@ -381,6 +382,7 @@ spec:
381382
metadata:
382383
annotations:
383384
target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
385+
openshift.io/required-scc: restricted-v2
384386
spec:
385387
securityContext:
386388
runAsNonRoot: true

‎scripts/olm-deployment.patch.yaml

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
- command: update
2-
path: spec.template.metadata.annotations."target.workload.openshift.io/management"
3-
value: '{"effect": "PreferredDuringScheduling"}'
2+
path: spec.template.metadata.annotations
3+
value:
4+
target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
5+
openshift.io/required-scc: restricted-v2
46
- command: update
57
path: spec.template.spec.priorityClassName
68
value: system-cluster-critical

‎scripts/packageserver-deployment.patch.yaml

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
- command: update
2-
path: spec.install.spec.deployments[0].spec.template.metadata.annotations."target.workload.openshift.io/management"
3-
value: '{"effect": "PreferredDuringScheduling"}'
2+
path: spec.install.spec.deployments[0].spec.template.metadata.annotations
3+
value:
4+
target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
5+
openshift.io/required-scc: restricted-v2
46
- command: update
57
path: spec.install.spec.deployments[0].spec.template.spec.priorityClassName
68
value: system-cluster-critical

0 commit comments

Comments
 (0)