Skip to content

Use fullName instead of Release.Name for mqtt #48

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.

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
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.3.5
version: 0.4.0

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
Expand Down
28 changes: 22 additions & 6 deletions index.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,43 @@ entries:
netmaker:
- apiVersion: v2
appVersion: 0.21.2
created: "2023-08-08T15:50:24.860625+05:30"
created: "2024-01-03T14:36:23.432741735-06:00"
dependencies:
- condition: postgresql-ha.enabled
name: postgresql-ha
repository: oci://registry-1.docker.io/bitnamicharts
version: 11.8.1
description: A Helm chart to run HA Netmaker on Kubernetes
digest: 066e96154015b3d3bfd1fd456b5171d858ff77d161fa5b3cdb54687cd65cf68c
digest: c073952d67a21834e8f253dd6744c62fac5fd754266dc1fd09d4222bcbfff067
icon: https://raw.githubusercontent.com/gravitl/netmaker/master/netclient/windowsdata/resource/netclient.ico
name: netmaker
type: application
urls:
- https://gravitl.github.io/netmaker-helm/netmaker-0.3.5.tgz
- netmaker-0.4.0.tgz
version: 0.4.0
- apiVersion: v2
appVersion: 0.21.2
created: "2024-01-03T14:36:23.424181142-06:00"
dependencies:
- condition: postgresql-ha.enabled
name: postgresql-ha
repository: oci://registry-1.docker.io/bitnamicharts
version: 11.8.1
description: A Helm chart to run HA Netmaker on Kubernetes
digest: 4e93984611624f6898b98f274694413c8e341d7fde038e56c6d2660b5b3b82dc
icon: https://raw.githubusercontent.com/gravitl/netmaker/master/netclient/windowsdata/resource/netclient.ico
name: netmaker
type: application
urls:
- netmaker-0.3.5.tgz
version: 0.3.5
postgresql-ha:
- annotations:
category: Database
licenses: Apache-2.0
apiVersion: v2
appVersion: 15.3.0
created: "2023-08-08T15:50:24.86669+05:30"
created: "2024-01-03T14:36:23.442122501-06:00"
dependencies:
- name: common
repository: oci://registry-1.docker.io/bitnamicharts
Expand Down Expand Up @@ -53,6 +69,6 @@ entries:
sources:
- https://github.com/bitnami/charts/tree/main/bitnami/postgresql-ha
urls:
- https://gravitl.github.io/netmaker-helm/charts/postgresql-ha-11.8.1.tgz
- charts/postgresql-ha-11.8.1.tgz
version: 11.8.1
generated: "2023-08-08T15:50:24.853521+05:30"
generated: "2024-01-03T14:36:23.412938405-06:00"
Binary file added netmaker-0.4.0.tgz
Binary file not shown.
4 changes: 2 additions & 2 deletions templates/configmap.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{{- $dbHost := .Values.db.host -}}
{{- if eq $dbHost "" -}}
{{- $dbHost = printf "%s-postgresql-ha-pgpool.%s.svc.cluster.local" .Release.Name .Release.Namespace -}}
{{- $dbHost = printf "%s-postgresql-ha-pgpool.%s.svc.cluster.local" (include "netmaker.fullname" .) .Release.Namespace -}}
{{- end -}}
apiVersion: v1
kind: ConfigMap
Expand All @@ -21,7 +21,7 @@ data:
CORS_ALLOWED_ORIGIN: "*"
DISPLAY_KEYS: "on"
DATABASE: "{{ .Values.db.type }}"
SERVER_BROKER_ENDPOINT: "ws://{{ .Release.Name }}-mqtt.{{ .Release.Namespace }}.svc.cluster.local:1883"
SERVER_BROKER_ENDPOINT: "ws://{{ include "netmaker.fullname" . }}-mqtt.{{ .Release.Namespace }}.svc.cluster.local:1883"
VERBOSITY: "1"
K8s: "true"
MQ_PASSWORD: "{{ .Values.mq.password }}"
Expand Down