Merge pull request #123 from nuvlaedge/issue-2763-multiple

Change to allow deployment of multiple Kubernetes NEs
nuvlaedge · Jan 22, 2024 · 11d0bf0 · 11d0bf0
2 parents ea73ef0 + 2793580
commit 11d0bf0
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 3 deletions.
diff --git a/helm/templates/NOTES.txt b/helm/templates/NOTES.txt
@@ -4,9 +4,13 @@ The NuvlaEdge has just been installed on your Kubernetes node {{ .Values.kuberne
 
 1. After the initial installation, to approve the certificate signing request
    for the certificate used to manage the NuvlaEdge instance please run the
-   following command as system admin of the K8s cluster
+   following command as system admin of the K8s cluster:{{printf "\n\n" }}
 
-   kubectl certificate approve {{ .Values.credManager.csr_name }}{{printf "\n" }}
+   {{- if .Values.SET_MULTIPLE -}}
+     kubectl certificate approve {{ .Values.credManager.csr_name }}{{ printf "-" }}{{ include "nuvlaedge.uuid" . }}{{printf "\n\n" }}
+   {{- else -}}
+     kubectl certificate approve {{ .Values.credManager.csr_name }}{{printf "\n\n" }}
+   {{- end -}}
 
 {{- else -}}
 

diff --git a/helm/templates/_helpers.tpl b/helm/templates/_helpers.tpl
@@ -16,6 +16,13 @@ nuvlaedge
 {{- end }}
 {{- end }}
 
+{{/*
+Define the UUID based on the NUVLAEDGE_UUID
+*/}}
+{{- define "nuvlaedge.uuid" -}}
+{{- .Values.NUVLAEDGE_UUID | replace "nuvlabox/" "" }}
+{{- end }}
+
 {{/*
 Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).

diff --git a/helm/templates/kubernetes-credentials-manager-job.yaml b/helm/templates/kubernetes-credentials-manager-job.yaml
@@ -28,6 +28,12 @@ spec:
               value: "{{ .Values.credManager.wait_approved_sec }}"
             - name: CSR_NAME
               value: {{ .Values.credManager.csr_name }}
+            - name: NUVLAEDGE_UUID
+              value: {{ .Values.NUVLAEDGE_UUID }}
+            - name: MY_NAMESPACE
+              value: {{ include "nuvlaedge.namespace" . }}
+            - name: SET_MULTIPLE
+              value: {{ .Values.SET_MULTIPLE }}
       volumes:
         - name: nuvlaedge-db
           hostPath:

diff --git a/helm/templates/serviceaccount-rbac.yaml b/helm/templates/serviceaccount-rbac.yaml
@@ -1,7 +1,8 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: nuvlaedge-service-account-cluster-role-binding
+  # We've got a 63 character limit!
+  name: nuvlaedge-service-account-cluster-role-binding-{{ include "nuvlaedge.uuid" .}}
   namespace: {{ include "nuvlaedge.namespace" . }}
   labels:
     {{- include "nuvlaedge.labels" . | nindent 4 }}