Merge branch 'OpsMx:master' into master

OpsMx · Aug 24, 2021 · 26513d4 · 26513d4
2 parents 429bd88 + 9ba73a8
commit 26513d4
Show file tree

Hide file tree

Showing 44 changed files with 122 additions and 75 deletions.
diff --git a/README.md b/README.md
@@ -99,7 +99,7 @@ Parameter | Description | Default
 `imageCredentials.email` | Email associated with docker account | `[email protected]`
 `rbac.create` | Enable or disable rbac | `true`
 `installSpinnaker` | If true, install Spinnaker along with OES Extensions | `true`
-`installationMode` | The installation mode. Available installation modes are **OES-AP** (both OES 3.0 and Autopilot), **OES** (Only OES 3.0), **AP** (Only Autopilot) and **None**(Skip OES installation) | `OES-AP`
+`installationMode` | The installation mode. Available installation modes are **OES-AP** (for OES that includes Autopilot) and **None**(Skip OES installation) | `OES-AP`
 `global.certManager.installed` | Disable this flag if cert-manager is not installed, when set to true issuer and TLS certs for ingress are automatically created | `true`
 `global.createIngress` | If true, exposes OES ui & gate services over Ingress | `false`
 `global.spinDeck.protocol` | Change this to https if TLS is enabled for ingress endpoint | `http`

diff --git a/charts/oes/Chart.yaml b/charts/oes/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: oes
-version: 3.9.1
-appVersion: 3.9.0
+version: 3.9.2
+appVersion: 3.9.1.2
 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/README.md b/charts/oes/README.md
@@ -99,7 +99,7 @@ Parameter | Description | Default
 `imageCredentials.email` | Email associated with docker account | `[email protected]`
 `rbac.create` | Enable or disable rbac | `true`
 `installSpinnaker` | If true, install Spinnaker along with OES Extensions | `true`
-`installationMode` | The installation mode. Available installation modes are **OES-AP** (both OES 3.0 and Autopilot), **OES** (Only OES 3.0), **AP** (Only Autopilot) and **None**(Skip OES installation) | `OES-AP`
+`installationMode` | The installation mode. Available installation modes are **OES-AP** (for OES that includes Autopilot) and **None**(Skip OES installation) | `OES-AP`
 `global.certManager.installed` | Disable this flag if cert-manager is not installed, when set to true issuer and TLS certs for ingress are automatically created | `true`
 `global.createIngress` | If true, exposes OES ui & gate services over Ingress | `false`
 `global.spinDeck.protocol` | Change this to https if TLS is enabled for ingress endpoint | `http`

diff --git a/charts/oes/templates/configmaps/oes-autopilot-configmap.yaml b/charts/oes/templates/configmaps/oes-autopilot-configmap.yaml
@@ -1,4 +1,4 @@
-{{- if or (eq .Values.installationMode "OES-AP") (eq .Values.installationMode "AP") -}}
+{{- if (eq .Values.installationMode "OES-AP") -}}
 apiVersion: v1
 data:
   autopilot.properties: |

diff --git a/charts/oes/templates/configmaps/oes-dashboard-configmap.yaml b/charts/oes/templates/configmaps/oes-dashboard-configmap.yaml
@@ -1,4 +1,4 @@
-{{- if or (eq .Values.installationMode "OES-AP") (eq .Values.installationMode "AP") (eq .Values.installationMode "OES") -}}
+{{- if (eq .Values.installationMode "OES-AP") -}}
 apiVersion: v1
 data:
   dashboard-local.yml: |

diff --git a/charts/oes/templates/configmaps/oes-gate-configmap.yaml b/charts/oes/templates/configmaps/oes-gate-configmap.yaml
@@ -1,4 +1,4 @@
-{{- if or (eq .Values.installationMode "OES-AP") (eq .Values.installationMode "AP") (eq .Values.installationMode "OES") -}}
+{{- if (eq .Values.installationMode "OES-AP") -}}
 apiVersion: v1
 data:
   gate.yml: |

diff --git a/charts/oes/templates/configmaps/oes-platform-configmap.yaml b/charts/oes/templates/configmaps/oes-platform-configmap.yaml
@@ -1,4 +1,4 @@
-{{- if or (eq .Values.installationMode "OES-AP") (eq .Values.installationMode "AP") (eq .Values.installationMode "OES") -}}
+{{- if (eq .Values.installationMode "OES-AP") -}}
 apiVersion: v1
 data:
   platform-local.yml: |

