Merge pull request #390 from mbaldessari/common-automatic-update

common automatic update
validatedpatterns · Jun 29, 2024 · 0a6d59e · 0a6d59e
2 parents d97644d + 7a4b050
commit 0a6d59e
Show file tree

Hide file tree

Showing 24 changed files with 574 additions and 150 deletions.
diff --git a/common/acm/Chart.yaml b/common/acm/Chart.yaml
@@ -3,4 +3,4 @@ description: A Helm chart to configure Advanced Cluster Manager for OpenShift.
 keywords:
 - pattern
 name: acm
-version: 0.0.1
+version: 0.0.2
diff --git a/common/acm/templates/_helpers.tpl b/common/acm/templates/_helpers.tpl
@@ -11,3 +11,47 @@ Default always defined valueFiles to be included when pushing the cluster wide a
 # hub's cluster version, whereas we want to include the spoke cluster version
 - '/values-{{ `{{ printf "%d.%d" ((semver (index (lookup "config.openshift.io/v1" "ClusterVersion" "" "version").status.history 0).version).Major) ((semver (index (lookup "config.openshift.io/v1" "ClusterVersion" "" "version").status.history 0).version).Minor) }}` }}.yaml'
 {{- end }} {{- /*acm.app.policies.valuefiles */}}
+
+{{- define "acm.app.policies.multisourcevaluefiles" -}}
+- "$patternref/values-global.yaml"
+- "$patternref/values-{{ .name }}.yaml"
+- '$patternref/values-{{ `{{ (lookup "config.openshift.io/v1" "Infrastructure" "" "cluster").spec.platformSpec.type }}` }}.yaml'
+- '$patternref/values-{{ `{{ (lookup "config.openshift.io/v1" "Infrastructure" "" "cluster").spec.platformSpec.type }}` }}-{{ `{{ printf "%d.%d" ((semver (index (lookup "config.openshift.io/v1" "ClusterVersion" "" "version").status.history 0).version).Major) ((semver (index (lookup "config.openshift.io/v1" "ClusterVersion" "" "version").status.history 0).version).Minor) }}` }}.yaml'
+- '$patternref/values-{{ `{{ (lookup "config.openshift.io/v1" "Infrastructure" "" "cluster").spec.platformSpec.type }}` }}-{{ .name }}.yaml'
+# We cannot use $.Values.global.clusterVersion because that gets resolved to the
+# hub's cluster version, whereas we want to include the spoke cluster version
+- '$patternref/values-{{ `{{ printf "%d.%d" ((semver (index (lookup "config.openshift.io/v1" "ClusterVersion" "" "version").status.history 0).version).Major) ((semver (index (lookup "config.openshift.io/v1" "ClusterVersion" "" "version").status.history 0).version).Minor) }}` }}.yaml'
+{{- end }} {{- /*acm.app.policies.multisourcevaluefiles */}}
+
+{{- define "acm.app.policies.helmparameters" -}}
+- name: global.repoURL
+  value: {{ $.Values.global.repoURL }}
+- name: global.targetRevision
+  value: {{ $.Values.global.targetRevision }}
+- name: global.namespace
+  value: $ARGOCD_APP_NAMESPACE
+- name: global.pattern
+  value: {{ $.Values.global.pattern }}
+- name: global.hubClusterDomain
+  value: {{ $.Values.global.hubClusterDomain }}
+- name: global.localClusterDomain
+  value: '{{ `{{ (lookup "config.openshift.io/v1" "Ingress" "" "cluster").spec.domain }}` }}'
+- name: global.clusterDomain
+  value: '{{ `{{ (lookup "config.openshift.io/v1" "Ingress" "" "cluster").spec.domain | replace "apps." "" }}` }}'
+- name: global.clusterVersion
+  value: '{{ `{{ printf "%d.%d" ((semver (index (lookup "config.openshift.io/v1" "ClusterVersion" "" "version").status.history 0).version).Major) ((semver (index (lookup "config.openshift.io/v1" "ClusterVersion" "" "version").status.history 0).version).Minor) }}` }}'
+- name: global.localClusterName
+  value: '{{ `{{ (split "." (lookup "config.openshift.io/v1" "Ingress" "" "cluster").spec.domain)._1 }}` }}'
+- name: global.clusterPlatform
+  value: {{ $.Values.global.clusterPlatform }}
+- name: global.multiSourceSupport
+  value: {{ $.Values.global.multiSourceSupport | quote }}
+- name: global.multiSourceRepoUrl
+  value: {{ $.Values.global.multiSourceRepoUrl }}
+- name: global.multiSourceTargetRevision
+  value: {{ $.Values.global.multiSourceTargetRevision }}
+- name: global.privateRepo
+  value: {{ $.Values.global.privateRepo | quote }}
+- name: global.experimentalCapabilities
+  value: {{ $.Values.global.experimentalCapabilities }}
+{{- end }} {{- /*acm.app.policies.helmparameters */}}
diff --git a/common/acm/templates/policies/application-policies.yaml b/common/acm/templates/policies/application-policies.yaml
@@ -36,6 +36,46 @@ spec:
                   - resources-finalizer.argocd.argoproj.io/foreground
                 spec:
                   project: default
