Move config to env vars for easier config.

config.sample.conf

 TF_DOMAIN_NAME=testtrain.trust-scheme.de
 TF_DOMAIN_IP=52.19.94.74
-PRIMARY_SERVER_NDS=ns1.testtrain.trust-scheme.de
+PRIMARY_SERVER_NSD=ns1.testtrain.trust-scheme.de
 PRIMARY_SERVER_IP=52.19.94.74
-SECONDARY_SERVER_1_NDS=ns2.testtrain.trust-scheme.de
+SECONDARY_SERVER_1_NSD=ns2.testtrain.trust-scheme.de
 SECONDARY_SERVER_1_IP=52.17.60.21
-SECONDARY_SERVER_2_NDS=ns3.testtrain.trust-scheme.de
+SECONDARY_SERVER_2_NSD=ns3.testtrain.trust-scheme.de
 SECONDARY_SERVER_2_IP=1.2.3.4

config.sample2.conf

 TF_DOMAIN_NAME=dev-idm.iao.fraunhofer.de
 TF_DOMAIN_IP=137.251.108.191
-PRIMARY_SERVER_NDS=ns1.dev-idm.iao.fraunhofer.de
+PRIMARY_SERVER_NSD=ns1.dev-idm.iao.fraunhofer.de
 PRIMARY_SERVER_IP=137.251.108.191
-SECONDARY_SERVER_1_NDS=ns2.testtrain.trust-scheme.de
+SECONDARY_SERVER_1_NSD=ns2.testtrain.trust-scheme.de
 SECONDARY_SERVER_1_IP=52.17.60.21
-SECONDARY_SERVER_2_NDS=ns3.testtrain.trust-scheme.de
+SECONDARY_SERVER_2_NSD=ns3.testtrain.trust-scheme.de
 SECONDARY_SERVER_2_IP=1.2.3.4

deploy/helm/nsd/templates/configmap-zones.yaml

@@ -3,5 +3,11 @@ kind: ConfigMap
 metadata:
   name: nsd-config-zones
 data: 
-  config.conf: |-
-{{ .Values.application.properties.zoneConfigFileContent | nindent 4 }}
+  TF_DOMAIN_NAME: {{ .Values.application.properties.zoneConfig.TF_DOMAIN_NAME }}
+  TF_DOMAIN_IP: {{ .Values.application.properties.zoneConfig.TF_DOMAIN_IP }}
+  PRIMARY_SERVER_NSD: {{ .Values.application.properties.zoneConfig.PRIMARY_SERVER_NSD }}
+  PRIMARY_SERVER_IP: {{ .Values.application.properties.zoneConfig.PRIMARY_SERVER_IP }}
+  SECONDARY_SERVER_1_NSD: {{ .Values.application.properties.zoneConfig.SECONDARY_SERVER_1_NSD }}
+  SECONDARY_SERVER_1_IP: {{ .Values.application.properties.zoneConfig.SECONDARY_SERVER_1_IP }}
+  SECONDARY_SERVER_2_NSD: {{ .Values.application.properties.zoneConfig.SECONDARY_SERVER_2_NSD }}
+  SECONDARY_SERVER_2_IP: {{ .Values.application.properties.zoneConfig.SECONDARY_SERVER_2_IP }}
\ No newline at end of file

deploy/helm/nsd/templates/deployment.yaml

@@ -28,6 +28,9 @@ spec:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       containers:
         - name: {{ .Chart.Name }}
+          envFrom:
+            - configMapRef:
+                name: nsd-config-zones
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
@@ -61,9 +64,6 @@ spec:
           volumeMounts:
             - name: zoneconfig
               mountPath: /var/lib/zonemgr/
-            - name: config-file-zones
-              mountPath: /usr/lib/zonemgr/config.conf
-              subPath: config.conf
             - name: config-file-auth
               mountPath: /usr/lib/zonemgr/auth.conf
               subPath: auth.conf
@@ -86,9 +86,6 @@ spec:
         - name: zoneconfig
           persistentVolumeClaim:
             claimName: nsd-zonedata-pvc
-        - name: config-file-zones
-          configMap:
-            name: nsd-config-zones
         - name: config-file-auth
           configMap:
             name: nsd-config-auth
