Skip to content

Commit 52a99fb

Browse files
author
dkokkinos
authored
Merge branch 'openshift:main' into OSASINFRA-3675
2 parents 83116dc + 94ed008 commit 52a99fb

52 files changed

Lines changed: 572 additions & 655 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

assets/csidriveroperators/aws-ebs/base/09_deployment.yaml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,21 @@ spec:
5656
memory: 50Mi
5757
cpu: 10m
5858
terminationMessagePolicy: FallbackToLogsOnError
59+
securityContext:
60+
readOnlyRootFilesystem: true
61+
allowPrivilegeEscalation: false
62+
capabilities:
63+
drop:
64+
- ALL
65+
volumeMounts:
66+
- mountPath: /tmp
67+
name: tmp
5968
serviceAccountName: aws-ebs-csi-driver-operator
69+
securityContext:
70+
runAsNonRoot: true
71+
seccompProfile:
72+
type: RuntimeDefault
73+
volumes:
74+
- name: tmp
75+
emptyDir:
76+
medium: Memory

assets/csidriveroperators/aws-ebs/hypershift/mgmt/deployment.patch.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ spec:
5050
- mountPath: /var/run/secrets/openshift/serviceaccount
5151
name: web-identity-token
5252
terminationMessagePolicy: FallbackToLogsOnError
53+
securityContext:
54+
readOnlyRootFilesystem: false
5355
priorityClassName: hypershift-control-plane
5456
tolerations:
5557
- key: CriticalAddonsOnly

assets/csidriveroperators/aws-ebs/hypershift/mgmt/generated/apps_v1_deployment_aws-ebs-csi-driver-operator.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,13 +109,25 @@ spec:
109109
requests:
110110
cpu: 10m
111111
memory: 50Mi
112+
securityContext:
113+
allowPrivilegeEscalation: false
114+
capabilities:
115+
drop:
116+
- ALL
117+
readOnlyRootFilesystem: false
112118
terminationMessagePolicy: FallbackToLogsOnError
113119
volumeMounts:
114120
- mountPath: /etc/guest-kubeconfig
115121
name: guest-kubeconfig
116122
- mountPath: /var/run/secrets/openshift/serviceaccount
117123
name: web-identity-token
124+
- mountPath: /tmp
125+
name: tmp
118126
priorityClassName: hypershift-control-plane
127+
securityContext:
128+
runAsNonRoot: true
129+
seccompProfile:
130+
type: RuntimeDefault
119131
serviceAccountName: aws-ebs-csi-driver-operator
120132
tolerations:
121133
- key: CriticalAddonsOnly
@@ -138,3 +150,6 @@ spec:
138150
- name: guest-kubeconfig
139151
secret:
140152
secretName: service-network-admin-kubeconfig
153+
- emptyDir:
154+
medium: Memory
155+
name: tmp

assets/csidriveroperators/aws-ebs/standalone/generated/apps_v1_deployment_aws-ebs-csi-driver-operator.yaml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,31 @@ spec:
5656
requests:
5757
cpu: 10m
5858
memory: 50Mi
59+
securityContext:
60+
allowPrivilegeEscalation: false
61+
capabilities:
62+
drop:
63+
- ALL
64+
readOnlyRootFilesystem: true
5965
terminationMessagePolicy: FallbackToLogsOnError
66+
volumeMounts:
67+
- mountPath: /tmp
68+
name: tmp
6069
nodeSelector:
6170
node-role.kubernetes.io/master: ""
6271
priorityClassName: system-cluster-critical
72+
securityContext:
73+
runAsNonRoot: true
74+
seccompProfile:
75+
type: RuntimeDefault
6376
serviceAccountName: aws-ebs-csi-driver-operator
6477
tolerations:
6578
- key: CriticalAddonsOnly
6679
operator: Exists
6780
- effect: NoSchedule
6881
key: node-role.kubernetes.io/master
6982
operator: Exists
83+
volumes:
84+
- emptyDir:
85+
medium: Memory
86+
name: tmp