+                  {{- if $.Values.global.multiSourceSupport }}
+                  sources:
+                    - repoURL: {{ coalesce .repoURL $.Values.global.repoURL }}
+                      targetRevision: {{ coalesce .targetRevision $.Values.global.targetRevision }}
+                      ref: patternref
+                    - repoURL: {{ $.Values.global.multiSourceRepoUrl }}
+                      targetRevision: {{ $.Values.global.multiSourceTargetRevision }}
+                      helm:
+                        ignoreMissingValueFiles: true
+                        values: |
+                          extraParametersNested:
+                          {{- range $k, $v := $.Values.extraParametersNested }}
+                            {{ $k }}: {{ printf "%s" $v | quote }}
+                          {{- end }}
+                        valueFiles:
+                        {{- include "acm.app.policies.multisourcevaluefiles" . | nindent 26 }}
+                        {{- range $valueFile := .extraValueFiles }}
+                        - {{ $valueFile | quote }}
+                        {{- end }}
+                        parameters:
+                        {{- include "acm.app.policies.helmparameters" $ | nindent 26 }}
+                        - name: clusterGroup.name
+                          value: {{ $group.name }}
+                        {{- range $k, $v := $.Values.extraParametersNested }}
+                        - name: {{ $k }}
+                          value: {{ printf "%s" $v | quote }}
+                        {{- end }}
+                       {{- range .helmOverrides }}
+                        - name: {{ .name }}
+                          value: {{ .value | quote }}
+                       {{- end }}
+                       {{- if .fileParameters }}
+                        fileParameters:
+                        {{- range .fileParameters }}
+                        - name: {{ .name }}
+                          path: {{ .path }}
+                        {{- end }}
+                       {{- end }}
+
+                  {{- else }}
                   source:
                     repoURL: {{ coalesce .repoURL $.Values.global.repoURL }}
                     targetRevision: {{ coalesce .targetRevision $.Values.global.targetRevision }}
@@ -53,30 +93,9 @@ spec:
                       - {{ $valueFile | quote }}
                       {{- end }}
                       parameters:
-                      - name: global.repoURL
-                        value: {{ $.Values.global.repoURL }}
-                      - name: global.targetRevision
-                        value: {{ $.Values.global.targetRevision }}
-                      - name: global.namespace
-                        value: $ARGOCD_APP_NAMESPACE
-                      - name: global.pattern
-                        value: {{ $.Values.global.pattern }}
-                      - name: global.hubClusterDomain
-                        value: {{ $.Values.global.hubClusterDomain }}
-                      - name: global.localClusterDomain
-                        value: '{{ `{{ (lookup "config.openshift.io/v1" "Ingress" "" "cluster").spec.domain }}` }}'
-                      - name: global.clusterDomain
-                        value: '{{ `{{ (lookup "config.openshift.io/v1" "Ingress" "" "cluster").spec.domain | replace "apps." "" }}` }}'
-                      - name: global.clusterVersion
-                        value: '{{ `{{ printf "%d.%d" ((semver (index (lookup "config.openshift.io/v1" "ClusterVersion" "" "version").status.history 0).version).Major) ((semver (index (lookup "config.openshift.io/v1" "ClusterVersion" "" "version").status.history 0).version).Minor) }}` }}'
-                      - name: global.localClusterName
-                        value: '{{ `{{ (split "." (lookup "config.openshift.io/v1" "Ingress" "" "cluster").spec.domain)._1 }}` }}'
-                      - name: global.clusterPlatform
-                        value: {{ $.Values.global.clusterPlatform }}
+                      {{- include "acm.app.policies.helmparameters" $ | nindent 22 }}
                       - name: clusterGroup.name
                         value: {{ $group.name }}
