Skip to content
9 changes: 5 additions & 4 deletions common/acm/templates/policies/acm-hub-ca-policy.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# This pushes out the HUB's Certificate Authorities on to the imported clusters
{{ if .Values.clusterGroup.isHubCluster }}
{{- if .Values.clusterGroup.isHubCluster }}
{{- if (eq (((.Values.global).secretStore).backend) "vault") }}
---
apiVersion: policy.open-cluster-management.io/v1
kind: Policy
Expand Down Expand Up @@ -31,7 +32,7 @@ spec:
type: Opaque
metadata:
name: hub-ca
namespace: imperative
namespace: golang-external-secrets
data:
hub-kube-root-ca.crt: '{{ `{{hub fromConfigMap "" "kube-root-ca.crt" "ca.crt" | base64enc hub}}` }}'
hub-openshift-service-ca.crt: '{{ `{{hub fromConfigMap "" "openshift-service-ca.crt" "service-ca.crt" | base64enc hub}}` }}'
Expand Down Expand Up @@ -67,5 +68,5 @@ spec:
operator: NotIn
values:
- 'true'
{{ end }}

{{- end }}
{{- end }}
9 changes: 9 additions & 0 deletions common/acm/templates/policies/application-policies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@ spec:
path: {{ default "common/clustergroup" .path }}
helm:
ignoreMissingValueFiles: true
values: |
extraParametersNested:
{{- range $k, $v := $.Values.extraParametersNested }}
{{ $k }}: {{ printf "%s" $v | quote }}
{{- end }}
valueFiles:
{{- include "acm.app.policies.valuefiles" . | nindent 22 }}
{{- range $valueFile := .extraValueFiles }}
Expand Down Expand Up @@ -73,6 +78,10 @@ spec:
value: {{ $group.name }}
- name: global.experimentalCapabilities
value: {{ $.Values.global.experimentalCapabilities }}
{{- range $k, $v := $.Values.extraParametersNested }}
- name: {{ $k }}
value: {{ printf "%s" $v | quote }}
{{- end }}
{{- range .helmOverrides }}
- name: {{ .name }}
value: {{ .value | quote }}
Expand Down
2 changes: 2 additions & 0 deletions common/acm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ global:
targetRevision: main
options:
applicationRetryLimit: 20
secretStore:
backend: "vault"

clusterGroup:
subscriptions:
Expand Down
10 changes: 10 additions & 0 deletions common/clustergroup/templates/plumbing/applications.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,11 @@ spec:
{{- else }}
helm:
ignoreMissingValueFiles: true
values: |
extraParametersNested:
{{- range $k, $v := $.Values.extraParametersNested }}
{{ $k }}: {{ printf "%s" $v | quote }}
{{- end }}
valueFiles:
{{- include "clustergroup.app.globalvalues.prefixedvaluefiles" $ | nindent 8 }}
{{- range $valueFile := $.Values.clusterGroup.sharedValueFiles }}
Expand Down Expand Up @@ -216,6 +221,11 @@ spec:
{{- else if not .kustomize }}
helm:
ignoreMissingValueFiles: true
values: |
extraParametersNested:
{{- range $k, $v := $.Values.extraParametersNested }}
{{ $k }}: {{ printf "%s" $v | quote }}
{{- end }}
valueFiles:
{{- include "clustergroup.app.globalvalues.valuefiles" $ | nindent 6 }}
{{- range $valueFile := $.Values.clusterGroup.sharedValueFiles }}
Expand Down
2 changes: 1 addition & 1 deletion common/golang-external-secrets/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ name: golang-external-secrets
version: 0.0.3
dependencies:
- name: external-secrets
version: "0.9.16"
version: "0.9.18"
repository: "https://charts.external-secrets.io"
#"https://external-secrets.github.io/kubernetes-external-secrets"
Binary file not shown.
Binary file not shown.
8 changes: 4 additions & 4 deletions common/golang-external-secrets/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ golangExternalSecrets:
type: Secret
name: hub-ca
key: hub-kube-root-ca.crt
namespace: imperative
namespace: golang-external-secrets

global:
hubClusterDomain: hub.example.com
Expand All @@ -37,10 +37,10 @@ clusterGroup:

