increment version

nrwl · Jan 9, 2024 · 88610e0 · 88610e0
1 parent 5a6933e
commit 88610e0
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 23 deletions.
diff --git a/charts/nx-cloud/templates/nx-cloud-frontend-deployment.yaml b/charts/nx-cloud/templates/nx-cloud-frontend-deployment.yaml
@@ -97,5 +97,5 @@ spec:
         {{- end }}
         {{- if or .Values.nxCloudWorkflows.enabled .Values.nxCloudWorkflows.externalNameService }}
             - name: NX_CLOUD_WORKFLOW_CONTROLLER_ADDRESS
-              value: http://nx-cloud-workflow-controller-service:9000
+              value: http://nx-cloud-workflow-controller-service.{{ .Values.nxCloudWorkflows.namespace }}.svc.cluster.local:9000
         {{- end }}
diff --git a/charts/nx-cloud/templates/nx-cloud-workflow-controller-deployment.yaml b/charts/nx-cloud/templates/nx-cloud-workflow-controller-deployment.yaml
@@ -53,6 +53,13 @@ spec:
               port: 9000
             initialDelaySeconds: 5
             periodSeconds: 10
+          {{- if gt (len .Values.nxCloudWorkflows.controllerEnv) 0 }}
+          env:
+            {{- range $key, $value := .Values.nxCloudWorkflows.controllerEnv }}
+            - name: {{ $key | quote }}
+              value: {{ $value | quote }}
+            {{- end }}
+          {{- end }}
       serviceAccountName: nx-cloud-workflow-controller
       terminationGracePeriodSeconds: 10
 {{- end }}
diff --git a/charts/nx-cloud/templates/nx-cloud-workflow-controller-service-account.yaml b/charts/nx-cloud/templates/nx-cloud-workflow-controller-service-account.yaml
@@ -2,6 +2,12 @@
 ---
 apiVersion: v1
 kind: ServiceAccount
+metadata:
+  name: nx-cloud-workflow-runner
+  namespace: {{ .Values.nxCloudWorkflows.namespace }}
+---
+apiVersion: v1
+kind: ServiceAccount
 metadata:
   labels:
     {{- include "nxCloud.app.labels" . | indent 4 }}
@@ -15,35 +21,60 @@ metadata:
   namespace: {{ .Values.nxCloudWorkflows.namespace }}
 rules:
 - apiGroups:
-  - ''
+    - ''
+  resources:
+    - services
+    - pods
+  verbs:
+    - create
+    - delete
+    - get
+    - list
+    - patch
+    - update
+    - watch
+- apiGroups:
+    - apps
+  resources:
+    - deployments
+  verbs:
+    - create
+    - delete
+    - get
+    - list
+    - patch
+    - update
+    - watch
+- apiGroups:
+    - ''
   resources:
-  - secrets
+    - secrets
   verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
+    - create
+    - delete
+    - get
+    - list
+    - patch
+    - update
+    - watch
 - apiGroups:
-  - batch
+    - batch
   resources:
-  - jobs
+    - jobs
   verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
+    - create
+    - delete
+    - get
+    - list
+    - patch
+    - update
+    - watch
 - apiGroups:
-  - batch
+    - batch
   resources:
-  - jobs/status
+    - jobs/status
   verbs:
-  - get
+    - get
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
@@ -59,5 +90,5 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: nx-cloud-workflow-controller
-    namespace: {{ .Release.Namespace }}
+    namespace: {{ .Values.nxCloudWorkflows.namespace }}
 {{- end }}
diff --git a/charts/nx-cloud/values.yaml b/charts/nx-cloud/values.yaml
@@ -113,6 +113,7 @@ nxCloudWorkflows:
   externalNameService: ''
   buildToolsImageTag: '2401.04.1'
   executorEnv: {}
+  controllerEnv: {}
 
 replicas:
   frontend: 1