diff --git a/charts/oes/templates/configmaps/oes-sapor-cacerts.yaml b/charts/oes/templates/configmaps/oes-sapor-cacerts.yaml
diff --git a/charts/oes/templates/configmaps/oes-sapor-configmap.yaml b/charts/oes/templates/configmaps/oes-sapor-configmap.yaml
@@ -1,4 +1,4 @@
-{{- if or (eq .Values.installationMode "OES-AP") (eq .Values.installationMode "OES") -}}
+{{- if (eq .Values.installationMode "OES-AP") -}}
 apiVersion: v1
 data:
   application.yml: |

diff --git a/charts/oes/templates/configmaps/oes-sapor-x509-configmap.yaml b/charts/oes/templates/configmaps/oes-sapor-x509-configmap.yaml
@@ -1,5 +1,4 @@
-{{- if or (eq .Values.installationMode "OES-AP") (eq .Values.installationMode "OES") -}}
-{{- if .Values.sapor.config.spinnaker.x509.enabled }}
+{{- if and (eq .Values.installationMode "OES-AP") (.Values.sapor.config.spinnaker.x509.enabled) -}}
 apiVersion: v1
 binaryData:
   client.p12: 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
@@ -10,5 +9,4 @@ metadata:
     app: oes
     component: sapor
 {{ include "oes.standard-labels" . | indent 4 }}
-{{- end }}
 {{- end }}
diff --git a/charts/oes/templates/configmaps/oes-ui-configmap.yaml b/charts/oes/templates/configmaps/oes-ui-configmap.yaml
@@ -1,4 +1,4 @@
-{{ if or (eq .Values.installationMode "OES-AP") (eq .Values.installationMode "AP") (eq .Values.installationMode "OES") }}
+{{ if (eq .Values.installationMode "OES-AP") }}
 apiVersion: v1
 data:
 {{ (tpl (.Files.Glob "config/oes-ui/app-config.json").AsConfig . ) | indent 2 }}

diff --git a/charts/oes/templates/configmaps/oes-visibility-configmap.yaml b/charts/oes/templates/configmaps/oes-visibility-configmap.yaml
@@ -1,4 +1,4 @@
-{{- if or (eq .Values.installationMode "OES-AP") (eq .Values.installationMode "AP") (eq .Values.installationMode "OES") -}}
+{{- if (eq .Values.installationMode "OES-AP") -}}
 apiVersion: v1
 data:
   visibility-local.yml: |