-                      - name: global.experimentalCapabilities
-                        value: {{ $.Values.global.experimentalCapabilities }}
                       {{- range $k, $v := $.Values.extraParametersNested }}
                       - name: {{ $k }}
                         value: {{ printf "%s" $v | quote }}
@@ -92,6 +111,7 @@ spec:
                         path: {{ .path }}
                       {{- end }}
                      {{- end }}
+                  {{- end }}{{/* if $.Values.global.multiSourceSupport */}}
                   destination:
                     server: https://kubernetes.default.svc
                     namespace: {{ $.Values.global.pattern }}-{{ .name }}

diff --git a/common/ansible/plugins/modules/vault_load_parsed_secrets.py b/common/ansible/plugins/modules/vault_load_parsed_secrets.py
@@ -215,7 +215,7 @@ def inject_field(
         for prefix in prefixes:
             cmd = (
                 f"oc exec -n {self.namespace} {self.pod} -i -- sh -c "
-                f"\"vault kv {verb} -mount={mount} {prefix}/{secret_name} {fieldname}='{fieldvalue}'\""
+                f"\"vault kv {verb} -mount={mount} {prefix}/{secret_name} {fieldname}='\"'{fieldvalue}'\"'\""
             )
             self._run_command(cmd, attempts=3)
         return

diff --git a/common/ansible/tests/unit/test_vault_load_parsed_secrets.py b/common/ansible/tests/unit/test_vault_load_parsed_secrets.py
@@ -120,7 +120,7 @@ def test_ensure_value_injection_works(self):
                 attempts=3,
             ),
             call(
-                "oc exec -n vault vault-0 -i -- sh -c \"vault kv put -mount=secret hub/config-demo secret='value123'\"",
+                "oc exec -n vault vault-0 -i -- sh -c \"vault kv put -mount=secret hub/config-demo secret='\"'value123'\"'\"",  # noqa: E501
                 attempts=3,
             ),
         ]
@@ -159,7 +159,7 @@ def test_ensure_b64_value_injection_works(self):
                 attempts=3,
             ),
             call(
-                "oc exec -n vault vault-0 -i -- sh -c \"vault kv put -mount=secret hub/config-demo secret='dmFsdWUxMjMK'\"",  # noqa: E501
+                "oc exec -n vault vault-0 -i -- sh -c \"vault kv put -mount=secret hub/config-demo secret='\"'dmFsdWUxMjMK'\"'\"",  # noqa: E501
                 attempts=3,
             ),
         ]
@@ -198,11 +198,11 @@ def test_ensure_file_injection_works(self):
                 attempts=3,
             ),
             call(
-                "oc exec -n vault vault-0 -i -- sh -c \"vault kv put -mount=secret secret/region-one/config-demo secret='value123'\"",  # noqa: E501
+                "oc exec -n vault vault-0 -i -- sh -c \"vault kv put -mount=secret secret/region-one/config-demo secret='\"'value123'\"'\"",  # noqa: E501
                 attempts=3,
             ),
             call(
-                "oc exec -n vault vault-0 -i -- sh -c \"vault kv put -mount=secret secret/snowflake.blueprints.rhecoeng.com/config-demo secret='value123'\"",  # noqa: E501
+                "oc exec -n vault vault-0 -i -- sh -c \"vault kv put -mount=secret secret/snowflake.blueprints.rhecoeng.com/config-demo secret='\"'value123'\"'\"",  # noqa: E501
                 attempts=3,
             ),
             call(
@@ -249,11 +249,11 @@ def test_ensure_file_b64_injection_works(self):
                 attempts=3,
             ),
             call(
-                "oc exec -n vault vault-0 -i -- sh -c \"vault kv put -mount=secret secret/region-one/config-demo secret='value123'\"",  # noqa: E501
+                "oc exec -n vault vault-0 -i -- sh -c \"vault kv put -mount=secret secret/region-one/config-demo secret='\"'value123'\"'\"",  # noqa: E501
                 attempts=3,
             ),
             call(
-                "oc exec -n vault vault-0 -i -- sh -c \"vault kv put -mount=secret secret/snowflake.blueprints.rhecoeng.com/config-demo secret='value123'\"",  # noqa: E501
+                "oc exec -n vault vault-0 -i -- sh -c \"vault kv put -mount=secret secret/snowflake.blueprints.rhecoeng.com/config-demo secret='\"'value123'\"'\"",  # noqa: E501
                 attempts=3,
             ),
             call(

diff --git a/common/clustergroup/templates/_helpers.tpl b/common/clustergroup/templates/_helpers.tpl
@@ -3,9 +3,9 @@ Default always defined top-level variables for helm charts
 */}}
 {{- define "clustergroup.app.globalvalues.helmparameters" -}}
 - name: global.repoURL
