fix: allow certs to be loaded on readonly filesystems (#135)

* fix: allow certs to be loaded on readonly * increment version * increment version * fix nxapi security context refs * remove package file
nrwl · Sep 26, 2024 · 699b2ca · 699b2ca
1 parent 172fc5e
commit 699b2ca
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 3 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.15.10
+version: 0.15.11
 maintainers:
   - name: nx
     url: "https://nx.app/"

diff --git a/charts/nx-cloud/templates/nx-cloud-aggregator-cron.yaml b/charts/nx-cloud/templates/nx-cloud-aggregator-cron.yaml
@@ -2,19 +2,38 @@
 spec:
   template:
     spec:
+      {{- if .Values.selfSignedCertConfigMap }}
+      initContainers:
+        - command:
+            - sh
+            - -c
+            - cp -r /usr/lib/jvm/java-17-amazon-corretto/jre/lib/security /cacerts
+          image: {{ include "nxCloud.images.aggregator.image" . }}
+          name: copy-cacerts
+          {{- if .Values.aggregator.securityContext }}
+          securityContext:
+          {{- toYaml .Values.aggregator.securityContext | nindent 12 }}
+          {{- end }}
+          volumeMounts:
+            - mountPath: /cacerts
+              name: cacerts
+      {{- end}}
       containers:
         - name: nx-cloud-aggregator
           image: {{ include "nxCloud.images.aggregator.image" . }}
           imagePullPolicy: {{ .Values.aggregator.image.pullPolicy | quote }}
             {{- if .Values.aggregator.resources }}
           resources: {{- toYaml .Values.aggregator.resources | nindent 16 }}
             {{- end }}
-          {{- if .Values.selfSignedCertConfigMap }}
           {{- if .Values.aggregator.securityContext }}
           securityContext:
           {{- toYaml .Values.aggregator.securityContext | nindent 12 }}
           {{- end }}
+          {{- if .Values.selfSignedCertConfigMap }}
           volumeMounts:
+            - mountPath: /usr/lib/jvm/java-17-amazon-corretto/jre/lib/security
+              name: cacerts
+              subPath: security
             - mountPath: /self-signed-certs
               name: self-signed-certs-volume
           {{- end}}
@@ -49,6 +68,8 @@ spec:
           {{- end }}
       {{- if .Values.selfSignedCertConfigMap }}
       volumes:
+        - emptyDir: { }
+          name: cacerts
         - configMap:
             name: {{ .Values.selfSignedCertConfigMap }}
           name: self-signed-certs-volume

diff --git a/charts/nx-cloud/templates/nx-cloud-nx-api-deployment.yaml b/charts/nx-cloud/templates/nx-cloud-nx-api-deployment.yaml
@@ -27,6 +27,22 @@ spec:
       {{- if .Values.awsS3.serviceAccountName }}
       serviceAccountName: {{ .Values.awsS3.serviceAccountName }}
       {{- end }}
+      {{- if .Values.selfSignedCertConfigMap }}
+      initContainers:
+        - command:
+            - sh
+            - -c
+            - cp -r /usr/lib/jvm/java-17-amazon-corretto/jre/lib/security /cacerts
+          image: {{ include "nxCloud.images.nxApi.image" . }}
+          name: copy-cacerts
+              {{- if .Values.nxApi.securityContext }}
+          securityContext:
+              {{- toYaml .Values.nxApi.securityContext | nindent 12 }}
+              {{- end }}
+          volumeMounts:
+            - mountPath: /cacerts
+              name: cacerts
+      {{- end}}
       containers:
         - name: nx-cloud-nx-api
           image: {{ include "nxCloud.images.nxApi.image" . }}
@@ -36,12 +52,15 @@ spec:
           {{- end }}
           ports:
             - containerPort: {{ .Values.nxApi.deployment.port }}
-          {{- if .Values.selfSignedCertConfigMap }}
           {{- if .Values.nxApi.securityContext }}
           securityContext:
           {{- toYaml .Values.nxApi.securityContext | nindent 12 }}
           {{- end }}
+          {{- if .Values.selfSignedCertConfigMap }}
           volumeMounts:
+            - mountPath: /usr/lib/jvm/java-17-amazon-corretto/jre/lib/security
+              name: cacerts
+              subPath: security
             - mountPath: /self-signed-certs
               name: self-signed-certs-volume
           {{- end}}
@@ -131,6 +150,8 @@ spec:
         {{- end }}
       {{- if .Values.selfSignedCertConfigMap }}
       volumes:
+        - emptyDir: { }
+          name: cacerts
         - configMap:
             name: {{ .Values.selfSignedCertConfigMap }}
           name: self-signed-certs-volume