Update helm chart for OES app v3.9.5 release (#218)

* 3.9.4 fixes, create-job yaml was missing, added * Updated to handle custom-cacerts and remove JAVA_OPTSs for halyard init containers * Support for extraEnvVars * Fixed oes-ui tag * Added Dinghy and script for side-car * Removed dinghy * Address comments * Added the branch oes3.9 to github action * Updated App Release Co-authored-by: ksrinimba <[email protected]> Co-authored-by: abhinaybyrisetty <[email protected]> Co-authored-by: lakkireddys-opsmx <[email protected]>
OpsMx · Dec 3, 2021 · 4901d25 · 4901d25
1 parent 21c8dc8
commit 4901d25
Show file tree

Hide file tree

Showing 15 changed files with 107 additions and 22 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - master
+      - oes3.9
     paths:
       - 'charts/oes/Chart.yaml'
       - 'charts/oes/Chart.lock'

diff --git a/charts/oes/Chart.yaml b/charts/oes/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: oes
-version: 3.9.7
-appVersion: 3.9.1.2
+version: 3.9.8
+appVersion: 3.9.5
 description: OES is a non-forked version of OSS spinnaker
 icon: https://raw.githubusercontent.com/OpsMx/enterprise-spinnaker/master/img/opsmx.png
 maintainers:

diff --git a/charts/oes/charts/spinnaker/templates/deployments/create-sample-job.yaml b/charts/oes/charts/spinnaker/templates/deployments/create-sample-job.yaml
@@ -0,0 +1,37 @@
+{{- if .Values.autoInstallSampleApps }}
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: {{ .Release.Name }}-create-sample-app
+spec:
+  template:
+    spec:
+      serviceAccountName: {{ .Release.Name }}-spinnaker-halyard
+      securityContext:
+        fsGroup: 1000
+        runAsUser: 1000
+      restartPolicy: OnFailure
+      volumes:
+      - secret:
+          secretName: {{ .Release.Name }}-spinnaker-spin-config
+        name: spin-config
+      - configMap:
+          defaultMode: 420
+          name: {{ .Release.Name }}-spinnaker-spin-pipeline-import
+        name: spin-pipeline-import
+      - name: spin-pipeline-config
+        emptyDir: {}
+      containers:
+      - command:  
+        - bash
+        - /tmp/config/spin-pipeline-import.sh
+        name: sample-pipeline-install
+        image: {{ .Values.global.customImages.registry }}/spin-sample-pipeline:1.0
+        volumeMounts:         
+        - name: spin-pipeline-config
+          mountPath: /tmp/config/git
+        - mountPath: /tmp/config
+          name: spin-pipeline-import
+        - mountPath: /tmp/config/spin
+          name: spin-config
+{{- end }}
diff --git a/charts/oes/charts/spinnaker/templates/statefulsets/halyard.yaml b/charts/oes/charts/spinnaker/templates/statefulsets/halyard.yaml
@@ -131,10 +131,6 @@ spec:
           subPath: cacerts
           name: cacerts
         {{- end }}
-        {{- if .Values.halyard.env }}
-        env:
-{{ toYaml .Values.halyard.env | indent 8 }}
-        {{- end }}
       {{- if and (.Values.gitopsHalyard.enabled) (eq .Values.gitopsHalyard.repo.type "git") }}
       - name: "halyardconfig-update"
         command:
@@ -189,10 +185,6 @@ spec:
         {{- end }}
         - mountPath: /tmp/autoconfig
           name: halyard-overrideurl
-        {{- if .Values.halyard.env }}
-        env:
-{{ toYaml .Values.halyard.env | indent 8 }}
-        {{- end }}
       {{- end }}
       volumes:
       {{- if or .Values.gitopsHalyard.enabled (not .Values.halyard.persistence.enabled) }}

diff --git a/charts/oes/config/oes-gate/gate.yml b/charts/oes/config/oes-gate/gate.yml
@@ -123,6 +123,12 @@ services:
     enabled: true
 {{- end }}
   user: {}
+retrofit:
+  connectTimeout: 30000
+  readTimeout: 30000
+  callTimeout: 30000
+  writeTimeout: 30000
+  retryOnConnectionFailure: true
 cors:
   {{- if .Values.global.commonGate.enabled }}
   allowed-origins-pattern: ^https?://(?:localhost|{{ .Values.global.oesUI.host }}|{{ .Values.global.spinDeck.host }}|opsmx.com)(?::[1-9]\d*)?/?

diff --git a/charts/oes/templates/_helpers.tpl b/charts/oes/templates/_helpers.tpl
@@ -121,3 +121,18 @@ Return the proper Autopilot image name
 {{- $tag := .Values.autopilot.image.tag | toString -}}
 {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
 {{- end -}}
+
+
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Renders a value that contains template.
+Usage:
+{{ include "tplvalues.render" ( dict "value" .Values.path.to.the.Value "context" $) }}
+*/}}
+{{- define "tplvalues.render" -}}
+    {{- if typeIs "string" .value }}
+        {{- tpl .value .context }}
+    {{- else }}
+        {{- tpl (.value | toYaml) .context }}
+    {{- end }}
+{{- end -}}
diff --git a/charts/oes/templates/clouddriver-sidecar/k8config-sync.yaml b/charts/oes/templates/clouddriver-sidecar/k8config-sync.yaml
@@ -0,0 +1,18 @@
+apiVersion: v1
+data:
+  k8config-sync.sh: |+
+    #!/bin/bash
+    rm -rf spinnaker-poc
+    mkdir -p /opsmx
+    echo " ####### Cloning the Dynamic Account Repo #################"
+    git clone  -c http.sslVerify=false https://skambhampati:[email protected]/SpinCloud-GCP/spinnaker-poc.git
+    cd spinnaker-poc/
+    cat clouddriver-local.yml |grep -i opsmx|cut -f3 -d"/"  > /opsmx/config_files.txt
+    for config in $(cat /opsmx/config_files.txt)
+    do
+    kubectl get secrets $config -o=jsonpath='{.data.*}'|base64 -d > /opsmx/$config
+    done
+
+kind: ConfigMap
+metadata:
+  name: k8config-sync
diff --git a/charts/oes/templates/deployments/oes-gate-deployment.yaml b/charts/oes/templates/deployments/oes-gate-deployment.yaml
@@ -48,6 +48,9 @@ spec:
         env:
         - name: spring_profiles_active
           value: vault,local
