Merge pull request #422 from mbaldessari/ops-private

Fix placement of tokenSecret material

Author: mbaldessari

operator-install/templates/pattern.yaml

@@ -11,15 +11,15 @@ spec:
   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 */}}
   multiSourceConfig:
     enabled: {{ .Values.main.multiSourceConfig.enabled }}
 {{- if .Values.main.analyticsUUID }}
   analyticsUUID: {{ .Values.main.analyticsUUID }}
 {{- end }} {{/* if .Values.main.analyticsUUID */}}
-{{- 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 */}}
 {{- if .Values.main.extraParameters }}
   extraParameters:
 {{- range .Values.main.extraParameters }}

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

@@ -27,7 +27,7 @@ spec:
     targetRevision: main
   gitOpsSpec:
     operatorChannel: gitops-1.8
-    operatorSource: redhat-operators
+    operatorSource: redhat-operators 
   multiSourceConfig:
     enabled: false
 ---

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

@@ -27,7 +27,7 @@ spec:
     targetRevision: main
   gitOpsSpec:
     operatorChannel: gitops-1.8
-    operatorSource: redhat-operators
+    operatorSource: redhat-operators 
   multiSourceConfig:
     enabled: false
 ---

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

@@ -27,7 +27,7 @@ spec:
     targetRevision: main
   gitOpsSpec:
     operatorChannel: gitops-1.8
-    operatorSource: redhat-operators
+    operatorSource: redhat-operators 
   multiSourceConfig:
     enabled: false
 ---

tests/operator-install-naked.expected.yaml

@@ -27,7 +27,7 @@ spec:
     targetRevision: main
   gitOpsSpec:
     operatorChannel: gitops-1.8
-    operatorSource: redhat-operators
+    operatorSource: redhat-operators 
   multiSourceConfig:
     enabled: false
 ---

tests/operator-install-normal.expected.yaml

@@ -27,7 +27,7 @@ spec:
     targetRevision: main
   gitOpsSpec:
     operatorChannel: gitops-1.8
-    operatorSource: redhat-operators
+    operatorSource: redhat-operators 
   multiSourceConfig:
     enabled: false
 ---