Skip to content

Commit 1c2d310

Browse files
committed
set required-scc for openshift workloads
1 parent fa48564 commit 1c2d310

File tree

7 files changed

+10
-0
lines changed

7 files changed

+10
-0
lines changed

bindata/assets/deployments/console-deployment.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ spec:
2121
component: ui
2222
annotations:
2323
target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
24+
openshift.io/required-scc: restricted-v2
2425
spec:
2526
nodeSelector:
2627
node-role.kubernetes.io/master: ""

bindata/assets/deployments/downloads-deployment.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ spec:
2222
component: downloads
2323
annotations:
2424
target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
25+
openshift.io/required-scc: restricted-v2
2526
spec:
2627
nodeSelector:
2728
kubernetes.io/os: linux

manifests/07-conversionwebhook-ibm-cloud-managed.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ spec:
1515
template:
1616
metadata:
1717
annotations:
18+
openshift.io/required-scc: restricted-v2
1819
target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
1920
labels:
2021
name: console-conversion-webhook

manifests/07-conversionwebhook.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ spec:
1616
metadata:
1717
annotations:
1818
target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
19+
openshift.io/required-scc: restricted-v2
1920
labels:
2021
name: console-conversion-webhook
2122
spec:

manifests/07-operator-ibm-cloud-managed.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ spec:
1515
template:
1616
metadata:
1717
annotations:
18+
openshift.io/required-scc: restricted-v2
1819
target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
1920
labels:
2021
name: console-operator

manifests/07-operator.yaml

Lines changed: 1 addition & 0 deletions
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
labels:
2122
name: console-operator
2223
spec:

pkg/console/subresource/deployment/deployment_test.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import (
2424
const (
2525
workloadManagementAnnotation = "target.workload.openshift.io/management"
2626
workloadManagementAnnotationValue = `{"effect": "PreferredDuringScheduling"}`
27+
requiredSCCAnnotation = "openshift.io/required-scc"
2728
)
2829

2930
func TestDefaultDeployment(t *testing.T) {
@@ -132,6 +133,7 @@ func TestDefaultDeployment(t *testing.T) {
132133
infrastructureConfigResourceVersionAnnotation: "",
133134
consoleImageAnnotation: "",
134135
workloadManagementAnnotation: workloadManagementAnnotationValue,
136+
requiredSCCAnnotation: "restricted-v2",
135137
}
136138

137139
consoleDeploymentAffinity := &corev1.Affinity{
@@ -1606,6 +1608,7 @@ func TestDefaultDownloadsDeployment(t *testing.T) {
16061608
Labels: labels,
16071609
Annotations: map[string]string{
16081610
workloadManagementAnnotation: workloadManagementAnnotationValue,
1611+
requiredSCCAnnotation: "restricted-v2",
16091612
},
16101613
},
16111614
Spec: downloadsDeploymentPodSpecSingleReplica,
@@ -1648,6 +1651,7 @@ func TestDefaultDownloadsDeployment(t *testing.T) {
16481651
Labels: labels,
16491652
Annotations: map[string]string{
16501653
workloadManagementAnnotation: workloadManagementAnnotationValue,
1654+
requiredSCCAnnotation: "restricted-v2",
16511655
},
16521656
},
16531657
Spec: *downloadsDeploymentPodSpecHighAvail,

0 commit comments

Comments
 (0)