chore(charts): fix missing port and update messagequeue

nrwl · Mar 1, 2024 · edf9699 · edf9699
1 parent a5c0d07
commit edf9699
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 12 deletions.
diff --git a/charts/nx-agents/Chart.yaml b/charts/nx-agents/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: nx-agents
 description: Nx Cloud Agents Helm Chart
 type: application
-version: 1.0.1
+version: 1.0.2-rc.1
 maintainers:
   - name: nx
     url: "https://nx.app/"

diff --git a/charts/nx-agents/ci/basic-moreenv.yaml b/charts/nx-agents/ci/basic-moreenv.yaml
@@ -67,7 +67,7 @@ secret:
   awsS3AccessKeyId: 'AWS_KEY'
   awsS3SecretAccessKey: 'AWS_SECRET'
 
-additionalManifests:
+extraManifests:
   secret:
     apiVersion: v1
     kind: Secret

diff --git a/charts/nx-agents/ci/basic-values.yaml b/charts/nx-agents/ci/basic-values.yaml
@@ -58,7 +58,7 @@ secret:
   awsS3AccessKeyId: 'AWS_KEY'
   awsS3SecretAccessKey: 'AWS_SECRET'
 
-additionalManifests:
+extraManifests:
   secret:
     apiVersion: v1
     kind: Secret

diff --git a/charts/nx-cloud/ci/basic-values.yaml b/charts/nx-cloud/ci/basic-values.yaml
@@ -61,6 +61,12 @@ aggregator:
       memory: '0.5Mi'
       cpu: '0.1'
 
+messagequeue:
+  deployment:
+    port: 61616
+  service:
+    port: 61616
+
 extraManifests:
   secret:
     apiVersion: v1

diff --git a/charts/nx-cloud/templates/nx-cloud-file-server-deployment.yaml b/charts/nx-cloud/templates/nx-cloud-file-server-deployment.yaml
@@ -47,7 +47,7 @@ spec:
             {{- toYaml .Values.fileServer.deployment.env | nindent 12 }}
             {{- end }}
           ports:
-            - containerPort: 5000
+            - containerPort: {{ .Values.fileServer.deployment.port }}
           livenessProbe:
             httpGet:
               path: /file/uptime-check

diff --git a/charts/nx-cloud/templates/nx-cloud-message-queue-deployment.yaml b/charts/nx-cloud/templates/nx-cloud-message-queue-deployment.yaml
@@ -27,8 +27,11 @@ spec:
           env:
             - name: ACTIVEMQ_TMP
               value: /opt/activemq/tmp
+            {{- if .Values.messagequeue.deployment.env }}
+            {{- toYaml .Values.messagequeue.deployment.env | nindent 12 }}
+            {{- end }}
           ports:
-            - containerPort: 61616
+            - containerPort: {{ .Values.messagequeue.deployment.port }}
               name: tcp
           volumeMounts:
             - mountPath: /opt/activemq/data

diff --git a/charts/nx-cloud/templates/nx-cloud-message-queue-service.yaml b/charts/nx-cloud/templates/nx-cloud-message-queue-service.yaml
@@ -3,16 +3,16 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: nx-cloud-messagequeue
+  name: {{ .Values.messagequeue.service.name }}
   labels:
     app: nx-cloud-messagequeue
     {{- include "nxCloud.app.labels" . | indent 4 }}
 spec:
   selector:
     app: nx-cloud-messagequeue
-  type: ClusterIP
+  type: {{ .Values.messagequeue.service.type }}
   ports:
     - name: tcp
-      port: 61616
-      targetPort: 61616
+      port: {{ .Values.messagequeue.service.port }}
+      targetPort: {{ .Values.messagequeue.deployment.port }}
 {{- end }}
diff --git a/charts/nx-cloud/values.yaml b/charts/nx-cloud/values.yaml
@@ -32,7 +32,7 @@ frontend:
     env: []
   service:
     name: nx-cloud-frontend-service
-    type: NodePort
+    type: ClusterIP
     port: 8080
     annotations: {}
   resources:
@@ -55,7 +55,7 @@ nxApi:
     env: []
   service:
     name: nx-cloud-nx-api-service
-    type: NodePort
+    type: ClusterIP
     port: 4203
     annotations: {}
   resources:
@@ -77,7 +77,7 @@ fileServer:
     env: []
   service:
     name: nx-cloud-file-server-service
-    type: NodePort
+    type: ClusterIP
     port: 8080
     annotations: {}
   resources:
@@ -116,6 +116,14 @@ messagequeue:
     tag: latest
     digest: ''
     pullPolicy: Always
+  deployment:
+    port: 61616
+    env: []
+  service:
+    name: nx-cloud-messagequeue
+    type: ClusterIP
+    port: 61616
+    annotations: {}
   resources:
     limits: {}
     requests: {}
@@ -185,6 +193,10 @@ saml:
   auth:
     enabled: false
 
+# If you plan to deploy using your own self-signed certs, add them to a config map and provide the name here
+# We will mount the configmap to the pods and import the certs contained within at `self-signed-cert.crt`
+selfSignedCertConfigMap: ''
+
 secret:
   name: ''
   nxCloudMongoServerEndpoint: ''