Skip to content

Commit 3775696

Browse files
committed
Switch to external charts after the move to slimmed common
1 parent d8fae2f commit 3775696

3 files changed

Lines changed: 31 additions & 43 deletions

File tree

values-all-in-one.yaml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,11 @@ clusterGroup:
102102

103103
applications:
104104
acm:
105-
name: acm #arbitary
105+
name: acm
106106
namespace: open-cluster-management
107107
project: opp
108-
path: common/acm
108+
chart: acm
109+
chartVersion: 0.1.*
109110
ignoreDifferences:
110111
- group: internal.open-cluster-management.io
111112
kind: ManagedClusterInfo
@@ -151,13 +152,15 @@ clusterGroup:
151152
name: vault
152153
namespace: vault
153154
project: hub
154-
path: common/hashicorp-vault
155+
chart: hashicorp-vault
156+
chartVersion: 0.1.*
155157

156158
golang-external-secrets:
157159
name: golang-external-secrets
158160
namespace: golang-external-secrets
159161
project: external-secrets
160-
path: common/golang-external-secrets
162+
chart: golang-external-secrets
163+
chartVersion: 0.1.*
161164

162165
external-secrets:
163166
name: external-secrets

values-hub.yaml

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,16 @@ clusterGroup:
5555

5656
applications:
5757
acm:
58-
name: acm #arbitary
58+
name: acm
5959
namespace: open-cluster-management
6060
project: opp
61-
path: common/acm
61+
chart: acm
62+
chartVersion: 0.1.*
6263
ignoreDifferences:
63-
- group: internal.open-cluster-management.io
64-
kind: ManagedClusterInfo
65-
jsonPointers:
66-
- /spec/loggingCA
64+
- group: internal.open-cluster-management.io
65+
kind: ManagedClusterInfo
66+
jsonPointers:
67+
- /spec/loggingCA
6768

6869
acs-central:
6970
name: acs-central
@@ -104,13 +105,15 @@ clusterGroup:
104105
name: vault
105106
namespace: vault
106107
project: hub
107-
path: common/hashicorp-vault
108+
chart: hashicorp-vault
109+
chartVersion: 0.1.*
108110

109111
golang-external-secrets:
110112
name: golang-external-secrets
111113
namespace: golang-external-secrets
112-
project: external-secrets
113-
path: common/golang-external-secrets
114+
project: hub
115+
chart: golang-external-secrets
116+
chartVersion: 0.1.*
114117

115118
external-secrets:
116119
name: external-secrets

values-opphub.yaml

Lines changed: 12 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,16 @@ clusterGroup:
5454

5555
applications:
5656
acm:
57-
name: acm #arbitary
57+
name: acm
5858
namespace: open-cluster-management
5959
project: opp
60-
path: common/acm
60+
chart: acm
61+
chartVersion: 0.1.*
6162
ignoreDifferences:
62-
- group: internal.open-cluster-management.io
63-
kind: ManagedClusterInfo
64-
jsonPointers:
65-
- /spec/loggingCA
63+
- group: internal.open-cluster-management.io
64+
kind: ManagedClusterInfo
65+
jsonPointers:
66+
- /spec/loggingCA
6667

6768
opp:
6869
name: opp
@@ -74,34 +75,15 @@ clusterGroup:
7475
name: vault
7576
namespace: vault
7677
project: hub
77-
chart: vault
78-
repoURL: https://helm.releases.hashicorp.com
79-
targetRevision: v0.19.0
80-
overrides:
81-
- name: global.openshift
82-
value: "true"
83-
- name: injector.enabled
84-
value: "false"
85-
- name: ui.enabled
86-
value: "true"
87-
- name: ui.serviceType
88-
value: LoadBalancer
89-
- name: server.route.enabled
90-
value: "true"
91-
- name: server.route.host
92-
value: null
93-
- name: server.route.tls.termination
94-
value: edge
95-
- name: server.image.repository
96-
value: "registry.connect.redhat.com/hashicorp/vault"
97-
- name: server.image.tag
98-
value: "1.9.2-ubi"
78+
chart: hashicorp-vault
79+
chartVersion: 0.1.*
9980

10081
golang-external-secrets:
10182
name: golang-external-secrets
10283
namespace: golang-external-secrets
103-
project: golang-external-secrets
104-
path: common/golang-external-secrets
84+
project: hub
85+
chart: golang-external-secrets
86+
chartVersion: 0.1.*
10587

10688
cli-tools:
10789
name: cli-tools

0 commit comments

Comments
 (0)