feat(base-cluster/flux): add option to add a path inside the kustomiz… (

#876)

charts/base-cluster/ci/flux-gitrepositories-gen-values.sh

@@ -7,12 +7,14 @@ set -o pipefail
 
 i=0
 for url in 'url="https://github.com"' 'url="ssh://[email protected]/group/name.git"'; do
-  for extra in 'branch="main"' 'commit="549aee1"' 'semver="1.0.0"' 'tag="2.0.1"' ''; do
-    for decr in 'decryption={provider:"sops"}' ''; do
-      for auth in 'username="user" | .password="pass"' ''; do
-        for git in 'gitInterval="5m"' ''; do
-          [[ $url = *ssh* ]] && [[ -n "$auth" ]] && continue
-          yq -y -n "{main$((i++)): ({} | .$url | .$extra | .$decr | .$auth | .$git)}"
+  for path in 'path="prod"' ''; do
+    for extra in 'branch="main"' 'commit="549aee1"' 'semver="1.0.0"' 'tag="2.0.1"' ''; do
+      for decr in 'decryption={provider:"sops"}' ''; do
+        for auth in 'username="user" | .password="pass"' ''; do
+          for git in 'gitInterval="5m"' ''; do
+            [[ $url = *ssh* ]] && [[ -n "$auth" ]] && continue
+            yq -y -n "{main$((i++)): ({} | .$url | .$path | .$extra | .$decr | .$auth | .$git)}"
+          done
         done
       done
     done

charts/base-cluster/templates/flux/flux.yaml

@@ -2,7 +2,7 @@
   {{- $authenticationMethod := (list nil) | first -}}
   {{- if and $instance.username $instance.password -}}
     {{- $authenticationMethod = "password" -}}
-  {{- else if regexMatch "^ssh://" $instance.url -}}
+  {{- else if hasPrefix "ssh://" $instance.url -}}
     {{- $authenticationMethod = "ssh" -}}
   {{- end -}}
   {{- $authenticationSecretName := printf "%s-flux-%s" (include "common.names.fullname" $) $name -}}
@@ -81,6 +81,9 @@ spec:
     kind: GitRepository
     name: {{ printf "%s-flux-%s" (include "common.names.fullname" $) $name }}
     namespace: {{ $.Release.Namespace }}
+  {{- if $instance.path }}
+  path: {{ include "common.tplvalues.render" (dict "value" $instance.path "context" $) | quote }}
+  {{- end }}
   {{- if $instance.decryption }}
   decryption:
     provider: {{ $instance.decryption.provider | quote }}

charts/base-cluster/values.schema.json

@@ -1054,6 +1054,9 @@
               "tag": {
                 "type": "string"
               },
+              "path": {
+                "type": "string"
+              },
               "gitInterval": {
                 "type": "string",
                 "description": "The interval in which to sync the repository",