diff --git a/charts/nx-cloud/Chart.yaml b/charts/nx-cloud/Chart.yaml index e709c4a..fb5afb0 100644 --- 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 index eb287ea..a208de9 100644 --- a/charts/nx-cloud/templates/nx-cloud-aggregator-cron.yaml +++ b/charts/nx-cloud/templates/nx-cloud-aggregator-cron.yaml @@ -2,6 +2,22 @@ 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" . }} @@ -9,12 +25,15 @@ spec: {{- 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 index 3872ad7..7260888 100644 --- 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