-  value: $ARGOCD_APP_SOURCE_REPO_URL
+  value: {{ $.Values.global.repoURL }}
 - name: global.targetRevision
-  value: $ARGOCD_APP_SOURCE_TARGET_REVISION
+  value: {{ $.Values.global.targetRevision }}
 - name: global.namespace
   value: $ARGOCD_APP_NAMESPACE
 - name: global.pattern
@@ -18,6 +18,12 @@ Default always defined top-level variables for helm charts
   value: "{{ $.Values.global.clusterPlatform }}"
 - name: global.hubClusterDomain
   value: {{ $.Values.global.hubClusterDomain }}
+- name: global.multiSourceSupport
+  value: {{ $.Values.global.multiSourceSupport | quote }}
+- name: global.multiSourceRepoUrl
+  value: {{ $.Values.global.multiSourceRepoUrl }}
+- name: global.multiSourceTargetRevision
+  value: {{ $.Values.global.multiSourceTargetRevision }}
 - name: global.localClusterDomain
   value: {{ coalesce $.Values.global.localClusterDomain $.Values.global.hubClusterDomain }}
 - name: global.privateRepo

diff --git a/common/golang-external-secrets/Chart.yaml b/common/golang-external-secrets/Chart.yaml
@@ -3,7 +3,7 @@ description: A Helm chart to configure the golang-based external-secrets.
 keywords:
 - pattern
 name: golang-external-secrets
-version: 0.0.3
+version: 0.0.4
 dependencies:
   - name: external-secrets
     version: "0.9.19"

diff --git a/common/hashicorp-vault/Chart.yaml b/common/hashicorp-vault/Chart.yaml
@@ -3,7 +3,7 @@ description: A Helm chart to configure Hashicorp's vault.
 keywords:
 - pattern
 name: hashicorp-vault
-version: 0.0.1
+version: 0.0.2
 dependencies:
   - name: vault
     version: "0.28.0"

diff --git a/common/tests/acm-industrial-edge-hub.expected.yaml b/common/tests/acm-industrial-edge-hub.expected.yaml
@@ -438,10 +438,18 @@ spec:
                         value: '{{ (split "." (lookup "config.openshift.io/v1" "Ingress" "" "cluster").spec.domain)._1 }}'
                       - name: global.clusterPlatform
                         value: aws
-                      - name: clusterGroup.name
-                        value: factory
+                      - name: global.multiSourceSupport
+                        value: 
+                      - name: global.multiSourceRepoUrl
+                        value: 
+                      - name: global.multiSourceTargetRevision
+                        value: 
+                      - name: global.privateRepo
+                        value: 
                       - name: global.experimentalCapabilities
                         value: 
+                      - name: clusterGroup.name
+                        value: factory
                       - name: clusterGroup.isHubCluster
                         value: "false"
                   destination:

diff --git a/common/tests/acm-medical-diagnosis-hub.expected.yaml b/common/tests/acm-medical-diagnosis-hub.expected.yaml
@@ -429,10 +429,18 @@ spec:
                         value: '{{ (split "." (lookup "config.openshift.io/v1" "Ingress" "" "cluster").spec.domain)._1 }}'
                       - name: global.clusterPlatform
                         value: aws
