Merge pull request #27 from mhjacks/wip-main

True-up with common, and make necessary changes
RedHatNordicsSA · Jan 21, 2022 · 23850a5 · 23850a5
2 parents d6cf9b5 + e5c6fb6
commit 23850a5
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 113 deletions.
diff --git a/common/acm/templates/policies/application-policies.yaml b/common/acm/templates/policies/application-policies.yaml
@@ -58,7 +58,11 @@ spec:
                       - name: global.hubClusterDomain
                         value: {{ $.Values.global.hubClusterDomain }}
                       - name: global.localClusterDomain
-                        value: '{{`{{ (lookup "config.openshift.io/v1" "Ingress" "" "cluster").spec.domain  }}`}}'
+                      {{- if $.Values.clusterGroup.isHubCluster }}
+                        value: {{ $.Values.global.hubClusterDomain }}
+                      {{- else }}
+                        value: '{{ `{{ (lookup "config.openshift.io/v1" "Ingress" "" "cluster").spec.domain }}` }}'
+                      {{- end }}
                      {{- range .helmOverrides }}
                       - name: {{ .name }}
                         value: {{ .value | quote }}

diff --git a/common/clustergroup/templates/applications.yaml b/common/clustergroup/templates/applications.yaml
@@ -40,7 +40,11 @@ spec:
         - name: global.hubClusterDomain
           value: {{ $.Values.global.hubClusterDomain }}
         - name: global.localClusterDomain
+        {{- if $.Values.clusterGroup.isHubCluster }}
+          value: {{ $.Values.global.hubClusterDomain }}
+        {{- else }}
           value: {{ $.Values.global.localClusterDomain }}
+        {{- end }}
         {{- range .overrides }}
         - name: {{ .name }}
           value: {{ .value | quote }}

diff --git a/common/clustergroup/values.yaml b/common/clustergroup/values.yaml
@@ -8,10 +8,7 @@ global:
 
 clusterGroup:
   name: example
-
-  proposedOptions:
-    manageGitops: True
-    isHubCluster: True
+  isHubCluster: true
 
 #  managedClusterGroups:
 #  - name: factory

diff --git a/common/vault-route/.helmignore b/common/vault-route/.helmignore
diff --git a/common/vault-route/Chart.yaml b/common/vault-route/Chart.yaml
diff --git a/common/vault-route/templates/vault-route.yaml b/common/vault-route/templates/vault-route.yaml
diff --git a/common/vault-route/values.yaml b/common/vault-route/values.yaml
diff --git a/values-hub.yaml b/values-hub.yaml
@@ -1,9 +1,6 @@
 clusterGroup:
   name: hub
-
-  proposedOptions:
-    manageGitops: True
-    isHubCluster: True
+  isHubCluster: true
 
   namespaces:
   - open-cluster-management

diff --git a/values-region-one.yaml b/values-region-one.yaml
@@ -6,10 +6,7 @@ global:
 
 clusterGroup:
   name: region-one
-
-  proposedOptions:
-    manageGitops: False
-    isHubCluster: False
+  isHubCluster: false
 
   namespaces:
     - multicloud-gitops-region-one

diff --git a/values-region-two.yaml b/values-region-two.yaml