diff --git a/charts/zora-saas/Chart.yaml b/charts/zora-saas/Chart.yaml index 56fc94f..fb03dd0 100644 --- a/charts/zora-saas/Chart.yaml +++ b/charts/zora-saas/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v2 name: zora-saas description: A Helm chart to deploy Zora SaaS on Kubernetes type: application -version: 0.2.7 -appVersion: "v0.2.7" +version: 0.2.8-rc1 +appVersion: "v0.2.8-rc1" diff --git a/charts/zora-saas/templates/NOTES.txt b/charts/zora-saas/templates/NOTES.txt index b80da50..1ae2c22 100644 --- a/charts/zora-saas/templates/NOTES.txt +++ b/charts/zora-saas/templates/NOTES.txt @@ -1,6 +1,6 @@ 1. Get the application URL by running these commands: {{- if .Values.ingress.enabled }} - http{{ if .Values.ingress.tlsSecretName }}s{{ end }}://{{ .Values.ingress.host }}{{ if .Values.ui.enabled }}{{ .Values.ingress.ui.path }}{{ else }}{{ .Values.ingress.server.path }}{{ end }} + http{{ if .Values.ingress.tlsSecretName }}s{{ end }}://{{ .Values.ingress.host }}{{ if .Values.ui.enabled }}{{ .Values.ingress.ui.path }}{{ else }}{{ first .Values.ingress.server.paths }}{{ end }} {{- else if contains "NodePort" .Values.service.type }} export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "zora-saas.fullname" . }}) export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") diff --git a/charts/zora-saas/templates/admin/deployment.yaml b/charts/zora-saas/templates/admin/deployment.yaml index 7790b29..8184cf3 100644 --- a/charts/zora-saas/templates/admin/deployment.yaml +++ b/charts/zora-saas/templates/admin/deployment.yaml @@ -33,12 +33,11 @@ spec: {{- toYaml .Values.admin.securityContext | nindent 12 }} image: "{{ .Values.admin.image.repository }}:{{ .Values.admin.image.tag | default .Chart.AppVersion }}" args: - - --storage={{ .Values.storage }} - --database={{ .Values.mongo.database }} envFrom: - secretRef: name: {{ .Values.mongo.secret }} - optional: {{ if eq .Values.storage "mongo" }}false{{ else }}true{{ end }} + optional: false imagePullPolicy: {{ .Values.admin.image.pullPolicy }} ports: - name: http diff --git a/charts/zora-saas/templates/deployment.yaml b/charts/zora-saas/templates/deployment.yaml index cf696db..fe2a953 100644 --- a/charts/zora-saas/templates/deployment.yaml +++ b/charts/zora-saas/templates/deployment.yaml @@ -35,7 +35,6 @@ spec: args: - --log-level={{ .Values.log.level }} - --log-encoding={{ .Values.log.encoding }} - - --storage={{ .Values.storage }} - --database={{ .Values.mongo.database }} - --read-timeout={{ .Values.readTimeout }} - --write-timeout={{ .Values.writeTimeout }} @@ -45,7 +44,7 @@ spec: envFrom: - secretRef: name: {{ .Values.mongo.secret }} - optional: {{ if eq .Values.storage "mongo" }}false{{ else }}true{{ end }} + optional: false imagePullPolicy: {{ .Values.image.pullPolicy }} ports: - name: http diff --git a/charts/zora-saas/templates/ingress.yaml b/charts/zora-saas/templates/ingress.yaml index 7fe14a1..773c2e5 100644 --- a/charts/zora-saas/templates/ingress.yaml +++ b/charts/zora-saas/templates/ingress.yaml @@ -1,7 +1,5 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "zora-saas.fullname" . -}} -{{- $svcPort := .Values.service.port -}} -{{- $uiPort := .Values.ui.service.port -}} {{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }} {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }} {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}} @@ -37,20 +35,22 @@ spec: - host: {{ .Values.ingress.host | quote }} http: paths: - - path: {{ .Values.ingress.server.path }} - {{- if and .Values.ingress.server.pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} - pathType: {{ .Values.ingress.server.pathType }} + {{ range $path := .Values.ingress.server.paths }} + - path: {{ $path }} + {{- if and $.Values.ingress.server.pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ $.Values.ingress.server.pathType }} {{- end }} backend: {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} service: name: {{ $fullName }} port: - number: {{ $svcPort }} + number: {{ $.Values.service.port }} {{- else }} serviceName: {{ $fullName }} - servicePort: {{ $svcPort }} + servicePort: {{ $.Values.service.port }} {{- end }} + {{- end }} {{- if .Values.ui.enabled }} - path: {{ .Values.ingress.ui.path }} {{- if and .Values.ingress.ui.pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} @@ -61,10 +61,10 @@ spec: service: name: {{ $fullName }}-ui port: - number: {{ $uiPort }} + number: {{ $.Values.ui.service.port }} {{- else }} serviceName: {{ $fullName }}-ui - servicePort: {{ $uiPort }} + servicePort: {{ $.Values.ui.service.port }} {{- end }} {{- end }} {{- end }} diff --git a/charts/zora-saas/values-dev.yaml b/charts/zora-saas/values-dev.yaml index d661c8a..9a4f92b 100644 --- a/charts/zora-saas/values-dev.yaml +++ b/charts/zora-saas/values-dev.yaml @@ -14,7 +14,6 @@ resources: memory: 15Mi imagePullSecrets: - name: zora-saas-registry-cred -storage: "mongo" mongo: database: "zora-saas-dev" log: diff --git a/charts/zora-saas/values-hml.yaml b/charts/zora-saas/values-hml.yaml index 5e1e27a..11ae222 100644 --- a/charts/zora-saas/values-hml.yaml +++ b/charts/zora-saas/values-hml.yaml @@ -14,7 +14,6 @@ resources: memory: 15Mi imagePullSecrets: - name: zora-saas-registry-cred -storage: "mongo" mongo: database: "zora-saas-hml" log: diff --git a/charts/zora-saas/values-prod.yaml b/charts/zora-saas/values-prod.yaml index 22a3ead..99f42d6 100644 --- a/charts/zora-saas/values-prod.yaml +++ b/charts/zora-saas/values-prod.yaml @@ -1,6 +1,6 @@ ui: image: - tag: saas-0.8.20 + tag: saas-0.8.21 resources: limits: #cpu: 100m @@ -31,7 +31,6 @@ resources: memory: 200Mi imagePullSecrets: - name: zora-saas-registry-cred -storage: "mongo" mongo: database: "zora-saas-prod" log: diff --git a/charts/zora-saas/values.yaml b/charts/zora-saas/values.yaml index f49ad6c..1799461 100644 --- a/charts/zora-saas/values.yaml +++ b/charts/zora-saas/values.yaml @@ -67,7 +67,9 @@ ingress: # kubernetes.io/tls-acme: "true" host: zora-saas.domain server: - path: /zora/api/v1alpha1 + paths: + - /zora/api/v1alpha1 + - /zora/api/v1alpha2 pathType: ImplementationSpecific ui: path: / @@ -134,9 +136,6 @@ ui: tolerations: [] affinity: {} -# 'mongo' or 'in_memory' -storage: "in_memory" - mongo: # This secret must contains MONGODB_URI data secret: mongodb-connection