Skip to content

Commit f8929bc

Browse files
alexandermarstonalexandermarston
authored
Merge branch 'stakater:master' into support-gchat
2 parents 6b87aa4 + 2fb9337 commit f8929bc

19 files changed

Lines changed: 156 additions & 278 deletions

File tree

‎.github/workflows/pull_request_docs.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,11 @@ jobs:
2222
DOC_SRC: docs
2323
MD_LINT_CONFIG: .markdownlint.yaml
2424
build:
25-
uses: stakater/.github/.github/workflows/pull_request_container_build.yaml@v0.0.131
25+
uses: stakater/.github/.github/workflows/pull_request_container_build.yaml@v0.0.132
2626
with:
2727
DOCKER_FILE_PATH: Dockerfile-docs
2828
CONTAINER_REGISTRY_URL: ghcr.io/stakater
29+
PUSH_IMAGE: false
2930
secrets:
3031
CONTAINER_REGISTRY_USERNAME: ${{ github.actor }}
3132
CONTAINER_REGISTRY_PASSWORD: ${{ secrets.GHCR_TOKEN }}

‎.vale.ini‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
StylesPath = styles
22
MinAlertLevel = warning
33

4-
Packages = https://github.com/stakater/vale-package/releases/download/v0.0.62/Stakater.zip
4+
Packages = https://github.com/stakater/vale-package/releases/download/v0.0.77/Stakater.zip
55
Vocab = Stakater
66

77
# Only check MarkDown files

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ ARG BUILDER_IMAGE
22
ARG BASE_IMAGE
33

44
# Build the manager binary
5-
FROM --platform=${BUILDPLATFORM} ${BUILDER_IMAGE:-golang:1.24.2} AS builder
5+
FROM --platform=${BUILDPLATFORM} ${BUILDER_IMAGE:-golang:1.24.4} AS builder
66

77
ARG TARGETOS
88
ARG TARGETARCH

‎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.1.3
5-
appVersion: v1.4.2
4+
version: 2.1.4
5+
appVersion: v1.4.4
66
keywords:
77
- Reloader
88
- kubernetes

‎deployments/kubernetes/chart/reloader/templates/clusterrole.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ metadata:
1111
labels:
1212
{{ include "reloader-labels.chart" . | indent 4 }}
1313
{{- if .Values.reloader.rbac.labels }}
14-
{{ toYaml .Values.reloader.rbac.labels | indent 4 }}
14+
{{ tpl (toYaml .Values.reloader.rbac.labels) . | indent 4 }}
1515
{{- end }}
1616
{{- if .Values.reloader.matchLabels }}
17-
{{ toYaml .Values.reloader.matchLabels | indent 4 }}
17+
{{ tpl (toYaml .Values.reloader.matchLabels) . | indent 4 }}
1818
{{- end }}
1919
name: {{ template "reloader-fullname" . }}-role
2020
rules:

‎deployments/kubernetes/chart/reloader/templates/clusterrolebinding.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ metadata:
1111
labels:
1212
{{ include "reloader-labels.chart" . | indent 4 }}
1313
{{- if .Values.reloader.rbac.labels }}
14-
{{ toYaml .Values.reloader.rbac.labels | indent 4 }}
14+
{{ tpl (toYaml .Values.reloader.rbac.labels) . | indent 4 }}
1515
{{- end }}
1616
{{- if .Values.reloader.matchLabels }}
17-
{{ toYaml .Values.reloader.matchLabels | indent 4 }}
17+
{{ tpl (toYaml .Values.reloader.matchLabels) . | indent 4 }}
1818
{{- end }}
1919
name: {{ template "reloader-fullname" . }}-role-binding
2020
roleRef:

‎deployments/kubernetes/chart/reloader/templates/deployment.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ metadata:
44
annotations:
55
{{ include "reloader-helm3.annotations" . | indent 4 }}
66
{{- if .Values.reloader.deployment.annotations }}
7-
{{ toYaml .Values.reloader.deployment.annotations | indent 4 }}
7+
{{ tpl (toYaml .Values.reloader.deployment.annotations) . | indent 4 }}
88
{{- end }}
99
labels:
1010
{{ include "reloader-labels.chart" . | indent 4 }}
1111
{{- if .Values.reloader.deployment.labels }}
12-
{{ toYaml .Values.reloader.deployment.labels | indent 4 }}
12+
{{ tpl (toYaml .Values.reloader.deployment.labels) . | indent 4 }}
1313
{{- end }}
1414
{{- if .Values.reloader.matchLabels }}
15-
{{ toYaml .Values.reloader.matchLabels | indent 4 }}
15+
{{ tpl (toYaml .Values.reloader.matchLabels) . | indent 4 }}
1616
{{- end }}
1717
name: {{ template "reloader-fullname" . }}
1818
namespace: {{ .Values.namespace | default .Release.Namespace }}
@@ -28,21 +28,21 @@ spec:
2828
app: {{ template "reloader-fullname" . }}
2929
release: {{ .Release.Name | quote }}
3030
{{- if .Values.reloader.matchLabels }}
31-
{{ toYaml .Values.reloader.matchLabels | indent 6 }}
31+
{{ tpl (toYaml .Values.reloader.matchLabels) . | indent 6 }}
3232
{{- end }}
3333
template:
3434
metadata:
3535
{{- if .Values.reloader.deployment.pod.annotations }}
3636
annotations:
37-
{{ toYaml .Values.reloader.deployment.pod.annotations | indent 8 }}
37+
{{ tpl (toYaml .Values.reloader.deployment.pod.annotations) . | indent 8 }}
3838
{{- end }}
3939
labels:
4040
{{ include "reloader-labels.chart" . | indent 8 }}
4141
{{- if .Values.reloader.deployment.labels }}
42-
{{ toYaml .Values.reloader.deployment.labels | indent 8 }}
42+
{{ tpl (toYaml .Values.reloader.deployment.labels) . | indent 8 }}
4343
{{- end }}
4444
{{- if .Values.reloader.matchLabels }}
45-
{{ toYaml .Values.reloader.matchLabels | indent 8 }}
45+
{{ tpl (toYaml .Values.reloader.matchLabels) . | indent 8 }}
4646
{{- end }}
4747
spec:
4848
{{- with .Values.global.imagePullSecrets }}

‎deployments/kubernetes/chart/reloader/templates/networkpolicy.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
labels:
88
{{ include "reloader-labels.chart" . | indent 4 }}
99
{{- if .Values.reloader.matchLabels }}
10-
{{ toYaml .Values.reloader.matchLabels | indent 4 }}
10+
{{ tpl (toYaml .Values.reloader.matchLabels) . | indent 4 }}
1111
{{- end }}
1212
name: {{ template "reloader-fullname" . }}
1313
namespace: {{ .Values.namespace | default .Release.Namespace }}
@@ -17,7 +17,7 @@ spec:
1717
app: {{ template "reloader-fullname" . }}
1818
release: {{ .Release.Name | quote }}
1919
{{- if .Values.reloader.matchLabels }}
20-
{{ toYaml .Values.reloader.matchLabels | indent 6 }}
20+
{{ tpl (toYaml .Values.reloader.matchLabels) . | indent 6 }}
2121
{{- end }}
2222
policyTypes:
2323
- Ingress

‎deployments/kubernetes/chart/reloader/templates/role.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ metadata:
1111
labels:
1212
{{ include "reloader-labels.chart" . | indent 4 }}
1313
{{- if .Values.reloader.rbac.labels }}
14-
{{ toYaml .Values.reloader.rbac.labels | indent 4 }}
14+
{{ tpl (toYaml .Values.reloader.rbac.labels) . | indent 4 }}
1515
{{- end }}
1616
{{- if .Values.reloader.matchLabels }}
17-
{{ toYaml .Values.reloader.matchLabels | indent 4 }}
17+
{{ tpl (toYaml .Values.reloader.matchLabels) . | indent 4 }}
1818
{{- end }}
1919
name: {{ template "reloader-fullname" . }}-role
2020
namespace: {{ .Values.namespace | default .Release.Namespace }}

‎deployments/kubernetes/chart/reloader/templates/rolebinding.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ metadata:
1111
labels:
1212
{{ include "reloader-labels.chart" . | indent 4 }}
1313
{{- if .Values.reloader.rbac.labels }}
14-
{{ toYaml .Values.reloader.rbac.labels | indent 4 }}
14+
{{ tpl (toYaml .Values.reloader.rbac.labels) . | indent 4 }}
1515
{{- end }}
1616
{{- if .Values.reloader.matchLabels }}
17-
{{ toYaml .Values.reloader.matchLabels | indent 4 }}
17+
{{ tpl (toYaml .Values.reloader.matchLabels) . | indent 4 }}
1818
{{- end }}
1919
name: {{ template "reloader-fullname" . }}-role-binding
2020
namespace: {{ .Values.namespace | default .Release.Namespace }}

0 commit comments

Comments
 (0)