Update version to 0.3.15, update alloy chart to 1.5.1

Makefile

@@ -5,6 +5,7 @@ HAS_ZIZMOR := $(shell command -v zizmor;)
 
 LATEST_ALLOY_HELM_CHART_VERSION = $(shell helm show chart grafana/alloy | yq -r '.version')
 ALLOY_HELM_CHART_VERSION := $(shell yq '.dependencies[].version' charts/alloy-helm-chart/Chart.yaml)
+ALLOY_BINARY_VERSION := $(shell helm show chart charts/alloy-helm-chart/charts/alloy-*.tgz | yq -r '.appVersion')
 ALLOY_OPERATOR_IMAGE = ghcr.io/grafana/alloy-operator:$(ALLOY_HELM_CHART_VERSION)
 ALLOY_OPERATOR_HELM_CHART_VERSION = $(shell yq '.version' charts/alloy-operator/Chart.yaml)
 
@@ -44,7 +45,7 @@ endif
 ##@ Build
 
 .PHONY: build
-build: charts/alloy-helm-chart/charts/alloy-$(ALLOY_HELM_CHART_VERSION).tgz build-image build-charts build-test-chart
+build: README.md charts/alloy-helm-chart/charts/alloy-$(ALLOY_HELM_CHART_VERSION).tgz build-image build-charts build-test-chart
 
 UPSTREAM_ALLOY_HELM_CHART_FILES = $(shell tar -tzf charts/alloy-helm-chart/charts/alloy-$(ALLOY_HELM_CHART_VERSION).tgz)
 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
 charts/alloy-operator/Chart.yaml: charts/alloy-helm-chart/Chart.yaml
 	yq ".appVersion = \"$(ALLOY_HELM_CHART_VERSION)\"" -i charts/alloy-operator/Chart.yaml
 
+TABLE_START := $(shell grep --line-number "Version table start" README.md | sed -e "s/^\([0-9]*\):.*/\1/")
+TABLE_END := $(shell grep --line-number "Version table end" README.md | sed -e "s/^\([0-9]*\):.*/\1/")
+README_LENGTH := $(shell wc -l < README.md)
+README.md: charts/alloy-operator/Chart.yaml charts/alloy-helm-chart/Chart.yaml
+	@head -n $(TABLE_START) $@ > $@.temp
+	@echo "" >> $@.temp
+	@echo "| Component        | Version |" >> $@.temp
+	@echo "|------------------|---------|" >> $@.temp
+	echo "| Alloy Operator   | $(ALLOY_OPERATOR_HELM_CHART_VERSION) |" >> $@.temp
+	echo "| Alloy Helm chart | $(ALLOY_HELM_CHART_VERSION) |" >> $@.temp
+	echo "| Alloy binary     | $(ALLOY_BINARY_VERSION) |" >> $@.temp
+	@echo "" >> $@.temp
+	@tail -n +$(TABLE_END) $@ >> $@.temp
+	@mv $@.temp $@
+
 charts/alloy-operator/README.md: charts/alloy-operator/values.yaml charts/alloy-operator/Chart.yaml
 ifdef HAS_HELM_DOCS
 	helm-docs --chart-search-root charts/alloy-operator

README.md

