Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion bindata/assets/deployments/console-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ spec:
component: ui
annotations:
target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
openshift.io/required-scc: restricted-v2
openshift.io/required-scc: restricted-v3
spec:
dnsPolicy: ClusterFirst
nodeSelector:
Expand All @@ -32,6 +32,7 @@ spec:
serviceAccountName: console
serviceAccount: console
schedulerName: default-scheduler
hostUsers: false
securityContext:
runAsNonRoot: true
seccompProfile:
Expand Down
3 changes: 2 additions & 1 deletion bindata/assets/deployments/downloads-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,15 @@ spec:
component: downloads
annotations:
target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
openshift.io/required-scc: restricted-v2
openshift.io/required-scc: restricted-v3
spec:
dnsPolicy: ClusterFirst
serviceAccountName: downloads
serviceAccount: downloads
nodeSelector:
kubernetes.io/os: linux
node-role.kubernetes.io/master: ""
hostUsers: false
terminationGracePeriodSeconds: 5
securityContext:
runAsNonRoot: true
Expand Down
11 changes: 8 additions & 3 deletions pkg/console/subresource/deployment/deployment_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ func TestDefaultDeployment(t *testing.T) {
consoleImageAnnotation: "",
servingCertSecretResourceVersionAnnotation: "",
workloadManagementAnnotation: workloadManagementAnnotationValue,
requiredSCCAnnotation: "restricted-v2",
requiredSCCAnnotation: "restricted-v3",
}

consoleDeploymentAffinity := &corev1.Affinity{
Expand Down Expand Up @@ -251,6 +251,7 @@ func TestDefaultDeployment(t *testing.T) {
RestartPolicy: corev1.RestartPolicyAlways,
SchedulerName: corev1.DefaultSchedulerName,
TerminationGracePeriodSeconds: &gracePeriod,
HostUsers: ptr.To(false),
SecurityContext: &corev1.PodSecurityContext{
RunAsNonRoot: utilpointer.Bool(true),
SeccompProfile: &corev1.SeccompProfile{
Expand Down Expand Up @@ -332,6 +333,7 @@ func TestDefaultDeployment(t *testing.T) {
RestartPolicy: corev1.RestartPolicyAlways,
SchedulerName: corev1.DefaultSchedulerName,
TerminationGracePeriodSeconds: &gracePeriod,
HostUsers: ptr.To(false),
SecurityContext: &corev1.PodSecurityContext{
RunAsNonRoot: utilpointer.Bool(true),
SeccompProfile: &corev1.SeccompProfile{
Expand Down Expand Up @@ -413,6 +415,7 @@ func TestDefaultDeployment(t *testing.T) {
RestartPolicy: corev1.RestartPolicyAlways,
SchedulerName: corev1.DefaultSchedulerName,
TerminationGracePeriodSeconds: &gracePeriod,
HostUsers: ptr.To(false),
SecurityContext: &corev1.PodSecurityContext{
RunAsNonRoot: utilpointer.Bool(true),
SeccompProfile: &corev1.SeccompProfile{
Expand Down Expand Up @@ -490,6 +493,7 @@ func TestDefaultDeployment(t *testing.T) {
RestartPolicy: corev1.RestartPolicyAlways,
SchedulerName: corev1.DefaultSchedulerName,
TerminationGracePeriodSeconds: &gracePeriod,
HostUsers: ptr.To(false),
SecurityContext: &corev1.PodSecurityContext{
RunAsNonRoot: utilpointer.Bool(true),
SeccompProfile: &corev1.SeccompProfile{
Expand Down Expand Up @@ -1755,6 +1759,7 @@ func TestDefaultDownloadsDeployment(t *testing.T) {
TolerationSeconds: &tolerationSeconds,
},
},
HostUsers: ptr.To(false),
SecurityContext: &corev1.PodSecurityContext{
RunAsNonRoot: utilpointer.Bool(true),
SeccompProfile: &corev1.SeccompProfile{
Expand Down Expand Up @@ -1886,7 +1891,7 @@ func TestDefaultDownloadsDeployment(t *testing.T) {
Labels: labels,
Annotations: map[string]string{
workloadManagementAnnotation: workloadManagementAnnotationValue,
requiredSCCAnnotation: "restricted-v2",
requiredSCCAnnotation: "restricted-v3",
},
},
Spec: downloadsDeploymentPodSpecSingleReplica,
Expand Down Expand Up @@ -1931,7 +1936,7 @@ func TestDefaultDownloadsDeployment(t *testing.T) {
Labels: labels,
Annotations: map[string]string{
workloadManagementAnnotation: workloadManagementAnnotationValue,
requiredSCCAnnotation: "restricted-v2",
requiredSCCAnnotation: "restricted-v3",
},
},
Spec: *downloadsDeploymentPodSpecHighAvail,
Expand Down