-
Notifications
You must be signed in to change notification settings - Fork 204
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add PodDisruptionBudget to helm chart (#1245)
* Add PodDisruptionBudget to helm chart * Add PodDisruptionBudget to helm chart * Update operations/helm/charts/alloy/README.md Co-authored-by: William Dumont <william.dumont@grafana.com> * revert changelog first * revert changelog first * revert changelog first * revert changelog first * Add tests for pdb in helm chart * update docs and files * Updated tests(new-line-at-end-of-file) * Update version in chart.yaml --------- Co-authored-by: William Dumont <william.dumont@grafana.com>
- Loading branch information
Showing
34 changed files
with
1,271 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 5 additions & 0 deletions
5
operations/helm/charts/alloy/ci/controller-deployment-pdb-max-unavailable-values.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| controller: | ||
| type: deployment | ||
| podDisruptionBudget: | ||
| enabled: true | ||
| maxUnavailable: 1 |
5 changes: 5 additions & 0 deletions
5
operations/helm/charts/alloy/ci/controller-deployment-pdb-min-available-values.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| controller: | ||
| type: deployment | ||
| podDisruptionBudget: | ||
| enabled: true | ||
| minAvailable: 1 |
5 changes: 5 additions & 0 deletions
5
operations/helm/charts/alloy/ci/controller-statefulset-pdb-max-unavailable-values.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| controller: | ||
| type: statefulset | ||
| podDisruptionBudget: | ||
| enabled: true | ||
| maxUnavailable: 1 |
5 changes: 5 additions & 0 deletions
5
operations/helm/charts/alloy/ci/controller-statefulset-pdb-min-available-values.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| controller: | ||
| type: statefulset | ||
| podDisruptionBudget: | ||
| enabled: true | ||
| minAvailable: 1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| {{- if .Values.controller.podDisruptionBudget.enabled }} | ||
| {{- if eq .Values.controller.type "daemonset" }} | ||
| {{- fail "PDBs (Pod Disruption Budgets) are not intended for DaemonSets. Please use a different controller type." }} | ||
| {{- end }} | ||
|
|
||
| {{- if and .Values.controller.podDisruptionBudget.minAvailable .Values.controller.podDisruptionBudget.maxUnavailable }} | ||
| {{- fail "Only one of minAvailable or maxUnavailable should be defined for PodDisruptionBudget" }} | ||
| {{- end }} | ||
|
|
||
| {{- if not (or .Values.controller.podDisruptionBudget.minAvailable .Values.controller.podDisruptionBudget.maxUnavailable) }} | ||
| {{- fail "Either minAvailable or maxUnavailable must be defined for PodDisruptionBudget" }} | ||
| {{- end }} | ||
|
|
||
| apiVersion: {{ include "alloy.controller.pdb.apiVersion" . }} | ||
| kind: PodDisruptionBudget | ||
| metadata: | ||
| name: {{ include "alloy.fullname" . }} | ||
| namespace: {{ .Release.Namespace }} | ||
| labels: | ||
| {{- include "alloy.labels" . | nindent 4 }} | ||
| spec: | ||
| selector: | ||
| matchLabels: | ||
| {{- include "alloy.selectorLabels" . | nindent 6 }} | ||
| {{- if .Values.controller.podDisruptionBudget.minAvailable }} | ||
| minAvailable: {{ .Values.controller.podDisruptionBudget.minAvailable }} | ||
| {{- end }} | ||
| {{- if .Values.controller.podDisruptionBudget.maxUnavailable }} | ||
| maxUnavailable: {{ .Values.controller.podDisruptionBudget.maxUnavailable }} | ||
| {{- end }} | ||
| {{- end }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
43 changes: 43 additions & 0 deletions
43
...tions/helm/tests/controller-deployment-pdb-max-unavailable/alloy/templates/configmap.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| --- | ||
| # 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 | ||
| app.kubernetes.io/component: config | ||
| data: | ||
| config.alloy: |- | ||
| 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" | ||
| } |
76 changes: 76 additions & 0 deletions
76
...sts/controller-deployment-pdb-max-unavailable/alloy/templates/controllers/deployment.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| --- | ||
| # Source: alloy/templates/controllers/deployment.yaml | ||
| apiVersion: apps/v1 | ||
| kind: Deployment | ||
| 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: | ||
| replicas: 1 | ||
| 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:v1.3.1 | ||
| imagePullPolicy: IfNotPresent | ||
| args: | ||
| - run | ||
| - /etc/alloy/config.alloy | ||
| - --storage.path=/tmp/alloy | ||
| - --server.http.listen-addr=0.0.0.0:12345 | ||
| - --server.http.ui-path-prefix=/ | ||
| - --stability.level=generally-available | ||
| env: | ||
| - name: ALLOY_DEPLOY_MODE | ||
| value: "helm" | ||
| - name: HOSTNAME | ||
| valueFrom: | ||
| fieldRef: | ||
| fieldPath: spec.nodeName | ||
| ports: | ||
| - containerPort: 12345 | ||
| name: http-metrics | ||
| readinessProbe: | ||
| httpGet: | ||
| path: /-/ready | ||
| port: 12345 | ||
| 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:12345/-/reload | ||
| volumeMounts: | ||
| - name: config | ||
| mountPath: /etc/alloy | ||
| resources: | ||
| requests: | ||
| cpu: 1m | ||
| memory: 5Mi | ||
| dnsPolicy: ClusterFirst | ||
| volumes: | ||
| - name: config | ||
| configMap: | ||
| name: alloy |
19 changes: 19 additions & 0 deletions
19
operations/helm/tests/controller-deployment-pdb-max-unavailable/alloy/templates/pdb.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| --- | ||
| # Source: alloy/templates/pdb.yaml | ||
| apiVersion: policy/v1 | ||
| kind: PodDisruptionBudget | ||
| 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 | ||
| spec: | ||
| selector: | ||
| matchLabels: | ||
| app.kubernetes.io/name: alloy | ||
| app.kubernetes.io/instance: alloy | ||
| maxUnavailable: 1 |
119 changes: 119 additions & 0 deletions
119
operations/helm/tests/controller-deployment-pdb-max-unavailable/alloy/templates/rbac.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,119 @@ | ||
| --- | ||
| # 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 | ||
| app.kubernetes.io/component: rbac | ||
| 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 | ||
| app.kubernetes.io/component: rbac | ||
| roleRef: | ||
| apiGroup: rbac.authorization.k8s.io | ||
| kind: ClusterRole | ||
| name: alloy | ||
| subjects: | ||
| - kind: ServiceAccount | ||
| name: alloy | ||
| namespace: default |
Oops, something went wrong.