From 8af971ce6a5b5e1e4de9e465fc6f2de7367fdbc8 Mon Sep 17 00:00:00 2001 From: Robert Fratto Date: Tue, 12 Mar 2024 08:46:58 -0400 Subject: [PATCH] helm: rename charts/grafana-agent to charts/alloy --- .github/workflows/helm-release.yml.disabled | 2 +- .github/workflows/helm-test.yml | 2 +- Makefile | 2 +- .../tasks/configure/configure-kubernetes.md | 8 +- docs/sources/tasks/migrate/from-operator.md | 2 +- .../internal/apis/monitoring/v1alpha2/doc.go | 2 +- operations/helm/Makefile | 2 +- operations/helm/README.md | 2 +- .../{grafana-agent => alloy}/.helmignore | 0 .../{grafana-agent => alloy}/CHANGELOG.md | 0 .../{grafana-agent => alloy}/Chart.yaml | 2 +- .../charts/{grafana-agent => alloy}/README.md | 0 .../{grafana-agent => alloy}/README.md.gotmpl | 0 .../charts/crds/Chart.yaml | 0 .../crds/monitoring.grafana.com_podlogs.yaml | 0 ...dditional-serviceaccount-label-values.yaml | 0 .../ci/clustering-values.yaml | 0 .../ci/controller-volumes-extra-values.yaml | 0 .../create-daemonset-hostnetwork-values.yaml | 0 .../ci/create-daemonset-values.yaml | 0 .../create-deployment-autoscaling-values.yaml | 0 .../ci/create-deployment-values.yaml | 0 ...create-statefulset-autoscaling-values.yaml | 0 .../ci/create-statefulset-values.yaml | 0 .../ci/custom-config-values.yaml | 0 .../ci/default-values-values.yaml | 0 .../ci/enable-servicemonitor-tls-values.yaml | 0 .../ci/enable-servicemonitor-values.yaml | 0 .../ci/envFrom-values.yaml | 0 .../ci/existing-config-values.yaml | 0 .../ci/extra-env-values.yaml | 0 .../ci/extra-ports-values.yaml | 0 .../ci/faro-ingress-values.yaml | 0 .../ci/global-image-pullsecrets-values.yaml | 0 .../ci/global-image-registry-values.yaml | 0 .../ci/initcontainers-values.yaml | 0 .../ci/local-image-pullsecrets-values.yaml | 0 .../ci/local-image-registry-values.yaml | 0 .../nodeselectors-and-tolerations-values.yaml | 0 .../ci/pod_annotations-values.yaml | 0 .../ci/sidecars-values.yaml | 0 .../ci/topologyspreadconstraints-values.yaml | 0 .../ci/with-digests-values.yaml | 0 .../config/example.river | 0 .../templates/NOTES.txt | 0 .../templates/_config.tpl | 0 .../templates/_helpers.tpl | 0 .../templates/cluster_service.yaml | 0 .../templates/configmap.yaml | 0 .../templates/containers/_agent.yaml | 0 .../templates/containers/_watch.yaml | 0 .../templates/controllers/_pod.yaml | 0 .../templates/controllers/daemonset.yaml | 0 .../templates/controllers/deployment.yaml | 0 .../templates/controllers/statefulset.yaml | 0 .../templates/hpa.yaml | 0 .../templates/ingress.yaml | 0 .../templates/rbac.yaml | 0 .../templates/service.yaml | 0 .../templates/serviceaccount.yaml | 0 .../templates/servicemonitor.yaml | 0 .../{grafana-agent => alloy}/values.yaml | 0 .../templates/configmap.yaml | 10 +- .../templates/controllers/daemonset.yaml | 22 ++-- .../alloy}/templates/rbac.yaml | 24 ++-- .../alloy}/templates/service.yaml | 14 +-- .../alloy/templates/serviceaccount.yaml | 14 +++ .../templates/serviceaccount.yaml | 14 --- .../templates/cluster_service.yaml | 14 +-- .../alloy}/templates/configmap.yaml | 10 +- .../templates/controllers/statefulset.yaml | 26 ++-- .../alloy}/templates/rbac.yaml | 24 ++-- .../alloy}/templates/service.yaml | 14 +-- .../alloy/templates/serviceaccount.yaml | 13 ++ .../templates/serviceaccount.yaml | 13 -- .../alloy}/templates/configmap.yaml | 10 +- .../templates/controllers/daemonset.yaml | 22 ++-- .../alloy}/templates/rbac.yaml | 24 ++-- .../alloy}/templates/service.yaml | 14 +-- .../alloy/templates/serviceaccount.yaml | 13 ++ .../templates/serviceaccount.yaml | 13 -- .../templates/configmap.yaml | 10 +- .../templates/controllers/daemonset.yaml | 22 ++-- .../alloy}/templates/rbac.yaml | 24 ++-- .../alloy}/templates/service.yaml | 14 +-- .../alloy/templates/serviceaccount.yaml | 13 ++ .../templates/serviceaccount.yaml | 13 -- .../alloy/templates/configmap.yaml | 42 +++++++ .../templates/controllers/daemonset.yaml | 22 ++-- .../alloy/templates/rbac.yaml | 117 ++++++++++++++++++ .../alloy/templates/service.yaml | 23 ++++ .../alloy/templates/serviceaccount.yaml | 13 ++ .../grafana-agent/templates/configmap.yaml | 42 ------- .../grafana-agent/templates/rbac.yaml | 117 ------------------ .../grafana-agent/templates/service.yaml | 23 ---- .../templates/serviceaccount.yaml | 13 -- .../alloy/templates/configmap.yaml | 42 +++++++ .../templates/controllers/deployment.yaml | 22 ++-- .../templates/hpa.yaml | 12 +- .../alloy/templates/rbac.yaml | 117 ++++++++++++++++++ .../alloy/templates/service.yaml | 23 ++++ .../alloy/templates/serviceaccount.yaml | 13 ++ .../grafana-agent/templates/configmap.yaml | 42 ------- .../grafana-agent/templates/rbac.yaml | 117 ------------------ .../grafana-agent/templates/service.yaml | 23 ---- .../templates/serviceaccount.yaml | 13 -- .../alloy/templates/configmap.yaml | 42 +++++++ .../templates/controllers/deployment.yaml | 22 ++-- .../alloy/templates/rbac.yaml | 117 ++++++++++++++++++ .../alloy/templates/service.yaml | 23 ++++ .../alloy/templates/serviceaccount.yaml | 13 ++ .../grafana-agent/templates/configmap.yaml | 42 ------- .../grafana-agent/templates/rbac.yaml | 117 ------------------ .../grafana-agent/templates/service.yaml | 23 ---- .../templates/serviceaccount.yaml | 13 -- .../alloy/templates/configmap.yaml | 42 +++++++ .../templates/controllers/statefulset.yaml | 24 ++-- .../templates/hpa.yaml | 12 +- .../alloy/templates/rbac.yaml | 117 ++++++++++++++++++ .../alloy/templates/service.yaml | 23 ++++ .../alloy/templates/serviceaccount.yaml | 13 ++ .../grafana-agent/templates/configmap.yaml | 42 ------- .../grafana-agent/templates/rbac.yaml | 117 ------------------ .../grafana-agent/templates/service.yaml | 23 ---- .../templates/serviceaccount.yaml | 13 -- .../alloy/templates/configmap.yaml | 42 +++++++ .../templates/controllers/statefulset.yaml | 24 ++-- .../alloy/templates/rbac.yaml | 117 ++++++++++++++++++ .../alloy/templates/service.yaml | 23 ++++ .../alloy/templates/serviceaccount.yaml | 13 ++ .../grafana-agent/templates/configmap.yaml | 42 ------- .../grafana-agent/templates/rbac.yaml | 117 ------------------ .../grafana-agent/templates/service.yaml | 23 ---- .../templates/serviceaccount.yaml | 13 -- .../templates/configmap.yaml | 10 +- .../templates/controllers/daemonset.yaml | 22 ++-- .../custom-config/alloy/templates/rbac.yaml | 117 ++++++++++++++++++ .../alloy/templates/service.yaml | 23 ++++ .../alloy/templates/serviceaccount.yaml | 13 ++ .../grafana-agent/templates/rbac.yaml | 117 ------------------ .../grafana-agent/templates/service.yaml | 23 ---- .../templates/serviceaccount.yaml | 13 -- .../alloy/templates/configmap.yaml | 42 +++++++ .../templates/controllers/daemonset.yaml | 22 ++-- .../default-values/alloy/templates/rbac.yaml | 117 ++++++++++++++++++ .../alloy/templates/service.yaml | 23 ++++ .../alloy/templates/serviceaccount.yaml | 13 ++ .../grafana-agent/templates/configmap.yaml | 42 ------- .../grafana-agent/templates/rbac.yaml | 117 ------------------ .../grafana-agent/templates/service.yaml | 23 ---- .../templates/serviceaccount.yaml | 13 -- .../alloy/templates/configmap.yaml | 42 +++++++ .../templates/controllers/daemonset.yaml | 22 ++-- .../alloy/templates/rbac.yaml | 117 ++++++++++++++++++ .../alloy/templates/service.yaml | 23 ++++ .../alloy/templates/serviceaccount.yaml | 13 ++ .../templates/servicemonitor.yaml | 14 +-- .../grafana-agent/templates/configmap.yaml | 42 ------- .../grafana-agent/templates/rbac.yaml | 117 ------------------ .../grafana-agent/templates/service.yaml | 23 ---- .../templates/serviceaccount.yaml | 13 -- .../alloy/templates/configmap.yaml | 42 +++++++ .../templates/controllers/daemonset.yaml | 74 +++++++++++ .../alloy/templates/rbac.yaml | 117 ++++++++++++++++++ .../alloy/templates/service.yaml | 23 ++++ .../alloy/templates/serviceaccount.yaml | 13 ++ .../alloy/templates/servicemonitor.yaml | 21 ++++ .../grafana-agent/templates/configmap.yaml | 42 ------- .../templates/controllers/daemonset.yaml | 74 ----------- .../grafana-agent/templates/rbac.yaml | 117 ------------------ .../grafana-agent/templates/service.yaml | 23 ---- .../templates/serviceaccount.yaml | 13 -- .../templates/servicemonitor.yaml | 21 ---- .../envFrom/alloy/templates/configmap.yaml | 42 +++++++ .../templates/controllers/daemonset.yaml | 22 ++-- .../tests/envFrom/alloy/templates/rbac.yaml | 117 ++++++++++++++++++ .../envFrom/alloy/templates/service.yaml | 23 ++++ .../alloy/templates/serviceaccount.yaml | 13 ++ .../grafana-agent/templates/configmap.yaml | 42 ------- .../envFrom/grafana-agent/templates/rbac.yaml | 117 ------------------ .../grafana-agent/templates/service.yaml | 23 ---- .../templates/serviceaccount.yaml | 13 -- .../templates/controllers/daemonset.yaml | 20 +-- .../existing-config/alloy/templates/rbac.yaml | 117 ++++++++++++++++++ .../alloy/templates/service.yaml | 23 ++++ .../alloy/templates/serviceaccount.yaml | 13 ++ .../grafana-agent/templates/rbac.yaml | 117 ------------------ .../grafana-agent/templates/service.yaml | 23 ---- .../templates/serviceaccount.yaml | 13 -- .../extra-env/alloy/templates/configmap.yaml | 42 +++++++ .../templates/controllers/daemonset.yaml | 22 ++-- .../tests/extra-env/alloy/templates/rbac.yaml | 117 ++++++++++++++++++ .../extra-env/alloy/templates/service.yaml | 23 ++++ .../alloy/templates/serviceaccount.yaml | 13 ++ .../grafana-agent/templates/configmap.yaml | 42 ------- .../grafana-agent/templates/rbac.yaml | 117 ------------------ .../grafana-agent/templates/service.yaml | 23 ---- .../templates/serviceaccount.yaml | 13 -- .../alloy/templates/configmap.yaml | 42 +++++++ .../templates/controllers/daemonset.yaml | 22 ++-- .../extra-ports/alloy/templates/rbac.yaml | 117 ++++++++++++++++++ .../templates/service.yaml | 14 +-- .../alloy/templates/serviceaccount.yaml | 13 ++ .../grafana-agent/templates/configmap.yaml | 42 ------- .../grafana-agent/templates/rbac.yaml | 117 ------------------ .../templates/serviceaccount.yaml | 13 -- .../alloy/templates/configmap.yaml | 42 +++++++ .../templates/controllers/daemonset.yaml | 22 ++-- .../templates/ingress.yaml | 12 +- .../faro-ingress/alloy/templates/rbac.yaml | 117 ++++++++++++++++++ .../templates/service.yaml | 14 +-- .../alloy/templates/serviceaccount.yaml | 13 ++ .../grafana-agent/templates/configmap.yaml | 42 ------- .../grafana-agent/templates/rbac.yaml | 117 ------------------ .../templates/serviceaccount.yaml | 13 -- .../alloy/templates/configmap.yaml | 42 +++++++ .../templates/controllers/daemonset.yaml | 22 ++-- .../alloy/templates/rbac.yaml | 117 ++++++++++++++++++ .../alloy/templates/service.yaml | 23 ++++ .../alloy/templates/serviceaccount.yaml | 13 ++ .../grafana-agent/templates/configmap.yaml | 42 ------- .../grafana-agent/templates/rbac.yaml | 117 ------------------ .../grafana-agent/templates/service.yaml | 23 ---- .../templates/serviceaccount.yaml | 13 -- .../alloy/templates/configmap.yaml | 42 +++++++ .../templates/controllers/daemonset.yaml | 22 ++-- .../alloy/templates/rbac.yaml | 117 ++++++++++++++++++ .../alloy/templates/service.yaml | 23 ++++ .../alloy/templates/serviceaccount.yaml | 13 ++ .../grafana-agent/templates/configmap.yaml | 42 ------- .../grafana-agent/templates/rbac.yaml | 117 ------------------ .../grafana-agent/templates/service.yaml | 23 ---- .../templates/serviceaccount.yaml | 13 -- .../alloy/templates/configmap.yaml | 42 +++++++ .../templates/controllers/daemonset.yaml | 22 ++-- .../initcontainers/alloy/templates/rbac.yaml | 117 ++++++++++++++++++ .../alloy/templates/service.yaml | 23 ++++ .../alloy/templates/serviceaccount.yaml | 13 ++ .../grafana-agent/templates/configmap.yaml | 42 ------- .../grafana-agent/templates/rbac.yaml | 117 ------------------ .../grafana-agent/templates/service.yaml | 23 ---- .../templates/serviceaccount.yaml | 13 -- .../alloy/templates/configmap.yaml | 42 +++++++ .../templates/controllers/daemonset.yaml | 22 ++-- .../alloy/templates/rbac.yaml | 117 ++++++++++++++++++ .../alloy/templates/service.yaml | 23 ++++ .../alloy/templates/serviceaccount.yaml | 13 ++ .../grafana-agent/templates/configmap.yaml | 42 ------- .../grafana-agent/templates/rbac.yaml | 117 ------------------ .../grafana-agent/templates/service.yaml | 23 ---- .../templates/serviceaccount.yaml | 13 -- .../alloy/templates/configmap.yaml | 42 +++++++ .../templates/controllers/daemonset.yaml | 22 ++-- .../alloy/templates/rbac.yaml | 117 ++++++++++++++++++ .../alloy/templates/service.yaml | 23 ++++ .../alloy/templates/serviceaccount.yaml | 13 ++ .../grafana-agent/templates/configmap.yaml | 42 ------- .../grafana-agent/templates/rbac.yaml | 117 ------------------ .../grafana-agent/templates/service.yaml | 23 ---- .../templates/serviceaccount.yaml | 13 -- .../alloy/templates/configmap.yaml | 42 +++++++ .../templates/controllers/daemonset.yaml | 22 ++-- .../alloy/templates/rbac.yaml | 117 ++++++++++++++++++ .../alloy/templates/service.yaml | 23 ++++ .../alloy/templates/serviceaccount.yaml | 13 ++ .../grafana-agent/templates/configmap.yaml | 42 ------- .../grafana-agent/templates/rbac.yaml | 117 ------------------ .../grafana-agent/templates/service.yaml | 23 ---- .../templates/serviceaccount.yaml | 13 -- .../alloy/templates/configmap.yaml | 42 +++++++ .../templates/controllers/daemonset.yaml | 22 ++-- .../pod_annotations/alloy/templates/rbac.yaml | 117 ++++++++++++++++++ .../alloy/templates/service.yaml | 23 ++++ .../alloy/templates/serviceaccount.yaml | 13 ++ .../grafana-agent/templates/configmap.yaml | 42 ------- .../grafana-agent/templates/rbac.yaml | 117 ------------------ .../grafana-agent/templates/service.yaml | 23 ---- .../templates/serviceaccount.yaml | 13 -- .../sidecars/alloy/templates/configmap.yaml | 42 +++++++ .../templates/controllers/daemonset.yaml | 22 ++-- .../tests/sidecars/alloy/templates/rbac.yaml | 117 ++++++++++++++++++ .../sidecars/alloy/templates/service.yaml | 23 ++++ .../alloy/templates/serviceaccount.yaml | 13 ++ .../grafana-agent/templates/configmap.yaml | 42 ------- .../grafana-agent/templates/rbac.yaml | 117 ------------------ .../grafana-agent/templates/service.yaml | 23 ---- .../templates/serviceaccount.yaml | 13 -- .../alloy/templates/configmap.yaml | 42 +++++++ .../templates/controllers/deployment.yaml | 22 ++-- .../alloy/templates/rbac.yaml | 117 ++++++++++++++++++ .../alloy/templates/service.yaml | 23 ++++ .../alloy/templates/serviceaccount.yaml | 13 ++ .../grafana-agent/templates/configmap.yaml | 42 ------- .../grafana-agent/templates/rbac.yaml | 117 ------------------ .../grafana-agent/templates/service.yaml | 23 ---- .../templates/serviceaccount.yaml | 13 -- .../alloy/templates/configmap.yaml | 42 +++++++ .../templates/controllers/daemonset.yaml | 22 ++-- .../with-digests/alloy/templates/rbac.yaml | 117 ++++++++++++++++++ .../with-digests/alloy/templates/service.yaml | 23 ++++ .../alloy/templates/serviceaccount.yaml | 13 ++ .../grafana-agent/templates/configmap.yaml | 42 ------- .../grafana-agent/templates/rbac.yaml | 117 ------------------ .../grafana-agent/templates/service.yaml | 23 ---- .../templates/serviceaccount.yaml | 13 -- 305 files changed, 5157 insertions(+), 5157 deletions(-) rename operations/helm/charts/{grafana-agent => alloy}/.helmignore (100%) rename operations/helm/charts/{grafana-agent => alloy}/CHANGELOG.md (100%) rename operations/helm/charts/{grafana-agent => alloy}/Chart.yaml (89%) rename operations/helm/charts/{grafana-agent => alloy}/README.md (100%) rename operations/helm/charts/{grafana-agent => alloy}/README.md.gotmpl (100%) rename operations/helm/charts/{grafana-agent => alloy}/charts/crds/Chart.yaml (100%) rename operations/helm/charts/{grafana-agent => alloy}/charts/crds/crds/monitoring.grafana.com_podlogs.yaml (100%) rename operations/helm/charts/{grafana-agent => alloy}/ci/additional-serviceaccount-label-values.yaml (100%) rename operations/helm/charts/{grafana-agent => alloy}/ci/clustering-values.yaml (100%) rename operations/helm/charts/{grafana-agent => alloy}/ci/controller-volumes-extra-values.yaml (100%) rename operations/helm/charts/{grafana-agent => alloy}/ci/create-daemonset-hostnetwork-values.yaml (100%) rename operations/helm/charts/{grafana-agent => alloy}/ci/create-daemonset-values.yaml (100%) rename operations/helm/charts/{grafana-agent => alloy}/ci/create-deployment-autoscaling-values.yaml (100%) rename operations/helm/charts/{grafana-agent => alloy}/ci/create-deployment-values.yaml (100%) rename operations/helm/charts/{grafana-agent => alloy}/ci/create-statefulset-autoscaling-values.yaml (100%) rename operations/helm/charts/{grafana-agent => alloy}/ci/create-statefulset-values.yaml (100%) rename operations/helm/charts/{grafana-agent => alloy}/ci/custom-config-values.yaml (100%) rename operations/helm/charts/{grafana-agent => alloy}/ci/default-values-values.yaml (100%) rename operations/helm/charts/{grafana-agent => alloy}/ci/enable-servicemonitor-tls-values.yaml (100%) rename operations/helm/charts/{grafana-agent => alloy}/ci/enable-servicemonitor-values.yaml (100%) rename operations/helm/charts/{grafana-agent => alloy}/ci/envFrom-values.yaml (100%) rename operations/helm/charts/{grafana-agent => alloy}/ci/existing-config-values.yaml (100%) rename operations/helm/charts/{grafana-agent => alloy}/ci/extra-env-values.yaml (100%) rename operations/helm/charts/{grafana-agent => alloy}/ci/extra-ports-values.yaml (100%) rename operations/helm/charts/{grafana-agent => alloy}/ci/faro-ingress-values.yaml (100%) rename operations/helm/charts/{grafana-agent => alloy}/ci/global-image-pullsecrets-values.yaml (100%) rename operations/helm/charts/{grafana-agent => alloy}/ci/global-image-registry-values.yaml (100%) rename operations/helm/charts/{grafana-agent => alloy}/ci/initcontainers-values.yaml (100%) rename operations/helm/charts/{grafana-agent => alloy}/ci/local-image-pullsecrets-values.yaml (100%) rename operations/helm/charts/{grafana-agent => alloy}/ci/local-image-registry-values.yaml (100%) rename operations/helm/charts/{grafana-agent => alloy}/ci/nodeselectors-and-tolerations-values.yaml (100%) rename operations/helm/charts/{grafana-agent => alloy}/ci/pod_annotations-values.yaml (100%) rename operations/helm/charts/{grafana-agent => alloy}/ci/sidecars-values.yaml (100%) rename operations/helm/charts/{grafana-agent => alloy}/ci/topologyspreadconstraints-values.yaml (100%) rename operations/helm/charts/{grafana-agent => alloy}/ci/with-digests-values.yaml (100%) rename operations/helm/charts/{grafana-agent => alloy}/config/example.river (100%) rename operations/helm/charts/{grafana-agent => alloy}/templates/NOTES.txt (100%) rename operations/helm/charts/{grafana-agent => alloy}/templates/_config.tpl (100%) rename operations/helm/charts/{grafana-agent => alloy}/templates/_helpers.tpl (100%) rename operations/helm/charts/{grafana-agent => alloy}/templates/cluster_service.yaml (100%) rename operations/helm/charts/{grafana-agent => alloy}/templates/configmap.yaml (100%) rename operations/helm/charts/{grafana-agent => alloy}/templates/containers/_agent.yaml (100%) rename operations/helm/charts/{grafana-agent => alloy}/templates/containers/_watch.yaml (100%) rename operations/helm/charts/{grafana-agent => alloy}/templates/controllers/_pod.yaml (100%) rename operations/helm/charts/{grafana-agent => alloy}/templates/controllers/daemonset.yaml (100%) rename operations/helm/charts/{grafana-agent => alloy}/templates/controllers/deployment.yaml (100%) rename operations/helm/charts/{grafana-agent => alloy}/templates/controllers/statefulset.yaml (100%) rename operations/helm/charts/{grafana-agent => alloy}/templates/hpa.yaml (100%) rename operations/helm/charts/{grafana-agent => alloy}/templates/ingress.yaml (100%) rename operations/helm/charts/{grafana-agent => alloy}/templates/rbac.yaml (100%) rename operations/helm/charts/{grafana-agent => alloy}/templates/service.yaml (100%) rename operations/helm/charts/{grafana-agent => alloy}/templates/serviceaccount.yaml (100%) rename operations/helm/charts/{grafana-agent => alloy}/templates/servicemonitor.yaml (100%) rename operations/helm/charts/{grafana-agent => alloy}/values.yaml (100%) rename operations/helm/tests/additional-serviceaccount-label/{grafana-agent => alloy}/templates/configmap.yaml (77%) rename operations/helm/tests/{create-daemonset/grafana-agent => additional-serviceaccount-label/alloy}/templates/controllers/daemonset.yaml (78%) rename operations/helm/tests/{controller-volumes-extra/grafana-agent => additional-serviceaccount-label/alloy}/templates/rbac.yaml (83%) rename operations/helm/tests/{clustering/grafana-agent => additional-serviceaccount-label/alloy}/templates/service.yaml (51%) create mode 100644 operations/helm/tests/additional-serviceaccount-label/alloy/templates/serviceaccount.yaml delete mode 100644 operations/helm/tests/additional-serviceaccount-label/grafana-agent/templates/serviceaccount.yaml rename operations/helm/tests/clustering/{grafana-agent => alloy}/templates/cluster_service.yaml (64%) rename operations/helm/tests/{controller-volumes-extra/grafana-agent => clustering/alloy}/templates/configmap.yaml (77%) rename operations/helm/tests/clustering/{grafana-agent => alloy}/templates/controllers/statefulset.yaml (76%) rename operations/helm/tests/{create-daemonset-hostnetwork/grafana-agent => clustering/alloy}/templates/rbac.yaml (83%) rename operations/helm/tests/{controller-volumes-extra/grafana-agent => clustering/alloy}/templates/service.yaml (51%) create mode 100644 operations/helm/tests/clustering/alloy/templates/serviceaccount.yaml delete mode 100644 operations/helm/tests/clustering/grafana-agent/templates/serviceaccount.yaml rename operations/helm/tests/{clustering/grafana-agent => controller-volumes-extra/alloy}/templates/configmap.yaml (77%) rename operations/helm/tests/controller-volumes-extra/{grafana-agent => alloy}/templates/controllers/daemonset.yaml (79%) rename operations/helm/tests/{additional-serviceaccount-label/grafana-agent => controller-volumes-extra/alloy}/templates/rbac.yaml (83%) rename operations/helm/tests/{create-daemonset-hostnetwork/grafana-agent => controller-volumes-extra/alloy}/templates/service.yaml (51%) create mode 100644 operations/helm/tests/controller-volumes-extra/alloy/templates/serviceaccount.yaml delete mode 100644 operations/helm/tests/controller-volumes-extra/grafana-agent/templates/serviceaccount.yaml rename operations/helm/tests/create-daemonset-hostnetwork/{grafana-agent => alloy}/templates/configmap.yaml (77%) rename operations/helm/tests/create-daemonset-hostnetwork/{grafana-agent => alloy}/templates/controllers/daemonset.yaml (78%) rename operations/helm/tests/{clustering/grafana-agent => create-daemonset-hostnetwork/alloy}/templates/rbac.yaml (83%) rename operations/helm/tests/{additional-serviceaccount-label/grafana-agent => create-daemonset-hostnetwork/alloy}/templates/service.yaml (51%) create mode 100644 operations/helm/tests/create-daemonset-hostnetwork/alloy/templates/serviceaccount.yaml delete mode 100644 operations/helm/tests/create-daemonset-hostnetwork/grafana-agent/templates/serviceaccount.yaml create mode 100644 operations/helm/tests/create-daemonset/alloy/templates/configmap.yaml rename operations/helm/tests/{additional-serviceaccount-label/grafana-agent => create-daemonset/alloy}/templates/controllers/daemonset.yaml (78%) create mode 100644 operations/helm/tests/create-daemonset/alloy/templates/rbac.yaml create mode 100644 operations/helm/tests/create-daemonset/alloy/templates/service.yaml create mode 100644 operations/helm/tests/create-daemonset/alloy/templates/serviceaccount.yaml delete mode 100644 operations/helm/tests/create-daemonset/grafana-agent/templates/configmap.yaml delete mode 100644 operations/helm/tests/create-daemonset/grafana-agent/templates/rbac.yaml delete mode 100644 operations/helm/tests/create-daemonset/grafana-agent/templates/service.yaml delete mode 100644 operations/helm/tests/create-daemonset/grafana-agent/templates/serviceaccount.yaml create mode 100644 operations/helm/tests/create-deployment-autoscaling/alloy/templates/configmap.yaml rename operations/helm/tests/create-deployment-autoscaling/{grafana-agent => alloy}/templates/controllers/deployment.yaml (79%) rename operations/helm/tests/create-deployment-autoscaling/{grafana-agent => alloy}/templates/hpa.yaml (82%) create mode 100644 operations/helm/tests/create-deployment-autoscaling/alloy/templates/rbac.yaml create mode 100644 operations/helm/tests/create-deployment-autoscaling/alloy/templates/service.yaml create mode 100644 operations/helm/tests/create-deployment-autoscaling/alloy/templates/serviceaccount.yaml delete mode 100644 operations/helm/tests/create-deployment-autoscaling/grafana-agent/templates/configmap.yaml delete mode 100644 operations/helm/tests/create-deployment-autoscaling/grafana-agent/templates/rbac.yaml delete mode 100644 operations/helm/tests/create-deployment-autoscaling/grafana-agent/templates/service.yaml delete mode 100644 operations/helm/tests/create-deployment-autoscaling/grafana-agent/templates/serviceaccount.yaml create mode 100644 operations/helm/tests/create-deployment/alloy/templates/configmap.yaml rename operations/helm/tests/create-deployment/{grafana-agent => alloy}/templates/controllers/deployment.yaml (78%) create mode 100644 operations/helm/tests/create-deployment/alloy/templates/rbac.yaml create mode 100644 operations/helm/tests/create-deployment/alloy/templates/service.yaml create mode 100644 operations/helm/tests/create-deployment/alloy/templates/serviceaccount.yaml delete mode 100644 operations/helm/tests/create-deployment/grafana-agent/templates/configmap.yaml delete mode 100644 operations/helm/tests/create-deployment/grafana-agent/templates/rbac.yaml delete mode 100644 operations/helm/tests/create-deployment/grafana-agent/templates/service.yaml delete mode 100644 operations/helm/tests/create-deployment/grafana-agent/templates/serviceaccount.yaml create mode 100644 operations/helm/tests/create-statefulset-autoscaling/alloy/templates/configmap.yaml rename operations/helm/tests/create-statefulset-autoscaling/{grafana-agent => alloy}/templates/controllers/statefulset.yaml (79%) rename operations/helm/tests/create-statefulset-autoscaling/{grafana-agent => alloy}/templates/hpa.yaml (77%) create mode 100644 operations/helm/tests/create-statefulset-autoscaling/alloy/templates/rbac.yaml create mode 100644 operations/helm/tests/create-statefulset-autoscaling/alloy/templates/service.yaml create mode 100644 operations/helm/tests/create-statefulset-autoscaling/alloy/templates/serviceaccount.yaml delete mode 100644 operations/helm/tests/create-statefulset-autoscaling/grafana-agent/templates/configmap.yaml delete mode 100644 operations/helm/tests/create-statefulset-autoscaling/grafana-agent/templates/rbac.yaml delete mode 100644 operations/helm/tests/create-statefulset-autoscaling/grafana-agent/templates/service.yaml delete mode 100644 operations/helm/tests/create-statefulset-autoscaling/grafana-agent/templates/serviceaccount.yaml create mode 100644 operations/helm/tests/create-statefulset/alloy/templates/configmap.yaml rename operations/helm/tests/create-statefulset/{grafana-agent => alloy}/templates/controllers/statefulset.yaml (77%) create mode 100644 operations/helm/tests/create-statefulset/alloy/templates/rbac.yaml create mode 100644 operations/helm/tests/create-statefulset/alloy/templates/service.yaml create mode 100644 operations/helm/tests/create-statefulset/alloy/templates/serviceaccount.yaml delete mode 100644 operations/helm/tests/create-statefulset/grafana-agent/templates/configmap.yaml delete mode 100644 operations/helm/tests/create-statefulset/grafana-agent/templates/rbac.yaml delete mode 100644 operations/helm/tests/create-statefulset/grafana-agent/templates/service.yaml delete mode 100644 operations/helm/tests/create-statefulset/grafana-agent/templates/serviceaccount.yaml rename operations/helm/tests/custom-config/{grafana-agent => alloy}/templates/configmap.yaml (60%) rename operations/helm/tests/{default-values/grafana-agent => custom-config/alloy}/templates/controllers/daemonset.yaml (78%) create mode 100644 operations/helm/tests/custom-config/alloy/templates/rbac.yaml create mode 100644 operations/helm/tests/custom-config/alloy/templates/service.yaml create mode 100644 operations/helm/tests/custom-config/alloy/templates/serviceaccount.yaml delete mode 100644 operations/helm/tests/custom-config/grafana-agent/templates/rbac.yaml delete mode 100644 operations/helm/tests/custom-config/grafana-agent/templates/service.yaml delete mode 100644 operations/helm/tests/custom-config/grafana-agent/templates/serviceaccount.yaml create mode 100644 operations/helm/tests/default-values/alloy/templates/configmap.yaml rename operations/helm/tests/{custom-config/grafana-agent => default-values/alloy}/templates/controllers/daemonset.yaml (78%) create mode 100644 operations/helm/tests/default-values/alloy/templates/rbac.yaml create mode 100644 operations/helm/tests/default-values/alloy/templates/service.yaml create mode 100644 operations/helm/tests/default-values/alloy/templates/serviceaccount.yaml delete mode 100644 operations/helm/tests/default-values/grafana-agent/templates/configmap.yaml delete mode 100644 operations/helm/tests/default-values/grafana-agent/templates/rbac.yaml delete mode 100644 operations/helm/tests/default-values/grafana-agent/templates/service.yaml delete mode 100644 operations/helm/tests/default-values/grafana-agent/templates/serviceaccount.yaml create mode 100644 operations/helm/tests/enable-servicemonitor-tls/alloy/templates/configmap.yaml rename operations/helm/tests/enable-servicemonitor-tls/{grafana-agent => alloy}/templates/controllers/daemonset.yaml (78%) create mode 100644 operations/helm/tests/enable-servicemonitor-tls/alloy/templates/rbac.yaml create mode 100644 operations/helm/tests/enable-servicemonitor-tls/alloy/templates/service.yaml create mode 100644 operations/helm/tests/enable-servicemonitor-tls/alloy/templates/serviceaccount.yaml rename operations/helm/tests/enable-servicemonitor-tls/{grafana-agent => alloy}/templates/servicemonitor.yaml (52%) delete mode 100644 operations/helm/tests/enable-servicemonitor-tls/grafana-agent/templates/configmap.yaml delete mode 100644 operations/helm/tests/enable-servicemonitor-tls/grafana-agent/templates/rbac.yaml delete mode 100644 operations/helm/tests/enable-servicemonitor-tls/grafana-agent/templates/service.yaml delete mode 100644 operations/helm/tests/enable-servicemonitor-tls/grafana-agent/templates/serviceaccount.yaml create mode 100644 operations/helm/tests/enable-servicemonitor/alloy/templates/configmap.yaml create mode 100644 operations/helm/tests/enable-servicemonitor/alloy/templates/controllers/daemonset.yaml create mode 100644 operations/helm/tests/enable-servicemonitor/alloy/templates/rbac.yaml create mode 100644 operations/helm/tests/enable-servicemonitor/alloy/templates/service.yaml create mode 100644 operations/helm/tests/enable-servicemonitor/alloy/templates/serviceaccount.yaml create mode 100644 operations/helm/tests/enable-servicemonitor/alloy/templates/servicemonitor.yaml delete mode 100644 operations/helm/tests/enable-servicemonitor/grafana-agent/templates/configmap.yaml delete mode 100644 operations/helm/tests/enable-servicemonitor/grafana-agent/templates/controllers/daemonset.yaml delete mode 100644 operations/helm/tests/enable-servicemonitor/grafana-agent/templates/rbac.yaml delete mode 100644 operations/helm/tests/enable-servicemonitor/grafana-agent/templates/service.yaml delete mode 100644 operations/helm/tests/enable-servicemonitor/grafana-agent/templates/serviceaccount.yaml delete mode 100644 operations/helm/tests/enable-servicemonitor/grafana-agent/templates/servicemonitor.yaml create mode 100644 operations/helm/tests/envFrom/alloy/templates/configmap.yaml rename operations/helm/tests/envFrom/{grafana-agent => alloy}/templates/controllers/daemonset.yaml (79%) create mode 100644 operations/helm/tests/envFrom/alloy/templates/rbac.yaml create mode 100644 operations/helm/tests/envFrom/alloy/templates/service.yaml create mode 100644 operations/helm/tests/envFrom/alloy/templates/serviceaccount.yaml delete mode 100644 operations/helm/tests/envFrom/grafana-agent/templates/configmap.yaml delete mode 100644 operations/helm/tests/envFrom/grafana-agent/templates/rbac.yaml delete mode 100644 operations/helm/tests/envFrom/grafana-agent/templates/service.yaml delete mode 100644 operations/helm/tests/envFrom/grafana-agent/templates/serviceaccount.yaml rename operations/helm/tests/existing-config/{grafana-agent => alloy}/templates/controllers/daemonset.yaml (80%) create mode 100644 operations/helm/tests/existing-config/alloy/templates/rbac.yaml create mode 100644 operations/helm/tests/existing-config/alloy/templates/service.yaml create mode 100644 operations/helm/tests/existing-config/alloy/templates/serviceaccount.yaml delete mode 100644 operations/helm/tests/existing-config/grafana-agent/templates/rbac.yaml delete mode 100644 operations/helm/tests/existing-config/grafana-agent/templates/service.yaml delete mode 100644 operations/helm/tests/existing-config/grafana-agent/templates/serviceaccount.yaml create mode 100644 operations/helm/tests/extra-env/alloy/templates/configmap.yaml rename operations/helm/tests/extra-env/{grafana-agent => alloy}/templates/controllers/daemonset.yaml (80%) create mode 100644 operations/helm/tests/extra-env/alloy/templates/rbac.yaml create mode 100644 operations/helm/tests/extra-env/alloy/templates/service.yaml create mode 100644 operations/helm/tests/extra-env/alloy/templates/serviceaccount.yaml delete mode 100644 operations/helm/tests/extra-env/grafana-agent/templates/configmap.yaml delete mode 100644 operations/helm/tests/extra-env/grafana-agent/templates/rbac.yaml delete mode 100644 operations/helm/tests/extra-env/grafana-agent/templates/service.yaml delete mode 100644 operations/helm/tests/extra-env/grafana-agent/templates/serviceaccount.yaml create mode 100644 operations/helm/tests/extra-ports/alloy/templates/configmap.yaml rename operations/helm/tests/extra-ports/{grafana-agent => alloy}/templates/controllers/daemonset.yaml (79%) create mode 100644 operations/helm/tests/extra-ports/alloy/templates/rbac.yaml rename operations/helm/tests/extra-ports/{grafana-agent => alloy}/templates/service.yaml (57%) create mode 100644 operations/helm/tests/extra-ports/alloy/templates/serviceaccount.yaml delete mode 100644 operations/helm/tests/extra-ports/grafana-agent/templates/configmap.yaml delete mode 100644 operations/helm/tests/extra-ports/grafana-agent/templates/rbac.yaml delete mode 100644 operations/helm/tests/extra-ports/grafana-agent/templates/serviceaccount.yaml create mode 100644 operations/helm/tests/faro-ingress/alloy/templates/configmap.yaml rename operations/helm/tests/faro-ingress/{grafana-agent => alloy}/templates/controllers/daemonset.yaml (79%) rename operations/helm/tests/faro-ingress/{grafana-agent => alloy}/templates/ingress.yaml (63%) create mode 100644 operations/helm/tests/faro-ingress/alloy/templates/rbac.yaml rename operations/helm/tests/faro-ingress/{grafana-agent => alloy}/templates/service.yaml (57%) create mode 100644 operations/helm/tests/faro-ingress/alloy/templates/serviceaccount.yaml delete mode 100644 operations/helm/tests/faro-ingress/grafana-agent/templates/configmap.yaml delete mode 100644 operations/helm/tests/faro-ingress/grafana-agent/templates/rbac.yaml delete mode 100644 operations/helm/tests/faro-ingress/grafana-agent/templates/serviceaccount.yaml create mode 100644 operations/helm/tests/global-image-pullsecrets/alloy/templates/configmap.yaml rename operations/helm/tests/global-image-pullsecrets/{grafana-agent => alloy}/templates/controllers/daemonset.yaml (79%) create mode 100644 operations/helm/tests/global-image-pullsecrets/alloy/templates/rbac.yaml create mode 100644 operations/helm/tests/global-image-pullsecrets/alloy/templates/service.yaml create mode 100644 operations/helm/tests/global-image-pullsecrets/alloy/templates/serviceaccount.yaml delete mode 100644 operations/helm/tests/global-image-pullsecrets/grafana-agent/templates/configmap.yaml delete mode 100644 operations/helm/tests/global-image-pullsecrets/grafana-agent/templates/rbac.yaml delete mode 100644 operations/helm/tests/global-image-pullsecrets/grafana-agent/templates/service.yaml delete mode 100644 operations/helm/tests/global-image-pullsecrets/grafana-agent/templates/serviceaccount.yaml create mode 100644 operations/helm/tests/global-image-registry/alloy/templates/configmap.yaml rename operations/helm/tests/global-image-registry/{grafana-agent => alloy}/templates/controllers/daemonset.yaml (78%) create mode 100644 operations/helm/tests/global-image-registry/alloy/templates/rbac.yaml create mode 100644 operations/helm/tests/global-image-registry/alloy/templates/service.yaml create mode 100644 operations/helm/tests/global-image-registry/alloy/templates/serviceaccount.yaml delete mode 100644 operations/helm/tests/global-image-registry/grafana-agent/templates/configmap.yaml delete mode 100644 operations/helm/tests/global-image-registry/grafana-agent/templates/rbac.yaml delete mode 100644 operations/helm/tests/global-image-registry/grafana-agent/templates/service.yaml delete mode 100644 operations/helm/tests/global-image-registry/grafana-agent/templates/serviceaccount.yaml create mode 100644 operations/helm/tests/initcontainers/alloy/templates/configmap.yaml rename operations/helm/tests/initcontainers/{grafana-agent => alloy}/templates/controllers/daemonset.yaml (83%) create mode 100644 operations/helm/tests/initcontainers/alloy/templates/rbac.yaml create mode 100644 operations/helm/tests/initcontainers/alloy/templates/service.yaml create mode 100644 operations/helm/tests/initcontainers/alloy/templates/serviceaccount.yaml delete mode 100644 operations/helm/tests/initcontainers/grafana-agent/templates/configmap.yaml delete mode 100644 operations/helm/tests/initcontainers/grafana-agent/templates/rbac.yaml delete mode 100644 operations/helm/tests/initcontainers/grafana-agent/templates/service.yaml delete mode 100644 operations/helm/tests/initcontainers/grafana-agent/templates/serviceaccount.yaml create mode 100644 operations/helm/tests/local-image-pullsecrets/alloy/templates/configmap.yaml rename operations/helm/tests/local-image-pullsecrets/{grafana-agent => alloy}/templates/controllers/daemonset.yaml (78%) create mode 100644 operations/helm/tests/local-image-pullsecrets/alloy/templates/rbac.yaml create mode 100644 operations/helm/tests/local-image-pullsecrets/alloy/templates/service.yaml create mode 100644 operations/helm/tests/local-image-pullsecrets/alloy/templates/serviceaccount.yaml delete mode 100644 operations/helm/tests/local-image-pullsecrets/grafana-agent/templates/configmap.yaml delete mode 100644 operations/helm/tests/local-image-pullsecrets/grafana-agent/templates/rbac.yaml delete mode 100644 operations/helm/tests/local-image-pullsecrets/grafana-agent/templates/service.yaml delete mode 100644 operations/helm/tests/local-image-pullsecrets/grafana-agent/templates/serviceaccount.yaml create mode 100644 operations/helm/tests/local-image-registry/alloy/templates/configmap.yaml rename operations/helm/tests/local-image-registry/{grafana-agent => alloy}/templates/controllers/daemonset.yaml (78%) create mode 100644 operations/helm/tests/local-image-registry/alloy/templates/rbac.yaml create mode 100644 operations/helm/tests/local-image-registry/alloy/templates/service.yaml create mode 100644 operations/helm/tests/local-image-registry/alloy/templates/serviceaccount.yaml delete mode 100644 operations/helm/tests/local-image-registry/grafana-agent/templates/configmap.yaml delete mode 100644 operations/helm/tests/local-image-registry/grafana-agent/templates/rbac.yaml delete mode 100644 operations/helm/tests/local-image-registry/grafana-agent/templates/service.yaml delete mode 100644 operations/helm/tests/local-image-registry/grafana-agent/templates/serviceaccount.yaml create mode 100644 operations/helm/tests/nodeselectors-and-tolerations/alloy/templates/configmap.yaml rename operations/helm/tests/nodeselectors-and-tolerations/{grafana-agent => alloy}/templates/controllers/daemonset.yaml (80%) create mode 100644 operations/helm/tests/nodeselectors-and-tolerations/alloy/templates/rbac.yaml create mode 100644 operations/helm/tests/nodeselectors-and-tolerations/alloy/templates/service.yaml create mode 100644 operations/helm/tests/nodeselectors-and-tolerations/alloy/templates/serviceaccount.yaml delete mode 100644 operations/helm/tests/nodeselectors-and-tolerations/grafana-agent/templates/configmap.yaml delete mode 100644 operations/helm/tests/nodeselectors-and-tolerations/grafana-agent/templates/rbac.yaml delete mode 100644 operations/helm/tests/nodeselectors-and-tolerations/grafana-agent/templates/service.yaml delete mode 100644 operations/helm/tests/nodeselectors-and-tolerations/grafana-agent/templates/serviceaccount.yaml create mode 100644 operations/helm/tests/pod_annotations/alloy/templates/configmap.yaml rename operations/helm/tests/pod_annotations/{grafana-agent => alloy}/templates/controllers/daemonset.yaml (78%) create mode 100644 operations/helm/tests/pod_annotations/alloy/templates/rbac.yaml create mode 100644 operations/helm/tests/pod_annotations/alloy/templates/service.yaml create mode 100644 operations/helm/tests/pod_annotations/alloy/templates/serviceaccount.yaml delete mode 100644 operations/helm/tests/pod_annotations/grafana-agent/templates/configmap.yaml delete mode 100644 operations/helm/tests/pod_annotations/grafana-agent/templates/rbac.yaml delete mode 100644 operations/helm/tests/pod_annotations/grafana-agent/templates/service.yaml delete mode 100644 operations/helm/tests/pod_annotations/grafana-agent/templates/serviceaccount.yaml create mode 100644 operations/helm/tests/sidecars/alloy/templates/configmap.yaml rename operations/helm/tests/sidecars/{grafana-agent => alloy}/templates/controllers/daemonset.yaml (83%) create mode 100644 operations/helm/tests/sidecars/alloy/templates/rbac.yaml create mode 100644 operations/helm/tests/sidecars/alloy/templates/service.yaml create mode 100644 operations/helm/tests/sidecars/alloy/templates/serviceaccount.yaml delete mode 100644 operations/helm/tests/sidecars/grafana-agent/templates/configmap.yaml delete mode 100644 operations/helm/tests/sidecars/grafana-agent/templates/rbac.yaml delete mode 100644 operations/helm/tests/sidecars/grafana-agent/templates/service.yaml delete mode 100644 operations/helm/tests/sidecars/grafana-agent/templates/serviceaccount.yaml create mode 100644 operations/helm/tests/topologyspreadconstraints/alloy/templates/configmap.yaml rename operations/helm/tests/topologyspreadconstraints/{grafana-agent => alloy}/templates/controllers/deployment.yaml (81%) create mode 100644 operations/helm/tests/topologyspreadconstraints/alloy/templates/rbac.yaml create mode 100644 operations/helm/tests/topologyspreadconstraints/alloy/templates/service.yaml create mode 100644 operations/helm/tests/topologyspreadconstraints/alloy/templates/serviceaccount.yaml delete mode 100644 operations/helm/tests/topologyspreadconstraints/grafana-agent/templates/configmap.yaml delete mode 100644 operations/helm/tests/topologyspreadconstraints/grafana-agent/templates/rbac.yaml delete mode 100644 operations/helm/tests/topologyspreadconstraints/grafana-agent/templates/service.yaml delete mode 100644 operations/helm/tests/topologyspreadconstraints/grafana-agent/templates/serviceaccount.yaml create mode 100644 operations/helm/tests/with-digests/alloy/templates/configmap.yaml rename operations/helm/tests/with-digests/{grafana-agent => alloy}/templates/controllers/daemonset.yaml (79%) create mode 100644 operations/helm/tests/with-digests/alloy/templates/rbac.yaml create mode 100644 operations/helm/tests/with-digests/alloy/templates/service.yaml create mode 100644 operations/helm/tests/with-digests/alloy/templates/serviceaccount.yaml delete mode 100644 operations/helm/tests/with-digests/grafana-agent/templates/configmap.yaml delete mode 100644 operations/helm/tests/with-digests/grafana-agent/templates/rbac.yaml delete mode 100644 operations/helm/tests/with-digests/grafana-agent/templates/service.yaml delete mode 100644 operations/helm/tests/with-digests/grafana-agent/templates/serviceaccount.yaml diff --git a/.github/workflows/helm-release.yml.disabled b/.github/workflows/helm-release.yml.disabled index 94caa2fd3f..18e3744506 100644 --- a/.github/workflows/helm-release.yml.disabled +++ b/.github/workflows/helm-release.yml.disabled @@ -130,7 +130,7 @@ jobs: # Note that this creates a release in grafana/helm-charts with a new tag. # The tag name in grafana/helm-charts is -, while the - # tag name for grafana/agent is helm-chart/. + # tag name for grafana/alloy is helm-chart/. - name: Make github release uses: softprops/action-gh-release@v1 with: diff --git a/.github/workflows/helm-test.yml b/.github/workflows/helm-test.yml index 378623eebb..a705d78f23 100644 --- a/.github/workflows/helm-test.yml +++ b/.github/workflows/helm-test.yml @@ -10,7 +10,7 @@ jobs: - name: Regenerate docs run: | docker run --rm \ - -v "$(pwd)/operations/helm/charts/grafana-agent:/helm-docs" \ + -v "$(pwd)/operations/helm/charts/alloy:/helm-docs" \ -u "$(id -u)" \ jnorwood/helm-docs if ! git diff --exit-code; then diff --git a/Makefile b/Makefile index e6d823b3eb..47ce69da76 100644 --- a/Makefile +++ b/Makefile @@ -229,7 +229,7 @@ generate-helm-docs: ifeq ($(USE_CONTAINER),1) $(RERUN_IN_CONTAINER) else - cd operations/helm/charts/grafana-agent && helm-docs + cd operations/helm/charts/alloy && helm-docs endif generate-helm-tests: diff --git a/docs/sources/tasks/configure/configure-kubernetes.md b/docs/sources/tasks/configure/configure-kubernetes.md index 822102f80f..e8709d4056 100644 --- a/docs/sources/tasks/configure/configure-kubernetes.md +++ b/docs/sources/tasks/configure/configure-kubernetes.md @@ -19,7 +19,7 @@ To configure {{< param "PRODUCT_NAME" >}} on Kubernetes, perform the following s 1. Run the following command in a terminal to upgrade your {{< param "PRODUCT_NAME" >}} installation: ```shell - helm upgrade RELEASE_NAME grafana/grafana-agent -f VALUES_PATH + helm upgrade RELEASE_NAME grafana/alloy -f VALUES_PATH ``` 1. Replace `RELEASE_NAME` with the name you used for your {{< param "PRODUCT_NAME" >}} installation. @@ -38,12 +38,12 @@ The following is an example snippet of a `kustomization` that disables this beha ```yaml configMapGenerator: - - name: grafana-agent + - name: alloy files: - config.river options: disableNameSuffixHash: true ``` -[values.yaml]: https://raw.githubusercontent.com/grafana/agent/main/operations/helm/charts/grafana-agent/values.yaml -[Helm chart]: https://github.com/grafana/agent/tree/main/operations/helm/charts/grafana-agent +[values.yaml]: https://raw.githubusercontent.com/grafana/alloy/main/operations/helm/charts/alloy/values.yaml +[Helm chart]: https://github.com/grafana/alloy/tree/main/operations/helm/charts/alloy [Kustomize]: https://kubernetes.io/docs/tasks/manage-kubernetes-objects/kustomization/ diff --git a/docs/sources/tasks/migrate/from-operator.md b/docs/sources/tasks/migrate/from-operator.md index 48b0af6cca..c01edd7c03 100644 --- a/docs/sources/tasks/migrate/from-operator.md +++ b/docs/sources/tasks/migrate/from-operator.md @@ -279,7 +279,7 @@ However, all static mode integrations have an equivalent component in the [`prom The [reference documentation][component documentation] should help convert those integrations to their {{< param "PRODUCT_NAME" >}} equivalent. -[default values]: https://github.com/grafana/alloy/blob/main/operations/helm/charts/grafana-agent/values.yaml +[default values]: https://github.com/grafana/alloy/blob/main/operations/helm/charts/alloy/values.yaml [clustering]: ../../../concepts/clustering/ [deployment guide]: ../../../get-started/deploy-alloy diff --git a/internal/component/loki/source/podlogs/internal/apis/monitoring/v1alpha2/doc.go b/internal/component/loki/source/podlogs/internal/apis/monitoring/v1alpha2/doc.go index ec4a8f557d..fbd99f5d4d 100644 --- a/internal/component/loki/source/podlogs/internal/apis/monitoring/v1alpha2/doc.go +++ b/internal/component/loki/source/podlogs/internal/apis/monitoring/v1alpha2/doc.go @@ -2,6 +2,6 @@ // +groupName=monitoring.grafana.com //go:generate controller-gen object paths=. -//go:generate controller-gen crd:crdVersions=v1 paths=. output:crd:dir=../../../../../../../../operations/helm/charts/grafana-agent/crds +//go:generate controller-gen crd:crdVersions=v1 paths=. output:crd:dir=../../../../../../../../operations/helm/charts/alloy/crds package v1alpha2 diff --git a/operations/helm/Makefile b/operations/helm/Makefile index 5cf89398a5..de7f25a59e 100644 --- a/operations/helm/Makefile +++ b/operations/helm/Makefile @@ -1,6 +1,6 @@ # Docs generated by https://github.com/norwoodj/helm-docs docs: - cd charts/grafana-agent && helm-docs + cd charts/alloy && helm-docs rebuild-tests: bash ./scripts/rebuild-tests.sh diff --git a/operations/helm/README.md b/operations/helm/README.md index f6fa836eb6..fb74f072c1 100644 --- a/operations/helm/README.md +++ b/operations/helm/README.md @@ -11,7 +11,7 @@ correctness of the templates emitted by the Helm chart. To regenerate this folder, call `make rebuild-tests` from the root of the repository. `make generate-helm-tests` will iterate through the value.yaml files in -`charts/grafana-agent/ci` and generate each one as a separate directory under `charts/grafana-agent/tests`. +`charts/alloy/ci` and generate each one as a separate directory under `charts/alloy/tests`. When modifying the Helm charts, `make rebuild-tests` must be run before submitting a PR, as a linter check will ensure that this directory is diff --git a/operations/helm/charts/grafana-agent/.helmignore b/operations/helm/charts/alloy/.helmignore similarity index 100% rename from operations/helm/charts/grafana-agent/.helmignore rename to operations/helm/charts/alloy/.helmignore diff --git a/operations/helm/charts/grafana-agent/CHANGELOG.md b/operations/helm/charts/alloy/CHANGELOG.md similarity index 100% rename from operations/helm/charts/grafana-agent/CHANGELOG.md rename to operations/helm/charts/alloy/CHANGELOG.md diff --git a/operations/helm/charts/grafana-agent/Chart.yaml b/operations/helm/charts/alloy/Chart.yaml similarity index 89% rename from operations/helm/charts/grafana-agent/Chart.yaml rename to operations/helm/charts/alloy/Chart.yaml index 4fd9bf70e5..9de00f3661 100644 --- a/operations/helm/charts/grafana-agent/Chart.yaml +++ b/operations/helm/charts/alloy/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -name: grafana-agent +name: alloy description: 'Grafana Alloy' type: application version: 0.36.0 diff --git a/operations/helm/charts/grafana-agent/README.md b/operations/helm/charts/alloy/README.md similarity index 100% rename from operations/helm/charts/grafana-agent/README.md rename to operations/helm/charts/alloy/README.md diff --git a/operations/helm/charts/grafana-agent/README.md.gotmpl b/operations/helm/charts/alloy/README.md.gotmpl similarity index 100% rename from operations/helm/charts/grafana-agent/README.md.gotmpl rename to operations/helm/charts/alloy/README.md.gotmpl diff --git a/operations/helm/charts/grafana-agent/charts/crds/Chart.yaml b/operations/helm/charts/alloy/charts/crds/Chart.yaml similarity index 100% rename from operations/helm/charts/grafana-agent/charts/crds/Chart.yaml rename to operations/helm/charts/alloy/charts/crds/Chart.yaml diff --git a/operations/helm/charts/grafana-agent/charts/crds/crds/monitoring.grafana.com_podlogs.yaml b/operations/helm/charts/alloy/charts/crds/crds/monitoring.grafana.com_podlogs.yaml similarity index 100% rename from operations/helm/charts/grafana-agent/charts/crds/crds/monitoring.grafana.com_podlogs.yaml rename to operations/helm/charts/alloy/charts/crds/crds/monitoring.grafana.com_podlogs.yaml diff --git a/operations/helm/charts/grafana-agent/ci/additional-serviceaccount-label-values.yaml b/operations/helm/charts/alloy/ci/additional-serviceaccount-label-values.yaml similarity index 100% rename from operations/helm/charts/grafana-agent/ci/additional-serviceaccount-label-values.yaml rename to operations/helm/charts/alloy/ci/additional-serviceaccount-label-values.yaml diff --git a/operations/helm/charts/grafana-agent/ci/clustering-values.yaml b/operations/helm/charts/alloy/ci/clustering-values.yaml similarity index 100% rename from operations/helm/charts/grafana-agent/ci/clustering-values.yaml rename to operations/helm/charts/alloy/ci/clustering-values.yaml diff --git a/operations/helm/charts/grafana-agent/ci/controller-volumes-extra-values.yaml b/operations/helm/charts/alloy/ci/controller-volumes-extra-values.yaml similarity index 100% rename from operations/helm/charts/grafana-agent/ci/controller-volumes-extra-values.yaml rename to operations/helm/charts/alloy/ci/controller-volumes-extra-values.yaml diff --git a/operations/helm/charts/grafana-agent/ci/create-daemonset-hostnetwork-values.yaml b/operations/helm/charts/alloy/ci/create-daemonset-hostnetwork-values.yaml similarity index 100% rename from operations/helm/charts/grafana-agent/ci/create-daemonset-hostnetwork-values.yaml rename to operations/helm/charts/alloy/ci/create-daemonset-hostnetwork-values.yaml diff --git a/operations/helm/charts/grafana-agent/ci/create-daemonset-values.yaml b/operations/helm/charts/alloy/ci/create-daemonset-values.yaml similarity index 100% rename from operations/helm/charts/grafana-agent/ci/create-daemonset-values.yaml rename to operations/helm/charts/alloy/ci/create-daemonset-values.yaml diff --git a/operations/helm/charts/grafana-agent/ci/create-deployment-autoscaling-values.yaml b/operations/helm/charts/alloy/ci/create-deployment-autoscaling-values.yaml similarity index 100% rename from operations/helm/charts/grafana-agent/ci/create-deployment-autoscaling-values.yaml rename to operations/helm/charts/alloy/ci/create-deployment-autoscaling-values.yaml diff --git a/operations/helm/charts/grafana-agent/ci/create-deployment-values.yaml b/operations/helm/charts/alloy/ci/create-deployment-values.yaml similarity index 100% rename from operations/helm/charts/grafana-agent/ci/create-deployment-values.yaml rename to operations/helm/charts/alloy/ci/create-deployment-values.yaml diff --git a/operations/helm/charts/grafana-agent/ci/create-statefulset-autoscaling-values.yaml b/operations/helm/charts/alloy/ci/create-statefulset-autoscaling-values.yaml similarity index 100% rename from operations/helm/charts/grafana-agent/ci/create-statefulset-autoscaling-values.yaml rename to operations/helm/charts/alloy/ci/create-statefulset-autoscaling-values.yaml diff --git a/operations/helm/charts/grafana-agent/ci/create-statefulset-values.yaml b/operations/helm/charts/alloy/ci/create-statefulset-values.yaml similarity index 100% rename from operations/helm/charts/grafana-agent/ci/create-statefulset-values.yaml rename to operations/helm/charts/alloy/ci/create-statefulset-values.yaml diff --git a/operations/helm/charts/grafana-agent/ci/custom-config-values.yaml b/operations/helm/charts/alloy/ci/custom-config-values.yaml similarity index 100% rename from operations/helm/charts/grafana-agent/ci/custom-config-values.yaml rename to operations/helm/charts/alloy/ci/custom-config-values.yaml diff --git a/operations/helm/charts/grafana-agent/ci/default-values-values.yaml b/operations/helm/charts/alloy/ci/default-values-values.yaml similarity index 100% rename from operations/helm/charts/grafana-agent/ci/default-values-values.yaml rename to operations/helm/charts/alloy/ci/default-values-values.yaml diff --git a/operations/helm/charts/grafana-agent/ci/enable-servicemonitor-tls-values.yaml b/operations/helm/charts/alloy/ci/enable-servicemonitor-tls-values.yaml similarity index 100% rename from operations/helm/charts/grafana-agent/ci/enable-servicemonitor-tls-values.yaml rename to operations/helm/charts/alloy/ci/enable-servicemonitor-tls-values.yaml diff --git a/operations/helm/charts/grafana-agent/ci/enable-servicemonitor-values.yaml b/operations/helm/charts/alloy/ci/enable-servicemonitor-values.yaml similarity index 100% rename from operations/helm/charts/grafana-agent/ci/enable-servicemonitor-values.yaml rename to operations/helm/charts/alloy/ci/enable-servicemonitor-values.yaml diff --git a/operations/helm/charts/grafana-agent/ci/envFrom-values.yaml b/operations/helm/charts/alloy/ci/envFrom-values.yaml similarity index 100% rename from operations/helm/charts/grafana-agent/ci/envFrom-values.yaml rename to operations/helm/charts/alloy/ci/envFrom-values.yaml diff --git a/operations/helm/charts/grafana-agent/ci/existing-config-values.yaml b/operations/helm/charts/alloy/ci/existing-config-values.yaml similarity index 100% rename from operations/helm/charts/grafana-agent/ci/existing-config-values.yaml rename to operations/helm/charts/alloy/ci/existing-config-values.yaml diff --git a/operations/helm/charts/grafana-agent/ci/extra-env-values.yaml b/operations/helm/charts/alloy/ci/extra-env-values.yaml similarity index 100% rename from operations/helm/charts/grafana-agent/ci/extra-env-values.yaml rename to operations/helm/charts/alloy/ci/extra-env-values.yaml diff --git a/operations/helm/charts/grafana-agent/ci/extra-ports-values.yaml b/operations/helm/charts/alloy/ci/extra-ports-values.yaml similarity index 100% rename from operations/helm/charts/grafana-agent/ci/extra-ports-values.yaml rename to operations/helm/charts/alloy/ci/extra-ports-values.yaml diff --git a/operations/helm/charts/grafana-agent/ci/faro-ingress-values.yaml b/operations/helm/charts/alloy/ci/faro-ingress-values.yaml similarity index 100% rename from operations/helm/charts/grafana-agent/ci/faro-ingress-values.yaml rename to operations/helm/charts/alloy/ci/faro-ingress-values.yaml diff --git a/operations/helm/charts/grafana-agent/ci/global-image-pullsecrets-values.yaml b/operations/helm/charts/alloy/ci/global-image-pullsecrets-values.yaml similarity index 100% rename from operations/helm/charts/grafana-agent/ci/global-image-pullsecrets-values.yaml rename to operations/helm/charts/alloy/ci/global-image-pullsecrets-values.yaml diff --git a/operations/helm/charts/grafana-agent/ci/global-image-registry-values.yaml b/operations/helm/charts/alloy/ci/global-image-registry-values.yaml similarity index 100% rename from operations/helm/charts/grafana-agent/ci/global-image-registry-values.yaml rename to operations/helm/charts/alloy/ci/global-image-registry-values.yaml diff --git a/operations/helm/charts/grafana-agent/ci/initcontainers-values.yaml b/operations/helm/charts/alloy/ci/initcontainers-values.yaml similarity index 100% rename from operations/helm/charts/grafana-agent/ci/initcontainers-values.yaml rename to operations/helm/charts/alloy/ci/initcontainers-values.yaml diff --git a/operations/helm/charts/grafana-agent/ci/local-image-pullsecrets-values.yaml b/operations/helm/charts/alloy/ci/local-image-pullsecrets-values.yaml similarity index 100% rename from operations/helm/charts/grafana-agent/ci/local-image-pullsecrets-values.yaml rename to operations/helm/charts/alloy/ci/local-image-pullsecrets-values.yaml diff --git a/operations/helm/charts/grafana-agent/ci/local-image-registry-values.yaml b/operations/helm/charts/alloy/ci/local-image-registry-values.yaml similarity index 100% rename from operations/helm/charts/grafana-agent/ci/local-image-registry-values.yaml rename to operations/helm/charts/alloy/ci/local-image-registry-values.yaml diff --git a/operations/helm/charts/grafana-agent/ci/nodeselectors-and-tolerations-values.yaml b/operations/helm/charts/alloy/ci/nodeselectors-and-tolerations-values.yaml similarity index 100% rename from operations/helm/charts/grafana-agent/ci/nodeselectors-and-tolerations-values.yaml rename to operations/helm/charts/alloy/ci/nodeselectors-and-tolerations-values.yaml diff --git a/operations/helm/charts/grafana-agent/ci/pod_annotations-values.yaml b/operations/helm/charts/alloy/ci/pod_annotations-values.yaml similarity index 100% rename from operations/helm/charts/grafana-agent/ci/pod_annotations-values.yaml rename to operations/helm/charts/alloy/ci/pod_annotations-values.yaml diff --git a/operations/helm/charts/grafana-agent/ci/sidecars-values.yaml b/operations/helm/charts/alloy/ci/sidecars-values.yaml similarity index 100% rename from operations/helm/charts/grafana-agent/ci/sidecars-values.yaml rename to operations/helm/charts/alloy/ci/sidecars-values.yaml diff --git a/operations/helm/charts/grafana-agent/ci/topologyspreadconstraints-values.yaml b/operations/helm/charts/alloy/ci/topologyspreadconstraints-values.yaml similarity index 100% rename from operations/helm/charts/grafana-agent/ci/topologyspreadconstraints-values.yaml rename to operations/helm/charts/alloy/ci/topologyspreadconstraints-values.yaml diff --git a/operations/helm/charts/grafana-agent/ci/with-digests-values.yaml b/operations/helm/charts/alloy/ci/with-digests-values.yaml similarity index 100% rename from operations/helm/charts/grafana-agent/ci/with-digests-values.yaml rename to operations/helm/charts/alloy/ci/with-digests-values.yaml diff --git a/operations/helm/charts/grafana-agent/config/example.river b/operations/helm/charts/alloy/config/example.river similarity index 100% rename from operations/helm/charts/grafana-agent/config/example.river rename to operations/helm/charts/alloy/config/example.river diff --git a/operations/helm/charts/grafana-agent/templates/NOTES.txt b/operations/helm/charts/alloy/templates/NOTES.txt similarity index 100% rename from operations/helm/charts/grafana-agent/templates/NOTES.txt rename to operations/helm/charts/alloy/templates/NOTES.txt diff --git a/operations/helm/charts/grafana-agent/templates/_config.tpl b/operations/helm/charts/alloy/templates/_config.tpl similarity index 100% rename from operations/helm/charts/grafana-agent/templates/_config.tpl rename to operations/helm/charts/alloy/templates/_config.tpl diff --git a/operations/helm/charts/grafana-agent/templates/_helpers.tpl b/operations/helm/charts/alloy/templates/_helpers.tpl similarity index 100% rename from operations/helm/charts/grafana-agent/templates/_helpers.tpl rename to operations/helm/charts/alloy/templates/_helpers.tpl diff --git a/operations/helm/charts/grafana-agent/templates/cluster_service.yaml b/operations/helm/charts/alloy/templates/cluster_service.yaml similarity index 100% rename from operations/helm/charts/grafana-agent/templates/cluster_service.yaml rename to operations/helm/charts/alloy/templates/cluster_service.yaml diff --git a/operations/helm/charts/grafana-agent/templates/configmap.yaml b/operations/helm/charts/alloy/templates/configmap.yaml similarity index 100% rename from operations/helm/charts/grafana-agent/templates/configmap.yaml rename to operations/helm/charts/alloy/templates/configmap.yaml diff --git a/operations/helm/charts/grafana-agent/templates/containers/_agent.yaml b/operations/helm/charts/alloy/templates/containers/_agent.yaml similarity index 100% rename from operations/helm/charts/grafana-agent/templates/containers/_agent.yaml rename to operations/helm/charts/alloy/templates/containers/_agent.yaml diff --git a/operations/helm/charts/grafana-agent/templates/containers/_watch.yaml b/operations/helm/charts/alloy/templates/containers/_watch.yaml similarity index 100% rename from operations/helm/charts/grafana-agent/templates/containers/_watch.yaml rename to operations/helm/charts/alloy/templates/containers/_watch.yaml diff --git a/operations/helm/charts/grafana-agent/templates/controllers/_pod.yaml b/operations/helm/charts/alloy/templates/controllers/_pod.yaml similarity index 100% rename from operations/helm/charts/grafana-agent/templates/controllers/_pod.yaml rename to operations/helm/charts/alloy/templates/controllers/_pod.yaml diff --git a/operations/helm/charts/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/charts/alloy/templates/controllers/daemonset.yaml similarity index 100% rename from operations/helm/charts/grafana-agent/templates/controllers/daemonset.yaml rename to operations/helm/charts/alloy/templates/controllers/daemonset.yaml diff --git a/operations/helm/charts/grafana-agent/templates/controllers/deployment.yaml b/operations/helm/charts/alloy/templates/controllers/deployment.yaml similarity index 100% rename from operations/helm/charts/grafana-agent/templates/controllers/deployment.yaml rename to operations/helm/charts/alloy/templates/controllers/deployment.yaml diff --git a/operations/helm/charts/grafana-agent/templates/controllers/statefulset.yaml b/operations/helm/charts/alloy/templates/controllers/statefulset.yaml similarity index 100% rename from operations/helm/charts/grafana-agent/templates/controllers/statefulset.yaml rename to operations/helm/charts/alloy/templates/controllers/statefulset.yaml diff --git a/operations/helm/charts/grafana-agent/templates/hpa.yaml b/operations/helm/charts/alloy/templates/hpa.yaml similarity index 100% rename from operations/helm/charts/grafana-agent/templates/hpa.yaml rename to operations/helm/charts/alloy/templates/hpa.yaml diff --git a/operations/helm/charts/grafana-agent/templates/ingress.yaml b/operations/helm/charts/alloy/templates/ingress.yaml similarity index 100% rename from operations/helm/charts/grafana-agent/templates/ingress.yaml rename to operations/helm/charts/alloy/templates/ingress.yaml diff --git a/operations/helm/charts/grafana-agent/templates/rbac.yaml b/operations/helm/charts/alloy/templates/rbac.yaml similarity index 100% rename from operations/helm/charts/grafana-agent/templates/rbac.yaml rename to operations/helm/charts/alloy/templates/rbac.yaml diff --git a/operations/helm/charts/grafana-agent/templates/service.yaml b/operations/helm/charts/alloy/templates/service.yaml similarity index 100% rename from operations/helm/charts/grafana-agent/templates/service.yaml rename to operations/helm/charts/alloy/templates/service.yaml diff --git a/operations/helm/charts/grafana-agent/templates/serviceaccount.yaml b/operations/helm/charts/alloy/templates/serviceaccount.yaml similarity index 100% rename from operations/helm/charts/grafana-agent/templates/serviceaccount.yaml rename to operations/helm/charts/alloy/templates/serviceaccount.yaml diff --git a/operations/helm/charts/grafana-agent/templates/servicemonitor.yaml b/operations/helm/charts/alloy/templates/servicemonitor.yaml similarity index 100% rename from operations/helm/charts/grafana-agent/templates/servicemonitor.yaml rename to operations/helm/charts/alloy/templates/servicemonitor.yaml diff --git a/operations/helm/charts/grafana-agent/values.yaml b/operations/helm/charts/alloy/values.yaml similarity index 100% rename from operations/helm/charts/grafana-agent/values.yaml rename to operations/helm/charts/alloy/values.yaml diff --git a/operations/helm/tests/additional-serviceaccount-label/grafana-agent/templates/configmap.yaml b/operations/helm/tests/additional-serviceaccount-label/alloy/templates/configmap.yaml similarity index 77% rename from operations/helm/tests/additional-serviceaccount-label/grafana-agent/templates/configmap.yaml rename to operations/helm/tests/additional-serviceaccount-label/alloy/templates/configmap.yaml index 2fdc6f0117..c9ae77aa1e 100644 --- a/operations/helm/tests/additional-serviceaccount-label/grafana-agent/templates/configmap.yaml +++ b/operations/helm/tests/additional-serviceaccount-label/alloy/templates/configmap.yaml @@ -1,13 +1,13 @@ --- -# Source: grafana-agent/templates/configmap.yaml +# Source: alloy/templates/configmap.yaml apiVersion: v1 kind: ConfigMap metadata: - name: grafana-agent + name: alloy labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + 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 data: diff --git a/operations/helm/tests/create-daemonset/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/additional-serviceaccount-label/alloy/templates/controllers/daemonset.yaml similarity index 78% rename from operations/helm/tests/create-daemonset/grafana-agent/templates/controllers/daemonset.yaml rename to operations/helm/tests/additional-serviceaccount-label/alloy/templates/controllers/daemonset.yaml index 97d9cbfb9b..fdd2df0969 100644 --- a/operations/helm/tests/create-daemonset/grafana-agent/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/additional-serviceaccount-label/alloy/templates/controllers/daemonset.yaml @@ -1,30 +1,30 @@ --- -# Source: grafana-agent/templates/controllers/daemonset.yaml +# Source: alloy/templates/controllers/daemonset.yaml apiVersion: apps/v1 kind: DaemonSet metadata: - name: grafana-agent + name: alloy labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + 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: minReadySeconds: 10 selector: matchLabels: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy template: metadata: annotations: kubectl.kubernetes.io/default-container: alloy labels: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy spec: - serviceAccountName: grafana-agent + serviceAccountName: alloy containers: - name: alloy image: docker.io/grafana/alloy:v0.40.2 @@ -71,4 +71,4 @@ spec: volumes: - name: config configMap: - name: grafana-agent + name: alloy diff --git a/operations/helm/tests/controller-volumes-extra/grafana-agent/templates/rbac.yaml b/operations/helm/tests/additional-serviceaccount-label/alloy/templates/rbac.yaml similarity index 83% rename from operations/helm/tests/controller-volumes-extra/grafana-agent/templates/rbac.yaml rename to operations/helm/tests/additional-serviceaccount-label/alloy/templates/rbac.yaml index 3765583fb6..53ca27544f 100644 --- a/operations/helm/tests/controller-volumes-extra/grafana-agent/templates/rbac.yaml +++ b/operations/helm/tests/additional-serviceaccount-label/alloy/templates/rbac.yaml @@ -1,13 +1,13 @@ --- -# Source: grafana-agent/templates/rbac.yaml +# Source: alloy/templates/rbac.yaml apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: grafana-agent + name: alloy labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + 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 rules: @@ -96,22 +96,22 @@ rules: resources: ["replicasets"] verbs: ["get", "list", "watch"] --- -# Source: grafana-agent/templates/rbac.yaml +# Source: alloy/templates/rbac.yaml apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: grafana-agent + name: alloy labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + 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 roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: grafana-agent + name: alloy subjects: - kind: ServiceAccount - name: grafana-agent + name: alloy namespace: default diff --git a/operations/helm/tests/clustering/grafana-agent/templates/service.yaml b/operations/helm/tests/additional-serviceaccount-label/alloy/templates/service.yaml similarity index 51% rename from operations/helm/tests/clustering/grafana-agent/templates/service.yaml rename to operations/helm/tests/additional-serviceaccount-label/alloy/templates/service.yaml index c98f79428b..34c0608fd3 100644 --- a/operations/helm/tests/clustering/grafana-agent/templates/service.yaml +++ b/operations/helm/tests/additional-serviceaccount-label/alloy/templates/service.yaml @@ -1,20 +1,20 @@ --- -# Source: grafana-agent/templates/service.yaml +# Source: alloy/templates/service.yaml apiVersion: v1 kind: Service metadata: - name: grafana-agent + name: alloy labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + 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: type: ClusterIP selector: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy internalTrafficPolicy: Cluster ports: - name: http-metrics diff --git a/operations/helm/tests/additional-serviceaccount-label/alloy/templates/serviceaccount.yaml b/operations/helm/tests/additional-serviceaccount-label/alloy/templates/serviceaccount.yaml new file mode 100644 index 0000000000..8c685ec855 --- /dev/null +++ b/operations/helm/tests/additional-serviceaccount-label/alloy/templates/serviceaccount.yaml @@ -0,0 +1,14 @@ +--- +# Source: alloy/templates/serviceaccount.yaml +apiVersion: v1 +kind: ServiceAccount +metadata: + name: alloy + namespace: default + 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 + test: "true" diff --git a/operations/helm/tests/additional-serviceaccount-label/grafana-agent/templates/serviceaccount.yaml b/operations/helm/tests/additional-serviceaccount-label/grafana-agent/templates/serviceaccount.yaml deleted file mode 100644 index 08eca9f756..0000000000 --- a/operations/helm/tests/additional-serviceaccount-label/grafana-agent/templates/serviceaccount.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -# Source: grafana-agent/templates/serviceaccount.yaml -apiVersion: v1 -kind: ServiceAccount -metadata: - name: grafana-agent - namespace: default - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm - test: "true" diff --git a/operations/helm/tests/clustering/grafana-agent/templates/cluster_service.yaml b/operations/helm/tests/clustering/alloy/templates/cluster_service.yaml similarity index 64% rename from operations/helm/tests/clustering/grafana-agent/templates/cluster_service.yaml rename to operations/helm/tests/clustering/alloy/templates/cluster_service.yaml index fb9f35e867..b7dd21b837 100644 --- a/operations/helm/tests/clustering/grafana-agent/templates/cluster_service.yaml +++ b/operations/helm/tests/clustering/alloy/templates/cluster_service.yaml @@ -1,21 +1,21 @@ --- -# Source: grafana-agent/templates/cluster_service.yaml +# Source: alloy/templates/cluster_service.yaml apiVersion: v1 kind: Service metadata: - name: grafana-agent-cluster + name: alloy-cluster labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + 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: type: ClusterIP clusterIP: 'None' selector: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy ports: # Do not include the -metrics suffix in the port name, otherwise metrics # can be double-collected with the non-headless Service if it's also diff --git a/operations/helm/tests/controller-volumes-extra/grafana-agent/templates/configmap.yaml b/operations/helm/tests/clustering/alloy/templates/configmap.yaml similarity index 77% rename from operations/helm/tests/controller-volumes-extra/grafana-agent/templates/configmap.yaml rename to operations/helm/tests/clustering/alloy/templates/configmap.yaml index 2fdc6f0117..c9ae77aa1e 100644 --- a/operations/helm/tests/controller-volumes-extra/grafana-agent/templates/configmap.yaml +++ b/operations/helm/tests/clustering/alloy/templates/configmap.yaml @@ -1,13 +1,13 @@ --- -# Source: grafana-agent/templates/configmap.yaml +# Source: alloy/templates/configmap.yaml apiVersion: v1 kind: ConfigMap metadata: - name: grafana-agent + name: alloy labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + 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 data: diff --git a/operations/helm/tests/clustering/grafana-agent/templates/controllers/statefulset.yaml b/operations/helm/tests/clustering/alloy/templates/controllers/statefulset.yaml similarity index 76% rename from operations/helm/tests/clustering/grafana-agent/templates/controllers/statefulset.yaml rename to operations/helm/tests/clustering/alloy/templates/controllers/statefulset.yaml index ba6d8e8ba7..1de3c634c7 100644 --- a/operations/helm/tests/clustering/grafana-agent/templates/controllers/statefulset.yaml +++ b/operations/helm/tests/clustering/alloy/templates/controllers/statefulset.yaml @@ -1,33 +1,33 @@ --- -# Source: grafana-agent/templates/controllers/statefulset.yaml +# Source: alloy/templates/controllers/statefulset.yaml apiVersion: apps/v1 kind: StatefulSet metadata: - name: grafana-agent + name: alloy labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + 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: replicas: 3 podManagementPolicy: Parallel minReadySeconds: 10 - serviceName: grafana-agent + serviceName: alloy selector: matchLabels: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy template: metadata: annotations: kubectl.kubernetes.io/default-container: alloy labels: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy spec: - serviceAccountName: grafana-agent + serviceAccountName: alloy containers: - name: alloy image: docker.io/grafana/alloy:v0.40.2 @@ -39,7 +39,7 @@ spec: - --server.http.listen-addr=0.0.0.0:80 - --server.http.ui-path-prefix=/ - --cluster.enabled=true - - --cluster.join-addresses=grafana-agent-cluster + - --cluster.join-addresses=alloy-cluster env: - name: AGENT_DEPLOY_MODE value: "helm" @@ -76,4 +76,4 @@ spec: volumes: - name: config configMap: - name: grafana-agent + name: alloy diff --git a/operations/helm/tests/create-daemonset-hostnetwork/grafana-agent/templates/rbac.yaml b/operations/helm/tests/clustering/alloy/templates/rbac.yaml similarity index 83% rename from operations/helm/tests/create-daemonset-hostnetwork/grafana-agent/templates/rbac.yaml rename to operations/helm/tests/clustering/alloy/templates/rbac.yaml index 3765583fb6..53ca27544f 100644 --- a/operations/helm/tests/create-daemonset-hostnetwork/grafana-agent/templates/rbac.yaml +++ b/operations/helm/tests/clustering/alloy/templates/rbac.yaml @@ -1,13 +1,13 @@ --- -# Source: grafana-agent/templates/rbac.yaml +# Source: alloy/templates/rbac.yaml apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: grafana-agent + name: alloy labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + 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 rules: @@ -96,22 +96,22 @@ rules: resources: ["replicasets"] verbs: ["get", "list", "watch"] --- -# Source: grafana-agent/templates/rbac.yaml +# Source: alloy/templates/rbac.yaml apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: grafana-agent + name: alloy labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + 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 roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: grafana-agent + name: alloy subjects: - kind: ServiceAccount - name: grafana-agent + name: alloy namespace: default diff --git a/operations/helm/tests/controller-volumes-extra/grafana-agent/templates/service.yaml b/operations/helm/tests/clustering/alloy/templates/service.yaml similarity index 51% rename from operations/helm/tests/controller-volumes-extra/grafana-agent/templates/service.yaml rename to operations/helm/tests/clustering/alloy/templates/service.yaml index c98f79428b..34c0608fd3 100644 --- a/operations/helm/tests/controller-volumes-extra/grafana-agent/templates/service.yaml +++ b/operations/helm/tests/clustering/alloy/templates/service.yaml @@ -1,20 +1,20 @@ --- -# Source: grafana-agent/templates/service.yaml +# Source: alloy/templates/service.yaml apiVersion: v1 kind: Service metadata: - name: grafana-agent + name: alloy labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + 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: type: ClusterIP selector: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy internalTrafficPolicy: Cluster ports: - name: http-metrics diff --git a/operations/helm/tests/clustering/alloy/templates/serviceaccount.yaml b/operations/helm/tests/clustering/alloy/templates/serviceaccount.yaml new file mode 100644 index 0000000000..46df991efb --- /dev/null +++ b/operations/helm/tests/clustering/alloy/templates/serviceaccount.yaml @@ -0,0 +1,13 @@ +--- +# Source: alloy/templates/serviceaccount.yaml +apiVersion: v1 +kind: ServiceAccount +metadata: + name: alloy + namespace: default + 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 diff --git a/operations/helm/tests/clustering/grafana-agent/templates/serviceaccount.yaml b/operations/helm/tests/clustering/grafana-agent/templates/serviceaccount.yaml deleted file mode 100644 index 65d7e0df38..0000000000 --- a/operations/helm/tests/clustering/grafana-agent/templates/serviceaccount.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# Source: grafana-agent/templates/serviceaccount.yaml -apiVersion: v1 -kind: ServiceAccount -metadata: - name: grafana-agent - namespace: default - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm diff --git a/operations/helm/tests/clustering/grafana-agent/templates/configmap.yaml b/operations/helm/tests/controller-volumes-extra/alloy/templates/configmap.yaml similarity index 77% rename from operations/helm/tests/clustering/grafana-agent/templates/configmap.yaml rename to operations/helm/tests/controller-volumes-extra/alloy/templates/configmap.yaml index 2fdc6f0117..c9ae77aa1e 100644 --- a/operations/helm/tests/clustering/grafana-agent/templates/configmap.yaml +++ b/operations/helm/tests/controller-volumes-extra/alloy/templates/configmap.yaml @@ -1,13 +1,13 @@ --- -# Source: grafana-agent/templates/configmap.yaml +# Source: alloy/templates/configmap.yaml apiVersion: v1 kind: ConfigMap metadata: - name: grafana-agent + name: alloy labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + 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 data: diff --git a/operations/helm/tests/controller-volumes-extra/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/controller-volumes-extra/alloy/templates/controllers/daemonset.yaml similarity index 79% rename from operations/helm/tests/controller-volumes-extra/grafana-agent/templates/controllers/daemonset.yaml rename to operations/helm/tests/controller-volumes-extra/alloy/templates/controllers/daemonset.yaml index 727b30100f..67b85b9397 100644 --- a/operations/helm/tests/controller-volumes-extra/grafana-agent/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/controller-volumes-extra/alloy/templates/controllers/daemonset.yaml @@ -1,30 +1,30 @@ --- -# Source: grafana-agent/templates/controllers/daemonset.yaml +# Source: alloy/templates/controllers/daemonset.yaml apiVersion: apps/v1 kind: DaemonSet metadata: - name: grafana-agent + name: alloy labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + 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: minReadySeconds: 10 selector: matchLabels: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy template: metadata: annotations: kubectl.kubernetes.io/default-container: alloy labels: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy spec: - serviceAccountName: grafana-agent + serviceAccountName: alloy containers: - name: alloy image: docker.io/grafana/alloy:v0.40.2 @@ -74,7 +74,7 @@ spec: volumes: - name: config configMap: - name: grafana-agent + name: alloy - emptyDir: sizeLimit: 500Mi name: cache-volume diff --git a/operations/helm/tests/additional-serviceaccount-label/grafana-agent/templates/rbac.yaml b/operations/helm/tests/controller-volumes-extra/alloy/templates/rbac.yaml similarity index 83% rename from operations/helm/tests/additional-serviceaccount-label/grafana-agent/templates/rbac.yaml rename to operations/helm/tests/controller-volumes-extra/alloy/templates/rbac.yaml index 3765583fb6..53ca27544f 100644 --- a/operations/helm/tests/additional-serviceaccount-label/grafana-agent/templates/rbac.yaml +++ b/operations/helm/tests/controller-volumes-extra/alloy/templates/rbac.yaml @@ -1,13 +1,13 @@ --- -# Source: grafana-agent/templates/rbac.yaml +# Source: alloy/templates/rbac.yaml apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: grafana-agent + name: alloy labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + 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 rules: @@ -96,22 +96,22 @@ rules: resources: ["replicasets"] verbs: ["get", "list", "watch"] --- -# Source: grafana-agent/templates/rbac.yaml +# Source: alloy/templates/rbac.yaml apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: grafana-agent + name: alloy labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + 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 roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: grafana-agent + name: alloy subjects: - kind: ServiceAccount - name: grafana-agent + name: alloy namespace: default diff --git a/operations/helm/tests/create-daemonset-hostnetwork/grafana-agent/templates/service.yaml b/operations/helm/tests/controller-volumes-extra/alloy/templates/service.yaml similarity index 51% rename from operations/helm/tests/create-daemonset-hostnetwork/grafana-agent/templates/service.yaml rename to operations/helm/tests/controller-volumes-extra/alloy/templates/service.yaml index c98f79428b..34c0608fd3 100644 --- a/operations/helm/tests/create-daemonset-hostnetwork/grafana-agent/templates/service.yaml +++ b/operations/helm/tests/controller-volumes-extra/alloy/templates/service.yaml @@ -1,20 +1,20 @@ --- -# Source: grafana-agent/templates/service.yaml +# Source: alloy/templates/service.yaml apiVersion: v1 kind: Service metadata: - name: grafana-agent + name: alloy labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + 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: type: ClusterIP selector: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy internalTrafficPolicy: Cluster ports: - name: http-metrics diff --git a/operations/helm/tests/controller-volumes-extra/alloy/templates/serviceaccount.yaml b/operations/helm/tests/controller-volumes-extra/alloy/templates/serviceaccount.yaml new file mode 100644 index 0000000000..46df991efb --- /dev/null +++ b/operations/helm/tests/controller-volumes-extra/alloy/templates/serviceaccount.yaml @@ -0,0 +1,13 @@ +--- +# Source: alloy/templates/serviceaccount.yaml +apiVersion: v1 +kind: ServiceAccount +metadata: + name: alloy + namespace: default + 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 diff --git a/operations/helm/tests/controller-volumes-extra/grafana-agent/templates/serviceaccount.yaml b/operations/helm/tests/controller-volumes-extra/grafana-agent/templates/serviceaccount.yaml deleted file mode 100644 index 65d7e0df38..0000000000 --- a/operations/helm/tests/controller-volumes-extra/grafana-agent/templates/serviceaccount.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# Source: grafana-agent/templates/serviceaccount.yaml -apiVersion: v1 -kind: ServiceAccount -metadata: - name: grafana-agent - namespace: default - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm diff --git a/operations/helm/tests/create-daemonset-hostnetwork/grafana-agent/templates/configmap.yaml b/operations/helm/tests/create-daemonset-hostnetwork/alloy/templates/configmap.yaml similarity index 77% rename from operations/helm/tests/create-daemonset-hostnetwork/grafana-agent/templates/configmap.yaml rename to operations/helm/tests/create-daemonset-hostnetwork/alloy/templates/configmap.yaml index 2fdc6f0117..c9ae77aa1e 100644 --- a/operations/helm/tests/create-daemonset-hostnetwork/grafana-agent/templates/configmap.yaml +++ b/operations/helm/tests/create-daemonset-hostnetwork/alloy/templates/configmap.yaml @@ -1,13 +1,13 @@ --- -# Source: grafana-agent/templates/configmap.yaml +# Source: alloy/templates/configmap.yaml apiVersion: v1 kind: ConfigMap metadata: - name: grafana-agent + name: alloy labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + 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 data: diff --git a/operations/helm/tests/create-daemonset-hostnetwork/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/create-daemonset-hostnetwork/alloy/templates/controllers/daemonset.yaml similarity index 78% rename from operations/helm/tests/create-daemonset-hostnetwork/grafana-agent/templates/controllers/daemonset.yaml rename to operations/helm/tests/create-daemonset-hostnetwork/alloy/templates/controllers/daemonset.yaml index 1786dc9e1e..520e373a6c 100644 --- a/operations/helm/tests/create-daemonset-hostnetwork/grafana-agent/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/create-daemonset-hostnetwork/alloy/templates/controllers/daemonset.yaml @@ -1,30 +1,30 @@ --- -# Source: grafana-agent/templates/controllers/daemonset.yaml +# Source: alloy/templates/controllers/daemonset.yaml apiVersion: apps/v1 kind: DaemonSet metadata: - name: grafana-agent + name: alloy labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + 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: minReadySeconds: 10 selector: matchLabels: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy template: metadata: annotations: kubectl.kubernetes.io/default-container: alloy labels: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy spec: - serviceAccountName: grafana-agent + serviceAccountName: alloy containers: - name: alloy image: docker.io/grafana/alloy:v0.40.2 @@ -72,4 +72,4 @@ spec: volumes: - name: config configMap: - name: grafana-agent + name: alloy diff --git a/operations/helm/tests/clustering/grafana-agent/templates/rbac.yaml b/operations/helm/tests/create-daemonset-hostnetwork/alloy/templates/rbac.yaml similarity index 83% rename from operations/helm/tests/clustering/grafana-agent/templates/rbac.yaml rename to operations/helm/tests/create-daemonset-hostnetwork/alloy/templates/rbac.yaml index 3765583fb6..53ca27544f 100644 --- a/operations/helm/tests/clustering/grafana-agent/templates/rbac.yaml +++ b/operations/helm/tests/create-daemonset-hostnetwork/alloy/templates/rbac.yaml @@ -1,13 +1,13 @@ --- -# Source: grafana-agent/templates/rbac.yaml +# Source: alloy/templates/rbac.yaml apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: grafana-agent + name: alloy labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + 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 rules: @@ -96,22 +96,22 @@ rules: resources: ["replicasets"] verbs: ["get", "list", "watch"] --- -# Source: grafana-agent/templates/rbac.yaml +# Source: alloy/templates/rbac.yaml apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: grafana-agent + name: alloy labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + 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 roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: grafana-agent + name: alloy subjects: - kind: ServiceAccount - name: grafana-agent + name: alloy namespace: default diff --git a/operations/helm/tests/additional-serviceaccount-label/grafana-agent/templates/service.yaml b/operations/helm/tests/create-daemonset-hostnetwork/alloy/templates/service.yaml similarity index 51% rename from operations/helm/tests/additional-serviceaccount-label/grafana-agent/templates/service.yaml rename to operations/helm/tests/create-daemonset-hostnetwork/alloy/templates/service.yaml index c98f79428b..34c0608fd3 100644 --- a/operations/helm/tests/additional-serviceaccount-label/grafana-agent/templates/service.yaml +++ b/operations/helm/tests/create-daemonset-hostnetwork/alloy/templates/service.yaml @@ -1,20 +1,20 @@ --- -# Source: grafana-agent/templates/service.yaml +# Source: alloy/templates/service.yaml apiVersion: v1 kind: Service metadata: - name: grafana-agent + name: alloy labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + 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: type: ClusterIP selector: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy internalTrafficPolicy: Cluster ports: - name: http-metrics diff --git a/operations/helm/tests/create-daemonset-hostnetwork/alloy/templates/serviceaccount.yaml b/operations/helm/tests/create-daemonset-hostnetwork/alloy/templates/serviceaccount.yaml new file mode 100644 index 0000000000..46df991efb --- /dev/null +++ b/operations/helm/tests/create-daemonset-hostnetwork/alloy/templates/serviceaccount.yaml @@ -0,0 +1,13 @@ +--- +# Source: alloy/templates/serviceaccount.yaml +apiVersion: v1 +kind: ServiceAccount +metadata: + name: alloy + namespace: default + 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 diff --git a/operations/helm/tests/create-daemonset-hostnetwork/grafana-agent/templates/serviceaccount.yaml b/operations/helm/tests/create-daemonset-hostnetwork/grafana-agent/templates/serviceaccount.yaml deleted file mode 100644 index 65d7e0df38..0000000000 --- a/operations/helm/tests/create-daemonset-hostnetwork/grafana-agent/templates/serviceaccount.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# Source: grafana-agent/templates/serviceaccount.yaml -apiVersion: v1 -kind: ServiceAccount -metadata: - name: grafana-agent - namespace: default - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm diff --git a/operations/helm/tests/create-daemonset/alloy/templates/configmap.yaml b/operations/helm/tests/create-daemonset/alloy/templates/configmap.yaml new file mode 100644 index 0000000000..c9ae77aa1e --- /dev/null +++ b/operations/helm/tests/create-daemonset/alloy/templates/configmap.yaml @@ -0,0 +1,42 @@ +--- +# Source: alloy/templates/configmap.yaml +apiVersion: v1 +kind: ConfigMap +metadata: + name: 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 +data: + config.river: |- + logging { + level = "info" + format = "logfmt" + } + + discovery.kubernetes "pods" { + role = "pod" + } + + discovery.kubernetes "nodes" { + role = "node" + } + + discovery.kubernetes "services" { + role = "service" + } + + discovery.kubernetes "endpoints" { + role = "endpoints" + } + + discovery.kubernetes "endpointslices" { + role = "endpointslice" + } + + discovery.kubernetes "ingresses" { + role = "ingress" + } diff --git a/operations/helm/tests/additional-serviceaccount-label/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/create-daemonset/alloy/templates/controllers/daemonset.yaml similarity index 78% rename from operations/helm/tests/additional-serviceaccount-label/grafana-agent/templates/controllers/daemonset.yaml rename to operations/helm/tests/create-daemonset/alloy/templates/controllers/daemonset.yaml index 97d9cbfb9b..fdd2df0969 100644 --- a/operations/helm/tests/additional-serviceaccount-label/grafana-agent/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/create-daemonset/alloy/templates/controllers/daemonset.yaml @@ -1,30 +1,30 @@ --- -# Source: grafana-agent/templates/controllers/daemonset.yaml +# Source: alloy/templates/controllers/daemonset.yaml apiVersion: apps/v1 kind: DaemonSet metadata: - name: grafana-agent + name: alloy labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + 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: minReadySeconds: 10 selector: matchLabels: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy template: metadata: annotations: kubectl.kubernetes.io/default-container: alloy labels: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy spec: - serviceAccountName: grafana-agent + serviceAccountName: alloy containers: - name: alloy image: docker.io/grafana/alloy:v0.40.2 @@ -71,4 +71,4 @@ spec: volumes: - name: config configMap: - name: grafana-agent + name: alloy diff --git a/operations/helm/tests/create-daemonset/alloy/templates/rbac.yaml b/operations/helm/tests/create-daemonset/alloy/templates/rbac.yaml new file mode 100644 index 0000000000..53ca27544f --- /dev/null +++ b/operations/helm/tests/create-daemonset/alloy/templates/rbac.yaml @@ -0,0 +1,117 @@ +--- +# Source: alloy/templates/rbac.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: 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 +rules: + # Rules which allow discovery.kubernetes to function. + - apiGroups: + - "" + - "discovery.k8s.io" + - "networking.k8s.io" + resources: + - endpoints + - endpointslices + - ingresses + - nodes + - nodes/proxy + - nodes/metrics + - pods + - services + verbs: + - get + - list + - watch + # Rules which allow loki.source.kubernetes and loki.source.podlogs to work. + - apiGroups: + - "" + resources: + - pods + - pods/log + - namespaces + verbs: + - get + - list + - watch + - apiGroups: + - "monitoring.grafana.com" + resources: + - podlogs + verbs: + - get + - list + - watch + # Rules which allow mimir.rules.kubernetes to work. + - apiGroups: ["monitoring.coreos.com"] + resources: + - prometheusrules + verbs: + - get + - list + - watch + - nonResourceURLs: + - /metrics + verbs: + - get + # Rules for prometheus.kubernetes.* + - apiGroups: ["monitoring.coreos.com"] + resources: + - podmonitors + - servicemonitors + - probes + verbs: + - get + - list + - watch + # Rules which allow eventhandler to work. + - apiGroups: + - "" + resources: + - events + verbs: + - get + - list + - watch + # needed for remote.kubernetes.* + - apiGroups: [""] + resources: + - "configmaps" + - "secrets" + verbs: + - get + - list + - watch + # needed for otelcol.processor.k8sattributes + - apiGroups: ["apps"] + resources: ["replicasets"] + verbs: ["get", "list", "watch"] + - apiGroups: ["extensions"] + resources: ["replicasets"] + verbs: ["get", "list", "watch"] +--- +# Source: alloy/templates/rbac.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: 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 +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: alloy +subjects: + - kind: ServiceAccount + name: alloy + namespace: default diff --git a/operations/helm/tests/create-daemonset/alloy/templates/service.yaml b/operations/helm/tests/create-daemonset/alloy/templates/service.yaml new file mode 100644 index 0000000000..34c0608fd3 --- /dev/null +++ b/operations/helm/tests/create-daemonset/alloy/templates/service.yaml @@ -0,0 +1,23 @@ +--- +# Source: alloy/templates/service.yaml +apiVersion: v1 +kind: Service +metadata: + name: 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: + type: ClusterIP + selector: + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy + internalTrafficPolicy: Cluster + ports: + - name: http-metrics + port: 80 + targetPort: 80 + protocol: "TCP" diff --git a/operations/helm/tests/create-daemonset/alloy/templates/serviceaccount.yaml b/operations/helm/tests/create-daemonset/alloy/templates/serviceaccount.yaml new file mode 100644 index 0000000000..46df991efb --- /dev/null +++ b/operations/helm/tests/create-daemonset/alloy/templates/serviceaccount.yaml @@ -0,0 +1,13 @@ +--- +# Source: alloy/templates/serviceaccount.yaml +apiVersion: v1 +kind: ServiceAccount +metadata: + name: alloy + namespace: default + 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 diff --git a/operations/helm/tests/create-daemonset/grafana-agent/templates/configmap.yaml b/operations/helm/tests/create-daemonset/grafana-agent/templates/configmap.yaml deleted file mode 100644 index 2fdc6f0117..0000000000 --- a/operations/helm/tests/create-daemonset/grafana-agent/templates/configmap.yaml +++ /dev/null @@ -1,42 +0,0 @@ ---- -# Source: grafana-agent/templates/configmap.yaml -apiVersion: v1 -kind: ConfigMap -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -data: - config.river: |- - logging { - level = "info" - format = "logfmt" - } - - discovery.kubernetes "pods" { - role = "pod" - } - - discovery.kubernetes "nodes" { - role = "node" - } - - discovery.kubernetes "services" { - role = "service" - } - - discovery.kubernetes "endpoints" { - role = "endpoints" - } - - discovery.kubernetes "endpointslices" { - role = "endpointslice" - } - - discovery.kubernetes "ingresses" { - role = "ingress" - } diff --git a/operations/helm/tests/create-daemonset/grafana-agent/templates/rbac.yaml b/operations/helm/tests/create-daemonset/grafana-agent/templates/rbac.yaml deleted file mode 100644 index 3765583fb6..0000000000 --- a/operations/helm/tests/create-daemonset/grafana-agent/templates/rbac.yaml +++ /dev/null @@ -1,117 +0,0 @@ ---- -# Source: grafana-agent/templates/rbac.yaml -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -rules: - # Rules which allow discovery.kubernetes to function. - - apiGroups: - - "" - - "discovery.k8s.io" - - "networking.k8s.io" - resources: - - endpoints - - endpointslices - - ingresses - - nodes - - nodes/proxy - - nodes/metrics - - pods - - services - verbs: - - get - - list - - watch - # Rules which allow loki.source.kubernetes and loki.source.podlogs to work. - - apiGroups: - - "" - resources: - - pods - - pods/log - - namespaces - verbs: - - get - - list - - watch - - apiGroups: - - "monitoring.grafana.com" - resources: - - podlogs - verbs: - - get - - list - - watch - # Rules which allow mimir.rules.kubernetes to work. - - apiGroups: ["monitoring.coreos.com"] - resources: - - prometheusrules - verbs: - - get - - list - - watch - - nonResourceURLs: - - /metrics - verbs: - - get - # Rules for prometheus.kubernetes.* - - apiGroups: ["monitoring.coreos.com"] - resources: - - podmonitors - - servicemonitors - - probes - verbs: - - get - - list - - watch - # Rules which allow eventhandler to work. - - apiGroups: - - "" - resources: - - events - verbs: - - get - - list - - watch - # needed for remote.kubernetes.* - - apiGroups: [""] - resources: - - "configmaps" - - "secrets" - verbs: - - get - - list - - watch - # needed for otelcol.processor.k8sattributes - - apiGroups: ["apps"] - resources: ["replicasets"] - verbs: ["get", "list", "watch"] - - apiGroups: ["extensions"] - resources: ["replicasets"] - verbs: ["get", "list", "watch"] ---- -# Source: grafana-agent/templates/rbac.yaml -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: grafana-agent -subjects: - - kind: ServiceAccount - name: grafana-agent - namespace: default diff --git a/operations/helm/tests/create-daemonset/grafana-agent/templates/service.yaml b/operations/helm/tests/create-daemonset/grafana-agent/templates/service.yaml deleted file mode 100644 index c98f79428b..0000000000 --- a/operations/helm/tests/create-daemonset/grafana-agent/templates/service.yaml +++ /dev/null @@ -1,23 +0,0 @@ ---- -# Source: grafana-agent/templates/service.yaml -apiVersion: v1 -kind: Service -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -spec: - type: ClusterIP - selector: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - internalTrafficPolicy: Cluster - ports: - - name: http-metrics - port: 80 - targetPort: 80 - protocol: "TCP" diff --git a/operations/helm/tests/create-daemonset/grafana-agent/templates/serviceaccount.yaml b/operations/helm/tests/create-daemonset/grafana-agent/templates/serviceaccount.yaml deleted file mode 100644 index 65d7e0df38..0000000000 --- a/operations/helm/tests/create-daemonset/grafana-agent/templates/serviceaccount.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# Source: grafana-agent/templates/serviceaccount.yaml -apiVersion: v1 -kind: ServiceAccount -metadata: - name: grafana-agent - namespace: default - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm diff --git a/operations/helm/tests/create-deployment-autoscaling/alloy/templates/configmap.yaml b/operations/helm/tests/create-deployment-autoscaling/alloy/templates/configmap.yaml new file mode 100644 index 0000000000..c9ae77aa1e --- /dev/null +++ b/operations/helm/tests/create-deployment-autoscaling/alloy/templates/configmap.yaml @@ -0,0 +1,42 @@ +--- +# Source: alloy/templates/configmap.yaml +apiVersion: v1 +kind: ConfigMap +metadata: + name: 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 +data: + config.river: |- + logging { + level = "info" + format = "logfmt" + } + + discovery.kubernetes "pods" { + role = "pod" + } + + discovery.kubernetes "nodes" { + role = "node" + } + + discovery.kubernetes "services" { + role = "service" + } + + discovery.kubernetes "endpoints" { + role = "endpoints" + } + + discovery.kubernetes "endpointslices" { + role = "endpointslice" + } + + discovery.kubernetes "ingresses" { + role = "ingress" + } diff --git a/operations/helm/tests/create-deployment-autoscaling/grafana-agent/templates/controllers/deployment.yaml b/operations/helm/tests/create-deployment-autoscaling/alloy/templates/controllers/deployment.yaml similarity index 79% rename from operations/helm/tests/create-deployment-autoscaling/grafana-agent/templates/controllers/deployment.yaml rename to operations/helm/tests/create-deployment-autoscaling/alloy/templates/controllers/deployment.yaml index efd291c67f..9541ab33c3 100644 --- a/operations/helm/tests/create-deployment-autoscaling/grafana-agent/templates/controllers/deployment.yaml +++ b/operations/helm/tests/create-deployment-autoscaling/alloy/templates/controllers/deployment.yaml @@ -1,30 +1,30 @@ --- -# Source: grafana-agent/templates/controllers/deployment.yaml +# Source: alloy/templates/controllers/deployment.yaml apiVersion: apps/v1 kind: Deployment metadata: - name: grafana-agent + name: alloy labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + 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: minReadySeconds: 10 selector: matchLabels: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy template: metadata: annotations: kubectl.kubernetes.io/default-container: alloy labels: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy spec: - serviceAccountName: grafana-agent + serviceAccountName: alloy containers: - name: alloy image: docker.io/grafana/alloy:v0.40.2 @@ -74,4 +74,4 @@ spec: volumes: - name: config configMap: - name: grafana-agent + name: alloy diff --git a/operations/helm/tests/create-deployment-autoscaling/grafana-agent/templates/hpa.yaml b/operations/helm/tests/create-deployment-autoscaling/alloy/templates/hpa.yaml similarity index 82% rename from operations/helm/tests/create-deployment-autoscaling/grafana-agent/templates/hpa.yaml rename to operations/helm/tests/create-deployment-autoscaling/alloy/templates/hpa.yaml index b181724fe4..7914063972 100644 --- a/operations/helm/tests/create-deployment-autoscaling/grafana-agent/templates/hpa.yaml +++ b/operations/helm/tests/create-deployment-autoscaling/alloy/templates/hpa.yaml @@ -1,20 +1,20 @@ --- -# Source: grafana-agent/templates/hpa.yaml +# Source: alloy/templates/hpa.yaml apiVersion: autoscaling/v2 kind: HorizontalPodAutoscaler metadata: - name: grafana-agent + name: alloy labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + 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: scaleTargetRef: apiVersion: apps/v1 kind: deployment - name: grafana-agent + name: alloy minReplicas: 1 maxReplicas: 5 behavior: diff --git a/operations/helm/tests/create-deployment-autoscaling/alloy/templates/rbac.yaml b/operations/helm/tests/create-deployment-autoscaling/alloy/templates/rbac.yaml new file mode 100644 index 0000000000..53ca27544f --- /dev/null +++ b/operations/helm/tests/create-deployment-autoscaling/alloy/templates/rbac.yaml @@ -0,0 +1,117 @@ +--- +# Source: alloy/templates/rbac.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: 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 +rules: + # Rules which allow discovery.kubernetes to function. + - apiGroups: + - "" + - "discovery.k8s.io" + - "networking.k8s.io" + resources: + - endpoints + - endpointslices + - ingresses + - nodes + - nodes/proxy + - nodes/metrics + - pods + - services + verbs: + - get + - list + - watch + # Rules which allow loki.source.kubernetes and loki.source.podlogs to work. + - apiGroups: + - "" + resources: + - pods + - pods/log + - namespaces + verbs: + - get + - list + - watch + - apiGroups: + - "monitoring.grafana.com" + resources: + - podlogs + verbs: + - get + - list + - watch + # Rules which allow mimir.rules.kubernetes to work. + - apiGroups: ["monitoring.coreos.com"] + resources: + - prometheusrules + verbs: + - get + - list + - watch + - nonResourceURLs: + - /metrics + verbs: + - get + # Rules for prometheus.kubernetes.* + - apiGroups: ["monitoring.coreos.com"] + resources: + - podmonitors + - servicemonitors + - probes + verbs: + - get + - list + - watch + # Rules which allow eventhandler to work. + - apiGroups: + - "" + resources: + - events + verbs: + - get + - list + - watch + # needed for remote.kubernetes.* + - apiGroups: [""] + resources: + - "configmaps" + - "secrets" + verbs: + - get + - list + - watch + # needed for otelcol.processor.k8sattributes + - apiGroups: ["apps"] + resources: ["replicasets"] + verbs: ["get", "list", "watch"] + - apiGroups: ["extensions"] + resources: ["replicasets"] + verbs: ["get", "list", "watch"] +--- +# Source: alloy/templates/rbac.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: 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 +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: alloy +subjects: + - kind: ServiceAccount + name: alloy + namespace: default diff --git a/operations/helm/tests/create-deployment-autoscaling/alloy/templates/service.yaml b/operations/helm/tests/create-deployment-autoscaling/alloy/templates/service.yaml new file mode 100644 index 0000000000..34c0608fd3 --- /dev/null +++ b/operations/helm/tests/create-deployment-autoscaling/alloy/templates/service.yaml @@ -0,0 +1,23 @@ +--- +# Source: alloy/templates/service.yaml +apiVersion: v1 +kind: Service +metadata: + name: 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: + type: ClusterIP + selector: + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy + internalTrafficPolicy: Cluster + ports: + - name: http-metrics + port: 80 + targetPort: 80 + protocol: "TCP" diff --git a/operations/helm/tests/create-deployment-autoscaling/alloy/templates/serviceaccount.yaml b/operations/helm/tests/create-deployment-autoscaling/alloy/templates/serviceaccount.yaml new file mode 100644 index 0000000000..46df991efb --- /dev/null +++ b/operations/helm/tests/create-deployment-autoscaling/alloy/templates/serviceaccount.yaml @@ -0,0 +1,13 @@ +--- +# Source: alloy/templates/serviceaccount.yaml +apiVersion: v1 +kind: ServiceAccount +metadata: + name: alloy + namespace: default + 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 diff --git a/operations/helm/tests/create-deployment-autoscaling/grafana-agent/templates/configmap.yaml b/operations/helm/tests/create-deployment-autoscaling/grafana-agent/templates/configmap.yaml deleted file mode 100644 index 2fdc6f0117..0000000000 --- a/operations/helm/tests/create-deployment-autoscaling/grafana-agent/templates/configmap.yaml +++ /dev/null @@ -1,42 +0,0 @@ ---- -# Source: grafana-agent/templates/configmap.yaml -apiVersion: v1 -kind: ConfigMap -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -data: - config.river: |- - logging { - level = "info" - format = "logfmt" - } - - discovery.kubernetes "pods" { - role = "pod" - } - - discovery.kubernetes "nodes" { - role = "node" - } - - discovery.kubernetes "services" { - role = "service" - } - - discovery.kubernetes "endpoints" { - role = "endpoints" - } - - discovery.kubernetes "endpointslices" { - role = "endpointslice" - } - - discovery.kubernetes "ingresses" { - role = "ingress" - } diff --git a/operations/helm/tests/create-deployment-autoscaling/grafana-agent/templates/rbac.yaml b/operations/helm/tests/create-deployment-autoscaling/grafana-agent/templates/rbac.yaml deleted file mode 100644 index 3765583fb6..0000000000 --- a/operations/helm/tests/create-deployment-autoscaling/grafana-agent/templates/rbac.yaml +++ /dev/null @@ -1,117 +0,0 @@ ---- -# Source: grafana-agent/templates/rbac.yaml -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -rules: - # Rules which allow discovery.kubernetes to function. - - apiGroups: - - "" - - "discovery.k8s.io" - - "networking.k8s.io" - resources: - - endpoints - - endpointslices - - ingresses - - nodes - - nodes/proxy - - nodes/metrics - - pods - - services - verbs: - - get - - list - - watch - # Rules which allow loki.source.kubernetes and loki.source.podlogs to work. - - apiGroups: - - "" - resources: - - pods - - pods/log - - namespaces - verbs: - - get - - list - - watch - - apiGroups: - - "monitoring.grafana.com" - resources: - - podlogs - verbs: - - get - - list - - watch - # Rules which allow mimir.rules.kubernetes to work. - - apiGroups: ["monitoring.coreos.com"] - resources: - - prometheusrules - verbs: - - get - - list - - watch - - nonResourceURLs: - - /metrics - verbs: - - get - # Rules for prometheus.kubernetes.* - - apiGroups: ["monitoring.coreos.com"] - resources: - - podmonitors - - servicemonitors - - probes - verbs: - - get - - list - - watch - # Rules which allow eventhandler to work. - - apiGroups: - - "" - resources: - - events - verbs: - - get - - list - - watch - # needed for remote.kubernetes.* - - apiGroups: [""] - resources: - - "configmaps" - - "secrets" - verbs: - - get - - list - - watch - # needed for otelcol.processor.k8sattributes - - apiGroups: ["apps"] - resources: ["replicasets"] - verbs: ["get", "list", "watch"] - - apiGroups: ["extensions"] - resources: ["replicasets"] - verbs: ["get", "list", "watch"] ---- -# Source: grafana-agent/templates/rbac.yaml -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: grafana-agent -subjects: - - kind: ServiceAccount - name: grafana-agent - namespace: default diff --git a/operations/helm/tests/create-deployment-autoscaling/grafana-agent/templates/service.yaml b/operations/helm/tests/create-deployment-autoscaling/grafana-agent/templates/service.yaml deleted file mode 100644 index c98f79428b..0000000000 --- a/operations/helm/tests/create-deployment-autoscaling/grafana-agent/templates/service.yaml +++ /dev/null @@ -1,23 +0,0 @@ ---- -# Source: grafana-agent/templates/service.yaml -apiVersion: v1 -kind: Service -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -spec: - type: ClusterIP - selector: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - internalTrafficPolicy: Cluster - ports: - - name: http-metrics - port: 80 - targetPort: 80 - protocol: "TCP" diff --git a/operations/helm/tests/create-deployment-autoscaling/grafana-agent/templates/serviceaccount.yaml b/operations/helm/tests/create-deployment-autoscaling/grafana-agent/templates/serviceaccount.yaml deleted file mode 100644 index 65d7e0df38..0000000000 --- a/operations/helm/tests/create-deployment-autoscaling/grafana-agent/templates/serviceaccount.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# Source: grafana-agent/templates/serviceaccount.yaml -apiVersion: v1 -kind: ServiceAccount -metadata: - name: grafana-agent - namespace: default - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm diff --git a/operations/helm/tests/create-deployment/alloy/templates/configmap.yaml b/operations/helm/tests/create-deployment/alloy/templates/configmap.yaml new file mode 100644 index 0000000000..c9ae77aa1e --- /dev/null +++ b/operations/helm/tests/create-deployment/alloy/templates/configmap.yaml @@ -0,0 +1,42 @@ +--- +# Source: alloy/templates/configmap.yaml +apiVersion: v1 +kind: ConfigMap +metadata: + name: 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 +data: + config.river: |- + logging { + level = "info" + format = "logfmt" + } + + discovery.kubernetes "pods" { + role = "pod" + } + + discovery.kubernetes "nodes" { + role = "node" + } + + discovery.kubernetes "services" { + role = "service" + } + + discovery.kubernetes "endpoints" { + role = "endpoints" + } + + discovery.kubernetes "endpointslices" { + role = "endpointslice" + } + + discovery.kubernetes "ingresses" { + role = "ingress" + } diff --git a/operations/helm/tests/create-deployment/grafana-agent/templates/controllers/deployment.yaml b/operations/helm/tests/create-deployment/alloy/templates/controllers/deployment.yaml similarity index 78% rename from operations/helm/tests/create-deployment/grafana-agent/templates/controllers/deployment.yaml rename to operations/helm/tests/create-deployment/alloy/templates/controllers/deployment.yaml index a0bde9d5bc..2c7d54aed8 100644 --- a/operations/helm/tests/create-deployment/grafana-agent/templates/controllers/deployment.yaml +++ b/operations/helm/tests/create-deployment/alloy/templates/controllers/deployment.yaml @@ -1,13 +1,13 @@ --- -# Source: grafana-agent/templates/controllers/deployment.yaml +# Source: alloy/templates/controllers/deployment.yaml apiVersion: apps/v1 kind: Deployment metadata: - name: grafana-agent + name: alloy labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + 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: @@ -15,17 +15,17 @@ spec: minReadySeconds: 10 selector: matchLabels: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy template: metadata: annotations: kubectl.kubernetes.io/default-container: alloy labels: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy spec: - serviceAccountName: grafana-agent + serviceAccountName: alloy containers: - name: alloy image: docker.io/grafana/alloy:v0.40.2 @@ -72,4 +72,4 @@ spec: volumes: - name: config configMap: - name: grafana-agent + name: alloy diff --git a/operations/helm/tests/create-deployment/alloy/templates/rbac.yaml b/operations/helm/tests/create-deployment/alloy/templates/rbac.yaml new file mode 100644 index 0000000000..53ca27544f --- /dev/null +++ b/operations/helm/tests/create-deployment/alloy/templates/rbac.yaml @@ -0,0 +1,117 @@ +--- +# Source: alloy/templates/rbac.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: 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 +rules: + # Rules which allow discovery.kubernetes to function. + - apiGroups: + - "" + - "discovery.k8s.io" + - "networking.k8s.io" + resources: + - endpoints + - endpointslices + - ingresses + - nodes + - nodes/proxy + - nodes/metrics + - pods + - services + verbs: + - get + - list + - watch + # Rules which allow loki.source.kubernetes and loki.source.podlogs to work. + - apiGroups: + - "" + resources: + - pods + - pods/log + - namespaces + verbs: + - get + - list + - watch + - apiGroups: + - "monitoring.grafana.com" + resources: + - podlogs + verbs: + - get + - list + - watch + # Rules which allow mimir.rules.kubernetes to work. + - apiGroups: ["monitoring.coreos.com"] + resources: + - prometheusrules + verbs: + - get + - list + - watch + - nonResourceURLs: + - /metrics + verbs: + - get + # Rules for prometheus.kubernetes.* + - apiGroups: ["monitoring.coreos.com"] + resources: + - podmonitors + - servicemonitors + - probes + verbs: + - get + - list + - watch + # Rules which allow eventhandler to work. + - apiGroups: + - "" + resources: + - events + verbs: + - get + - list + - watch + # needed for remote.kubernetes.* + - apiGroups: [""] + resources: + - "configmaps" + - "secrets" + verbs: + - get + - list + - watch + # needed for otelcol.processor.k8sattributes + - apiGroups: ["apps"] + resources: ["replicasets"] + verbs: ["get", "list", "watch"] + - apiGroups: ["extensions"] + resources: ["replicasets"] + verbs: ["get", "list", "watch"] +--- +# Source: alloy/templates/rbac.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: 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 +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: alloy +subjects: + - kind: ServiceAccount + name: alloy + namespace: default diff --git a/operations/helm/tests/create-deployment/alloy/templates/service.yaml b/operations/helm/tests/create-deployment/alloy/templates/service.yaml new file mode 100644 index 0000000000..34c0608fd3 --- /dev/null +++ b/operations/helm/tests/create-deployment/alloy/templates/service.yaml @@ -0,0 +1,23 @@ +--- +# Source: alloy/templates/service.yaml +apiVersion: v1 +kind: Service +metadata: + name: 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: + type: ClusterIP + selector: + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy + internalTrafficPolicy: Cluster + ports: + - name: http-metrics + port: 80 + targetPort: 80 + protocol: "TCP" diff --git a/operations/helm/tests/create-deployment/alloy/templates/serviceaccount.yaml b/operations/helm/tests/create-deployment/alloy/templates/serviceaccount.yaml new file mode 100644 index 0000000000..46df991efb --- /dev/null +++ b/operations/helm/tests/create-deployment/alloy/templates/serviceaccount.yaml @@ -0,0 +1,13 @@ +--- +# Source: alloy/templates/serviceaccount.yaml +apiVersion: v1 +kind: ServiceAccount +metadata: + name: alloy + namespace: default + 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 diff --git a/operations/helm/tests/create-deployment/grafana-agent/templates/configmap.yaml b/operations/helm/tests/create-deployment/grafana-agent/templates/configmap.yaml deleted file mode 100644 index 2fdc6f0117..0000000000 --- a/operations/helm/tests/create-deployment/grafana-agent/templates/configmap.yaml +++ /dev/null @@ -1,42 +0,0 @@ ---- -# Source: grafana-agent/templates/configmap.yaml -apiVersion: v1 -kind: ConfigMap -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -data: - config.river: |- - logging { - level = "info" - format = "logfmt" - } - - discovery.kubernetes "pods" { - role = "pod" - } - - discovery.kubernetes "nodes" { - role = "node" - } - - discovery.kubernetes "services" { - role = "service" - } - - discovery.kubernetes "endpoints" { - role = "endpoints" - } - - discovery.kubernetes "endpointslices" { - role = "endpointslice" - } - - discovery.kubernetes "ingresses" { - role = "ingress" - } diff --git a/operations/helm/tests/create-deployment/grafana-agent/templates/rbac.yaml b/operations/helm/tests/create-deployment/grafana-agent/templates/rbac.yaml deleted file mode 100644 index 3765583fb6..0000000000 --- a/operations/helm/tests/create-deployment/grafana-agent/templates/rbac.yaml +++ /dev/null @@ -1,117 +0,0 @@ ---- -# Source: grafana-agent/templates/rbac.yaml -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -rules: - # Rules which allow discovery.kubernetes to function. - - apiGroups: - - "" - - "discovery.k8s.io" - - "networking.k8s.io" - resources: - - endpoints - - endpointslices - - ingresses - - nodes - - nodes/proxy - - nodes/metrics - - pods - - services - verbs: - - get - - list - - watch - # Rules which allow loki.source.kubernetes and loki.source.podlogs to work. - - apiGroups: - - "" - resources: - - pods - - pods/log - - namespaces - verbs: - - get - - list - - watch - - apiGroups: - - "monitoring.grafana.com" - resources: - - podlogs - verbs: - - get - - list - - watch - # Rules which allow mimir.rules.kubernetes to work. - - apiGroups: ["monitoring.coreos.com"] - resources: - - prometheusrules - verbs: - - get - - list - - watch - - nonResourceURLs: - - /metrics - verbs: - - get - # Rules for prometheus.kubernetes.* - - apiGroups: ["monitoring.coreos.com"] - resources: - - podmonitors - - servicemonitors - - probes - verbs: - - get - - list - - watch - # Rules which allow eventhandler to work. - - apiGroups: - - "" - resources: - - events - verbs: - - get - - list - - watch - # needed for remote.kubernetes.* - - apiGroups: [""] - resources: - - "configmaps" - - "secrets" - verbs: - - get - - list - - watch - # needed for otelcol.processor.k8sattributes - - apiGroups: ["apps"] - resources: ["replicasets"] - verbs: ["get", "list", "watch"] - - apiGroups: ["extensions"] - resources: ["replicasets"] - verbs: ["get", "list", "watch"] ---- -# Source: grafana-agent/templates/rbac.yaml -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: grafana-agent -subjects: - - kind: ServiceAccount - name: grafana-agent - namespace: default diff --git a/operations/helm/tests/create-deployment/grafana-agent/templates/service.yaml b/operations/helm/tests/create-deployment/grafana-agent/templates/service.yaml deleted file mode 100644 index c98f79428b..0000000000 --- a/operations/helm/tests/create-deployment/grafana-agent/templates/service.yaml +++ /dev/null @@ -1,23 +0,0 @@ ---- -# Source: grafana-agent/templates/service.yaml -apiVersion: v1 -kind: Service -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -spec: - type: ClusterIP - selector: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - internalTrafficPolicy: Cluster - ports: - - name: http-metrics - port: 80 - targetPort: 80 - protocol: "TCP" diff --git a/operations/helm/tests/create-deployment/grafana-agent/templates/serviceaccount.yaml b/operations/helm/tests/create-deployment/grafana-agent/templates/serviceaccount.yaml deleted file mode 100644 index 65d7e0df38..0000000000 --- a/operations/helm/tests/create-deployment/grafana-agent/templates/serviceaccount.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# Source: grafana-agent/templates/serviceaccount.yaml -apiVersion: v1 -kind: ServiceAccount -metadata: - name: grafana-agent - namespace: default - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm diff --git a/operations/helm/tests/create-statefulset-autoscaling/alloy/templates/configmap.yaml b/operations/helm/tests/create-statefulset-autoscaling/alloy/templates/configmap.yaml new file mode 100644 index 0000000000..c9ae77aa1e --- /dev/null +++ b/operations/helm/tests/create-statefulset-autoscaling/alloy/templates/configmap.yaml @@ -0,0 +1,42 @@ +--- +# Source: alloy/templates/configmap.yaml +apiVersion: v1 +kind: ConfigMap +metadata: + name: 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 +data: + config.river: |- + logging { + level = "info" + format = "logfmt" + } + + discovery.kubernetes "pods" { + role = "pod" + } + + discovery.kubernetes "nodes" { + role = "node" + } + + discovery.kubernetes "services" { + role = "service" + } + + discovery.kubernetes "endpoints" { + role = "endpoints" + } + + discovery.kubernetes "endpointslices" { + role = "endpointslice" + } + + discovery.kubernetes "ingresses" { + role = "ingress" + } diff --git a/operations/helm/tests/create-statefulset-autoscaling/grafana-agent/templates/controllers/statefulset.yaml b/operations/helm/tests/create-statefulset-autoscaling/alloy/templates/controllers/statefulset.yaml similarity index 79% rename from operations/helm/tests/create-statefulset-autoscaling/grafana-agent/templates/controllers/statefulset.yaml rename to operations/helm/tests/create-statefulset-autoscaling/alloy/templates/controllers/statefulset.yaml index 084e210b31..4306d0d521 100644 --- a/operations/helm/tests/create-statefulset-autoscaling/grafana-agent/templates/controllers/statefulset.yaml +++ b/operations/helm/tests/create-statefulset-autoscaling/alloy/templates/controllers/statefulset.yaml @@ -1,32 +1,32 @@ --- -# Source: grafana-agent/templates/controllers/statefulset.yaml +# Source: alloy/templates/controllers/statefulset.yaml apiVersion: apps/v1 kind: StatefulSet metadata: - name: grafana-agent + name: alloy labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + 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: podManagementPolicy: Parallel minReadySeconds: 10 - serviceName: grafana-agent + serviceName: alloy selector: matchLabels: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy template: metadata: annotations: kubectl.kubernetes.io/default-container: alloy labels: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy spec: - serviceAccountName: grafana-agent + serviceAccountName: alloy containers: - name: alloy image: docker.io/grafana/alloy:v0.40.2 @@ -76,7 +76,7 @@ spec: volumes: - name: config configMap: - name: grafana-agent + name: alloy persistentVolumeClaimRetentionPolicy: whenDeleted: Delete whenScaled: Delete diff --git a/operations/helm/tests/create-statefulset-autoscaling/grafana-agent/templates/hpa.yaml b/operations/helm/tests/create-statefulset-autoscaling/alloy/templates/hpa.yaml similarity index 77% rename from operations/helm/tests/create-statefulset-autoscaling/grafana-agent/templates/hpa.yaml rename to operations/helm/tests/create-statefulset-autoscaling/alloy/templates/hpa.yaml index a6674c612a..2dd9b01343 100644 --- a/operations/helm/tests/create-statefulset-autoscaling/grafana-agent/templates/hpa.yaml +++ b/operations/helm/tests/create-statefulset-autoscaling/alloy/templates/hpa.yaml @@ -1,20 +1,20 @@ --- -# Source: grafana-agent/templates/hpa.yaml +# Source: alloy/templates/hpa.yaml apiVersion: autoscaling/v2 kind: HorizontalPodAutoscaler metadata: - name: grafana-agent + name: alloy labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + 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: scaleTargetRef: apiVersion: apps/v1 kind: statefulset - name: grafana-agent + name: alloy minReplicas: 1 maxReplicas: 5 behavior: diff --git a/operations/helm/tests/create-statefulset-autoscaling/alloy/templates/rbac.yaml b/operations/helm/tests/create-statefulset-autoscaling/alloy/templates/rbac.yaml new file mode 100644 index 0000000000..53ca27544f --- /dev/null +++ b/operations/helm/tests/create-statefulset-autoscaling/alloy/templates/rbac.yaml @@ -0,0 +1,117 @@ +--- +# Source: alloy/templates/rbac.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: 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 +rules: + # Rules which allow discovery.kubernetes to function. + - apiGroups: + - "" + - "discovery.k8s.io" + - "networking.k8s.io" + resources: + - endpoints + - endpointslices + - ingresses + - nodes + - nodes/proxy + - nodes/metrics + - pods + - services + verbs: + - get + - list + - watch + # Rules which allow loki.source.kubernetes and loki.source.podlogs to work. + - apiGroups: + - "" + resources: + - pods + - pods/log + - namespaces + verbs: + - get + - list + - watch + - apiGroups: + - "monitoring.grafana.com" + resources: + - podlogs + verbs: + - get + - list + - watch + # Rules which allow mimir.rules.kubernetes to work. + - apiGroups: ["monitoring.coreos.com"] + resources: + - prometheusrules + verbs: + - get + - list + - watch + - nonResourceURLs: + - /metrics + verbs: + - get + # Rules for prometheus.kubernetes.* + - apiGroups: ["monitoring.coreos.com"] + resources: + - podmonitors + - servicemonitors + - probes + verbs: + - get + - list + - watch + # Rules which allow eventhandler to work. + - apiGroups: + - "" + resources: + - events + verbs: + - get + - list + - watch + # needed for remote.kubernetes.* + - apiGroups: [""] + resources: + - "configmaps" + - "secrets" + verbs: + - get + - list + - watch + # needed for otelcol.processor.k8sattributes + - apiGroups: ["apps"] + resources: ["replicasets"] + verbs: ["get", "list", "watch"] + - apiGroups: ["extensions"] + resources: ["replicasets"] + verbs: ["get", "list", "watch"] +--- +# Source: alloy/templates/rbac.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: 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 +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: alloy +subjects: + - kind: ServiceAccount + name: alloy + namespace: default diff --git a/operations/helm/tests/create-statefulset-autoscaling/alloy/templates/service.yaml b/operations/helm/tests/create-statefulset-autoscaling/alloy/templates/service.yaml new file mode 100644 index 0000000000..34c0608fd3 --- /dev/null +++ b/operations/helm/tests/create-statefulset-autoscaling/alloy/templates/service.yaml @@ -0,0 +1,23 @@ +--- +# Source: alloy/templates/service.yaml +apiVersion: v1 +kind: Service +metadata: + name: 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: + type: ClusterIP + selector: + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy + internalTrafficPolicy: Cluster + ports: + - name: http-metrics + port: 80 + targetPort: 80 + protocol: "TCP" diff --git a/operations/helm/tests/create-statefulset-autoscaling/alloy/templates/serviceaccount.yaml b/operations/helm/tests/create-statefulset-autoscaling/alloy/templates/serviceaccount.yaml new file mode 100644 index 0000000000..46df991efb --- /dev/null +++ b/operations/helm/tests/create-statefulset-autoscaling/alloy/templates/serviceaccount.yaml @@ -0,0 +1,13 @@ +--- +# Source: alloy/templates/serviceaccount.yaml +apiVersion: v1 +kind: ServiceAccount +metadata: + name: alloy + namespace: default + 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 diff --git a/operations/helm/tests/create-statefulset-autoscaling/grafana-agent/templates/configmap.yaml b/operations/helm/tests/create-statefulset-autoscaling/grafana-agent/templates/configmap.yaml deleted file mode 100644 index 2fdc6f0117..0000000000 --- a/operations/helm/tests/create-statefulset-autoscaling/grafana-agent/templates/configmap.yaml +++ /dev/null @@ -1,42 +0,0 @@ ---- -# Source: grafana-agent/templates/configmap.yaml -apiVersion: v1 -kind: ConfigMap -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -data: - config.river: |- - logging { - level = "info" - format = "logfmt" - } - - discovery.kubernetes "pods" { - role = "pod" - } - - discovery.kubernetes "nodes" { - role = "node" - } - - discovery.kubernetes "services" { - role = "service" - } - - discovery.kubernetes "endpoints" { - role = "endpoints" - } - - discovery.kubernetes "endpointslices" { - role = "endpointslice" - } - - discovery.kubernetes "ingresses" { - role = "ingress" - } diff --git a/operations/helm/tests/create-statefulset-autoscaling/grafana-agent/templates/rbac.yaml b/operations/helm/tests/create-statefulset-autoscaling/grafana-agent/templates/rbac.yaml deleted file mode 100644 index 3765583fb6..0000000000 --- a/operations/helm/tests/create-statefulset-autoscaling/grafana-agent/templates/rbac.yaml +++ /dev/null @@ -1,117 +0,0 @@ ---- -# Source: grafana-agent/templates/rbac.yaml -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -rules: - # Rules which allow discovery.kubernetes to function. - - apiGroups: - - "" - - "discovery.k8s.io" - - "networking.k8s.io" - resources: - - endpoints - - endpointslices - - ingresses - - nodes - - nodes/proxy - - nodes/metrics - - pods - - services - verbs: - - get - - list - - watch - # Rules which allow loki.source.kubernetes and loki.source.podlogs to work. - - apiGroups: - - "" - resources: - - pods - - pods/log - - namespaces - verbs: - - get - - list - - watch - - apiGroups: - - "monitoring.grafana.com" - resources: - - podlogs - verbs: - - get - - list - - watch - # Rules which allow mimir.rules.kubernetes to work. - - apiGroups: ["monitoring.coreos.com"] - resources: - - prometheusrules - verbs: - - get - - list - - watch - - nonResourceURLs: - - /metrics - verbs: - - get - # Rules for prometheus.kubernetes.* - - apiGroups: ["monitoring.coreos.com"] - resources: - - podmonitors - - servicemonitors - - probes - verbs: - - get - - list - - watch - # Rules which allow eventhandler to work. - - apiGroups: - - "" - resources: - - events - verbs: - - get - - list - - watch - # needed for remote.kubernetes.* - - apiGroups: [""] - resources: - - "configmaps" - - "secrets" - verbs: - - get - - list - - watch - # needed for otelcol.processor.k8sattributes - - apiGroups: ["apps"] - resources: ["replicasets"] - verbs: ["get", "list", "watch"] - - apiGroups: ["extensions"] - resources: ["replicasets"] - verbs: ["get", "list", "watch"] ---- -# Source: grafana-agent/templates/rbac.yaml -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: grafana-agent -subjects: - - kind: ServiceAccount - name: grafana-agent - namespace: default diff --git a/operations/helm/tests/create-statefulset-autoscaling/grafana-agent/templates/service.yaml b/operations/helm/tests/create-statefulset-autoscaling/grafana-agent/templates/service.yaml deleted file mode 100644 index c98f79428b..0000000000 --- a/operations/helm/tests/create-statefulset-autoscaling/grafana-agent/templates/service.yaml +++ /dev/null @@ -1,23 +0,0 @@ ---- -# Source: grafana-agent/templates/service.yaml -apiVersion: v1 -kind: Service -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -spec: - type: ClusterIP - selector: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - internalTrafficPolicy: Cluster - ports: - - name: http-metrics - port: 80 - targetPort: 80 - protocol: "TCP" diff --git a/operations/helm/tests/create-statefulset-autoscaling/grafana-agent/templates/serviceaccount.yaml b/operations/helm/tests/create-statefulset-autoscaling/grafana-agent/templates/serviceaccount.yaml deleted file mode 100644 index 65d7e0df38..0000000000 --- a/operations/helm/tests/create-statefulset-autoscaling/grafana-agent/templates/serviceaccount.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# Source: grafana-agent/templates/serviceaccount.yaml -apiVersion: v1 -kind: ServiceAccount -metadata: - name: grafana-agent - namespace: default - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm diff --git a/operations/helm/tests/create-statefulset/alloy/templates/configmap.yaml b/operations/helm/tests/create-statefulset/alloy/templates/configmap.yaml new file mode 100644 index 0000000000..c9ae77aa1e --- /dev/null +++ b/operations/helm/tests/create-statefulset/alloy/templates/configmap.yaml @@ -0,0 +1,42 @@ +--- +# Source: alloy/templates/configmap.yaml +apiVersion: v1 +kind: ConfigMap +metadata: + name: 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 +data: + config.river: |- + logging { + level = "info" + format = "logfmt" + } + + discovery.kubernetes "pods" { + role = "pod" + } + + discovery.kubernetes "nodes" { + role = "node" + } + + discovery.kubernetes "services" { + role = "service" + } + + discovery.kubernetes "endpoints" { + role = "endpoints" + } + + discovery.kubernetes "endpointslices" { + role = "endpointslice" + } + + discovery.kubernetes "ingresses" { + role = "ingress" + } diff --git a/operations/helm/tests/create-statefulset/grafana-agent/templates/controllers/statefulset.yaml b/operations/helm/tests/create-statefulset/alloy/templates/controllers/statefulset.yaml similarity index 77% rename from operations/helm/tests/create-statefulset/grafana-agent/templates/controllers/statefulset.yaml rename to operations/helm/tests/create-statefulset/alloy/templates/controllers/statefulset.yaml index 823bd087b6..1ee176d9d9 100644 --- a/operations/helm/tests/create-statefulset/grafana-agent/templates/controllers/statefulset.yaml +++ b/operations/helm/tests/create-statefulset/alloy/templates/controllers/statefulset.yaml @@ -1,33 +1,33 @@ --- -# Source: grafana-agent/templates/controllers/statefulset.yaml +# Source: alloy/templates/controllers/statefulset.yaml apiVersion: apps/v1 kind: StatefulSet metadata: - name: grafana-agent + name: alloy labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + 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: replicas: 1 podManagementPolicy: Parallel minReadySeconds: 10 - serviceName: grafana-agent + serviceName: alloy selector: matchLabels: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy template: metadata: annotations: kubectl.kubernetes.io/default-container: alloy labels: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy spec: - serviceAccountName: grafana-agent + serviceAccountName: alloy containers: - name: alloy image: docker.io/grafana/alloy:v0.40.2 @@ -74,4 +74,4 @@ spec: volumes: - name: config configMap: - name: grafana-agent + name: alloy diff --git a/operations/helm/tests/create-statefulset/alloy/templates/rbac.yaml b/operations/helm/tests/create-statefulset/alloy/templates/rbac.yaml new file mode 100644 index 0000000000..53ca27544f --- /dev/null +++ b/operations/helm/tests/create-statefulset/alloy/templates/rbac.yaml @@ -0,0 +1,117 @@ +--- +# Source: alloy/templates/rbac.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: 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 +rules: + # Rules which allow discovery.kubernetes to function. + - apiGroups: + - "" + - "discovery.k8s.io" + - "networking.k8s.io" + resources: + - endpoints + - endpointslices + - ingresses + - nodes + - nodes/proxy + - nodes/metrics + - pods + - services + verbs: + - get + - list + - watch + # Rules which allow loki.source.kubernetes and loki.source.podlogs to work. + - apiGroups: + - "" + resources: + - pods + - pods/log + - namespaces + verbs: + - get + - list + - watch + - apiGroups: + - "monitoring.grafana.com" + resources: + - podlogs + verbs: + - get + - list + - watch + # Rules which allow mimir.rules.kubernetes to work. + - apiGroups: ["monitoring.coreos.com"] + resources: + - prometheusrules + verbs: + - get + - list + - watch + - nonResourceURLs: + - /metrics + verbs: + - get + # Rules for prometheus.kubernetes.* + - apiGroups: ["monitoring.coreos.com"] + resources: + - podmonitors + - servicemonitors + - probes + verbs: + - get + - list + - watch + # Rules which allow eventhandler to work. + - apiGroups: + - "" + resources: + - events + verbs: + - get + - list + - watch + # needed for remote.kubernetes.* + - apiGroups: [""] + resources: + - "configmaps" + - "secrets" + verbs: + - get + - list + - watch + # needed for otelcol.processor.k8sattributes + - apiGroups: ["apps"] + resources: ["replicasets"] + verbs: ["get", "list", "watch"] + - apiGroups: ["extensions"] + resources: ["replicasets"] + verbs: ["get", "list", "watch"] +--- +# Source: alloy/templates/rbac.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: 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 +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: alloy +subjects: + - kind: ServiceAccount + name: alloy + namespace: default diff --git a/operations/helm/tests/create-statefulset/alloy/templates/service.yaml b/operations/helm/tests/create-statefulset/alloy/templates/service.yaml new file mode 100644 index 0000000000..34c0608fd3 --- /dev/null +++ b/operations/helm/tests/create-statefulset/alloy/templates/service.yaml @@ -0,0 +1,23 @@ +--- +# Source: alloy/templates/service.yaml +apiVersion: v1 +kind: Service +metadata: + name: 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: + type: ClusterIP + selector: + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy + internalTrafficPolicy: Cluster + ports: + - name: http-metrics + port: 80 + targetPort: 80 + protocol: "TCP" diff --git a/operations/helm/tests/create-statefulset/alloy/templates/serviceaccount.yaml b/operations/helm/tests/create-statefulset/alloy/templates/serviceaccount.yaml new file mode 100644 index 0000000000..46df991efb --- /dev/null +++ b/operations/helm/tests/create-statefulset/alloy/templates/serviceaccount.yaml @@ -0,0 +1,13 @@ +--- +# Source: alloy/templates/serviceaccount.yaml +apiVersion: v1 +kind: ServiceAccount +metadata: + name: alloy + namespace: default + 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 diff --git a/operations/helm/tests/create-statefulset/grafana-agent/templates/configmap.yaml b/operations/helm/tests/create-statefulset/grafana-agent/templates/configmap.yaml deleted file mode 100644 index 2fdc6f0117..0000000000 --- a/operations/helm/tests/create-statefulset/grafana-agent/templates/configmap.yaml +++ /dev/null @@ -1,42 +0,0 @@ ---- -# Source: grafana-agent/templates/configmap.yaml -apiVersion: v1 -kind: ConfigMap -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -data: - config.river: |- - logging { - level = "info" - format = "logfmt" - } - - discovery.kubernetes "pods" { - role = "pod" - } - - discovery.kubernetes "nodes" { - role = "node" - } - - discovery.kubernetes "services" { - role = "service" - } - - discovery.kubernetes "endpoints" { - role = "endpoints" - } - - discovery.kubernetes "endpointslices" { - role = "endpointslice" - } - - discovery.kubernetes "ingresses" { - role = "ingress" - } diff --git a/operations/helm/tests/create-statefulset/grafana-agent/templates/rbac.yaml b/operations/helm/tests/create-statefulset/grafana-agent/templates/rbac.yaml deleted file mode 100644 index 3765583fb6..0000000000 --- a/operations/helm/tests/create-statefulset/grafana-agent/templates/rbac.yaml +++ /dev/null @@ -1,117 +0,0 @@ ---- -# Source: grafana-agent/templates/rbac.yaml -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -rules: - # Rules which allow discovery.kubernetes to function. - - apiGroups: - - "" - - "discovery.k8s.io" - - "networking.k8s.io" - resources: - - endpoints - - endpointslices - - ingresses - - nodes - - nodes/proxy - - nodes/metrics - - pods - - services - verbs: - - get - - list - - watch - # Rules which allow loki.source.kubernetes and loki.source.podlogs to work. - - apiGroups: - - "" - resources: - - pods - - pods/log - - namespaces - verbs: - - get - - list - - watch - - apiGroups: - - "monitoring.grafana.com" - resources: - - podlogs - verbs: - - get - - list - - watch - # Rules which allow mimir.rules.kubernetes to work. - - apiGroups: ["monitoring.coreos.com"] - resources: - - prometheusrules - verbs: - - get - - list - - watch - - nonResourceURLs: - - /metrics - verbs: - - get - # Rules for prometheus.kubernetes.* - - apiGroups: ["monitoring.coreos.com"] - resources: - - podmonitors - - servicemonitors - - probes - verbs: - - get - - list - - watch - # Rules which allow eventhandler to work. - - apiGroups: - - "" - resources: - - events - verbs: - - get - - list - - watch - # needed for remote.kubernetes.* - - apiGroups: [""] - resources: - - "configmaps" - - "secrets" - verbs: - - get - - list - - watch - # needed for otelcol.processor.k8sattributes - - apiGroups: ["apps"] - resources: ["replicasets"] - verbs: ["get", "list", "watch"] - - apiGroups: ["extensions"] - resources: ["replicasets"] - verbs: ["get", "list", "watch"] ---- -# Source: grafana-agent/templates/rbac.yaml -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: grafana-agent -subjects: - - kind: ServiceAccount - name: grafana-agent - namespace: default diff --git a/operations/helm/tests/create-statefulset/grafana-agent/templates/service.yaml b/operations/helm/tests/create-statefulset/grafana-agent/templates/service.yaml deleted file mode 100644 index c98f79428b..0000000000 --- a/operations/helm/tests/create-statefulset/grafana-agent/templates/service.yaml +++ /dev/null @@ -1,23 +0,0 @@ ---- -# Source: grafana-agent/templates/service.yaml -apiVersion: v1 -kind: Service -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -spec: - type: ClusterIP - selector: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - internalTrafficPolicy: Cluster - ports: - - name: http-metrics - port: 80 - targetPort: 80 - protocol: "TCP" diff --git a/operations/helm/tests/create-statefulset/grafana-agent/templates/serviceaccount.yaml b/operations/helm/tests/create-statefulset/grafana-agent/templates/serviceaccount.yaml deleted file mode 100644 index 65d7e0df38..0000000000 --- a/operations/helm/tests/create-statefulset/grafana-agent/templates/serviceaccount.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# Source: grafana-agent/templates/serviceaccount.yaml -apiVersion: v1 -kind: ServiceAccount -metadata: - name: grafana-agent - namespace: default - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm diff --git a/operations/helm/tests/custom-config/grafana-agent/templates/configmap.yaml b/operations/helm/tests/custom-config/alloy/templates/configmap.yaml similarity index 60% rename from operations/helm/tests/custom-config/grafana-agent/templates/configmap.yaml rename to operations/helm/tests/custom-config/alloy/templates/configmap.yaml index 1b7aeff62f..17d19ad116 100644 --- a/operations/helm/tests/custom-config/grafana-agent/templates/configmap.yaml +++ b/operations/helm/tests/custom-config/alloy/templates/configmap.yaml @@ -1,13 +1,13 @@ --- -# Source: grafana-agent/templates/configmap.yaml +# Source: alloy/templates/configmap.yaml apiVersion: v1 kind: ConfigMap metadata: - name: grafana-agent + name: alloy labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + 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 data: diff --git a/operations/helm/tests/default-values/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/custom-config/alloy/templates/controllers/daemonset.yaml similarity index 78% rename from operations/helm/tests/default-values/grafana-agent/templates/controllers/daemonset.yaml rename to operations/helm/tests/custom-config/alloy/templates/controllers/daemonset.yaml index 97d9cbfb9b..fdd2df0969 100644 --- a/operations/helm/tests/default-values/grafana-agent/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/custom-config/alloy/templates/controllers/daemonset.yaml @@ -1,30 +1,30 @@ --- -# Source: grafana-agent/templates/controllers/daemonset.yaml +# Source: alloy/templates/controllers/daemonset.yaml apiVersion: apps/v1 kind: DaemonSet metadata: - name: grafana-agent + name: alloy labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + 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: minReadySeconds: 10 selector: matchLabels: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy template: metadata: annotations: kubectl.kubernetes.io/default-container: alloy labels: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy spec: - serviceAccountName: grafana-agent + serviceAccountName: alloy containers: - name: alloy image: docker.io/grafana/alloy:v0.40.2 @@ -71,4 +71,4 @@ spec: volumes: - name: config configMap: - name: grafana-agent + name: alloy diff --git a/operations/helm/tests/custom-config/alloy/templates/rbac.yaml b/operations/helm/tests/custom-config/alloy/templates/rbac.yaml new file mode 100644 index 0000000000..53ca27544f --- /dev/null +++ b/operations/helm/tests/custom-config/alloy/templates/rbac.yaml @@ -0,0 +1,117 @@ +--- +# Source: alloy/templates/rbac.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: 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 +rules: + # Rules which allow discovery.kubernetes to function. + - apiGroups: + - "" + - "discovery.k8s.io" + - "networking.k8s.io" + resources: + - endpoints + - endpointslices + - ingresses + - nodes + - nodes/proxy + - nodes/metrics + - pods + - services + verbs: + - get + - list + - watch + # Rules which allow loki.source.kubernetes and loki.source.podlogs to work. + - apiGroups: + - "" + resources: + - pods + - pods/log + - namespaces + verbs: + - get + - list + - watch + - apiGroups: + - "monitoring.grafana.com" + resources: + - podlogs + verbs: + - get + - list + - watch + # Rules which allow mimir.rules.kubernetes to work. + - apiGroups: ["monitoring.coreos.com"] + resources: + - prometheusrules + verbs: + - get + - list + - watch + - nonResourceURLs: + - /metrics + verbs: + - get + # Rules for prometheus.kubernetes.* + - apiGroups: ["monitoring.coreos.com"] + resources: + - podmonitors + - servicemonitors + - probes + verbs: + - get + - list + - watch + # Rules which allow eventhandler to work. + - apiGroups: + - "" + resources: + - events + verbs: + - get + - list + - watch + # needed for remote.kubernetes.* + - apiGroups: [""] + resources: + - "configmaps" + - "secrets" + verbs: + - get + - list + - watch + # needed for otelcol.processor.k8sattributes + - apiGroups: ["apps"] + resources: ["replicasets"] + verbs: ["get", "list", "watch"] + - apiGroups: ["extensions"] + resources: ["replicasets"] + verbs: ["get", "list", "watch"] +--- +# Source: alloy/templates/rbac.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: 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 +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: alloy +subjects: + - kind: ServiceAccount + name: alloy + namespace: default diff --git a/operations/helm/tests/custom-config/alloy/templates/service.yaml b/operations/helm/tests/custom-config/alloy/templates/service.yaml new file mode 100644 index 0000000000..34c0608fd3 --- /dev/null +++ b/operations/helm/tests/custom-config/alloy/templates/service.yaml @@ -0,0 +1,23 @@ +--- +# Source: alloy/templates/service.yaml +apiVersion: v1 +kind: Service +metadata: + name: 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: + type: ClusterIP + selector: + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy + internalTrafficPolicy: Cluster + ports: + - name: http-metrics + port: 80 + targetPort: 80 + protocol: "TCP" diff --git a/operations/helm/tests/custom-config/alloy/templates/serviceaccount.yaml b/operations/helm/tests/custom-config/alloy/templates/serviceaccount.yaml new file mode 100644 index 0000000000..46df991efb --- /dev/null +++ b/operations/helm/tests/custom-config/alloy/templates/serviceaccount.yaml @@ -0,0 +1,13 @@ +--- +# Source: alloy/templates/serviceaccount.yaml +apiVersion: v1 +kind: ServiceAccount +metadata: + name: alloy + namespace: default + 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 diff --git a/operations/helm/tests/custom-config/grafana-agent/templates/rbac.yaml b/operations/helm/tests/custom-config/grafana-agent/templates/rbac.yaml deleted file mode 100644 index 3765583fb6..0000000000 --- a/operations/helm/tests/custom-config/grafana-agent/templates/rbac.yaml +++ /dev/null @@ -1,117 +0,0 @@ ---- -# Source: grafana-agent/templates/rbac.yaml -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -rules: - # Rules which allow discovery.kubernetes to function. - - apiGroups: - - "" - - "discovery.k8s.io" - - "networking.k8s.io" - resources: - - endpoints - - endpointslices - - ingresses - - nodes - - nodes/proxy - - nodes/metrics - - pods - - services - verbs: - - get - - list - - watch - # Rules which allow loki.source.kubernetes and loki.source.podlogs to work. - - apiGroups: - - "" - resources: - - pods - - pods/log - - namespaces - verbs: - - get - - list - - watch - - apiGroups: - - "monitoring.grafana.com" - resources: - - podlogs - verbs: - - get - - list - - watch - # Rules which allow mimir.rules.kubernetes to work. - - apiGroups: ["monitoring.coreos.com"] - resources: - - prometheusrules - verbs: - - get - - list - - watch - - nonResourceURLs: - - /metrics - verbs: - - get - # Rules for prometheus.kubernetes.* - - apiGroups: ["monitoring.coreos.com"] - resources: - - podmonitors - - servicemonitors - - probes - verbs: - - get - - list - - watch - # Rules which allow eventhandler to work. - - apiGroups: - - "" - resources: - - events - verbs: - - get - - list - - watch - # needed for remote.kubernetes.* - - apiGroups: [""] - resources: - - "configmaps" - - "secrets" - verbs: - - get - - list - - watch - # needed for otelcol.processor.k8sattributes - - apiGroups: ["apps"] - resources: ["replicasets"] - verbs: ["get", "list", "watch"] - - apiGroups: ["extensions"] - resources: ["replicasets"] - verbs: ["get", "list", "watch"] ---- -# Source: grafana-agent/templates/rbac.yaml -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: grafana-agent -subjects: - - kind: ServiceAccount - name: grafana-agent - namespace: default diff --git a/operations/helm/tests/custom-config/grafana-agent/templates/service.yaml b/operations/helm/tests/custom-config/grafana-agent/templates/service.yaml deleted file mode 100644 index c98f79428b..0000000000 --- a/operations/helm/tests/custom-config/grafana-agent/templates/service.yaml +++ /dev/null @@ -1,23 +0,0 @@ ---- -# Source: grafana-agent/templates/service.yaml -apiVersion: v1 -kind: Service -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -spec: - type: ClusterIP - selector: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - internalTrafficPolicy: Cluster - ports: - - name: http-metrics - port: 80 - targetPort: 80 - protocol: "TCP" diff --git a/operations/helm/tests/custom-config/grafana-agent/templates/serviceaccount.yaml b/operations/helm/tests/custom-config/grafana-agent/templates/serviceaccount.yaml deleted file mode 100644 index 65d7e0df38..0000000000 --- a/operations/helm/tests/custom-config/grafana-agent/templates/serviceaccount.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# Source: grafana-agent/templates/serviceaccount.yaml -apiVersion: v1 -kind: ServiceAccount -metadata: - name: grafana-agent - namespace: default - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm diff --git a/operations/helm/tests/default-values/alloy/templates/configmap.yaml b/operations/helm/tests/default-values/alloy/templates/configmap.yaml new file mode 100644 index 0000000000..c9ae77aa1e --- /dev/null +++ b/operations/helm/tests/default-values/alloy/templates/configmap.yaml @@ -0,0 +1,42 @@ +--- +# Source: alloy/templates/configmap.yaml +apiVersion: v1 +kind: ConfigMap +metadata: + name: 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 +data: + config.river: |- + logging { + level = "info" + format = "logfmt" + } + + discovery.kubernetes "pods" { + role = "pod" + } + + discovery.kubernetes "nodes" { + role = "node" + } + + discovery.kubernetes "services" { + role = "service" + } + + discovery.kubernetes "endpoints" { + role = "endpoints" + } + + discovery.kubernetes "endpointslices" { + role = "endpointslice" + } + + discovery.kubernetes "ingresses" { + role = "ingress" + } diff --git a/operations/helm/tests/custom-config/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/default-values/alloy/templates/controllers/daemonset.yaml similarity index 78% rename from operations/helm/tests/custom-config/grafana-agent/templates/controllers/daemonset.yaml rename to operations/helm/tests/default-values/alloy/templates/controllers/daemonset.yaml index 97d9cbfb9b..fdd2df0969 100644 --- a/operations/helm/tests/custom-config/grafana-agent/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/default-values/alloy/templates/controllers/daemonset.yaml @@ -1,30 +1,30 @@ --- -# Source: grafana-agent/templates/controllers/daemonset.yaml +# Source: alloy/templates/controllers/daemonset.yaml apiVersion: apps/v1 kind: DaemonSet metadata: - name: grafana-agent + name: alloy labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + 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: minReadySeconds: 10 selector: matchLabels: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy template: metadata: annotations: kubectl.kubernetes.io/default-container: alloy labels: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy spec: - serviceAccountName: grafana-agent + serviceAccountName: alloy containers: - name: alloy image: docker.io/grafana/alloy:v0.40.2 @@ -71,4 +71,4 @@ spec: volumes: - name: config configMap: - name: grafana-agent + name: alloy diff --git a/operations/helm/tests/default-values/alloy/templates/rbac.yaml b/operations/helm/tests/default-values/alloy/templates/rbac.yaml new file mode 100644 index 0000000000..53ca27544f --- /dev/null +++ b/operations/helm/tests/default-values/alloy/templates/rbac.yaml @@ -0,0 +1,117 @@ +--- +# Source: alloy/templates/rbac.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: 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 +rules: + # Rules which allow discovery.kubernetes to function. + - apiGroups: + - "" + - "discovery.k8s.io" + - "networking.k8s.io" + resources: + - endpoints + - endpointslices + - ingresses + - nodes + - nodes/proxy + - nodes/metrics + - pods + - services + verbs: + - get + - list + - watch + # Rules which allow loki.source.kubernetes and loki.source.podlogs to work. + - apiGroups: + - "" + resources: + - pods + - pods/log + - namespaces + verbs: + - get + - list + - watch + - apiGroups: + - "monitoring.grafana.com" + resources: + - podlogs + verbs: + - get + - list + - watch + # Rules which allow mimir.rules.kubernetes to work. + - apiGroups: ["monitoring.coreos.com"] + resources: + - prometheusrules + verbs: + - get + - list + - watch + - nonResourceURLs: + - /metrics + verbs: + - get + # Rules for prometheus.kubernetes.* + - apiGroups: ["monitoring.coreos.com"] + resources: + - podmonitors + - servicemonitors + - probes + verbs: + - get + - list + - watch + # Rules which allow eventhandler to work. + - apiGroups: + - "" + resources: + - events + verbs: + - get + - list + - watch + # needed for remote.kubernetes.* + - apiGroups: [""] + resources: + - "configmaps" + - "secrets" + verbs: + - get + - list + - watch + # needed for otelcol.processor.k8sattributes + - apiGroups: ["apps"] + resources: ["replicasets"] + verbs: ["get", "list", "watch"] + - apiGroups: ["extensions"] + resources: ["replicasets"] + verbs: ["get", "list", "watch"] +--- +# Source: alloy/templates/rbac.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: 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 +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: alloy +subjects: + - kind: ServiceAccount + name: alloy + namespace: default diff --git a/operations/helm/tests/default-values/alloy/templates/service.yaml b/operations/helm/tests/default-values/alloy/templates/service.yaml new file mode 100644 index 0000000000..34c0608fd3 --- /dev/null +++ b/operations/helm/tests/default-values/alloy/templates/service.yaml @@ -0,0 +1,23 @@ +--- +# Source: alloy/templates/service.yaml +apiVersion: v1 +kind: Service +metadata: + name: 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: + type: ClusterIP + selector: + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy + internalTrafficPolicy: Cluster + ports: + - name: http-metrics + port: 80 + targetPort: 80 + protocol: "TCP" diff --git a/operations/helm/tests/default-values/alloy/templates/serviceaccount.yaml b/operations/helm/tests/default-values/alloy/templates/serviceaccount.yaml new file mode 100644 index 0000000000..46df991efb --- /dev/null +++ b/operations/helm/tests/default-values/alloy/templates/serviceaccount.yaml @@ -0,0 +1,13 @@ +--- +# Source: alloy/templates/serviceaccount.yaml +apiVersion: v1 +kind: ServiceAccount +metadata: + name: alloy + namespace: default + 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 diff --git a/operations/helm/tests/default-values/grafana-agent/templates/configmap.yaml b/operations/helm/tests/default-values/grafana-agent/templates/configmap.yaml deleted file mode 100644 index 2fdc6f0117..0000000000 --- a/operations/helm/tests/default-values/grafana-agent/templates/configmap.yaml +++ /dev/null @@ -1,42 +0,0 @@ ---- -# Source: grafana-agent/templates/configmap.yaml -apiVersion: v1 -kind: ConfigMap -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -data: - config.river: |- - logging { - level = "info" - format = "logfmt" - } - - discovery.kubernetes "pods" { - role = "pod" - } - - discovery.kubernetes "nodes" { - role = "node" - } - - discovery.kubernetes "services" { - role = "service" - } - - discovery.kubernetes "endpoints" { - role = "endpoints" - } - - discovery.kubernetes "endpointslices" { - role = "endpointslice" - } - - discovery.kubernetes "ingresses" { - role = "ingress" - } diff --git a/operations/helm/tests/default-values/grafana-agent/templates/rbac.yaml b/operations/helm/tests/default-values/grafana-agent/templates/rbac.yaml deleted file mode 100644 index 3765583fb6..0000000000 --- a/operations/helm/tests/default-values/grafana-agent/templates/rbac.yaml +++ /dev/null @@ -1,117 +0,0 @@ ---- -# Source: grafana-agent/templates/rbac.yaml -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -rules: - # Rules which allow discovery.kubernetes to function. - - apiGroups: - - "" - - "discovery.k8s.io" - - "networking.k8s.io" - resources: - - endpoints - - endpointslices - - ingresses - - nodes - - nodes/proxy - - nodes/metrics - - pods - - services - verbs: - - get - - list - - watch - # Rules which allow loki.source.kubernetes and loki.source.podlogs to work. - - apiGroups: - - "" - resources: - - pods - - pods/log - - namespaces - verbs: - - get - - list - - watch - - apiGroups: - - "monitoring.grafana.com" - resources: - - podlogs - verbs: - - get - - list - - watch - # Rules which allow mimir.rules.kubernetes to work. - - apiGroups: ["monitoring.coreos.com"] - resources: - - prometheusrules - verbs: - - get - - list - - watch - - nonResourceURLs: - - /metrics - verbs: - - get - # Rules for prometheus.kubernetes.* - - apiGroups: ["monitoring.coreos.com"] - resources: - - podmonitors - - servicemonitors - - probes - verbs: - - get - - list - - watch - # Rules which allow eventhandler to work. - - apiGroups: - - "" - resources: - - events - verbs: - - get - - list - - watch - # needed for remote.kubernetes.* - - apiGroups: [""] - resources: - - "configmaps" - - "secrets" - verbs: - - get - - list - - watch - # needed for otelcol.processor.k8sattributes - - apiGroups: ["apps"] - resources: ["replicasets"] - verbs: ["get", "list", "watch"] - - apiGroups: ["extensions"] - resources: ["replicasets"] - verbs: ["get", "list", "watch"] ---- -# Source: grafana-agent/templates/rbac.yaml -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: grafana-agent -subjects: - - kind: ServiceAccount - name: grafana-agent - namespace: default diff --git a/operations/helm/tests/default-values/grafana-agent/templates/service.yaml b/operations/helm/tests/default-values/grafana-agent/templates/service.yaml deleted file mode 100644 index c98f79428b..0000000000 --- a/operations/helm/tests/default-values/grafana-agent/templates/service.yaml +++ /dev/null @@ -1,23 +0,0 @@ ---- -# Source: grafana-agent/templates/service.yaml -apiVersion: v1 -kind: Service -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -spec: - type: ClusterIP - selector: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - internalTrafficPolicy: Cluster - ports: - - name: http-metrics - port: 80 - targetPort: 80 - protocol: "TCP" diff --git a/operations/helm/tests/default-values/grafana-agent/templates/serviceaccount.yaml b/operations/helm/tests/default-values/grafana-agent/templates/serviceaccount.yaml deleted file mode 100644 index 65d7e0df38..0000000000 --- a/operations/helm/tests/default-values/grafana-agent/templates/serviceaccount.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# Source: grafana-agent/templates/serviceaccount.yaml -apiVersion: v1 -kind: ServiceAccount -metadata: - name: grafana-agent - namespace: default - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm diff --git a/operations/helm/tests/enable-servicemonitor-tls/alloy/templates/configmap.yaml b/operations/helm/tests/enable-servicemonitor-tls/alloy/templates/configmap.yaml new file mode 100644 index 0000000000..c9ae77aa1e --- /dev/null +++ b/operations/helm/tests/enable-servicemonitor-tls/alloy/templates/configmap.yaml @@ -0,0 +1,42 @@ +--- +# Source: alloy/templates/configmap.yaml +apiVersion: v1 +kind: ConfigMap +metadata: + name: 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 +data: + config.river: |- + logging { + level = "info" + format = "logfmt" + } + + discovery.kubernetes "pods" { + role = "pod" + } + + discovery.kubernetes "nodes" { + role = "node" + } + + discovery.kubernetes "services" { + role = "service" + } + + discovery.kubernetes "endpoints" { + role = "endpoints" + } + + discovery.kubernetes "endpointslices" { + role = "endpointslice" + } + + discovery.kubernetes "ingresses" { + role = "ingress" + } diff --git a/operations/helm/tests/enable-servicemonitor-tls/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/enable-servicemonitor-tls/alloy/templates/controllers/daemonset.yaml similarity index 78% rename from operations/helm/tests/enable-servicemonitor-tls/grafana-agent/templates/controllers/daemonset.yaml rename to operations/helm/tests/enable-servicemonitor-tls/alloy/templates/controllers/daemonset.yaml index 10c6c433d7..72fc14e915 100644 --- a/operations/helm/tests/enable-servicemonitor-tls/grafana-agent/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/enable-servicemonitor-tls/alloy/templates/controllers/daemonset.yaml @@ -1,30 +1,30 @@ --- -# Source: grafana-agent/templates/controllers/daemonset.yaml +# Source: alloy/templates/controllers/daemonset.yaml apiVersion: apps/v1 kind: DaemonSet metadata: - name: grafana-agent + name: alloy labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + 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: minReadySeconds: 10 selector: matchLabels: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy template: metadata: annotations: kubectl.kubernetes.io/default-container: alloy labels: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy spec: - serviceAccountName: grafana-agent + serviceAccountName: alloy containers: - name: alloy image: docker.io/grafana/alloy:v0.40.2 @@ -71,4 +71,4 @@ spec: volumes: - name: config configMap: - name: grafana-agent + name: alloy diff --git a/operations/helm/tests/enable-servicemonitor-tls/alloy/templates/rbac.yaml b/operations/helm/tests/enable-servicemonitor-tls/alloy/templates/rbac.yaml new file mode 100644 index 0000000000..53ca27544f --- /dev/null +++ b/operations/helm/tests/enable-servicemonitor-tls/alloy/templates/rbac.yaml @@ -0,0 +1,117 @@ +--- +# Source: alloy/templates/rbac.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: 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 +rules: + # Rules which allow discovery.kubernetes to function. + - apiGroups: + - "" + - "discovery.k8s.io" + - "networking.k8s.io" + resources: + - endpoints + - endpointslices + - ingresses + - nodes + - nodes/proxy + - nodes/metrics + - pods + - services + verbs: + - get + - list + - watch + # Rules which allow loki.source.kubernetes and loki.source.podlogs to work. + - apiGroups: + - "" + resources: + - pods + - pods/log + - namespaces + verbs: + - get + - list + - watch + - apiGroups: + - "monitoring.grafana.com" + resources: + - podlogs + verbs: + - get + - list + - watch + # Rules which allow mimir.rules.kubernetes to work. + - apiGroups: ["monitoring.coreos.com"] + resources: + - prometheusrules + verbs: + - get + - list + - watch + - nonResourceURLs: + - /metrics + verbs: + - get + # Rules for prometheus.kubernetes.* + - apiGroups: ["monitoring.coreos.com"] + resources: + - podmonitors + - servicemonitors + - probes + verbs: + - get + - list + - watch + # Rules which allow eventhandler to work. + - apiGroups: + - "" + resources: + - events + verbs: + - get + - list + - watch + # needed for remote.kubernetes.* + - apiGroups: [""] + resources: + - "configmaps" + - "secrets" + verbs: + - get + - list + - watch + # needed for otelcol.processor.k8sattributes + - apiGroups: ["apps"] + resources: ["replicasets"] + verbs: ["get", "list", "watch"] + - apiGroups: ["extensions"] + resources: ["replicasets"] + verbs: ["get", "list", "watch"] +--- +# Source: alloy/templates/rbac.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: 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 +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: alloy +subjects: + - kind: ServiceAccount + name: alloy + namespace: default diff --git a/operations/helm/tests/enable-servicemonitor-tls/alloy/templates/service.yaml b/operations/helm/tests/enable-servicemonitor-tls/alloy/templates/service.yaml new file mode 100644 index 0000000000..34c0608fd3 --- /dev/null +++ b/operations/helm/tests/enable-servicemonitor-tls/alloy/templates/service.yaml @@ -0,0 +1,23 @@ +--- +# Source: alloy/templates/service.yaml +apiVersion: v1 +kind: Service +metadata: + name: 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: + type: ClusterIP + selector: + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy + internalTrafficPolicy: Cluster + ports: + - name: http-metrics + port: 80 + targetPort: 80 + protocol: "TCP" diff --git a/operations/helm/tests/enable-servicemonitor-tls/alloy/templates/serviceaccount.yaml b/operations/helm/tests/enable-servicemonitor-tls/alloy/templates/serviceaccount.yaml new file mode 100644 index 0000000000..46df991efb --- /dev/null +++ b/operations/helm/tests/enable-servicemonitor-tls/alloy/templates/serviceaccount.yaml @@ -0,0 +1,13 @@ +--- +# Source: alloy/templates/serviceaccount.yaml +apiVersion: v1 +kind: ServiceAccount +metadata: + name: alloy + namespace: default + 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 diff --git a/operations/helm/tests/enable-servicemonitor-tls/grafana-agent/templates/servicemonitor.yaml b/operations/helm/tests/enable-servicemonitor-tls/alloy/templates/servicemonitor.yaml similarity index 52% rename from operations/helm/tests/enable-servicemonitor-tls/grafana-agent/templates/servicemonitor.yaml rename to operations/helm/tests/enable-servicemonitor-tls/alloy/templates/servicemonitor.yaml index 3312cb651c..ac88625439 100644 --- a/operations/helm/tests/enable-servicemonitor-tls/grafana-agent/templates/servicemonitor.yaml +++ b/operations/helm/tests/enable-servicemonitor-tls/alloy/templates/servicemonitor.yaml @@ -1,13 +1,13 @@ --- -# Source: grafana-agent/templates/servicemonitor.yaml +# Source: alloy/templates/servicemonitor.yaml apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: - name: grafana-agent + name: alloy labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + 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: @@ -19,5 +19,5 @@ spec: insecureSkipVerify: true selector: matchLabels: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy diff --git a/operations/helm/tests/enable-servicemonitor-tls/grafana-agent/templates/configmap.yaml b/operations/helm/tests/enable-servicemonitor-tls/grafana-agent/templates/configmap.yaml deleted file mode 100644 index 2fdc6f0117..0000000000 --- a/operations/helm/tests/enable-servicemonitor-tls/grafana-agent/templates/configmap.yaml +++ /dev/null @@ -1,42 +0,0 @@ ---- -# Source: grafana-agent/templates/configmap.yaml -apiVersion: v1 -kind: ConfigMap -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -data: - config.river: |- - logging { - level = "info" - format = "logfmt" - } - - discovery.kubernetes "pods" { - role = "pod" - } - - discovery.kubernetes "nodes" { - role = "node" - } - - discovery.kubernetes "services" { - role = "service" - } - - discovery.kubernetes "endpoints" { - role = "endpoints" - } - - discovery.kubernetes "endpointslices" { - role = "endpointslice" - } - - discovery.kubernetes "ingresses" { - role = "ingress" - } diff --git a/operations/helm/tests/enable-servicemonitor-tls/grafana-agent/templates/rbac.yaml b/operations/helm/tests/enable-servicemonitor-tls/grafana-agent/templates/rbac.yaml deleted file mode 100644 index 3765583fb6..0000000000 --- a/operations/helm/tests/enable-servicemonitor-tls/grafana-agent/templates/rbac.yaml +++ /dev/null @@ -1,117 +0,0 @@ ---- -# Source: grafana-agent/templates/rbac.yaml -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -rules: - # Rules which allow discovery.kubernetes to function. - - apiGroups: - - "" - - "discovery.k8s.io" - - "networking.k8s.io" - resources: - - endpoints - - endpointslices - - ingresses - - nodes - - nodes/proxy - - nodes/metrics - - pods - - services - verbs: - - get - - list - - watch - # Rules which allow loki.source.kubernetes and loki.source.podlogs to work. - - apiGroups: - - "" - resources: - - pods - - pods/log - - namespaces - verbs: - - get - - list - - watch - - apiGroups: - - "monitoring.grafana.com" - resources: - - podlogs - verbs: - - get - - list - - watch - # Rules which allow mimir.rules.kubernetes to work. - - apiGroups: ["monitoring.coreos.com"] - resources: - - prometheusrules - verbs: - - get - - list - - watch - - nonResourceURLs: - - /metrics - verbs: - - get - # Rules for prometheus.kubernetes.* - - apiGroups: ["monitoring.coreos.com"] - resources: - - podmonitors - - servicemonitors - - probes - verbs: - - get - - list - - watch - # Rules which allow eventhandler to work. - - apiGroups: - - "" - resources: - - events - verbs: - - get - - list - - watch - # needed for remote.kubernetes.* - - apiGroups: [""] - resources: - - "configmaps" - - "secrets" - verbs: - - get - - list - - watch - # needed for otelcol.processor.k8sattributes - - apiGroups: ["apps"] - resources: ["replicasets"] - verbs: ["get", "list", "watch"] - - apiGroups: ["extensions"] - resources: ["replicasets"] - verbs: ["get", "list", "watch"] ---- -# Source: grafana-agent/templates/rbac.yaml -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: grafana-agent -subjects: - - kind: ServiceAccount - name: grafana-agent - namespace: default diff --git a/operations/helm/tests/enable-servicemonitor-tls/grafana-agent/templates/service.yaml b/operations/helm/tests/enable-servicemonitor-tls/grafana-agent/templates/service.yaml deleted file mode 100644 index c98f79428b..0000000000 --- a/operations/helm/tests/enable-servicemonitor-tls/grafana-agent/templates/service.yaml +++ /dev/null @@ -1,23 +0,0 @@ ---- -# Source: grafana-agent/templates/service.yaml -apiVersion: v1 -kind: Service -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -spec: - type: ClusterIP - selector: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - internalTrafficPolicy: Cluster - ports: - - name: http-metrics - port: 80 - targetPort: 80 - protocol: "TCP" diff --git a/operations/helm/tests/enable-servicemonitor-tls/grafana-agent/templates/serviceaccount.yaml b/operations/helm/tests/enable-servicemonitor-tls/grafana-agent/templates/serviceaccount.yaml deleted file mode 100644 index 65d7e0df38..0000000000 --- a/operations/helm/tests/enable-servicemonitor-tls/grafana-agent/templates/serviceaccount.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# Source: grafana-agent/templates/serviceaccount.yaml -apiVersion: v1 -kind: ServiceAccount -metadata: - name: grafana-agent - namespace: default - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm diff --git a/operations/helm/tests/enable-servicemonitor/alloy/templates/configmap.yaml b/operations/helm/tests/enable-servicemonitor/alloy/templates/configmap.yaml new file mode 100644 index 0000000000..c9ae77aa1e --- /dev/null +++ b/operations/helm/tests/enable-servicemonitor/alloy/templates/configmap.yaml @@ -0,0 +1,42 @@ +--- +# Source: alloy/templates/configmap.yaml +apiVersion: v1 +kind: ConfigMap +metadata: + name: 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 +data: + config.river: |- + logging { + level = "info" + format = "logfmt" + } + + discovery.kubernetes "pods" { + role = "pod" + } + + discovery.kubernetes "nodes" { + role = "node" + } + + discovery.kubernetes "services" { + role = "service" + } + + discovery.kubernetes "endpoints" { + role = "endpoints" + } + + discovery.kubernetes "endpointslices" { + role = "endpointslice" + } + + discovery.kubernetes "ingresses" { + role = "ingress" + } diff --git a/operations/helm/tests/enable-servicemonitor/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/enable-servicemonitor/alloy/templates/controllers/daemonset.yaml new file mode 100644 index 0000000000..fdd2df0969 --- /dev/null +++ b/operations/helm/tests/enable-servicemonitor/alloy/templates/controllers/daemonset.yaml @@ -0,0 +1,74 @@ +--- +# Source: alloy/templates/controllers/daemonset.yaml +apiVersion: apps/v1 +kind: DaemonSet +metadata: + name: 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: + minReadySeconds: 10 + selector: + matchLabels: + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy + template: + metadata: + annotations: + kubectl.kubernetes.io/default-container: alloy + labels: + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy + spec: + serviceAccountName: alloy + containers: + - name: alloy + image: docker.io/grafana/alloy:v0.40.2 + imagePullPolicy: IfNotPresent + args: + - run + - /etc/alloy/config.river + - --storage.path=/tmp/alloy + - --server.http.listen-addr=0.0.0.0:80 + - --server.http.ui-path-prefix=/ + env: + - name: AGENT_DEPLOY_MODE + value: "helm" + - name: HOSTNAME + valueFrom: + fieldRef: + fieldPath: spec.nodeName + ports: + - containerPort: 80 + name: http-metrics + readinessProbe: + httpGet: + path: /-/ready + port: 80 + scheme: HTTP + initialDelaySeconds: 10 + timeoutSeconds: 1 + volumeMounts: + - name: config + mountPath: /etc/alloy + - name: config-reloader + image: ghcr.io/jimmidyson/configmap-reload:v0.12.0 + args: + - --volume-dir=/etc/alloy + - --webhook-url=http://localhost:80/-/reload + volumeMounts: + - name: config + mountPath: /etc/alloy + resources: + requests: + cpu: 1m + memory: 5Mi + dnsPolicy: ClusterFirst + volumes: + - name: config + configMap: + name: alloy diff --git a/operations/helm/tests/enable-servicemonitor/alloy/templates/rbac.yaml b/operations/helm/tests/enable-servicemonitor/alloy/templates/rbac.yaml new file mode 100644 index 0000000000..53ca27544f --- /dev/null +++ b/operations/helm/tests/enable-servicemonitor/alloy/templates/rbac.yaml @@ -0,0 +1,117 @@ +--- +# Source: alloy/templates/rbac.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: 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 +rules: + # Rules which allow discovery.kubernetes to function. + - apiGroups: + - "" + - "discovery.k8s.io" + - "networking.k8s.io" + resources: + - endpoints + - endpointslices + - ingresses + - nodes + - nodes/proxy + - nodes/metrics + - pods + - services + verbs: + - get + - list + - watch + # Rules which allow loki.source.kubernetes and loki.source.podlogs to work. + - apiGroups: + - "" + resources: + - pods + - pods/log + - namespaces + verbs: + - get + - list + - watch + - apiGroups: + - "monitoring.grafana.com" + resources: + - podlogs + verbs: + - get + - list + - watch + # Rules which allow mimir.rules.kubernetes to work. + - apiGroups: ["monitoring.coreos.com"] + resources: + - prometheusrules + verbs: + - get + - list + - watch + - nonResourceURLs: + - /metrics + verbs: + - get + # Rules for prometheus.kubernetes.* + - apiGroups: ["monitoring.coreos.com"] + resources: + - podmonitors + - servicemonitors + - probes + verbs: + - get + - list + - watch + # Rules which allow eventhandler to work. + - apiGroups: + - "" + resources: + - events + verbs: + - get + - list + - watch + # needed for remote.kubernetes.* + - apiGroups: [""] + resources: + - "configmaps" + - "secrets" + verbs: + - get + - list + - watch + # needed for otelcol.processor.k8sattributes + - apiGroups: ["apps"] + resources: ["replicasets"] + verbs: ["get", "list", "watch"] + - apiGroups: ["extensions"] + resources: ["replicasets"] + verbs: ["get", "list", "watch"] +--- +# Source: alloy/templates/rbac.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: 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 +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: alloy +subjects: + - kind: ServiceAccount + name: alloy + namespace: default diff --git a/operations/helm/tests/enable-servicemonitor/alloy/templates/service.yaml b/operations/helm/tests/enable-servicemonitor/alloy/templates/service.yaml new file mode 100644 index 0000000000..34c0608fd3 --- /dev/null +++ b/operations/helm/tests/enable-servicemonitor/alloy/templates/service.yaml @@ -0,0 +1,23 @@ +--- +# Source: alloy/templates/service.yaml +apiVersion: v1 +kind: Service +metadata: + name: 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: + type: ClusterIP + selector: + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy + internalTrafficPolicy: Cluster + ports: + - name: http-metrics + port: 80 + targetPort: 80 + protocol: "TCP" diff --git a/operations/helm/tests/enable-servicemonitor/alloy/templates/serviceaccount.yaml b/operations/helm/tests/enable-servicemonitor/alloy/templates/serviceaccount.yaml new file mode 100644 index 0000000000..46df991efb --- /dev/null +++ b/operations/helm/tests/enable-servicemonitor/alloy/templates/serviceaccount.yaml @@ -0,0 +1,13 @@ +--- +# Source: alloy/templates/serviceaccount.yaml +apiVersion: v1 +kind: ServiceAccount +metadata: + name: alloy + namespace: default + 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 diff --git a/operations/helm/tests/enable-servicemonitor/alloy/templates/servicemonitor.yaml b/operations/helm/tests/enable-servicemonitor/alloy/templates/servicemonitor.yaml new file mode 100644 index 0000000000..0437bb1ef1 --- /dev/null +++ b/operations/helm/tests/enable-servicemonitor/alloy/templates/servicemonitor.yaml @@ -0,0 +1,21 @@ +--- +# Source: alloy/templates/servicemonitor.yaml +apiVersion: monitoring.coreos.com/v1 +kind: ServiceMonitor +metadata: + name: 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: + endpoints: + - port: http-metrics + scheme: http + honorLabels: true + selector: + matchLabels: + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy diff --git a/operations/helm/tests/enable-servicemonitor/grafana-agent/templates/configmap.yaml b/operations/helm/tests/enable-servicemonitor/grafana-agent/templates/configmap.yaml deleted file mode 100644 index 2fdc6f0117..0000000000 --- a/operations/helm/tests/enable-servicemonitor/grafana-agent/templates/configmap.yaml +++ /dev/null @@ -1,42 +0,0 @@ ---- -# Source: grafana-agent/templates/configmap.yaml -apiVersion: v1 -kind: ConfigMap -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -data: - config.river: |- - logging { - level = "info" - format = "logfmt" - } - - discovery.kubernetes "pods" { - role = "pod" - } - - discovery.kubernetes "nodes" { - role = "node" - } - - discovery.kubernetes "services" { - role = "service" - } - - discovery.kubernetes "endpoints" { - role = "endpoints" - } - - discovery.kubernetes "endpointslices" { - role = "endpointslice" - } - - discovery.kubernetes "ingresses" { - role = "ingress" - } diff --git a/operations/helm/tests/enable-servicemonitor/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/enable-servicemonitor/grafana-agent/templates/controllers/daemonset.yaml deleted file mode 100644 index 97d9cbfb9b..0000000000 --- a/operations/helm/tests/enable-servicemonitor/grafana-agent/templates/controllers/daemonset.yaml +++ /dev/null @@ -1,74 +0,0 @@ ---- -# Source: grafana-agent/templates/controllers/daemonset.yaml -apiVersion: apps/v1 -kind: DaemonSet -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -spec: - minReadySeconds: 10 - selector: - matchLabels: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - template: - metadata: - annotations: - kubectl.kubernetes.io/default-container: alloy - labels: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - spec: - serviceAccountName: grafana-agent - containers: - - name: alloy - image: docker.io/grafana/alloy:v0.40.2 - imagePullPolicy: IfNotPresent - args: - - run - - /etc/alloy/config.river - - --storage.path=/tmp/alloy - - --server.http.listen-addr=0.0.0.0:80 - - --server.http.ui-path-prefix=/ - env: - - name: AGENT_DEPLOY_MODE - value: "helm" - - name: HOSTNAME - valueFrom: - fieldRef: - fieldPath: spec.nodeName - ports: - - containerPort: 80 - name: http-metrics - readinessProbe: - httpGet: - path: /-/ready - port: 80 - scheme: HTTP - initialDelaySeconds: 10 - timeoutSeconds: 1 - volumeMounts: - - name: config - mountPath: /etc/alloy - - name: config-reloader - image: ghcr.io/jimmidyson/configmap-reload:v0.12.0 - args: - - --volume-dir=/etc/alloy - - --webhook-url=http://localhost:80/-/reload - volumeMounts: - - name: config - mountPath: /etc/alloy - resources: - requests: - cpu: 1m - memory: 5Mi - dnsPolicy: ClusterFirst - volumes: - - name: config - configMap: - name: grafana-agent diff --git a/operations/helm/tests/enable-servicemonitor/grafana-agent/templates/rbac.yaml b/operations/helm/tests/enable-servicemonitor/grafana-agent/templates/rbac.yaml deleted file mode 100644 index 3765583fb6..0000000000 --- a/operations/helm/tests/enable-servicemonitor/grafana-agent/templates/rbac.yaml +++ /dev/null @@ -1,117 +0,0 @@ ---- -# Source: grafana-agent/templates/rbac.yaml -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -rules: - # Rules which allow discovery.kubernetes to function. - - apiGroups: - - "" - - "discovery.k8s.io" - - "networking.k8s.io" - resources: - - endpoints - - endpointslices - - ingresses - - nodes - - nodes/proxy - - nodes/metrics - - pods - - services - verbs: - - get - - list - - watch - # Rules which allow loki.source.kubernetes and loki.source.podlogs to work. - - apiGroups: - - "" - resources: - - pods - - pods/log - - namespaces - verbs: - - get - - list - - watch - - apiGroups: - - "monitoring.grafana.com" - resources: - - podlogs - verbs: - - get - - list - - watch - # Rules which allow mimir.rules.kubernetes to work. - - apiGroups: ["monitoring.coreos.com"] - resources: - - prometheusrules - verbs: - - get - - list - - watch - - nonResourceURLs: - - /metrics - verbs: - - get - # Rules for prometheus.kubernetes.* - - apiGroups: ["monitoring.coreos.com"] - resources: - - podmonitors - - servicemonitors - - probes - verbs: - - get - - list - - watch - # Rules which allow eventhandler to work. - - apiGroups: - - "" - resources: - - events - verbs: - - get - - list - - watch - # needed for remote.kubernetes.* - - apiGroups: [""] - resources: - - "configmaps" - - "secrets" - verbs: - - get - - list - - watch - # needed for otelcol.processor.k8sattributes - - apiGroups: ["apps"] - resources: ["replicasets"] - verbs: ["get", "list", "watch"] - - apiGroups: ["extensions"] - resources: ["replicasets"] - verbs: ["get", "list", "watch"] ---- -# Source: grafana-agent/templates/rbac.yaml -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: grafana-agent -subjects: - - kind: ServiceAccount - name: grafana-agent - namespace: default diff --git a/operations/helm/tests/enable-servicemonitor/grafana-agent/templates/service.yaml b/operations/helm/tests/enable-servicemonitor/grafana-agent/templates/service.yaml deleted file mode 100644 index c98f79428b..0000000000 --- a/operations/helm/tests/enable-servicemonitor/grafana-agent/templates/service.yaml +++ /dev/null @@ -1,23 +0,0 @@ ---- -# Source: grafana-agent/templates/service.yaml -apiVersion: v1 -kind: Service -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -spec: - type: ClusterIP - selector: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - internalTrafficPolicy: Cluster - ports: - - name: http-metrics - port: 80 - targetPort: 80 - protocol: "TCP" diff --git a/operations/helm/tests/enable-servicemonitor/grafana-agent/templates/serviceaccount.yaml b/operations/helm/tests/enable-servicemonitor/grafana-agent/templates/serviceaccount.yaml deleted file mode 100644 index 65d7e0df38..0000000000 --- a/operations/helm/tests/enable-servicemonitor/grafana-agent/templates/serviceaccount.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# Source: grafana-agent/templates/serviceaccount.yaml -apiVersion: v1 -kind: ServiceAccount -metadata: - name: grafana-agent - namespace: default - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm diff --git a/operations/helm/tests/enable-servicemonitor/grafana-agent/templates/servicemonitor.yaml b/operations/helm/tests/enable-servicemonitor/grafana-agent/templates/servicemonitor.yaml deleted file mode 100644 index 4a5a3e6bc4..0000000000 --- a/operations/helm/tests/enable-servicemonitor/grafana-agent/templates/servicemonitor.yaml +++ /dev/null @@ -1,21 +0,0 @@ ---- -# Source: grafana-agent/templates/servicemonitor.yaml -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -spec: - endpoints: - - port: http-metrics - scheme: http - honorLabels: true - selector: - matchLabels: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent diff --git a/operations/helm/tests/envFrom/alloy/templates/configmap.yaml b/operations/helm/tests/envFrom/alloy/templates/configmap.yaml new file mode 100644 index 0000000000..c9ae77aa1e --- /dev/null +++ b/operations/helm/tests/envFrom/alloy/templates/configmap.yaml @@ -0,0 +1,42 @@ +--- +# Source: alloy/templates/configmap.yaml +apiVersion: v1 +kind: ConfigMap +metadata: + name: 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 +data: + config.river: |- + logging { + level = "info" + format = "logfmt" + } + + discovery.kubernetes "pods" { + role = "pod" + } + + discovery.kubernetes "nodes" { + role = "node" + } + + discovery.kubernetes "services" { + role = "service" + } + + discovery.kubernetes "endpoints" { + role = "endpoints" + } + + discovery.kubernetes "endpointslices" { + role = "endpointslice" + } + + discovery.kubernetes "ingresses" { + role = "ingress" + } diff --git a/operations/helm/tests/envFrom/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/envFrom/alloy/templates/controllers/daemonset.yaml similarity index 79% rename from operations/helm/tests/envFrom/grafana-agent/templates/controllers/daemonset.yaml rename to operations/helm/tests/envFrom/alloy/templates/controllers/daemonset.yaml index 5fc992ce56..b210d6a202 100644 --- a/operations/helm/tests/envFrom/grafana-agent/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/envFrom/alloy/templates/controllers/daemonset.yaml @@ -1,30 +1,30 @@ --- -# Source: grafana-agent/templates/controllers/daemonset.yaml +# Source: alloy/templates/controllers/daemonset.yaml apiVersion: apps/v1 kind: DaemonSet metadata: - name: grafana-agent + name: alloy labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + 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: minReadySeconds: 10 selector: matchLabels: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy template: metadata: annotations: kubectl.kubernetes.io/default-container: alloy labels: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy spec: - serviceAccountName: grafana-agent + serviceAccountName: alloy containers: - name: alloy image: docker.io/grafana/alloy:v0.40.2 @@ -74,4 +74,4 @@ spec: volumes: - name: config configMap: - name: grafana-agent + name: alloy diff --git a/operations/helm/tests/envFrom/alloy/templates/rbac.yaml b/operations/helm/tests/envFrom/alloy/templates/rbac.yaml new file mode 100644 index 0000000000..53ca27544f --- /dev/null +++ b/operations/helm/tests/envFrom/alloy/templates/rbac.yaml @@ -0,0 +1,117 @@ +--- +# Source: alloy/templates/rbac.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: 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 +rules: + # Rules which allow discovery.kubernetes to function. + - apiGroups: + - "" + - "discovery.k8s.io" + - "networking.k8s.io" + resources: + - endpoints + - endpointslices + - ingresses + - nodes + - nodes/proxy + - nodes/metrics + - pods + - services + verbs: + - get + - list + - watch + # Rules which allow loki.source.kubernetes and loki.source.podlogs to work. + - apiGroups: + - "" + resources: + - pods + - pods/log + - namespaces + verbs: + - get + - list + - watch + - apiGroups: + - "monitoring.grafana.com" + resources: + - podlogs + verbs: + - get + - list + - watch + # Rules which allow mimir.rules.kubernetes to work. + - apiGroups: ["monitoring.coreos.com"] + resources: + - prometheusrules + verbs: + - get + - list + - watch + - nonResourceURLs: + - /metrics + verbs: + - get + # Rules for prometheus.kubernetes.* + - apiGroups: ["monitoring.coreos.com"] + resources: + - podmonitors + - servicemonitors + - probes + verbs: + - get + - list + - watch + # Rules which allow eventhandler to work. + - apiGroups: + - "" + resources: + - events + verbs: + - get + - list + - watch + # needed for remote.kubernetes.* + - apiGroups: [""] + resources: + - "configmaps" + - "secrets" + verbs: + - get + - list + - watch + # needed for otelcol.processor.k8sattributes + - apiGroups: ["apps"] + resources: ["replicasets"] + verbs: ["get", "list", "watch"] + - apiGroups: ["extensions"] + resources: ["replicasets"] + verbs: ["get", "list", "watch"] +--- +# Source: alloy/templates/rbac.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: 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 +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: alloy +subjects: + - kind: ServiceAccount + name: alloy + namespace: default diff --git a/operations/helm/tests/envFrom/alloy/templates/service.yaml b/operations/helm/tests/envFrom/alloy/templates/service.yaml new file mode 100644 index 0000000000..34c0608fd3 --- /dev/null +++ b/operations/helm/tests/envFrom/alloy/templates/service.yaml @@ -0,0 +1,23 @@ +--- +# Source: alloy/templates/service.yaml +apiVersion: v1 +kind: Service +metadata: + name: 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: + type: ClusterIP + selector: + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy + internalTrafficPolicy: Cluster + ports: + - name: http-metrics + port: 80 + targetPort: 80 + protocol: "TCP" diff --git a/operations/helm/tests/envFrom/alloy/templates/serviceaccount.yaml b/operations/helm/tests/envFrom/alloy/templates/serviceaccount.yaml new file mode 100644 index 0000000000..46df991efb --- /dev/null +++ b/operations/helm/tests/envFrom/alloy/templates/serviceaccount.yaml @@ -0,0 +1,13 @@ +--- +# Source: alloy/templates/serviceaccount.yaml +apiVersion: v1 +kind: ServiceAccount +metadata: + name: alloy + namespace: default + 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 diff --git a/operations/helm/tests/envFrom/grafana-agent/templates/configmap.yaml b/operations/helm/tests/envFrom/grafana-agent/templates/configmap.yaml deleted file mode 100644 index 2fdc6f0117..0000000000 --- a/operations/helm/tests/envFrom/grafana-agent/templates/configmap.yaml +++ /dev/null @@ -1,42 +0,0 @@ ---- -# Source: grafana-agent/templates/configmap.yaml -apiVersion: v1 -kind: ConfigMap -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -data: - config.river: |- - logging { - level = "info" - format = "logfmt" - } - - discovery.kubernetes "pods" { - role = "pod" - } - - discovery.kubernetes "nodes" { - role = "node" - } - - discovery.kubernetes "services" { - role = "service" - } - - discovery.kubernetes "endpoints" { - role = "endpoints" - } - - discovery.kubernetes "endpointslices" { - role = "endpointslice" - } - - discovery.kubernetes "ingresses" { - role = "ingress" - } diff --git a/operations/helm/tests/envFrom/grafana-agent/templates/rbac.yaml b/operations/helm/tests/envFrom/grafana-agent/templates/rbac.yaml deleted file mode 100644 index 3765583fb6..0000000000 --- a/operations/helm/tests/envFrom/grafana-agent/templates/rbac.yaml +++ /dev/null @@ -1,117 +0,0 @@ ---- -# Source: grafana-agent/templates/rbac.yaml -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -rules: - # Rules which allow discovery.kubernetes to function. - - apiGroups: - - "" - - "discovery.k8s.io" - - "networking.k8s.io" - resources: - - endpoints - - endpointslices - - ingresses - - nodes - - nodes/proxy - - nodes/metrics - - pods - - services - verbs: - - get - - list - - watch - # Rules which allow loki.source.kubernetes and loki.source.podlogs to work. - - apiGroups: - - "" - resources: - - pods - - pods/log - - namespaces - verbs: - - get - - list - - watch - - apiGroups: - - "monitoring.grafana.com" - resources: - - podlogs - verbs: - - get - - list - - watch - # Rules which allow mimir.rules.kubernetes to work. - - apiGroups: ["monitoring.coreos.com"] - resources: - - prometheusrules - verbs: - - get - - list - - watch - - nonResourceURLs: - - /metrics - verbs: - - get - # Rules for prometheus.kubernetes.* - - apiGroups: ["monitoring.coreos.com"] - resources: - - podmonitors - - servicemonitors - - probes - verbs: - - get - - list - - watch - # Rules which allow eventhandler to work. - - apiGroups: - - "" - resources: - - events - verbs: - - get - - list - - watch - # needed for remote.kubernetes.* - - apiGroups: [""] - resources: - - "configmaps" - - "secrets" - verbs: - - get - - list - - watch - # needed for otelcol.processor.k8sattributes - - apiGroups: ["apps"] - resources: ["replicasets"] - verbs: ["get", "list", "watch"] - - apiGroups: ["extensions"] - resources: ["replicasets"] - verbs: ["get", "list", "watch"] ---- -# Source: grafana-agent/templates/rbac.yaml -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: grafana-agent -subjects: - - kind: ServiceAccount - name: grafana-agent - namespace: default diff --git a/operations/helm/tests/envFrom/grafana-agent/templates/service.yaml b/operations/helm/tests/envFrom/grafana-agent/templates/service.yaml deleted file mode 100644 index c98f79428b..0000000000 --- a/operations/helm/tests/envFrom/grafana-agent/templates/service.yaml +++ /dev/null @@ -1,23 +0,0 @@ ---- -# Source: grafana-agent/templates/service.yaml -apiVersion: v1 -kind: Service -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -spec: - type: ClusterIP - selector: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - internalTrafficPolicy: Cluster - ports: - - name: http-metrics - port: 80 - targetPort: 80 - protocol: "TCP" diff --git a/operations/helm/tests/envFrom/grafana-agent/templates/serviceaccount.yaml b/operations/helm/tests/envFrom/grafana-agent/templates/serviceaccount.yaml deleted file mode 100644 index 65d7e0df38..0000000000 --- a/operations/helm/tests/envFrom/grafana-agent/templates/serviceaccount.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# Source: grafana-agent/templates/serviceaccount.yaml -apiVersion: v1 -kind: ServiceAccount -metadata: - name: grafana-agent - namespace: default - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm diff --git a/operations/helm/tests/existing-config/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/existing-config/alloy/templates/controllers/daemonset.yaml similarity index 80% rename from operations/helm/tests/existing-config/grafana-agent/templates/controllers/daemonset.yaml rename to operations/helm/tests/existing-config/alloy/templates/controllers/daemonset.yaml index a32b52ae04..d5da2f01bb 100644 --- a/operations/helm/tests/existing-config/grafana-agent/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/existing-config/alloy/templates/controllers/daemonset.yaml @@ -1,30 +1,30 @@ --- -# Source: grafana-agent/templates/controllers/daemonset.yaml +# Source: alloy/templates/controllers/daemonset.yaml apiVersion: apps/v1 kind: DaemonSet metadata: - name: grafana-agent + name: alloy labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + 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: minReadySeconds: 10 selector: matchLabels: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy template: metadata: annotations: kubectl.kubernetes.io/default-container: alloy labels: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy spec: - serviceAccountName: grafana-agent + serviceAccountName: alloy containers: - name: alloy image: docker.io/grafana/alloy:v0.40.2 diff --git a/operations/helm/tests/existing-config/alloy/templates/rbac.yaml b/operations/helm/tests/existing-config/alloy/templates/rbac.yaml new file mode 100644 index 0000000000..53ca27544f --- /dev/null +++ b/operations/helm/tests/existing-config/alloy/templates/rbac.yaml @@ -0,0 +1,117 @@ +--- +# Source: alloy/templates/rbac.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: 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 +rules: + # Rules which allow discovery.kubernetes to function. + - apiGroups: + - "" + - "discovery.k8s.io" + - "networking.k8s.io" + resources: + - endpoints + - endpointslices + - ingresses + - nodes + - nodes/proxy + - nodes/metrics + - pods + - services + verbs: + - get + - list + - watch + # Rules which allow loki.source.kubernetes and loki.source.podlogs to work. + - apiGroups: + - "" + resources: + - pods + - pods/log + - namespaces + verbs: + - get + - list + - watch + - apiGroups: + - "monitoring.grafana.com" + resources: + - podlogs + verbs: + - get + - list + - watch + # Rules which allow mimir.rules.kubernetes to work. + - apiGroups: ["monitoring.coreos.com"] + resources: + - prometheusrules + verbs: + - get + - list + - watch + - nonResourceURLs: + - /metrics + verbs: + - get + # Rules for prometheus.kubernetes.* + - apiGroups: ["monitoring.coreos.com"] + resources: + - podmonitors + - servicemonitors + - probes + verbs: + - get + - list + - watch + # Rules which allow eventhandler to work. + - apiGroups: + - "" + resources: + - events + verbs: + - get + - list + - watch + # needed for remote.kubernetes.* + - apiGroups: [""] + resources: + - "configmaps" + - "secrets" + verbs: + - get + - list + - watch + # needed for otelcol.processor.k8sattributes + - apiGroups: ["apps"] + resources: ["replicasets"] + verbs: ["get", "list", "watch"] + - apiGroups: ["extensions"] + resources: ["replicasets"] + verbs: ["get", "list", "watch"] +--- +# Source: alloy/templates/rbac.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: 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 +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: alloy +subjects: + - kind: ServiceAccount + name: alloy + namespace: default diff --git a/operations/helm/tests/existing-config/alloy/templates/service.yaml b/operations/helm/tests/existing-config/alloy/templates/service.yaml new file mode 100644 index 0000000000..34c0608fd3 --- /dev/null +++ b/operations/helm/tests/existing-config/alloy/templates/service.yaml @@ -0,0 +1,23 @@ +--- +# Source: alloy/templates/service.yaml +apiVersion: v1 +kind: Service +metadata: + name: 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: + type: ClusterIP + selector: + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy + internalTrafficPolicy: Cluster + ports: + - name: http-metrics + port: 80 + targetPort: 80 + protocol: "TCP" diff --git a/operations/helm/tests/existing-config/alloy/templates/serviceaccount.yaml b/operations/helm/tests/existing-config/alloy/templates/serviceaccount.yaml new file mode 100644 index 0000000000..46df991efb --- /dev/null +++ b/operations/helm/tests/existing-config/alloy/templates/serviceaccount.yaml @@ -0,0 +1,13 @@ +--- +# Source: alloy/templates/serviceaccount.yaml +apiVersion: v1 +kind: ServiceAccount +metadata: + name: alloy + namespace: default + 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 diff --git a/operations/helm/tests/existing-config/grafana-agent/templates/rbac.yaml b/operations/helm/tests/existing-config/grafana-agent/templates/rbac.yaml deleted file mode 100644 index 3765583fb6..0000000000 --- a/operations/helm/tests/existing-config/grafana-agent/templates/rbac.yaml +++ /dev/null @@ -1,117 +0,0 @@ ---- -# Source: grafana-agent/templates/rbac.yaml -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -rules: - # Rules which allow discovery.kubernetes to function. - - apiGroups: - - "" - - "discovery.k8s.io" - - "networking.k8s.io" - resources: - - endpoints - - endpointslices - - ingresses - - nodes - - nodes/proxy - - nodes/metrics - - pods - - services - verbs: - - get - - list - - watch - # Rules which allow loki.source.kubernetes and loki.source.podlogs to work. - - apiGroups: - - "" - resources: - - pods - - pods/log - - namespaces - verbs: - - get - - list - - watch - - apiGroups: - - "monitoring.grafana.com" - resources: - - podlogs - verbs: - - get - - list - - watch - # Rules which allow mimir.rules.kubernetes to work. - - apiGroups: ["monitoring.coreos.com"] - resources: - - prometheusrules - verbs: - - get - - list - - watch - - nonResourceURLs: - - /metrics - verbs: - - get - # Rules for prometheus.kubernetes.* - - apiGroups: ["monitoring.coreos.com"] - resources: - - podmonitors - - servicemonitors - - probes - verbs: - - get - - list - - watch - # Rules which allow eventhandler to work. - - apiGroups: - - "" - resources: - - events - verbs: - - get - - list - - watch - # needed for remote.kubernetes.* - - apiGroups: [""] - resources: - - "configmaps" - - "secrets" - verbs: - - get - - list - - watch - # needed for otelcol.processor.k8sattributes - - apiGroups: ["apps"] - resources: ["replicasets"] - verbs: ["get", "list", "watch"] - - apiGroups: ["extensions"] - resources: ["replicasets"] - verbs: ["get", "list", "watch"] ---- -# Source: grafana-agent/templates/rbac.yaml -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: grafana-agent -subjects: - - kind: ServiceAccount - name: grafana-agent - namespace: default diff --git a/operations/helm/tests/existing-config/grafana-agent/templates/service.yaml b/operations/helm/tests/existing-config/grafana-agent/templates/service.yaml deleted file mode 100644 index c98f79428b..0000000000 --- a/operations/helm/tests/existing-config/grafana-agent/templates/service.yaml +++ /dev/null @@ -1,23 +0,0 @@ ---- -# Source: grafana-agent/templates/service.yaml -apiVersion: v1 -kind: Service -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -spec: - type: ClusterIP - selector: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - internalTrafficPolicy: Cluster - ports: - - name: http-metrics - port: 80 - targetPort: 80 - protocol: "TCP" diff --git a/operations/helm/tests/existing-config/grafana-agent/templates/serviceaccount.yaml b/operations/helm/tests/existing-config/grafana-agent/templates/serviceaccount.yaml deleted file mode 100644 index 65d7e0df38..0000000000 --- a/operations/helm/tests/existing-config/grafana-agent/templates/serviceaccount.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# Source: grafana-agent/templates/serviceaccount.yaml -apiVersion: v1 -kind: ServiceAccount -metadata: - name: grafana-agent - namespace: default - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm diff --git a/operations/helm/tests/extra-env/alloy/templates/configmap.yaml b/operations/helm/tests/extra-env/alloy/templates/configmap.yaml new file mode 100644 index 0000000000..c9ae77aa1e --- /dev/null +++ b/operations/helm/tests/extra-env/alloy/templates/configmap.yaml @@ -0,0 +1,42 @@ +--- +# Source: alloy/templates/configmap.yaml +apiVersion: v1 +kind: ConfigMap +metadata: + name: 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 +data: + config.river: |- + logging { + level = "info" + format = "logfmt" + } + + discovery.kubernetes "pods" { + role = "pod" + } + + discovery.kubernetes "nodes" { + role = "node" + } + + discovery.kubernetes "services" { + role = "service" + } + + discovery.kubernetes "endpoints" { + role = "endpoints" + } + + discovery.kubernetes "endpointslices" { + role = "endpointslice" + } + + discovery.kubernetes "ingresses" { + role = "ingress" + } diff --git a/operations/helm/tests/extra-env/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/extra-env/alloy/templates/controllers/daemonset.yaml similarity index 80% rename from operations/helm/tests/extra-env/grafana-agent/templates/controllers/daemonset.yaml rename to operations/helm/tests/extra-env/alloy/templates/controllers/daemonset.yaml index b0eacff778..ba538213a4 100644 --- a/operations/helm/tests/extra-env/grafana-agent/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/extra-env/alloy/templates/controllers/daemonset.yaml @@ -1,30 +1,30 @@ --- -# Source: grafana-agent/templates/controllers/daemonset.yaml +# Source: alloy/templates/controllers/daemonset.yaml apiVersion: apps/v1 kind: DaemonSet metadata: - name: grafana-agent + name: alloy labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + 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: minReadySeconds: 10 selector: matchLabels: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy template: metadata: annotations: kubectl.kubernetes.io/default-container: alloy labels: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy spec: - serviceAccountName: grafana-agent + serviceAccountName: alloy containers: - name: alloy image: docker.io/grafana/alloy:v0.40.2 @@ -80,4 +80,4 @@ spec: volumes: - name: config configMap: - name: grafana-agent + name: alloy diff --git a/operations/helm/tests/extra-env/alloy/templates/rbac.yaml b/operations/helm/tests/extra-env/alloy/templates/rbac.yaml new file mode 100644 index 0000000000..53ca27544f --- /dev/null +++ b/operations/helm/tests/extra-env/alloy/templates/rbac.yaml @@ -0,0 +1,117 @@ +--- +# Source: alloy/templates/rbac.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: 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 +rules: + # Rules which allow discovery.kubernetes to function. + - apiGroups: + - "" + - "discovery.k8s.io" + - "networking.k8s.io" + resources: + - endpoints + - endpointslices + - ingresses + - nodes + - nodes/proxy + - nodes/metrics + - pods + - services + verbs: + - get + - list + - watch + # Rules which allow loki.source.kubernetes and loki.source.podlogs to work. + - apiGroups: + - "" + resources: + - pods + - pods/log + - namespaces + verbs: + - get + - list + - watch + - apiGroups: + - "monitoring.grafana.com" + resources: + - podlogs + verbs: + - get + - list + - watch + # Rules which allow mimir.rules.kubernetes to work. + - apiGroups: ["monitoring.coreos.com"] + resources: + - prometheusrules + verbs: + - get + - list + - watch + - nonResourceURLs: + - /metrics + verbs: + - get + # Rules for prometheus.kubernetes.* + - apiGroups: ["monitoring.coreos.com"] + resources: + - podmonitors + - servicemonitors + - probes + verbs: + - get + - list + - watch + # Rules which allow eventhandler to work. + - apiGroups: + - "" + resources: + - events + verbs: + - get + - list + - watch + # needed for remote.kubernetes.* + - apiGroups: [""] + resources: + - "configmaps" + - "secrets" + verbs: + - get + - list + - watch + # needed for otelcol.processor.k8sattributes + - apiGroups: ["apps"] + resources: ["replicasets"] + verbs: ["get", "list", "watch"] + - apiGroups: ["extensions"] + resources: ["replicasets"] + verbs: ["get", "list", "watch"] +--- +# Source: alloy/templates/rbac.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: 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 +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: alloy +subjects: + - kind: ServiceAccount + name: alloy + namespace: default diff --git a/operations/helm/tests/extra-env/alloy/templates/service.yaml b/operations/helm/tests/extra-env/alloy/templates/service.yaml new file mode 100644 index 0000000000..34c0608fd3 --- /dev/null +++ b/operations/helm/tests/extra-env/alloy/templates/service.yaml @@ -0,0 +1,23 @@ +--- +# Source: alloy/templates/service.yaml +apiVersion: v1 +kind: Service +metadata: + name: 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: + type: ClusterIP + selector: + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy + internalTrafficPolicy: Cluster + ports: + - name: http-metrics + port: 80 + targetPort: 80 + protocol: "TCP" diff --git a/operations/helm/tests/extra-env/alloy/templates/serviceaccount.yaml b/operations/helm/tests/extra-env/alloy/templates/serviceaccount.yaml new file mode 100644 index 0000000000..46df991efb --- /dev/null +++ b/operations/helm/tests/extra-env/alloy/templates/serviceaccount.yaml @@ -0,0 +1,13 @@ +--- +# Source: alloy/templates/serviceaccount.yaml +apiVersion: v1 +kind: ServiceAccount +metadata: + name: alloy + namespace: default + 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 diff --git a/operations/helm/tests/extra-env/grafana-agent/templates/configmap.yaml b/operations/helm/tests/extra-env/grafana-agent/templates/configmap.yaml deleted file mode 100644 index 2fdc6f0117..0000000000 --- a/operations/helm/tests/extra-env/grafana-agent/templates/configmap.yaml +++ /dev/null @@ -1,42 +0,0 @@ ---- -# Source: grafana-agent/templates/configmap.yaml -apiVersion: v1 -kind: ConfigMap -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -data: - config.river: |- - logging { - level = "info" - format = "logfmt" - } - - discovery.kubernetes "pods" { - role = "pod" - } - - discovery.kubernetes "nodes" { - role = "node" - } - - discovery.kubernetes "services" { - role = "service" - } - - discovery.kubernetes "endpoints" { - role = "endpoints" - } - - discovery.kubernetes "endpointslices" { - role = "endpointslice" - } - - discovery.kubernetes "ingresses" { - role = "ingress" - } diff --git a/operations/helm/tests/extra-env/grafana-agent/templates/rbac.yaml b/operations/helm/tests/extra-env/grafana-agent/templates/rbac.yaml deleted file mode 100644 index 3765583fb6..0000000000 --- a/operations/helm/tests/extra-env/grafana-agent/templates/rbac.yaml +++ /dev/null @@ -1,117 +0,0 @@ ---- -# Source: grafana-agent/templates/rbac.yaml -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -rules: - # Rules which allow discovery.kubernetes to function. - - apiGroups: - - "" - - "discovery.k8s.io" - - "networking.k8s.io" - resources: - - endpoints - - endpointslices - - ingresses - - nodes - - nodes/proxy - - nodes/metrics - - pods - - services - verbs: - - get - - list - - watch - # Rules which allow loki.source.kubernetes and loki.source.podlogs to work. - - apiGroups: - - "" - resources: - - pods - - pods/log - - namespaces - verbs: - - get - - list - - watch - - apiGroups: - - "monitoring.grafana.com" - resources: - - podlogs - verbs: - - get - - list - - watch - # Rules which allow mimir.rules.kubernetes to work. - - apiGroups: ["monitoring.coreos.com"] - resources: - - prometheusrules - verbs: - - get - - list - - watch - - nonResourceURLs: - - /metrics - verbs: - - get - # Rules for prometheus.kubernetes.* - - apiGroups: ["monitoring.coreos.com"] - resources: - - podmonitors - - servicemonitors - - probes - verbs: - - get - - list - - watch - # Rules which allow eventhandler to work. - - apiGroups: - - "" - resources: - - events - verbs: - - get - - list - - watch - # needed for remote.kubernetes.* - - apiGroups: [""] - resources: - - "configmaps" - - "secrets" - verbs: - - get - - list - - watch - # needed for otelcol.processor.k8sattributes - - apiGroups: ["apps"] - resources: ["replicasets"] - verbs: ["get", "list", "watch"] - - apiGroups: ["extensions"] - resources: ["replicasets"] - verbs: ["get", "list", "watch"] ---- -# Source: grafana-agent/templates/rbac.yaml -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: grafana-agent -subjects: - - kind: ServiceAccount - name: grafana-agent - namespace: default diff --git a/operations/helm/tests/extra-env/grafana-agent/templates/service.yaml b/operations/helm/tests/extra-env/grafana-agent/templates/service.yaml deleted file mode 100644 index c98f79428b..0000000000 --- a/operations/helm/tests/extra-env/grafana-agent/templates/service.yaml +++ /dev/null @@ -1,23 +0,0 @@ ---- -# Source: grafana-agent/templates/service.yaml -apiVersion: v1 -kind: Service -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -spec: - type: ClusterIP - selector: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - internalTrafficPolicy: Cluster - ports: - - name: http-metrics - port: 80 - targetPort: 80 - protocol: "TCP" diff --git a/operations/helm/tests/extra-env/grafana-agent/templates/serviceaccount.yaml b/operations/helm/tests/extra-env/grafana-agent/templates/serviceaccount.yaml deleted file mode 100644 index 65d7e0df38..0000000000 --- a/operations/helm/tests/extra-env/grafana-agent/templates/serviceaccount.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# Source: grafana-agent/templates/serviceaccount.yaml -apiVersion: v1 -kind: ServiceAccount -metadata: - name: grafana-agent - namespace: default - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm diff --git a/operations/helm/tests/extra-ports/alloy/templates/configmap.yaml b/operations/helm/tests/extra-ports/alloy/templates/configmap.yaml new file mode 100644 index 0000000000..c9ae77aa1e --- /dev/null +++ b/operations/helm/tests/extra-ports/alloy/templates/configmap.yaml @@ -0,0 +1,42 @@ +--- +# Source: alloy/templates/configmap.yaml +apiVersion: v1 +kind: ConfigMap +metadata: + name: 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 +data: + config.river: |- + logging { + level = "info" + format = "logfmt" + } + + discovery.kubernetes "pods" { + role = "pod" + } + + discovery.kubernetes "nodes" { + role = "node" + } + + discovery.kubernetes "services" { + role = "service" + } + + discovery.kubernetes "endpoints" { + role = "endpoints" + } + + discovery.kubernetes "endpointslices" { + role = "endpointslice" + } + + discovery.kubernetes "ingresses" { + role = "ingress" + } diff --git a/operations/helm/tests/extra-ports/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/extra-ports/alloy/templates/controllers/daemonset.yaml similarity index 79% rename from operations/helm/tests/extra-ports/grafana-agent/templates/controllers/daemonset.yaml rename to operations/helm/tests/extra-ports/alloy/templates/controllers/daemonset.yaml index d01572ae7d..b68ed7e8fd 100644 --- a/operations/helm/tests/extra-ports/grafana-agent/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/extra-ports/alloy/templates/controllers/daemonset.yaml @@ -1,30 +1,30 @@ --- -# Source: grafana-agent/templates/controllers/daemonset.yaml +# Source: alloy/templates/controllers/daemonset.yaml apiVersion: apps/v1 kind: DaemonSet metadata: - name: grafana-agent + name: alloy labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + 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: minReadySeconds: 10 selector: matchLabels: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy template: metadata: annotations: kubectl.kubernetes.io/default-container: alloy labels: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy spec: - serviceAccountName: grafana-agent + serviceAccountName: alloy containers: - name: alloy image: docker.io/grafana/alloy:v0.40.2 @@ -74,4 +74,4 @@ spec: volumes: - name: config configMap: - name: grafana-agent + name: alloy diff --git a/operations/helm/tests/extra-ports/alloy/templates/rbac.yaml b/operations/helm/tests/extra-ports/alloy/templates/rbac.yaml new file mode 100644 index 0000000000..53ca27544f --- /dev/null +++ b/operations/helm/tests/extra-ports/alloy/templates/rbac.yaml @@ -0,0 +1,117 @@ +--- +# Source: alloy/templates/rbac.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: 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 +rules: + # Rules which allow discovery.kubernetes to function. + - apiGroups: + - "" + - "discovery.k8s.io" + - "networking.k8s.io" + resources: + - endpoints + - endpointslices + - ingresses + - nodes + - nodes/proxy + - nodes/metrics + - pods + - services + verbs: + - get + - list + - watch + # Rules which allow loki.source.kubernetes and loki.source.podlogs to work. + - apiGroups: + - "" + resources: + - pods + - pods/log + - namespaces + verbs: + - get + - list + - watch + - apiGroups: + - "monitoring.grafana.com" + resources: + - podlogs + verbs: + - get + - list + - watch + # Rules which allow mimir.rules.kubernetes to work. + - apiGroups: ["monitoring.coreos.com"] + resources: + - prometheusrules + verbs: + - get + - list + - watch + - nonResourceURLs: + - /metrics + verbs: + - get + # Rules for prometheus.kubernetes.* + - apiGroups: ["monitoring.coreos.com"] + resources: + - podmonitors + - servicemonitors + - probes + verbs: + - get + - list + - watch + # Rules which allow eventhandler to work. + - apiGroups: + - "" + resources: + - events + verbs: + - get + - list + - watch + # needed for remote.kubernetes.* + - apiGroups: [""] + resources: + - "configmaps" + - "secrets" + verbs: + - get + - list + - watch + # needed for otelcol.processor.k8sattributes + - apiGroups: ["apps"] + resources: ["replicasets"] + verbs: ["get", "list", "watch"] + - apiGroups: ["extensions"] + resources: ["replicasets"] + verbs: ["get", "list", "watch"] +--- +# Source: alloy/templates/rbac.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: 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 +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: alloy +subjects: + - kind: ServiceAccount + name: alloy + namespace: default diff --git a/operations/helm/tests/extra-ports/grafana-agent/templates/service.yaml b/operations/helm/tests/extra-ports/alloy/templates/service.yaml similarity index 57% rename from operations/helm/tests/extra-ports/grafana-agent/templates/service.yaml rename to operations/helm/tests/extra-ports/alloy/templates/service.yaml index 89acaacaad..e4fc0125bb 100644 --- a/operations/helm/tests/extra-ports/grafana-agent/templates/service.yaml +++ b/operations/helm/tests/extra-ports/alloy/templates/service.yaml @@ -1,20 +1,20 @@ --- -# Source: grafana-agent/templates/service.yaml +# Source: alloy/templates/service.yaml apiVersion: v1 kind: Service metadata: - name: grafana-agent + name: alloy labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + 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: type: ClusterIP selector: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy internalTrafficPolicy: Cluster ports: - name: http-metrics diff --git a/operations/helm/tests/extra-ports/alloy/templates/serviceaccount.yaml b/operations/helm/tests/extra-ports/alloy/templates/serviceaccount.yaml new file mode 100644 index 0000000000..46df991efb --- /dev/null +++ b/operations/helm/tests/extra-ports/alloy/templates/serviceaccount.yaml @@ -0,0 +1,13 @@ +--- +# Source: alloy/templates/serviceaccount.yaml +apiVersion: v1 +kind: ServiceAccount +metadata: + name: alloy + namespace: default + 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 diff --git a/operations/helm/tests/extra-ports/grafana-agent/templates/configmap.yaml b/operations/helm/tests/extra-ports/grafana-agent/templates/configmap.yaml deleted file mode 100644 index 2fdc6f0117..0000000000 --- a/operations/helm/tests/extra-ports/grafana-agent/templates/configmap.yaml +++ /dev/null @@ -1,42 +0,0 @@ ---- -# Source: grafana-agent/templates/configmap.yaml -apiVersion: v1 -kind: ConfigMap -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -data: - config.river: |- - logging { - level = "info" - format = "logfmt" - } - - discovery.kubernetes "pods" { - role = "pod" - } - - discovery.kubernetes "nodes" { - role = "node" - } - - discovery.kubernetes "services" { - role = "service" - } - - discovery.kubernetes "endpoints" { - role = "endpoints" - } - - discovery.kubernetes "endpointslices" { - role = "endpointslice" - } - - discovery.kubernetes "ingresses" { - role = "ingress" - } diff --git a/operations/helm/tests/extra-ports/grafana-agent/templates/rbac.yaml b/operations/helm/tests/extra-ports/grafana-agent/templates/rbac.yaml deleted file mode 100644 index 3765583fb6..0000000000 --- a/operations/helm/tests/extra-ports/grafana-agent/templates/rbac.yaml +++ /dev/null @@ -1,117 +0,0 @@ ---- -# Source: grafana-agent/templates/rbac.yaml -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -rules: - # Rules which allow discovery.kubernetes to function. - - apiGroups: - - "" - - "discovery.k8s.io" - - "networking.k8s.io" - resources: - - endpoints - - endpointslices - - ingresses - - nodes - - nodes/proxy - - nodes/metrics - - pods - - services - verbs: - - get - - list - - watch - # Rules which allow loki.source.kubernetes and loki.source.podlogs to work. - - apiGroups: - - "" - resources: - - pods - - pods/log - - namespaces - verbs: - - get - - list - - watch - - apiGroups: - - "monitoring.grafana.com" - resources: - - podlogs - verbs: - - get - - list - - watch - # Rules which allow mimir.rules.kubernetes to work. - - apiGroups: ["monitoring.coreos.com"] - resources: - - prometheusrules - verbs: - - get - - list - - watch - - nonResourceURLs: - - /metrics - verbs: - - get - # Rules for prometheus.kubernetes.* - - apiGroups: ["monitoring.coreos.com"] - resources: - - podmonitors - - servicemonitors - - probes - verbs: - - get - - list - - watch - # Rules which allow eventhandler to work. - - apiGroups: - - "" - resources: - - events - verbs: - - get - - list - - watch - # needed for remote.kubernetes.* - - apiGroups: [""] - resources: - - "configmaps" - - "secrets" - verbs: - - get - - list - - watch - # needed for otelcol.processor.k8sattributes - - apiGroups: ["apps"] - resources: ["replicasets"] - verbs: ["get", "list", "watch"] - - apiGroups: ["extensions"] - resources: ["replicasets"] - verbs: ["get", "list", "watch"] ---- -# Source: grafana-agent/templates/rbac.yaml -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: grafana-agent -subjects: - - kind: ServiceAccount - name: grafana-agent - namespace: default diff --git a/operations/helm/tests/extra-ports/grafana-agent/templates/serviceaccount.yaml b/operations/helm/tests/extra-ports/grafana-agent/templates/serviceaccount.yaml deleted file mode 100644 index 65d7e0df38..0000000000 --- a/operations/helm/tests/extra-ports/grafana-agent/templates/serviceaccount.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# Source: grafana-agent/templates/serviceaccount.yaml -apiVersion: v1 -kind: ServiceAccount -metadata: - name: grafana-agent - namespace: default - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm diff --git a/operations/helm/tests/faro-ingress/alloy/templates/configmap.yaml b/operations/helm/tests/faro-ingress/alloy/templates/configmap.yaml new file mode 100644 index 0000000000..c9ae77aa1e --- /dev/null +++ b/operations/helm/tests/faro-ingress/alloy/templates/configmap.yaml @@ -0,0 +1,42 @@ +--- +# Source: alloy/templates/configmap.yaml +apiVersion: v1 +kind: ConfigMap +metadata: + name: 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 +data: + config.river: |- + logging { + level = "info" + format = "logfmt" + } + + discovery.kubernetes "pods" { + role = "pod" + } + + discovery.kubernetes "nodes" { + role = "node" + } + + discovery.kubernetes "services" { + role = "service" + } + + discovery.kubernetes "endpoints" { + role = "endpoints" + } + + discovery.kubernetes "endpointslices" { + role = "endpointslice" + } + + discovery.kubernetes "ingresses" { + role = "ingress" + } diff --git a/operations/helm/tests/faro-ingress/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/faro-ingress/alloy/templates/controllers/daemonset.yaml similarity index 79% rename from operations/helm/tests/faro-ingress/grafana-agent/templates/controllers/daemonset.yaml rename to operations/helm/tests/faro-ingress/alloy/templates/controllers/daemonset.yaml index c755dd92e6..232baf4cd0 100644 --- a/operations/helm/tests/faro-ingress/grafana-agent/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/faro-ingress/alloy/templates/controllers/daemonset.yaml @@ -1,30 +1,30 @@ --- -# Source: grafana-agent/templates/controllers/daemonset.yaml +# Source: alloy/templates/controllers/daemonset.yaml apiVersion: apps/v1 kind: DaemonSet metadata: - name: grafana-agent + name: alloy labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + 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: minReadySeconds: 10 selector: matchLabels: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy template: metadata: annotations: kubectl.kubernetes.io/default-container: alloy labels: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy spec: - serviceAccountName: grafana-agent + serviceAccountName: alloy containers: - name: alloy image: docker.io/grafana/alloy:v0.40.2 @@ -74,4 +74,4 @@ spec: volumes: - name: config configMap: - name: grafana-agent + name: alloy diff --git a/operations/helm/tests/faro-ingress/grafana-agent/templates/ingress.yaml b/operations/helm/tests/faro-ingress/alloy/templates/ingress.yaml similarity index 63% rename from operations/helm/tests/faro-ingress/grafana-agent/templates/ingress.yaml rename to operations/helm/tests/faro-ingress/alloy/templates/ingress.yaml index dfd9a0b9ba..7c4b32c460 100644 --- a/operations/helm/tests/faro-ingress/grafana-agent/templates/ingress.yaml +++ b/operations/helm/tests/faro-ingress/alloy/templates/ingress.yaml @@ -1,14 +1,14 @@ --- -# Source: grafana-agent/templates/ingress.yaml +# Source: alloy/templates/ingress.yaml apiVersion: networking.k8s.io/v1 kind: Ingress metadata: - name: grafana-agent + name: alloy namespace: default labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + 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: @@ -20,6 +20,6 @@ spec: pathType: Prefix backend: service: - name: grafana-agent + name: alloy port: number: 12347 diff --git a/operations/helm/tests/faro-ingress/alloy/templates/rbac.yaml b/operations/helm/tests/faro-ingress/alloy/templates/rbac.yaml new file mode 100644 index 0000000000..53ca27544f --- /dev/null +++ b/operations/helm/tests/faro-ingress/alloy/templates/rbac.yaml @@ -0,0 +1,117 @@ +--- +# Source: alloy/templates/rbac.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: 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 +rules: + # Rules which allow discovery.kubernetes to function. + - apiGroups: + - "" + - "discovery.k8s.io" + - "networking.k8s.io" + resources: + - endpoints + - endpointslices + - ingresses + - nodes + - nodes/proxy + - nodes/metrics + - pods + - services + verbs: + - get + - list + - watch + # Rules which allow loki.source.kubernetes and loki.source.podlogs to work. + - apiGroups: + - "" + resources: + - pods + - pods/log + - namespaces + verbs: + - get + - list + - watch + - apiGroups: + - "monitoring.grafana.com" + resources: + - podlogs + verbs: + - get + - list + - watch + # Rules which allow mimir.rules.kubernetes to work. + - apiGroups: ["monitoring.coreos.com"] + resources: + - prometheusrules + verbs: + - get + - list + - watch + - nonResourceURLs: + - /metrics + verbs: + - get + # Rules for prometheus.kubernetes.* + - apiGroups: ["monitoring.coreos.com"] + resources: + - podmonitors + - servicemonitors + - probes + verbs: + - get + - list + - watch + # Rules which allow eventhandler to work. + - apiGroups: + - "" + resources: + - events + verbs: + - get + - list + - watch + # needed for remote.kubernetes.* + - apiGroups: [""] + resources: + - "configmaps" + - "secrets" + verbs: + - get + - list + - watch + # needed for otelcol.processor.k8sattributes + - apiGroups: ["apps"] + resources: ["replicasets"] + verbs: ["get", "list", "watch"] + - apiGroups: ["extensions"] + resources: ["replicasets"] + verbs: ["get", "list", "watch"] +--- +# Source: alloy/templates/rbac.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: 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 +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: alloy +subjects: + - kind: ServiceAccount + name: alloy + namespace: default diff --git a/operations/helm/tests/faro-ingress/grafana-agent/templates/service.yaml b/operations/helm/tests/faro-ingress/alloy/templates/service.yaml similarity index 57% rename from operations/helm/tests/faro-ingress/grafana-agent/templates/service.yaml rename to operations/helm/tests/faro-ingress/alloy/templates/service.yaml index 46474326df..18c045acff 100644 --- a/operations/helm/tests/faro-ingress/grafana-agent/templates/service.yaml +++ b/operations/helm/tests/faro-ingress/alloy/templates/service.yaml @@ -1,20 +1,20 @@ --- -# Source: grafana-agent/templates/service.yaml +# Source: alloy/templates/service.yaml apiVersion: v1 kind: Service metadata: - name: grafana-agent + name: alloy labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + 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: type: ClusterIP selector: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy internalTrafficPolicy: Cluster ports: - name: http-metrics diff --git a/operations/helm/tests/faro-ingress/alloy/templates/serviceaccount.yaml b/operations/helm/tests/faro-ingress/alloy/templates/serviceaccount.yaml new file mode 100644 index 0000000000..46df991efb --- /dev/null +++ b/operations/helm/tests/faro-ingress/alloy/templates/serviceaccount.yaml @@ -0,0 +1,13 @@ +--- +# Source: alloy/templates/serviceaccount.yaml +apiVersion: v1 +kind: ServiceAccount +metadata: + name: alloy + namespace: default + 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 diff --git a/operations/helm/tests/faro-ingress/grafana-agent/templates/configmap.yaml b/operations/helm/tests/faro-ingress/grafana-agent/templates/configmap.yaml deleted file mode 100644 index 2fdc6f0117..0000000000 --- a/operations/helm/tests/faro-ingress/grafana-agent/templates/configmap.yaml +++ /dev/null @@ -1,42 +0,0 @@ ---- -# Source: grafana-agent/templates/configmap.yaml -apiVersion: v1 -kind: ConfigMap -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -data: - config.river: |- - logging { - level = "info" - format = "logfmt" - } - - discovery.kubernetes "pods" { - role = "pod" - } - - discovery.kubernetes "nodes" { - role = "node" - } - - discovery.kubernetes "services" { - role = "service" - } - - discovery.kubernetes "endpoints" { - role = "endpoints" - } - - discovery.kubernetes "endpointslices" { - role = "endpointslice" - } - - discovery.kubernetes "ingresses" { - role = "ingress" - } diff --git a/operations/helm/tests/faro-ingress/grafana-agent/templates/rbac.yaml b/operations/helm/tests/faro-ingress/grafana-agent/templates/rbac.yaml deleted file mode 100644 index 3765583fb6..0000000000 --- a/operations/helm/tests/faro-ingress/grafana-agent/templates/rbac.yaml +++ /dev/null @@ -1,117 +0,0 @@ ---- -# Source: grafana-agent/templates/rbac.yaml -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -rules: - # Rules which allow discovery.kubernetes to function. - - apiGroups: - - "" - - "discovery.k8s.io" - - "networking.k8s.io" - resources: - - endpoints - - endpointslices - - ingresses - - nodes - - nodes/proxy - - nodes/metrics - - pods - - services - verbs: - - get - - list - - watch - # Rules which allow loki.source.kubernetes and loki.source.podlogs to work. - - apiGroups: - - "" - resources: - - pods - - pods/log - - namespaces - verbs: - - get - - list - - watch - - apiGroups: - - "monitoring.grafana.com" - resources: - - podlogs - verbs: - - get - - list - - watch - # Rules which allow mimir.rules.kubernetes to work. - - apiGroups: ["monitoring.coreos.com"] - resources: - - prometheusrules - verbs: - - get - - list - - watch - - nonResourceURLs: - - /metrics - verbs: - - get - # Rules for prometheus.kubernetes.* - - apiGroups: ["monitoring.coreos.com"] - resources: - - podmonitors - - servicemonitors - - probes - verbs: - - get - - list - - watch - # Rules which allow eventhandler to work. - - apiGroups: - - "" - resources: - - events - verbs: - - get - - list - - watch - # needed for remote.kubernetes.* - - apiGroups: [""] - resources: - - "configmaps" - - "secrets" - verbs: - - get - - list - - watch - # needed for otelcol.processor.k8sattributes - - apiGroups: ["apps"] - resources: ["replicasets"] - verbs: ["get", "list", "watch"] - - apiGroups: ["extensions"] - resources: ["replicasets"] - verbs: ["get", "list", "watch"] ---- -# Source: grafana-agent/templates/rbac.yaml -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: grafana-agent -subjects: - - kind: ServiceAccount - name: grafana-agent - namespace: default diff --git a/operations/helm/tests/faro-ingress/grafana-agent/templates/serviceaccount.yaml b/operations/helm/tests/faro-ingress/grafana-agent/templates/serviceaccount.yaml deleted file mode 100644 index 65d7e0df38..0000000000 --- a/operations/helm/tests/faro-ingress/grafana-agent/templates/serviceaccount.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# Source: grafana-agent/templates/serviceaccount.yaml -apiVersion: v1 -kind: ServiceAccount -metadata: - name: grafana-agent - namespace: default - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm diff --git a/operations/helm/tests/global-image-pullsecrets/alloy/templates/configmap.yaml b/operations/helm/tests/global-image-pullsecrets/alloy/templates/configmap.yaml new file mode 100644 index 0000000000..c9ae77aa1e --- /dev/null +++ b/operations/helm/tests/global-image-pullsecrets/alloy/templates/configmap.yaml @@ -0,0 +1,42 @@ +--- +# Source: alloy/templates/configmap.yaml +apiVersion: v1 +kind: ConfigMap +metadata: + name: 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 +data: + config.river: |- + logging { + level = "info" + format = "logfmt" + } + + discovery.kubernetes "pods" { + role = "pod" + } + + discovery.kubernetes "nodes" { + role = "node" + } + + discovery.kubernetes "services" { + role = "service" + } + + discovery.kubernetes "endpoints" { + role = "endpoints" + } + + discovery.kubernetes "endpointslices" { + role = "endpointslice" + } + + discovery.kubernetes "ingresses" { + role = "ingress" + } diff --git a/operations/helm/tests/global-image-pullsecrets/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/global-image-pullsecrets/alloy/templates/controllers/daemonset.yaml similarity index 79% rename from operations/helm/tests/global-image-pullsecrets/grafana-agent/templates/controllers/daemonset.yaml rename to operations/helm/tests/global-image-pullsecrets/alloy/templates/controllers/daemonset.yaml index bf6d4190b7..2dbc3aa049 100644 --- a/operations/helm/tests/global-image-pullsecrets/grafana-agent/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/global-image-pullsecrets/alloy/templates/controllers/daemonset.yaml @@ -1,33 +1,33 @@ --- -# Source: grafana-agent/templates/controllers/daemonset.yaml +# Source: alloy/templates/controllers/daemonset.yaml apiVersion: apps/v1 kind: DaemonSet metadata: - name: grafana-agent + name: alloy labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + 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: minReadySeconds: 10 selector: matchLabels: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy template: metadata: annotations: kubectl.kubernetes.io/default-container: alloy labels: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy spec: securityContext: runAsGroup: 1000 runAsUser: 1000 - serviceAccountName: grafana-agent + serviceAccountName: alloy imagePullSecrets: - name: global-cred containers: @@ -76,4 +76,4 @@ spec: volumes: - name: config configMap: - name: grafana-agent + name: alloy diff --git a/operations/helm/tests/global-image-pullsecrets/alloy/templates/rbac.yaml b/operations/helm/tests/global-image-pullsecrets/alloy/templates/rbac.yaml new file mode 100644 index 0000000000..53ca27544f --- /dev/null +++ b/operations/helm/tests/global-image-pullsecrets/alloy/templates/rbac.yaml @@ -0,0 +1,117 @@ +--- +# Source: alloy/templates/rbac.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: 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 +rules: + # Rules which allow discovery.kubernetes to function. + - apiGroups: + - "" + - "discovery.k8s.io" + - "networking.k8s.io" + resources: + - endpoints + - endpointslices + - ingresses + - nodes + - nodes/proxy + - nodes/metrics + - pods + - services + verbs: + - get + - list + - watch + # Rules which allow loki.source.kubernetes and loki.source.podlogs to work. + - apiGroups: + - "" + resources: + - pods + - pods/log + - namespaces + verbs: + - get + - list + - watch + - apiGroups: + - "monitoring.grafana.com" + resources: + - podlogs + verbs: + - get + - list + - watch + # Rules which allow mimir.rules.kubernetes to work. + - apiGroups: ["monitoring.coreos.com"] + resources: + - prometheusrules + verbs: + - get + - list + - watch + - nonResourceURLs: + - /metrics + verbs: + - get + # Rules for prometheus.kubernetes.* + - apiGroups: ["monitoring.coreos.com"] + resources: + - podmonitors + - servicemonitors + - probes + verbs: + - get + - list + - watch + # Rules which allow eventhandler to work. + - apiGroups: + - "" + resources: + - events + verbs: + - get + - list + - watch + # needed for remote.kubernetes.* + - apiGroups: [""] + resources: + - "configmaps" + - "secrets" + verbs: + - get + - list + - watch + # needed for otelcol.processor.k8sattributes + - apiGroups: ["apps"] + resources: ["replicasets"] + verbs: ["get", "list", "watch"] + - apiGroups: ["extensions"] + resources: ["replicasets"] + verbs: ["get", "list", "watch"] +--- +# Source: alloy/templates/rbac.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: 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 +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: alloy +subjects: + - kind: ServiceAccount + name: alloy + namespace: default diff --git a/operations/helm/tests/global-image-pullsecrets/alloy/templates/service.yaml b/operations/helm/tests/global-image-pullsecrets/alloy/templates/service.yaml new file mode 100644 index 0000000000..34c0608fd3 --- /dev/null +++ b/operations/helm/tests/global-image-pullsecrets/alloy/templates/service.yaml @@ -0,0 +1,23 @@ +--- +# Source: alloy/templates/service.yaml +apiVersion: v1 +kind: Service +metadata: + name: 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: + type: ClusterIP + selector: + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy + internalTrafficPolicy: Cluster + ports: + - name: http-metrics + port: 80 + targetPort: 80 + protocol: "TCP" diff --git a/operations/helm/tests/global-image-pullsecrets/alloy/templates/serviceaccount.yaml b/operations/helm/tests/global-image-pullsecrets/alloy/templates/serviceaccount.yaml new file mode 100644 index 0000000000..46df991efb --- /dev/null +++ b/operations/helm/tests/global-image-pullsecrets/alloy/templates/serviceaccount.yaml @@ -0,0 +1,13 @@ +--- +# Source: alloy/templates/serviceaccount.yaml +apiVersion: v1 +kind: ServiceAccount +metadata: + name: alloy + namespace: default + 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 diff --git a/operations/helm/tests/global-image-pullsecrets/grafana-agent/templates/configmap.yaml b/operations/helm/tests/global-image-pullsecrets/grafana-agent/templates/configmap.yaml deleted file mode 100644 index 2fdc6f0117..0000000000 --- a/operations/helm/tests/global-image-pullsecrets/grafana-agent/templates/configmap.yaml +++ /dev/null @@ -1,42 +0,0 @@ ---- -# Source: grafana-agent/templates/configmap.yaml -apiVersion: v1 -kind: ConfigMap -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -data: - config.river: |- - logging { - level = "info" - format = "logfmt" - } - - discovery.kubernetes "pods" { - role = "pod" - } - - discovery.kubernetes "nodes" { - role = "node" - } - - discovery.kubernetes "services" { - role = "service" - } - - discovery.kubernetes "endpoints" { - role = "endpoints" - } - - discovery.kubernetes "endpointslices" { - role = "endpointslice" - } - - discovery.kubernetes "ingresses" { - role = "ingress" - } diff --git a/operations/helm/tests/global-image-pullsecrets/grafana-agent/templates/rbac.yaml b/operations/helm/tests/global-image-pullsecrets/grafana-agent/templates/rbac.yaml deleted file mode 100644 index 3765583fb6..0000000000 --- a/operations/helm/tests/global-image-pullsecrets/grafana-agent/templates/rbac.yaml +++ /dev/null @@ -1,117 +0,0 @@ ---- -# Source: grafana-agent/templates/rbac.yaml -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -rules: - # Rules which allow discovery.kubernetes to function. - - apiGroups: - - "" - - "discovery.k8s.io" - - "networking.k8s.io" - resources: - - endpoints - - endpointslices - - ingresses - - nodes - - nodes/proxy - - nodes/metrics - - pods - - services - verbs: - - get - - list - - watch - # Rules which allow loki.source.kubernetes and loki.source.podlogs to work. - - apiGroups: - - "" - resources: - - pods - - pods/log - - namespaces - verbs: - - get - - list - - watch - - apiGroups: - - "monitoring.grafana.com" - resources: - - podlogs - verbs: - - get - - list - - watch - # Rules which allow mimir.rules.kubernetes to work. - - apiGroups: ["monitoring.coreos.com"] - resources: - - prometheusrules - verbs: - - get - - list - - watch - - nonResourceURLs: - - /metrics - verbs: - - get - # Rules for prometheus.kubernetes.* - - apiGroups: ["monitoring.coreos.com"] - resources: - - podmonitors - - servicemonitors - - probes - verbs: - - get - - list - - watch - # Rules which allow eventhandler to work. - - apiGroups: - - "" - resources: - - events - verbs: - - get - - list - - watch - # needed for remote.kubernetes.* - - apiGroups: [""] - resources: - - "configmaps" - - "secrets" - verbs: - - get - - list - - watch - # needed for otelcol.processor.k8sattributes - - apiGroups: ["apps"] - resources: ["replicasets"] - verbs: ["get", "list", "watch"] - - apiGroups: ["extensions"] - resources: ["replicasets"] - verbs: ["get", "list", "watch"] ---- -# Source: grafana-agent/templates/rbac.yaml -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: grafana-agent -subjects: - - kind: ServiceAccount - name: grafana-agent - namespace: default diff --git a/operations/helm/tests/global-image-pullsecrets/grafana-agent/templates/service.yaml b/operations/helm/tests/global-image-pullsecrets/grafana-agent/templates/service.yaml deleted file mode 100644 index c98f79428b..0000000000 --- a/operations/helm/tests/global-image-pullsecrets/grafana-agent/templates/service.yaml +++ /dev/null @@ -1,23 +0,0 @@ ---- -# Source: grafana-agent/templates/service.yaml -apiVersion: v1 -kind: Service -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -spec: - type: ClusterIP - selector: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - internalTrafficPolicy: Cluster - ports: - - name: http-metrics - port: 80 - targetPort: 80 - protocol: "TCP" diff --git a/operations/helm/tests/global-image-pullsecrets/grafana-agent/templates/serviceaccount.yaml b/operations/helm/tests/global-image-pullsecrets/grafana-agent/templates/serviceaccount.yaml deleted file mode 100644 index 65d7e0df38..0000000000 --- a/operations/helm/tests/global-image-pullsecrets/grafana-agent/templates/serviceaccount.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# Source: grafana-agent/templates/serviceaccount.yaml -apiVersion: v1 -kind: ServiceAccount -metadata: - name: grafana-agent - namespace: default - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm diff --git a/operations/helm/tests/global-image-registry/alloy/templates/configmap.yaml b/operations/helm/tests/global-image-registry/alloy/templates/configmap.yaml new file mode 100644 index 0000000000..c9ae77aa1e --- /dev/null +++ b/operations/helm/tests/global-image-registry/alloy/templates/configmap.yaml @@ -0,0 +1,42 @@ +--- +# Source: alloy/templates/configmap.yaml +apiVersion: v1 +kind: ConfigMap +metadata: + name: 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 +data: + config.river: |- + logging { + level = "info" + format = "logfmt" + } + + discovery.kubernetes "pods" { + role = "pod" + } + + discovery.kubernetes "nodes" { + role = "node" + } + + discovery.kubernetes "services" { + role = "service" + } + + discovery.kubernetes "endpoints" { + role = "endpoints" + } + + discovery.kubernetes "endpointslices" { + role = "endpointslice" + } + + discovery.kubernetes "ingresses" { + role = "ingress" + } diff --git a/operations/helm/tests/global-image-registry/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/global-image-registry/alloy/templates/controllers/daemonset.yaml similarity index 78% rename from operations/helm/tests/global-image-registry/grafana-agent/templates/controllers/daemonset.yaml rename to operations/helm/tests/global-image-registry/alloy/templates/controllers/daemonset.yaml index 2f3ed25026..c066fd7be5 100644 --- a/operations/helm/tests/global-image-registry/grafana-agent/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/global-image-registry/alloy/templates/controllers/daemonset.yaml @@ -1,30 +1,30 @@ --- -# Source: grafana-agent/templates/controllers/daemonset.yaml +# Source: alloy/templates/controllers/daemonset.yaml apiVersion: apps/v1 kind: DaemonSet metadata: - name: grafana-agent + name: alloy labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + 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: minReadySeconds: 10 selector: matchLabels: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy template: metadata: annotations: kubectl.kubernetes.io/default-container: alloy labels: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy spec: - serviceAccountName: grafana-agent + serviceAccountName: alloy containers: - name: alloy image: quay.io/grafana/alloy:v0.40.2 @@ -71,4 +71,4 @@ spec: volumes: - name: config configMap: - name: grafana-agent + name: alloy diff --git a/operations/helm/tests/global-image-registry/alloy/templates/rbac.yaml b/operations/helm/tests/global-image-registry/alloy/templates/rbac.yaml new file mode 100644 index 0000000000..53ca27544f --- /dev/null +++ b/operations/helm/tests/global-image-registry/alloy/templates/rbac.yaml @@ -0,0 +1,117 @@ +--- +# Source: alloy/templates/rbac.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: 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 +rules: + # Rules which allow discovery.kubernetes to function. + - apiGroups: + - "" + - "discovery.k8s.io" + - "networking.k8s.io" + resources: + - endpoints + - endpointslices + - ingresses + - nodes + - nodes/proxy + - nodes/metrics + - pods + - services + verbs: + - get + - list + - watch + # Rules which allow loki.source.kubernetes and loki.source.podlogs to work. + - apiGroups: + - "" + resources: + - pods + - pods/log + - namespaces + verbs: + - get + - list + - watch + - apiGroups: + - "monitoring.grafana.com" + resources: + - podlogs + verbs: + - get + - list + - watch + # Rules which allow mimir.rules.kubernetes to work. + - apiGroups: ["monitoring.coreos.com"] + resources: + - prometheusrules + verbs: + - get + - list + - watch + - nonResourceURLs: + - /metrics + verbs: + - get + # Rules for prometheus.kubernetes.* + - apiGroups: ["monitoring.coreos.com"] + resources: + - podmonitors + - servicemonitors + - probes + verbs: + - get + - list + - watch + # Rules which allow eventhandler to work. + - apiGroups: + - "" + resources: + - events + verbs: + - get + - list + - watch + # needed for remote.kubernetes.* + - apiGroups: [""] + resources: + - "configmaps" + - "secrets" + verbs: + - get + - list + - watch + # needed for otelcol.processor.k8sattributes + - apiGroups: ["apps"] + resources: ["replicasets"] + verbs: ["get", "list", "watch"] + - apiGroups: ["extensions"] + resources: ["replicasets"] + verbs: ["get", "list", "watch"] +--- +# Source: alloy/templates/rbac.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: 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 +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: alloy +subjects: + - kind: ServiceAccount + name: alloy + namespace: default diff --git a/operations/helm/tests/global-image-registry/alloy/templates/service.yaml b/operations/helm/tests/global-image-registry/alloy/templates/service.yaml new file mode 100644 index 0000000000..34c0608fd3 --- /dev/null +++ b/operations/helm/tests/global-image-registry/alloy/templates/service.yaml @@ -0,0 +1,23 @@ +--- +# Source: alloy/templates/service.yaml +apiVersion: v1 +kind: Service +metadata: + name: 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: + type: ClusterIP + selector: + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy + internalTrafficPolicy: Cluster + ports: + - name: http-metrics + port: 80 + targetPort: 80 + protocol: "TCP" diff --git a/operations/helm/tests/global-image-registry/alloy/templates/serviceaccount.yaml b/operations/helm/tests/global-image-registry/alloy/templates/serviceaccount.yaml new file mode 100644 index 0000000000..46df991efb --- /dev/null +++ b/operations/helm/tests/global-image-registry/alloy/templates/serviceaccount.yaml @@ -0,0 +1,13 @@ +--- +# Source: alloy/templates/serviceaccount.yaml +apiVersion: v1 +kind: ServiceAccount +metadata: + name: alloy + namespace: default + 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 diff --git a/operations/helm/tests/global-image-registry/grafana-agent/templates/configmap.yaml b/operations/helm/tests/global-image-registry/grafana-agent/templates/configmap.yaml deleted file mode 100644 index 2fdc6f0117..0000000000 --- a/operations/helm/tests/global-image-registry/grafana-agent/templates/configmap.yaml +++ /dev/null @@ -1,42 +0,0 @@ ---- -# Source: grafana-agent/templates/configmap.yaml -apiVersion: v1 -kind: ConfigMap -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -data: - config.river: |- - logging { - level = "info" - format = "logfmt" - } - - discovery.kubernetes "pods" { - role = "pod" - } - - discovery.kubernetes "nodes" { - role = "node" - } - - discovery.kubernetes "services" { - role = "service" - } - - discovery.kubernetes "endpoints" { - role = "endpoints" - } - - discovery.kubernetes "endpointslices" { - role = "endpointslice" - } - - discovery.kubernetes "ingresses" { - role = "ingress" - } diff --git a/operations/helm/tests/global-image-registry/grafana-agent/templates/rbac.yaml b/operations/helm/tests/global-image-registry/grafana-agent/templates/rbac.yaml deleted file mode 100644 index 3765583fb6..0000000000 --- a/operations/helm/tests/global-image-registry/grafana-agent/templates/rbac.yaml +++ /dev/null @@ -1,117 +0,0 @@ ---- -# Source: grafana-agent/templates/rbac.yaml -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -rules: - # Rules which allow discovery.kubernetes to function. - - apiGroups: - - "" - - "discovery.k8s.io" - - "networking.k8s.io" - resources: - - endpoints - - endpointslices - - ingresses - - nodes - - nodes/proxy - - nodes/metrics - - pods - - services - verbs: - - get - - list - - watch - # Rules which allow loki.source.kubernetes and loki.source.podlogs to work. - - apiGroups: - - "" - resources: - - pods - - pods/log - - namespaces - verbs: - - get - - list - - watch - - apiGroups: - - "monitoring.grafana.com" - resources: - - podlogs - verbs: - - get - - list - - watch - # Rules which allow mimir.rules.kubernetes to work. - - apiGroups: ["monitoring.coreos.com"] - resources: - - prometheusrules - verbs: - - get - - list - - watch - - nonResourceURLs: - - /metrics - verbs: - - get - # Rules for prometheus.kubernetes.* - - apiGroups: ["monitoring.coreos.com"] - resources: - - podmonitors - - servicemonitors - - probes - verbs: - - get - - list - - watch - # Rules which allow eventhandler to work. - - apiGroups: - - "" - resources: - - events - verbs: - - get - - list - - watch - # needed for remote.kubernetes.* - - apiGroups: [""] - resources: - - "configmaps" - - "secrets" - verbs: - - get - - list - - watch - # needed for otelcol.processor.k8sattributes - - apiGroups: ["apps"] - resources: ["replicasets"] - verbs: ["get", "list", "watch"] - - apiGroups: ["extensions"] - resources: ["replicasets"] - verbs: ["get", "list", "watch"] ---- -# Source: grafana-agent/templates/rbac.yaml -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: grafana-agent -subjects: - - kind: ServiceAccount - name: grafana-agent - namespace: default diff --git a/operations/helm/tests/global-image-registry/grafana-agent/templates/service.yaml b/operations/helm/tests/global-image-registry/grafana-agent/templates/service.yaml deleted file mode 100644 index c98f79428b..0000000000 --- a/operations/helm/tests/global-image-registry/grafana-agent/templates/service.yaml +++ /dev/null @@ -1,23 +0,0 @@ ---- -# Source: grafana-agent/templates/service.yaml -apiVersion: v1 -kind: Service -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -spec: - type: ClusterIP - selector: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - internalTrafficPolicy: Cluster - ports: - - name: http-metrics - port: 80 - targetPort: 80 - protocol: "TCP" diff --git a/operations/helm/tests/global-image-registry/grafana-agent/templates/serviceaccount.yaml b/operations/helm/tests/global-image-registry/grafana-agent/templates/serviceaccount.yaml deleted file mode 100644 index 65d7e0df38..0000000000 --- a/operations/helm/tests/global-image-registry/grafana-agent/templates/serviceaccount.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# Source: grafana-agent/templates/serviceaccount.yaml -apiVersion: v1 -kind: ServiceAccount -metadata: - name: grafana-agent - namespace: default - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm diff --git a/operations/helm/tests/initcontainers/alloy/templates/configmap.yaml b/operations/helm/tests/initcontainers/alloy/templates/configmap.yaml new file mode 100644 index 0000000000..c9ae77aa1e --- /dev/null +++ b/operations/helm/tests/initcontainers/alloy/templates/configmap.yaml @@ -0,0 +1,42 @@ +--- +# Source: alloy/templates/configmap.yaml +apiVersion: v1 +kind: ConfigMap +metadata: + name: 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 +data: + config.river: |- + logging { + level = "info" + format = "logfmt" + } + + discovery.kubernetes "pods" { + role = "pod" + } + + discovery.kubernetes "nodes" { + role = "node" + } + + discovery.kubernetes "services" { + role = "service" + } + + discovery.kubernetes "endpoints" { + role = "endpoints" + } + + discovery.kubernetes "endpointslices" { + role = "endpointslice" + } + + discovery.kubernetes "ingresses" { + role = "ingress" + } diff --git a/operations/helm/tests/initcontainers/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/initcontainers/alloy/templates/controllers/daemonset.yaml similarity index 83% rename from operations/helm/tests/initcontainers/grafana-agent/templates/controllers/daemonset.yaml rename to operations/helm/tests/initcontainers/alloy/templates/controllers/daemonset.yaml index a6e441ea11..69ac09525d 100644 --- a/operations/helm/tests/initcontainers/grafana-agent/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/initcontainers/alloy/templates/controllers/daemonset.yaml @@ -1,30 +1,30 @@ --- -# Source: grafana-agent/templates/controllers/daemonset.yaml +# Source: alloy/templates/controllers/daemonset.yaml apiVersion: apps/v1 kind: DaemonSet metadata: - name: grafana-agent + name: alloy labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + 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: minReadySeconds: 10 selector: matchLabels: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy template: metadata: annotations: kubectl.kubernetes.io/default-container: alloy labels: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy spec: - serviceAccountName: grafana-agent + serviceAccountName: alloy initContainers: - env: - name: GEOIPUPDATE_ACCOUNT_ID @@ -92,6 +92,6 @@ spec: volumes: - name: config configMap: - name: grafana-agent + name: alloy - mountPath: /etc/geoip name: geoip diff --git a/operations/helm/tests/initcontainers/alloy/templates/rbac.yaml b/operations/helm/tests/initcontainers/alloy/templates/rbac.yaml new file mode 100644 index 0000000000..53ca27544f --- /dev/null +++ b/operations/helm/tests/initcontainers/alloy/templates/rbac.yaml @@ -0,0 +1,117 @@ +--- +# Source: alloy/templates/rbac.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: 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 +rules: + # Rules which allow discovery.kubernetes to function. + - apiGroups: + - "" + - "discovery.k8s.io" + - "networking.k8s.io" + resources: + - endpoints + - endpointslices + - ingresses + - nodes + - nodes/proxy + - nodes/metrics + - pods + - services + verbs: + - get + - list + - watch + # Rules which allow loki.source.kubernetes and loki.source.podlogs to work. + - apiGroups: + - "" + resources: + - pods + - pods/log + - namespaces + verbs: + - get + - list + - watch + - apiGroups: + - "monitoring.grafana.com" + resources: + - podlogs + verbs: + - get + - list + - watch + # Rules which allow mimir.rules.kubernetes to work. + - apiGroups: ["monitoring.coreos.com"] + resources: + - prometheusrules + verbs: + - get + - list + - watch + - nonResourceURLs: + - /metrics + verbs: + - get + # Rules for prometheus.kubernetes.* + - apiGroups: ["monitoring.coreos.com"] + resources: + - podmonitors + - servicemonitors + - probes + verbs: + - get + - list + - watch + # Rules which allow eventhandler to work. + - apiGroups: + - "" + resources: + - events + verbs: + - get + - list + - watch + # needed for remote.kubernetes.* + - apiGroups: [""] + resources: + - "configmaps" + - "secrets" + verbs: + - get + - list + - watch + # needed for otelcol.processor.k8sattributes + - apiGroups: ["apps"] + resources: ["replicasets"] + verbs: ["get", "list", "watch"] + - apiGroups: ["extensions"] + resources: ["replicasets"] + verbs: ["get", "list", "watch"] +--- +# Source: alloy/templates/rbac.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: 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 +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: alloy +subjects: + - kind: ServiceAccount + name: alloy + namespace: default diff --git a/operations/helm/tests/initcontainers/alloy/templates/service.yaml b/operations/helm/tests/initcontainers/alloy/templates/service.yaml new file mode 100644 index 0000000000..34c0608fd3 --- /dev/null +++ b/operations/helm/tests/initcontainers/alloy/templates/service.yaml @@ -0,0 +1,23 @@ +--- +# Source: alloy/templates/service.yaml +apiVersion: v1 +kind: Service +metadata: + name: 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: + type: ClusterIP + selector: + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy + internalTrafficPolicy: Cluster + ports: + - name: http-metrics + port: 80 + targetPort: 80 + protocol: "TCP" diff --git a/operations/helm/tests/initcontainers/alloy/templates/serviceaccount.yaml b/operations/helm/tests/initcontainers/alloy/templates/serviceaccount.yaml new file mode 100644 index 0000000000..46df991efb --- /dev/null +++ b/operations/helm/tests/initcontainers/alloy/templates/serviceaccount.yaml @@ -0,0 +1,13 @@ +--- +# Source: alloy/templates/serviceaccount.yaml +apiVersion: v1 +kind: ServiceAccount +metadata: + name: alloy + namespace: default + 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 diff --git a/operations/helm/tests/initcontainers/grafana-agent/templates/configmap.yaml b/operations/helm/tests/initcontainers/grafana-agent/templates/configmap.yaml deleted file mode 100644 index 2fdc6f0117..0000000000 --- a/operations/helm/tests/initcontainers/grafana-agent/templates/configmap.yaml +++ /dev/null @@ -1,42 +0,0 @@ ---- -# Source: grafana-agent/templates/configmap.yaml -apiVersion: v1 -kind: ConfigMap -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -data: - config.river: |- - logging { - level = "info" - format = "logfmt" - } - - discovery.kubernetes "pods" { - role = "pod" - } - - discovery.kubernetes "nodes" { - role = "node" - } - - discovery.kubernetes "services" { - role = "service" - } - - discovery.kubernetes "endpoints" { - role = "endpoints" - } - - discovery.kubernetes "endpointslices" { - role = "endpointslice" - } - - discovery.kubernetes "ingresses" { - role = "ingress" - } diff --git a/operations/helm/tests/initcontainers/grafana-agent/templates/rbac.yaml b/operations/helm/tests/initcontainers/grafana-agent/templates/rbac.yaml deleted file mode 100644 index 3765583fb6..0000000000 --- a/operations/helm/tests/initcontainers/grafana-agent/templates/rbac.yaml +++ /dev/null @@ -1,117 +0,0 @@ ---- -# Source: grafana-agent/templates/rbac.yaml -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -rules: - # Rules which allow discovery.kubernetes to function. - - apiGroups: - - "" - - "discovery.k8s.io" - - "networking.k8s.io" - resources: - - endpoints - - endpointslices - - ingresses - - nodes - - nodes/proxy - - nodes/metrics - - pods - - services - verbs: - - get - - list - - watch - # Rules which allow loki.source.kubernetes and loki.source.podlogs to work. - - apiGroups: - - "" - resources: - - pods - - pods/log - - namespaces - verbs: - - get - - list - - watch - - apiGroups: - - "monitoring.grafana.com" - resources: - - podlogs - verbs: - - get - - list - - watch - # Rules which allow mimir.rules.kubernetes to work. - - apiGroups: ["monitoring.coreos.com"] - resources: - - prometheusrules - verbs: - - get - - list - - watch - - nonResourceURLs: - - /metrics - verbs: - - get - # Rules for prometheus.kubernetes.* - - apiGroups: ["monitoring.coreos.com"] - resources: - - podmonitors - - servicemonitors - - probes - verbs: - - get - - list - - watch - # Rules which allow eventhandler to work. - - apiGroups: - - "" - resources: - - events - verbs: - - get - - list - - watch - # needed for remote.kubernetes.* - - apiGroups: [""] - resources: - - "configmaps" - - "secrets" - verbs: - - get - - list - - watch - # needed for otelcol.processor.k8sattributes - - apiGroups: ["apps"] - resources: ["replicasets"] - verbs: ["get", "list", "watch"] - - apiGroups: ["extensions"] - resources: ["replicasets"] - verbs: ["get", "list", "watch"] ---- -# Source: grafana-agent/templates/rbac.yaml -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: grafana-agent -subjects: - - kind: ServiceAccount - name: grafana-agent - namespace: default diff --git a/operations/helm/tests/initcontainers/grafana-agent/templates/service.yaml b/operations/helm/tests/initcontainers/grafana-agent/templates/service.yaml deleted file mode 100644 index c98f79428b..0000000000 --- a/operations/helm/tests/initcontainers/grafana-agent/templates/service.yaml +++ /dev/null @@ -1,23 +0,0 @@ ---- -# Source: grafana-agent/templates/service.yaml -apiVersion: v1 -kind: Service -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -spec: - type: ClusterIP - selector: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - internalTrafficPolicy: Cluster - ports: - - name: http-metrics - port: 80 - targetPort: 80 - protocol: "TCP" diff --git a/operations/helm/tests/initcontainers/grafana-agent/templates/serviceaccount.yaml b/operations/helm/tests/initcontainers/grafana-agent/templates/serviceaccount.yaml deleted file mode 100644 index 65d7e0df38..0000000000 --- a/operations/helm/tests/initcontainers/grafana-agent/templates/serviceaccount.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# Source: grafana-agent/templates/serviceaccount.yaml -apiVersion: v1 -kind: ServiceAccount -metadata: - name: grafana-agent - namespace: default - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm diff --git a/operations/helm/tests/local-image-pullsecrets/alloy/templates/configmap.yaml b/operations/helm/tests/local-image-pullsecrets/alloy/templates/configmap.yaml new file mode 100644 index 0000000000..c9ae77aa1e --- /dev/null +++ b/operations/helm/tests/local-image-pullsecrets/alloy/templates/configmap.yaml @@ -0,0 +1,42 @@ +--- +# Source: alloy/templates/configmap.yaml +apiVersion: v1 +kind: ConfigMap +metadata: + name: 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 +data: + config.river: |- + logging { + level = "info" + format = "logfmt" + } + + discovery.kubernetes "pods" { + role = "pod" + } + + discovery.kubernetes "nodes" { + role = "node" + } + + discovery.kubernetes "services" { + role = "service" + } + + discovery.kubernetes "endpoints" { + role = "endpoints" + } + + discovery.kubernetes "endpointslices" { + role = "endpointslice" + } + + discovery.kubernetes "ingresses" { + role = "ingress" + } diff --git a/operations/helm/tests/local-image-pullsecrets/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/local-image-pullsecrets/alloy/templates/controllers/daemonset.yaml similarity index 78% rename from operations/helm/tests/local-image-pullsecrets/grafana-agent/templates/controllers/daemonset.yaml rename to operations/helm/tests/local-image-pullsecrets/alloy/templates/controllers/daemonset.yaml index fe2e40bf2a..83f29f0ce3 100644 --- a/operations/helm/tests/local-image-pullsecrets/grafana-agent/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/local-image-pullsecrets/alloy/templates/controllers/daemonset.yaml @@ -1,30 +1,30 @@ --- -# Source: grafana-agent/templates/controllers/daemonset.yaml +# Source: alloy/templates/controllers/daemonset.yaml apiVersion: apps/v1 kind: DaemonSet metadata: - name: grafana-agent + name: alloy labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + 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: minReadySeconds: 10 selector: matchLabels: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy template: metadata: annotations: kubectl.kubernetes.io/default-container: alloy labels: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy spec: - serviceAccountName: grafana-agent + serviceAccountName: alloy imagePullSecrets: - name: local-cred containers: @@ -73,4 +73,4 @@ spec: volumes: - name: config configMap: - name: grafana-agent + name: alloy diff --git a/operations/helm/tests/local-image-pullsecrets/alloy/templates/rbac.yaml b/operations/helm/tests/local-image-pullsecrets/alloy/templates/rbac.yaml new file mode 100644 index 0000000000..53ca27544f --- /dev/null +++ b/operations/helm/tests/local-image-pullsecrets/alloy/templates/rbac.yaml @@ -0,0 +1,117 @@ +--- +# Source: alloy/templates/rbac.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: 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 +rules: + # Rules which allow discovery.kubernetes to function. + - apiGroups: + - "" + - "discovery.k8s.io" + - "networking.k8s.io" + resources: + - endpoints + - endpointslices + - ingresses + - nodes + - nodes/proxy + - nodes/metrics + - pods + - services + verbs: + - get + - list + - watch + # Rules which allow loki.source.kubernetes and loki.source.podlogs to work. + - apiGroups: + - "" + resources: + - pods + - pods/log + - namespaces + verbs: + - get + - list + - watch + - apiGroups: + - "monitoring.grafana.com" + resources: + - podlogs + verbs: + - get + - list + - watch + # Rules which allow mimir.rules.kubernetes to work. + - apiGroups: ["monitoring.coreos.com"] + resources: + - prometheusrules + verbs: + - get + - list + - watch + - nonResourceURLs: + - /metrics + verbs: + - get + # Rules for prometheus.kubernetes.* + - apiGroups: ["monitoring.coreos.com"] + resources: + - podmonitors + - servicemonitors + - probes + verbs: + - get + - list + - watch + # Rules which allow eventhandler to work. + - apiGroups: + - "" + resources: + - events + verbs: + - get + - list + - watch + # needed for remote.kubernetes.* + - apiGroups: [""] + resources: + - "configmaps" + - "secrets" + verbs: + - get + - list + - watch + # needed for otelcol.processor.k8sattributes + - apiGroups: ["apps"] + resources: ["replicasets"] + verbs: ["get", "list", "watch"] + - apiGroups: ["extensions"] + resources: ["replicasets"] + verbs: ["get", "list", "watch"] +--- +# Source: alloy/templates/rbac.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: 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 +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: alloy +subjects: + - kind: ServiceAccount + name: alloy + namespace: default diff --git a/operations/helm/tests/local-image-pullsecrets/alloy/templates/service.yaml b/operations/helm/tests/local-image-pullsecrets/alloy/templates/service.yaml new file mode 100644 index 0000000000..34c0608fd3 --- /dev/null +++ b/operations/helm/tests/local-image-pullsecrets/alloy/templates/service.yaml @@ -0,0 +1,23 @@ +--- +# Source: alloy/templates/service.yaml +apiVersion: v1 +kind: Service +metadata: + name: 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: + type: ClusterIP + selector: + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy + internalTrafficPolicy: Cluster + ports: + - name: http-metrics + port: 80 + targetPort: 80 + protocol: "TCP" diff --git a/operations/helm/tests/local-image-pullsecrets/alloy/templates/serviceaccount.yaml b/operations/helm/tests/local-image-pullsecrets/alloy/templates/serviceaccount.yaml new file mode 100644 index 0000000000..46df991efb --- /dev/null +++ b/operations/helm/tests/local-image-pullsecrets/alloy/templates/serviceaccount.yaml @@ -0,0 +1,13 @@ +--- +# Source: alloy/templates/serviceaccount.yaml +apiVersion: v1 +kind: ServiceAccount +metadata: + name: alloy + namespace: default + 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 diff --git a/operations/helm/tests/local-image-pullsecrets/grafana-agent/templates/configmap.yaml b/operations/helm/tests/local-image-pullsecrets/grafana-agent/templates/configmap.yaml deleted file mode 100644 index 2fdc6f0117..0000000000 --- a/operations/helm/tests/local-image-pullsecrets/grafana-agent/templates/configmap.yaml +++ /dev/null @@ -1,42 +0,0 @@ ---- -# Source: grafana-agent/templates/configmap.yaml -apiVersion: v1 -kind: ConfigMap -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -data: - config.river: |- - logging { - level = "info" - format = "logfmt" - } - - discovery.kubernetes "pods" { - role = "pod" - } - - discovery.kubernetes "nodes" { - role = "node" - } - - discovery.kubernetes "services" { - role = "service" - } - - discovery.kubernetes "endpoints" { - role = "endpoints" - } - - discovery.kubernetes "endpointslices" { - role = "endpointslice" - } - - discovery.kubernetes "ingresses" { - role = "ingress" - } diff --git a/operations/helm/tests/local-image-pullsecrets/grafana-agent/templates/rbac.yaml b/operations/helm/tests/local-image-pullsecrets/grafana-agent/templates/rbac.yaml deleted file mode 100644 index 3765583fb6..0000000000 --- a/operations/helm/tests/local-image-pullsecrets/grafana-agent/templates/rbac.yaml +++ /dev/null @@ -1,117 +0,0 @@ ---- -# Source: grafana-agent/templates/rbac.yaml -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -rules: - # Rules which allow discovery.kubernetes to function. - - apiGroups: - - "" - - "discovery.k8s.io" - - "networking.k8s.io" - resources: - - endpoints - - endpointslices - - ingresses - - nodes - - nodes/proxy - - nodes/metrics - - pods - - services - verbs: - - get - - list - - watch - # Rules which allow loki.source.kubernetes and loki.source.podlogs to work. - - apiGroups: - - "" - resources: - - pods - - pods/log - - namespaces - verbs: - - get - - list - - watch - - apiGroups: - - "monitoring.grafana.com" - resources: - - podlogs - verbs: - - get - - list - - watch - # Rules which allow mimir.rules.kubernetes to work. - - apiGroups: ["monitoring.coreos.com"] - resources: - - prometheusrules - verbs: - - get - - list - - watch - - nonResourceURLs: - - /metrics - verbs: - - get - # Rules for prometheus.kubernetes.* - - apiGroups: ["monitoring.coreos.com"] - resources: - - podmonitors - - servicemonitors - - probes - verbs: - - get - - list - - watch - # Rules which allow eventhandler to work. - - apiGroups: - - "" - resources: - - events - verbs: - - get - - list - - watch - # needed for remote.kubernetes.* - - apiGroups: [""] - resources: - - "configmaps" - - "secrets" - verbs: - - get - - list - - watch - # needed for otelcol.processor.k8sattributes - - apiGroups: ["apps"] - resources: ["replicasets"] - verbs: ["get", "list", "watch"] - - apiGroups: ["extensions"] - resources: ["replicasets"] - verbs: ["get", "list", "watch"] ---- -# Source: grafana-agent/templates/rbac.yaml -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: grafana-agent -subjects: - - kind: ServiceAccount - name: grafana-agent - namespace: default diff --git a/operations/helm/tests/local-image-pullsecrets/grafana-agent/templates/service.yaml b/operations/helm/tests/local-image-pullsecrets/grafana-agent/templates/service.yaml deleted file mode 100644 index c98f79428b..0000000000 --- a/operations/helm/tests/local-image-pullsecrets/grafana-agent/templates/service.yaml +++ /dev/null @@ -1,23 +0,0 @@ ---- -# Source: grafana-agent/templates/service.yaml -apiVersion: v1 -kind: Service -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -spec: - type: ClusterIP - selector: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - internalTrafficPolicy: Cluster - ports: - - name: http-metrics - port: 80 - targetPort: 80 - protocol: "TCP" diff --git a/operations/helm/tests/local-image-pullsecrets/grafana-agent/templates/serviceaccount.yaml b/operations/helm/tests/local-image-pullsecrets/grafana-agent/templates/serviceaccount.yaml deleted file mode 100644 index 65d7e0df38..0000000000 --- a/operations/helm/tests/local-image-pullsecrets/grafana-agent/templates/serviceaccount.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# Source: grafana-agent/templates/serviceaccount.yaml -apiVersion: v1 -kind: ServiceAccount -metadata: - name: grafana-agent - namespace: default - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm diff --git a/operations/helm/tests/local-image-registry/alloy/templates/configmap.yaml b/operations/helm/tests/local-image-registry/alloy/templates/configmap.yaml new file mode 100644 index 0000000000..c9ae77aa1e --- /dev/null +++ b/operations/helm/tests/local-image-registry/alloy/templates/configmap.yaml @@ -0,0 +1,42 @@ +--- +# Source: alloy/templates/configmap.yaml +apiVersion: v1 +kind: ConfigMap +metadata: + name: 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 +data: + config.river: |- + logging { + level = "info" + format = "logfmt" + } + + discovery.kubernetes "pods" { + role = "pod" + } + + discovery.kubernetes "nodes" { + role = "node" + } + + discovery.kubernetes "services" { + role = "service" + } + + discovery.kubernetes "endpoints" { + role = "endpoints" + } + + discovery.kubernetes "endpointslices" { + role = "endpointslice" + } + + discovery.kubernetes "ingresses" { + role = "ingress" + } diff --git a/operations/helm/tests/local-image-registry/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/local-image-registry/alloy/templates/controllers/daemonset.yaml similarity index 78% rename from operations/helm/tests/local-image-registry/grafana-agent/templates/controllers/daemonset.yaml rename to operations/helm/tests/local-image-registry/alloy/templates/controllers/daemonset.yaml index 2f3ed25026..c066fd7be5 100644 --- a/operations/helm/tests/local-image-registry/grafana-agent/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/local-image-registry/alloy/templates/controllers/daemonset.yaml @@ -1,30 +1,30 @@ --- -# Source: grafana-agent/templates/controllers/daemonset.yaml +# Source: alloy/templates/controllers/daemonset.yaml apiVersion: apps/v1 kind: DaemonSet metadata: - name: grafana-agent + name: alloy labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + 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: minReadySeconds: 10 selector: matchLabels: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy template: metadata: annotations: kubectl.kubernetes.io/default-container: alloy labels: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy spec: - serviceAccountName: grafana-agent + serviceAccountName: alloy containers: - name: alloy image: quay.io/grafana/alloy:v0.40.2 @@ -71,4 +71,4 @@ spec: volumes: - name: config configMap: - name: grafana-agent + name: alloy diff --git a/operations/helm/tests/local-image-registry/alloy/templates/rbac.yaml b/operations/helm/tests/local-image-registry/alloy/templates/rbac.yaml new file mode 100644 index 0000000000..53ca27544f --- /dev/null +++ b/operations/helm/tests/local-image-registry/alloy/templates/rbac.yaml @@ -0,0 +1,117 @@ +--- +# Source: alloy/templates/rbac.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: 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 +rules: + # Rules which allow discovery.kubernetes to function. + - apiGroups: + - "" + - "discovery.k8s.io" + - "networking.k8s.io" + resources: + - endpoints + - endpointslices + - ingresses + - nodes + - nodes/proxy + - nodes/metrics + - pods + - services + verbs: + - get + - list + - watch + # Rules which allow loki.source.kubernetes and loki.source.podlogs to work. + - apiGroups: + - "" + resources: + - pods + - pods/log + - namespaces + verbs: + - get + - list + - watch + - apiGroups: + - "monitoring.grafana.com" + resources: + - podlogs + verbs: + - get + - list + - watch + # Rules which allow mimir.rules.kubernetes to work. + - apiGroups: ["monitoring.coreos.com"] + resources: + - prometheusrules + verbs: + - get + - list + - watch + - nonResourceURLs: + - /metrics + verbs: + - get + # Rules for prometheus.kubernetes.* + - apiGroups: ["monitoring.coreos.com"] + resources: + - podmonitors + - servicemonitors + - probes + verbs: + - get + - list + - watch + # Rules which allow eventhandler to work. + - apiGroups: + - "" + resources: + - events + verbs: + - get + - list + - watch + # needed for remote.kubernetes.* + - apiGroups: [""] + resources: + - "configmaps" + - "secrets" + verbs: + - get + - list + - watch + # needed for otelcol.processor.k8sattributes + - apiGroups: ["apps"] + resources: ["replicasets"] + verbs: ["get", "list", "watch"] + - apiGroups: ["extensions"] + resources: ["replicasets"] + verbs: ["get", "list", "watch"] +--- +# Source: alloy/templates/rbac.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: 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 +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: alloy +subjects: + - kind: ServiceAccount + name: alloy + namespace: default diff --git a/operations/helm/tests/local-image-registry/alloy/templates/service.yaml b/operations/helm/tests/local-image-registry/alloy/templates/service.yaml new file mode 100644 index 0000000000..34c0608fd3 --- /dev/null +++ b/operations/helm/tests/local-image-registry/alloy/templates/service.yaml @@ -0,0 +1,23 @@ +--- +# Source: alloy/templates/service.yaml +apiVersion: v1 +kind: Service +metadata: + name: 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: + type: ClusterIP + selector: + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy + internalTrafficPolicy: Cluster + ports: + - name: http-metrics + port: 80 + targetPort: 80 + protocol: "TCP" diff --git a/operations/helm/tests/local-image-registry/alloy/templates/serviceaccount.yaml b/operations/helm/tests/local-image-registry/alloy/templates/serviceaccount.yaml new file mode 100644 index 0000000000..46df991efb --- /dev/null +++ b/operations/helm/tests/local-image-registry/alloy/templates/serviceaccount.yaml @@ -0,0 +1,13 @@ +--- +# Source: alloy/templates/serviceaccount.yaml +apiVersion: v1 +kind: ServiceAccount +metadata: + name: alloy + namespace: default + 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 diff --git a/operations/helm/tests/local-image-registry/grafana-agent/templates/configmap.yaml b/operations/helm/tests/local-image-registry/grafana-agent/templates/configmap.yaml deleted file mode 100644 index 2fdc6f0117..0000000000 --- a/operations/helm/tests/local-image-registry/grafana-agent/templates/configmap.yaml +++ /dev/null @@ -1,42 +0,0 @@ ---- -# Source: grafana-agent/templates/configmap.yaml -apiVersion: v1 -kind: ConfigMap -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -data: - config.river: |- - logging { - level = "info" - format = "logfmt" - } - - discovery.kubernetes "pods" { - role = "pod" - } - - discovery.kubernetes "nodes" { - role = "node" - } - - discovery.kubernetes "services" { - role = "service" - } - - discovery.kubernetes "endpoints" { - role = "endpoints" - } - - discovery.kubernetes "endpointslices" { - role = "endpointslice" - } - - discovery.kubernetes "ingresses" { - role = "ingress" - } diff --git a/operations/helm/tests/local-image-registry/grafana-agent/templates/rbac.yaml b/operations/helm/tests/local-image-registry/grafana-agent/templates/rbac.yaml deleted file mode 100644 index 3765583fb6..0000000000 --- a/operations/helm/tests/local-image-registry/grafana-agent/templates/rbac.yaml +++ /dev/null @@ -1,117 +0,0 @@ ---- -# Source: grafana-agent/templates/rbac.yaml -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -rules: - # Rules which allow discovery.kubernetes to function. - - apiGroups: - - "" - - "discovery.k8s.io" - - "networking.k8s.io" - resources: - - endpoints - - endpointslices - - ingresses - - nodes - - nodes/proxy - - nodes/metrics - - pods - - services - verbs: - - get - - list - - watch - # Rules which allow loki.source.kubernetes and loki.source.podlogs to work. - - apiGroups: - - "" - resources: - - pods - - pods/log - - namespaces - verbs: - - get - - list - - watch - - apiGroups: - - "monitoring.grafana.com" - resources: - - podlogs - verbs: - - get - - list - - watch - # Rules which allow mimir.rules.kubernetes to work. - - apiGroups: ["monitoring.coreos.com"] - resources: - - prometheusrules - verbs: - - get - - list - - watch - - nonResourceURLs: - - /metrics - verbs: - - get - # Rules for prometheus.kubernetes.* - - apiGroups: ["monitoring.coreos.com"] - resources: - - podmonitors - - servicemonitors - - probes - verbs: - - get - - list - - watch - # Rules which allow eventhandler to work. - - apiGroups: - - "" - resources: - - events - verbs: - - get - - list - - watch - # needed for remote.kubernetes.* - - apiGroups: [""] - resources: - - "configmaps" - - "secrets" - verbs: - - get - - list - - watch - # needed for otelcol.processor.k8sattributes - - apiGroups: ["apps"] - resources: ["replicasets"] - verbs: ["get", "list", "watch"] - - apiGroups: ["extensions"] - resources: ["replicasets"] - verbs: ["get", "list", "watch"] ---- -# Source: grafana-agent/templates/rbac.yaml -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: grafana-agent -subjects: - - kind: ServiceAccount - name: grafana-agent - namespace: default diff --git a/operations/helm/tests/local-image-registry/grafana-agent/templates/service.yaml b/operations/helm/tests/local-image-registry/grafana-agent/templates/service.yaml deleted file mode 100644 index c98f79428b..0000000000 --- a/operations/helm/tests/local-image-registry/grafana-agent/templates/service.yaml +++ /dev/null @@ -1,23 +0,0 @@ ---- -# Source: grafana-agent/templates/service.yaml -apiVersion: v1 -kind: Service -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -spec: - type: ClusterIP - selector: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - internalTrafficPolicy: Cluster - ports: - - name: http-metrics - port: 80 - targetPort: 80 - protocol: "TCP" diff --git a/operations/helm/tests/local-image-registry/grafana-agent/templates/serviceaccount.yaml b/operations/helm/tests/local-image-registry/grafana-agent/templates/serviceaccount.yaml deleted file mode 100644 index 65d7e0df38..0000000000 --- a/operations/helm/tests/local-image-registry/grafana-agent/templates/serviceaccount.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# Source: grafana-agent/templates/serviceaccount.yaml -apiVersion: v1 -kind: ServiceAccount -metadata: - name: grafana-agent - namespace: default - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm diff --git a/operations/helm/tests/nodeselectors-and-tolerations/alloy/templates/configmap.yaml b/operations/helm/tests/nodeselectors-and-tolerations/alloy/templates/configmap.yaml new file mode 100644 index 0000000000..c9ae77aa1e --- /dev/null +++ b/operations/helm/tests/nodeselectors-and-tolerations/alloy/templates/configmap.yaml @@ -0,0 +1,42 @@ +--- +# Source: alloy/templates/configmap.yaml +apiVersion: v1 +kind: ConfigMap +metadata: + name: 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 +data: + config.river: |- + logging { + level = "info" + format = "logfmt" + } + + discovery.kubernetes "pods" { + role = "pod" + } + + discovery.kubernetes "nodes" { + role = "node" + } + + discovery.kubernetes "services" { + role = "service" + } + + discovery.kubernetes "endpoints" { + role = "endpoints" + } + + discovery.kubernetes "endpointslices" { + role = "endpointslice" + } + + discovery.kubernetes "ingresses" { + role = "ingress" + } diff --git a/operations/helm/tests/nodeselectors-and-tolerations/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/nodeselectors-and-tolerations/alloy/templates/controllers/daemonset.yaml similarity index 80% rename from operations/helm/tests/nodeselectors-and-tolerations/grafana-agent/templates/controllers/daemonset.yaml rename to operations/helm/tests/nodeselectors-and-tolerations/alloy/templates/controllers/daemonset.yaml index 8fdfbd71c9..32b03746c8 100644 --- a/operations/helm/tests/nodeselectors-and-tolerations/grafana-agent/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/nodeselectors-and-tolerations/alloy/templates/controllers/daemonset.yaml @@ -1,30 +1,30 @@ --- -# Source: grafana-agent/templates/controllers/daemonset.yaml +# Source: alloy/templates/controllers/daemonset.yaml apiVersion: apps/v1 kind: DaemonSet metadata: - name: grafana-agent + name: alloy labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + 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: minReadySeconds: 10 selector: matchLabels: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy template: metadata: annotations: kubectl.kubernetes.io/default-container: alloy labels: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy spec: - serviceAccountName: grafana-agent + serviceAccountName: alloy containers: - name: alloy image: docker.io/grafana/alloy:v0.40.2 @@ -81,4 +81,4 @@ spec: volumes: - name: config configMap: - name: grafana-agent + name: alloy diff --git a/operations/helm/tests/nodeselectors-and-tolerations/alloy/templates/rbac.yaml b/operations/helm/tests/nodeselectors-and-tolerations/alloy/templates/rbac.yaml new file mode 100644 index 0000000000..53ca27544f --- /dev/null +++ b/operations/helm/tests/nodeselectors-and-tolerations/alloy/templates/rbac.yaml @@ -0,0 +1,117 @@ +--- +# Source: alloy/templates/rbac.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: 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 +rules: + # Rules which allow discovery.kubernetes to function. + - apiGroups: + - "" + - "discovery.k8s.io" + - "networking.k8s.io" + resources: + - endpoints + - endpointslices + - ingresses + - nodes + - nodes/proxy + - nodes/metrics + - pods + - services + verbs: + - get + - list + - watch + # Rules which allow loki.source.kubernetes and loki.source.podlogs to work. + - apiGroups: + - "" + resources: + - pods + - pods/log + - namespaces + verbs: + - get + - list + - watch + - apiGroups: + - "monitoring.grafana.com" + resources: + - podlogs + verbs: + - get + - list + - watch + # Rules which allow mimir.rules.kubernetes to work. + - apiGroups: ["monitoring.coreos.com"] + resources: + - prometheusrules + verbs: + - get + - list + - watch + - nonResourceURLs: + - /metrics + verbs: + - get + # Rules for prometheus.kubernetes.* + - apiGroups: ["monitoring.coreos.com"] + resources: + - podmonitors + - servicemonitors + - probes + verbs: + - get + - list + - watch + # Rules which allow eventhandler to work. + - apiGroups: + - "" + resources: + - events + verbs: + - get + - list + - watch + # needed for remote.kubernetes.* + - apiGroups: [""] + resources: + - "configmaps" + - "secrets" + verbs: + - get + - list + - watch + # needed for otelcol.processor.k8sattributes + - apiGroups: ["apps"] + resources: ["replicasets"] + verbs: ["get", "list", "watch"] + - apiGroups: ["extensions"] + resources: ["replicasets"] + verbs: ["get", "list", "watch"] +--- +# Source: alloy/templates/rbac.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: 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 +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: alloy +subjects: + - kind: ServiceAccount + name: alloy + namespace: default diff --git a/operations/helm/tests/nodeselectors-and-tolerations/alloy/templates/service.yaml b/operations/helm/tests/nodeselectors-and-tolerations/alloy/templates/service.yaml new file mode 100644 index 0000000000..34c0608fd3 --- /dev/null +++ b/operations/helm/tests/nodeselectors-and-tolerations/alloy/templates/service.yaml @@ -0,0 +1,23 @@ +--- +# Source: alloy/templates/service.yaml +apiVersion: v1 +kind: Service +metadata: + name: 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: + type: ClusterIP + selector: + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy + internalTrafficPolicy: Cluster + ports: + - name: http-metrics + port: 80 + targetPort: 80 + protocol: "TCP" diff --git a/operations/helm/tests/nodeselectors-and-tolerations/alloy/templates/serviceaccount.yaml b/operations/helm/tests/nodeselectors-and-tolerations/alloy/templates/serviceaccount.yaml new file mode 100644 index 0000000000..46df991efb --- /dev/null +++ b/operations/helm/tests/nodeselectors-and-tolerations/alloy/templates/serviceaccount.yaml @@ -0,0 +1,13 @@ +--- +# Source: alloy/templates/serviceaccount.yaml +apiVersion: v1 +kind: ServiceAccount +metadata: + name: alloy + namespace: default + 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 diff --git a/operations/helm/tests/nodeselectors-and-tolerations/grafana-agent/templates/configmap.yaml b/operations/helm/tests/nodeselectors-and-tolerations/grafana-agent/templates/configmap.yaml deleted file mode 100644 index 2fdc6f0117..0000000000 --- a/operations/helm/tests/nodeselectors-and-tolerations/grafana-agent/templates/configmap.yaml +++ /dev/null @@ -1,42 +0,0 @@ ---- -# Source: grafana-agent/templates/configmap.yaml -apiVersion: v1 -kind: ConfigMap -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -data: - config.river: |- - logging { - level = "info" - format = "logfmt" - } - - discovery.kubernetes "pods" { - role = "pod" - } - - discovery.kubernetes "nodes" { - role = "node" - } - - discovery.kubernetes "services" { - role = "service" - } - - discovery.kubernetes "endpoints" { - role = "endpoints" - } - - discovery.kubernetes "endpointslices" { - role = "endpointslice" - } - - discovery.kubernetes "ingresses" { - role = "ingress" - } diff --git a/operations/helm/tests/nodeselectors-and-tolerations/grafana-agent/templates/rbac.yaml b/operations/helm/tests/nodeselectors-and-tolerations/grafana-agent/templates/rbac.yaml deleted file mode 100644 index 3765583fb6..0000000000 --- a/operations/helm/tests/nodeselectors-and-tolerations/grafana-agent/templates/rbac.yaml +++ /dev/null @@ -1,117 +0,0 @@ ---- -# Source: grafana-agent/templates/rbac.yaml -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -rules: - # Rules which allow discovery.kubernetes to function. - - apiGroups: - - "" - - "discovery.k8s.io" - - "networking.k8s.io" - resources: - - endpoints - - endpointslices - - ingresses - - nodes - - nodes/proxy - - nodes/metrics - - pods - - services - verbs: - - get - - list - - watch - # Rules which allow loki.source.kubernetes and loki.source.podlogs to work. - - apiGroups: - - "" - resources: - - pods - - pods/log - - namespaces - verbs: - - get - - list - - watch - - apiGroups: - - "monitoring.grafana.com" - resources: - - podlogs - verbs: - - get - - list - - watch - # Rules which allow mimir.rules.kubernetes to work. - - apiGroups: ["monitoring.coreos.com"] - resources: - - prometheusrules - verbs: - - get - - list - - watch - - nonResourceURLs: - - /metrics - verbs: - - get - # Rules for prometheus.kubernetes.* - - apiGroups: ["monitoring.coreos.com"] - resources: - - podmonitors - - servicemonitors - - probes - verbs: - - get - - list - - watch - # Rules which allow eventhandler to work. - - apiGroups: - - "" - resources: - - events - verbs: - - get - - list - - watch - # needed for remote.kubernetes.* - - apiGroups: [""] - resources: - - "configmaps" - - "secrets" - verbs: - - get - - list - - watch - # needed for otelcol.processor.k8sattributes - - apiGroups: ["apps"] - resources: ["replicasets"] - verbs: ["get", "list", "watch"] - - apiGroups: ["extensions"] - resources: ["replicasets"] - verbs: ["get", "list", "watch"] ---- -# Source: grafana-agent/templates/rbac.yaml -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: grafana-agent -subjects: - - kind: ServiceAccount - name: grafana-agent - namespace: default diff --git a/operations/helm/tests/nodeselectors-and-tolerations/grafana-agent/templates/service.yaml b/operations/helm/tests/nodeselectors-and-tolerations/grafana-agent/templates/service.yaml deleted file mode 100644 index c98f79428b..0000000000 --- a/operations/helm/tests/nodeselectors-and-tolerations/grafana-agent/templates/service.yaml +++ /dev/null @@ -1,23 +0,0 @@ ---- -# Source: grafana-agent/templates/service.yaml -apiVersion: v1 -kind: Service -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -spec: - type: ClusterIP - selector: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - internalTrafficPolicy: Cluster - ports: - - name: http-metrics - port: 80 - targetPort: 80 - protocol: "TCP" diff --git a/operations/helm/tests/nodeselectors-and-tolerations/grafana-agent/templates/serviceaccount.yaml b/operations/helm/tests/nodeselectors-and-tolerations/grafana-agent/templates/serviceaccount.yaml deleted file mode 100644 index 65d7e0df38..0000000000 --- a/operations/helm/tests/nodeselectors-and-tolerations/grafana-agent/templates/serviceaccount.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# Source: grafana-agent/templates/serviceaccount.yaml -apiVersion: v1 -kind: ServiceAccount -metadata: - name: grafana-agent - namespace: default - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm diff --git a/operations/helm/tests/pod_annotations/alloy/templates/configmap.yaml b/operations/helm/tests/pod_annotations/alloy/templates/configmap.yaml new file mode 100644 index 0000000000..c9ae77aa1e --- /dev/null +++ b/operations/helm/tests/pod_annotations/alloy/templates/configmap.yaml @@ -0,0 +1,42 @@ +--- +# Source: alloy/templates/configmap.yaml +apiVersion: v1 +kind: ConfigMap +metadata: + name: 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 +data: + config.river: |- + logging { + level = "info" + format = "logfmt" + } + + discovery.kubernetes "pods" { + role = "pod" + } + + discovery.kubernetes "nodes" { + role = "node" + } + + discovery.kubernetes "services" { + role = "service" + } + + discovery.kubernetes "endpoints" { + role = "endpoints" + } + + discovery.kubernetes "endpointslices" { + role = "endpointslice" + } + + discovery.kubernetes "ingresses" { + role = "ingress" + } diff --git a/operations/helm/tests/pod_annotations/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/pod_annotations/alloy/templates/controllers/daemonset.yaml similarity index 78% rename from operations/helm/tests/pod_annotations/grafana-agent/templates/controllers/daemonset.yaml rename to operations/helm/tests/pod_annotations/alloy/templates/controllers/daemonset.yaml index 0cdcbbe73a..557600ede9 100644 --- a/operations/helm/tests/pod_annotations/grafana-agent/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/pod_annotations/alloy/templates/controllers/daemonset.yaml @@ -1,31 +1,31 @@ --- -# Source: grafana-agent/templates/controllers/daemonset.yaml +# Source: alloy/templates/controllers/daemonset.yaml apiVersion: apps/v1 kind: DaemonSet metadata: - name: grafana-agent + name: alloy labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + 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: minReadySeconds: 10 selector: matchLabels: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy template: metadata: annotations: kubectl.kubernetes.io/default-container: alloy testAnnotationKey: testAnnotationValue labels: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy spec: - serviceAccountName: grafana-agent + serviceAccountName: alloy containers: - name: alloy image: docker.io/grafana/alloy:v0.40.2 @@ -72,4 +72,4 @@ spec: volumes: - name: config configMap: - name: grafana-agent + name: alloy diff --git a/operations/helm/tests/pod_annotations/alloy/templates/rbac.yaml b/operations/helm/tests/pod_annotations/alloy/templates/rbac.yaml new file mode 100644 index 0000000000..53ca27544f --- /dev/null +++ b/operations/helm/tests/pod_annotations/alloy/templates/rbac.yaml @@ -0,0 +1,117 @@ +--- +# Source: alloy/templates/rbac.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: 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 +rules: + # Rules which allow discovery.kubernetes to function. + - apiGroups: + - "" + - "discovery.k8s.io" + - "networking.k8s.io" + resources: + - endpoints + - endpointslices + - ingresses + - nodes + - nodes/proxy + - nodes/metrics + - pods + - services + verbs: + - get + - list + - watch + # Rules which allow loki.source.kubernetes and loki.source.podlogs to work. + - apiGroups: + - "" + resources: + - pods + - pods/log + - namespaces + verbs: + - get + - list + - watch + - apiGroups: + - "monitoring.grafana.com" + resources: + - podlogs + verbs: + - get + - list + - watch + # Rules which allow mimir.rules.kubernetes to work. + - apiGroups: ["monitoring.coreos.com"] + resources: + - prometheusrules + verbs: + - get + - list + - watch + - nonResourceURLs: + - /metrics + verbs: + - get + # Rules for prometheus.kubernetes.* + - apiGroups: ["monitoring.coreos.com"] + resources: + - podmonitors + - servicemonitors + - probes + verbs: + - get + - list + - watch + # Rules which allow eventhandler to work. + - apiGroups: + - "" + resources: + - events + verbs: + - get + - list + - watch + # needed for remote.kubernetes.* + - apiGroups: [""] + resources: + - "configmaps" + - "secrets" + verbs: + - get + - list + - watch + # needed for otelcol.processor.k8sattributes + - apiGroups: ["apps"] + resources: ["replicasets"] + verbs: ["get", "list", "watch"] + - apiGroups: ["extensions"] + resources: ["replicasets"] + verbs: ["get", "list", "watch"] +--- +# Source: alloy/templates/rbac.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: 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 +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: alloy +subjects: + - kind: ServiceAccount + name: alloy + namespace: default diff --git a/operations/helm/tests/pod_annotations/alloy/templates/service.yaml b/operations/helm/tests/pod_annotations/alloy/templates/service.yaml new file mode 100644 index 0000000000..34c0608fd3 --- /dev/null +++ b/operations/helm/tests/pod_annotations/alloy/templates/service.yaml @@ -0,0 +1,23 @@ +--- +# Source: alloy/templates/service.yaml +apiVersion: v1 +kind: Service +metadata: + name: 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: + type: ClusterIP + selector: + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy + internalTrafficPolicy: Cluster + ports: + - name: http-metrics + port: 80 + targetPort: 80 + protocol: "TCP" diff --git a/operations/helm/tests/pod_annotations/alloy/templates/serviceaccount.yaml b/operations/helm/tests/pod_annotations/alloy/templates/serviceaccount.yaml new file mode 100644 index 0000000000..46df991efb --- /dev/null +++ b/operations/helm/tests/pod_annotations/alloy/templates/serviceaccount.yaml @@ -0,0 +1,13 @@ +--- +# Source: alloy/templates/serviceaccount.yaml +apiVersion: v1 +kind: ServiceAccount +metadata: + name: alloy + namespace: default + 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 diff --git a/operations/helm/tests/pod_annotations/grafana-agent/templates/configmap.yaml b/operations/helm/tests/pod_annotations/grafana-agent/templates/configmap.yaml deleted file mode 100644 index 2fdc6f0117..0000000000 --- a/operations/helm/tests/pod_annotations/grafana-agent/templates/configmap.yaml +++ /dev/null @@ -1,42 +0,0 @@ ---- -# Source: grafana-agent/templates/configmap.yaml -apiVersion: v1 -kind: ConfigMap -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -data: - config.river: |- - logging { - level = "info" - format = "logfmt" - } - - discovery.kubernetes "pods" { - role = "pod" - } - - discovery.kubernetes "nodes" { - role = "node" - } - - discovery.kubernetes "services" { - role = "service" - } - - discovery.kubernetes "endpoints" { - role = "endpoints" - } - - discovery.kubernetes "endpointslices" { - role = "endpointslice" - } - - discovery.kubernetes "ingresses" { - role = "ingress" - } diff --git a/operations/helm/tests/pod_annotations/grafana-agent/templates/rbac.yaml b/operations/helm/tests/pod_annotations/grafana-agent/templates/rbac.yaml deleted file mode 100644 index 3765583fb6..0000000000 --- a/operations/helm/tests/pod_annotations/grafana-agent/templates/rbac.yaml +++ /dev/null @@ -1,117 +0,0 @@ ---- -# Source: grafana-agent/templates/rbac.yaml -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -rules: - # Rules which allow discovery.kubernetes to function. - - apiGroups: - - "" - - "discovery.k8s.io" - - "networking.k8s.io" - resources: - - endpoints - - endpointslices - - ingresses - - nodes - - nodes/proxy - - nodes/metrics - - pods - - services - verbs: - - get - - list - - watch - # Rules which allow loki.source.kubernetes and loki.source.podlogs to work. - - apiGroups: - - "" - resources: - - pods - - pods/log - - namespaces - verbs: - - get - - list - - watch - - apiGroups: - - "monitoring.grafana.com" - resources: - - podlogs - verbs: - - get - - list - - watch - # Rules which allow mimir.rules.kubernetes to work. - - apiGroups: ["monitoring.coreos.com"] - resources: - - prometheusrules - verbs: - - get - - list - - watch - - nonResourceURLs: - - /metrics - verbs: - - get - # Rules for prometheus.kubernetes.* - - apiGroups: ["monitoring.coreos.com"] - resources: - - podmonitors - - servicemonitors - - probes - verbs: - - get - - list - - watch - # Rules which allow eventhandler to work. - - apiGroups: - - "" - resources: - - events - verbs: - - get - - list - - watch - # needed for remote.kubernetes.* - - apiGroups: [""] - resources: - - "configmaps" - - "secrets" - verbs: - - get - - list - - watch - # needed for otelcol.processor.k8sattributes - - apiGroups: ["apps"] - resources: ["replicasets"] - verbs: ["get", "list", "watch"] - - apiGroups: ["extensions"] - resources: ["replicasets"] - verbs: ["get", "list", "watch"] ---- -# Source: grafana-agent/templates/rbac.yaml -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: grafana-agent -subjects: - - kind: ServiceAccount - name: grafana-agent - namespace: default diff --git a/operations/helm/tests/pod_annotations/grafana-agent/templates/service.yaml b/operations/helm/tests/pod_annotations/grafana-agent/templates/service.yaml deleted file mode 100644 index c98f79428b..0000000000 --- a/operations/helm/tests/pod_annotations/grafana-agent/templates/service.yaml +++ /dev/null @@ -1,23 +0,0 @@ ---- -# Source: grafana-agent/templates/service.yaml -apiVersion: v1 -kind: Service -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -spec: - type: ClusterIP - selector: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - internalTrafficPolicy: Cluster - ports: - - name: http-metrics - port: 80 - targetPort: 80 - protocol: "TCP" diff --git a/operations/helm/tests/pod_annotations/grafana-agent/templates/serviceaccount.yaml b/operations/helm/tests/pod_annotations/grafana-agent/templates/serviceaccount.yaml deleted file mode 100644 index 65d7e0df38..0000000000 --- a/operations/helm/tests/pod_annotations/grafana-agent/templates/serviceaccount.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# Source: grafana-agent/templates/serviceaccount.yaml -apiVersion: v1 -kind: ServiceAccount -metadata: - name: grafana-agent - namespace: default - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm diff --git a/operations/helm/tests/sidecars/alloy/templates/configmap.yaml b/operations/helm/tests/sidecars/alloy/templates/configmap.yaml new file mode 100644 index 0000000000..c9ae77aa1e --- /dev/null +++ b/operations/helm/tests/sidecars/alloy/templates/configmap.yaml @@ -0,0 +1,42 @@ +--- +# Source: alloy/templates/configmap.yaml +apiVersion: v1 +kind: ConfigMap +metadata: + name: 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 +data: + config.river: |- + logging { + level = "info" + format = "logfmt" + } + + discovery.kubernetes "pods" { + role = "pod" + } + + discovery.kubernetes "nodes" { + role = "node" + } + + discovery.kubernetes "services" { + role = "service" + } + + discovery.kubernetes "endpoints" { + role = "endpoints" + } + + discovery.kubernetes "endpointslices" { + role = "endpointslice" + } + + discovery.kubernetes "ingresses" { + role = "ingress" + } diff --git a/operations/helm/tests/sidecars/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/sidecars/alloy/templates/controllers/daemonset.yaml similarity index 83% rename from operations/helm/tests/sidecars/grafana-agent/templates/controllers/daemonset.yaml rename to operations/helm/tests/sidecars/alloy/templates/controllers/daemonset.yaml index 410fa04519..6f21c3078b 100644 --- a/operations/helm/tests/sidecars/grafana-agent/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/sidecars/alloy/templates/controllers/daemonset.yaml @@ -1,30 +1,30 @@ --- -# Source: grafana-agent/templates/controllers/daemonset.yaml +# Source: alloy/templates/controllers/daemonset.yaml apiVersion: apps/v1 kind: DaemonSet metadata: - name: grafana-agent + name: alloy labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + 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: minReadySeconds: 10 selector: matchLabels: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy template: metadata: annotations: kubectl.kubernetes.io/default-container: alloy labels: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy spec: - serviceAccountName: grafana-agent + serviceAccountName: alloy containers: - name: alloy image: docker.io/grafana/alloy:v0.40.2 @@ -91,6 +91,6 @@ spec: volumes: - name: config configMap: - name: grafana-agent + name: alloy - mountPath: /etc/geoip name: geoip diff --git a/operations/helm/tests/sidecars/alloy/templates/rbac.yaml b/operations/helm/tests/sidecars/alloy/templates/rbac.yaml new file mode 100644 index 0000000000..53ca27544f --- /dev/null +++ b/operations/helm/tests/sidecars/alloy/templates/rbac.yaml @@ -0,0 +1,117 @@ +--- +# Source: alloy/templates/rbac.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: 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 +rules: + # Rules which allow discovery.kubernetes to function. + - apiGroups: + - "" + - "discovery.k8s.io" + - "networking.k8s.io" + resources: + - endpoints + - endpointslices + - ingresses + - nodes + - nodes/proxy + - nodes/metrics + - pods + - services + verbs: + - get + - list + - watch + # Rules which allow loki.source.kubernetes and loki.source.podlogs to work. + - apiGroups: + - "" + resources: + - pods + - pods/log + - namespaces + verbs: + - get + - list + - watch + - apiGroups: + - "monitoring.grafana.com" + resources: + - podlogs + verbs: + - get + - list + - watch + # Rules which allow mimir.rules.kubernetes to work. + - apiGroups: ["monitoring.coreos.com"] + resources: + - prometheusrules + verbs: + - get + - list + - watch + - nonResourceURLs: + - /metrics + verbs: + - get + # Rules for prometheus.kubernetes.* + - apiGroups: ["monitoring.coreos.com"] + resources: + - podmonitors + - servicemonitors + - probes + verbs: + - get + - list + - watch + # Rules which allow eventhandler to work. + - apiGroups: + - "" + resources: + - events + verbs: + - get + - list + - watch + # needed for remote.kubernetes.* + - apiGroups: [""] + resources: + - "configmaps" + - "secrets" + verbs: + - get + - list + - watch + # needed for otelcol.processor.k8sattributes + - apiGroups: ["apps"] + resources: ["replicasets"] + verbs: ["get", "list", "watch"] + - apiGroups: ["extensions"] + resources: ["replicasets"] + verbs: ["get", "list", "watch"] +--- +# Source: alloy/templates/rbac.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: 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 +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: alloy +subjects: + - kind: ServiceAccount + name: alloy + namespace: default diff --git a/operations/helm/tests/sidecars/alloy/templates/service.yaml b/operations/helm/tests/sidecars/alloy/templates/service.yaml new file mode 100644 index 0000000000..34c0608fd3 --- /dev/null +++ b/operations/helm/tests/sidecars/alloy/templates/service.yaml @@ -0,0 +1,23 @@ +--- +# Source: alloy/templates/service.yaml +apiVersion: v1 +kind: Service +metadata: + name: 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: + type: ClusterIP + selector: + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy + internalTrafficPolicy: Cluster + ports: + - name: http-metrics + port: 80 + targetPort: 80 + protocol: "TCP" diff --git a/operations/helm/tests/sidecars/alloy/templates/serviceaccount.yaml b/operations/helm/tests/sidecars/alloy/templates/serviceaccount.yaml new file mode 100644 index 0000000000..46df991efb --- /dev/null +++ b/operations/helm/tests/sidecars/alloy/templates/serviceaccount.yaml @@ -0,0 +1,13 @@ +--- +# Source: alloy/templates/serviceaccount.yaml +apiVersion: v1 +kind: ServiceAccount +metadata: + name: alloy + namespace: default + 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 diff --git a/operations/helm/tests/sidecars/grafana-agent/templates/configmap.yaml b/operations/helm/tests/sidecars/grafana-agent/templates/configmap.yaml deleted file mode 100644 index 2fdc6f0117..0000000000 --- a/operations/helm/tests/sidecars/grafana-agent/templates/configmap.yaml +++ /dev/null @@ -1,42 +0,0 @@ ---- -# Source: grafana-agent/templates/configmap.yaml -apiVersion: v1 -kind: ConfigMap -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -data: - config.river: |- - logging { - level = "info" - format = "logfmt" - } - - discovery.kubernetes "pods" { - role = "pod" - } - - discovery.kubernetes "nodes" { - role = "node" - } - - discovery.kubernetes "services" { - role = "service" - } - - discovery.kubernetes "endpoints" { - role = "endpoints" - } - - discovery.kubernetes "endpointslices" { - role = "endpointslice" - } - - discovery.kubernetes "ingresses" { - role = "ingress" - } diff --git a/operations/helm/tests/sidecars/grafana-agent/templates/rbac.yaml b/operations/helm/tests/sidecars/grafana-agent/templates/rbac.yaml deleted file mode 100644 index 3765583fb6..0000000000 --- a/operations/helm/tests/sidecars/grafana-agent/templates/rbac.yaml +++ /dev/null @@ -1,117 +0,0 @@ ---- -# Source: grafana-agent/templates/rbac.yaml -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -rules: - # Rules which allow discovery.kubernetes to function. - - apiGroups: - - "" - - "discovery.k8s.io" - - "networking.k8s.io" - resources: - - endpoints - - endpointslices - - ingresses - - nodes - - nodes/proxy - - nodes/metrics - - pods - - services - verbs: - - get - - list - - watch - # Rules which allow loki.source.kubernetes and loki.source.podlogs to work. - - apiGroups: - - "" - resources: - - pods - - pods/log - - namespaces - verbs: - - get - - list - - watch - - apiGroups: - - "monitoring.grafana.com" - resources: - - podlogs - verbs: - - get - - list - - watch - # Rules which allow mimir.rules.kubernetes to work. - - apiGroups: ["monitoring.coreos.com"] - resources: - - prometheusrules - verbs: - - get - - list - - watch - - nonResourceURLs: - - /metrics - verbs: - - get - # Rules for prometheus.kubernetes.* - - apiGroups: ["monitoring.coreos.com"] - resources: - - podmonitors - - servicemonitors - - probes - verbs: - - get - - list - - watch - # Rules which allow eventhandler to work. - - apiGroups: - - "" - resources: - - events - verbs: - - get - - list - - watch - # needed for remote.kubernetes.* - - apiGroups: [""] - resources: - - "configmaps" - - "secrets" - verbs: - - get - - list - - watch - # needed for otelcol.processor.k8sattributes - - apiGroups: ["apps"] - resources: ["replicasets"] - verbs: ["get", "list", "watch"] - - apiGroups: ["extensions"] - resources: ["replicasets"] - verbs: ["get", "list", "watch"] ---- -# Source: grafana-agent/templates/rbac.yaml -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: grafana-agent -subjects: - - kind: ServiceAccount - name: grafana-agent - namespace: default diff --git a/operations/helm/tests/sidecars/grafana-agent/templates/service.yaml b/operations/helm/tests/sidecars/grafana-agent/templates/service.yaml deleted file mode 100644 index c98f79428b..0000000000 --- a/operations/helm/tests/sidecars/grafana-agent/templates/service.yaml +++ /dev/null @@ -1,23 +0,0 @@ ---- -# Source: grafana-agent/templates/service.yaml -apiVersion: v1 -kind: Service -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -spec: - type: ClusterIP - selector: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - internalTrafficPolicy: Cluster - ports: - - name: http-metrics - port: 80 - targetPort: 80 - protocol: "TCP" diff --git a/operations/helm/tests/sidecars/grafana-agent/templates/serviceaccount.yaml b/operations/helm/tests/sidecars/grafana-agent/templates/serviceaccount.yaml deleted file mode 100644 index 65d7e0df38..0000000000 --- a/operations/helm/tests/sidecars/grafana-agent/templates/serviceaccount.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# Source: grafana-agent/templates/serviceaccount.yaml -apiVersion: v1 -kind: ServiceAccount -metadata: - name: grafana-agent - namespace: default - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm diff --git a/operations/helm/tests/topologyspreadconstraints/alloy/templates/configmap.yaml b/operations/helm/tests/topologyspreadconstraints/alloy/templates/configmap.yaml new file mode 100644 index 0000000000..c9ae77aa1e --- /dev/null +++ b/operations/helm/tests/topologyspreadconstraints/alloy/templates/configmap.yaml @@ -0,0 +1,42 @@ +--- +# Source: alloy/templates/configmap.yaml +apiVersion: v1 +kind: ConfigMap +metadata: + name: 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 +data: + config.river: |- + logging { + level = "info" + format = "logfmt" + } + + discovery.kubernetes "pods" { + role = "pod" + } + + discovery.kubernetes "nodes" { + role = "node" + } + + discovery.kubernetes "services" { + role = "service" + } + + discovery.kubernetes "endpoints" { + role = "endpoints" + } + + discovery.kubernetes "endpointslices" { + role = "endpointslice" + } + + discovery.kubernetes "ingresses" { + role = "ingress" + } diff --git a/operations/helm/tests/topologyspreadconstraints/grafana-agent/templates/controllers/deployment.yaml b/operations/helm/tests/topologyspreadconstraints/alloy/templates/controllers/deployment.yaml similarity index 81% rename from operations/helm/tests/topologyspreadconstraints/grafana-agent/templates/controllers/deployment.yaml rename to operations/helm/tests/topologyspreadconstraints/alloy/templates/controllers/deployment.yaml index 7faf74aa1c..2b0ff9dfc6 100644 --- a/operations/helm/tests/topologyspreadconstraints/grafana-agent/templates/controllers/deployment.yaml +++ b/operations/helm/tests/topologyspreadconstraints/alloy/templates/controllers/deployment.yaml @@ -1,13 +1,13 @@ --- -# Source: grafana-agent/templates/controllers/deployment.yaml +# Source: alloy/templates/controllers/deployment.yaml apiVersion: apps/v1 kind: Deployment metadata: - name: grafana-agent + name: alloy labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + 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: @@ -15,17 +15,17 @@ spec: minReadySeconds: 10 selector: matchLabels: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy template: metadata: annotations: kubectl.kubernetes.io/default-container: alloy labels: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy spec: - serviceAccountName: grafana-agent + serviceAccountName: alloy containers: - name: alloy image: docker.io/grafana/alloy:v0.40.2 @@ -80,4 +80,4 @@ spec: volumes: - name: config configMap: - name: grafana-agent + name: alloy diff --git a/operations/helm/tests/topologyspreadconstraints/alloy/templates/rbac.yaml b/operations/helm/tests/topologyspreadconstraints/alloy/templates/rbac.yaml new file mode 100644 index 0000000000..53ca27544f --- /dev/null +++ b/operations/helm/tests/topologyspreadconstraints/alloy/templates/rbac.yaml @@ -0,0 +1,117 @@ +--- +# Source: alloy/templates/rbac.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: 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 +rules: + # Rules which allow discovery.kubernetes to function. + - apiGroups: + - "" + - "discovery.k8s.io" + - "networking.k8s.io" + resources: + - endpoints + - endpointslices + - ingresses + - nodes + - nodes/proxy + - nodes/metrics + - pods + - services + verbs: + - get + - list + - watch + # Rules which allow loki.source.kubernetes and loki.source.podlogs to work. + - apiGroups: + - "" + resources: + - pods + - pods/log + - namespaces + verbs: + - get + - list + - watch + - apiGroups: + - "monitoring.grafana.com" + resources: + - podlogs + verbs: + - get + - list + - watch + # Rules which allow mimir.rules.kubernetes to work. + - apiGroups: ["monitoring.coreos.com"] + resources: + - prometheusrules + verbs: + - get + - list + - watch + - nonResourceURLs: + - /metrics + verbs: + - get + # Rules for prometheus.kubernetes.* + - apiGroups: ["monitoring.coreos.com"] + resources: + - podmonitors + - servicemonitors + - probes + verbs: + - get + - list + - watch + # Rules which allow eventhandler to work. + - apiGroups: + - "" + resources: + - events + verbs: + - get + - list + - watch + # needed for remote.kubernetes.* + - apiGroups: [""] + resources: + - "configmaps" + - "secrets" + verbs: + - get + - list + - watch + # needed for otelcol.processor.k8sattributes + - apiGroups: ["apps"] + resources: ["replicasets"] + verbs: ["get", "list", "watch"] + - apiGroups: ["extensions"] + resources: ["replicasets"] + verbs: ["get", "list", "watch"] +--- +# Source: alloy/templates/rbac.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: 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 +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: alloy +subjects: + - kind: ServiceAccount + name: alloy + namespace: default diff --git a/operations/helm/tests/topologyspreadconstraints/alloy/templates/service.yaml b/operations/helm/tests/topologyspreadconstraints/alloy/templates/service.yaml new file mode 100644 index 0000000000..34c0608fd3 --- /dev/null +++ b/operations/helm/tests/topologyspreadconstraints/alloy/templates/service.yaml @@ -0,0 +1,23 @@ +--- +# Source: alloy/templates/service.yaml +apiVersion: v1 +kind: Service +metadata: + name: 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: + type: ClusterIP + selector: + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy + internalTrafficPolicy: Cluster + ports: + - name: http-metrics + port: 80 + targetPort: 80 + protocol: "TCP" diff --git a/operations/helm/tests/topologyspreadconstraints/alloy/templates/serviceaccount.yaml b/operations/helm/tests/topologyspreadconstraints/alloy/templates/serviceaccount.yaml new file mode 100644 index 0000000000..46df991efb --- /dev/null +++ b/operations/helm/tests/topologyspreadconstraints/alloy/templates/serviceaccount.yaml @@ -0,0 +1,13 @@ +--- +# Source: alloy/templates/serviceaccount.yaml +apiVersion: v1 +kind: ServiceAccount +metadata: + name: alloy + namespace: default + 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 diff --git a/operations/helm/tests/topologyspreadconstraints/grafana-agent/templates/configmap.yaml b/operations/helm/tests/topologyspreadconstraints/grafana-agent/templates/configmap.yaml deleted file mode 100644 index 2fdc6f0117..0000000000 --- a/operations/helm/tests/topologyspreadconstraints/grafana-agent/templates/configmap.yaml +++ /dev/null @@ -1,42 +0,0 @@ ---- -# Source: grafana-agent/templates/configmap.yaml -apiVersion: v1 -kind: ConfigMap -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -data: - config.river: |- - logging { - level = "info" - format = "logfmt" - } - - discovery.kubernetes "pods" { - role = "pod" - } - - discovery.kubernetes "nodes" { - role = "node" - } - - discovery.kubernetes "services" { - role = "service" - } - - discovery.kubernetes "endpoints" { - role = "endpoints" - } - - discovery.kubernetes "endpointslices" { - role = "endpointslice" - } - - discovery.kubernetes "ingresses" { - role = "ingress" - } diff --git a/operations/helm/tests/topologyspreadconstraints/grafana-agent/templates/rbac.yaml b/operations/helm/tests/topologyspreadconstraints/grafana-agent/templates/rbac.yaml deleted file mode 100644 index 3765583fb6..0000000000 --- a/operations/helm/tests/topologyspreadconstraints/grafana-agent/templates/rbac.yaml +++ /dev/null @@ -1,117 +0,0 @@ ---- -# Source: grafana-agent/templates/rbac.yaml -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -rules: - # Rules which allow discovery.kubernetes to function. - - apiGroups: - - "" - - "discovery.k8s.io" - - "networking.k8s.io" - resources: - - endpoints - - endpointslices - - ingresses - - nodes - - nodes/proxy - - nodes/metrics - - pods - - services - verbs: - - get - - list - - watch - # Rules which allow loki.source.kubernetes and loki.source.podlogs to work. - - apiGroups: - - "" - resources: - - pods - - pods/log - - namespaces - verbs: - - get - - list - - watch - - apiGroups: - - "monitoring.grafana.com" - resources: - - podlogs - verbs: - - get - - list - - watch - # Rules which allow mimir.rules.kubernetes to work. - - apiGroups: ["monitoring.coreos.com"] - resources: - - prometheusrules - verbs: - - get - - list - - watch - - nonResourceURLs: - - /metrics - verbs: - - get - # Rules for prometheus.kubernetes.* - - apiGroups: ["monitoring.coreos.com"] - resources: - - podmonitors - - servicemonitors - - probes - verbs: - - get - - list - - watch - # Rules which allow eventhandler to work. - - apiGroups: - - "" - resources: - - events - verbs: - - get - - list - - watch - # needed for remote.kubernetes.* - - apiGroups: [""] - resources: - - "configmaps" - - "secrets" - verbs: - - get - - list - - watch - # needed for otelcol.processor.k8sattributes - - apiGroups: ["apps"] - resources: ["replicasets"] - verbs: ["get", "list", "watch"] - - apiGroups: ["extensions"] - resources: ["replicasets"] - verbs: ["get", "list", "watch"] ---- -# Source: grafana-agent/templates/rbac.yaml -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: grafana-agent -subjects: - - kind: ServiceAccount - name: grafana-agent - namespace: default diff --git a/operations/helm/tests/topologyspreadconstraints/grafana-agent/templates/service.yaml b/operations/helm/tests/topologyspreadconstraints/grafana-agent/templates/service.yaml deleted file mode 100644 index c98f79428b..0000000000 --- a/operations/helm/tests/topologyspreadconstraints/grafana-agent/templates/service.yaml +++ /dev/null @@ -1,23 +0,0 @@ ---- -# Source: grafana-agent/templates/service.yaml -apiVersion: v1 -kind: Service -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -spec: - type: ClusterIP - selector: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - internalTrafficPolicy: Cluster - ports: - - name: http-metrics - port: 80 - targetPort: 80 - protocol: "TCP" diff --git a/operations/helm/tests/topologyspreadconstraints/grafana-agent/templates/serviceaccount.yaml b/operations/helm/tests/topologyspreadconstraints/grafana-agent/templates/serviceaccount.yaml deleted file mode 100644 index 65d7e0df38..0000000000 --- a/operations/helm/tests/topologyspreadconstraints/grafana-agent/templates/serviceaccount.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# Source: grafana-agent/templates/serviceaccount.yaml -apiVersion: v1 -kind: ServiceAccount -metadata: - name: grafana-agent - namespace: default - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm diff --git a/operations/helm/tests/with-digests/alloy/templates/configmap.yaml b/operations/helm/tests/with-digests/alloy/templates/configmap.yaml new file mode 100644 index 0000000000..c9ae77aa1e --- /dev/null +++ b/operations/helm/tests/with-digests/alloy/templates/configmap.yaml @@ -0,0 +1,42 @@ +--- +# Source: alloy/templates/configmap.yaml +apiVersion: v1 +kind: ConfigMap +metadata: + name: 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 +data: + config.river: |- + logging { + level = "info" + format = "logfmt" + } + + discovery.kubernetes "pods" { + role = "pod" + } + + discovery.kubernetes "nodes" { + role = "node" + } + + discovery.kubernetes "services" { + role = "service" + } + + discovery.kubernetes "endpoints" { + role = "endpoints" + } + + discovery.kubernetes "endpointslices" { + role = "endpointslice" + } + + discovery.kubernetes "ingresses" { + role = "ingress" + } diff --git a/operations/helm/tests/with-digests/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/with-digests/alloy/templates/controllers/daemonset.yaml similarity index 79% rename from operations/helm/tests/with-digests/grafana-agent/templates/controllers/daemonset.yaml rename to operations/helm/tests/with-digests/alloy/templates/controllers/daemonset.yaml index 57eb2cb87a..4418f7f17a 100644 --- a/operations/helm/tests/with-digests/grafana-agent/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/with-digests/alloy/templates/controllers/daemonset.yaml @@ -1,30 +1,30 @@ --- -# Source: grafana-agent/templates/controllers/daemonset.yaml +# Source: alloy/templates/controllers/daemonset.yaml apiVersion: apps/v1 kind: DaemonSet metadata: - name: grafana-agent + name: alloy labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + 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: minReadySeconds: 10 selector: matchLabels: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy template: metadata: annotations: kubectl.kubernetes.io/default-container: alloy labels: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy spec: - serviceAccountName: grafana-agent + serviceAccountName: alloy containers: - name: alloy image: docker.io/grafana/agent@sha256:82575a7be3e4770e53f620298e58bcc4cdb0fd0338e01c4b206cae9e3ca46ebf @@ -71,4 +71,4 @@ spec: volumes: - name: config configMap: - name: grafana-agent + name: alloy diff --git a/operations/helm/tests/with-digests/alloy/templates/rbac.yaml b/operations/helm/tests/with-digests/alloy/templates/rbac.yaml new file mode 100644 index 0000000000..53ca27544f --- /dev/null +++ b/operations/helm/tests/with-digests/alloy/templates/rbac.yaml @@ -0,0 +1,117 @@ +--- +# Source: alloy/templates/rbac.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: 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 +rules: + # Rules which allow discovery.kubernetes to function. + - apiGroups: + - "" + - "discovery.k8s.io" + - "networking.k8s.io" + resources: + - endpoints + - endpointslices + - ingresses + - nodes + - nodes/proxy + - nodes/metrics + - pods + - services + verbs: + - get + - list + - watch + # Rules which allow loki.source.kubernetes and loki.source.podlogs to work. + - apiGroups: + - "" + resources: + - pods + - pods/log + - namespaces + verbs: + - get + - list + - watch + - apiGroups: + - "monitoring.grafana.com" + resources: + - podlogs + verbs: + - get + - list + - watch + # Rules which allow mimir.rules.kubernetes to work. + - apiGroups: ["monitoring.coreos.com"] + resources: + - prometheusrules + verbs: + - get + - list + - watch + - nonResourceURLs: + - /metrics + verbs: + - get + # Rules for prometheus.kubernetes.* + - apiGroups: ["monitoring.coreos.com"] + resources: + - podmonitors + - servicemonitors + - probes + verbs: + - get + - list + - watch + # Rules which allow eventhandler to work. + - apiGroups: + - "" + resources: + - events + verbs: + - get + - list + - watch + # needed for remote.kubernetes.* + - apiGroups: [""] + resources: + - "configmaps" + - "secrets" + verbs: + - get + - list + - watch + # needed for otelcol.processor.k8sattributes + - apiGroups: ["apps"] + resources: ["replicasets"] + verbs: ["get", "list", "watch"] + - apiGroups: ["extensions"] + resources: ["replicasets"] + verbs: ["get", "list", "watch"] +--- +# Source: alloy/templates/rbac.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: 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 +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: alloy +subjects: + - kind: ServiceAccount + name: alloy + namespace: default diff --git a/operations/helm/tests/with-digests/alloy/templates/service.yaml b/operations/helm/tests/with-digests/alloy/templates/service.yaml new file mode 100644 index 0000000000..34c0608fd3 --- /dev/null +++ b/operations/helm/tests/with-digests/alloy/templates/service.yaml @@ -0,0 +1,23 @@ +--- +# Source: alloy/templates/service.yaml +apiVersion: v1 +kind: Service +metadata: + name: 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: + type: ClusterIP + selector: + app.kubernetes.io/name: alloy + app.kubernetes.io/instance: alloy + internalTrafficPolicy: Cluster + ports: + - name: http-metrics + port: 80 + targetPort: 80 + protocol: "TCP" diff --git a/operations/helm/tests/with-digests/alloy/templates/serviceaccount.yaml b/operations/helm/tests/with-digests/alloy/templates/serviceaccount.yaml new file mode 100644 index 0000000000..46df991efb --- /dev/null +++ b/operations/helm/tests/with-digests/alloy/templates/serviceaccount.yaml @@ -0,0 +1,13 @@ +--- +# Source: alloy/templates/serviceaccount.yaml +apiVersion: v1 +kind: ServiceAccount +metadata: + name: alloy + namespace: default + 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 diff --git a/operations/helm/tests/with-digests/grafana-agent/templates/configmap.yaml b/operations/helm/tests/with-digests/grafana-agent/templates/configmap.yaml deleted file mode 100644 index 2fdc6f0117..0000000000 --- a/operations/helm/tests/with-digests/grafana-agent/templates/configmap.yaml +++ /dev/null @@ -1,42 +0,0 @@ ---- -# Source: grafana-agent/templates/configmap.yaml -apiVersion: v1 -kind: ConfigMap -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -data: - config.river: |- - logging { - level = "info" - format = "logfmt" - } - - discovery.kubernetes "pods" { - role = "pod" - } - - discovery.kubernetes "nodes" { - role = "node" - } - - discovery.kubernetes "services" { - role = "service" - } - - discovery.kubernetes "endpoints" { - role = "endpoints" - } - - discovery.kubernetes "endpointslices" { - role = "endpointslice" - } - - discovery.kubernetes "ingresses" { - role = "ingress" - } diff --git a/operations/helm/tests/with-digests/grafana-agent/templates/rbac.yaml b/operations/helm/tests/with-digests/grafana-agent/templates/rbac.yaml deleted file mode 100644 index 3765583fb6..0000000000 --- a/operations/helm/tests/with-digests/grafana-agent/templates/rbac.yaml +++ /dev/null @@ -1,117 +0,0 @@ ---- -# Source: grafana-agent/templates/rbac.yaml -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -rules: - # Rules which allow discovery.kubernetes to function. - - apiGroups: - - "" - - "discovery.k8s.io" - - "networking.k8s.io" - resources: - - endpoints - - endpointslices - - ingresses - - nodes - - nodes/proxy - - nodes/metrics - - pods - - services - verbs: - - get - - list - - watch - # Rules which allow loki.source.kubernetes and loki.source.podlogs to work. - - apiGroups: - - "" - resources: - - pods - - pods/log - - namespaces - verbs: - - get - - list - - watch - - apiGroups: - - "monitoring.grafana.com" - resources: - - podlogs - verbs: - - get - - list - - watch - # Rules which allow mimir.rules.kubernetes to work. - - apiGroups: ["monitoring.coreos.com"] - resources: - - prometheusrules - verbs: - - get - - list - - watch - - nonResourceURLs: - - /metrics - verbs: - - get - # Rules for prometheus.kubernetes.* - - apiGroups: ["monitoring.coreos.com"] - resources: - - podmonitors - - servicemonitors - - probes - verbs: - - get - - list - - watch - # Rules which allow eventhandler to work. - - apiGroups: - - "" - resources: - - events - verbs: - - get - - list - - watch - # needed for remote.kubernetes.* - - apiGroups: [""] - resources: - - "configmaps" - - "secrets" - verbs: - - get - - list - - watch - # needed for otelcol.processor.k8sattributes - - apiGroups: ["apps"] - resources: ["replicasets"] - verbs: ["get", "list", "watch"] - - apiGroups: ["extensions"] - resources: ["replicasets"] - verbs: ["get", "list", "watch"] ---- -# Source: grafana-agent/templates/rbac.yaml -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: grafana-agent -subjects: - - kind: ServiceAccount - name: grafana-agent - namespace: default diff --git a/operations/helm/tests/with-digests/grafana-agent/templates/service.yaml b/operations/helm/tests/with-digests/grafana-agent/templates/service.yaml deleted file mode 100644 index c98f79428b..0000000000 --- a/operations/helm/tests/with-digests/grafana-agent/templates/service.yaml +++ /dev/null @@ -1,23 +0,0 @@ ---- -# Source: grafana-agent/templates/service.yaml -apiVersion: v1 -kind: Service -metadata: - name: grafana-agent - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm -spec: - type: ClusterIP - selector: - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - internalTrafficPolicy: Cluster - ports: - - name: http-metrics - port: 80 - targetPort: 80 - protocol: "TCP" diff --git a/operations/helm/tests/with-digests/grafana-agent/templates/serviceaccount.yaml b/operations/helm/tests/with-digests/grafana-agent/templates/serviceaccount.yaml deleted file mode 100644 index 65d7e0df38..0000000000 --- a/operations/helm/tests/with-digests/grafana-agent/templates/serviceaccount.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# Source: grafana-agent/templates/serviceaccount.yaml -apiVersion: v1 -kind: ServiceAccount -metadata: - name: grafana-agent - namespace: default - labels: - helm.sh/chart: grafana-agent - app.kubernetes.io/name: grafana-agent - app.kubernetes.io/instance: grafana-agent - app.kubernetes.io/version: "vX.Y.Z" - app.kubernetes.io/managed-by: Helm