Merge pull request #8 from GitGuardian/ctourriere/-/fix_cronjob_naming

fix(cronjob): Fix cronjob naming
GitGuardian · Jan 13, 2025 · 6762d41 · 6762d41
2 parents 3ef604f + 17251ab
commit 6762d41
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 8 deletions.
diff --git a/charts/nhi-scout/templates/_cronjob.tpl b/charts/nhi-scout/templates/_cronjob.tpl
@@ -2,7 +2,7 @@
 apiVersion: batch/v1
 kind: CronJob
 metadata:
-  name: {{ .cronjob_name }}-{{ include "nhi-scout.fullname" . }}
+  name: {{ include "nhi-scout.fullname" . }}-{{ .cronjob_name }}
   labels:
     {{- include "nhi-scout.labels" . | nindent 4 }}
 spec:

diff --git a/charts/nhi-scout/templates/cronjob_inventory.yaml b/charts/nhi-scout/templates/cronjob_inventory.yaml
@@ -3,4 +3,4 @@
 {{ $command = "fetch-and-send" -}}
 {{- end }}
 
-{{ include "nhi-scout.cronjob" (merge . (dict "cronjob_name" "inventory" "command" $command) ) }}
+{{ include "nhi-scout.cronjob" (merge (dict "cronjob_name" "inventory" "command" $command) .) -}}
diff --git a/charts/nhi-scout/templates/cronjob_sync.yaml b/charts/nhi-scout/templates/cronjob_sync.yaml
@@ -1,3 +1,3 @@
-{{ if .Values.inventory.config.gitguardian }}
-{{ include "nhi-scout.cronjob" (merge . (dict "cronjob_name" "sync" "command" "sync-secrets") ) }}
-{{ end }}
+{{- if .Values.inventory.sync }}
+{{ include "nhi-scout.cronjob" (merge (dict "cronjob_name" "sync" "command" "sync-secrets") .) -}}
+{{- end }}
diff --git a/charts/nhi-scout/test_values.yaml b/charts/nhi-scout/test_values.yaml
@@ -2,6 +2,7 @@
 # yaml-language-server: $schema=values.schema.json
 
 inventory:
+  sync: false
   config:
     sources: {}
     gitguardian: null

diff --git a/charts/nhi-scout/tests/base_cronjob_test.yaml b/charts/nhi-scout/tests/base_cronjob_test.yaml
@@ -5,7 +5,6 @@ values:
 - ../test_values.yaml
 templates:
 - cronjob_inventory.yaml
-- cronjob_sync.yaml
 set:
   inventory.config.gitguardian.api_token: "foobar"
   inventory.config.gitguardian.endpoint: "https://some-url.com"

diff --git a/charts/nhi-scout/tests/inventory_cronjob_test.yaml b/charts/nhi-scout/tests/inventory_cronjob_test.yaml
@@ -14,7 +14,7 @@ tests:
       of: CronJob
   - matchRegex:
       path: metadata.name
-      pattern: inventory-.*-nhi-scout$
+      pattern: .*-nhi-scout-inventory$
 
 - it: should use the gitguardian command if set
   set:

diff --git a/charts/nhi-scout/tests/sync_cronjob_test.yaml b/charts/nhi-scout/tests/sync_cronjob_test.yaml
@@ -6,6 +6,7 @@ values:
 templates:
 - cronjob_sync.yaml
 set:
+  inventory.sync: true
   inventory.config.gitguardian.api_token: "foobar"
   inventory.config.gitguardian.endpoint: "https://some-url.com"
 tests:
@@ -17,7 +18,7 @@ tests:
       of: CronJob
   - matchRegex:
       path: metadata.name
-      pattern: sync-.*-nhi-scout$
+      pattern: .*-nhi-scout-sync$
 
 - it: should use the gitguardian command if set
   asserts: