Skip to content

Commit a2ccfd6

Browse files
authored
Merge pull request #12 from rackerlabs/update-release
chore: update default tags to follow the chart metadata
2 parents 8ecfb41 + 2c76795 commit a2ccfd6

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

.github/workflows/release.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,11 @@ jobs:
7272
PKG_VER=${GITHUB_REF_NAME#v}
7373
7474
# update Chart.yaml with tag version
75-
yq -i ".appVersion = \"${PKG_VER}\" | .version = \"${PKG_VER}\"" charts/Chart.yaml
76-
yq -i ".rackspaceWebhook.image.tag = \"${PKG_VER}\"" charts/values.yaml
75+
yq -i ".version = \"${PKG_VER}\"" charts/Chart.yaml
7776
7877
# package chart
7978
helm package -u -d ${{ github.workspace }} charts
8079
8180
# push chart to ghcr.io
8281
helm push ${{ github.workspace }}/external-dns-rackspace-${PKG_VER}.tgz \
83-
oci://ghcr.io/${GITHUB_REPOSITORY_OWNER}/charts
82+
oci://ghcr.io/${GITHUB_REPOSITORY_OWNER}/charts

charts/templates/deployment.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ spec:
2626
- name: external-dns
2727
securityContext:
2828
{{- toYaml .Values.externalDns.containerSecurityContext | nindent 10 }}
29-
image: "{{ .Values.externalDns.image.repository }}:{{ .Values.externalDns.image.tag }}"
29+
image: "{{ .Values.externalDns.image.repository }}:{{ .Values.externalDns.image.tag | default .Chart.AppVersion }}"
3030
imagePullPolicy: {{ .Values.externalDns.image.pullPolicy }}
3131
args:
3232
- --domain-filter={{ .Values.domainFilter }}
@@ -47,7 +47,7 @@ spec:
4747
- name: rackspace-webhook
4848
securityContext:
4949
{{- toYaml .Values.rackspaceWebhook.containerSecurityContext | nindent 10 }}
50-
image: "{{ .Values.rackspaceWebhook.image.repository }}:{{ .Values.rackspaceWebhook.image.tag }}"
50+
image: "{{ .Values.rackspaceWebhook.image.repository }}:{{ .Values.rackspaceWebhook.image.tag | default (printf "v%s" .Chart.Version) }}"
5151
imagePullPolicy: {{ .Values.rackspaceWebhook.image.pullPolicy }}
5252
ports:
5353
- name: http

charts/values.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ externalDns:
88
enabled: true
99
image:
1010
repository: registry.k8s.io/external-dns/external-dns
11-
tag: v0.18.0
11+
# -- defaults to the Chart's AppVersion which should match the External DNS release
12+
tag: ""
1213
pullPolicy: IfNotPresent
1314
replicas: 1
1415
serviceAccount:
@@ -63,7 +64,8 @@ rackspaceWebhook:
6364
enabled: true
6465
image:
6566
repository: ghcr.io/rackerlabs/external-dns-rackspace-webhook
66-
tag: latest
67+
# -- defaults to the Chart version which matches the container version
68+
tag: ""
6769
pullPolicy: IfNotPresent
6870
secret:
6971
create: true

0 commit comments

Comments
 (0)