diff --git a/charts/oes/templates/deployments/oes-autopilot-deployment.yaml b/charts/oes/templates/deployments/oes-autopilot-deployment.yaml
@@ -1,4 +1,4 @@
-{{- if or (eq .Values.installationMode "OES-AP") (eq .Values.installationMode "AP") -}}
+{{- if (eq .Values.installationMode "OES-AP") -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -39,6 +39,10 @@ spec:
       imagePullSecrets:
         - name: {{ .Values.imagePullSecret}}
       {{- if (eq .Values.db.enabled true) }}
+      {{- if .Values.autopilot.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.autopilot.nodeSelector | indent 8 }}
+      {{- end }}
       initContainers:
       - name: db-check
         image: postgres:9.6.5

diff --git a/charts/oes/templates/deployments/oes-dashboard-deployment.yaml b/charts/oes/templates/deployments/oes-dashboard-deployment.yaml
@@ -1,4 +1,4 @@
-{{- if or (eq .Values.installationMode "OES-AP") (eq .Values.installationMode "AP") (eq .Values.installationMode "OES") -}}
+{{- if (eq .Values.installationMode "OES-AP") -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -55,6 +55,10 @@ spec:
           periodSeconds: 60
       imagePullSecrets:
       - name: {{ .Values.imagePullSecret}}
+      {{- if .Values.dashboard.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.dashboard.nodeSelector | indent 8 }}
+      {{- end }}
       volumes:
       - name: dashboard-config
         configMap:

diff --git a/charts/oes/templates/deployments/oes-gate-deployment.yaml b/charts/oes/templates/deployments/oes-gate-deployment.yaml
@@ -1,4 +1,4 @@
-{{- if or (eq .Values.installationMode "OES-AP") (eq .Values.installationMode "AP") (eq .Values.installationMode "OES") -}}
+{{- if (eq .Values.installationMode "OES-AP") -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -81,6 +81,10 @@ spec:
           periodSeconds: 60
       imagePullSecrets:
       - name: {{ .Values.imagePullSecret}}
+      {{- if .Values.gate.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.gate.nodeSelector | indent 8 }}
+      {{- end }}
       volumes:
       {{- if .Values.gate.config.saml.enabled }}
       - secret:	

diff --git a/charts/oes/templates/deployments/oes-platform-deployment.yaml b/charts/oes/templates/deployments/oes-platform-deployment.yaml
@@ -1,4 +1,4 @@
-{{- if or (eq .Values.installationMode "OES-AP") (eq .Values.installationMode "AP") (eq .Values.installationMode "OES") -}}
+{{- if (eq .Values.installationMode "OES-AP") -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -62,6 +62,10 @@ spec:
           subPath: bootstrap.yml
       imagePullSecrets:
       - name: {{ .Values.imagePullSecret }}
+      {{- if .Values.platform.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.platform.nodeSelector | indent 8 }}
+      {{- end }}
       volumes:
       - name: platform-config-volume
         configMap:

diff --git a/charts/oes/templates/deployments/oes-sapor-deployment.yaml b/charts/oes/templates/deployments/oes-sapor-deployment.yaml
@@ -1,4 +1,4 @@
-{{- if or (eq .Values.installationMode "OES-AP") (eq .Values.installationMode "OES") -}}
+{{- if (eq .Values.installationMode "OES-AP") -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -79,6 +79,10 @@ spec:
           periodSeconds: 60
       imagePullSecrets:
       - name: {{ .Values.imagePullSecret }}
+      {{- if .Values.sapor.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.sapor.nodeSelector | indent 8 }}
+      {{- end }}
       volumes:
       {{- if .Values.forwarder.enabled }}
       - secret:

diff --git a/charts/oes/templates/deployments/oes-ui-deployment.yaml b/charts/oes/templates/deployments/oes-ui-deployment.yaml
@@ -1,4 +1,4 @@
-{{- if or (eq .Values.installationMode "OES-AP") (eq .Values.installationMode "AP") (eq .Values.installationMode "OES") -}}
+{{- if (eq .Values.installationMode "OES-AP") -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -61,6 +61,10 @@ spec:
           periodSeconds: 5
       imagePullSecrets:
       - name: {{ .Values.imagePullSecret}}
+      {{- if .Values.ui.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.ui.nodeSelector | indent 8 }}
+      {{- end }}
       volumes:
       {{- if .Values.autoConfiguration.enabled }}
       - configMap:

diff --git a/charts/oes/templates/deployments/oes-visibility-deployment.yaml b/charts/oes/templates/deployments/oes-visibility-deployment.yaml
@@ -1,4 +1,4 @@
-{{- if or (eq .Values.installationMode "OES-AP") (eq .Values.installationMode "AP") (eq .Values.installationMode "OES") -}}
+{{- if (eq .Values.installationMode "OES-AP") -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -61,6 +61,10 @@ spec:
           periodSeconds: 60
       imagePullSecrets:
       - name: {{ .Values.imagePullSecret}}
+      {{- if .Values.visibility.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.visibility.nodeSelector | indent 8 }}
+      {{- end }}
       volumes:
       - name: visibility-config
         configMap:

diff --git a/charts/oes/templates/deployments/opa-deployment.yaml b/charts/oes/templates/deployments/opa-deployment.yaml
@@ -1,4 +1,4 @@
-{{- if or (eq .Values.installationMode "OES-AP") (eq .Values.installationMode "OES") -}}
+{{- if (eq .Values.installationMode "OES-AP") -}}
 {{- if .Values.opa.enabled -}}
 apiVersion: apps/v1
 kind: Deployment
@@ -25,5 +25,9 @@ spec:
           args:
             - "run"
             - "--server"
+      {{- if .Values.opa.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.opa.nodeSelector | indent 8 }}
+      {{- end }}
 {{- end -}}
 {{- end -}}
diff --git a/charts/oes/templates/forwarder/create-controller-secret.yaml b/charts/oes/templates/forwarder/create-controller-secret.yaml
@@ -1,5 +1,4 @@
-{{- if or (eq .Values.installationMode "OES-AP") (eq .Values.installationMode "OES") -}}
-{{- if .Values.forwarder.enabled }}
+{{- if and (eq .Values.installationMode "OES-AP") (.Values.forwarder.enabled) -}}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -47,6 +46,5 @@ 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,5 +1,4 @@
-{{- if or (eq .Values.installationMode "OES-AP") (eq .Values.installationMode "OES") -}}
-{{- if .Values.forwarder.enabled }}
+{{- if and (eq .Values.installationMode "OES-AP") (.Values.forwarder.enabled) -}}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -18,4 +17,3 @@ data:
     serviceAuth:
       currentKeyName: "public.pem"
 {{- end -}}
-{{- end -}}
diff --git a/charts/oes/templates/forwarder/oes-forwarder-deployment.yaml b/charts/oes/templates/forwarder/oes-forwarder-deployment.yaml
@@ -1,5 +1,4 @@
-{{- if or (eq .Values.installationMode "OES-AP") (eq .Values.installationMode "OES") -}}
-{{- if .Values.forwarder.enabled }}
+{{- if and (eq .Values.installationMode "OES-AP") (.Values.forwarder.enabled) -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -73,5 +72,4 @@ 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,5 +1,4 @@
-{{- if or (eq .Values.installationMode "OES-AP") (eq .Values.installationMode "OES") -}}
-{{- if .Values.forwarder.enabled }}
+{{- if and (eq .Values.installationMode "OES-AP") (.Values.forwarder.enabled) -}}
 apiVersion: v1
 kind: Service
 metadata:
@@ -8,6 +7,10 @@ metadata:
     agent.opsmx.com/name: controller1
     agent.opsmx.com/role: controller
 {{ include "oes.standard-labels" . | indent 4 }}
+{{- if .Values.ui.ServiceAnnotations }}
+  annotations:
+{{ toYaml .Values.forwarder.serviceAnnotations | indent 4 }}
+{{- end }}
 spec:
   selector:
     app: opsmx-controller-controller1
@@ -31,6 +34,10 @@ metadata:
     agent.opsmx.com/name: controller1
     agent.opsmx.com/role: controller
 {{ include "oes.standard-labels" . | indent 4 }}
+{{- if .Values.forwarder.serviceAnnotations }}
+  annotations:
+{{ toYaml .Values.forwarder.serviceAnnotations | indent 4 }}
+{{- end }}
 spec:
   selector:
     app: opsmx-controller-controller1
@@ -39,4 +46,3 @@ spec:
   - name: agent-grpc
     port: 9001
 {{- 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,5 +1,4 @@
-{{- if or (eq .Values.installationMode "OES-AP") (eq .Values.installationMode "OES") -}}
-{{- if .Values.forwarder.enabled }}
+{{- if and (eq .Values.installationMode "OES-AP") (.Values.forwarder.enabled) -}}
 apiVersion: v1
 kind: Service
 metadata:
@@ -8,6 +7,10 @@ metadata:
     agent.opsmx.com/name: controller1
     agent.opsmx.com/role: controller
 {{ include "oes.standard-labels" . | indent 4 }}
+{{- if .Values.forwarder.serviceAnnotations }}
+  annotations:
+{{ toYaml .Values.forwarder.serviceAnnotations | indent 4 }}
+{{- end }}
 spec:
   selector:
     app: opsmx-controller-controller1
@@ -17,4 +20,3 @@ spec:
     port: 9001
     targetPort: agent-grpc
 {{- end -}}
-{{- end -}}
diff --git a/charts/oes/templates/ingress/oes-gate-ingress.yaml b/charts/oes/templates/ingress/oes-gate-ingress.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.global.createIngress -}}
-{{- if or (eq .Values.installationMode "OES-AP") (eq .Values.installationMode "OES") -}}
+{{- if (eq .Values.installationMode "OES-AP") -}}
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:

diff --git a/charts/oes/templates/ingress/oes-ui-ingress.yaml b/charts/oes/templates/ingress/oes-ui-ingress.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.global.createIngress -}}
-{{- if or (eq .Values.installationMode "OES-AP") (eq .Values.installationMode "OES") -}}
+{{- if (eq .Values.installationMode "OES-AP") -}}
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:

diff --git a/charts/oes/templates/rbac/oes-init-rolebinding.yaml b/charts/oes/templates/rbac/oes-init-rolebinding.yaml
@@ -1,4 +1,4 @@
-{{- if or (eq .Values.installationMode "OES-AP") (eq .Values.installationMode "AP") (eq .Values.installationMode "OES") -}}
+{{- if (eq .Values.installationMode "OES-AP") -}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:

diff --git a/charts/oes/templates/sapor-gate/sapor-gate-deployment.yaml b/charts/oes/templates/sapor-gate/sapor-gate-deployment.yaml
@@ -1,4 +1,4 @@
-{{- if or (eq .Values.installationMode "OES-AP") (eq .Values.installationMode "OES") -}}
+{{- if (eq .Values.installationMode "OES-AP") -}}
 {{- if .Values.saporgate.enabled }}
 apiVersion: apps/v1
 kind: Deployment

diff --git a/charts/oes/templates/sapor-gate/sapor-gate-secret.yaml b/charts/oes/templates/sapor-gate/sapor-gate-secret.yaml
@@ -1,5 +1,4 @@
-{{- if or (eq .Values.installationMode "OES-AP") (eq .Values.installationMode "OES") -}}
-{{- if .Values.saporgate.enabled }}
+{{- if and (eq .Values.installationMode "OES-AP") (.Values.saporgate.enabled) -}}
 apiVersion: v1
 data:
   gate-local.yml: {{- tpl (.Files.Get "config/sapor-gate/gate-local.yml") . |b64enc | nindent 4 }}
@@ -14,5 +13,4 @@ metadata:
     component: sapor-gate
   name: sapor-gate-files
 type: Opaque
-{{ end }}
 {{- end -}}
diff --git a/charts/oes/templates/sapor-gate/sapor-gate-service.yaml b/charts/oes/templates/sapor-gate/sapor-gate-service.yaml
@@ -1,5 +1,4 @@
-{{- if or (eq .Values.installationMode "OES-AP") (eq .Values.installationMode "OES") -}}
-{{- if .Values.saporgate.enabled }}
+{{- if and (eq .Values.installationMode "OES-AP") (.Values.saporgate.enabled) -}}
 apiVersion: v1
 kind: Service
 metadata:
@@ -18,5 +17,4 @@ spec:
   selector:
     app: oes
     component: sapor-gate
-{{- end -}}
 {{- end -}}
diff --git a/charts/oes/templates/secrets/imagepull-secret.yaml b/charts/oes/templates/secrets/imagepull-secret.yaml
@@ -1,5 +1,4 @@
-{{- if or (eq .Values.installationMode "OES-AP") (eq .Values.installationMode "AP") (eq .Values.installationMode "OES") -}}
-{{- if (eq .Values.imagePullSecret "opsmxdev-secret") }}
+{{- if and (eq .Values.installationMode "OES-AP") (eq .Values.imagePullSecret "opsmxdev-secret") -}}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -9,5 +8,4 @@ metadata:
 type: kubernetes.io/dockerconfigjson
 data:
   .dockerconfigjson: {{ template "imagePullSecret" . }}
-{{- end }}
 {{- end -}}
diff --git a/charts/oes/templates/services/oes-autopilot-service.yaml b/charts/oes/templates/services/oes-autopilot-service.yaml
@@ -1,4 +1,4 @@
-{{- if or (eq .Values.installationMode "OES-AP") (eq .Values.installationMode "AP") -}}
+{{- if (eq .Values.installationMode "OES-AP") -}}
 apiVersion: v1
 kind: Service
 metadata:

diff --git a/charts/oes/templates/services/oes-dashboard-service.yaml b/charts/oes/templates/services/oes-dashboard-service.yaml
@@ -1,4 +1,4 @@
-{{- if or (eq .Values.installationMode "OES-AP") (eq .Values.installationMode "AP") (eq .Values.installationMode "OES") -}}
+{{- if (eq .Values.installationMode "OES-AP") -}}
 apiVersion: v1
 kind: Service
 metadata: