Add support for configuring namespaces

Author: Falcon Taylor-Carter

ci_scripts/deploy_connector.sh

@@ -9,12 +9,12 @@ else
    helm delete $(helm ls --short)
 fi
 echo "Deploying k8s-connect with latest changes"
-helm install ci-sck --set global.splunk.hec.token=$CI_SPLUNK_HEC_TOKEN \
+helm install --create-namespace ci-sck --set global.splunk.hec.token=$CI_SPLUNK_HEC_TOKEN \
 --set global.splunk.hec.host=$CI_SPLUNK_HOST \
 --set kubelet.serviceMonitor.https=true \
 -f ci_scripts/sck_values.yml helm-artifacts/splunk-connect-for-kubernetes*.tgz
 #wait for deployment to finish
 # 2 logging, 2 metrics, 1 aggregator, 1 object 
 until kubectl get pod | grep Running | [[ $(wc -l) == 7 ]]; do
    sleep 5;
-done
+done

helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-logging/templates/_helpers.tpl

@@ -35,7 +35,11 @@ Create chart name and version as used by the chart label.
 Get namespace to deploy to.
 */}}
 {{- define "splunk-kubernetes-logging.namespace" -}}
-    {{- default .Release.Namespace .Values.namespace -}}
+{{- if .Values.namespace -}}
+{{- .Values.namespace -}}
+{{- else -}}
+{{- .Release.Namespace -}}
+{{- end -}}
 {{- end -}}
 
 {{/*

helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-logging/templates/service-headless.yaml

@@ -7,7 +7,7 @@ metadata:
   {{- else }}
   name: {{ template "splunk-kubernetes-logging.fullname" . }}
   {{- end }}
-  nnamespace: {{ template "splunk-kubernetes-logging.namespace" . }}
+  namespace: {{ template "splunk-kubernetes-logging.namespace" . }}
   labels:
     app: {{ template "splunk-kubernetes-logging.name" . }}
     chart: {{ template "splunk-kubernetes-logging.chart" . }}

helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-metrics/templates/_helpers.tpl

@@ -46,7 +46,11 @@ Create chart name and version as used by the chart label.
 Get namespace to deploy to.
 */}}
 {{- define "splunk-kubernetes-metrics.namespace" -}}
-    {{- default .Release.Namespace .Values.namespace -}}
+{{- if .Values.namespace -}}
+{{- .Values.namespace -}}
+{{- else -}}
+{{- .Release.Namespace -}}
+{{- end -}}
 {{- end -}}
 
 {{/*

helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-objects/templates/_helpers.tpl

@@ -35,7 +35,11 @@ Create chart name and version as used by the chart label.
 Get namespace to deploy to.
 */}}
 {{- define "splunk-kubernetes-objects.namespace" -}}
-    {{- default .Release.Namespace .Values.namespace -}}
+{{- if .Values.namespace -}}
+{{- .Values.namespace -}}
+{{- else -}}
+{{- .Release.Namespace -}}
+{{- end -}}
 {{- end -}}
 
 {{/*

helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-objects/templates/configMap.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ template "splunk-kubernetes-objects.fullname" . }}
-  namespace: {{ template "splunk-kubernetes-objects.fullname" . }}
+  namespace: {{ template "splunk-kubernetes-objects.namespace" . }}
   labels:
     app: {{ template "splunk-kubernetes-objects.name" . }}
     chart: {{ template "splunk-kubernetes-objects.chart" . }}

helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-objects/templates/deployment.yaml

@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "splunk-kubernetes-objects.fullname" . }}
-  namespace: {{ template "splunk-kubernetes-objects.fullname" . }}
+  namespace: {{ template "splunk-kubernetes-objects.namespace" . }}
   labels:
     app: {{ template "splunk-kubernetes-objects.name" . }}
     chart: {{ template "splunk-kubernetes-objects.chart" . }}

helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-objects/templates/podSecurityPolicy.yaml

@@ -3,7 +3,7 @@ apiVersion: policy/v1beta1
 kind: PodSecurityPolicy
 metadata:
   name: {{ template "splunk-kubernetes-objects.fullname" . }}
-  namespace: {{ template "splunk-kubernetes-objects.fullname" . }}
+  namespace: {{ template "splunk-kubernetes-objects.namespace" . }}
   labels:
     app: {{ template "splunk-kubernetes-objects.name" . }}
     chart: {{ template "splunk-kubernetes-objects.chart" . }}

helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-objects/templates/secret.yaml

@@ -3,7 +3,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ template "splunk-kubernetes-objects.secret" . }}
-  namespace: {{ template "splunk-kubernetes-objects.fullname" . }}
+  namespace: {{ template "splunk-kubernetes-objects.namespace" . }}
   labels:
     app: {{ template "splunk-kubernetes-objects.name" . }}
     chart: {{ template "splunk-kubernetes-objects.chart" . }}

helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-objects/templates/serviceAccount.yaml

@@ -3,7 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ template "splunk-kubernetes-objects.serviceAccountName" . }}
-  namespace: {{ template "splunk-kubernetes-objects.fullname" . }}
+  namespace: {{ template "splunk-kubernetes-objects.namespace" . }}
   labels:
     app: {{ template "splunk-kubernetes-objects.name" . }}
     chart: {{ template "splunk-kubernetes-objects.chart" . }}