Add the ability to set up people server annotations (#185)

ONLYOFFICE · May 2, 2024 · ba26d70 · ba26d70
1 parent f2a232b
commit ba26d70
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 19 deletions.
diff --git a/templates/applications/opensearch.yaml b/templates/applications/opensearch.yaml
@@ -9,6 +9,10 @@ metadata:
     {{- if .Values.commonLabels }}
     {{- include "docspace.labels.commonLabels" . | trim | nindent 4 }}
     {{- end }}
+  {{- if or .Values.commonAnnotations .Values.opensearch.annotations }}
+  {{- $dictValue := default .Values.commonAnnotations .Values.opensearch.annotations }}
+  annotations: {{- include "docspace.annotations" ( dict "keyName" $dictValue "context" $ ) | nindent 4 }}
+  {{- end }}
 spec:
   replicas: 1
   selector:
@@ -29,10 +33,7 @@ spec:
         {{- include "docspace.labels.commonLabels" . | trim | nindent 8 }}
         {{- end }}
       {{- if .Values.opensearch.podAnnotations }}
-      annotations:
-        {{- range $key, $value := .Values.opensearch.podAnnotations }}
-        {{ $key }}: {{ tpl $value $ }}
-        {{- end }}
+      annotations: {{- include "docspace.annotations" ( dict "keyName" .Values.opensearch.podAnnotations "context" $ ) | nindent 8 }}
       {{- end }}
     spec:
       serviceAccountName: {{ include "docspace.serviceAccountName" . }}

diff --git a/templates/applications/people-server.yaml b/templates/applications/people-server.yaml
@@ -9,6 +9,10 @@ metadata:
     {{- if .Values.commonLabels }}
     {{- include "docspace.labels.commonLabels" . | trim | nindent 4 }}
     {{- end }}
+  {{- if or .Values.commonAnnotations .Values.peopleServer.annotations }}
+  {{- $dictValue := default .Values.commonAnnotations .Values.peopleServer.annotations }}
+  annotations: {{- include "docspace.annotations" ( dict "keyName" $dictValue "context" $ ) | nindent 4 }}
+  {{- end }}
 spec:
   replicas: {{ .Values.peopleServer.replicaCount }}
   selector:
@@ -37,11 +41,9 @@ spec:
         {{- if .Values.commonLabels }}
         {{- include "docspace.labels.commonLabels" . | trim | nindent 8 }}
         {{- end }}
-      {{- if .Values.podAnnotations }}
-      annotations:
-        {{- range $key, $value := .Values.podAnnotations }}
-        {{ $key }}: {{ tpl $value $ }}
-        {{- end }}
+      {{- if or .Values.podAnnotations .Values.peopleServer.podAnnotations }}
+      {{- $dictValue := default .Values.podAnnotations .Values.peopleServer.podAnnotations }}
+      annotations: {{- include "docspace.annotations" ( dict "keyName" $dictValue "context" $ ) | nindent 8 }}
       {{- end }}
     spec:
       serviceAccountName: {{ include "docspace.serviceAccountName" . }}

diff --git a/templates/applications/proxy-frontend.yaml b/templates/applications/proxy-frontend.yaml
@@ -9,6 +9,10 @@ metadata:
     {{- if .Values.commonLabels }}
     {{- include "docspace.labels.commonLabels" . | trim | nindent 4 }}
     {{- end }}
+  {{- if or .Values.commonAnnotations .Values.proxyFrontend.annotations }}
+  {{- $dictValue := default .Values.commonAnnotations .Values.proxyFrontend.annotations }}
+  annotations: {{- include "docspace.annotations" ( dict "keyName" $dictValue "context" $ ) | nindent 4 }}
+  {{- end }}
 spec:
   replicas: {{ .Values.proxyFrontend.replicaCount }}
   selector:
@@ -38,10 +42,7 @@ spec:
         {{- include "docspace.labels.commonLabels" . | trim | nindent 8 }}
         {{- end }}
       {{- if .Values.proxyFrontend.podAnnotations }}
-      annotations:
-        {{- range $key, $value := .Values.proxyFrontend.podAnnotations }}
-        {{ $key }}: {{ tpl $value $ }}
-        {{- end }}
+      annotations: {{- include "docspace.annotations" ( dict "keyName" .Values.proxyFrontend.podAnnotations "context" $ ) | nindent 8 }}
       {{- end }}
     spec:
       serviceAccountName: {{ include "docspace.serviceAccountName" . }}

diff --git a/templates/applications/router.yaml b/templates/applications/router.yaml
@@ -9,6 +9,10 @@ metadata:
     {{- if .Values.commonLabels }}
     {{- include "docspace.labels.commonLabels" . | trim | nindent 4 }}
     {{- end }}
+  {{- if or .Values.commonAnnotations .Values.router.annotations }}
+  {{- $dictValue := default .Values.commonAnnotations .Values.router.annotations }}
+  annotations: {{- include "docspace.annotations" ( dict "keyName" $dictValue "context" $ ) | nindent 4 }}
+  {{- end }}
 spec:
   replicas: {{ .Values.router.replicaCount }}
   selector:
@@ -37,11 +41,9 @@ spec:
         {{- if .Values.commonLabels }}
         {{- include "docspace.labels.commonLabels" . | trim | nindent 8 }}
         {{- end }}
-      {{- if .Values.podAnnotations }}
-      annotations:
-        {{- range $key, $value := .Values.podAnnotations }}
-        {{ $key }}: {{ tpl $value $ }}
-        {{- end }}
+      {{- if or .Values.podAnnotations .Values.router.podAnnotations }}
+      {{- $dictValue := default .Values.podAnnotations .Values.router.podAnnotations }}
+      annotations: {{- include "docspace.annotations" ( dict "keyName" $dictValue "context" $ ) | nindent 8 }}
       {{- end }}
     spec:
       serviceAccountName: {{ include "docspace.serviceAccountName" . }}

diff --git a/values.yaml b/values.yaml
@@ -560,6 +560,10 @@ peopleServer:
   # peopleServer.kind The controller used for deploy
   # Possible values are `Deployment` (default) or `StatefulSet`
   kind: Deployment
+  # peopleServer.annotations Defines annotations that will be additionally added to People Server deploy
+  # If set to, it takes priority over the `commonAnnotations`
+  # You can also use `tpl` as the value for the key
+  annotations: {}
   # peopleServer.replicaCount Number of People Server replicas to deploy
   replicaCount: 2
   # Update strategy used to replace old Pods by new ones
@@ -577,6 +581,8 @@ peopleServer:
   # Used if `peopleServer.kind` is set to `StatefulSet`
   # ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#pod-management-policies
   podManagementPolicy: OrderedReady
+  # peopleServer.podAnnotations Map of annotations to add to the People Server pods
+  podAnnotations: {}
   # Configure a Security Context for the People Server Pods
   # If set to, it takes priority over the `podSecurityContext`
   podSecurityContext:
@@ -709,6 +715,10 @@ router:
   # router.kind The controller used for deploy
   # Possible values are `Deployment` (default) or `StatefulSet`
   kind: Deployment
+  # router.annotations Defines annotations that will be additionally added to Router deploy
+  # If set to, it takes priority over the `commonAnnotations`
+  # You can also use `tpl` as the value for the key
+  annotations: {}
   # router.replicaCount Number of Router replicas to deploy
   replicaCount: 2
   # Update strategy used to replace old Pods by new ones
@@ -726,6 +736,8 @@ router:
   # Used if `router.kind` is set to `StatefulSet`
   # ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#pod-management-policies
   podManagementPolicy: OrderedReady
+  # router.podAnnotations Map of annotations to add to the Router pods
+  podAnnotations: {}
   # Configure a Security Context for the Router Pods
   # If set to, it takes priority over the `podSecurityContext`
   podSecurityContext:
@@ -3136,6 +3148,10 @@ proxyFrontend:
   # proxyFrontend.kind The controller used for deploy
   # Possible values are `Deployment` (default) or `StatefulSet`
   kind: Deployment
+  # proxyFrontend.annotations Defines annotations that will be additionally added to Proxy Frontend deploy
+  # If set to, it takes priority over the `commonAnnotations`
+  # You can also use `tpl` as the value for the key
+  annotations: {}
   # proxyFrontend.replicaCount Number of Proxy Frontend replicas to deploy
   replicaCount: 2
   # Update strategy used to replace old Pods by new ones
@@ -3683,7 +3699,11 @@ upgrade:
 opensearch:
   # opensearch.enabled Enables Opensearch installation
   enabled: true
-  # Update strategy used to replace old Pods by new ones
+  # opensearch.annotations Defines annotations that will be additionally added to Opensearch deploy
+  # If set to, it takes priority over the `commonAnnotations`
+  # You can also use `tpl` as the value for the key
+  annotations: {}
+  # Update strategy used to replace old Pod by new ones
   updateStrategy:
     # opensearch.updateStrategy.type Opensearch update strategy type
     # Allowed values: `RollingUpdate` or `OnDelete`