Skip to content

Commit 8ba6f42

Browse files
petewallpetewall
authored
Update version to 0.3.15, update alloy chart to 1.5.1 (#112)
Signed-off-by: Pete Wall <[email protected]>
1 parent 894d3ee commit 8ba6f42

File tree

21 files changed

+178
-146
lines changed

21 files changed

+178
-146
lines changed

‎Makefile‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ HAS_ZIZMOR := $(shell command -v zizmor;)
55

66
LATEST_ALLOY_HELM_CHART_VERSION = $(shell helm show chart grafana/alloy | yq -r '.version')
77
ALLOY_HELM_CHART_VERSION := $(shell yq '.dependencies[].version' charts/alloy-helm-chart/Chart.yaml)
8+
ALLOY_BINARY_VERSION := $(shell helm show chart charts/alloy-helm-chart/charts/alloy-*.tgz | yq -r '.appVersion')
89
ALLOY_OPERATOR_IMAGE = ghcr.io/grafana/alloy-operator:$(ALLOY_HELM_CHART_VERSION)
910
ALLOY_OPERATOR_HELM_CHART_VERSION = $(shell yq '.version' charts/alloy-operator/Chart.yaml)
1011

@@ -44,7 +45,7 @@ endif
4445
##@ Build
4546

4647
.PHONY: build
47-
build: charts/alloy-helm-chart/charts/alloy-$(ALLOY_HELM_CHART_VERSION).tgz build-image build-charts build-test-chart
48+
build: README.md charts/alloy-helm-chart/charts/alloy-$(ALLOY_HELM_CHART_VERSION).tgz build-image build-charts build-test-chart
4849

4950
UPSTREAM_ALLOY_HELM_CHART_FILES = $(shell tar -tzf charts/alloy-helm-chart/charts/alloy-$(ALLOY_HELM_CHART_VERSION).tgz)
5051
UPSTREAM_ALLOY_HELM_CHART_CRDS_FILES = $(filter alloy/charts/%, $(UPSTREAM_ALLOY_HELM_CHART_FILES))
@@ -85,6 +86,21 @@ push-image: .temp/image-built-${ALLOY_HELM_CHART_VERSION} charts/alloy-helm-char
8586
charts/alloy-operator/Chart.yaml: charts/alloy-helm-chart/Chart.yaml
8687
yq ".appVersion = \"$(ALLOY_HELM_CHART_VERSION)\"" -i charts/alloy-operator/Chart.yaml
8788

89+
TABLE_START := $(shell grep --line-number "Version table start" README.md | sed -e "s/^\([0-9]*\):.*/\1/")
90+
TABLE_END := $(shell grep --line-number "Version table end" README.md | sed -e "s/^\([0-9]*\):.*/\1/")
91+
README_LENGTH := $(shell wc -l < README.md)
92+
README.md: charts/alloy-operator/Chart.yaml charts/alloy-helm-chart/Chart.yaml
93+
@head -n $(TABLE_START) $@ > $@.temp
94+
@echo "" >> $@.temp
95+
@echo "| Component | Version |" >> $@.temp
96+
@echo "|------------------|---------|" >> $@.temp
97+
echo "| Alloy Operator | $(ALLOY_OPERATOR_HELM_CHART_VERSION) |" >> $@.temp
98+
echo "| Alloy Helm chart | $(ALLOY_HELM_CHART_VERSION) |" >> $@.temp
99+
echo "| Alloy binary | $(ALLOY_BINARY_VERSION) |" >> $@.temp
100+
@echo "" >> $@.temp
101+
@tail -n +$(TABLE_END) $@ >> $@.temp
102+
@mv $@.temp $@
103+
88104
charts/alloy-operator/README.md: charts/alloy-operator/values.yaml charts/alloy-operator/Chart.yaml
89105
ifdef HAS_HELM_DOCS
90106
helm-docs --chart-search-root charts/alloy-operator

‎README.md‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,21 @@ The Alloy Operator is a Kubernetes Operator that manages the lifecycle of
55
[Operator SDK](https://sdk.operatorframework.io/) using the
66
[Alloy Helm chart](https://github.com/grafana/alloy/tree/main/operations/helm/charts/alloy) as its base.
77

8+
## Current version
9+
10+
[//]: # (Version table start)
11+
12+
| Component | Version |
13+
|------------------|---------|
14+
| Alloy Operator | 0.3.15 |
15+
| Alloy Helm chart | 1.5.1 |
16+
| Alloy binary | v1.12.1 |
17+
18+
[//]: # (Version table end)
19+
820
## Usage
921

10-
To use the Alloy Operator, there are three steps to follow:
22+
To use the Alloy Operator, there are two steps to follow:
1123

1224
1. Deploy the Alloy Operator.
1325
1. Deploy an Alloy instance.

‎charts/alloy-helm-chart/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ apiVersion: v2
33
name: alloy-helm-chart
44
description: A fake chart for holding the current Alloy helm chart
55
type: library
6-
version: 1.5.0
6+
version: 1.5.1
77
dependencies:
88
- name: alloy
99
repository: https://grafana.github.io/helm-charts
10-
version: 1.5.0
10+
version: 1.5.1

‎charts/alloy-operator/CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Changelog
22

3+
## 0.3.15
4+
35
## 0.3.14
46

57
* Update Alloy to 1.5.0 (@petewall)

‎charts/alloy-operator/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ icon: https://raw.githubusercontent.com/grafana/grafana/main/public/img/grafana_
66
sources:
77
- https://github.com/grafana/alloy-operator
88
type: application
9-
version: 0.3.14
10-
appVersion: "1.5.0"
9+
version: 0.3.15
10+
appVersion: "1.5.1"
1111
maintainers:
1212
- email: [email protected]
1313
name: petewall

‎charts/alloy-operator/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
# alloy-operator
77

8-
![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)
8+
![Version: 0.3.15](https://img.shields.io/badge/Version-0.3.15-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.5.1](https://img.shields.io/badge/AppVersion-1.5.1-informational?style=flat-square)
99

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

‎charts/alloy-operator/docs/examples/default/output.yaml‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ metadata:
66
name: test-alloy-operator
77
namespace: operator
88
labels:
9-
helm.sh/chart: alloy-operator-0.3.14
9+
helm.sh/chart: alloy-operator-0.3.15
1010
app.kubernetes.io/name: alloy-operator
1111
app.kubernetes.io/instance: test
12-
app.kubernetes.io/version: "1.5.0"
12+
app.kubernetes.io/version: "1.5.1"
1313
app.kubernetes.io/managed-by: Helm
1414
automountServiceAccountToken: true
1515
---
@@ -19,10 +19,10 @@ kind: ClusterRole
1919
metadata:
2020
name: test-alloy-operator-alloy-manager
2121
labels:
22-
helm.sh/chart: alloy-operator-0.3.14
22+
helm.sh/chart: alloy-operator-0.3.15
2323
app.kubernetes.io/name: alloy-operator
2424
app.kubernetes.io/instance: test
25-
app.kubernetes.io/version: "1.5.0"
25+
app.kubernetes.io/version: "1.5.1"
2626
app.kubernetes.io/managed-by: Helm
2727
rules:
2828
- apiGroups:
@@ -77,10 +77,10 @@ kind: ClusterRoleBinding
7777
metadata:
7878
name: test-alloy-operator-alloy-manager
7979
labels:
80-
helm.sh/chart: alloy-operator-0.3.14
80+
helm.sh/chart: alloy-operator-0.3.15
8181
app.kubernetes.io/name: alloy-operator
8282
app.kubernetes.io/instance: test
83-
app.kubernetes.io/version: "1.5.0"
83+
app.kubernetes.io/version: "1.5.1"
8484
app.kubernetes.io/managed-by: Helm
8585
roleRef:
8686
apiGroup: rbac.authorization.k8s.io
@@ -97,10 +97,10 @@ kind: ClusterRoleBinding
9797
metadata:
9898
name: test-alloy-operator
9999
labels:
100-
helm.sh/chart: alloy-operator-0.3.14
100+
helm.sh/chart: alloy-operator-0.3.15
101101
app.kubernetes.io/name: alloy-operator
102102
app.kubernetes.io/instance: test
103-
app.kubernetes.io/version: "1.5.0"
103+
app.kubernetes.io/version: "1.5.1"
104104
app.kubernetes.io/managed-by: Helm
105105
roleRef:
106106
apiGroup: rbac.authorization.k8s.io
@@ -118,10 +118,10 @@ metadata:
118118
name: test-alloy-operator-leader-election-role
119119
namespace: operator
120120
labels:
121-
helm.sh/chart: alloy-operator-0.3.14
121+
helm.sh/chart: alloy-operator-0.3.15
122122
app.kubernetes.io/name: alloy-operator
123123
app.kubernetes.io/instance: test
124-
app.kubernetes.io/version: "1.5.0"
124+
app.kubernetes.io/version: "1.5.1"
125125
app.kubernetes.io/managed-by: Helm
126126
rules:
127127
- apiGroups:
@@ -163,10 +163,10 @@ metadata:
163163
name: test-alloy-operator-leader-election-rolebinding
164164
namespace: operator
165165
labels:
166-
helm.sh/chart: alloy-operator-0.3.14
166+
helm.sh/chart: alloy-operator-0.3.15
167167
app.kubernetes.io/name: alloy-operator
168168
app.kubernetes.io/instance: test
169-
app.kubernetes.io/version: "1.5.0"
169+
app.kubernetes.io/version: "1.5.1"
170170
app.kubernetes.io/managed-by: Helm
171171
roleRef:
172172
apiGroup: rbac.authorization.k8s.io
@@ -184,10 +184,10 @@ metadata:
184184
name: test-alloy-operator
185185
namespace: operator
186186
labels:
187-
helm.sh/chart: alloy-operator-0.3.14
187+
helm.sh/chart: alloy-operator-0.3.15
188188
app.kubernetes.io/name: alloy-operator
189189
app.kubernetes.io/instance: test
190-
app.kubernetes.io/version: "1.5.0"
190+
app.kubernetes.io/version: "1.5.1"
191191
app.kubernetes.io/managed-by: Helm
192192
spec:
193193
type: ClusterIP
@@ -211,10 +211,10 @@ metadata:
211211
name: test-alloy-operator
212212
namespace: operator
213213
labels:
214-
helm.sh/chart: alloy-operator-0.3.14
214+
helm.sh/chart: alloy-operator-0.3.15
215215
app.kubernetes.io/name: alloy-operator
216216
app.kubernetes.io/instance: test
217-
app.kubernetes.io/version: "1.5.0"
217+
app.kubernetes.io/version: "1.5.1"
218218
app.kubernetes.io/managed-by: Helm
219219
spec:
220220
replicas: 1
@@ -225,10 +225,10 @@ spec:
225225
template:
226226
metadata:
227227
labels:
228-
helm.sh/chart: alloy-operator-0.3.14
228+
helm.sh/chart: alloy-operator-0.3.15
229229
app.kubernetes.io/name: alloy-operator
230230
app.kubernetes.io/instance: test
231-
app.kubernetes.io/version: "1.5.0"
231+
app.kubernetes.io/version: "1.5.1"
232232
app.kubernetes.io/managed-by: Helm
233233
spec:
234234
serviceAccountName: test-alloy-operator
@@ -241,7 +241,7 @@ spec:
241241
type: RuntimeDefault
242242
containers:
243243
- name: alloy-operator
244-
image: "ghcr.io/grafana/alloy-operator:1.5.0"
244+
image: "ghcr.io/grafana/alloy-operator:1.5.1"
245245
imagePullPolicy: IfNotPresent
246246
args:
247247
- --health-probe-bind-address=:8081

‎charts/alloy-operator/docs/examples/image-by-digest/output.yaml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ metadata:
66
name: test-alloy-operator
77
namespace: operator
88
labels:
9-
helm.sh/chart: alloy-operator-0.3.14
9+
helm.sh/chart: alloy-operator-0.3.15
1010
app.kubernetes.io/name: alloy-operator
1111
app.kubernetes.io/instance: test
12-
app.kubernetes.io/version: "1.5.0"
12+
app.kubernetes.io/version: "1.5.1"
1313
app.kubernetes.io/managed-by: Helm
1414
automountServiceAccountToken: true
1515
---
@@ -19,10 +19,10 @@ kind: ClusterRole
1919
metadata:
2020
name: test-alloy-operator-alloy-manager
2121
labels:
22-
helm.sh/chart: alloy-operator-0.3.14
22+
helm.sh/chart: alloy-operator-0.3.15
2323
app.kubernetes.io/name: alloy-operator
2424
app.kubernetes.io/instance: test
25-
app.kubernetes.io/version: "1.5.0"
25+
app.kubernetes.io/version: "1.5.1"
2626
app.kubernetes.io/managed-by: Helm
2727
rules:
2828
- apiGroups:
@@ -77,10 +77,10 @@ kind: ClusterRoleBinding
7777
metadata:
7878
name: test-alloy-operator-alloy-manager
7979
labels:
80-
helm.sh/chart: alloy-operator-0.3.14
80+
helm.sh/chart: alloy-operator-0.3.15
8181
app.kubernetes.io/name: alloy-operator
8282
app.kubernetes.io/instance: test
83-
app.kubernetes.io/version: "1.5.0"
83+
app.kubernetes.io/version: "1.5.1"
8484
app.kubernetes.io/managed-by: Helm
8585
roleRef:
8686
apiGroup: rbac.authorization.k8s.io
@@ -97,10 +97,10 @@ kind: ClusterRoleBinding
9797
metadata:
9898
name: test-alloy-operator
9999
labels:
100-
helm.sh/chart: alloy-operator-0.3.14
100+
helm.sh/chart: alloy-operator-0.3.15
101101
app.kubernetes.io/name: alloy-operator
102102
app.kubernetes.io/instance: test
103-
app.kubernetes.io/version: "1.5.0"
103+
app.kubernetes.io/version: "1.5.1"
104104
app.kubernetes.io/managed-by: Helm
105105
roleRef:
106106
apiGroup: rbac.authorization.k8s.io
@@ -118,10 +118,10 @@ metadata:
118118
name: test-alloy-operator-leader-election-role
119119
namespace: operator
120120
labels:
121-
helm.sh/chart: alloy-operator-0.3.14
121+
helm.sh/chart: alloy-operator-0.3.15
122122
app.kubernetes.io/name: alloy-operator
123123
app.kubernetes.io/instance: test
124-
app.kubernetes.io/version: "1.5.0"
124+
app.kubernetes.io/version: "1.5.1"
125125
app.kubernetes.io/managed-by: Helm
126126
rules:
127127
- apiGroups:
@@ -163,10 +163,10 @@ metadata:
163163
name: test-alloy-operator-leader-election-rolebinding
164164
namespace: operator
165165
labels:
166-
helm.sh/chart: alloy-operator-0.3.14
166+
helm.sh/chart: alloy-operator-0.3.15
167167
app.kubernetes.io/name: alloy-operator
168168
app.kubernetes.io/instance: test
169-
app.kubernetes.io/version: "1.5.0"
169+
app.kubernetes.io/version: "1.5.1"
170170
app.kubernetes.io/managed-by: Helm
171171
roleRef:
172172
apiGroup: rbac.authorization.k8s.io
@@ -184,10 +184,10 @@ metadata:
184184
name: test-alloy-operator
185185
namespace: operator
186186
labels:
187-
helm.sh/chart: alloy-operator-0.3.14
187+
helm.sh/chart: alloy-operator-0.3.15
188188
app.kubernetes.io/name: alloy-operator
189189
app.kubernetes.io/instance: test
190-
app.kubernetes.io/version: "1.5.0"
190+
app.kubernetes.io/version: "1.5.1"
191191
app.kubernetes.io/managed-by: Helm
192192
spec:
193193
type: ClusterIP
@@ -211,10 +211,10 @@ metadata:
211211
name: test-alloy-operator
212212
namespace: operator
213213
labels:
214-
helm.sh/chart: alloy-operator-0.3.14
214+
helm.sh/chart: alloy-operator-0.3.15
215215
app.kubernetes.io/name: alloy-operator
216216
app.kubernetes.io/instance: test
217-
app.kubernetes.io/version: "1.5.0"
217+
app.kubernetes.io/version: "1.5.1"
218218
app.kubernetes.io/managed-by: Helm
219219
spec:
220220
replicas: 1
@@ -225,10 +225,10 @@ spec:
225225
template:
226226
metadata:
227227
labels:
228-
helm.sh/chart: alloy-operator-0.3.14
228+
helm.sh/chart: alloy-operator-0.3.15
229229
app.kubernetes.io/name: alloy-operator
230230
app.kubernetes.io/instance: test
231-
app.kubernetes.io/version: "1.5.0"
231+
app.kubernetes.io/version: "1.5.1"
232232
app.kubernetes.io/managed-by: Helm
233233
spec:
234234
serviceAccountName: test-alloy-operator

0 commit comments

Comments
 (0)