external-secrets:
image:
tag: v0.9.16-ubi
tag: v0.9.18-ubi
webhook:
image:
tag: v0.9.16-ubi
tag: v0.9.18-ubi
certController:
image:
tag: v0.9.16-ubi
tag: v0.9.18-ubi
4 changes: 3 additions & 1 deletion common/tests/acm-industrial-edge-hub.expected.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ spec:
type: Opaque
metadata:
name: hub-ca
namespace: imperative
namespace: golang-external-secrets
data:
hub-kube-root-ca.crt: '{{hub fromConfigMap "" "kube-root-ca.crt" "ca.crt" | base64enc hub}}'
hub-openshift-service-ca.crt: '{{hub fromConfigMap "" "openshift-service-ca.crt" "service-ca.crt" | base64enc hub}}'
Expand Down Expand Up @@ -214,6 +214,8 @@ spec:
path: common/clustergroup
helm:
ignoreMissingValueFiles: true
values: |
extraParametersNested:
valueFiles:
- "/values-global.yaml"
- "/values-factory.yaml"
Expand Down
4 changes: 3 additions & 1 deletion common/tests/acm-medical-diagnosis-hub.expected.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ spec:
type: Opaque
metadata:
name: hub-ca
namespace: imperative
namespace: golang-external-secrets
data:
hub-kube-root-ca.crt: '{{hub fromConfigMap "" "kube-root-ca.crt" "ca.crt" | base64enc hub}}'
hub-openshift-service-ca.crt: '{{hub fromConfigMap "" "openshift-service-ca.crt" "service-ca.crt" | base64enc hub}}'
Expand Down Expand Up @@ -205,6 +205,8 @@ spec:
path: common/clustergroup
helm:
ignoreMissingValueFiles: true
values: |
extraParametersNested:
valueFiles:
- "/values-global.yaml"
- "/values-region-one.yaml"
Expand Down
6 changes: 5 additions & 1 deletion common/tests/acm-normal.expected.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -561,7 +561,7 @@ spec:
type: Opaque
metadata:
name: hub-ca
namespace: imperative
namespace: golang-external-secrets
data:
hub-kube-root-ca.crt: '{{hub fromConfigMap "" "kube-root-ca.crt" "ca.crt" | base64enc hub}}'
hub-openshift-service-ca.crt: '{{hub fromConfigMap "" "openshift-service-ca.crt" "service-ca.crt" | base64enc hub}}'
Expand Down Expand Up @@ -608,6 +608,8 @@ spec:
path: common/clustergroup
helm:
ignoreMissingValueFiles: true
values: |
extraParametersNested:
valueFiles:
- "/values-global.yaml"
- "/values-acm-edge.yaml"
Expand Down Expand Up @@ -704,6 +706,8 @@ spec:
path: common/clustergroup
helm:
ignoreMissingValueFiles: true
values: |
extraParametersNested:
valueFiles:
- "/values-global.yaml"
- "/values-acm-provision-edge.yaml"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -559,6 +559,8 @@ spec:
path: charts/datacenter/opendatahub
helm:
ignoreMissingValueFiles: true
values: |
extraParametersNested:
valueFiles:
- "/values-global.yaml"
- "/values-factory.yaml"
Expand Down
14 changes: 14 additions & 0 deletions common/tests/clustergroup-industrial-edge-hub.expected.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -857,6 +857,8 @@ spec:
path: common/acm
helm:
ignoreMissingValueFiles: true
values: |
extraParametersNested:
valueFiles:
- "/values-global.yaml"
- "/values-datacenter.yaml"
Expand Down Expand Up @@ -922,6 +924,8 @@ spec:
path: charts/datacenter/opendatahub
helm:
ignoreMissingValueFiles: true
values: |
extraParametersNested:
valueFiles:
- "/values-global.yaml"
- "/values-datacenter.yaml"
Expand Down Expand Up @@ -978,6 +982,8 @@ spec:
path: charts/datacenter/pipelines
helm:
ignoreMissingValueFiles: true
values: |
extraParametersNested:
valueFiles:
- "/values-global.yaml"
- "/values-datacenter.yaml"
Expand Down Expand Up @@ -1034,6 +1040,8 @@ spec:
path: charts/datacenter/manuela-data-lake
helm:
ignoreMissingValueFiles: true
values: |
extraParametersNested:
valueFiles:
- "/values-global.yaml"
- "/values-datacenter.yaml"
Expand Down Expand Up @@ -1120,6 +1128,8 @@ spec:
path: charts/datacenter/external-secrets
helm:
ignoreMissingValueFiles: true
values: |
extraParametersNested:
valueFiles:
- "/values-global.yaml"
- "/values-datacenter.yaml"
Expand Down Expand Up @@ -1176,6 +1186,8 @@ spec:
path: common/golang-external-secrets
helm:
ignoreMissingValueFiles: true
values: |
extraParametersNested:
valueFiles:
- "/values-global.yaml"
- "/values-datacenter.yaml"
Expand Down Expand Up @@ -1259,6 +1271,8 @@ spec:
chart: vault
helm:
ignoreMissingValueFiles: true
values: |
extraParametersNested:
valueFiles:
- "/values-global.yaml"
- "/values-datacenter.yaml"
Expand Down
26 changes: 26 additions & 0 deletions common/tests/clustergroup-medical-diagnosis-hub.expected.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -742,6 +742,8 @@ spec:
path: common/golang-external-secrets
helm:
ignoreMissingValueFiles: true
values: |
extraParametersNested:
valueFiles:
- "/values-global.yaml"
- "/values-hub.yaml"
Expand Down Expand Up @@ -798,6 +800,8 @@ spec:
path: charts/all/kafdrop
helm:
ignoreMissingValueFiles: true
values: |
extraParametersNested:
valueFiles:
- "/values-global.yaml"
- "/values-hub.yaml"
Expand Down Expand Up @@ -854,6 +858,8 @@ spec:
path: charts/all/kafka
helm:
ignoreMissingValueFiles: true
values: |
extraParametersNested:
valueFiles:
- "/values-global.yaml"
- "/values-hub.yaml"
Expand Down Expand Up @@ -910,6 +916,8 @@ spec:
path: charts/all/opendatahub
helm:
ignoreMissingValueFiles: true
values: |
extraParametersNested:
valueFiles:
- "/values-global.yaml"
- "/values-hub.yaml"
Expand Down Expand Up @@ -966,6 +974,8 @@ spec:
path: charts/all/openshift-data-foundations
helm:
ignoreMissingValueFiles: true
values: |
extraParametersNested:
valueFiles:
- "/values-global.yaml"
- "/values-hub.yaml"
Expand Down Expand Up @@ -1022,6 +1032,8 @@ spec:
path: charts/all/openshift-serverless
helm:
ignoreMissingValueFiles: true
values: |
extraParametersNested:
valueFiles:
- "/values-global.yaml"
- "/values-hub.yaml"
Expand Down Expand Up @@ -1078,6 +1090,8 @@ spec:
path: charts/all/medical-diagnosis/service-account
helm:
ignoreMissingValueFiles: true
values: |
extraParametersNested:
valueFiles:
- "/values-global.yaml"
- "/values-hub.yaml"
Expand Down Expand Up @@ -1134,6 +1148,8 @@ spec:
chart: vault
helm:
ignoreMissingValueFiles: true
values: |
extraParametersNested:
valueFiles:
- "/values-global.yaml"
- "/values-hub.yaml"
Expand Down Expand Up @@ -1208,6 +1224,8 @@ spec:
path: charts/all/medical-diagnosis/database
helm:
ignoreMissingValueFiles: true
values: |
extraParametersNested:
valueFiles:
- "/values-global.yaml"
- "/values-hub.yaml"
Expand Down Expand Up @@ -1264,6 +1282,8 @@ spec:
path: charts/all/medical-diagnosis/grafana
helm:
ignoreMissingValueFiles: true
values: |
extraParametersNested:
valueFiles:
- "/values-global.yaml"
- "/values-hub.yaml"
Expand Down Expand Up @@ -1320,6 +1340,8 @@ spec:
path: charts/all/medical-diagnosis/image-generator
helm:
ignoreMissingValueFiles: true
values: |
extraParametersNested:
valueFiles:
- "/values-global.yaml"
- "/values-hub.yaml"
Expand Down Expand Up @@ -1385,6 +1407,8 @@ spec:
path: charts/all/medical-diagnosis/image-server
helm:
ignoreMissingValueFiles: true
values: |
extraParametersNested:
valueFiles:
- "/values-global.yaml"
- "/values-hub.yaml"
Expand Down Expand Up @@ -1450,6 +1474,8 @@ spec:
path: charts/all/medical-diagnosis/xray-init
helm:
ignoreMissingValueFiles: true
values: |
extraParametersNested:
valueFiles:
- "/values-global.yaml"
- "/values-hub.yaml"
Expand Down
4 changes: 4 additions & 0 deletions common/tests/clustergroup-normal.expected.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -707,6 +707,8 @@ spec:
path: common/acm
helm:
ignoreMissingValueFiles: true
values: |
extraParametersNested:
valueFiles:
- "/values-global.yaml"
- "/values-example.yaml"
Expand Down Expand Up @@ -774,6 +776,8 @@ spec:
path: charts/datacenter/pipelines
helm:
ignoreMissingValueFiles: true
values: |
extraParametersNested:
valueFiles:
- "/values-global.yaml"
- "/values-example.yaml"
Expand Down
Loading