-                      - name: clusterGroup.name
-                        value: region-one
+                      - name: global.multiSourceSupport
+                        value: 
+                      - name: global.multiSourceRepoUrl
+                        value: 
+                      - name: global.multiSourceTargetRevision
+                        value: 
+                      - name: global.privateRepo
+                        value: 
                       - name: global.experimentalCapabilities
                         value: 
+                      - name: clusterGroup.name
+                        value: region-one
                       - name: clusterGroup.isHubCluster
                         value: "false"
                   destination:

diff --git a/common/tests/acm-normal.expected.yaml b/common/tests/acm-normal.expected.yaml
@@ -1389,10 +1389,18 @@ spec:
                         value: '{{ (split "." (lookup "config.openshift.io/v1" "Ingress" "" "cluster").spec.domain)._1 }}'
                       - name: global.clusterPlatform
                         value: aws
-                      - name: clusterGroup.name
-                        value: acm-edge
+                      - name: global.multiSourceSupport
+                        value: 
+                      - name: global.multiSourceRepoUrl
+                        value: 
+                      - name: global.multiSourceTargetRevision
+                        value: 
+                      - name: global.privateRepo
+                        value: 
                       - name: global.experimentalCapabilities
                         value: 
+                      - name: clusterGroup.name
+                        value: acm-edge
                       - name: clusterGroup.isHubCluster
                         value: "false"
                   destination:
@@ -1487,10 +1495,18 @@ spec:
                         value: '{{ (split "." (lookup "config.openshift.io/v1" "Ingress" "" "cluster").spec.domain)._1 }}'
                       - name: global.clusterPlatform
                         value: aws
-                      - name: clusterGroup.name
-                        value: acm-provision-edge
+                      - name: global.multiSourceSupport
+                        value: 
+                      - name: global.multiSourceRepoUrl
+                        value: 
+                      - name: global.multiSourceTargetRevision
+                        value: 
+                      - name: global.privateRepo
+                        value: 
                       - name: global.experimentalCapabilities
                         value: 
+                      - name: clusterGroup.name
+                        value: acm-provision-edge
                       - name: clusterGroup.isHubCluster
                         value: "false"
                   destination:
@@ -1585,10 +1601,18 @@ spec:
                         value: '{{ (split "." (lookup "config.openshift.io/v1" "Ingress" "" "cluster").spec.domain)._1 }}'
                       - name: global.clusterPlatform
                         value: aws
-                      - name: clusterGroup.name
-                        value: acm-provision-on-deploy
+                      - name: global.multiSourceSupport
+                        value: 
+                      - name: global.multiSourceRepoUrl
+                        value: 
+                      - name: global.multiSourceTargetRevision
+                        value: 
+                      - name: global.privateRepo
+                        value: 
                       - name: global.experimentalCapabilities
                         value: 
+                      - name: clusterGroup.name
+                        value: acm-provision-on-deploy
                   destination:
                     server: https://kubernetes.default.svc
                     namespace: mypattern-acm-provision-on-deploy

diff --git a/common/tests/clustergroup-industrial-edge-factory.expected.yaml b/common/tests/clustergroup-industrial-edge-factory.expected.yaml
@@ -650,9 +650,9 @@ spec:
       - "/values-4.12-factory.yaml" 
       parameters:
         - name: global.repoURL
-          value: $ARGOCD_APP_SOURCE_REPO_URL
+          value: https://github.com/pattern-clone/mypattern
         - name: global.targetRevision
-          value: $ARGOCD_APP_SOURCE_TARGET_REVISION
+          value: main
         - name: global.namespace
           value: $ARGOCD_APP_NAMESPACE
         - name: global.pattern
@@ -665,6 +665,12 @@ spec:
           value: "aws"
         - name: global.hubClusterDomain
           value: apps.hub.example.com
+        - name: global.multiSourceSupport
+          value: 
+        - name: global.multiSourceRepoUrl
+          value: 
+        - name: global.multiSourceTargetRevision
+          value: 
         - name: global.localClusterDomain
           value: apps.region.example.com
         - name: global.privateRepo