Merge pull request #210 from ksimon1/remove-run-as-disk-virt

[release-v0.9] Remove runAs from disk-virt tasks
kubevirt · Jan 12, 2023 · e90a7ee · e90a7ee
2 parents a78fd6a + 4e05abf
commit e90a7ee
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 18 deletions.
diff --git a/manifests/kubernetes/kubevirt-tekton-tasks-kubernetes.yaml b/manifests/kubernetes/kubevirt-tekton-tasks-kubernetes.yaml
diff --git a/manifests/okd/kubevirt-tekton-tasks-okd.yaml b/manifests/okd/kubevirt-tekton-tasks-okd.yaml
diff --git a/modules/disk-virt-customize/build/disk-virt-customize/Dockerfile b/modules/disk-virt-customize/build/disk-virt-customize/Dockerfile
@@ -25,14 +25,16 @@ ENV ENTRY_CMD=/usr/local/bin/${TASK_NAME} \
     USER_NAME=${TASK_NAME} \
     HOME=/home/${TASK_NAME}
 
+USER root
+
 # install libguestfs rhsrvany.exe win dependency for virt-customize
 COPY --from=rhsrvanyBuilder /rhsrvany/RHSrvAny/rhsrvany.exe /usr/share/virt-tools/rhsrvany.exe
 
 # install task binary
 COPY --from=taskBuilder /${TASK_NAME} ${ENTRY_CMD}
 COPY build/${TASK_NAME}/bin /usr/local/bin
 
-#RUN  /usr/local/bin/user_setup
+RUN  /usr/local/bin/user_setup
 ENTRYPOINT ["/usr/local/bin/entrypoint"]
 CMD ["--help"]
 

diff --git a/modules/disk-virt-sysprep/build/disk-virt-sysprep/Dockerfile b/modules/disk-virt-sysprep/build/disk-virt-sysprep/Dockerfile
@@ -25,14 +25,16 @@ ENV ENTRY_CMD=/usr/local/bin/${TASK_NAME} \
     USER_NAME=${TASK_NAME} \
     HOME=/home/${TASK_NAME} 
 
+USER root
+
 # install libguestfs rhsrvany.exe win dependency for virt-sysprep
 COPY --from=rhsrvanyBuilder /rhsrvany/RHSrvAny/rhsrvany.exe /usr/share/virt-tools/rhsrvany.exe
 
 # install task binary
 COPY --from=taskBuilder /${TASK_NAME} ${ENTRY_CMD}
 COPY build/${TASK_NAME}/bin /usr/local/bin
 
-#RUN  /usr/local/bin/user_setup
+RUN  /usr/local/bin/user_setup
 ENTRYPOINT ["/usr/local/bin/entrypoint"]
 CMD ["--help"]
 

diff --git a/tasks/disk-virt-customize/manifests/disk-virt-customize.yaml b/tasks/disk-virt-customize/manifests/disk-virt-customize.yaml
diff --git a/tasks/disk-virt-sysprep/manifests/disk-virt-sysprep.yaml b/tasks/disk-virt-sysprep/manifests/disk-virt-sysprep.yaml
diff --git a/templates/disk-virt-customize/manifests/disk-virt-customize.yaml b/templates/disk-virt-customize/manifests/disk-virt-customize.yaml
@@ -45,8 +45,6 @@ spec:
           value: direct
         - name: LIBGUESTFS_PATH
           value: /mnt/appliance
-      securityContext:
-        runAsUser: 0
       resources:
         limits:
           devices.kubevirt.io/kvm: '1'

diff --git a/templates/disk-virt-sysprep/manifests/disk-virt-sysprep.yaml b/templates/disk-virt-sysprep/manifests/disk-virt-sysprep.yaml
@@ -45,8 +45,6 @@ spec:
           value: direct
         - name: LIBGUESTFS_PATH
           value: /mnt/appliance
-      securityContext:
-        runAsUser: 0
       resources:
         limits:
           devices.kubevirt.io/kvm: '1'