Skip to content

Commit d4ce130

Browse files
committed
Consolidated Helm template context references ($ vs .)
1 parent 1f25e2b commit d4ce130

File tree

4 files changed

+25
-25
lines changed

4 files changed

+25
-25
lines changed

charts/eoapi/templates/core/rbac.yaml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
apiVersion: rbac.authorization.k8s.io/v1
33
kind: Role
44
metadata:
5-
name: eoapi-role-{{ $.Release.Name }}
5+
name: eoapi-role-{{ .Release.Name }}
66
labels:
7-
app: eoapi-{{ $.Release.Name }}
7+
app: eoapi-{{ .Release.Name }}
88
rules:
99
- apiGroups: ["batch"]
1010
resources: ["jobs"]
@@ -14,9 +14,9 @@ rules:
1414
apiVersion: rbac.authorization.k8s.io/v1
1515
kind: ClusterRole
1616
metadata:
17-
name: eoapi-cluster-role-{{ $.Release.Name }}
17+
name: eoapi-cluster-role-{{ .Release.Name }}
1818
labels:
19-
app: eoapi-{{ $.Release.Name }}
19+
app: eoapi-{{ .Release.Name }}
2020
rules:
2121
# CRD management for Knative operator installation
2222
- apiGroups: ["apiextensions.k8s.io"]
@@ -50,32 +50,32 @@ rules:
5050
apiVersion: rbac.authorization.k8s.io/v1
5151
kind: ClusterRoleBinding
5252
metadata:
53-
name: eoapi-cluster-rolebinding-{{ $.Release.Name }}
53+
name: eoapi-cluster-rolebinding-{{ .Release.Name }}
5454
labels:
55-
app: eoapi-{{ $.Release.Name }}
55+
app: eoapi-{{ .Release.Name }}
5656
subjects:
5757
- kind: ServiceAccount
5858
name: {{ include "eoapi.serviceAccountName" . }}
59-
namespace: {{ $.Release.Namespace }}
59+
namespace: {{ .Release.Namespace }}
6060
roleRef:
6161
kind: ClusterRole
62-
name: eoapi-cluster-role-{{ $.Release.Name }}
62+
name: eoapi-cluster-role-{{ .Release.Name }}
6363
apiGroup: rbac.authorization.k8s.io
6464
---
6565
{{- end }}
6666
---
6767
apiVersion: rbac.authorization.k8s.io/v1
6868
kind: RoleBinding
6969
metadata:
70-
name: eoapi-rolebinding-{{ $.Release.Name }}
70+
name: eoapi-rolebinding-{{ .Release.Name }}
7171
labels:
72-
app: eoapi-{{ $.Release.Name }}
72+
app: eoapi-{{ .Release.Name }}
7373
subjects:
7474
- kind: ServiceAccount
7575
name: {{ include "eoapi.serviceAccountName" . }}
76-
namespace: {{ $.Release.Namespace }}
76+
namespace: {{ .Release.Namespace }}
7777
roleRef:
7878
kind: Role
79-
name: eoapi-role-{{ $.Release.Name }}
79+
name: eoapi-role-{{ .Release.Name }}
8080
apiGroup: rbac.authorization.k8s.io
8181
{{- end }}

