Merge pull request #1007 from andrewmyhre/kubefed-image-uid

configure images with a UID and set SC in deployments
kubernetes-retired · Jun 20, 2019 · cd944ea · cd944ea
2 parents 9e2e763 + eadabe9
commit cd944ea
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/charts/kubefed/charts/controllermanager/templates/deployments.yaml b/charts/kubefed/charts/controllermanager/templates/deployments.yaml
@@ -16,6 +16,8 @@ spec:
       labels:
         kubefed-control-plane: controller-manager
     spec:
+      securityContext:
+        runAsUser: 1001
       serviceAccountName: kubefed-controller
       containers:
       - args:
@@ -60,6 +62,8 @@ spec:
       labels:
         kubefed-admission-webhook: "true"
     spec:
+      securityContext:
+        runAsUser: 1001
       serviceAccountName: kubefed-admission-webhook
       containers:
       - name: admission-webhook

diff --git a/images/kubefed/Dockerfile b/images/kubefed/Dockerfile
@@ -15,16 +15,17 @@
 
 FROM alpine:latest
 RUN apk --no-cache add ca-certificates
-RUN adduser -D hyperfed
+RUN adduser -D -g hyperfed -u 1001 hyperfed
 
-RUN mkdir -p /hyperfed && \
-    chown -R hyperfed:hyperfed /hyperfed
+RUN mkdir -p /hyperfed
 
 WORKDIR /hyperfed/
 COPY /hyperfed .
 RUN ln -s hyperfed controller-manager \
  && ln -s hyperfed kubefedctl \
  && ln -s hyperfed webhook
 
+RUN chown -R hyperfed:hyperfed /hyperfed
+
 USER hyperfed
 ENTRYPOINT ["./controller-manager"]