feat: Add support for extraContainers (#67)

Signed-off-by: Asgeir Nilsen <[email protected]>

Author: asgeirn

charts/zot/Chart.yaml

@@ -3,4 +3,4 @@ appVersion: v2.1.5
 description: A Helm chart for Kubernetes
 name: zot
 type: application
-version: 0.1.73
+version: 0.1.74

charts/zot/templates/deployment.yaml

@@ -121,6 +121,9 @@ spec:
               {{- end }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
+      {{- with .Values.extraContainers }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       volumes:
         - name: data
           emptyDir: {}
@@ -159,4 +162,4 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       dnsPolicy: {{ .Values.dnsPolicy }}
-{{ end }}
+{{ end }}

charts/zot/templates/statefulset.yaml

@@ -134,6 +134,9 @@ spec:
               {{- end }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
+      {{- with .Values.extraContainers }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       {{- if or .Values.mountConfig .Values.mountSecret .Values.externalSecrets (not (empty .Values.extraVolumes)) }}
       volumes:
       {{- if .Values.mountConfig }}

charts/zot/values.yaml

@@ -172,6 +172,12 @@ extraVolumes: []
 # - name: data
 #   emptyDir: {}
 
+# Extra Containers running alongside the main container
+extraContainers: []
+# - name: data
+#   image: busybox
+#   command: ["sleep", "infinity"]
+
 # Deployment strategy type
 strategy:
   type: RollingUpdate

tests/ci/extra-container-persistence/.helmignore

@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/

tests/ci/extra-container-persistence/Chart.yaml

@@ -0,0 +1,10 @@
+apiVersion: v2
+name: extra-container-persistence
+description: Test chart for zot extra-container values with persistence enabled
+type: application
+version: 0.1.0
+appVersion: "0.1.0"
+dependencies:
+- name: zot
+  version: ~0.1.39
+  repository: "file://../../../charts/zot"

tests/ci/extra-container-persistence/values.yaml

@@ -0,0 +1,61 @@
+zot:
+  # Enable persistence to test extraContainers with StatefulSet
+  persistence: true
+
+  # PVC configuration for StatefulSet
+  pvc:
+    create: true
+    storage: 1Gi
+    accessModes: ["ReadWriteOnce"]
+
+  # Test extraContainers functionality with StatefulSet
+  extraContainers:
+    - name: sidecar-redis
+      image: redis:alpine
+      ports:
+        - containerPort: 6379
+          name: redis
+          protocol: TCP
+      command: ["redis-server"]
+      args: ["--appendonly", "yes"]
+      volumeMounts:
+        - name: redis-data
+          mountPath: /data
+      resources:
+        limits:
+          memory: "256Mi"
+          cpu: "200m"
+        requests:
+          memory: "128Mi"
+          cpu: "100m"
+    - name: monitoring-agent
+      image: busybox:latest
+      command: ["sh", "-c"]
+      args: ["while true; do echo 'Monitoring StatefulSet pod'; df -h; sleep 60; done"]
+      resources:
+        limits:
+          memory: "64Mi"
+          cpu: "50m"
+        requests:
+          memory: "32Mi"
+          cpu: "25m"
+
+  # Add extra volumes to support the sidecar containers
+  extraVolumes:
+    - name: redis-data
+      emptyDir: {}
+
+  # Set security context for testing
+  securityContext:
+    runAsUser: 1000
+    runAsGroup: 1000
+    fsGroup: 1000
+
+  # Use lower resource requirements for testing
+  resources:
+    limits:
+      memory: "512Mi"
+      cpu: "500m"
+    requests:
+      memory: "256Mi"
+      cpu: "250m"

tests/ci/extra-container/.helmignore

@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/

tests/ci/extra-container/Chart.yaml

@@ -0,0 +1,10 @@
+apiVersion: v2
+name: extra-container
+description: Test chart for zot extra-container values
+type: application
+version: 0.1.0
+appVersion: "0.1.0"
+dependencies:
+- name: zot
+  version: ~0.1.39
+  repository: "file://../../../charts/zot"

tests/ci/extra-container/values.yaml

@@ -0,0 +1,41 @@
+zot:
+  # Test extraContainers functionality with both deployment and statefulset scenarios
+  extraContainers:
+    - name: sidecar-nginx
+      image: nginx:alpine
+      ports:
+        - containerPort: 80
+          name: http
+          protocol: TCP
+      volumeMounts:
+        - name: shared-data
+          mountPath: /usr/share/nginx/html
+      resources:
+        limits:
+          memory: "128Mi"
+          cpu: "100m"
+        requests:
+          memory: "64Mi"
+          cpu: "50m"
+    - name: busybox-logger
+      image: busybox:latest
+      command: ["sh", "-c"]
+      args: ["while true; do echo 'Logging from sidecar'; sleep 30; done"]
+      resources:
+        limits:
+          memory: "64Mi"
+          cpu: "50m"
+        requests:
+          memory: "32Mi"
+          cpu: "25m"
+
+  # Add extra volumes to support the sidecar containers
+  extraVolumes:
+    - name: shared-data
+      emptyDir: {}
+
+  # Set security context for testing
+  securityContext:
+    runAsUser: 1000
+    runAsGroup: 1000
+    fsGroup: 1000