charts/eoapi/templates/database/pgstacbootstrap/configmap.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,23 @@
66
apiVersion: v1
77
kind: ConfigMap
88
metadata:
9-
name: {{ $.Release.Name }}-pgstac-settings-config
9+
name: {{ .Release.Name }}-pgstac-settings-config
1010
annotations:
1111
helm.sh/hook: "post-install,post-upgrade"
1212
helm.sh/hook-weight: "-7"
1313
helm.sh/hook-delete-policy: "before-hook-creation,hook-succeeded"
1414
data:
1515
pgstac-settings.sql: |
16-
{{- tpl ($.Files.Get "data/initdb/settings/pgstac-settings.sql.tpl") $ | nindent 4 }}
16+
{{- tpl (.Files.Get "data/initdb/settings/pgstac-settings.sql.tpl") . | nindent 4 }}
1717
{{- if (index .Values "eoapi-notifier").enabled }}
18-
{{ $.Files.Get "data/initdb/settings/pgstac-notification-triggers.sql" | nindent 4 }}
18+
{{ .Files.Get "data/initdb/settings/pgstac-notification-triggers.sql" | nindent 4 }}
1919
{{- end }}
2020
---
2121
{{- if .Values.pgstacBootstrap.settings.loadSamples }}
2222
apiVersion: v1
2323
kind: ConfigMap
2424
metadata:
25-
name: {{ $.Release.Name }}-initdb-sql-config
25+
name: {{ .Release.Name }}-initdb-sql-config
2626
annotations:
2727
helm.sh/hook: "post-install,post-upgrade"
2828
helm.sh/hook-weight: "-7"
@@ -36,7 +36,7 @@ data:
3636
apiVersion: v1
3737
kind: ConfigMap
3838
metadata:
39-
name: {{ $.Release.Name }}-initdb-json-config
39+
name: {{ .Release.Name }}-initdb-json-config
4040
annotations:
4141
helm.sh/hook: "post-install,post-upgrade"
4242
helm.sh/hook-weight: "-7"
@@ -58,7 +58,7 @@ data:
5858
apiVersion: v1
5959
kind: ConfigMap
6060
metadata:
61-
name: {{ $.Release.Name }}-pgstac-queryables-config
61+
name: {{ .Release.Name }}-pgstac-queryables-config
6262
annotations:
6363
helm.sh/hook: "post-install,post-upgrade"
6464
helm.sh/hook-weight: "-7"

charts/eoapi/templates/database/pgstacbootstrap/eoap-superuser-initdb.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,27 +47,27 @@ spec:
4747
- name: PGUSER
4848
valueFrom:
4949
secretKeyRef:
50-
name: {{ $.Values.postgrescluster.name | default $.Release.Name }}-pguser-postgres
50+
name: {{ .Values.postgrescluster.name | default .Release.Name }}-pguser-postgres
5151
key: user
5252
- name: PGPORT
5353
valueFrom:
5454
secretKeyRef:
55-
name: {{ $.Values.postgrescluster.name | default $.Release.Name }}-pguser-postgres
55+
name: {{ .Values.postgrescluster.name | default .Release.Name }}-pguser-postgres
5656
key: port
5757
- name: PGHOST
5858
valueFrom:
5959
secretKeyRef:
60-
name: {{ $.Values.postgrescluster.name | default $.Release.Name }}-pguser-postgres
60+
name: {{ .Values.postgrescluster.name | default .Release.Name }}-pguser-postgres
6161
key: host
6262
- name: PGPASSWORD
6363
valueFrom:
6464
secretKeyRef:
65-
name: {{ $.Values.postgrescluster.name | default $.Release.Name }}-pguser-postgres
65+
name: {{ .Values.postgrescluster.name | default .Release.Name }}-pguser-postgres
6666
key: password
6767
- name: PGDATABASE
6868
valueFrom:
6969
secretKeyRef:
70-
name: {{ $.Values.postgrescluster.name | default $.Release.Name }}-pguser-postgres
70+
name: {{ .Values.postgrescluster.name | default .Release.Name }}-pguser-postgres
7171
key: dbname
7272
volumes:
7373
- name: {{ .Release.Name }}-initdb-config

charts/eoapi/templates/networking/ingress.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ metadata:
2222
# Traefik stripPrefix middleware for services that need path stripping (excludes STAC)
2323
{{- if eq .Values.ingress.className "traefik" }}
2424
traefik.ingress.kubernetes.io/router.entrypoints: web
25-
traefik.ingress.kubernetes.io/router.middlewares: {{ $.Release.Namespace }}-{{ $.Release.Name }}-strip-prefix-middleware@kubernetescrd
25+
traefik.ingress.kubernetes.io/router.middlewares: {{ .Release.Namespace }}-{{ .Release.Name }}-strip-prefix-middleware@kubernetescrd
2626
{{- end }}
2727
spec:
2828
{{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }}
@@ -136,7 +136,7 @@ spec:
136136

137137
{{- if .Values.docServer.enabled }}
138138
- pathType: Prefix
139-
path: "/{{ $.Values.ingress.rootPath | default "" }}"
139+
path: "/{{ .Values.ingress.rootPath | default "" }}"
140140
backend:
141141
service:
142142
name: {{ .Release.Name }}-doc-server

0 commit comments

Comments
 (0)