assets/csidriveroperators/azure-disk/base/08_deployment.yaml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,21 @@ spec:
5757
memory: 50Mi
5858
cpu: 10m
5959
terminationMessagePolicy: FallbackToLogsOnError
60+
securityContext:
61+
readOnlyRootFilesystem: true
62+
allowPrivilegeEscalation: false
63+
capabilities:
64+
drop:
65+
- ALL
66+
volumeMounts:
67+
- mountPath: /tmp
68+
name: tmp
6069
serviceAccountName: azure-disk-csi-driver-operator
70+
securityContext:
71+
runAsNonRoot: true
72+
seccompProfile:
73+
type: RuntimeDefault
74+
volumes:
75+
- name: tmp
76+
emptyDir:
77+
medium: Memory

assets/csidriveroperators/azure-disk/hypershift/mgmt/deployment.patch.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,13 @@ spec:
5656
volumeMounts:
5757
- mountPath: /etc/guest-kubeconfig
5858
name: guest-kubeconfig
59+
securityContext:
60+
readOnlyRootFilesystem: false
5961
priorityClassName: hypershift-control-plane
6062
volumes:
6163
- name: guest-kubeconfig
6264
secret:
6365
secretName: service-network-admin-kubeconfig
66+
securityContext:
67+
# Hypershift on AKS does not support SCC and needs a specific user ID
68+
runAsUser: 1001

assets/csidriveroperators/azure-disk/hypershift/mgmt/generated/apps_v1_deployment_azure-disk-csi-driver-operator.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,24 @@ spec:
8888
requests:
8989
cpu: 10m
9090
memory: 50Mi
91+
securityContext:
92+
allowPrivilegeEscalation: false
93+
capabilities:
94+
drop:
95+
- ALL
96+
readOnlyRootFilesystem: false
9197
terminationMessagePolicy: FallbackToLogsOnError
9298
volumeMounts:
9399
- mountPath: /etc/guest-kubeconfig
94100
name: guest-kubeconfig
101+
- mountPath: /tmp
102+
name: tmp
95103
priorityClassName: hypershift-control-plane
104+
securityContext:
105+
runAsNonRoot: true
106+
runAsUser: 1001
107+
seccompProfile:
108+
type: RuntimeDefault
96109
serviceAccountName: azure-disk-csi-driver-operator
97110
tolerations:
98111
- key: CriticalAddonsOnly
@@ -109,3 +122,6 @@ spec:
109122
- name: guest-kubeconfig
110123
secret:
111124
secretName: service-network-admin-kubeconfig
125+
- emptyDir:
126+
medium: Memory
127+
name: tmp

assets/csidriveroperators/azure-disk/standalone/generated/apps_v1_deployment_azure-disk-csi-driver-operator.yaml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,31 @@ spec:
5656
requests:
5757
cpu: 10m
5858
memory: 50Mi
59+
securityContext:
60+
allowPrivilegeEscalation: false
61+
capabilities:
62+
drop:
63+
- ALL
64+
readOnlyRootFilesystem: true
5965
terminationMessagePolicy: FallbackToLogsOnError
66+
volumeMounts:
67+
- mountPath: /tmp
68+
name: tmp
6069
nodeSelector:
6170
node-role.kubernetes.io/master: ""
6271
priorityClassName: system-cluster-critical
72+
securityContext:
73+
runAsNonRoot: true
74+
seccompProfile:
75+
type: RuntimeDefault
6376
serviceAccountName: azure-disk-csi-driver-operator
6477
tolerations:
6578
- key: CriticalAddonsOnly
6679
operator: Exists
6780
- effect: NoSchedule
6881
key: node-role.kubernetes.io/master
6982
operator: Exists
83+
volumes:
84+
- emptyDir:
85+
medium: Memory
86+
name: tmp

assets/csidriveroperators/azure-file-original/03_sa.yaml

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

assets/csidriveroperators/azure-file-original/04_role.yaml

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

0 commit comments

Comments
 (0)