Extra labels #13
Merged
Extra labels #13
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Resources access data node
EladDolev
requested changes
Jul 20, 2021
| @@ -26,6 +26,9 @@ spec: | |||
| app: {{ template "timescaledb.fullname" . }} | |||
| release: {{ .Release.Name }} | |||
| timescaleNodeType: access | |||
| {{ with .Values.accessNode.extraPodLabels -}} | |||
| {{ toYaml . }} | |||
There was a problem hiding this comment.
indentation
{{- with .Values.accessNode.extraPodLabels }}
{{ toYaml . | nindent 6/8}}
{{- end }}
There was a problem hiding this comment.
tested and renders correctly:
helm template timescaledb -f values.yaml -s templates/statefulset-timescaledb-accessnode.yaml .
apiVersion: apps/v1
kind: StatefulSet
metadata:
name: timescaledb-access
labels:
app: timescaledb
chart: timescaledb-multinode-0.9.0
release: timescaledb
heritage: Helm
spec:
serviceName: timescaledb-access
replicas: 1
podManagementPolicy: Parallel
selector:
matchLabels:
app: timescaledb
release: timescaledb
timescaleNodeType: access
template:
metadata:
name: timescaledb-access
labels:
app: timescaledb
release: timescaledb
timescaleNodeType: access
app.kubernetes.io/part-of: globalcatalog
There was a problem hiding this comment.
(us-east-1.playground):/tmp/timescaledb-kubernetes/charts/timescaledb-multinode$ git diff
diff --git a/charts/timescaledb-multinode/templates/statefulset-timescaledb-accessnode.yaml b/charts/timescaledb-multinode/templates/statefulset-timescaledb-accessnode.yaml
index 55ab134..467c6fa 100644
--- a/charts/timescaledb-multinode/templates/statefulset-timescaledb-accessnode.yaml
+++ b/charts/timescaledb-multinode/templates/statefulset-timescaledb-accessnode.yaml
@@ -26,8 +26,8 @@ spec:
app: {{ template "timescaledb.fullname" . }}
release: {{ .Release.Name }}
timescaleNodeType: access
- {{ with .Values.accessNode.extraPodLabels -}}
- {{ toYaml . }}
+ {{- with .Values.accessNode.extraPodLabels }}
+ {{- toYaml . | nindent 8 }}
{{- end }}
spec:
serviceAccountName: {{ template "timescaledb.serviceAccountName" . }}
diff --git a/charts/timescaledb-multinode/values.yaml b/charts/timescaledb-multinode/values.yaml
index f264fb6..e269647 100644
--- a/charts/timescaledb-multinode/values.yaml
+++ b/charts/timescaledb-multinode/values.yaml
@@ -35,7 +35,9 @@ env:
value: /var/lib/postgresql/pgdata
accessNode:
- extraPodLabels: {}
+ extraPodLabels:
+ test: one
+ another: test
#enable external access using LoadBalancer
service:
type: LoadBalancer
(us-east-1.playground):/tmp/timescaledb-kubernetes/charts/timescaledb-multinode$ helm template . | grep test -A 2 -B 2
release: RELEASE-NAME
timescaleNodeType: access
another: test
test: one
spec:
serviceAccountName: RELEASE-NAME-timescaledb
(us-east-1.playground):/tmp/timescaledb-kubernetes/charts/timescaledb-multinode$ git checkout templates/statefulset-timescaledb-accessnode.yaml
Updated 1 path from the index
(us-east-1.playground):/tmp/timescaledb-kubernetes/charts/timescaledb-multinode$ git diff
diff --git a/charts/timescaledb-multinode/values.yaml b/charts/timescaledb-multinode/values.yaml
index f264fb6..e269647 100644
--- a/charts/timescaledb-multinode/values.yaml
+++ b/charts/timescaledb-multinode/values.yaml
@@ -35,7 +35,9 @@ env:
value: /var/lib/postgresql/pgdata
accessNode:
- extraPodLabels: {}
+ extraPodLabels:
+ test: one
+ another: test
#enable external access using LoadBalancer
service:
type: LoadBalancer
(us-east-1.playground):/tmp/timescaledb-kubernetes/charts/timescaledb-multinode$ helm template . | grep test -A 2 -B 2
Error: YAML parse error on timescaledb-multinode/templates/statefulset-timescaledb-accessnode.yaml: error converting YAML to JSON: yaml: line 31: mapping values are not allowed in this context
Use --debug flag to render out invalid YAML
EladDolev
requested changes
Jul 21, 2021
| @@ -27,7 +27,7 @@ spec: | |||
| release: {{ .Release.Name }} | |||
| timescaleNodeType: access | |||
| {{ with .Values.accessNode.extraPodLabels -}} | |||
There was a problem hiding this comment.
Suggested change
| {{ with .Values.accessNode.extraPodLabels -}} | |
| {{- with .Values.accessNode.extraPodLabels }} |
- should be on the left side, not on the right to reduce confusion
that's probably the reason this odd thing is working
There was a problem hiding this comment.
moved the - but it's the same correct render
Also tried with but still renders correctly
{{- if .Values.dataNode.extraPodLabels }}
{{ toYaml .Values.dataNode.extraPodLabels }}
{{- end }}
EladDolev
reviewed
Jul 21, 2021
charts/timescaledb-multinode/templates/statefulset-timescaledb-accessnode.yaml
Outdated
Show resolved
Hide resolved
EladDolev
requested changes
Jul 21, 2021
| @@ -27,7 +27,7 @@ spec: | |||
| release: {{ .Release.Name }} | |||
| timescaleNodeType: access | |||
| {{ with .Values.accessNode.extraPodLabels -}} | |||
committed by mistake
EladDolev
approved these changes
Jul 21, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
add suupport for extraPodLabels