fix(common): correctly disable host docker-compose (#1964)

* fix(common): correctly disable host docker-compose

* whoopsies

charts/library/common/Chart.yaml

@@ -15,4 +15,4 @@ maintainers:
 name: common
 sources: null
 type: library
-version: 8.17.0
+version: 8.17.1

charts/library/common/templates/lib/controller/_hostpatch.tpl

@@ -1,6 +1,7 @@
 {{/*
 This template serves as the blueprint for the mountPermissions job that is run
 before chart installation.
+TODO: delete docker compose deletion once iX has disabled it
 */}}
 {{- define "common.controller.hostpatch" -}}
 - name: hostpatch
@@ -11,5 +12,10 @@ before chart installation.
   command:
     - "/bin/sh"
     - "-c"
-    - ( sysctl -w fs.inotify.max_user_watches=524288 || echo "error setting inotify") && ( sysctl -w fs.inotify.max_user_instances=512 || echo "error setting inotify")&& ( chmod -x /usr/bin/docker-compose || echo "error locking docker-compose") && ( chmod -x /bin/docker-compose || echo "error locking docker-compose" )
+    - ( sysctl -w fs.inotify.max_user_watches=524288 || echo "error setting inotify") && ( sysctl -w fs.inotify.max_user_instances=512 || echo "error setting inotify") && ( chmod -x /host/usr/bin/docker-compose || echo "error locking docker-compose") && ( chmod -x /host/usr/bin/docker-compose || echo "error locking docker-compose")
+  volumeMounts:
+    - mountPath: /host/usr/bin
+      name: host-usr-bin
+    - mountPath: /host/bin
+      name: host-bin
 {{- end -}}

charts/library/common/values.yaml

@@ -741,6 +741,34 @@ persistence:
     sizeLimit:  # 1Gi
 
 
+  # -- Hostpath mountpoint to allow mounting the /usr/bin folder to disable docker-compose
+  # [[ref]]https://kubernetes.io/docs/concepts/storage/volumes/#hostpath)
+  # @default -- See below
+  # TODO Delete this once iX has blocked docker-compose
+  host-usr-bin:
+    enabled: true
+    noMount: true
+    type: hostPath
+    # -- Which path on the host should be mounted.
+    hostPath: /usr/bin
+    # -- Where to mount the path in the main container.
+    # Defaults to the value of `hostPath`
+    mountPath: "/host/usr/bin"
+
+  # -- Hostpath mountpoint to allow mounting the /bin folder to disable docker-compose
+  # [[ref]]https://kubernetes.io/docs/concepts/storage/volumes/#hostpath)
+  # @default -- See below
+  # TODO Delete this once iX has blocked docker-compose
+  host-bin:
+    enabled: true
+    noMount: true
+    type: hostPath
+    # -- Which path on the host should be mounted.
+    hostPath: /bin
+    # -- Where to mount the path in the main container.
+    # Defaults to the value of `hostPath`
+    mountPath: "/host/bin"
+
   # -- Example of a hostPath mount
   # [[ref]]https://kubernetes.io/docs/concepts/storage/volumes/#hostpath)
   # @default -- See below