chore: tidy initContainers

- make initcontainers easier to read/follow
2026-03-21 16:55:35 +11:00
parent ee9ec23f6f
commit 125b844060
3 changed files with 57 additions and 49 deletions
@@ -99,27 +99,28 @@ spec:
              name: vault-ca-cert
              subPath: ca.crt
      initContainers:
-        - args:
-            - mkdir -p /etc/puppetlabs/puppet/eyaml/keys;
-              cp /tmp/puppet/configmap/check_for_masters.sh /etc/puppetlabs/puppet/check_for_masters.sh;
-              chown puppet:puppet /etc/puppetlabs/puppet/check_for_masters.sh;
-              chmod +x /etc/puppetlabs/puppet/check_for_masters.sh;
-              bash /etc/puppetlabs/puppet/check_for_masters.sh;
-              mkdir -p /etc/puppetlabs/code/environments;
-              mkdir -p /etc/puppetlabs/puppet/manifests;
-              chown -R puppet:puppet /etc/puppetlabs;
-              mkdir -p /opt/puppetlabs/server/data/puppetserver/dropsonde/bin/;
-              touch /opt/puppetlabs/server/data/puppetserver/dropsonde/bin/dropsonde;
-              chown puppet:puppet -R /opt/puppetlabs/server/data/puppetserver/;
+        - name: perms-and-dirs
+          image: ghcr.io/openvoxproject/openvoxserver:8.8.0-main
+          imagePullPolicy: IfNotPresent
          command:
            - sh
            - -c
+          args:
+            - |
+              mkdir -p /etc/puppetlabs/puppet/eyaml/keys
+              cp /tmp/puppet/configmap/check_for_masters.sh /etc/puppetlabs/puppet/check_for_masters.sh
+              chown puppet:puppet /etc/puppetlabs/puppet/check_for_masters.sh
+              chmod +x /etc/puppetlabs/puppet/check_for_masters.sh
+              bash /etc/puppetlabs/puppet/check_for_masters.sh
+              mkdir -p /etc/puppetlabs/code/environments
+              mkdir -p /etc/puppetlabs/puppet/manifests
+              chown -R puppet:puppet /etc/puppetlabs
+              mkdir -p /opt/puppetlabs/server/data/puppetserver/dropsonde/bin/
+              touch /opt/puppetlabs/server/data/puppetserver/dropsonde/bin/dropsonde
+              chown puppet:puppet -R /opt/puppetlabs/server/data/puppetserver/
          envFrom:
            - configMapRef:
                name: puppetserver-init-config
-          image: ghcr.io/openvoxproject/openvoxserver:8.8.0-main
-          imagePullPolicy: IfNotPresent
-          name: perms-and-dirs
          resources:
            limits:
              cpu: 300m
@@ -128,6 +129,8 @@ spec:
              cpu: 200m
              memory: 128Mi
          securityContext:
+            runAsUser: 0
+            runAsNonRoot: false
            capabilities:
              add:
                - CAP_CHOWN
@@ -144,8 +147,6 @@ spec:
                - FOWNER
              drop:
                - all
-            runAsNonRoot: false
-            runAsUser: 0
          volumeMounts:
            - mountPath: /etc/puppetlabs/puppet/
              name: puppet-puppet-storage