Skip to content

Commit 08147e7

Browse files
karl-johan-grahnChristianCiach
authored andcommitted
Helm chart update for v1.4.0 (stakater#886)
* update * update * update
1 parent 128a3fb commit 08147e7

8 files changed

Lines changed: 66 additions & 38 deletions

File tree

.github/workflows/push-helm-chart.yaml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Push Helm Chart
22

3-
# TODO: fix: workflows have a problem where only code owners' PRs get the actions running
3+
# TODO: fix: workflows have a problem where only code owners' PRs get the actions running
44

55
on:
66
pull_request:
@@ -104,6 +104,13 @@ jobs:
104104
commit_username: stakater-user
105105
commit_email: stakater@gmail.com
106106

107+
- name: Push new chart tag
108+
uses: anothrNick/github-tag-action@1.71.0
109+
env:
110+
GITHUB_TOKEN: ${{ secrets.PUBLISH_TOKEN }}
111+
WITH_V: false
112+
CUSTOM_TAG: chart-v${{ steps.new_chart_version.outputs.result }}
113+
107114
- name: Notify Slack
108115
uses: 8398a7/action-slack@v3
109116
if: always() # Pick up events even if the job fails or is canceled.
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name: Release Helm chart
2+
3+
on:
4+
push:
5+
tags:
6+
- "chart-v*"
7+
tags-ignore:
8+
- "v*"
9+
10+
permissions:
11+
contents: write
12+
13+
jobs:
14+
release-helm-chart:
15+
name: Release Helm chart
16+
runs-on: ubuntu-latest
17+
18+
steps:
19+
- name: Check out code
20+
uses: actions/checkout@v4
21+
with:
22+
fetch-depth: 0
23+
24+
- name: Create release
25+
env:
26+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
27+
tag: ${{ github.ref }}
28+
run: |
29+
gh release create "$tag" \
30+
--repo="$GITHUB_REPOSITORY" \
31+
--title="Helm chart ${tag#chart-}" \
32+
--generate-notes
33+
34+
- name: Notify Slack
35+
uses: 8398a7/action-slack@v3
36+
if: always()
37+
with:
38+
status: ${{ job.status }}
39+
fields: repo,author,action,eventName,ref,workflow
40+
env:
41+
SLACK_WEBHOOK_URL: ${{ secrets.STAKATER_DELIVERY_SLACK_WEBHOOK }}

.github/workflows/release.yaml

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
name: Release Go project
22

33
on:
4-
release:
5-
types: [published]
4+
push:
5+
tags:
6+
- "v*"
7+
tags-ignore:
8+
- "chart-v*"
69

710
env:
811
DOCKER_FILE_PATH: Dockerfile
@@ -12,7 +15,7 @@ env:
1215
REGISTRY: ghcr.io
1316

1417
jobs:
15-
build:
18+
release:
1619

1720
permissions:
1821
contents: read
@@ -193,22 +196,6 @@ jobs:
193196
## Add steps to generate required artifacts for a release here(helm chart, operator manifest etc.)
194197
##############################
195198

196-
# # Generate tag for operator without "v"
197-
# - name: Generate Operator Tag
198-
# id: generate_operator_tag
199-
# uses: anothrNick/github-tag-action@1.70.0
200-
# env:
201-
# GITHUB_TOKEN: ${{ secrets.STAKATER_GITHUB_TOKEN }}
202-
# WITH_V: false
203-
# DEFAULT_BUMP: patch
204-
# DRY_RUN: true
205-
206-
# # Update chart tag to the latest semver tag
207-
# - name: Update Chart Version
208-
# env:
209-
# VERSION: ${{ steps.generate_operator_tag.outputs.RELEASE_VERSION }}
210-
# run: make bump-chart
211-
212199
- name: Run GoReleaser
213200
uses: goreleaser/goreleaser-action@master
214201
with:

.goreleaser.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,7 @@ snapshot:
1818
checksum:
1919
name_template: "{{ .ProjectName }}_{{ .Version }}_checksums.txt"
2020
changelog:
21-
sort: asc
22-
filters:
23-
exclude:
24-
- '^docs:'
25-
- '^test:'
21+
# It will be generated manually as part of making a new GitHub release
22+
disable: true
2623
env_files:
2724
github_token: /home/jenkins/.apitoken/hub

Makefile

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ GOLANGCI_LINT_VERSION ?= v1.57.2
4646
YQ_VERSION ?= v4.27.5
4747
YQ_DOWNLOAD_URL = "https://github.com/mikefarah/yq/releases/download/$(YQ_VERSION)/yq_$(OS)_$(ARCH)"
4848

49-
5049
.PHONY: yq
5150
yq: $(YQ) ## Download YQ locally if needed
5251
$(YQ):
@@ -58,7 +57,6 @@ $(YQ):
5857
@chmod +x $(YQ)
5958
@echo "yq downloaded successfully to $(YQ)."
6059

61-
6260
.PHONY: kustomize
6361
kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.
6462
$(KUSTOMIZE): $(LOCALBIN)
@@ -157,12 +155,6 @@ k8s-manifests: $(KUSTOMIZE) ## Generate k8s manifests using Kustomize from 'mani
157155
update-manifests-version: ## Generate k8s manifests using Kustomize from 'manifests' folder
158156
sed -i 's/image:.*/image: \"ghcr.io\/stakater\/reloader:v$(VERSION)"/g' deployments/kubernetes/manifests/deployment.yaml
159157

160-
# Bump Chart
161-
bump-chart:
162-
sed -i "s/^appVersion:.*/appVersion: v$(VERSION)/" deployments/kubernetes/chart/reloader/Chart.yaml
163-
sed -i "s/tag:.*/tag: v$(VERSION)/" deployments/kubernetes/chart/reloader/values.yaml
164-
sed -i "s/version:.*/version: v$(VERSION)/" deployments/kubernetes/chart/reloader/values.yaml
165-
166158
YQ_VERSION = v4.42.1
167159
YQ_BIN = $(shell pwd)/yq
168160
CURRENT_ARCH := $(shell uname -m | sed 's/x86_64/amd64/' | sed 's/aarch64/arm64/')

deployments/kubernetes/chart/reloader/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apiVersion: v1
22
name: reloader
33
description: Reloader chart that runs on kubernetes
4-
version: 2.0.0
5-
appVersion: v1.3.0
4+
version: 2.1.0
5+
appVersion: v1.4.0
66
keywords:
77
- Reloader
88
- kubernetes

deployments/kubernetes/chart/reloader/README.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,4 +158,8 @@ _Helm chart versioning_: The Reloader Helm chart is maintained in this repositor
158158

159159
Helm chart will be released to the chart registry whenever files in `deployments/kubernetes/chart/reloader/**` change on the main branch.
160160

161-
Helm Chart will be released by the maintainers, on labelling a PR with `release/helm-chart` and pre-maturely updating the `version` field in `Chart.yaml` file.
161+
### To release the Helm chart
162+
163+
1. Create a new branch and update the Helm chart `appVersion` and `version`, example pull-request: [PR-846](https://github.com/stakater/Reloader/pull/846)
164+
1. Label the PR with `release/helm-chart`
165+
1. After approval and just before squash, make sure the squash commit message represents all changes, because it will be used to autogenerate the changelog message

deployments/kubernetes/chart/reloader/values.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ fullnameOverride: ""
1717
image:
1818
name: stakater/reloader
1919
repository: ghcr.io/stakater/reloader
20-
tag: v1.3.0
20+
tag: v1.4.0
2121
# digest: sha256:1234567
2222
pullPolicy: IfNotPresent
2323

@@ -106,7 +106,7 @@ reloader:
106106
labels:
107107
provider: stakater
108108
group: com.stakater.platform
109-
version: v1.3.0
109+
version: v1.4.0
110110
# Support for extra environment variables.
111111
env:
112112
# Open supports Key value pair as environment variables.

0 commit comments

Comments
 (0)