Update values comments & validation to match spec

Contrast-Security-OSS · Jan 26, 2024 · 3e7403b · 3e7403b
1 parent c3c967c
commit 3e7403b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/manifests/helm/templates/agent-injectors.yaml.tpl b/manifests/helm/templates/agent-injectors.yaml.tpl
@@ -27,18 +27,17 @@ spec:
   image:
     {{- $injector.image | toYaml | nindent 4 }}
   {{- end}}
+  {{- if or $injector.selector $injector.images }}
   {{ $selector := $injector.selector | default dict -}}
-  {{- $labels := $selector.labels -}}
-  {{- $images := $selector.images -}}
-  {{- $_ := required "One of injector.selector.labels or injector.selector.images required" (coalesce $labels $images) -}}
   selector:
-  {{- if $labels }}
+  {{- if $selector.labels }}
     labels:
-      {{- $labels | toYaml | nindent 6 }}
+      {{- $selector.labels | toYaml | nindent 6 }}
   {{- end }}
-  {{- if $images }}
+  {{- if $selector.images }}
     images:
-      {{- $images | toYaml | nindent 6 }}
+      {{- $selector.images | toYaml | nindent 6 }}
+  {{- end }}
   {{- end }}
 {{- end }}
 {{- end }}

diff --git a/manifests/helm/values.yaml b/manifests/helm/values.yaml
@@ -65,13 +65,17 @@ agentInjectors:
       name: contrast-java-injector
       # Optional, defaults to true (enabled)
       enabled: true
-      #Required. This injector will be created in each specified namespace.
+      # Required. This injector will be created in each specified namespace.
       namespaces:
         - default
+      # Optional, specify labels and/or image names to inject. If omitted, all workloads will be injected.
+      # Label selections are cumulative using the logical AND operation.
       selector:
         labels:
           - name: contrast-agent
             value: java
+        #images:
+        #  - imagename
       # Optional image configuration.
       # image:
       #   registry: docker.io/contrast