Merge pull request #28 from mhjacks/wip-main

Fix conditionals in lookup and add config-demo to hub cluster
RedHatNordicsSA · Jan 24, 2022 · bf5c8bf · bf5c8bf
2 parents 23850a5 + 69b5926
commit bf5c8bf
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/charts/region/config-demo/templates/config-demo-cm.yaml b/charts/region/config-demo/templates/config-demo-cm.yaml
@@ -17,9 +17,5 @@ data:
             Hub Cluster domain is '{{ .Values.global.hubClusterDomain }}' <br>
             Pod is running on Local Cluster Domain '{{ .Values.global.localClusterDomain }}' <br>
             </h1>
-
-            <h2>
-            Your secret is 'secret-token' <br>
-            </h2>
           </body>
       </html>
diff --git a/common/acm/templates/policies/application-policies.yaml b/common/acm/templates/policies/application-policies.yaml
@@ -58,11 +58,7 @@ spec:
                       - name: global.hubClusterDomain
                         value: {{ $.Values.global.hubClusterDomain }}
                       - name: global.localClusterDomain
-                      {{- 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/values-hub.yaml b/values-hub.yaml
@@ -5,6 +5,7 @@ clusterGroup:
   namespaces:
   - open-cluster-management
   - vault
+  - config-demo
 
   subscriptions:
   - name: advanced-cluster-management
@@ -14,6 +15,7 @@ clusterGroup:
 
   projects:
   - hub
+  - config-demo
 
   applications:
   - name: acm
@@ -58,6 +60,11 @@ clusterGroup:
     - name: injector.agentImage.tag
       value: "1.9.2-ubi"
 
+  - name: config-demo
+    namespace: config-demo
+    project: config-demo
+    path: charts/region/config-demo
+
   managedClusterGroups:
   - name: region-one
     helmOverrides: