Skip to content

Commit 5341801

Browse files
authored
Merge pull request #518 from mbaldessari/new-ns-for-hub-ca
Updates to acm-hub-ca
2 parents e1a448d + f673491 commit 5341801

7 files changed

Lines changed: 12 additions & 9 deletions

acm/templates/policies/acm-hub-ca-policy.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# This pushes out the HUB's Certificate Authorities on to the imported clusters
2-
{{ if .Values.clusterGroup.isHubCluster }}
2+
{{- if .Values.clusterGroup.isHubCluster }}
3+
{{- if (eq (((.Values.global).secretStore).backend) "vault") }}
34
---
45
apiVersion: policy.open-cluster-management.io/v1
56
kind: Policy
@@ -31,7 +32,7 @@ spec:
3132
type: Opaque
3233
metadata:
3334
name: hub-ca
34-
namespace: imperative
35+
namespace: golang-external-secrets
3536
data:
3637
hub-kube-root-ca.crt: '{{ `{{hub fromConfigMap "" "kube-root-ca.crt" "ca.crt" | base64enc hub}}` }}'
3738
hub-openshift-service-ca.crt: '{{ `{{hub fromConfigMap "" "openshift-service-ca.crt" "service-ca.crt" | base64enc hub}}` }}'
@@ -67,5 +68,5 @@ spec:
6768
operator: NotIn
6869
values:
6970
- 'true'
70-
{{ end }}
71-
71+
{{- end }}
72+
{{- end }}

acm/values.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ global:
99
targetRevision: main
1010
options:
1111
applicationRetryLimit: 20
12+
secretStore:
13+
backend: "vault"
1214

1315
clusterGroup:
1416
subscriptions:

golang-external-secrets/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ golangExternalSecrets:
2323
type: Secret
2424
name: hub-ca
2525
key: hub-kube-root-ca.crt
26-
namespace: imperative
26+
namespace: golang-external-secrets
2727

2828
global:
2929
hubClusterDomain: hub.example.com

tests/acm-industrial-edge-hub.expected.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ spec:
167167
type: Opaque
168168
metadata:
169169
name: hub-ca
170-
namespace: imperative
170+
namespace: golang-external-secrets
171171
data:
172172
hub-kube-root-ca.crt: '{{hub fromConfigMap "" "kube-root-ca.crt" "ca.crt" | base64enc hub}}'
173173
hub-openshift-service-ca.crt: '{{hub fromConfigMap "" "openshift-service-ca.crt" "service-ca.crt" | base64enc hub}}'

tests/acm-medical-diagnosis-hub.expected.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ spec:
158158
type: Opaque
159159
metadata:
160160
name: hub-ca
161-
namespace: imperative
161+
namespace: golang-external-secrets
162162
data:
163163
hub-kube-root-ca.crt: '{{hub fromConfigMap "" "kube-root-ca.crt" "ca.crt" | base64enc hub}}'
164164
hub-openshift-service-ca.crt: '{{hub fromConfigMap "" "openshift-service-ca.crt" "service-ca.crt" | base64enc hub}}'

tests/acm-normal.expected.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,7 @@ spec:
561561
type: Opaque
562562
metadata:
563563
name: hub-ca
564-
namespace: imperative
564+
namespace: golang-external-secrets
565565
data:
566566
hub-kube-root-ca.crt: '{{hub fromConfigMap "" "kube-root-ca.crt" "ca.crt" | base64enc hub}}'
567567
hub-openshift-service-ca.crt: '{{hub fromConfigMap "" "openshift-service-ca.crt" "service-ca.crt" | base64enc hub}}'

tests/golang-external-secrets-industrial-edge-factory.expected.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12502,7 +12502,7 @@ spec:
1250212502
type: Secret
1250312503
name: hub-ca
1250412504
key: hub-kube-root-ca.crt
12505-
namespace: imperative
12505+
namespace: golang-external-secrets
1250612506

1250712507
auth:
1250812508
kubernetes:

0 commit comments

Comments
 (0)