Skip to content

Commit

Permalink
Fixup: update helm chart common label to apollographql. (#4137)
Browse files Browse the repository at this point in the history
Followup to #4005 , this updates the name where we forgot to, so we can
cut an other alpha and deploy the chart.
  • Loading branch information
o0Ignition0o authored Nov 3, 2023
1 parent 4e353cb commit 79ba162
Show file tree
Hide file tree
Showing 12 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion helm/chart/router/templates/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ metadata:
labels:
{{- include "router.labels" . | nindent 4 }}
{{- if .Values.extraLabels }}
{{- include "common.templatizeExtraLabels" . | trim | nindent 4 }}
{{- include "apollographql.templatizeExtraLabels" . | trim | nindent 4 }}
{{- end }}
data:
configuration.yaml: |
Expand Down
2 changes: 1 addition & 1 deletion helm/chart/router/templates/hpa.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ metadata:
labels:
{{- include "router.labels" . | nindent 4 }}
{{- if .Values.extraLabels }}
{{- include "common.templatizeExtraLabels" . | trim | nindent 4 }}
{{- include "apollographql.templatizeExtraLabels" . | trim | nindent 4 }}
{{- end }}
spec:
scaleTargetRef:
Expand Down
2 changes: 1 addition & 1 deletion helm/chart/router/templates/ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
labels:
{{- include "router.labels" . | nindent 4 }}
{{- if .Values.extraLabels }}
{{- include "common.templatizeExtraLabels" . | trim | nindent 4 }}
{{- include "apollographql.templatizeExtraLabels" . | trim | nindent 4 }}
{{- end }}
{{- with .Values.ingress.annotations }}
annotations:
Expand Down
2 changes: 1 addition & 1 deletion helm/chart/router/templates/pdb.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
labels:
{{- include "router.labels" . | nindent 4 }}
{{- if .Values.extraLabels }}
{{- include "common.templatizeExtraLabels" . | trim | nindent 4 }}
{{- include "apollographql.templatizeExtraLabels" . | trim | nindent 4 }}
{{- end }}
spec:
{{- if .Values.podDisruptionBudget.minAvailable }}
Expand Down
2 changes: 1 addition & 1 deletion helm/chart/router/templates/secret.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
labels:
{{- include "router.labels" . | nindent 4 }}
{{- if .Values.extraLabels }}
{{- include "common.templatizeExtraLabels" . | trim | nindent 4 }}
{{- include "apollographql.templatizeExtraLabels" . | trim | nindent 4 }}
{{- end }}
data:
managedFederationApiKey: {{ default "MISSING" .Values.managedFederation.apiKey | b64enc | quote }}
Expand Down
2 changes: 1 addition & 1 deletion helm/chart/router/templates/service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
labels:
{{- include "router.labels" . | nindent 4 }}
{{- if .Values.extraLabels }}
{{- include "common.templatizeExtraLabels" . | trim | nindent 4 }}
{{- include "apollographql.templatizeExtraLabels" . | trim | nindent 4 }}
{{- end }}
{{- with .Values.service.annotations }}
annotations:
Expand Down
2 changes: 1 addition & 1 deletion helm/chart/router/templates/serviceaccount.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
labels:
{{- include "router.labels" . | nindent 4 }}
{{- if .Values.extraLabels }}
{{- include "common.templatizeExtraLabels" . | trim | nindent 4 }}
{{- include "apollographql.templatizeExtraLabels" . | trim | nindent 4 }}
{{- end }}
{{- with .Values.serviceAccount.annotations }}
annotations:
Expand Down
2 changes: 1 addition & 1 deletion helm/chart/router/templates/serviceentry.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ metadata:
app.fullName: {{ $fullName }}
{{- include "router.labels" . | nindent 4 }}
{{- if .Values.extraLabels }}
{{- include "common.templatizeExtraLabels" . | trim | nindent 4 }}
{{- include "apollographql.templatizeExtraLabels" . | trim | nindent 4 }}
{{- end }}
{{- with .Values.serviceentry.annotations }}
annotations:
Expand Down
2 changes: 1 addition & 1 deletion helm/chart/router/templates/servicemonitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
labels:
{{- include "router.labels" . | nindent 4 }}
{{- if .Values.extraLabels }}
{{- include "common.templatizeExtraLabels" . | trim | nindent 4 }}
{{- include "apollographql.templatizeExtraLabels" . | trim | nindent 4 }}
{{- end }}
spec:
endpoints:
Expand Down
2 changes: 1 addition & 1 deletion helm/chart/router/templates/supergraph-cm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
labels:
{{- include "router.labels" . | nindent 4 }}
{{- if .Values.extraLabels }}
{{- include "common.templatizeExtraLabels" . | trim | nindent 4 }}
{{- include "apollographql.templatizeExtraLabels" . | trim | nindent 4 }}
{{- end }}
data:
supergraph-schema.graphql: |-
Expand Down
2 changes: 1 addition & 1 deletion helm/chart/router/templates/tests/test-connection.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
labels:
{{- include "router.labels" . | nindent 4 }}
{{- if .Values.extraLabels }}
{{- include "common.templatizeExtraLabels" . | trim | nindent 4 }}
{{- include "apollographql.templatizeExtraLabels" . | trim | nindent 4 }}
{{- end }}
annotations:
"helm.sh/hook": test
Expand Down
2 changes: 1 addition & 1 deletion helm/chart/router/templates/virtualservice.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ metadata:
labels:
{{- include "router.labels" . | nindent 4 }}
{{- if .Values.extraLabels }}
{{- include "common.templatizeExtraLabels" . | trim | nindent 4 }}
{{- include "apollographql.templatizeExtraLabels" . | trim | nindent 4 }}
{{- end }}
{{- with .Values.ingress.annotations }}
annotations:
Expand Down

0 comments on commit 79ba162

Please sign in to comment.