Added required changes for SAAS Setup in GitOps Style (#108)

* Added required changes for SAAS Setup in GitOps Style

* Separated Dynamic Accounts and the Git-ops Hal Repo

* Added Gitops Secret Condition

Co-authored-by: lakkireddys-opsmx <susmita.lakkireddy@opsmx.io>

charts/oes/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: oes
-version: 3.6.2
+version: 3.6.3
 appVersion: 3.6.1
 description: OES is a non-forked version of OSS spinnaker
 icon: https://www.opsmx.com/images/logo.png

charts/oes/templates/deployments/oes-sapor-deployment.yaml

@@ -73,10 +73,10 @@ spec:
       - name: {{ .Values.imagePullSecret }}
       volumes:
       {{- if .Values.forwarder.enabled }}
-      - secret:	
+      - secret:
           secretName: oes-command-secret
         name: certs-volume
-      - secret:	
+      - secret:
           secretName: ca-secret
         name: ca-certs-volume
       {{- end }}

charts/oes/templates/secrets/opsmx-gitops-secret.yaml

@@ -1,15 +1,17 @@
 {{ if .Values.spinnaker.gitopsHalyard.enabled }}
+{{- if (eq .Values.spinnaker.gitopsHalyard.secretName "opsmx-gitops-auth") }}
 apiVersion: v1
 stringData:
   # Repo uri to fetch halyard configuration
-  gitcloneparam: https://<gituserID>:<gittoken>@github.com/opsmx/gitops-haldir.git
+  gitcloneparam: https://{{ .Values.spinnaker.gitopsHalyard.repo.username }}:{{ .Values.spinnaker.gitopsHalyard.repo.token }}@github.com/{{ .Values.spinnaker.gitopsHalyard.repo.organization }}/{{ .Values.spinnaker.gitopsHalyard.repo.halRepository }}.git
 
   # Repo details to fetch dynamic configuration
-  dynamicaccountsgituri: https://github.com/OpsMx/gitops-accounts-sample.git
-  gittoken: <gittoken>
-  gituser: <gituserID>
+  dynamicaccountsgituri: https://github.com/{{ .Values.spinnaker.gitopsHalyard.repo.organization }}/{{ .Values.spinnaker.gitopsHalyard.dynamicAccRepository }}.git
+  gituser: {{ .Values.spinnaker.gitopsHalyard.repo.username }}
+  gittoken: {{ .Values.spinnaker.gitopsHalyard.repo.token }}
 kind: Secret
 metadata:
-  name: opsmx-gitops-auth
+  name: {{ .Values.spinnaker.gitopsHalyard.secretName }}
 type: Opaque
+{{- end -}}
 {{ end }}

charts/oes/values.yaml

@@ -973,8 +973,15 @@ spinnaker:
     enabled: false
     mTLS:
       enabled: false   # Enable mTLS for Spinnaker Services and SSL for Deck and Gate
-    repo-type: git # git, S3, vault, only git support at this point
-    secretName: opsmx-gitops-auth
+    #repo-type: git # git, S3, vault, only git support at this point
+    repo:
+      type: git # git, S3, vault, only git support at this point
+      organization: OpsMx
+      halRepository: gitops-haldir # Please provide the repo URL of the GitOps Halyard Directory.
+      dynamicAccRepository: standard-dynamic-account # Please provide the repo URL of the GitOps Dynamic Accounts Directory.
+      username: <GitHub_UserName>
+      token: <GitHub_Token>
+    secretName: opsmx-gitops-auth 
     # Max time(in secs) that an init container of halyard should wait
     # to fetch External Load Balancer IP of spin-deck and spin-gate
     spinnakerLBCheckDelay: 10