+       {{- if .Values.extraEnvVars }}
+       {{- include "tplvalues.render" (dict "value" .Values.extraEnvVars "context" $) | nindent 8 }}
+       {{- end }}
         ports:
         - containerPort: 8084
           protocol: TCP

diff --git a/charts/oes/templates/deployments/oes-platform-deployment.yaml b/charts/oes/templates/deployments/oes-platform-deployment.yaml
@@ -40,6 +40,9 @@ spec:
         - containerPort: 8095
           protocol: TCP
         env:
+       {{- if .Values.extraEnvVars }}
+       {{- include "tplvalues.render" (dict "value" .Values.extraEnvVars "context" $) | nindent 8 }}
+       {{- end }}
         resources:
 {{ toYaml .Values.platform.resources | indent 12 }}
         readinessProbe:

diff --git a/charts/oes/templates/deployments/oes-sapor-deployment.yaml b/charts/oes/templates/deployments/oes-sapor-deployment.yaml
@@ -34,6 +34,10 @@ spec:
       containers:
       - image: {{ template "sapor.image" . }}
         name: oes-sapor
+        env:
+       {{- if .Values.extraEnvVars }}
+       {{- include "tplvalues.render" (dict "value" .Values.extraEnvVars "context" $) | nindent 8 }}
+       {{- end }}
         ports:
         - containerPort: 8085
           protocol: TCP

diff --git a/charts/oes/templates/deployments/oes-visibility-deployment.yaml b/charts/oes/templates/deployments/oes-visibility-deployment.yaml
@@ -39,6 +39,9 @@ spec:
         - containerPort: 8096
           protocol: TCP
         env:
+       {{- if .Values.extraEnvVars }}
+       {{- include "tplvalues.render" (dict "value" .Values.extraEnvVars "context" $) | nindent 8 }}
+       {{- end }}
         volumeMounts:
         - mountPath: /opsmx/conf/visibility-local.yml
           name: visibility-config

