From bce0b77319df7bac0b0ba0743438f0e0ce338dda Mon Sep 17 00:00:00 2001 From: Eleanor Nicholson Date: Tue, 14 Feb 2023 15:43:46 +0000 Subject: [PATCH] feat(vector): add annotations for deployment, daemonset, statefulset (#280) --- charts/vector/Chart.yaml | 2 +- charts/vector/README.md | 3 ++- charts/vector/ci/aggregator-all-values.yaml | 4 ++++ charts/vector/templates/daemonset.yaml | 2 ++ charts/vector/templates/deployment.yaml | 2 ++ charts/vector/templates/statefulset.yaml | 2 ++ charts/vector/values.yaml | 3 +++ 7 files changed, 16 insertions(+), 2 deletions(-) diff --git a/charts/vector/Chart.yaml b/charts/vector/Chart.yaml index fa051ec..2b14cf5 100644 --- a/charts/vector/Chart.yaml +++ b/charts/vector/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: vector -version: "0.19.0" +version: "0.19.1" kubeVersion: ">=1.15.0-0" description: A lightweight, ultra-fast tool for building observability pipelines type: application diff --git a/charts/vector/README.md b/charts/vector/README.md index 70036af..510ca05 100644 --- a/charts/vector/README.md +++ b/charts/vector/README.md @@ -1,6 +1,6 @@ # Vector -![Version: 0.19.0](https://img.shields.io/badge/Version-0.19.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.27.0-distroless-libc](https://img.shields.io/badge/AppVersion-0.27.0--distroless--libc-informational?style=flat-square) +![Version: 0.19.1](https://img.shields.io/badge/Version-0.19.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.27.0-distroless-libc](https://img.shields.io/badge/AppVersion-0.27.0--distroless--libc-informational?style=flat-square) [Vector](https://vector.dev/) is a high-performance, end-to-end observability data pipeline that puts you in control of your observability data. Collect, transform, and route all your logs, metrics, and traces to any vendors you want today and any other vendors you may want tomorrow. Vector enables dramatic cost reduction, novel data enrichment, and data security where you need it, not where is most convenient for your vendors. @@ -213,6 +213,7 @@ helm install --name \ | tolerations | list | `[]` | Configure Vector Pods to be scheduled on [tainted](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) nodes. | | topologySpreadConstraints | list | `[]` | Configure [topology spread constraints](https://kubernetes.io/docs/concepts/scheduling-eviction/topology-spread-constraints/) for Vector Pods. Valid for the "Aggregator" and "Stateless-Aggregator" roles. | | updateStrategy | object | `{}` | Customize the updateStrategy used to replace Vector Pods, this is also used for the DeploymentStrategy for the "Stateless-Aggregators". Valid options depend on the chosen role. | +| workloadResourceAnnotations | object | `{}` | Set annotations on the Vector DaemonSet, Deployment or StatefulSet. | ### HAProxy values diff --git a/charts/vector/ci/aggregator-all-values.yaml b/charts/vector/ci/aggregator-all-values.yaml index 86bc5e7..131bb9e 100644 --- a/charts/vector/ci/aggregator-all-values.yaml +++ b/charts/vector/ci/aggregator-all-values.yaml @@ -11,6 +11,10 @@ securityContext: runAsNonRoot: true runAsUser: 1000 +workloadResourceAnnotations: + kubernetes.io/description: "Vector aggregator deployment." + configmap.reloader.stakater.com/reload: additional-configmap + resources: requests: cpu: 200m diff --git a/charts/vector/templates/daemonset.yaml b/charts/vector/templates/daemonset.yaml index 51cc017..60da13b 100644 --- a/charts/vector/templates/daemonset.yaml +++ b/charts/vector/templates/daemonset.yaml @@ -5,6 +5,8 @@ metadata: name: {{ include "vector.fullname" . }} labels: {{- include "vector.labels" . | nindent 4 }} + annotations: + {{- toYaml .Values.workloadResourceAnnotations | nindent 4 }} spec: selector: matchLabels: diff --git a/charts/vector/templates/deployment.yaml b/charts/vector/templates/deployment.yaml index 0ff0981..3154f3c 100644 --- a/charts/vector/templates/deployment.yaml +++ b/charts/vector/templates/deployment.yaml @@ -5,6 +5,8 @@ metadata: name: {{ include "vector.fullname" . }} labels: {{- include "vector.labels" . | nindent 4 }} + annotations: + {{- toYaml .Values.workloadResourceAnnotations | nindent 4 }} spec: {{- if not .Values.autoscaling.enabled }} replicas: {{ .Values.replicas }} diff --git a/charts/vector/templates/statefulset.yaml b/charts/vector/templates/statefulset.yaml index 09db5c1..abe0289 100644 --- a/charts/vector/templates/statefulset.yaml +++ b/charts/vector/templates/statefulset.yaml @@ -5,6 +5,8 @@ metadata: name: {{ include "vector.fullname" . }} labels: {{- include "vector.labels" . | nindent 4 }} + annotations: + {{- toYaml .Values.workloadResourceAnnotations | nindent 4 }} spec: {{- if not .Values.autoscaling.enabled }} replicas: {{ .Values.replicas }} diff --git a/charts/vector/values.yaml b/charts/vector/values.yaml index 99996f4..a5dfa00 100644 --- a/charts/vector/values.yaml +++ b/charts/vector/values.yaml @@ -131,6 +131,9 @@ podHostNetwork: false # for Vector Pods. podSecurityContext: {} +# workloadResourceAnnotations -- Set annotations on the Vector DaemonSet, Deployment or StatefulSet. +workloadResourceAnnotations: {} + # securityContext -- Specify securityContext on Vector containers. securityContext: {}