Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions charts/alloy-helm-chart/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ apiVersion: v2
name: alloy-helm-chart
description: A fake chart for holding the current Alloy helm chart
type: library
version: 1.4.0
version: 1.5.0
dependencies:
- name: alloy
repository: https://grafana.github.io/helm-charts
version: 1.4.0
version: 1.5.0
3 changes: 2 additions & 1 deletion charts/alloy-operator/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# Changelog

## Unreleased
## 0.3.14

* Update Alloy to 1.5.0 (@petewall)
* Update Operator Framework to 1.42.0 (@petewall)
* Add the ability to make pod and container security contexts optional, or override the fs, group, and user IDs (@petewall)

Expand Down
4 changes: 2 additions & 2 deletions charts/alloy-operator/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ icon: https://raw.githubusercontent.com/grafana/grafana/main/public/img/grafana_
sources:
- https://github.com/grafana/alloy-operator
type: application
version: 0.3.13
appVersion: "1.4.0"
version: 0.3.14
appVersion: "1.5.0"
maintainers:
- email: pete.wall@grafana.com
name: petewall
Expand Down
2 changes: 1 addition & 1 deletion charts/alloy-operator/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

# alloy-operator

![Version: 0.3.13](https://img.shields.io/badge/Version-0.3.13-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.4.0](https://img.shields.io/badge/AppVersion-1.4.0-informational?style=flat-square)
![Version: 0.3.14](https://img.shields.io/badge/Version-0.3.14-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.5.0](https://img.shields.io/badge/AppVersion-1.5.0-informational?style=flat-square)

A Helm chart the Alloy Operator, a project to innovate on creating instances of Grafana Alloy.

Expand Down
4 changes: 4 additions & 0 deletions charts/alloy-operator/alloy-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,10 @@ rbac:
- apiGroups: ["monitoring.coreos.com"]
resources: ["prometheusrules"]
verbs: ["get", "list", "watch"]
# -- Rules required for the `mimir.alerts.kubernetes` component.
- apiGroups: ["monitoring.coreos.com"]
resources: ["alertmanagerconfigs"]
verbs: ["get", "list", "watch"]
# -- Rules required for the `prometheus.operator.*` components.
- apiGroups: ["monitoring.coreos.com"]
resources: ["podmonitors", "servicemonitors", "probes", "scrapeconfigs"]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.9.2
creationTimestamp: null
name: podlogs.monitoring.grafana.com
spec:
group: monitoring.grafana.com
Expand Down
38 changes: 19 additions & 19 deletions charts/alloy-operator/docs/examples/default/output.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ metadata:
name: test-alloy-operator
namespace: operator
labels:
helm.sh/chart: alloy-operator-0.3.13
helm.sh/chart: alloy-operator-0.3.14
app.kubernetes.io/name: alloy-operator
app.kubernetes.io/instance: test
app.kubernetes.io/version: "1.4.0"
app.kubernetes.io/version: "1.5.0"
app.kubernetes.io/managed-by: Helm
automountServiceAccountToken: true
---
Expand All @@ -19,10 +19,10 @@ kind: ClusterRole
metadata:
name: test-alloy-operator-alloy-manager
labels:
helm.sh/chart: alloy-operator-0.3.13
helm.sh/chart: alloy-operator-0.3.14
app.kubernetes.io/name: alloy-operator
app.kubernetes.io/instance: test
app.kubernetes.io/version: "1.4.0"
app.kubernetes.io/version: "1.5.0"
app.kubernetes.io/managed-by: Helm
rules:
- apiGroups:
Expand Down Expand Up @@ -77,10 +77,10 @@ kind: ClusterRoleBinding
metadata:
name: test-alloy-operator-alloy-manager
labels:
helm.sh/chart: alloy-operator-0.3.13
helm.sh/chart: alloy-operator-0.3.14
app.kubernetes.io/name: alloy-operator
app.kubernetes.io/instance: test
app.kubernetes.io/version: "1.4.0"
app.kubernetes.io/version: "1.5.0"
app.kubernetes.io/managed-by: Helm
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand All @@ -97,10 +97,10 @@ kind: ClusterRoleBinding
metadata:
name: test-alloy-operator
labels:
helm.sh/chart: alloy-operator-0.3.13
helm.sh/chart: alloy-operator-0.3.14
app.kubernetes.io/name: alloy-operator
app.kubernetes.io/instance: test
app.kubernetes.io/version: "1.4.0"
app.kubernetes.io/version: "1.5.0"
app.kubernetes.io/managed-by: Helm
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand All @@ -118,10 +118,10 @@ metadata:
name: test-alloy-operator-leader-election-role
namespace: operator
labels:
helm.sh/chart: alloy-operator-0.3.13
helm.sh/chart: alloy-operator-0.3.14
app.kubernetes.io/name: alloy-operator
app.kubernetes.io/instance: test
app.kubernetes.io/version: "1.4.0"
app.kubernetes.io/version: "1.5.0"
app.kubernetes.io/managed-by: Helm
rules:
- apiGroups:
Expand Down Expand Up @@ -163,10 +163,10 @@ metadata:
name: test-alloy-operator-leader-election-rolebinding
namespace: operator
labels:
helm.sh/chart: alloy-operator-0.3.13
helm.sh/chart: alloy-operator-0.3.14
app.kubernetes.io/name: alloy-operator
app.kubernetes.io/instance: test
app.kubernetes.io/version: "1.4.0"
app.kubernetes.io/version: "1.5.0"
app.kubernetes.io/managed-by: Helm
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand All @@ -184,10 +184,10 @@ metadata:
name: test-alloy-operator
namespace: operator
labels:
helm.sh/chart: alloy-operator-0.3.13
helm.sh/chart: alloy-operator-0.3.14
app.kubernetes.io/name: alloy-operator
app.kubernetes.io/instance: test
app.kubernetes.io/version: "1.4.0"
app.kubernetes.io/version: "1.5.0"
app.kubernetes.io/managed-by: Helm
spec:
type: ClusterIP
Expand All @@ -211,10 +211,10 @@ metadata:
name: test-alloy-operator
namespace: operator
labels:
helm.sh/chart: alloy-operator-0.3.13
helm.sh/chart: alloy-operator-0.3.14
app.kubernetes.io/name: alloy-operator
app.kubernetes.io/instance: test
app.kubernetes.io/version: "1.4.0"
app.kubernetes.io/version: "1.5.0"
app.kubernetes.io/managed-by: Helm
spec:
replicas: 1
Expand All @@ -225,10 +225,10 @@ spec:
template:
metadata:
labels:
helm.sh/chart: alloy-operator-0.3.13
helm.sh/chart: alloy-operator-0.3.14
app.kubernetes.io/name: alloy-operator
app.kubernetes.io/instance: test
app.kubernetes.io/version: "1.4.0"
app.kubernetes.io/version: "1.5.0"
app.kubernetes.io/managed-by: Helm
spec:
serviceAccountName: test-alloy-operator
Expand All @@ -241,7 +241,7 @@ spec:
type: RuntimeDefault
containers:
- name: alloy-operator
image: "ghcr.io/grafana/alloy-operator:1.4.0"
image: "ghcr.io/grafana/alloy-operator:1.5.0"
imagePullPolicy: IfNotPresent
args:
- --health-probe-bind-address=:8081
Expand Down
36 changes: 18 additions & 18 deletions charts/alloy-operator/docs/examples/image-by-digest/output.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ metadata:
name: test-alloy-operator
namespace: operator
labels:
helm.sh/chart: alloy-operator-0.3.13
helm.sh/chart: alloy-operator-0.3.14
app.kubernetes.io/name: alloy-operator
app.kubernetes.io/instance: test
app.kubernetes.io/version: "1.4.0"
app.kubernetes.io/version: "1.5.0"
app.kubernetes.io/managed-by: Helm
automountServiceAccountToken: true
---
Expand All @@ -19,10 +19,10 @@ kind: ClusterRole
metadata:
name: test-alloy-operator-alloy-manager
labels:
helm.sh/chart: alloy-operator-0.3.13
helm.sh/chart: alloy-operator-0.3.14
app.kubernetes.io/name: alloy-operator
app.kubernetes.io/instance: test
app.kubernetes.io/version: "1.4.0"
app.kubernetes.io/version: "1.5.0"
app.kubernetes.io/managed-by: Helm
rules:
- apiGroups:
Expand Down Expand Up @@ -77,10 +77,10 @@ kind: ClusterRoleBinding
metadata:
name: test-alloy-operator-alloy-manager
labels:
helm.sh/chart: alloy-operator-0.3.13
helm.sh/chart: alloy-operator-0.3.14
app.kubernetes.io/name: alloy-operator
app.kubernetes.io/instance: test
app.kubernetes.io/version: "1.4.0"
app.kubernetes.io/version: "1.5.0"
app.kubernetes.io/managed-by: Helm
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand All @@ -97,10 +97,10 @@ kind: ClusterRoleBinding
metadata:
name: test-alloy-operator
labels:
helm.sh/chart: alloy-operator-0.3.13
helm.sh/chart: alloy-operator-0.3.14
app.kubernetes.io/name: alloy-operator
app.kubernetes.io/instance: test
app.kubernetes.io/version: "1.4.0"
app.kubernetes.io/version: "1.5.0"
app.kubernetes.io/managed-by: Helm
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand All @@ -118,10 +118,10 @@ metadata:
name: test-alloy-operator-leader-election-role
namespace: operator
labels:
helm.sh/chart: alloy-operator-0.3.13
helm.sh/chart: alloy-operator-0.3.14
app.kubernetes.io/name: alloy-operator
app.kubernetes.io/instance: test
app.kubernetes.io/version: "1.4.0"
app.kubernetes.io/version: "1.5.0"
app.kubernetes.io/managed-by: Helm
rules:
- apiGroups:
Expand Down Expand Up @@ -163,10 +163,10 @@ metadata:
name: test-alloy-operator-leader-election-rolebinding
namespace: operator
labels:
helm.sh/chart: alloy-operator-0.3.13
helm.sh/chart: alloy-operator-0.3.14
app.kubernetes.io/name: alloy-operator
app.kubernetes.io/instance: test
app.kubernetes.io/version: "1.4.0"
app.kubernetes.io/version: "1.5.0"
app.kubernetes.io/managed-by: Helm
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand All @@ -184,10 +184,10 @@ metadata:
name: test-alloy-operator
namespace: operator
labels:
helm.sh/chart: alloy-operator-0.3.13
helm.sh/chart: alloy-operator-0.3.14
app.kubernetes.io/name: alloy-operator
app.kubernetes.io/instance: test
app.kubernetes.io/version: "1.4.0"
app.kubernetes.io/version: "1.5.0"
app.kubernetes.io/managed-by: Helm
spec:
type: ClusterIP
Expand All @@ -211,10 +211,10 @@ metadata:
name: test-alloy-operator
namespace: operator
labels:
helm.sh/chart: alloy-operator-0.3.13
helm.sh/chart: alloy-operator-0.3.14
app.kubernetes.io/name: alloy-operator
app.kubernetes.io/instance: test
app.kubernetes.io/version: "1.4.0"
app.kubernetes.io/version: "1.5.0"
app.kubernetes.io/managed-by: Helm
spec:
replicas: 1
Expand All @@ -225,10 +225,10 @@ spec:
template:
metadata:
labels:
helm.sh/chart: alloy-operator-0.3.13
helm.sh/chart: alloy-operator-0.3.14
app.kubernetes.io/name: alloy-operator
app.kubernetes.io/instance: test
app.kubernetes.io/version: "1.4.0"
app.kubernetes.io/version: "1.5.0"
app.kubernetes.io/managed-by: Helm
spec:
serviceAccountName: test-alloy-operator
Expand Down
Loading
Loading