diff --git a/charts/oes/templates/forwarder/create-controller-secret.yaml b/charts/oes/templates/forwarder/create-controller-secret.yaml
@@ -29,7 +29,6 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: create-controller-secret
-
 spec:
  template:
     spec:

diff --git a/charts/oes/templates/ingress/oes-ui-ingress.yaml b/charts/oes/templates/ingress/oes-ui-ingress.yaml
@@ -23,7 +23,7 @@ spec:
           service:
             name: oes-ui
             port:
-              number: 80
+              number: 8080
         path: /
         pathType: ImplementationSpecific
 {{- if .Values.global.ssl.enabled }}

diff --git a/charts/oes/templates/services/oes-ui-service.yaml b/charts/oes/templates/services/oes-ui-service.yaml
@@ -15,7 +15,7 @@ spec:
   type: {{ .Values.k8sServiceType }}
   ports:
   - name: "oes-ui-service"
-    port: 80
+    port: 8080
     targetPort: 8080
   - name: "https"
     port: 443

diff --git a/charts/oes/values.yaml b/charts/oes/values.yaml
@@ -14,8 +14,8 @@ imagePullSecret: opsmxdev-secret
 ##
 imageCredentials:
   registry: https://quay.io/
-  username: quayID  # Quay username
-  password: quayPassword # Quay password
+  username: opsmxguest  # Quay username
+  password: OpsMx@321 # Quay password
   email: [email protected]   # email corresponding to quay registry ID
 
 rbac:
@@ -41,6 +41,10 @@ vault:
   address: https://server.vaultint.opsmx.net # Vault Address URL
   token: 123132 # Vault Root token
 
+#extraEnvVars:
+#  - name: JAVA_OPTS
+#    value: -Dhttps.proxyHost=proxy.server.local -Dhttps.proxyPort=3128 
+
 ## OES UI, OES Gate, Spinnaker Deck and Spinnaker Gate service type
 ##
 k8sServiceType: ClusterIP
@@ -293,7 +297,7 @@ autopilot:
   image:
     registry: quay.io/opsmxpublic
     repository: ubi8-oes-autopilot
-    tag: v3.9.1.2
+    tag: v3.9.5
     pullPolicy: IfNotPresent
 
   annotations:
@@ -342,7 +346,7 @@ dashboard:
   image:
     registry: quay.io/opsmxpublic
     repository: ubi8-oes-dashboard
-    tag: v3.9.1.2
+    tag: v3.9.5
     pullPolicy: IfNotPresent
 
   annotations:
@@ -396,7 +400,7 @@ gate:
   image:
     registry: quay.io/opsmxpublic
     repository: ubi8-gate
-    tag: v3.9.1.2
+    tag: v3.9.5
     pullPolicy: IfNotPresent
 
   serviceAnnotations: {}
@@ -485,7 +489,7 @@ platform:
   image:
     registry: quay.io/opsmxpublic
     repository: ubi8-oes-platform
-    tag: v3.9.1.3
+    tag: v3.9.5
     pullPolicy: IfNotPresent
 
   annotations:
@@ -543,7 +547,7 @@ sapor:
   image:
     registry: quay.io/opsmxpublic
     repository: ubi8-oes-sapor
-    tag: v3.9.1.2
+    tag: v3.9.5
     pullPolicy: IfNotPresent
 
   annotations:
@@ -627,7 +631,7 @@ ui:
   image:
     registry: quay.io/opsmxpublic
     repository: ubi8-oes-ui
-    tag: v3.9.1.2
+    tag: v3.9.5.0
     pullPolicy: IfNotPresent
   serviceAnnotations: {}
 
@@ -646,7 +650,7 @@ visibility:
   image:
     registry: quay.io/opsmxpublic
     repository: ubi8-oes-visibility
-    tag: v3.9.1.2
+    tag: v3.9.5
     pullPolicy: IfNotPresent
 
   annotations:
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ on: @@
       push:
         branches:
           - master
+          - oes3.9
         paths:
           - 'charts/oes/Chart.yaml'
           - 'charts/oes/Chart.lock'
@@ Expand Down @@