diff --git a/operations/helm/charts/grafana-agent/CHANGELOG.md b/operations/helm/charts/grafana-agent/CHANGELOG.md index 6133ed8a8dd0..70b612d74572 100644 --- a/operations/helm/charts/grafana-agent/CHANGELOG.md +++ b/operations/helm/charts/grafana-agent/CHANGELOG.md @@ -10,6 +10,10 @@ internal API changes are not present. Unreleased ---------- +### Enhancements + +- Update `rbac` to include necessary rules for the `otelcol.processor.k8sattributes` component. (@rlankfo) + 0.29.0 (2023-11-30) ------------------- diff --git a/operations/helm/charts/grafana-agent/templates/rbac.yaml b/operations/helm/charts/grafana-agent/templates/rbac.yaml index fbbe733dcd92..af0d30665ad0 100644 --- a/operations/helm/charts/grafana-agent/templates/rbac.yaml +++ b/operations/helm/charts/grafana-agent/templates/rbac.yaml @@ -83,6 +83,13 @@ rules: - get - list - watch + # needed for otelcol.processor.k8sattributes + - apiGroups: ["apps"] + resources: ["replicasets"] + verbs: ["get", "list", "watch"] + - apiGroups: ["extensions"] + resources: ["replicasets"] + verbs: ["get", "list", "watch"] --- diff --git a/operations/helm/tests/clustering/grafana-agent/templates/rbac.yaml b/operations/helm/tests/clustering/grafana-agent/templates/rbac.yaml index 063aa099ae47..3765583fb64f 100644 --- a/operations/helm/tests/clustering/grafana-agent/templates/rbac.yaml +++ b/operations/helm/tests/clustering/grafana-agent/templates/rbac.yaml @@ -88,6 +88,13 @@ rules: - 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 diff --git a/operations/helm/tests/controller-volumes-extra/grafana-agent/templates/rbac.yaml b/operations/helm/tests/controller-volumes-extra/grafana-agent/templates/rbac.yaml index 063aa099ae47..3765583fb64f 100644 --- a/operations/helm/tests/controller-volumes-extra/grafana-agent/templates/rbac.yaml +++ b/operations/helm/tests/controller-volumes-extra/grafana-agent/templates/rbac.yaml @@ -88,6 +88,13 @@ rules: - 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 diff --git a/operations/helm/tests/create-daemonset-hostnetwork/grafana-agent/templates/rbac.yaml b/operations/helm/tests/create-daemonset-hostnetwork/grafana-agent/templates/rbac.yaml index 063aa099ae47..3765583fb64f 100644 --- a/operations/helm/tests/create-daemonset-hostnetwork/grafana-agent/templates/rbac.yaml +++ b/operations/helm/tests/create-daemonset-hostnetwork/grafana-agent/templates/rbac.yaml @@ -88,6 +88,13 @@ rules: - 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 diff --git a/operations/helm/tests/create-daemonset/grafana-agent/templates/rbac.yaml b/operations/helm/tests/create-daemonset/grafana-agent/templates/rbac.yaml index 063aa099ae47..3765583fb64f 100644 --- a/operations/helm/tests/create-daemonset/grafana-agent/templates/rbac.yaml +++ b/operations/helm/tests/create-daemonset/grafana-agent/templates/rbac.yaml @@ -88,6 +88,13 @@ rules: - 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 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 index 063aa099ae47..3765583fb64f 100644 --- a/operations/helm/tests/create-deployment-autoscaling/grafana-agent/templates/rbac.yaml +++ b/operations/helm/tests/create-deployment-autoscaling/grafana-agent/templates/rbac.yaml @@ -88,6 +88,13 @@ rules: - 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 diff --git a/operations/helm/tests/create-deployment/grafana-agent/templates/rbac.yaml b/operations/helm/tests/create-deployment/grafana-agent/templates/rbac.yaml index 063aa099ae47..3765583fb64f 100644 --- a/operations/helm/tests/create-deployment/grafana-agent/templates/rbac.yaml +++ b/operations/helm/tests/create-deployment/grafana-agent/templates/rbac.yaml @@ -88,6 +88,13 @@ rules: - 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 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 index 063aa099ae47..3765583fb64f 100644 --- a/operations/helm/tests/create-statefulset-autoscaling/grafana-agent/templates/rbac.yaml +++ b/operations/helm/tests/create-statefulset-autoscaling/grafana-agent/templates/rbac.yaml @@ -88,6 +88,13 @@ rules: - 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 diff --git a/operations/helm/tests/create-statefulset/grafana-agent/templates/rbac.yaml b/operations/helm/tests/create-statefulset/grafana-agent/templates/rbac.yaml index 063aa099ae47..3765583fb64f 100644 --- a/operations/helm/tests/create-statefulset/grafana-agent/templates/rbac.yaml +++ b/operations/helm/tests/create-statefulset/grafana-agent/templates/rbac.yaml @@ -88,6 +88,13 @@ rules: - 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 diff --git a/operations/helm/tests/custom-config/grafana-agent/templates/rbac.yaml b/operations/helm/tests/custom-config/grafana-agent/templates/rbac.yaml index 063aa099ae47..3765583fb64f 100644 --- a/operations/helm/tests/custom-config/grafana-agent/templates/rbac.yaml +++ b/operations/helm/tests/custom-config/grafana-agent/templates/rbac.yaml @@ -88,6 +88,13 @@ rules: - 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 diff --git a/operations/helm/tests/default-values/grafana-agent/templates/rbac.yaml b/operations/helm/tests/default-values/grafana-agent/templates/rbac.yaml index 063aa099ae47..3765583fb64f 100644 --- a/operations/helm/tests/default-values/grafana-agent/templates/rbac.yaml +++ b/operations/helm/tests/default-values/grafana-agent/templates/rbac.yaml @@ -88,6 +88,13 @@ rules: - 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 diff --git a/operations/helm/tests/enable-servicemonitor/grafana-agent/templates/rbac.yaml b/operations/helm/tests/enable-servicemonitor/grafana-agent/templates/rbac.yaml index 063aa099ae47..3765583fb64f 100644 --- a/operations/helm/tests/enable-servicemonitor/grafana-agent/templates/rbac.yaml +++ b/operations/helm/tests/enable-servicemonitor/grafana-agent/templates/rbac.yaml @@ -88,6 +88,13 @@ rules: - 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 diff --git a/operations/helm/tests/envFrom/grafana-agent/templates/rbac.yaml b/operations/helm/tests/envFrom/grafana-agent/templates/rbac.yaml index 063aa099ae47..3765583fb64f 100644 --- a/operations/helm/tests/envFrom/grafana-agent/templates/rbac.yaml +++ b/operations/helm/tests/envFrom/grafana-agent/templates/rbac.yaml @@ -88,6 +88,13 @@ rules: - 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 diff --git a/operations/helm/tests/existing-config/grafana-agent/templates/rbac.yaml b/operations/helm/tests/existing-config/grafana-agent/templates/rbac.yaml index 063aa099ae47..3765583fb64f 100644 --- a/operations/helm/tests/existing-config/grafana-agent/templates/rbac.yaml +++ b/operations/helm/tests/existing-config/grafana-agent/templates/rbac.yaml @@ -88,6 +88,13 @@ rules: - 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 diff --git a/operations/helm/tests/extra-env/grafana-agent/templates/rbac.yaml b/operations/helm/tests/extra-env/grafana-agent/templates/rbac.yaml index 063aa099ae47..3765583fb64f 100644 --- a/operations/helm/tests/extra-env/grafana-agent/templates/rbac.yaml +++ b/operations/helm/tests/extra-env/grafana-agent/templates/rbac.yaml @@ -88,6 +88,13 @@ rules: - 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 diff --git a/operations/helm/tests/extra-ports/grafana-agent/templates/rbac.yaml b/operations/helm/tests/extra-ports/grafana-agent/templates/rbac.yaml index 063aa099ae47..3765583fb64f 100644 --- a/operations/helm/tests/extra-ports/grafana-agent/templates/rbac.yaml +++ b/operations/helm/tests/extra-ports/grafana-agent/templates/rbac.yaml @@ -88,6 +88,13 @@ rules: - 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 diff --git a/operations/helm/tests/faro-ingress/grafana-agent/templates/rbac.yaml b/operations/helm/tests/faro-ingress/grafana-agent/templates/rbac.yaml index 063aa099ae47..3765583fb64f 100644 --- a/operations/helm/tests/faro-ingress/grafana-agent/templates/rbac.yaml +++ b/operations/helm/tests/faro-ingress/grafana-agent/templates/rbac.yaml @@ -88,6 +88,13 @@ rules: - 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 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 index 063aa099ae47..3765583fb64f 100644 --- a/operations/helm/tests/global-image-pullsecrets/grafana-agent/templates/rbac.yaml +++ b/operations/helm/tests/global-image-pullsecrets/grafana-agent/templates/rbac.yaml @@ -88,6 +88,13 @@ rules: - 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 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 index 063aa099ae47..3765583fb64f 100644 --- a/operations/helm/tests/global-image-registry/grafana-agent/templates/rbac.yaml +++ b/operations/helm/tests/global-image-registry/grafana-agent/templates/rbac.yaml @@ -88,6 +88,13 @@ rules: - 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 diff --git a/operations/helm/tests/initcontainers/grafana-agent/templates/rbac.yaml b/operations/helm/tests/initcontainers/grafana-agent/templates/rbac.yaml index 063aa099ae47..3765583fb64f 100644 --- a/operations/helm/tests/initcontainers/grafana-agent/templates/rbac.yaml +++ b/operations/helm/tests/initcontainers/grafana-agent/templates/rbac.yaml @@ -88,6 +88,13 @@ rules: - 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 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 index 063aa099ae47..3765583fb64f 100644 --- a/operations/helm/tests/local-image-pullsecrets/grafana-agent/templates/rbac.yaml +++ b/operations/helm/tests/local-image-pullsecrets/grafana-agent/templates/rbac.yaml @@ -88,6 +88,13 @@ rules: - 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 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 index 063aa099ae47..3765583fb64f 100644 --- a/operations/helm/tests/local-image-registry/grafana-agent/templates/rbac.yaml +++ b/operations/helm/tests/local-image-registry/grafana-agent/templates/rbac.yaml @@ -88,6 +88,13 @@ rules: - 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 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 index 063aa099ae47..3765583fb64f 100644 --- a/operations/helm/tests/nodeselectors-and-tolerations/grafana-agent/templates/rbac.yaml +++ b/operations/helm/tests/nodeselectors-and-tolerations/grafana-agent/templates/rbac.yaml @@ -88,6 +88,13 @@ rules: - 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 diff --git a/operations/helm/tests/static-mode/grafana-agent/templates/rbac.yaml b/operations/helm/tests/static-mode/grafana-agent/templates/rbac.yaml index 063aa099ae47..3765583fb64f 100644 --- a/operations/helm/tests/static-mode/grafana-agent/templates/rbac.yaml +++ b/operations/helm/tests/static-mode/grafana-agent/templates/rbac.yaml @@ -88,6 +88,13 @@ rules: - 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