Skip to content

Commit 1002fd5

Browse files
blang9238HN23
blang9238
and
HN23
authored
Adds support for sidecars to address #511 (#531)
* enterprise: adding support for additional initContainers * enterprise: bumping chart version to 3.18, update readme and adding sidecar keys to jobs in values Signed-off-by: Ben Lang <blang@anchore.com> Signed-off-by: Hung Nguyen <me@hnguy.com> --------- Signed-off-by: Ben Lang <blang@anchore.com> Signed-off-by: Hung Nguyen <me@hnguy.com> Co-authored-by: Hung Nguyen <me@hnguy.com>
1 parent 88ed2ef commit 1002fd5

18 files changed

+264
-14
lines changed

‎stable/enterprise/.helmignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
.git
2+
.DS_Store
3+
*/.DS_Store
24
examples/

‎stable/enterprise/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v2
22
name: enterprise
3-
version: "3.17.2"
3+
version: "3.18.0"
44
appVersion: "5.23.0"
55
kubeVersion: 1.23.x - 1.34.x || 1.23.x-x - 1.34.x-x
66
description: |

‎stable/enterprise/README.md‎

Lines changed: 19 additions & 0 deletions
Large diffs are not rendered by default.

‎stable/enterprise/templates/_common.tpl‎

Lines changed: 44 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -468,6 +468,49 @@ Setup the common anchore volume mounts
468468
{{- end }}
469469
{{- end -}}
470470

471+
{{/*
472+
Helper: returns a truthy value if any initContainers (global or component-specific)
473+
are configured for the given component.
474+
475+
Usage:
476+
{{- if include "enterprise.common.hasInitContainers" (merge (dict "component" $component) .) }}
477+
...
478+
{{- end }}
479+
*/}}
480+
{{- define "enterprise.common.hasInitContainers" -}}
481+
{{- $component := .component -}}
482+
483+
{{- with .Values.initContainers -}}
484+
true
485+
{{- end }}
486+
487+
{{- if $component }}
488+
{{- with (index .Values (print $component)).initContainers -}}
489+
true
490+
{{- end }}
491+
{{- end }}
492+
493+
{{- end -}}
494+
495+
{{/*
496+
Render initContainers for a specific component
497+
Usage: {{- include "enterprise.common.initContainers" (merge (dict "component" $component) .) | nindent 8 }}
498+
*/}}
499+
{{- define "enterprise.common.initContainers" -}}
500+
{{- $component := .component -}}
501+
502+
{{/* First add any global initContainers */}}
503+
{{- with .Values.initContainers }}
504+
{{ toYaml . }}
505+
{{- end }}
506+
507+
{{/* Then add component-specific initContainers */}}
508+
{{- if $component }}
509+
{{- with (index .Values (print $component)).initContainers }}
510+
{{ toYaml . }}
511+
{{- end }}
512+
{{- end }}
513+
{{- end -}}
471514

