Skip to content

CLOUD-589 Pass additional Statefulset labels and any Annotations from values.yaml #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
andrewkro wants to merge 5 commits into
base: main
Choose a base branch
from
Open

CLOUD-589 Pass additional Statefulset labels and any Annotations from values.yaml #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a6a1724
Pass additional Statefulset labels and any Annotations from values.yaml
Oct 28, 2020
8e87c08
Add options to readme, cleanup values, fix indenting
Oct 28, 2020
22d5535
CLOUD-589 Add annotations and labels for the underlying pod
Nov 2, 2020
80f4c17
CLOUD-589 Move podTemplate values under statefulSet namespace for cla…
Nov 2, 2020
dcf3fa0
CLOUD-589 Move podTemplate values under statefulSet namespace for cla…
Nov 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions helm/pmm-server/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ The following tables lists the configurable parameters of the Percona chart and
| `service.type` | Option specifying the [Kubernetes Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to be used | "" |
| `service.loadBalancerIP` | IP address for the public access | "" |
| `prometheus.configMap.name` | Name of k8s configMap with scrape_configs | "" |
| `statefulSet.labels` | Additional labels for the statefulset | "" |
| `statefulSet.annotations` | Annotations for the statefulset | "" |
| `statefulSet.podTemplate.labels` | Additional labels to be passed to the underlying Pod | "" |
| `statefulSet.podTemplate.annotations` | Annotations for the Pod | "" |


Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`.
Expand Down
14 changes: 14 additions & 0 deletions helm/pmm-server/templates/statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@ metadata:
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}"
{{- if .Values.statefulSet.labels }}
{{ toYaml .Values.statefulSet.labels | indent 4 }}
{{- end }}
{{- with .Values.statefulSet.annotations }}
annotations:
{{ toYaml . | indent 4 }}
{{- end }}
spec:
serviceName: {{ template "percona.fullname" . }}
replicas: 1
Expand All @@ -21,6 +28,13 @@ spec:
labels:
app: {{ template "percona.fullname" . }}
component: pmm
{{- if .Values.statefulSet.podTemplate.labels }}
{{ toYaml .Values.statefulSet.podTemplate.labels | indent 8 }}
{{- end }}
{{- with .Values.statefulSet.podTemplate.annotations }}
Copy link
Copy Markdown
Contributor

@tplavcic tplavcic Mar 17, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @andrewkro ! Sorry, but this got sidetracked somehow!
Could you please rebase on current main branch and the annotations for the pod will need to be changed a bit since we set annotations in case if platform is openshift so we need to merge them and not that one overrides the other values.
Thanks!

annotations:
{{ toYaml . | indent 8 }}
{{- end }}
spec:
securityContext:
supplementalGroups: [1000]
Expand Down
9 changes: 9 additions & 0 deletions helm/pmm-server/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,12 @@ service:
prometheus:
configMap:
name: ""

## Set Statefulset Labels and Annotations
statefulSet:
annotations: {}
labels: {}
## Set Pod Labels and Annotations
podTemplate:
annotations: {}
labels: {}