feat: Added option to extend deployment annotations list (#96)

promitor · Jan 19, 2022 · 59b4239 · 59b4239
1 parent 24e9eb6
commit 59b4239
Show file tree

Hide file tree

Showing 11 changed files with 96 additions and 47 deletions.
diff --git a/docs/index.yaml b/docs/index.yaml
diff --git a/docs/promitor-agent-resource-discovery-0.7.2.tgz b/docs/promitor-agent-resource-discovery-0.7.2.tgz
diff --git a/docs/promitor-agent-scraper-2.7.2.tgz b/docs/promitor-agent-scraper-2.7.2.tgz
diff --git a/promitor-agent-resource-discovery/Chart.yaml b/promitor-agent-resource-discovery/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-version: 0.7.1
+version: 0.7.2
 appVersion: 0.7.0
 type: application
 name: promitor-agent-resource-discovery

diff --git a/promitor-agent-resource-discovery/README.md b/promitor-agent-resource-discovery/README.md
@@ -107,6 +107,7 @@ their default values.
 | `affinity`  | Affinity settings ([docs](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity)) |    `{}`    |
 | `nodeSelector` | Node labels for pod assignment | `{}` |
 | `podLabels`  | Additional pod labels to include |    `{}`    |
+| `annotations` | Additional annotations to include | `{}` |
 | `priorityClassName`  | Priority class to be used by pod ([docs](https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/)) |    `""`    |
 | `securityContext.*`  | Custom security context object for pod ([docs](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/)) | `{}`            |
 | `securityContext.enabled`  | Whether to include custom security context for pod or not | `false`            |

diff --git a/promitor-agent-resource-discovery/templates/deployment.yaml b/promitor-agent-resource-discovery/templates/deployment.yaml
@@ -30,6 +30,9 @@ spec:
         {{- if .Values.secrets.createSecret }}
         checksum/secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}
         {{- end }}
+        {{- if .Values.annotations }}
+        {{- toYaml .Values.annotations | nindent 8 }}
+        {{- end }}
     spec:
       {{- if .Values.securityContext.enabled }}
       securityContext: {{- omit .Values.securityContext "enabled" | toYaml | nindent 8 }}

diff --git a/promitor-agent-resource-discovery/values.yaml b/promitor-agent-resource-discovery/values.yaml
@@ -110,6 +110,8 @@ affinity: {}
 
 podLabels: {}
 
+annotations: {}
+
 priorityClassName: ""
 
 resources: {}

diff --git a/promitor-agent-scraper/Chart.yaml b/promitor-agent-scraper/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-version: 2.7.1
+version: 2.7.2
 appVersion: 2.6.0
 type: application
 name: promitor-agent-scraper

diff --git a/promitor-agent-scraper/README.md b/promitor-agent-scraper/README.md
@@ -130,6 +130,7 @@ their default values.
 | `affinity`  | Affinity settings ([docs](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity)) |    `{}`    |
 | `nodeSelector` | Node labels for pod assignment | `{}` |
 | `podLabels`  | Additional pod labels to include |    `{}`    |
+| `annotations` | Additional annotations to include | `{}` |
 | `priorityClassName`  | Priority class to be used by pod ([docs](https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/)) |    `""`    |
 | `securityContext.enabled`  | Whether to include custom security context for pod or not | `true`            |
 | `securityContext.*`  | Custom security context object for pod ([docs](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/)) | <pre>runAsGroup: 10000<br>runAsNonRoot: true<br>runAsUser: 10000<br>seccompProfile:<br>&emsp;type: RuntimeDefault</pre> |

diff --git a/promitor-agent-scraper/templates/deployment.yaml b/promitor-agent-scraper/templates/deployment.yaml
@@ -34,6 +34,9 @@ spec:
         {{- if .Values.secrets.createSecret }}
         checksum/secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}
         {{- end }}
+        {{- if .Values.annotations }}
+        {{- toYaml .Values.annotations | nindent 8 }}
+        {{- end }}
     spec:
       {{- if and .Values.rbac.create .Values.rbac.serviceAccount.create .Values.rbac.serviceAccount.automountServiceAccountToken }}
       automountServiceAccountToken: true

diff --git a/promitor-agent-scraper/values.yaml b/promitor-agent-scraper/values.yaml
@@ -146,6 +146,8 @@ affinity: {}
 
 podLabels: {}
 
+annotations: {}
+
 priorityClassName: ""
 
 resources: {}