Merge pull request #295 from saitejaopsmx/oes3.12

Added Spinnaker annotations in OES Components
OpsMx · Apr 13, 2022 · 88b4ad5 · 88b4ad5
2 parents bf85c17 + fd8eb68
commit 88b4ad5
Show file tree

Hide file tree

Showing 22 changed files with 102 additions and 2 deletions.
diff --git a/charts/oes/charts/openldap/templates/deployment.yaml b/charts/oes/charts/openldap/templates/deployment.yaml
@@ -1,6 +1,8 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
+  annotations:
+    moniker.spinnaker.io/application: isd
   name:  {{ template "openldap.fullname" . }}
   labels:
     app: {{ template "openldap.name" . }}

diff --git a/charts/oes/charts/redis/templates/redis-master-statefulset.yaml b/charts/oes/charts/redis/templates/redis-master-statefulset.yaml
@@ -1,6 +1,8 @@
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
+  annotations:
+    moniker.spinnaker.io/application: isd
   name: {{ template "redis.fullname" . }}-master
   labels:
     app: {{ template "redis.name" . }}

diff --git a/charts/oes/charts/spinnaker/templates/statefulsets/halyard.yaml b/charts/oes/charts/spinnaker/templates/statefulsets/halyard.yaml
@@ -1,6 +1,8 @@
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
+  annotations:
+    moniker.spinnaker.io/application: spin
   name: {{ template "spinnaker.fullname" . }}-halyard
   labels:
 {{ include "spinnaker.standard-labels" . | indent 4 }}

diff --git a/charts/oes/templates/_helpers.tpl b/charts/oes/templates/_helpers.tpl
@@ -41,6 +41,13 @@ release: {{ .Release.Name | quote }}
 chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
 {{- end -}}
 
+{{/*
+Common annotations for ISD.
+*/}}
+{{- define "isd.standard-annotations" -}}
+moniker.spinnaker.io/application: isd
+{{- end -}}
+
 {{/*
 Return the proper UI image name
 */}}

diff --git a/charts/oes/templates/deployments/oes-audit-client.yaml b/charts/oes/templates/deployments/oes-audit-client.yaml
@@ -2,6 +2,8 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
+  annotations:
+{{ include "isd.standard-annotations" . | indent 4 }}
   labels:
     app: oes
     component: auditclient

diff --git a/charts/oes/templates/deployments/oes-audit-service.yaml b/charts/oes/templates/deployments/oes-audit-service.yaml
@@ -2,6 +2,8 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
+  annotations:
+{{ include "isd.standard-annotations" . | indent 4 }}
   labels:
     app: oes
     component: auditservice

diff --git a/charts/oes/templates/deployments/oes-autopilot-deployment.yaml b/charts/oes/templates/deployments/oes-autopilot-deployment.yaml
@@ -2,6 +2,8 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
+  annotations:
+{{ include "isd.standard-annotations" . | indent 4 }}
   name: oes-autopilot
   labels:
     app: oes

diff --git a/charts/oes/templates/deployments/oes-dashboard-deployment.yaml b/charts/oes/templates/deployments/oes-dashboard-deployment.yaml
@@ -2,6 +2,8 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
+  annotations:
+{{ include "isd.standard-annotations" . | indent 4 }}
   labels:
     app: oes
     component: dashboard

diff --git a/charts/oes/templates/deployments/oes-datascience-deployment.yaml b/charts/oes/templates/deployments/oes-datascience-deployment.yaml
@@ -2,6 +2,8 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
+  annotations:
+{{ include "isd.standard-annotations" . | indent 4 }}
   labels:
     app: oes
     component: datascience

diff --git a/charts/oes/templates/deployments/oes-gate-deployment.yaml b/charts/oes/templates/deployments/oes-gate-deployment.yaml
@@ -2,6 +2,8 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
+  annotations:
+{{ include "isd.standard-annotations" . | indent 4 }}
   labels:
     app: oes
     component: gate

diff --git a/charts/oes/templates/deployments/oes-platform-deployment.yaml b/charts/oes/templates/deployments/oes-platform-deployment.yaml
@@ -2,7 +2,8 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  creationTimestamp: null
+  annotations:
+{{ include "isd.standard-annotations" . | indent 4 }}
   labels:
     app: oes
     component: platform

diff --git a/charts/oes/templates/deployments/oes-rabbitmq-deployment.yaml b/charts/oes/templates/deployments/oes-rabbitmq-deployment.yaml
@@ -1,6 +1,8 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
+  annotations:
+{{ include "isd.standard-annotations" . | indent 4 }}
   labels:
     app: oes
     component: rabbitmq
@@ -14,6 +16,10 @@ spec:
       component: rabbitmq
   template:
     metadata:
+      annotations:
+{{- if .Values.rabbitmq.annotations -}}
+{{ toYaml .Values.rabbitmq.annotations | nindent 8 }}
+{{- end }}
       labels:
         app: oes
         component: rabbitmq

diff --git a/charts/oes/templates/deployments/oes-sapor-deployment.yaml b/charts/oes/templates/deployments/oes-sapor-deployment.yaml
@@ -2,6 +2,8 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
+  annotations:
+{{ include "isd.standard-annotations" . | indent 4 }}
   labels:
     app: oes
     component: sapor

