06652d7e8b
Fixes #6 ### Motivation As suggested here: https://pulsar.apache.org/docs/en/helm-deploy/#prepare-the-helm-release. The ```prepare_helm_release.sh``` script provided with this Helm chart can create a secret credentials resource and > The username and password are used for logging into Grafana dashboard and Pulsar Manager. However, I haven't been able to make use of such a feature for a number of reasons: 1. This secret doesn't seem to affect the ```pulsar-manager-deployment.yaml``` definition. Instead, the ```./templates/pulsar-manager-admin-secret.yaml``` seems to be the one providing the credentials for the pulsar manager (UI) (with the added possibility to overwrite via values.yaml at ```pulsar_manager.admin.user/password```). 2. Using the Pulsar chart as a dependency for an umbrella chart (this is currently my use case), will bring extra hassle that will make it very hard to have all resources follow the same naming structure, thus causing some resources to never be deployed successfully e.g.: ```./templates/grafana-deployment.yaml``` will complain that it couldn't find the secret created by the bash script. Attempting to fix this issue via the ```-k``` flag passed to the script will cause the JWT secret tokens to have a name that's unexpected by the broker, etc. ### Modifications Decouple grafana credentials from pulsar manager via a new secret resource named ```./charts/pulsar/templates/grafana-admin-secret.yaml```. Add credentials overriding via values.yaml in the same way as pulsar_manager (grafana.admin.user/password) & delete secret resource manipulation from bash scripts (cleaup_helm_release.sh & prepare_helm_release.sh) ### Verifying this change - [x] Make sure that the change passes the CI checks.
85 lines
3.2 KiB
YAML
85 lines
3.2 KiB
YAML
#
|
|
# Licensed to the Apache Software Foundation (ASF) under one
|
|
# or more contributor license agreements. See the NOTICE file
|
|
# distributed with this work for additional information
|
|
# regarding copyright ownership. The ASF licenses this file
|
|
# to you under the Apache License, Version 2.0 (the
|
|
# "License"); you may not use this file except in compliance
|
|
# with the License. You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing,
|
|
# software distributed under the License is distributed on an
|
|
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
# KIND, either express or implied. See the License for the
|
|
# specific language governing permissions and limitations
|
|
# under the License.
|
|
#
|
|
|
|
{{- if or .Values.monitoring.grafana .Values.extra.monitoring }}
|
|
apiVersion: apps/v1
|
|
kind: Deployment
|
|
metadata:
|
|
name: "{{ template "pulsar.fullname" . }}-{{ .Values.grafana.component }}"
|
|
namespace: {{ .Values.namespace }}
|
|
labels:
|
|
{{- include "pulsar.standardLabels" . | nindent 4 }}
|
|
component: {{ .Values.grafana.component }}
|
|
spec:
|
|
replicas: {{ .Values.grafana.replicaCount }}
|
|
selector:
|
|
matchLabels:
|
|
{{- include "pulsar.matchLabels" . | nindent 6 }}
|
|
component: {{ .Values.grafana.component }}
|
|
template:
|
|
metadata:
|
|
labels:
|
|
{{- include "pulsar.template.labels" . | nindent 8 }}
|
|
component: {{ .Values.grafana.component }}
|
|
annotations:
|
|
{{- with .Values.grafana.annotations }}
|
|
{{ toYaml . | indent 8 }}
|
|
{{- end }}
|
|
spec:
|
|
{{- if .Values.grafana.nodeSelector }}
|
|
nodeSelector:
|
|
{{ toYaml .Values.grafana.nodeSelector | indent 8 }}
|
|
{{- end }}
|
|
{{- if .Values.grafana.tolerations }}
|
|
tolerations:
|
|
{{ toYaml .Values.grafana.tolerations | indent 8 }}
|
|
{{- end }}
|
|
terminationGracePeriodSeconds: {{ .Values.grafana.gracePeriod }}
|
|
containers:
|
|
- name: "{{ template "pulsar.fullname" . }}-{{ .Values.grafana.component }}"
|
|
image: "{{ .Values.images.grafana.repository }}:{{ .Values.images.grafana.tag }}"
|
|
imagePullPolicy: {{ .Values.images.grafana.pullPolicy }}
|
|
{{- if .Values.grafana.resources }}
|
|
resources:
|
|
{{ toYaml .Values.grafana.resources | indent 10 }}
|
|
{{- end }}
|
|
ports:
|
|
- name: server
|
|
containerPort: {{ .Values.grafana.port }}
|
|
env:
|
|
# for supporting apachepulsar/pulsar-grafana
|
|
- name: PROMETHEUS_URL
|
|
value: http://{{ template "pulsar.fullname" . }}-{{ .Values.prometheus.component }}:9090/
|
|
# for supporting streamnative/apache-pulsar-grafana-dashboard
|
|
- name: PULSAR_PROMETHEUS_URL
|
|
value: http://{{ template "pulsar.fullname" . }}-{{ .Values.prometheus.component }}:9090/
|
|
- name: PULSAR_CLUSTER
|
|
value: {{ template "pulsar.fullname" . }}
|
|
- name: GRAFANA_ADMIN_USER
|
|
valueFrom:
|
|
secretKeyRef:
|
|
name: "{{ template "pulsar.fullname" . }}-{{ .Values.grafana.component }}-secret"
|
|
key: GRAFANA_ADMIN_USER
|
|
- name: GRAFANA_ADMIN_PASSWORD
|
|
valueFrom:
|
|
secretKeyRef:
|
|
name: "{{ template "pulsar.fullname" . }}-{{ .Values.grafana.component }}-secret"
|
|
key: GRAFANA_ADMIN_PASSWORD
|
|
{{- end }}
|