Correct case on the sharedConfigMap helpers

element-hq · Jun 27, 2023 · 285d451 · 285d451
1 parent 317f58b
commit 285d451
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 14 deletions.
diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl
@@ -191,7 +191,7 @@ app.kubernetes.io/component: jitsi-ingress
 {{/*
 Define a helper function to output the data of the shared ConfigMap
 */}}
-{{- define "jitsi.sharedconfigmap.data" -}}
+{{- define "jitsi.sharedConfigMap.data" -}}
 JVB_STUN_SERVERS: {{ $.Values.JVB_STUN_SERVERS }}
 PUBLIC_URL: {{ ((gt (len $.Values.ingress.hosts) 0) | ternary (print "https://" ($.Values.ingress.hosts | first)) $.Values.PUBLIC_URL) | required "One of PUBLIC_URL or ingress.hosts must be provided" }}
 TZ: {{ $.Values.TZ }}
@@ -200,8 +200,8 @@ TZ: {{ $.Values.TZ }}
 {{/*
 Define a helper function to create a hash of the output of the previous function
 */}}
-{{- define "jitsi.sharedconfigmap.hash" -}}
-{{- $cm := include "jitsi.sharedconfigmap.data" . | sha256sum }}
+{{- define "jitsi.sharedConfigMap.hash" -}}
+{{- $cm := include "jitsi.sharedConfigMap.data" . | sha256sum }}
 {{- printf "%s" (trunc 63 $cm) -}}
 {{- end }}
 

diff --git a/templates/jicofo-deployment.yaml b/templates/jicofo-deployment.yaml
@@ -5,7 +5,7 @@ kind: Deployment
 metadata:
   labels: {{ include "jitsi.jicofoShard.labels" (merge (dict "RelativeScope" .) $) | nindent 4 }}
   annotations:
-    configmap-hash: {{ include "jitsi.sharedconfigmap.hash" $ }}
+    configmap-hash: {{ include "jitsi.sharedConfigMap.hash" $ }}
   {{- with $.Values.jicofo.extraAnnotations }}
     {{- toYaml . | nindent 4 }}
   {{- end }}
@@ -24,7 +24,7 @@ spec:
     metadata:
       labels: {{ include "jitsi.jicofoShard.labels" (merge (dict "RelativeScope" .) $) | nindent 8 }}
       annotations:
-        configmap-hash: {{ include "jitsi.sharedconfigmap.hash" $ }}
+        configmap-hash: {{ include "jitsi.sharedConfigMap.hash" $ }}
       {{- with $.Values.jicofo.extraAnnotations }}
         {{- toYaml . | nindent 8 }}
       {{- end }}

diff --git a/templates/jvb-statefulset.yaml b/templates/jvb-statefulset.yaml
@@ -6,7 +6,7 @@ kind: StatefulSet
 metadata:
   labels: {{ include "jitsi.jvbShard.labels" (merge (dict "RelativeScope" (dict "shard" $shard)) $) | nindent 4 }}
   annotations:
-    configmap-hash: {{ include "jitsi.sharedconfigmap.hash" $ }}
+    configmap-hash: {{ include "jitsi.sharedConfigMap.hash" $ }}
   {{- with $.Values.jvb.extraAnnotations }}
     {{- toYaml . | nindent 4 }}
   {{- end }}
@@ -22,7 +22,7 @@ spec:
     metadata:
       labels: {{ include "jitsi.jvbShard.labels" (merge (dict "RelativeScope" (dict "shard" $shard)) $) | nindent 8 }}
       annotations:
-        configmap-hash: {{ include "jitsi.sharedconfigmap.hash" $ }}
+        configmap-hash: {{ include "jitsi.sharedConfigMap.hash" $ }}
         kubectl.kubernetes.io/default-container: jvb
       {{ if $.Values.jvb.monitoringEnable }}
         prometheus.io/scrape: "true"

diff --git a/templates/prosody-deployment.yaml b/templates/prosody-deployment.yaml
@@ -5,7 +5,7 @@ kind: Deployment
 metadata:
   labels: {{ include "jitsi.prosodyShard.labels" (merge (dict "RelativeScope" .) $) | nindent 4 }}
   annotations:
-    configmap-hash: {{ include "jitsi.sharedconfigmap.hash" $ }}
+    configmap-hash: {{ include "jitsi.sharedConfigMap.hash" $ }}
   {{- with $.Values.prosody.extraAnnotations }}
     {{- toYaml . | nindent 4 }}
   {{- end }}
@@ -24,7 +24,7 @@ spec:
     metadata:
       labels: {{ include "jitsi.prosodyShard.labels" (merge (dict "RelativeScope" .) $) | nindent 8 }}
       annotations:
-        configmap-hash: {{ include "jitsi.sharedconfigmap.hash" $ }}
+        configmap-hash: {{ include "jitsi.sharedConfigMap.hash" $ }}
       {{ if $.Values.prosody.monitoringEnable  }}
         prometheus.io/scrape: "true"
         prometheus.io/port: "5280"

diff --git a/templates/shared-config.yaml b/templates/shared-config.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 data:
-  {{ include "jitsi.sharedconfigmap.data" $ | nindent 2 }}
+  {{ include "jitsi.sharedConfigMap.data" $ | nindent 2 }}
 kind: ConfigMap
 metadata:
   labels: {{ include "jitsi.config.labels" $ | nindent 4 }}

diff --git a/templates/sysctl-jvb-daemonset.yaml b/templates/sysctl-jvb-daemonset.yaml
@@ -7,7 +7,7 @@ kind: DaemonSet
 metadata:
   labels: {{ include "jitsi.sysctlJvb.labels" $ | nindent 4 }}
   annotations:
-    configmap-hash: {{ include "jitsi.sharedconfigmap.hash" $ }}
+    configmap-hash: {{ include "jitsi.sharedConfigMap.hash" $ }}
   {{- with $.Values.sysctljvb.extraAnnotations }}
     {{- toYaml . | nindent 4 }}
   {{- end }}
@@ -22,8 +22,9 @@ spec:
     {{- with $.Values.sysctljvb.extraLabels }}
       {{- toYaml . | nindent 8 }}
     {{- end }}
-    {{- with $.Values.sysctljvb.extraAnnotations }}
       annotations:
+        configmap-hash: {{ include "jitsi.sharedConfigMap.hash" $ }}
+    {{- with $.Values.sysctljvb.extraAnnotations }}
         {{- toYaml . | nindent 8 }}
     {{- end }}
     spec:

diff --git a/templates/web-deployment.yaml b/templates/web-deployment.yaml
@@ -5,7 +5,7 @@ kind: Deployment
 metadata:
   labels: {{ include "jitsi.webShard.labels" (merge (dict "RelativeScope" .) $) | nindent 4 }}
   annotations:
-    configmap-hash: {{ include "jitsi.sharedconfigmap.hash" $ }}
+    configmap-hash: {{ include "jitsi.sharedConfigMap.hash" $ }}
   {{- with $.Values.web.extraAnnotations }}
     {{- toYaml . | nindent 4 }}
   {{- end }}
@@ -24,7 +24,7 @@ spec:
     metadata:
       labels: {{ include "jitsi.webShard.labels" (merge (dict "RelativeScope" .) $) | nindent 8 }}
       annotations:
-        configmap-hash: {{ include "jitsi.sharedconfigmap.hash" $ }}
+        configmap-hash: {{ include "jitsi.sharedConfigMap.hash" $ }}
       {{- with $.Values.web.extraAnnotations }}
         {{- toYaml . | nindent 8 }}
       {{- end }}