From 5e52b4df04cdf7f43f9ec71612a4552312da404a Mon Sep 17 00:00:00 2001 From: Brandt Keller Date: Fri, 15 Aug 2025 22:43:10 +0000 Subject: [PATCH 1/2] feat(guac): support for oci-collector extra volumes Signed-off-by: Brandt Keller --- charts/guac/templates/oci-collector-deployment.yaml | 9 ++++++++- charts/guac/values.yaml | 10 ++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/charts/guac/templates/oci-collector-deployment.yaml b/charts/guac/templates/oci-collector-deployment.yaml index 400abec..1cdd9a1 100644 --- a/charts/guac/templates/oci-collector-deployment.yaml +++ b/charts/guac/templates/oci-collector-deployment.yaml @@ -51,6 +51,9 @@ spec: - name: guac-config mountPath: {{ .Values.guac.guacImage.workingDir }} readOnly: true + {{- with .Values.guac.ociCollector.extraVolumeMounts }} + {{- toYaml . | nindent 10 }} + {{- end }} {{- if or .Values.guac.common.env .Values.guac.ociCollector.env }} env: @@ -70,6 +73,10 @@ spec: - name: guac-config configMap: name: guac-cm + {{- with .Values.guac.ociCollector.extraVolumes }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- if .Values.guac.ociCollector.nodeSelector }} nodeSelector: {{ toYaml .Values.guac.ociCollector.nodeSelector | indent 8 }} @@ -85,5 +92,5 @@ spec: {{- end }} {{- end }} - {{- end }} + diff --git a/charts/guac/values.yaml b/charts/guac/values.yaml index 43e926c..965c182 100644 --- a/charts/guac/values.yaml +++ b/charts/guac/values.yaml @@ -213,6 +213,16 @@ guac: # requests: # cpu: "0.25" # memory: "0.5G" + extraVolumeMounts: [] + # Example: mount a secret read-only + # - name: reg-creds + # mountPath: /var/run/registry-creds + # readOnly: true + extraVolumes: [] + # - name: reg-creds + # secret: + # secretName: my-registry-creds + # optional: false depsDevCollector: enabled: true From d84f81cbd2cac7a3baa3d7b7da6b53746731f219 Mon Sep 17 00:00:00 2001 From: Brandt Keller Date: Fri, 15 Aug 2025 22:48:04 +0000 Subject: [PATCH 2/2] fix(guac): add parameter documentation Signed-off-by: Brandt Keller --- charts/guac/values.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/charts/guac/values.yaml b/charts/guac/values.yaml index 965c182..47dfa92 100644 --- a/charts/guac/values.yaml +++ b/charts/guac/values.yaml @@ -32,6 +32,8 @@ imagePullSecrets: ## @param guac.ociCollector.serviceAccount.create - whether to create OCI Collector service account ## @param guac.ociCollector.serviceAccount.annotations - OCI Collector service account annotations ## @param guac.ociCollector.resources - [map] resource requests or limits of the ociCollector deployment +## @param guac.ociCollector.extraVolumeMounts - [map] extra volume mounts for the ociCollector deployment +## @param guac.ociCollector.extraVolumes - [map] extra volumes for the ociCollector deployment ## @param guac.depsDevCollector.enabled String Whether to deploy Deps.Dev Collector ## @param guac.depsDevCollector.name String Name of the Deps.Dev Collector component. ## @param guac.depsDevCollector.annotations.reloader.stakater.com/auto [string] Boolean for deploying [stakater/Reloader] (https://github.com/stakater/Reloader)