Merge pull request #423 from mbaldessari/argh

Fix placement of tokenSecret material in the right section

Author: mbaldessari

operator-install/templates/pattern.yaml

@@ -8,13 +8,13 @@ spec:
   gitSpec:
     targetRepo: {{ .Values.main.git.repoURL }}
     targetRevision: {{ .Values.main.git.revision }}
-  gitOpsSpec:
-    operatorChannel: {{ default "gitops-1.8" .Values.main.gitops.channel }}
-    operatorSource: {{ default "redhat-operators" .Values.main.gitops.operatorSource }}
 {{- if and .Values.main.tokenSecret .Values.main.tokenSecretNamespace }}
     tokenSecret: {{ .Values.main.tokenSecret }}
     tokenSecretNamespace: {{ .Values.main.tokenSecretNamespace }}
 {{- end }} {{/* if and .Values.main.tokenSecret .Values.main.tokenSecretNamespace */}}
+  gitOpsSpec:
+    operatorChannel: {{ default "gitops-1.8" .Values.main.gitops.channel }}
+    operatorSource: {{ default "redhat-operators" .Values.main.gitops.operatorSource }}
   multiSourceConfig:
     enabled: {{ .Values.main.multiSourceConfig.enabled }}
 {{- if .Values.main.analyticsUUID }}

tests/operator-install-industrial-edge-factory.expected.yaml

@@ -24,10 +24,10 @@ spec:
   clusterGroupName: example
   gitSpec:
     targetRepo: https://github.com/pattern-clone/mypattern
-    targetRevision: main
+    targetRevision: main 
   gitOpsSpec:
     operatorChannel: gitops-1.8
-    operatorSource: redhat-operators 
+    operatorSource: redhat-operators
   multiSourceConfig:
     enabled: false
 ---

tests/operator-install-industrial-edge-hub.expected.yaml

@@ -24,10 +24,10 @@ spec:
   clusterGroupName: example
   gitSpec:
     targetRepo: https://github.com/pattern-clone/mypattern
-    targetRevision: main
+    targetRevision: main 
   gitOpsSpec:
     operatorChannel: gitops-1.8
-    operatorSource: redhat-operators 
+    operatorSource: redhat-operators
   multiSourceConfig:
     enabled: false
 ---

tests/operator-install-medical-diagnosis-hub.expected.yaml

@@ -24,10 +24,10 @@ spec:
   clusterGroupName: example
   gitSpec:
     targetRepo: https://github.com/pattern-clone/mypattern
-    targetRevision: main
+    targetRevision: main 
   gitOpsSpec:
     operatorChannel: gitops-1.8
-    operatorSource: redhat-operators 
+    operatorSource: redhat-operators
   multiSourceConfig:
     enabled: false
 ---

tests/operator-install-naked.expected.yaml

@@ -24,10 +24,10 @@ spec:
   clusterGroupName: default
   gitSpec:
     targetRepo: https://github.com/pattern-clone/mypattern
-    targetRevision: main
+    targetRevision: main 
   gitOpsSpec:
     operatorChannel: gitops-1.8
-    operatorSource: redhat-operators 
+    operatorSource: redhat-operators
   multiSourceConfig:
     enabled: false
 ---

tests/operator-install-normal.expected.yaml

@@ -24,10 +24,10 @@ spec:
   clusterGroupName: example
   gitSpec:
     targetRepo: https://github.com/pattern-clone/mypattern
-    targetRevision: main
+    targetRevision: main 
   gitOpsSpec:
     operatorChannel: gitops-1.8
-    operatorSource: redhat-operators 
+    operatorSource: redhat-operators
   multiSourceConfig:
     enabled: false
 ---