Add optional annotations per-deployment

geek-cookbook · Dec 23, 2020 · 2d44620 · 2d44620
1 parent 2377372
commit 2d44620
Show file tree

Hide file tree

Showing 12 changed files with 43 additions and 1 deletion.
diff --git a/charts/fission-all/Chart.yaml b/charts/fission-all/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: fission-all
-version: 1.8.1-pre36
+version: 1.8.1-pre37
 description: Fission is a fast serverless framework for Kubernetes.
 keywords:
 - fission

diff --git a/charts/fission-all/templates/builder/deployment.yaml b/charts/fission-all/templates/builder/deployment.yaml
@@ -14,6 +14,10 @@ spec:
     metadata:
       labels:
         svc: buildermgr
+{{- if .Values.builder.annotations }}
+      annotations:
+{{ toYaml .Values.builder.annotations | indent 8 }}  
+{{ end }}         
     spec:
       securityContext:
 {{ toYaml .Values.builder.podSecurityContext | indent 8 }}   

diff --git a/charts/fission-all/templates/controller/deployment.yaml b/charts/fission-all/templates/controller/deployment.yaml
@@ -17,6 +17,10 @@ spec:
       labels:
         svc: controller
         application: fission-api
+{{- if .Values.controller.annotations }}
+      annotations:
+{{ toYaml .Values.controller.annotations | indent 8 }}  
+{{ end }}         
     spec:
       securityContext:
 {{ toYaml .Values.controller.podSecurityContext | indent 8 }}    

diff --git a/charts/fission-all/templates/executor/deployment.yaml b/charts/fission-all/templates/executor/deployment.yaml
@@ -18,6 +18,9 @@ spec:
         prometheus.io/scrape: "true"
         prometheus.io/path: "/metrics"
         prometheus.io/port: "8080"
+{{- if .Values.executor.annotations }}
+{{ toYaml .Values.executor.annotations | indent 8 }}  
+{{ end }}         
     spec:
       securityContext:
 {{ toYaml .Values.executor.podSecurityContext | indent 8 }} 

diff --git a/charts/fission-all/templates/influxdb/deployment.yaml b/charts/fission-all/templates/influxdb/deployment.yaml
@@ -15,6 +15,10 @@ spec:
     metadata:
       labels:
         svc: influxdb
+{{- if .Values.influxdb.annotations }}
+      annotations:
+{{ toYaml .Values.influxdb.annotations | indent 8 }}  
+{{ end }}         
     spec:
       securityContext:
 {{ toYaml .Values.influxdb.podSecurityContext | indent 8 }}       

diff --git a/charts/fission-all/templates/kubewatcher/deployment.yaml b/charts/fission-all/templates/kubewatcher/deployment.yaml
@@ -14,6 +14,10 @@ spec:
     metadata:
       labels:
         svc: kubewatcher
+{{- if .Values.kubewatcher.annotations }}
+      annotations:
+{{ toYaml .Values.kubewatcher.annotations | indent 8 }}  
+{{ end }}         
     spec:
       securityContext:
 {{ toYaml .Values.kubewatcher.podSecurityContext | indent 8 }}       

diff --git a/charts/fission-all/templates/logger/daemonset.yaml b/charts/fission-all/templates/logger/daemonset.yaml
@@ -14,6 +14,10 @@ spec:
     metadata:
       labels:
         svc: logger
+{{- if .Values.logger.annotations }}
+      annotations:
+{{ toYaml .Values.logger.annotations | indent 8 }}  
+{{ end }}        
     spec:
       securityContext:
 {{ toYaml .Values.logger.podSecurityContext | indent 8 }}     

diff --git a/charts/fission-all/templates/mqtrigger/deployment.yaml b/charts/fission-all/templates/mqtrigger/deployment.yaml
@@ -21,6 +21,10 @@ spec:
       labels:
         svc: mqtrigger
         messagequeue: nats-streaming
+{{- if .Values.mqtrigger.annotations }}
+      annotations:
+{{ toYaml .Values.mqtrigger.annotations | indent 8 }}  
+{{ end }}         
     spec:
       securityContext:
 {{ toYaml .Values.mqtrigger.podSecurityContext | indent 8 }}       

diff --git a/charts/fission-all/templates/nats/deployment.yaml b/charts/fission-all/templates/nats/deployment.yaml
@@ -17,6 +17,10 @@ spec:
     metadata:
       labels:
         svc: nats-streaming
+{{- if .Values.nats.annotations }}
+      annotations:
+{{ toYaml .Values.nats.annotations | indent 8 }}  
+{{ end }}         
     spec:
       securityContext:
 {{ toYaml .Values.nats.podSecurityContext | indent 8 }}       

diff --git a/charts/fission-all/templates/router/deployment.yaml b/charts/fission-all/templates/router/deployment.yaml
@@ -27,6 +27,9 @@ spec:
         prometheus.io/scrape: "true"
         prometheus.io/path: "/metrics"
         prometheus.io/port: "8080"
+{{- if .Values.router.annotations }}      annotations:
+{{ toYaml .Values.router.annotations | indent 8 }}  
+{{ end }}         
     spec:
       securityContext:
 {{ toYaml .Values.router.podSecurityContext | indent 8 }} 

diff --git a/charts/fission-all/templates/storagesvc/deployment.yaml b/charts/fission-all/templates/storagesvc/deployment.yaml
@@ -19,6 +19,10 @@ spec:
       labels:
         svc: storagesvc
         application: fission-storage
+{{- if .Values.storagesvc.annotations }}
+      annotations:
+{{ toYaml .Values.storagesvc.annotations | indent 8 }}  
+{{ end }}         
     spec:
       securityContext:
 {{ toYaml .Values.storagesvc.podSecurityContext | indent 8 }}       

diff --git a/charts/fission-all/templates/timer/deployment.yaml b/charts/fission-all/templates/timer/deployment.yaml
@@ -14,6 +14,10 @@ spec:
     metadata:
       labels:
         svc: timer
+{{- if .Values.timer.annotations }}
+      annotations:
+{{ toYaml .Values.timer.annotations | indent 8 }}  
+{{ end }}         
     spec:
       securityContext:
 {{ toYaml .Values.timer.podSecurityContext | indent 8 }}