diff --git a/charts/oes/templates/deployments/oes-ui-deployment.yaml b/charts/oes/templates/deployments/oes-ui-deployment.yaml
@@ -2,6 +2,8 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
+  annotations:
+{{ include "isd.standard-annotations" . | indent 4 }}
   labels:
     app: oes
     component: ui
@@ -17,6 +19,9 @@ spec:
     metadata:
       annotations:
         checksum/configmap: {{ (.Files.Glob "config/oes-ui/app-config.json").AsConfig | sha256sum }}
+{{- if .Values.ui.annotations -}}
+        {{ toYaml .Values.ui.annotations | nindent 8 }}
+{{- end }}
       labels:
         app: oes
         component: ui

diff --git a/charts/oes/templates/deployments/oes-visibility-deployment.yaml b/charts/oes/templates/deployments/oes-visibility-deployment.yaml
@@ -2,6 +2,8 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
+  annotations:
+{{ include "isd.standard-annotations" . | indent 4 }}
   labels:
     app: oes
     component: visibility

diff --git a/charts/oes/templates/deployments/opa-deployment.yaml b/charts/oes/templates/deployments/opa-deployment.yaml
@@ -3,6 +3,8 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
+  annotations:
+{{ include "isd.standard-annotations" . | indent 4 }}
   labels:
     app: opa
 {{ include "oes.standard-labels" . | indent 4 }}
@@ -14,6 +16,10 @@ spec:
       app: opa
   template:
     metadata:
+      annotations:
+{{- if .Values.opa.annotations -}}
+{{ toYaml .Values.opa.annotations | nindent 8 }}
+{{- end }}
       labels:
         app: opa
 {{ include "oes.standard-labels" . | indent 8 }}

diff --git a/charts/oes/templates/forwarder/oes-forwarder-deployment.yaml b/charts/oes/templates/forwarder/oes-forwarder-deployment.yaml
@@ -2,6 +2,8 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
+  annotations:
+{{ include "isd.standard-annotations" . | indent 4 }}
   name: opsmx-controller-controller1
   labels:
     agent.opsmx.com/name: controller1
@@ -22,6 +24,9 @@ spec:
       annotations:
         pullversion: "16"
         checksum/configmap: {{ (.Files.Glob "templates/forwarder/oes-forwarder-config.yaml").AsConfig | sha256sum }}
+{{- if .Values.forwarder.annotations -}}
+{{ toYaml .Values.forwarder.annotations | nindent 8 }}
+{{- end }}
     spec:
       containers:
       - name: opsmx-controller-controller1

diff --git a/charts/oes/templates/hooks/github-create.yaml b/charts/oes/templates/hooks/github-create.yaml
@@ -4,6 +4,7 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   annotations:
+{{ include "isd.standard-annotations" . | indent 4 }}
     "helm.sh/hook": "pre-install"
     "helm.sh/hook-delete-policy": "before-hook-creation"
     "helm.sh/hook-weight": "1"
@@ -16,6 +17,8 @@ spec:
   backoffLimit: 1
   template:
     metadata:
+      annotations:
+{{ include "isd.standard-annotations" . | indent 8 }}
       labels:
         app: oes
         component: github-config

diff --git a/charts/oes/templates/hooks/oes-config-job.yaml b/charts/oes/templates/hooks/oes-config-job.yaml
@@ -3,6 +3,7 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   annotations:
+{{ include "isd.standard-annotations" . | indent 4 }}
     "helm.sh/hook": "post-install,post-upgrade"
     "helm.sh/hook-delete-policy": "before-hook-creation"
     "helm.sh/hook-weight": "5"
@@ -16,6 +17,7 @@ spec:
     metadata:
       annotations:
         checksum/configmap: {{ (.Files.Glob "templates/configmaps/datasource-creation.yaml").AsConfig | sha256sum }}
+{{ include "isd.standard-annotations" . | indent 8 }}
       labels:
         app: oes
         component: oes-config

diff --git a/charts/oes/templates/sapor-gate/sapor-gate-deployment.yaml b/charts/oes/templates/sapor-gate/sapor-gate-deployment.yaml
@@ -4,6 +4,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   annotations:
+{{ include "isd.standard-annotations" . | indent 4 }}
   labels:
     app: oes
     component: sapor-gate
@@ -19,6 +20,9 @@ spec:
     metadata:
       annotations:
         checksum/secret: {{ (.Files.Glob "config/sapor-gate/gate.yml").AsConfig | sha256sum }}
+{{- if .Values.saporgate.annotations -}}
+        {{ toYaml .Values.saporgate.annotations | nindent 8 }}
+{{- end }}
       labels:
         app: oes
         component: sapor-gate

diff --git a/charts/oes/templates/statefulsets/oes-db-statefulset.yaml b/charts/oes/templates/statefulsets/oes-db-statefulset.yaml
@@ -2,6 +2,8 @@
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
+  annotations:
+{{ include "isd.standard-annotations" . | indent 4 }}
   labels:
     app: oes
     component: db
@@ -17,6 +19,10 @@ spec:
       component: db
   template:
     metadata:
+      annotations:
+{{- if .Values.db.annotations -}}
+{{ toYaml .Values.db.annotations | nindent 8 }}
+{{- end }}
       labels:
         app: oes
         component: db