Skip to content

Commit 915377d

Browse files
pantierrapantierra
authored
Named components consistently. (#259)
1 parent 4bd29a5 commit 915377d

39 files changed

+152
-158
lines changed

‎.github/workflows/helm-tests.yml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -228,28 +228,28 @@ jobs:
228228
echo ""
229229
230230
echo "Waiting for raster service to be ready..."
231-
kubectl wait --for=condition=Ready pod -l app=raster-${RELEASE_NAME} --timeout=180s || {
231+
kubectl wait --for=condition=Ready pod -l app=${RELEASE_NAME}-raster --timeout=180s || {
232232
echo "Raster service failed to become ready. Checking status..."
233-
kubectl get pods -l app=raster-${RELEASE_NAME} -o wide
234-
kubectl describe pods -l app=raster-${RELEASE_NAME}
233+
kubectl get pods -l app=${RELEASE_NAME}-raster -o wide
234+
kubectl describe pods -l app=${RELEASE_NAME}-raster
235235
exit 1
236236
}
237237
echo "raster service is ready, moving on..."
238238
239239
echo "Waiting for vector service to be ready..."
240-
kubectl wait --for=condition=Ready pod -l app=vector-${RELEASE_NAME} --timeout=180s || {
240+
kubectl wait --for=condition=Ready pod -l app=${RELEASE_NAME}-vector --timeout=180s || {
241241
echo "Vector service failed to become ready. Checking status..."
242-
kubectl get pods -l app=vector-${RELEASE_NAME} -o wide
243-
kubectl describe pods -l app=vector-${RELEASE_NAME}
242+
kubectl get pods -l app=${RELEASE_NAME}-vector -o wide
243+
kubectl describe pods -l app=${RELEASE_NAME}-vector
244244
exit 1
245245
}
246246
echo "vector service is ready, moving on..."
247247
248248
echo "Waiting for stac service to be ready..."
249-
kubectl wait --for=condition=Ready pod -l app=stac-${RELEASE_NAME} --timeout=180s || {
249+
kubectl wait --for=condition=Ready pod -l app=${RELEASE_NAME}-stac --timeout=180s || {
250250
echo "STAC service failed to become ready. Checking status..."
251-
kubectl get pods -l app=stac-${RELEASE_NAME} -o wide
252-
kubectl describe pods -l app=stac-${RELEASE_NAME}
251+
kubectl get pods -l app=${RELEASE_NAME}-stac -o wide
252+
kubectl describe pods -l app=${RELEASE_NAME}-stac
253253
exit 1
254254
}
255255
echo "all services are ready, moving on..."
@@ -271,9 +271,9 @@ jobs:
271271
# Check init container logs for all services
272272
for SERVICE in raster vector stac multidim; do
273273
echo "===== $SERVICE Service Pod Status ====="
274-
kubectl get pods -l app=$SERVICE-$RELEASE_NAME -o wide || echo "No $SERVICE pods found"
274+
kubectl get pods -l app=$RELEASE_NAME-$SERVICE -o wide || echo "No $SERVICE pods found"
275275
276-
POD_NAME=$(kubectl get pod -l app=$SERVICE-$RELEASE_NAME -o jsonpath='{.items[0].metadata.name}' 2>/dev/null || echo "")
276+
POD_NAME=$(kubectl get pod -l app=$RELEASE_NAME-$SERVICE -o jsonpath='{.items[0].metadata.name}' 2>/dev/null || echo "")
277277
if [ -n "$POD_NAME" ]; then
278278
echo "===== $SERVICE Pod ($POD_NAME) Init Container Logs ====="
279279
kubectl logs pod/$POD_NAME -c wait-for-pgstac-jobs --tail=100 || echo "Could not get $SERVICE init container logs"
@@ -296,15 +296,15 @@ jobs:
296296
297297
# Check pgstac jobs using labels instead of hardcoded names
298298
for APP_LABEL in pgstac-migrate pgstac-load-samples; do
299-
echo "===== Jobs with app=$APP_LABEL Status ====="
300-
JOBS=$(kubectl get jobs -l app=$APP_LABEL -o name 2>/dev/null || true)
299+
echo "===== Jobs with app=$RELEASE_NAME-$APP_LABEL Status ====="
300+
JOBS=$(kubectl get jobs -l app=$RELEASE_NAME-$APP_LABEL -o name 2>/dev/null || true)
301301
if [ -n "$JOBS" ]; then
302302
for JOB in $JOBS; do
303303
echo "--- Job $JOB ---"
304304
kubectl get "$JOB" -o yaml 2>/dev/null | grep -A 10 -E "conditions|status:" || echo "Could not get status for $JOB"
305305
done
306306
else
307-
echo "No jobs found with app=$APP_LABEL label"
307+
echo "No jobs found with app=$RELEASE_NAME-$APP_LABEL label"
308308
fi
309309
echo ""
310310
done

‎charts/eoapi-support/templates/dashboard.config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v1
22
kind: ConfigMap
33
metadata:
4-
name: eoapi-dashboards
4+
name: {{ .Release.Name }}-dashboards
55
labels:
66
eoapi_dashboard: "1"
77
data:

‎charts/eoapi-support/values.yaml‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
# so giving props where props are due to Yuvi Panda :sparkles:
33
prometheus-adapter:
44
prometheus:
5-
# NOTE: the `url` below make some assumptions about the namespace where you released eoapi and prometheus
6-
# 1) that you didn't change the default name of the `prometheus-server` or the port and installed in eoapi namespace
7-
# 2) namely that you ran `helm install eoapi --create-namespace=eoapi` with the `eoapi` namespace
5+
# NOTE: the `url` below makes assumptions about release name and namespace:
6+
# 1) Release name is "eoapi-support" (follows RELEASE_NAME-prometheus-server pattern)
7+
# 2) Deployed in "eoapi" namespace
8+
# 3) If using different release name, update to: http://YOUR_RELEASE_NAME-prometheus-server.YOUR_NAMESPACE.svc.cluster.local
89
url: http://eoapi-support-prometheus-server.eoapi.svc.cluster.local
910
port: 80
1011
path: ""
@@ -136,9 +137,10 @@ grafana:
136137
- name: prometheus
137138
orgId: 1
138139
type: prometheus
139-
# NOTE: the `url` below make some assumptions about the namespace where you released eoapi and prometheus
140-
# 1) that you didn't change the default name of the `prometheus-server` or the port and installed in eoapi namespace
141-
# 2) namely that you ran `helm install eoapi --create-namespace=eoapi` with the `eoapi` namespace
140+
# NOTE: the `url` below makes assumptions about release name and namespace:
141+
# 1) Release name is "eoapi-support" (follows RELEASE_NAME-prometheus-server pattern)
142+
# 2) Deployed in "eoapi" namespace
143+
# 3) If using different release name, update to: http://YOUR_RELEASE_NAME-prometheus-server.YOUR_NAMESPACE.svc.cluster.local
142144
url: http://eoapi-support-prometheus-server.eoapi.svc.cluster.local
143145
access: proxy
144146
jsonData:
@@ -161,7 +163,11 @@ grafana:
161163
path: /var/lib/grafana/dashboards/default
162164

163165
dashboardsConfigMaps:
164-
default: "eoapi-dashboards"
166+
# NOTE: This must match the ConfigMap name created in templates/dashboard.config.yaml
167+
# The template creates: {{ .Release.Name }}-dashboards
168+
# If release name is "eoapi-support", this should be "eoapi-support-dashboards"
169+
# Update this value to match your actual release name + "-dashboards"
170+
default: "eoapi-support-dashboards"
165171

166172
metrics-server:
167173
apiService:

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
apiVersion: v1
77
kind: ConfigMap
88
metadata:
9-
name: pgstac-settings-config-{{ $.Release.Name }}
9+
name: {{ $.Release.Name }}-pgstac-settings-config
1010
annotations:
1111
helm.sh/hook: "post-install,post-upgrade"
1212
helm.sh/hook-weight: "-7"
@@ -19,7 +19,7 @@ data:
1919
apiVersion: v1
2020
kind: ConfigMap
2121
metadata:
22-
name: initdb-sql-config-{{ $.Release.Name }}
22+
name: {{ $.Release.Name }}-initdb-sql-config
2323
annotations:
2424
helm.sh/hook: "post-install,post-upgrade"
2525
helm.sh/hook-weight: "-7"
@@ -33,7 +33,7 @@ data:
3333
apiVersion: v1
3434
kind: ConfigMap
3535
metadata:
36-
name: initdb-json-config-{{ $.Release.Name }}
36+
name: {{ $.Release.Name }}-initdb-json-config
3737
annotations:
3838
helm.sh/hook: "post-install,post-upgrade"
3939
helm.sh/hook-weight: "-7"
@@ -49,7 +49,7 @@ data:
4949
apiVersion: v1
5050
kind: ConfigMap
5151
metadata:
52-
name: initdb
52+
name: {{ .Release.Name }}-initdb
5353
data:
5454
initdb.sql: |
5555
\c {{ .Values.pgstacBootstrap.settings.database }}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
apiVersion: batch/v1
77
kind: Job
88
metadata:
9-
name: pgstac-eoapi-superuser-init-db
9+
name: {{ .Release.Name }}-pgstac-superuser-init-db
1010
labels:
11-
app: pgstac-eoapi-superuser-init-db
11+
app: {{ .Release.Name }}-pgstac-superuser-init-db
1212
annotations:
1313
helm.sh/hook: "post-install,post-upgrade"
1414
helm.sh/hook-weight: "-6"
@@ -17,7 +17,7 @@ spec:
1717
template:
1818
metadata:
1919
labels:
20-
app: pgstac-eoapi-superuser-init-db
20+
app: {{ .Release.Name }}-pgstac-superuser-init-db
2121
spec:
2222
restartPolicy: Never
2323
containers:
@@ -42,7 +42,7 @@ spec:
4242
{{- toYaml .Values.pgstacBootstrap.settings.resources | nindent 12 }}
4343
volumeMounts:
4444
- mountPath: /opt/sql
45-
name: initdb-config
45+
name: {{ .Release.Name }}-initdb-config
4646
env:
4747
- name: PGUSER
4848
valueFrom:
@@ -70,9 +70,9 @@ spec:
7070
name: {{ $.Values.postgrescluster.name | default $.Release.Name }}-pguser-postgres
7171
key: dbname
7272
volumes:
73-
- name: initdb-config
73+
- name: {{ .Release.Name }}-initdb-config
7474
configMap:
75-
name: initdb
75+
name: {{ .Release.Name }}-initdb
7676
{{- with .Values.pgstacBootstrap.settings.affinity }}
7777
affinity:
7878
{{- toYaml . | nindent 8 }}

‎charts/eoapi/templates/pgstacbootstrap/job.yaml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ kind: Job
2525
metadata:
2626
name: {{ .Release.Name }}-pgstac-migrate
2727
labels:
28-
app: pgstac-migrate
28+
app: {{ .Release.Name }}-pgstac-migrate
2929
annotations:
3030
helm.sh/hook: "post-install,post-upgrade"
3131
helm.sh/hook-weight: "-5"
@@ -34,7 +34,7 @@ spec:
3434
template:
3535
metadata:
3636
labels:
37-
app: pgstac-migrate
37+
app: {{ .Release.Name }}-pgstac-migrate
3838
spec:
3939
restartPolicy: Never
4040
containers:
@@ -68,13 +68,13 @@ spec:
6868
{{- toYaml .Values.pgstacBootstrap.settings.resources | nindent 12 }}
6969
volumeMounts:
7070
- mountPath: /opt/settings
71-
name: pgstac-settings-volume-{{ .Release.Name }}
71+
name: {{ .Release.Name }}-pgstac-settings-volume
7272
env:
7373
{{- include "eoapi.postgresqlEnv" . | nindent 12 }}
7474
volumes:
75-
- name: pgstac-settings-volume-{{ .Release.Name }}
75+
- name: {{ .Release.Name }}-pgstac-settings-volume
7676
configMap:
77-
name: pgstac-settings-config-{{ .Release.Name }}
77+
name: {{ .Release.Name }}-pgstac-settings-config
7878
{{- with .Values.pgstacBootstrap.settings.affinity }}
7979
affinity:
8080
{{- toYaml . | nindent 8 }}
@@ -93,7 +93,7 @@ kind: Job
9393
metadata:
9494
name: {{ .Release.Name }}-pgstac-load-samples
9595
labels:
96-
app: pgstac-load-samples
96+
app: {{ .Release.Name }}-pgstac-load-samples
9797
annotations:
9898
helm.sh/hook: "post-install,post-upgrade"
9999
helm.sh/hook-weight: "-4"
@@ -102,7 +102,7 @@ spec:
102102
template:
103103
metadata:
104104
labels:
105-
app: pgstac-load-samples
105+
app: {{ .Release.Name }}-pgstac-load-samples
106106
spec:
107107
restartPolicy: Never
108108
containers:
@@ -134,18 +134,18 @@ spec:
134134
{{- toYaml .Values.pgstacBootstrap.settings.resources | nindent 12 }}
135135
volumeMounts:
136136
- mountPath: /opt/sql
137-
name: initdb-sql-volume-{{ .Release.Name }}
137+
name: {{ .Release.Name }}-initdb-sql-volume
138138
- mountPath: /opt/data
139-
name: initdb-json-volume-{{ .Release.Name }}
139+
name: {{ .Release.Name }}-initdb-json-volume
140140
env:
141141
{{- include "eoapi.postgresqlEnv" . | nindent 12 }}
142142
volumes:
143-
- name: initdb-sql-volume-{{ .Release.Name }}
143+
- name: {{ .Release.Name }}-initdb-sql-volume
144144
configMap:
145-
name: initdb-sql-config-{{ .Release.Name }}
146-
- name: initdb-json-volume-{{ .Release.Name }}
145+
name: {{ .Release.Name }}-initdb-sql-config
146+
- name: {{ .Release.Name }}-initdb-json-volume
147147
configMap:
148-
name: initdb-json-config-{{ .Release.Name }}
148+
name: {{ .Release.Name }}-initdb-json-config
149149
{{- with .Values.pgstacBootstrap.settings.affinity }}
150150
affinity:
151151
{{- toYaml . | nindent 8 }}

‎charts/eoapi/templates/service-account.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ kind: ServiceAccount
44
metadata:
55
name: {{ include "eoapi.serviceAccountName" . }}
66
labels:
7-
app: eoapi-{{ .Release.Name }}
7+
app: eoapi-eoapi-{{ .Release.Name }}
88
{{- range $key, $value := .Values.serviceAccount.labels }}
99
{{ $key }}: {{ $value | quote }}
1010
{{- end }}

‎charts/eoapi/templates/services/_common.tpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,9 @@ initContainers:
109109
done
110110
}
111111

112-
wait_for_job_by_label "app=pgstac-migrate" "pgstac-migrate"
112+
wait_for_job_by_label "app={{ .Release.Name }}-pgstac-migrate" "pgstac-migrate"
113113
{{- if .Values.pgstacBootstrap.settings.loadSamples }}
114-
wait_for_job_by_label "app=pgstac-load-samples" "pgstac-load-samples"
114+
wait_for_job_by_label "app={{ .Release.Name }}-pgstac-load-samples" "pgstac-load-samples"
115115
{{- end }}
116116
{{- end }}
117117
{{- end -}}

‎charts/eoapi/templates/services/browser/deployment.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22
apiVersion: apps/v1
33
kind: Deployment
44
metadata:
5-
name: browser-{{ .Release.Name }}
5+
name: {{ .Release.Name }}-browser
66
labels:
7-
app: browser-{{ .Release.Name }}
7+
app: {{ .Release.Name }}-browser
88
gitsha: {{ .Values.gitSha }}
99
spec:
1010
replicas: {{.Values.browser.replicaCount}}
1111
selector:
1212
matchLabels:
13-
app: browser-{{ .Release.Name }}
13+
app: {{ .Release.Name }}-browser
1414
template:
1515
metadata:
1616
labels:
17-
app: browser-{{ .Release.Name }}
17+
app: {{ .Release.Name }}-browser
1818
spec:
1919
containers:
2020
- name: browser

‎charts/eoapi/templates/services/browser/service.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
apiVersion: v1
33
kind: Service
44
metadata:
5-
name: browser-{{ .Release.Name }}
5+
name: {{ .Release.Name }}-browser
66
labels:
7-
app: browser-{{ .Release.Name }}
7+
app: {{ .Release.Name }}-browser
88
{{- if .Values.browser.annotations }}
99
annotations:
1010
{{- with .Values.browser.annotations }}
@@ -13,7 +13,7 @@ metadata:
1313
{{- end }}
1414
spec:
1515
selector:
16-
app: browser-{{ .Release.Name }}
16+
app: {{ .Release.Name }}-browser
1717
ports:
1818
- protocol: TCP
1919
port: 8080

0 commit comments

Comments
 (0)