Merge pull request #23 from dnvgl/fluxAutomationFix

Fixed the flux image automation policy that always included default n…
dnvgl · Apr 13, 2023 · 642b183 · 642b183
2 parents a8844d4 + 1f5f180
commit 642b183
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 8 deletions.
diff --git a/charts/platform-service/Chart.yaml b/charts/platform-service/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
 appVersion: "1.1"
 description: Platform service chart
 name: platform-service
-version: 1.2.0
+version: 1.2.1
diff --git a/charts/platform-service/templates/image-policy.yaml b/charts/platform-service/templates/image-policy.yaml
@@ -9,5 +9,11 @@ spec:
 {{- if .Values.image.fluxAutomation.filterTags }}
   filterTags: {{ .Values.image.fluxAutomation.filterTags | toYaml | nindent 4 }}
 {{- end }}
-  policy: {{ (required "policy is required when fluxAutomation is enabled" .Values.image.fluxAutomation.policy) | toYaml | nindent 4 }}
+{{- if .Values.image.fluxAutomation.policy }}
+  policy: {{ .Values.image.fluxAutomation.policy | toYaml | nindent 4 }}
+{{- else }}
+  policy:
+    numerical:
+      order: asc
+{{- end }}
 {{- end }}
diff --git a/charts/platform-service/values.yaml b/charts/platform-service/values.yaml
@@ -33,9 +33,9 @@ image:
     #filterTags:
     #  pattern: '^dev-(?P<build>.*)'
     #  extract: '$build'
-    policy:
-      numerical:
-        order: asc
+    #policy:
+    #  numerical:
+    #    order: asc
 # deploymentOnly -- This workload is an addon to another for the same app - only create the deployment and destination rule
 deploymentOnly: false
 

diff --git a/testing/generate-results.sh b/testing/generate-results.sh
@@ -90,7 +90,7 @@ helm template test-release ../charts/platform-service -n test-ns -f values.yaml
     > results/default-image-automation.yaml
 
 helm template test-release ../charts/platform-service -n test-ns -f values.yaml \
-    --set image.fluxAutomation.enabled=true,image.fluxAutomation.filterTags.pattern='^dev-(?P<build>.*)',image.fluxAutomation.filterTags.extract='$build',image.fluxAutomation.policy.numerical.order=asc \
+    --set image.fluxAutomation.enabled=true,image.fluxAutomation.filterTags.pattern='^dev-(?P<build>.*)',image.fluxAutomation.filterTags.extract='$build',image.fluxAutomation.policy.semver.range='> 0' \
     --show-only templates/image-policy.yaml \
     --show-only templates/image-repository.yaml \
     --debug \

diff --git a/testing/results/image-automation-options.yaml b/testing/results/image-automation-options.yaml
@@ -11,8 +11,8 @@ spec:
     extract: $build
     pattern: ^dev-(?P<build>.*)
   policy: 
-    numerical:
-      order: asc
+    semver:
+      range: '> 0'
 ---
 # Source: platform-service/templates/image-repository.yaml
 apiVersion: image.toolkit.fluxcd.io/v1beta1