472515
{{/*
473516
Setup the common anchore volumes
@@ -522,4 +565,4 @@ When calling this template, .anchoreService can be included in the context for a
522565
{{- toYaml $server | nindent 6 }}
523566
{{- else -}}
524567
{}{{- end }}
525-
{{- end }}
568+
{{- end }}

‎stable/enterprise/templates/analyzer_deployment.yaml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,19 @@ spec:
3030
- name: analyzer-config-volume
3131
configMap:
3232
name: {{ template "enterprise.analyzer.fullname" . }}
33-
{{- if or (and .Values.scratchVolume.fixGroupPermissions .Values.securityContext.fsGroup) (and (.Values.cloudsql.enabled) (.Values.cloudsql.useSideCar)) }}
33+
{{- if or
34+
(and .Values.scratchVolume.fixGroupPermissions .Values.securityContext.fsGroup)
35+
(and (.Values.cloudsql.enabled) (.Values.cloudsql.useSideCar))
36+
(include "enterprise.common.hasInitContainers" (merge (dict "component" $component) .))
37+
}}
3438
initContainers:
3539
{{- if and .Values.scratchVolume.fixGroupPermissions .Values.securityContext.fsGroup }}
3640
{{- include "enterprise.common.fixPermissionsInitContainer" . | nindent 8 }}
3741
{{- end -}}
42+
{{- if and (.Values.cloudsql.enabled) (.Values.cloudsql.useSideCar) }}
3843
{{- include "enterprise.common.cloudsqlInitContainer" . | nindent 8 }}
44+
{{- end }}
45+
{{- include "enterprise.common.initContainers" (merge (dict "component" $component) .) | nindent 8 }}
3946
{{- end }}
4047
containers:
4148
{{- include "enterprise.common.cloudsqlContainer" . | nindent 8 }}

‎stable/enterprise/templates/api_deployment.yaml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,15 @@ spec:
3232
configMap:
3333
name: {{ template "enterprise.fullname" . }}-policy-bundles
3434
{{- end }}
35-
{{- if and (.Values.cloudsql.enabled) (.Values.cloudsql.useSideCar) }}
35+
{{- if or
36+
(and (.Values.cloudsql.enabled) (.Values.cloudsql.useSideCar))
37+
(include "enterprise.common.hasInitContainers" (merge (dict "component" $component) .))
38+
}}
3639
initContainers:
40+
{{- include "enterprise.common.initContainers" (merge (dict "component" $component) .) | nindent 8 }}
41+
{{- if and (.Values.cloudsql.enabled) (.Values.cloudsql.useSideCar) }}
3742
{{- include "enterprise.common.cloudsqlInitContainer" . | nindent 8 }}
43+
{{- end }}
3844
{{- end }}
3945
containers:
4046
{{- include "enterprise.common.cloudsqlContainer" . | nindent 8 }}

‎stable/enterprise/templates/catalog_deployment.yaml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,19 @@ spec:
3434
configMap:
3535
name: {{ template "enterprise.fullname" . }}-policy-bundles
3636
{{- end }}
37-
{{- if or (and .Values.scratchVolume.fixGroupPermissions .Values.securityContext.fsGroup) (and (.Values.cloudsql.enabled) (.Values.cloudsql.useSideCar)) }}
37+
{{- if or
38+
(and .Values.scratchVolume.fixGroupPermissions .Values.securityContext.fsGroup)
39+
(and (.Values.cloudsql.enabled) (.Values.cloudsql.useSideCar))
40+
(include "enterprise.common.hasInitContainers" (merge (dict "component" $component) .))
41+
}}
3842
initContainers:
3943
{{- if and .Values.scratchVolume.fixGroupPermissions .Values.securityContext.fsGroup }}
4044
{{- include "enterprise.common.fixPermissionsInitContainer" . | nindent 8 }}
4145
{{- end -}}
46+
{{- if and (.Values.cloudsql.enabled) (.Values.cloudsql.useSideCar) }}
4247
{{- include "enterprise.common.cloudsqlInitContainer" . | nindent 8 }}
48+
{{- end }}
49+
{{- include "enterprise.common.initContainers" (merge (dict "component" $component) .) | nindent 8 }}
4350
{{- end }}
4451
containers:
4552
{{- if .Values.cloudsql.enabled }}

‎stable/enterprise/templates/datasyncer_deployment.yaml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,19 @@ spec:
2626
volumes: {{- include "enterprise.common.volumes" (merge (dict "component" $component) .) | nindent 8 }}
2727
- name: anchore-scratch
2828
{{- include "enterprise.common.scratchVolume.details" (merge (dict "component" $component) .) | nindent 10 }}
29-
{{- if or (and .Values.scratchVolume.fixGroupPermissions .Values.securityContext.fsGroup) (and (.Values.cloudsql.enabled) (.Values.cloudsql.useSideCar)) }}
29+
{{- if or
30+
(and .Values.scratchVolume.fixGroupPermissions .Values.securityContext.fsGroup)
31+
(and (.Values.cloudsql.enabled) (.Values.cloudsql.useSideCar))
32+
(include "enterprise.common.hasInitContainers" (merge (dict "component" $component) .))
33+
}}
3034
initContainers:
3135
{{- if and .Values.scratchVolume.fixGroupPermissions .Values.securityContext.fsGroup }}
3236
{{- include "enterprise.common.fixPermissionsInitContainer" . | nindent 8 }}
3337
{{- end -}}
38+
{{- if and (.Values.cloudsql.enabled) (.Values.cloudsql.useSideCar) }}
3439
{{- include "enterprise.common.cloudsqlInitContainer" . | nindent 8 }}
40+
{{- end }}
41+
{{- include "enterprise.common.initContainers" (merge (dict "component" $component) .) | nindent 8 }}
3542
{{- end }}
3643
containers:
3744
{{- if .Values.cloudsql.enabled }}

‎stable/enterprise/templates/hooks/post-upgrade/upgrade_job.yaml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,15 @@ spec:
3535
secret:
3636
secretName: {{ .Values.cloudsql.serviceAccSecretName }}
3737
{{- end }}
38-
{{- if and (.Values.cloudsql.enabled) (.Values.cloudsql.useSideCar) }}
38+
{{- if or
39+
(and .Values.cloudsql.enabled .Values.cloudsql.useSideCar)
40+
(include "enterprise.common.hasInitContainers" (merge (dict "component" $component) .))
41+
}}
3942
initContainers:
43+
{{- if and .Values.cloudsql.enabled .Values.cloudsql.useSideCar }}
4044
{{- include "enterprise.common.cloudsqlContainer" . | nindent 8 }}
45+
{{- end }}
46+
{{- include "enterprise.common.initContainers" (merge (dict "component" $component) .) | nindent 8 }}
4147
{{- end }}
4248
containers:
4349
{{- if and (.Values.cloudsql.enabled) (not .Values.cloudsql.useSideCar) }}

‎stable/enterprise/templates/hooks/pre-upgrade/object_store_analysis_archive_migration_job.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,9 @@ spec:
9999
{{- with .Values.osaaMigrationJob.resources }}
100100
resources: {{- toYaml . | nindent 12 }}
101101
{{- end }}
102+
{{- if include "enterprise.common.hasInitContainers" (merge (dict "component" $component) .) }}
103+
{{- include "enterprise.common.initContainers" (merge (dict "component" $component) .) | nindent 8 }}
104+
{{- end }}
102105
containers:
103106
{{- if .Values.cloudsql.enabled }}
104107
{{- include "enterprise.common.cloudsqlContainer" . | nindent 8 }}

0 commit comments

Comments
 (0)