\ No newline at end of file

deploy/helm/nsd/values.yaml

@@ -116,15 +116,15 @@ restartPolicy: Always
 
 application:
   properties:
-    zoneConfigFileContent: |
-      TF_DOMAIN_NAME=your_federation_zone
-      TF_DOMAIN_IP=1.2.3.4
-      PRIMARY_SERVER_NDS=nameserver1_for_your_federation_zone
-      PRIMARY_SERVER_IP=1.2.3.4
-      SECONDARY_SERVER_1_NDS=nameserver2_for_your_federation_zone
-      SECONDARY_SERVER_1_IP=1.2.3.4
-      SECONDARY_SERVER_2_NDS=nameserver3_for_your_federation_zone
-      SECONDARY_SERVER_2_IP=1.2.3.4
+    zoneConfig: 
+      TF_DOMAIN_NAME: your_federation_zone
+      TF_DOMAIN_IP: 1.2.3.4
+      PRIMARY_SERVER_NSD: nameserver1_for_your_federation_zone
+      PRIMARY_SERVER_IP: 1.2.3.4
+      SECONDARY_SERVER_1_NSD: nameserver2_for_your_federation_zone
+      SECONDARY_SERVER_1_IP: 1.2.3.4
+      SECONDARY_SERVER_2_NSD: nameserver3_for_your_federation_zone
+      SECONDARY_SERVER_2_IP: 1.2.3.4
     authConfigFileContent:
       ISSUER_URL: "<your issuer>"
       CLIENT_ID: "<your allowed client/audience>"

script.sh

@@ -49,8 +49,7 @@ if [ -f "$CONFIG_FILE" ]; then
     source "${CONFIG_FILE}"
     echo "[INFO] Config file found. Trust framework domain name to set: $TF_DOMAIN_NAME"
 else
-    echo "[ERROR]: Configuration file \"$CONFIG_FILE\" does not exist."
-    exit 1
+    echo "Using Env Variables"
 fi
 
 ZM_PATH="/usr/lib/zonemgr/"		# path for source code.
@@ -76,7 +75,7 @@ ${RUNNER} \
   --database $SQLITE_DB \
   add-environment \
 	--environment network \
-	--nsd-name "${PRIMARY_SERVER_NDS}" \
+	--nsd-name "${PRIMARY_SERVER_NSD}" \
 	--nsd-conf "$VAR_PATH"nsd.zones.conf \
 	--nsd-reload "$ZM_PATH"reload-nsd.sh \
 	--key-file "$VAR_PATH"private_key.tmp
@@ -98,8 +97,8 @@ ${RUNNER} \
     --environment network \
     --apex "${TF_DOMAIN_NAME}" \
     "$TF_DOMAIN_NAME" NS \
-      "$PRIMARY_SERVER_NDS" \
-      "$SECONDARY_SERVER_1_NDS"
+      "$PRIMARY_SERVER_NSD" \
+      "$SECONDARY_SERVER_1_NSD"
 
 ${RUNNER} \
   --database $SQLITE_DB \
@@ -113,21 +112,21 @@ ${RUNNER} \
   add-record \
     --environment network \
     --apex "$TF_DOMAIN_NAME" \
-      "$PRIMARY_SERVER_NDS" A "$PRIMARY_SERVER_IP"
+      "$PRIMARY_SERVER_NSD" A "$PRIMARY_SERVER_IP"
 
 ${RUNNER} \
   --database $SQLITE_DB \
   add-record \
     --environment network \
     --apex "$TF_DOMAIN_NAME" \
-      "$SECONDARY_SERVER_1_NDS" A "$SECONDARY_SERVER_1_IP"
+      "$SECONDARY_SERVER_1_NSD" A "$SECONDARY_SERVER_1_IP"
 
 ${RUNNER} \
   --database $SQLITE_DB \
   add-record \
     --environment network \
     --apex "$TF_DOMAIN_NAME" \
-      "$SECONDARY_SERVER_2_NDS" A "$SECONDARY_SERVER_2_IP"
+      "$SECONDARY_SERVER_2_NSD" A "$SECONDARY_SERVER_2_IP"
 
 echo
 echo "[INFO] Adding cron job for resigning..."