Skip to content

Commit 36a4dbc

Browse files
authored
Merge pull request #127 from kubernetes-csi/revert-124-nonroot
Revert "fix: create nonroot user in Dockerfile"
2 parents ee54478 + 819bd6c commit 36a4dbc

File tree

9 files changed

+3
-17
lines changed

9 files changed

+3
-17
lines changed

.github/workflows/darwin.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: MacOS Build & Unit Test
1+
name: MacOS Unit Tests
22
on:
33
push:
44
branches: [ master ]

.github/workflows/ubuntu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Ubuntu Test
1+
name: Linux Unit tests
22
on:
33
push:
44
branches: [ master ]

.github/workflows/windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Windows Build & Unit Test
1+
name: Windows Unit Tests
22
on:
33
push:
44
branches: [ master ]

charts/latest/csi-driver-smb/templates/csi-smb-controller.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,6 @@ spec:
9090
env:
9191
- name: CSI_ENDPOINT
9292
value: unix:///csi/csi.sock
93-
securityContext:
94-
runAsUser: 0
9593
volumeMounts:
9694
- mountPath: /csi
9795
name: socket-dir

charts/latest/csi-driver-smb/templates/csi-smb-node.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ spec:
100100
fieldPath: spec.nodeName
101101
securityContext:
102102
privileged: true
103-
runAsUser: 0
104103
volumeMounts:
105104
- mountPath: /csi
106105
name: socket-dir

deploy/csi-smb-controller.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,6 @@ spec:
8686
env:
8787
- name: CSI_ENDPOINT
8888
value: unix:///csi/csi.sock
89-
securityContext:
90-
runAsUser: 0
9189
volumeMounts:
9290
- mountPath: /csi
9391
name: socket-dir

deploy/csi-smb-node.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ spec:
9696
fieldPath: spec.nodeName
9797
securityContext:
9898
privileged: true
99-
runAsUser: 0
10099
volumeMounts:
101100
- mountPath: /csi
102101
name: socket-dir

pkg/smbplugin/Dockerfile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,5 @@ RUN clean-install ca-certificates cifs-utils util-linux e2fsprogs mount udev xfs
2525
LABEL maintainers="andyzhangx"
2626
LABEL description="SMB CSI Driver"
2727

28-
# Create a nonroot user
29-
RUN useradd -u 10001 nonroot
30-
USER nonroot
31-
3228
COPY ./_output/smbplugin /smbplugin
3329
ENTRYPOINT ["/smbplugin"]

pkg/smbplugin/dev.Dockerfile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,5 @@ RUN apt-get update && apt-get install -y ca-certificates cifs-utils util-linux e
1717
LABEL maintainers="andyzhangx"
1818
LABEL description="SMB CSI Driver"
1919

20-
# Create a nonroot user
21-
RUN useradd -u 10001 nonroot
22-
USER nonroot
23-
2420
COPY ./_output/smbplugin /smbplugin
2521
ENTRYPOINT ["/smbplugin"]

0 commit comments

Comments
 (0)