Update helm chart for OES v3.5 release (#96)

* Deploy forwarder related resources only when enabled * Update chart version * Update helm chart for OES v3.5.1 * Update image repo to ubi8-oes-<service> * Handle inclusion of volume mounts * Remove unncessary stuff Co-authored-by: abhinayopsmx <abhinay.byrisetty@opsmx.io>
OpsMx · Mar 1, 2021 · 5900b49 · 5900b49
1 parent eebb53b
commit 5900b49
Show file tree

Hide file tree

Showing 10 changed files with 70 additions and 57 deletions.
diff --git a/charts/oes/Chart.yaml b/charts/oes/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: oes
-version: 3.5.4
-appVersion: 3.5.0
+version: 3.5.5
+appVersion: 3.5.1
 description: OES is a non-forked version of OSS spinnaker
 icon: https://www.opsmx.com/images/logo.png
 maintainers:

diff --git a/charts/oes/config/oes-sapor/application.yml b/charts/oes/config/oes-sapor/application.yml
@@ -32,13 +32,13 @@ datasources:
 ## Set the below field to true if agent for kubernetes
 kubernetes:
   agent:
-    enabled: {{ .Values.sapor.config.kubernetes.agent.enabled }} 
+    enabled: {{ .Values.forwarder.enabled }}
     serverHostName: {{ .Values.forwarder.externalName }}
     serverPort: 9003
     caCertfile: /opt/opsmx/controller/ca.crt
     certFile: /opt/opsmx/controller/cert/tls.crt
     keyFile: /opt/opsmx/controller/cert/tls.key
-    image: {{ .Values.sapor.config.kubernetes.agent.image }}
+    image: {{ .Values.forwarder.agent.image }}
   template:
     path: /opt/opsmx/controller
     kubectlTemplateFileName: kubeconfig.template

diff --git a/charts/oes/templates/deployments/oes-sapor-deployment.yaml b/charts/oes/templates/deployments/oes-sapor-deployment.yaml
@@ -33,6 +33,7 @@ spec:
         - containerPort: 8085
           protocol: TCP
         volumeMounts:
+        {{- if .Values.forwarder.enabled }}
         - mountPath: /opt/opsmx/controller/ca.crt	
           name: ca-certs-volume	
           subPath: tls.crt	
@@ -42,6 +43,7 @@ spec:
         - mountPath: /opt/opsmx/controller/cert/tls.key	
           name: certs-volume	
           subPath: tls.key
+        {{- end }}
         - name: sapor-config-volume
           mountPath: /opt/opsmx/application.yml
           subPath: application.yml
@@ -70,12 +72,14 @@ spec:
       imagePullSecrets:
       - name: {{ .Values.imagePullSecret }}
       volumes:
+      {{- if .Values.forwarder.enabled }}
       - secret:	
           secretName: oes-command-secret
         name: certs-volume
       - secret:	
           secretName: ca-secret
         name: ca-certs-volume
+      {{- end }}
       - configMap:
           name: oes-sapor-config
         name: sapor-config-volume

diff --git a/charts/oes/templates/forwarder/create-controller-secret.yaml b/charts/oes/templates/forwarder/create-controller-secret.yaml
@@ -1,4 +1,5 @@
 {{- if or (eq .Values.installationMode "OES-AP") (eq .Values.installationMode "OES") -}}
+{{- if .Values.forwarder.enabled }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -45,5 +46,6 @@ spec:
        restartPolicy: Never
        serviceAccount: create-controller-secret
 {{- end -}}
+{{- end -}}
 
 
diff --git a/charts/oes/templates/forwarder/oes-forwarder-config.yaml b/charts/oes/templates/forwarder/oes-forwarder-config.yaml
@@ -1,4 +1,5 @@
 {{- if or (eq .Values.installationMode "OES-AP") (eq .Values.installationMode "OES") -}}
+{{- if .Values.forwarder.enabled }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -16,3 +17,4 @@ data:
     commandHostname: opsmx-controller-controller1
     agentHostname: {{ .Values.forwarder.externalName }}
 {{- end -}}
+{{- end -}}
diff --git a/charts/oes/templates/forwarder/oes-forwarder-deployment.yaml b/charts/oes/templates/forwarder/oes-forwarder-deployment.yaml
@@ -1,4 +1,5 @@
 {{- if or (eq .Values.installationMode "OES-AP") (eq .Values.installationMode "OES") -}}
+{{- if .Values.forwarder.enabled }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -68,4 +69,5 @@ spec:
           - key: "configFile"
             path: "config.yaml"
 {{- end -}}
+{{- end -}}
 
diff --git a/charts/oes/templates/forwarder/oes-forwarder-svc-agent.yaml b/charts/oes/templates/forwarder/oes-forwarder-svc-agent.yaml
@@ -1,4 +1,5 @@
 {{- if or (eq .Values.installationMode "OES-AP") (eq .Values.installationMode "OES") -}}
+{{- if .Values.forwarder.enabled }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -22,3 +23,4 @@ spec:
     port: 9003
     targetPort: command
 {{- end -}}
+{{- end -}}
diff --git a/charts/oes/templates/forwarder/oes-forwarder-svc-ipc.yaml b/charts/oes/templates/forwarder/oes-forwarder-svc-ipc.yaml
@@ -1,4 +1,5 @@
 {{- if or (eq .Values.installationMode "OES-AP") (eq .Values.installationMode "OES") -}}
+{{- if .Values.forwarder.enabled }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -16,3 +17,4 @@ spec:
     port: 9001
     targetPort: agent-grpc
 {{- end -}}
+{{- end -}}
diff --git a/charts/oes/values-oss.yaml b/charts/oes/values-oss.yaml
@@ -27,7 +27,7 @@ k8sServiceType: LoadBalancer
 #####################################################
 spinnaker:
   halyard:
-    spinnakerVersion: 1.22.2
+    spinnakerVersion: 1.24.4
     image:
       repository: quay.io/opsmxpublic/ubi8-spin-halyard
       tag: opsmx-1.40.0
@@ -78,25 +78,25 @@ spinnaker:
         healthEndpoint: /health
         kubernetes:
           useExecHealthCheck: false
-        artifactId: quay.io/opsmxpublic/ubi8-spin-gate:1.18.1
+        artifactId: quay.io/opsmxpublic/ubi8-spin-gate:1.20.0
       deck.yml:
-        artifactId: quay.io/opsmxpublic/ubi8-spin-deck:3.3.0
+        artifactId: quay.io/opsmxpublic/ubi8-spin-deck:3.5.1
       clouddriver.yml:
-        artifactId: quay.io/opsmxpublic/ubi8-spin-clouddriver:6.11.1
+        artifactId: quay.io/opsmxpublic/ubi8-spin-clouddriver:7.2.2
       echo.yml:
-        artifactId: quay.io/opsmxpublic/ubi8-spin-echo:2.14.0
+        artifactId: quay.io/opsmxpublic/ubi8-spin-echo:2.15.2
       fiat.yml:
-        artifactId: quay.io/opsmxpublic/ubi8-spin-fiat:1.13.0
+        artifactId: quay.io/opsmxpublic/ubi8-spin-fiat:1.14.1
       front50.yml:
-        artifactId: quay.io/opsmxpublic/ubi8-spin-front50:0.25.1
+        artifactId: quay.io/opsmxpublic/ubi8-spin-front50:0.26.1
       igor.yml:
-        artifactId: quay.io/opsmxpublic/ubi8-spin-igor:1.12.0
+        artifactId: quay.io/opsmxpublic/ubi8-spin-igor:1.14.0
       kayenta.yml:
-        artifactId: quay.io/opsmxpublic/ubi8-spin-kayenta:0.17.0
+        artifactId: quay.io/opsmxpublic/ubi8-spin-kayenta:0.19.0
       orca.yml:
-        artifactId: quay.io/opsmxpublic/ubi8-spin-orca:2.16.0
+        artifactId: quay.io/opsmxpublic/ubi8-spin-orca:2.18.1
       rosco.yml:
-        artifactId: quay.io/opsmxpublic/ubi8-spin-rosco:0.21.1
+        artifactId: quay.io/opsmxpublic/ubi8-spin-rosco:0.23.0
     ## Uncomment if you want to add extra commands to the init script
     ## run by the init container before halyard is started.
     ## The content will be passed through `tpl`, so value interpolation is supported.

diff --git a/charts/oes/values.yaml b/charts/oes/values.yaml
@@ -150,7 +150,7 @@ db:
   image:
     registry: quay.io/opsmxpublic
     repository: ubi8-oes-autopilot-db
-    tag: v1.6
+    tag: v1.6.1
     pullPolicy: IfNotPresent
 
   ## Strategy to rollout statefulset pods
@@ -176,7 +176,7 @@ autopilot:
   image:
     registry: quay.io/opsmxpublic
     repository: ubi8-oes-autopilot
-    tag: v3.5.0
+    tag: v3.5.1
     pullPolicy: IfNotPresent
 
   resources:
@@ -223,7 +223,7 @@ dashboard:
   image:
     registry: quay.io/opsmxpublic
     repository: ubi8-oes-dashboard
-    tag: v3.5.0
+    tag: v3.5.1
     pullPolicy: IfNotPresent
 
   resources:
@@ -246,6 +246,22 @@ dashboard:
     ## If spinnaker is exposed on Load balancer instead of ingress, set this value to external IP of spinnaker UI
     #spinnakerLink: http://spinnaker.domain.com
 
+#####################################################
+##
+## Values of Forwarder/Controller
+##
+forwarder:
+  enabled: false
+  agent:
+    image: quay.io/opsmxpublic/forwarder-agent:v20210118T161303
+    serviceType: LoadBalancer
+  # Value is also used in sapor configuration for kubernetes.agent.serverHostName
+  externalName: controller-agent.testing.opsmx.com
+  image:
+    repository: quay.io/opsmxpublic/forwarder-controller
+    tag: v1.0.0
+    pullPolicy: IfNotPresent
+
 ###############################################################################
 ##
 ## Values of OES Gate
@@ -256,7 +272,7 @@ gate:
   image:
     registry: quay.io/opsmxpublic
     repository: ubi8-oes-gate
-    tag: v3.5.0
+    tag: v3.5.1
     pullPolicy: IfNotPresent
 
   resources:
@@ -297,7 +313,7 @@ platform:
   image:
     registry: quay.io/opsmxpublic
     repository: ubi8-oes-platform
-    tag: v3.5.0
+    tag: v3.5.1
     pullPolicy: IfNotPresent
 
   resources:
@@ -351,7 +367,7 @@ sapor:
   image:
     registry: quay.io/opsmxpublic
     repository: ubi8-oes-sapor
-    tag: v3.5.0
+    tag: v3.5.1
     pullPolicy: IfNotPresent
 
   resources:
@@ -415,12 +431,6 @@ sapor:
     datasources:
       platform: true
 
-    ## Set the below field to true if agent for kubernetes
-    kubernetes:
-      agent:
-        enabled: true
-        image: quay.io/opsmxpublic/forwarder-agent:v20210118T161303
-
     ## Set the below field to true if default java cacert is to be overriden
     ##
     caCerts:
@@ -436,7 +446,7 @@ ui:
   image:
     registry: quay.io/opsmxpublic
     repository: ubi8-oes-ui
-    tag: v3.5.0
+    tag: v3.5.1
     pullPolicy: IfNotPresent
 
   config:
@@ -455,7 +465,7 @@ visibility:
   image:
     registry: quay.io/opsmxpublic
     repository: ubi8-oes-visibility
-    tag: v3.5.0
+    tag: v3.5.1
     pullPolicy: IfNotPresent
 
   resources:
@@ -507,17 +517,6 @@ opa:
     tag: edge-rootless
     pullPolicy: IfNotPresent
 
-#####################################################
-## Forwarder/Controller configuration
-#####################################################
-forwarder:
-  agentServiceType: LoadBalancer
-  # Value is also used in sapor configuration for kubernetes.agent.serverHostName
-  externalName: controller-agent.testing.opsmx.com
-  image:
-    repository: quay.io/opsmxpublic/forwarder-controller
-    tag: v1.0.0
-    pullPolicy: IfNotPresent
 ####################################################
 ## LDAP configuration
 ####################################################
@@ -658,7 +657,7 @@ kibana:
 #####################################################
 spinnaker:
   halyard:
-    spinnakerVersion: 1.22.2
+    spinnakerVersion: 1.24.4
     image:
       repository: quay.io/opsmxpublic/ubi8-spin-halyard
       tag: opsmx-1.40.0
@@ -719,37 +718,37 @@ spinnaker:
         healthEndpoint: /health
         kubernetes:
           useExecHealthCheck: false
-        artifactId: quay.io/opsmxpublic/ubi8-spin-gate:1.18.1
+        artifactId: quay.io/opsmxpublic/ubi8-spin-gate:1.20.0
       deck.yml:
-        artifactId: quay.io/opsmxpublic/ubi8-spin-deck:3.3.0
+        artifactId: quay.io/opsmxpublic/ubi8-oes-deck:3.5.1
       clouddriver.yml:
-        artifactId: quay.io/opsmxpublic/ubi8-spin-clouddriver:6.11.1
+        artifactId: quay.io/opsmxpublic/ubi8-spin-clouddriver:7.2.2
       clouddriver-caching.yml:
-        artifactId: quay.io/opsmxpublic/ubi8-spin-clouddriver:6.11.1
+        artifactId: quay.io/opsmxpublic/ubi8-spin-clouddriver:7.2.2
       clouddriver-rw.yml:
-        artifactId: quay.io/opsmxpublic/ubi8-spin-clouddriver:6.11.1
+        artifactId: quay.io/opsmxpublic/ubi8-spin-clouddriver:7.2.2
       clouddriver-ro.yml:
-        artifactId: quay.io/opsmxpublic/ubi8-spin-clouddriver:6.11.1
+        artifactId: quay.io/opsmxpublic/ubi8-spin-clouddriver:7.2.2
       clouddriver-ro-deck.yml:
-        artifactId: quay.io/opsmxpublic/ubi8-spin-clouddriver:6.11.1
+        artifactId: quay.io/opsmxpublic/ubi8-spin-clouddriver:7.2.2
       echo.yml:
-        artifactId: quay.io/opsmxpublic/ubi8-spin-echo:2.14.0
+        artifactId: quay.io/opsmxpublic/ubi8-spin-echo:2.15.2
       echo-scheduler.yml:
-        artifactId: quay.io/opsmxpublic/ubi8-spin-echo:2.14.0
+        artifactId: quay.io/opsmxpublic/ubi8-spin-echo:2.15.2
       echo-worker.yml:
-        artifactId: quay.io/opsmxpublic/ubi8-spin-echo:2.14.0
+        artifactId: quay.io/opsmxpublic/ubi8-spin-echo:2.15.2
       fiat.yml:
-        artifactId: quay.io/opsmxpublic/ubi8-spin-fiat:1.13.0
+        artifactId: quay.io/opsmxpublic/ubi8-spin-fiat:1.14.1
       front50.yml:
-        artifactId: quay.io/opsmxpublic/ubi8-oes-front50:0.25.1-opa
+        artifactId: quay.io/opsmxpublic/ubi8-oes-front50:0.26.1
       igor.yml:
-        artifactId: quay.io/opsmxpublic/ubi8-spin-igor:1.12.0
+        artifactId: quay.io/opsmxpublic/ubi8-spin-igor:1.14.0
       kayenta.yml:
-        artifactId: quay.io/opsmxpublic/ubi8-spin-kayenta:0.17.0
+        artifactId: quay.io/opsmxpublic/ubi8-spin-kayenta:0.19.0
       orca.yml:
-        artifactId: quay.io/opsmxpublic/ubi8-spin-orca:2.16.0
+        artifactId: quay.io/opsmxpublic/ubi8-oes-orca:2.18.1
       rosco.yml:
-        artifactId: quay.io/opsmxpublic/ubi8-spin-rosco:0.21.1
+        artifactId: quay.io/opsmxpublic/ubi8-spin-rosco:0.23.0
     ## Uncomment if you want to add extra commands to the init script
     ## run by the init container before halyard is started.
     ## The content will be passed through `tpl`, so value interpolation is supported.