diff --git a/charts/port-ocean/Chart.yaml b/charts/port-ocean/Chart.yaml index dfdba21..6d4598f 100644 --- a/charts/port-ocean/Chart.yaml +++ b/charts/port-ocean/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: port-ocean description: A Helm chart for Port Ocean integrations type: application -version: 0.1.20 +version: 0.1.21 appVersion: "0.1.0" home: https://getport.io/ sources: diff --git a/charts/port-ocean/templates/certificate_secret.yaml b/charts/port-ocean/templates/certificate_secret.yaml index 4d88909..da327b9 100644 --- a/charts/port-ocean/templates/certificate_secret.yaml +++ b/charts/port-ocean/templates/certificate_secret.yaml @@ -1,4 +1,4 @@ -{{- if .Values.selfSignedCertificate.enabled }} +{{- if and .Values.selfSignedCertificate.enabled (not .Values.selfSignedCertificate.secret.useExistingSecret) }} apiVersion: v1 kind: Secret metadata: @@ -6,4 +6,4 @@ metadata: type: Opaque data: crt: {{ .Values.selfSignedCertificate.certificate | b64enc }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/charts/port-ocean/templates/deployment.yaml b/charts/port-ocean/templates/deployment.yaml index 140d1df..fd2fa3b 100644 --- a/charts/port-ocean/templates/deployment.yaml +++ b/charts/port-ocean/templates/deployment.yaml @@ -64,7 +64,16 @@ spec: readOnly: true {{- end }} volumes: - {{- if .Values.selfSignedCertificate.enabled }} + {{- if and .Values.selfSignedCertificate.enabled .Values.selfSignedCertificate.secret.useExistingSecret }} + - name: certificates + projected: + sources: + - secret: + name: {{ .Values.selfSignedCertificate.secret.name }} + items: + - key: {{ .Values.selfSignedCertificate.secret.key }} + path: cert.crt + {{- else if .Values.selfSignedCertificate.enabled }} - name: certificates projected: sources: @@ -86,4 +95,3 @@ spec: tolerations: {{- toYaml . | nindent 8 }} {{- end }} - diff --git a/charts/port-ocean/values.yaml b/charts/port-ocean/values.yaml index b024fb8..29a92e0 100644 --- a/charts/port-ocean/values.yaml +++ b/charts/port-ocean/values.yaml @@ -15,15 +15,15 @@ extraEnv: podSecurityContext: {} # Example - # runAsGroup: 1001 - # runAsUser: 1001 - # fsGroup: 1001 - # fsGroupChangePolicy: "OnRootMismatch" +# runAsGroup: 1001 +# runAsUser: 1001 +# fsGroup: 1001 +# fsGroupChangePolicy: "OnRootMismatch" containerSecurityContext: {} # Example - # runAsGroup: 1001 - # runAsUser: 1001 - # allowPrivilegeEscalation: false +# runAsGroup: 1001 +# runAsUser: 1001 +# allowPrivilegeEscalation: false rolloutStrategy: "Recreate" @@ -35,7 +35,6 @@ resources: memory: "1024Mi" cpu: "500m" - nodeSelector: {} tolerations: [] @@ -91,4 +90,8 @@ integration: selfSignedCertificate: enabled: false - certificate: "" \ No newline at end of file + certificate: "" + secret: + name: "" + key: crt + useExistingSecret: false