@@ -5,9 +5,21 @@ The Alloy Operator is a Kubernetes Operator that manages the lifecycle of
 [Operator SDK](https://sdk.operatorframework.io/) using the
 [Alloy Helm chart](https://github.com/grafana/alloy/tree/main/operations/helm/charts/alloy) as its base.
 
+## Current version
+
+[//]: # (Version table start)
+
+| Component        | Version |
+|------------------|---------|
+| Alloy Operator   | 0.3.15 |
+| Alloy Helm chart | 1.5.1 |
+| Alloy binary     | v1.12.1 |
+
+[//]: # (Version table end)
+
 ## Usage
 
-To use the Alloy Operator, there are three steps to follow:
+To use the Alloy Operator, there are two steps to follow:
 
 1. Deploy the Alloy Operator.
 1. Deploy an Alloy instance.

charts/alloy-helm-chart/Chart.yaml

@@ -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.5.0
+version: 1.5.1
 dependencies:
   - name: alloy
     repository: https://grafana.github.io/helm-charts
-    version: 1.5.0
+    version: 1.5.1

charts/alloy-operator/CHANGELOG.md

@@ -1,5 +1,7 @@
 # Changelog
 
+## 0.3.15
+
 ## 0.3.14
 
 * Update Alloy to 1.5.0 (@petewall)

charts/alloy-operator/Chart.yaml

@@ -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.14
-appVersion: "1.5.0"
+version: 0.3.15
+appVersion: "1.5.1"
 maintainers:
   - email: pete.wall@grafana.com
     name: petewall

charts/alloy-operator/README.md

@@ -5,7 +5,7 @@
 
 # alloy-operator
 
-![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)
+![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)
 
 A Helm chart the Alloy Operator, a project to innovate on creating instances of Grafana Alloy.
 

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

@@ -6,10 +6,10 @@ metadata:
   name: test-alloy-operator
   namespace: operator
   labels:
-    helm.sh/chart: alloy-operator-0.3.14
+    helm.sh/chart: alloy-operator-0.3.15
     app.kubernetes.io/name: alloy-operator
     app.kubernetes.io/instance: test
-    app.kubernetes.io/version: "1.5.0"
+    app.kubernetes.io/version: "1.5.1"
     app.kubernetes.io/managed-by: Helm
 automountServiceAccountToken: true
 ---
@@ -19,10 +19,10 @@ kind: ClusterRole
 metadata:
   name: test-alloy-operator-alloy-manager
   labels:
-    helm.sh/chart: alloy-operator-0.3.14
+    helm.sh/chart: alloy-operator-0.3.15
     app.kubernetes.io/name: alloy-operator
     app.kubernetes.io/instance: test
-    app.kubernetes.io/version: "1.5.0"
+    app.kubernetes.io/version: "1.5.1"
     app.kubernetes.io/managed-by: Helm
 rules:
   - apiGroups:
@@ -77,10 +77,10 @@ kind: ClusterRoleBinding
 metadata:
   name: test-alloy-operator-alloy-manager
   labels:
-    helm.sh/chart: alloy-operator-0.3.14
+    helm.sh/chart: alloy-operator-0.3.15
     app.kubernetes.io/name: alloy-operator
     app.kubernetes.io/instance: test
-    app.kubernetes.io/version: "1.5.0"
+    app.kubernetes.io/version: "1.5.1"
     app.kubernetes.io/managed-by: Helm
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -97,10 +97,10 @@ kind: ClusterRoleBinding
 metadata:
   name: test-alloy-operator
   labels:
-    helm.sh/chart: alloy-operator-0.3.14
+    helm.sh/chart: alloy-operator-0.3.15
     app.kubernetes.io/name: alloy-operator
     app.kubernetes.io/instance: test
-    app.kubernetes.io/version: "1.5.0"
+    app.kubernetes.io/version: "1.5.1"
     app.kubernetes.io/managed-by: Helm
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -118,10 +118,10 @@ metadata:
   name: test-alloy-operator-leader-election-role
   namespace: operator
   labels:
-    helm.sh/chart: alloy-operator-0.3.14
+    helm.sh/chart: alloy-operator-0.3.15
     app.kubernetes.io/name: alloy-operator
     app.kubernetes.io/instance: test
-    app.kubernetes.io/version: "1.5.0"
+    app.kubernetes.io/version: "1.5.1"
     app.kubernetes.io/managed-by: Helm
 rules:
   - apiGroups:
@@ -163,10 +163,10 @@ metadata:
   name: test-alloy-operator-leader-election-rolebinding
   namespace: operator
   labels:
-    helm.sh/chart: alloy-operator-0.3.14
+    helm.sh/chart: alloy-operator-0.3.15
     app.kubernetes.io/name: alloy-operator
     app.kubernetes.io/instance: test
-    app.kubernetes.io/version: "1.5.0"
+    app.kubernetes.io/version: "1.5.1"
     app.kubernetes.io/managed-by: Helm
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -184,10 +184,10 @@ metadata:
   name: test-alloy-operator
   namespace: operator
   labels:
-    helm.sh/chart: alloy-operator-0.3.14
+    helm.sh/chart: alloy-operator-0.3.15
     app.kubernetes.io/name: alloy-operator
     app.kubernetes.io/instance: test
-    app.kubernetes.io/version: "1.5.0"
+    app.kubernetes.io/version: "1.5.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   type: ClusterIP
@@ -211,10 +211,10 @@ metadata:
   name: test-alloy-operator
   namespace: operator
   labels:
-    helm.sh/chart: alloy-operator-0.3.14
+    helm.sh/chart: alloy-operator-0.3.15
     app.kubernetes.io/name: alloy-operator
     app.kubernetes.io/instance: test
-    app.kubernetes.io/version: "1.5.0"
+    app.kubernetes.io/version: "1.5.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   replicas: 1
@@ -225,10 +225,10 @@ spec:
   template:
     metadata:
       labels:
-        helm.sh/chart: alloy-operator-0.3.14
+        helm.sh/chart: alloy-operator-0.3.15
         app.kubernetes.io/name: alloy-operator
         app.kubernetes.io/instance: test
-        app.kubernetes.io/version: "1.5.0"
+        app.kubernetes.io/version: "1.5.1"
         app.kubernetes.io/managed-by: Helm
     spec:
       serviceAccountName: test-alloy-operator
@@ -241,7 +241,7 @@ spec:
           type: RuntimeDefault
       containers:
         - name: alloy-operator
-          image: "ghcr.io/grafana/alloy-operator:1.5.0"
+          image: "ghcr.io/grafana/alloy-operator:1.5.1"
           imagePullPolicy: IfNotPresent
           args:
             - --health-probe-bind-address=:8081

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

@@ -6,10 +6,10 @@ metadata:
   name: test-alloy-operator
   namespace: operator
   labels:
-    helm.sh/chart: alloy-operator-0.3.14
+    helm.sh/chart: alloy-operator-0.3.15
     app.kubernetes.io/name: alloy-operator
     app.kubernetes.io/instance: test
-    app.kubernetes.io/version: "1.5.0"
+    app.kubernetes.io/version: "1.5.1"
     app.kubernetes.io/managed-by: Helm
 automountServiceAccountToken: true
 ---
@@ -19,10 +19,10 @@ kind: ClusterRole
 metadata:
   name: test-alloy-operator-alloy-manager
   labels:
-    helm.sh/chart: alloy-operator-0.3.14
+    helm.sh/chart: alloy-operator-0.3.15
     app.kubernetes.io/name: alloy-operator
     app.kubernetes.io/instance: test
-    app.kubernetes.io/version: "1.5.0"
+    app.kubernetes.io/version: "1.5.1"
     app.kubernetes.io/managed-by: Helm
 rules:
   - apiGroups:
@@ -77,10 +77,10 @@ kind: ClusterRoleBinding
 metadata:
   name: test-alloy-operator-alloy-manager
   labels:
-    helm.sh/chart: alloy-operator-0.3.14
+    helm.sh/chart: alloy-operator-0.3.15
     app.kubernetes.io/name: alloy-operator
     app.kubernetes.io/instance: test
-    app.kubernetes.io/version: "1.5.0"
+    app.kubernetes.io/version: "1.5.1"
     app.kubernetes.io/managed-by: Helm
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -97,10 +97,10 @@ kind: ClusterRoleBinding
 metadata:
   name: test-alloy-operator
   labels:
-    helm.sh/chart: alloy-operator-0.3.14
+    helm.sh/chart: alloy-operator-0.3.15
     app.kubernetes.io/name: alloy-operator
     app.kubernetes.io/instance: test
-    app.kubernetes.io/version: "1.5.0"
+    app.kubernetes.io/version: "1.5.1"
     app.kubernetes.io/managed-by: Helm
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -118,10 +118,10 @@ metadata:
   name: test-alloy-operator-leader-election-role
   namespace: operator
   labels:
-    helm.sh/chart: alloy-operator-0.3.14
+    helm.sh/chart: alloy-operator-0.3.15
     app.kubernetes.io/name: alloy-operator
     app.kubernetes.io/instance: test
-    app.kubernetes.io/version: "1.5.0"
+    app.kubernetes.io/version: "1.5.1"
     app.kubernetes.io/managed-by: Helm
 rules:
   - apiGroups:
@@ -163,10 +163,10 @@ metadata:
   name: test-alloy-operator-leader-election-rolebinding
   namespace: operator
   labels:
-    helm.sh/chart: alloy-operator-0.3.14
+    helm.sh/chart: alloy-operator-0.3.15
     app.kubernetes.io/name: alloy-operator
     app.kubernetes.io/instance: test
-    app.kubernetes.io/version: "1.5.0"
+    app.kubernetes.io/version: "1.5.1"
     app.kubernetes.io/managed-by: Helm
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -184,10 +184,10 @@ metadata:
   name: test-alloy-operator
   namespace: operator
   labels:
-    helm.sh/chart: alloy-operator-0.3.14
+    helm.sh/chart: alloy-operator-0.3.15
     app.kubernetes.io/name: alloy-operator
     app.kubernetes.io/instance: test
-    app.kubernetes.io/version: "1.5.0"
+    app.kubernetes.io/version: "1.5.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   type: ClusterIP
@@ -211,10 +211,10 @@ metadata:
   name: test-alloy-operator
   namespace: operator
   labels:
-    helm.sh/chart: alloy-operator-0.3.14
+    helm.sh/chart: alloy-operator-0.3.15
     app.kubernetes.io/name: alloy-operator
     app.kubernetes.io/instance: test
-    app.kubernetes.io/version: "1.5.0"
+    app.kubernetes.io/version: "1.5.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   replicas: 1
@@ -225,10 +225,10 @@ spec:
   template:
     metadata:
       labels:
-        helm.sh/chart: alloy-operator-0.3.14
+        helm.sh/chart: alloy-operator-0.3.15
         app.kubernetes.io/name: alloy-operator
         app.kubernetes.io/instance: test
-        app.kubernetes.io/version: "1.5.0"
+        app.kubernetes.io/version: "1.5.1"
         app.kubernetes.io/managed-by: Helm
     spec:
       serviceAccountName: test-alloy-operator