From 6ec71d93d7aea130e9e6f278ede34c3ee7cf8077 Mon Sep 17 00:00:00 2001 From: Jimmy Bourque Date: Tue, 12 Nov 2024 10:55:44 -0600 Subject: [PATCH 1/2] Updated pod labels to include all labels Signed-off-by: Jimmy Bourque --- operations/helm/charts/alloy/templates/controllers/_pod.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/operations/helm/charts/alloy/templates/controllers/_pod.yaml b/operations/helm/charts/alloy/templates/controllers/_pod.yaml index ce5677b301..2f97af54cd 100644 --- a/operations/helm/charts/alloy/templates/controllers/_pod.yaml +++ b/operations/helm/charts/alloy/templates/controllers/_pod.yaml @@ -7,7 +7,7 @@ metadata: {{- toYaml . | nindent 4 }} {{- end }} labels: - {{- include "alloy.selectorLabels" . | nindent 4 }} + {{- include "alloy.labels" . | nindent 4 }} {{- with .Values.controller.podLabels }} {{- toYaml . | nindent 4 }} {{- end }} From 8552828c6d0abf1c2a6cb5995f8c3930f7faf905 Mon Sep 17 00:00:00 2001 From: Jimmy Bourque Date: Fri, 15 Nov 2024 07:50:00 -0600 Subject: [PATCH 2/2] Ran update tests scripts to ensure it sees updated labels in tests --- .../alloy/templates/controllers/daemonset.yaml | 3 +++ .../clustering/alloy/templates/controllers/statefulset.yaml | 3 +++ .../alloy/templates/controllers/deployment.yaml | 3 +++ .../alloy/templates/controllers/deployment.yaml | 3 +++ .../alloy/templates/controllers/statefulset.yaml | 3 +++ .../alloy/templates/controllers/statefulset.yaml | 3 +++ .../alloy/templates/controllers/daemonset.yaml | 3 +++ .../alloy/templates/controllers/daemonset.yaml | 3 +++ .../alloy/templates/controllers/daemonset.yaml | 3 +++ .../alloy/templates/controllers/deployment.yaml | 3 +++ .../alloy/templates/controllers/deployment.yaml | 3 +++ .../alloy/templates/controllers/statefulset.yaml | 3 +++ .../alloy/templates/controllers/statefulset.yaml | 3 +++ .../custom-config/alloy/templates/controllers/daemonset.yaml | 3 +++ .../default-values/alloy/templates/controllers/daemonset.yaml | 3 +++ .../alloy/templates/controllers/daemonset.yaml | 3 +++ .../alloy/templates/controllers/daemonset.yaml | 3 +++ .../tests/envFrom/alloy/templates/controllers/daemonset.yaml | 3 +++ .../existing-config/alloy/templates/controllers/daemonset.yaml | 3 +++ .../tests/extra-env/alloy/templates/controllers/daemonset.yaml | 3 +++ .../extra-ports/alloy/templates/controllers/daemonset.yaml | 3 +++ .../faro-ingress/alloy/templates/controllers/daemonset.yaml | 3 +++ .../alloy/templates/controllers/daemonset.yaml | 3 +++ .../alloy/templates/controllers/daemonset.yaml | 3 +++ .../host-alias/alloy/templates/controllers/daemonset.yaml | 3 +++ .../initcontainers/alloy/templates/controllers/daemonset.yaml | 3 +++ .../alloy/templates/controllers/deployment.yaml | 3 +++ .../alloy/templates/controllers/daemonset.yaml | 3 +++ .../alloy/templates/controllers/daemonset.yaml | 3 +++ .../alloy/templates/controllers/daemonset.yaml | 3 +++ .../tests/nonroot/alloy/templates/controllers/daemonset.yaml | 3 +++ .../pod_annotations/alloy/templates/controllers/daemonset.yaml | 3 +++ .../tests/sidecars/alloy/templates/controllers/daemonset.yaml | 3 +++ .../alloy/templates/controllers/deployment.yaml | 3 +++ .../alloy/templates/controllers/deployment.yaml | 3 +++ .../with-digests/alloy/templates/controllers/daemonset.yaml | 3 +++ 36 files changed, 108 insertions(+) diff --git a/operations/helm/tests/additional-serviceaccount-label/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/additional-serviceaccount-label/alloy/templates/controllers/daemonset.yaml index 7ccc31efd2..62ed8230db 100644 --- a/operations/helm/tests/additional-serviceaccount-label/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/additional-serviceaccount-label/alloy/templates/controllers/daemonset.yaml @@ -21,8 +21,11 @@ spec: annotations: kubectl.kubernetes.io/default-container: alloy labels: + helm.sh/chart: alloy app.kubernetes.io/name: alloy app.kubernetes.io/instance: alloy + app.kubernetes.io/version: "vX.Y.Z" + app.kubernetes.io/managed-by: Helm spec: serviceAccountName: alloy containers: diff --git a/operations/helm/tests/clustering/alloy/templates/controllers/statefulset.yaml b/operations/helm/tests/clustering/alloy/templates/controllers/statefulset.yaml index 3c6c0173e5..31138534b8 100644 --- a/operations/helm/tests/clustering/alloy/templates/controllers/statefulset.yaml +++ b/operations/helm/tests/clustering/alloy/templates/controllers/statefulset.yaml @@ -24,8 +24,11 @@ spec: annotations: kubectl.kubernetes.io/default-container: alloy labels: + helm.sh/chart: alloy app.kubernetes.io/name: alloy app.kubernetes.io/instance: alloy + app.kubernetes.io/version: "vX.Y.Z" + app.kubernetes.io/managed-by: Helm spec: serviceAccountName: alloy containers: diff --git a/operations/helm/tests/controller-deployment-pdb-max-unavailable/alloy/templates/controllers/deployment.yaml b/operations/helm/tests/controller-deployment-pdb-max-unavailable/alloy/templates/controllers/deployment.yaml index dae7f92479..7e8663a421 100644 --- a/operations/helm/tests/controller-deployment-pdb-max-unavailable/alloy/templates/controllers/deployment.yaml +++ b/operations/helm/tests/controller-deployment-pdb-max-unavailable/alloy/templates/controllers/deployment.yaml @@ -22,8 +22,11 @@ spec: annotations: kubectl.kubernetes.io/default-container: alloy labels: + helm.sh/chart: alloy app.kubernetes.io/name: alloy app.kubernetes.io/instance: alloy + app.kubernetes.io/version: "vX.Y.Z" + app.kubernetes.io/managed-by: Helm spec: serviceAccountName: alloy containers: diff --git a/operations/helm/tests/controller-deployment-pdb-min-available/alloy/templates/controllers/deployment.yaml b/operations/helm/tests/controller-deployment-pdb-min-available/alloy/templates/controllers/deployment.yaml index dae7f92479..7e8663a421 100644 --- a/operations/helm/tests/controller-deployment-pdb-min-available/alloy/templates/controllers/deployment.yaml +++ b/operations/helm/tests/controller-deployment-pdb-min-available/alloy/templates/controllers/deployment.yaml @@ -22,8 +22,11 @@ spec: annotations: kubectl.kubernetes.io/default-container: alloy labels: + helm.sh/chart: alloy app.kubernetes.io/name: alloy app.kubernetes.io/instance: alloy + app.kubernetes.io/version: "vX.Y.Z" + app.kubernetes.io/managed-by: Helm spec: serviceAccountName: alloy containers: diff --git a/operations/helm/tests/controller-statefulset-pdb-max-unavailable/alloy/templates/controllers/statefulset.yaml b/operations/helm/tests/controller-statefulset-pdb-max-unavailable/alloy/templates/controllers/statefulset.yaml index 2d63337067..98b5a35641 100644 --- a/operations/helm/tests/controller-statefulset-pdb-max-unavailable/alloy/templates/controllers/statefulset.yaml +++ b/operations/helm/tests/controller-statefulset-pdb-max-unavailable/alloy/templates/controllers/statefulset.yaml @@ -24,8 +24,11 @@ spec: annotations: kubectl.kubernetes.io/default-container: alloy labels: + helm.sh/chart: alloy app.kubernetes.io/name: alloy app.kubernetes.io/instance: alloy + app.kubernetes.io/version: "vX.Y.Z" + app.kubernetes.io/managed-by: Helm spec: serviceAccountName: alloy containers: diff --git a/operations/helm/tests/controller-statefulset-pdb-min-available/alloy/templates/controllers/statefulset.yaml b/operations/helm/tests/controller-statefulset-pdb-min-available/alloy/templates/controllers/statefulset.yaml index 2d63337067..98b5a35641 100644 --- a/operations/helm/tests/controller-statefulset-pdb-min-available/alloy/templates/controllers/statefulset.yaml +++ b/operations/helm/tests/controller-statefulset-pdb-min-available/alloy/templates/controllers/statefulset.yaml @@ -24,8 +24,11 @@ spec: annotations: kubectl.kubernetes.io/default-container: alloy labels: + helm.sh/chart: alloy app.kubernetes.io/name: alloy app.kubernetes.io/instance: alloy + app.kubernetes.io/version: "vX.Y.Z" + app.kubernetes.io/managed-by: Helm spec: serviceAccountName: alloy containers: diff --git a/operations/helm/tests/controller-volumes-extra/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/controller-volumes-extra/alloy/templates/controllers/daemonset.yaml index b57436d247..7477a9ab1c 100644 --- a/operations/helm/tests/controller-volumes-extra/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/controller-volumes-extra/alloy/templates/controllers/daemonset.yaml @@ -21,8 +21,11 @@ spec: annotations: kubectl.kubernetes.io/default-container: alloy labels: + helm.sh/chart: alloy app.kubernetes.io/name: alloy app.kubernetes.io/instance: alloy + app.kubernetes.io/version: "vX.Y.Z" + app.kubernetes.io/managed-by: Helm spec: serviceAccountName: alloy containers: diff --git a/operations/helm/tests/create-daemonset-hostnetwork/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/create-daemonset-hostnetwork/alloy/templates/controllers/daemonset.yaml index ad51d8310d..241a5aa042 100644 --- a/operations/helm/tests/create-daemonset-hostnetwork/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/create-daemonset-hostnetwork/alloy/templates/controllers/daemonset.yaml @@ -21,8 +21,11 @@ spec: annotations: kubectl.kubernetes.io/default-container: alloy labels: + helm.sh/chart: alloy app.kubernetes.io/name: alloy app.kubernetes.io/instance: alloy + app.kubernetes.io/version: "vX.Y.Z" + app.kubernetes.io/managed-by: Helm spec: serviceAccountName: alloy containers: diff --git a/operations/helm/tests/create-daemonset/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/create-daemonset/alloy/templates/controllers/daemonset.yaml index 7ccc31efd2..62ed8230db 100644 --- a/operations/helm/tests/create-daemonset/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/create-daemonset/alloy/templates/controllers/daemonset.yaml @@ -21,8 +21,11 @@ spec: annotations: kubectl.kubernetes.io/default-container: alloy labels: + helm.sh/chart: alloy app.kubernetes.io/name: alloy app.kubernetes.io/instance: alloy + app.kubernetes.io/version: "vX.Y.Z" + app.kubernetes.io/managed-by: Helm spec: serviceAccountName: alloy containers: diff --git a/operations/helm/tests/create-deployment-autoscaling/alloy/templates/controllers/deployment.yaml b/operations/helm/tests/create-deployment-autoscaling/alloy/templates/controllers/deployment.yaml index a1df33be37..39c97002bd 100644 --- a/operations/helm/tests/create-deployment-autoscaling/alloy/templates/controllers/deployment.yaml +++ b/operations/helm/tests/create-deployment-autoscaling/alloy/templates/controllers/deployment.yaml @@ -21,8 +21,11 @@ spec: annotations: kubectl.kubernetes.io/default-container: alloy labels: + helm.sh/chart: alloy app.kubernetes.io/name: alloy app.kubernetes.io/instance: alloy + app.kubernetes.io/version: "vX.Y.Z" + app.kubernetes.io/managed-by: Helm spec: serviceAccountName: alloy containers: diff --git a/operations/helm/tests/create-deployment/alloy/templates/controllers/deployment.yaml b/operations/helm/tests/create-deployment/alloy/templates/controllers/deployment.yaml index dae7f92479..7e8663a421 100644 --- a/operations/helm/tests/create-deployment/alloy/templates/controllers/deployment.yaml +++ b/operations/helm/tests/create-deployment/alloy/templates/controllers/deployment.yaml @@ -22,8 +22,11 @@ spec: annotations: kubectl.kubernetes.io/default-container: alloy labels: + helm.sh/chart: alloy app.kubernetes.io/name: alloy app.kubernetes.io/instance: alloy + app.kubernetes.io/version: "vX.Y.Z" + app.kubernetes.io/managed-by: Helm spec: serviceAccountName: alloy containers: diff --git a/operations/helm/tests/create-statefulset-autoscaling/alloy/templates/controllers/statefulset.yaml b/operations/helm/tests/create-statefulset-autoscaling/alloy/templates/controllers/statefulset.yaml index 74ca132539..78ff93a2c6 100644 --- a/operations/helm/tests/create-statefulset-autoscaling/alloy/templates/controllers/statefulset.yaml +++ b/operations/helm/tests/create-statefulset-autoscaling/alloy/templates/controllers/statefulset.yaml @@ -23,8 +23,11 @@ spec: annotations: kubectl.kubernetes.io/default-container: alloy labels: + helm.sh/chart: alloy app.kubernetes.io/name: alloy app.kubernetes.io/instance: alloy + app.kubernetes.io/version: "vX.Y.Z" + app.kubernetes.io/managed-by: Helm spec: serviceAccountName: alloy containers: diff --git a/operations/helm/tests/create-statefulset/alloy/templates/controllers/statefulset.yaml b/operations/helm/tests/create-statefulset/alloy/templates/controllers/statefulset.yaml index 2d63337067..98b5a35641 100644 --- a/operations/helm/tests/create-statefulset/alloy/templates/controllers/statefulset.yaml +++ b/operations/helm/tests/create-statefulset/alloy/templates/controllers/statefulset.yaml @@ -24,8 +24,11 @@ spec: annotations: kubectl.kubernetes.io/default-container: alloy labels: + helm.sh/chart: alloy app.kubernetes.io/name: alloy app.kubernetes.io/instance: alloy + app.kubernetes.io/version: "vX.Y.Z" + app.kubernetes.io/managed-by: Helm spec: serviceAccountName: alloy containers: diff --git a/operations/helm/tests/custom-config/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/custom-config/alloy/templates/controllers/daemonset.yaml index 7ccc31efd2..62ed8230db 100644 --- a/operations/helm/tests/custom-config/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/custom-config/alloy/templates/controllers/daemonset.yaml @@ -21,8 +21,11 @@ spec: annotations: kubectl.kubernetes.io/default-container: alloy labels: + helm.sh/chart: alloy app.kubernetes.io/name: alloy app.kubernetes.io/instance: alloy + app.kubernetes.io/version: "vX.Y.Z" + app.kubernetes.io/managed-by: Helm spec: serviceAccountName: alloy containers: diff --git a/operations/helm/tests/default-values/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/default-values/alloy/templates/controllers/daemonset.yaml index 7ccc31efd2..62ed8230db 100644 --- a/operations/helm/tests/default-values/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/default-values/alloy/templates/controllers/daemonset.yaml @@ -21,8 +21,11 @@ spec: annotations: kubectl.kubernetes.io/default-container: alloy labels: + helm.sh/chart: alloy app.kubernetes.io/name: alloy app.kubernetes.io/instance: alloy + app.kubernetes.io/version: "vX.Y.Z" + app.kubernetes.io/managed-by: Helm spec: serviceAccountName: alloy containers: diff --git a/operations/helm/tests/enable-servicemonitor-tls/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/enable-servicemonitor-tls/alloy/templates/controllers/daemonset.yaml index 6d43e773c3..6a033d8bdb 100644 --- a/operations/helm/tests/enable-servicemonitor-tls/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/enable-servicemonitor-tls/alloy/templates/controllers/daemonset.yaml @@ -21,8 +21,11 @@ spec: annotations: kubectl.kubernetes.io/default-container: alloy labels: + helm.sh/chart: alloy app.kubernetes.io/name: alloy app.kubernetes.io/instance: alloy + app.kubernetes.io/version: "vX.Y.Z" + app.kubernetes.io/managed-by: Helm spec: serviceAccountName: alloy containers: diff --git a/operations/helm/tests/enable-servicemonitor/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/enable-servicemonitor/alloy/templates/controllers/daemonset.yaml index 7ccc31efd2..62ed8230db 100644 --- a/operations/helm/tests/enable-servicemonitor/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/enable-servicemonitor/alloy/templates/controllers/daemonset.yaml @@ -21,8 +21,11 @@ spec: annotations: kubectl.kubernetes.io/default-container: alloy labels: + helm.sh/chart: alloy app.kubernetes.io/name: alloy app.kubernetes.io/instance: alloy + app.kubernetes.io/version: "vX.Y.Z" + app.kubernetes.io/managed-by: Helm spec: serviceAccountName: alloy containers: diff --git a/operations/helm/tests/envFrom/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/envFrom/alloy/templates/controllers/daemonset.yaml index 7d721e3b27..001db90e8a 100644 --- a/operations/helm/tests/envFrom/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/envFrom/alloy/templates/controllers/daemonset.yaml @@ -21,8 +21,11 @@ spec: annotations: kubectl.kubernetes.io/default-container: alloy labels: + helm.sh/chart: alloy app.kubernetes.io/name: alloy app.kubernetes.io/instance: alloy + app.kubernetes.io/version: "vX.Y.Z" + app.kubernetes.io/managed-by: Helm spec: serviceAccountName: alloy containers: diff --git a/operations/helm/tests/existing-config/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/existing-config/alloy/templates/controllers/daemonset.yaml index 965ae9e429..c54fdc817a 100644 --- a/operations/helm/tests/existing-config/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/existing-config/alloy/templates/controllers/daemonset.yaml @@ -21,8 +21,11 @@ spec: annotations: kubectl.kubernetes.io/default-container: alloy labels: + helm.sh/chart: alloy app.kubernetes.io/name: alloy app.kubernetes.io/instance: alloy + app.kubernetes.io/version: "vX.Y.Z" + app.kubernetes.io/managed-by: Helm spec: serviceAccountName: alloy containers: diff --git a/operations/helm/tests/extra-env/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/extra-env/alloy/templates/controllers/daemonset.yaml index 66d83eeb13..254b9a0e5c 100644 --- a/operations/helm/tests/extra-env/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/extra-env/alloy/templates/controllers/daemonset.yaml @@ -21,8 +21,11 @@ spec: annotations: kubectl.kubernetes.io/default-container: alloy labels: + helm.sh/chart: alloy app.kubernetes.io/name: alloy app.kubernetes.io/instance: alloy + app.kubernetes.io/version: "vX.Y.Z" + app.kubernetes.io/managed-by: Helm spec: serviceAccountName: alloy containers: diff --git a/operations/helm/tests/extra-ports/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/extra-ports/alloy/templates/controllers/daemonset.yaml index fc871cdca5..e2389c4839 100644 --- a/operations/helm/tests/extra-ports/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/extra-ports/alloy/templates/controllers/daemonset.yaml @@ -21,8 +21,11 @@ spec: annotations: kubectl.kubernetes.io/default-container: alloy labels: + helm.sh/chart: alloy app.kubernetes.io/name: alloy app.kubernetes.io/instance: alloy + app.kubernetes.io/version: "vX.Y.Z" + app.kubernetes.io/managed-by: Helm spec: serviceAccountName: alloy containers: diff --git a/operations/helm/tests/faro-ingress/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/faro-ingress/alloy/templates/controllers/daemonset.yaml index 7cf86c80da..dbf66536ee 100644 --- a/operations/helm/tests/faro-ingress/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/faro-ingress/alloy/templates/controllers/daemonset.yaml @@ -21,8 +21,11 @@ spec: annotations: kubectl.kubernetes.io/default-container: alloy labels: + helm.sh/chart: alloy app.kubernetes.io/name: alloy app.kubernetes.io/instance: alloy + app.kubernetes.io/version: "vX.Y.Z" + app.kubernetes.io/managed-by: Helm spec: serviceAccountName: alloy containers: diff --git a/operations/helm/tests/global-image-pullsecrets/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/global-image-pullsecrets/alloy/templates/controllers/daemonset.yaml index 875430dd0f..9f31e6edc2 100644 --- a/operations/helm/tests/global-image-pullsecrets/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/global-image-pullsecrets/alloy/templates/controllers/daemonset.yaml @@ -21,8 +21,11 @@ spec: annotations: kubectl.kubernetes.io/default-container: alloy labels: + helm.sh/chart: alloy app.kubernetes.io/name: alloy app.kubernetes.io/instance: alloy + app.kubernetes.io/version: "vX.Y.Z" + app.kubernetes.io/managed-by: Helm spec: securityContext: runAsGroup: 1000 diff --git a/operations/helm/tests/global-image-registry/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/global-image-registry/alloy/templates/controllers/daemonset.yaml index 1933902acc..649a9c3fdb 100644 --- a/operations/helm/tests/global-image-registry/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/global-image-registry/alloy/templates/controllers/daemonset.yaml @@ -21,8 +21,11 @@ spec: annotations: kubectl.kubernetes.io/default-container: alloy labels: + helm.sh/chart: alloy app.kubernetes.io/name: alloy app.kubernetes.io/instance: alloy + app.kubernetes.io/version: "vX.Y.Z" + app.kubernetes.io/managed-by: Helm spec: serviceAccountName: alloy containers: diff --git a/operations/helm/tests/host-alias/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/host-alias/alloy/templates/controllers/daemonset.yaml index af29f80c4d..3d08f3fc77 100644 --- a/operations/helm/tests/host-alias/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/host-alias/alloy/templates/controllers/daemonset.yaml @@ -21,8 +21,11 @@ spec: annotations: kubectl.kubernetes.io/default-container: alloy labels: + helm.sh/chart: alloy app.kubernetes.io/name: alloy app.kubernetes.io/instance: alloy + app.kubernetes.io/version: "vX.Y.Z" + app.kubernetes.io/managed-by: Helm spec: serviceAccountName: alloy containers: diff --git a/operations/helm/tests/initcontainers/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/initcontainers/alloy/templates/controllers/daemonset.yaml index 73f378bfeb..08530e57f8 100644 --- a/operations/helm/tests/initcontainers/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/initcontainers/alloy/templates/controllers/daemonset.yaml @@ -21,8 +21,11 @@ spec: annotations: kubectl.kubernetes.io/default-container: alloy labels: + helm.sh/chart: alloy app.kubernetes.io/name: alloy app.kubernetes.io/instance: alloy + app.kubernetes.io/version: "vX.Y.Z" + app.kubernetes.io/managed-by: Helm spec: serviceAccountName: alloy initContainers: diff --git a/operations/helm/tests/lifecycle-hooks/alloy/templates/controllers/deployment.yaml b/operations/helm/tests/lifecycle-hooks/alloy/templates/controllers/deployment.yaml index 0f70f1da0a..8ba0ab5c8e 100644 --- a/operations/helm/tests/lifecycle-hooks/alloy/templates/controllers/deployment.yaml +++ b/operations/helm/tests/lifecycle-hooks/alloy/templates/controllers/deployment.yaml @@ -22,8 +22,11 @@ spec: annotations: kubectl.kubernetes.io/default-container: alloy labels: + helm.sh/chart: alloy app.kubernetes.io/name: alloy app.kubernetes.io/instance: alloy + app.kubernetes.io/version: "vX.Y.Z" + app.kubernetes.io/managed-by: Helm spec: serviceAccountName: alloy containers: diff --git a/operations/helm/tests/local-image-pullsecrets/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/local-image-pullsecrets/alloy/templates/controllers/daemonset.yaml index cd0ef136e3..6f0a98ef23 100644 --- a/operations/helm/tests/local-image-pullsecrets/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/local-image-pullsecrets/alloy/templates/controllers/daemonset.yaml @@ -21,8 +21,11 @@ spec: annotations: kubectl.kubernetes.io/default-container: alloy labels: + helm.sh/chart: alloy app.kubernetes.io/name: alloy app.kubernetes.io/instance: alloy + app.kubernetes.io/version: "vX.Y.Z" + app.kubernetes.io/managed-by: Helm spec: serviceAccountName: alloy imagePullSecrets: diff --git a/operations/helm/tests/local-image-registry/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/local-image-registry/alloy/templates/controllers/daemonset.yaml index 1933902acc..649a9c3fdb 100644 --- a/operations/helm/tests/local-image-registry/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/local-image-registry/alloy/templates/controllers/daemonset.yaml @@ -21,8 +21,11 @@ spec: annotations: kubectl.kubernetes.io/default-container: alloy labels: + helm.sh/chart: alloy app.kubernetes.io/name: alloy app.kubernetes.io/instance: alloy + app.kubernetes.io/version: "vX.Y.Z" + app.kubernetes.io/managed-by: Helm spec: serviceAccountName: alloy containers: diff --git a/operations/helm/tests/nodeselectors-and-tolerations/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/nodeselectors-and-tolerations/alloy/templates/controllers/daemonset.yaml index 1f378083e0..f8c36e0a93 100644 --- a/operations/helm/tests/nodeselectors-and-tolerations/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/nodeselectors-and-tolerations/alloy/templates/controllers/daemonset.yaml @@ -21,8 +21,11 @@ spec: annotations: kubectl.kubernetes.io/default-container: alloy labels: + helm.sh/chart: alloy app.kubernetes.io/name: alloy app.kubernetes.io/instance: alloy + app.kubernetes.io/version: "vX.Y.Z" + app.kubernetes.io/managed-by: Helm spec: serviceAccountName: alloy containers: diff --git a/operations/helm/tests/nonroot/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/nonroot/alloy/templates/controllers/daemonset.yaml index d66f119ac8..8a27d28ecf 100644 --- a/operations/helm/tests/nonroot/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/nonroot/alloy/templates/controllers/daemonset.yaml @@ -21,8 +21,11 @@ spec: annotations: kubectl.kubernetes.io/default-container: alloy labels: + helm.sh/chart: alloy app.kubernetes.io/name: alloy app.kubernetes.io/instance: alloy + app.kubernetes.io/version: "vX.Y.Z" + app.kubernetes.io/managed-by: Helm spec: securityContext: fsGroup: 473 diff --git a/operations/helm/tests/pod_annotations/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/pod_annotations/alloy/templates/controllers/daemonset.yaml index 2216d62453..5a80f1bb04 100644 --- a/operations/helm/tests/pod_annotations/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/pod_annotations/alloy/templates/controllers/daemonset.yaml @@ -22,8 +22,11 @@ spec: kubectl.kubernetes.io/default-container: alloy testAnnotationKey: testAnnotationValue labels: + helm.sh/chart: alloy app.kubernetes.io/name: alloy app.kubernetes.io/instance: alloy + app.kubernetes.io/version: "vX.Y.Z" + app.kubernetes.io/managed-by: Helm spec: serviceAccountName: alloy containers: diff --git a/operations/helm/tests/sidecars/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/sidecars/alloy/templates/controllers/daemonset.yaml index 897f2367d1..9f1b927897 100644 --- a/operations/helm/tests/sidecars/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/sidecars/alloy/templates/controllers/daemonset.yaml @@ -21,8 +21,11 @@ spec: annotations: kubectl.kubernetes.io/default-container: alloy labels: + helm.sh/chart: alloy app.kubernetes.io/name: alloy app.kubernetes.io/instance: alloy + app.kubernetes.io/version: "vX.Y.Z" + app.kubernetes.io/managed-by: Helm spec: serviceAccountName: alloy containers: diff --git a/operations/helm/tests/termination-grace-period/alloy/templates/controllers/deployment.yaml b/operations/helm/tests/termination-grace-period/alloy/templates/controllers/deployment.yaml index e5801c1e39..55d062862d 100644 --- a/operations/helm/tests/termination-grace-period/alloy/templates/controllers/deployment.yaml +++ b/operations/helm/tests/termination-grace-period/alloy/templates/controllers/deployment.yaml @@ -22,8 +22,11 @@ spec: annotations: kubectl.kubernetes.io/default-container: alloy labels: + helm.sh/chart: alloy app.kubernetes.io/name: alloy app.kubernetes.io/instance: alloy + app.kubernetes.io/version: "vX.Y.Z" + app.kubernetes.io/managed-by: Helm spec: serviceAccountName: alloy containers: diff --git a/operations/helm/tests/topologyspreadconstraints/alloy/templates/controllers/deployment.yaml b/operations/helm/tests/topologyspreadconstraints/alloy/templates/controllers/deployment.yaml index 1c8d9f9e99..b64f8a7f1e 100644 --- a/operations/helm/tests/topologyspreadconstraints/alloy/templates/controllers/deployment.yaml +++ b/operations/helm/tests/topologyspreadconstraints/alloy/templates/controllers/deployment.yaml @@ -22,8 +22,11 @@ spec: annotations: kubectl.kubernetes.io/default-container: alloy labels: + helm.sh/chart: alloy app.kubernetes.io/name: alloy app.kubernetes.io/instance: alloy + app.kubernetes.io/version: "vX.Y.Z" + app.kubernetes.io/managed-by: Helm spec: serviceAccountName: alloy containers: diff --git a/operations/helm/tests/with-digests/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/with-digests/alloy/templates/controllers/daemonset.yaml index 44b03c3615..b72d4f65f2 100644 --- a/operations/helm/tests/with-digests/alloy/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/with-digests/alloy/templates/controllers/daemonset.yaml @@ -21,8 +21,11 @@ spec: annotations: kubectl.kubernetes.io/default-container: alloy labels: + helm.sh/chart: alloy app.kubernetes.io/name: alloy app.kubernetes.io/instance: alloy + app.kubernetes.io/version: "vX.Y.Z" + app.kubernetes.io/managed-by: Helm spec: serviceAccountName: alloy containers: