handle differently namespaces controller services (#91)

* handle differently namespaces controller services * support external name service for both the api and frontend * bump version * fix else condition
nrwl · Jan 18, 2024 · 425bed3 · 425bed3
1 parent 8ab1e9b
commit 425bed3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/charts/nx-cloud/Chart.yaml b/charts/nx-cloud/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: nx-cloud
 description: Nx Cloud Helm Chart
 type: application
-version: 0.12.1
+version: 0.12.2
 maintainers:
   - name: nx
     url: "https://nx.app/"

diff --git a/charts/nx-cloud/templates/nx-cloud-frontend-deployment.yaml b/charts/nx-cloud/templates/nx-cloud-frontend-deployment.yaml
@@ -95,7 +95,10 @@ spec:
                     {{- end }}
                   {{- end }}
         {{- end }}
-        {{- if or .Values.nxCloudWorkflows.enabled .Values.nxCloudWorkflows.externalNameService }}
+        {{- if and .Values.nxCloudWorkflows.enabled .Values.nxCloudWorkflows.externalNameService }}
+            - name: NX_CLOUD_WORKFLOW_CONTROLLER_ADDRESS
+              value: http://nx-cloud-workflow-controller-service:9000
+        {{- else if .Values.nxCloudWorkflows.enabled }}
             - name: NX_CLOUD_WORKFLOW_CONTROLLER_ADDRESS
               value: http://nx-cloud-workflow-controller-service.{{ .Values.nxCloudWorkflows.namespace }}.svc.cluster.local:9000
         {{- end }}
diff --git a/charts/nx-cloud/templates/nx-cloud-nx-api-deployment.yaml b/charts/nx-cloud/templates/nx-cloud-nx-api-deployment.yaml
@@ -87,8 +87,11 @@ spec:
             - name: ACTIVEMQ_ADDRESS
               value: tcp://nx-cloud-messagequeue:61616
           {{- end }}
-          {{- if or .Values.nxCloudWorkflows.enabled .Values.nxCloudWorkflows.externalNameService }}
-            - name: NX_CLOUD_CI_SERVER_ADDRESS
+          {{- if and .Values.nxCloudWorkflows.enabled .Values.nxCloudWorkflows.externalNameService }}
+            - name: NX_CLOUD_WORKFLOW_CONTROLLER_ADDRESS
+              value: http://nx-cloud-workflow-controller-service:9000
+          {{- else if .Values.nxCloudWorkflows.enabled }}
+            - name: NX_CLOUD_WORKFLOW_CONTROLLER_ADDRESS
               value: http://nx-cloud-workflow-controller-service.{{ .Values.nxCloudWorkflows.namespace }}.svc.cluster.local:9000
           {{- end }}
           {{- with .Values.awsS3 }}