Allows overriding release namespace with value (fixes #30) (#36)

stardog-union · Dec 14, 2020 · 283b8fa · 283b8fa
1 parent 6595cfd
commit 283b8fa
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 11 deletions.
diff --git a/charts/stardog/README.md b/charts/stardog/README.md
@@ -24,6 +24,7 @@ Configuration Parameters
 | Parameter                                    | Description |
 | ---                                          | --- |
 | `fullnameOverride`                           | The k8s name for the Stardog deployment |
+| `namespaceOverride`                          | The k8s namespace for the Stardog deployment (single node only) |
 | `cluster.enabled`                            | Enable Stardog Cluster |
 | `replicaCount`                               | The number of replicas in Stardog Cluster |
 | `admin.password`                             | Stardog admin password |
@@ -81,6 +82,10 @@ a separate location.
 Limitations
 -----------
 
+At this time namespaceOverride is currently only supported for single-node deploys
+because the downstream ZooKeeper chart does not support namespaceOverride for ZooKeeper
+3.5 deployments.
+
 The chart does not currently support:
 - cache targets
 - rolling upgrades

diff --git a/charts/stardog/templates/_helpers.tpl b/charts/stardog/templates/_helpers.tpl
@@ -16,7 +16,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 
 {{- define "zkservers" -}}
 {{- $zk := dict "servers" (list) -}}
-{{- $namespace := .Release.Namespace -}}
+{{- $namespace := include "stardog.namespace" . -}}
 {{- $name := .Release.Name -}}
 {{- range int .Values.zookeeper.replicaCount | until -}}
 {{- $noop := printf "%s-zookeeper-%d.%s-zookeeper-headless.%s:2181" $name . $name $namespace | append $zk.servers | set $zk "servers" -}}
@@ -26,4 +26,15 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 
 {{- define "imagePullSecret" -}}
 {{- printf "{\"auths\": {\"%s\": {\"auth\": \"%s\"}}}" .Values.image.registry (printf "%s:%s" .Values.image.username .Values.image.password | b64enc) | b64enc }}
-{{- end -}}
+{{- end -}}
+
+{{/*
+Return Stardog namespace to use
+*/}}
+{{- define "stardog.namespace" -}}
+{{- if .Values.namespaceOverride -}}
+{{- .Values.namespaceOverride -}}
+{{- else -}}
+{{- .Release.Namespace -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/stardog/templates/configmap.yaml b/charts/stardog/templates/configmap.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "stardog.fullname" . }}-log4j
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "stardog.namespace" . }}
   labels:
     helm.sh/chart: {{ include "stardog.chart" . }}
     app.kubernetes.io/name: {{ .Chart.Name }}
@@ -18,7 +18,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "stardog.fullname" . }}-properties
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "stardog.namespace" . }}
   labels:
     helm.sh/chart: {{ include "stardog.chart" . }}
     app.kubernetes.io/name: {{ .Chart.Name }}

diff --git a/charts/stardog/templates/post-install-job.yaml b/charts/stardog/templates/post-install-job.yaml
@@ -2,7 +2,7 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: {{ include "stardog.fullname" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "stardog.namespace" . }}
   labels:
     helm.sh/chart: {{ include "stardog.chart" . }}
     app.kubernetes.io/name: {{ .Chart.Name }}
@@ -41,7 +41,7 @@ spec:
         - name: PORT
           value: "{{ .Values.ports.server }}"
         - name: HOST
-          value: "{{ include "stardog.fullname" . }}.{{ .Release.Namespace }}"
+          value: "{{ include "stardog.fullname" . }}.{{ include "stardog.namespace" . }}"
         - name: DELAY
           value: "{{ .Values.waitForStartSeconds }}"
         command:

diff --git a/charts/stardog/templates/secret-image.yaml b/charts/stardog/templates/secret-image.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ .Release.Name }}-image-pull-secret
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "stardog.namespace" . }}
   labels:
     helm.sh/chart: {{ include "stardog.chart" . }}
     app.kubernetes.io/name: {{ .Chart.Name }}

diff --git a/charts/stardog/templates/secret.yaml b/charts/stardog/templates/secret.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ include "stardog.fullname" . }}-password
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "stardog.namespace" . }}
   labels:
     helm.sh/chart: {{ include "stardog.chart" . }}
     app.kubernetes.io/name: {{ .Chart.Name }}

diff --git a/charts/stardog/templates/service.yaml b/charts/stardog/templates/service.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "stardog.fullname" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "stardog.namespace" . }}
   labels:
     app: {{ include "stardog.fullname" . }}
     helm.sh/chart: {{ include "stardog.chart" . }}

diff --git a/charts/stardog/templates/statefulset.yaml b/charts/stardog/templates/statefulset.yaml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: {{ include "stardog.fullname" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "stardog.namespace" . }}
   labels:
     helm.sh/chart: {{ include "stardog.chart" . }}
     app.kubernetes.io/name: {{ .Chart.Name }}
@@ -67,7 +67,7 @@ spec:
          while :
           do
             echo "Checking for ZK followers"
-            ZK_MNTR=$(echo mntr | nc {{ .Release.Name }}-zookeeper-headless.{{ .Release.Namespace }} 2181)
+            ZK_MNTR=$(echo mntr | nc {{ .Release.Name }}-zookeeper-headless.{{ include "stardog.namespace" . }} 2181)
             ZK_FOLLOWERS=$(echo "${ZK_MNTR}" | grep zk_synced_followers | awk '{print $2}')
             echo "Currently ${ZK_FOLLOWERS} ZK followers"
             if [[ "${ZK_FOLLOWERS}" -gt "1" ]]; then

diff --git a/charts/stardog/values.yaml b/charts/stardog/values.yaml
@@ -1,4 +1,7 @@
 ---
+# The namespace for Stardog resources that override the release namespace
+# namespaceOverride: stardog
+
 # The number of Stardog replicas to deploy in the cluster
 replicaCount: 3