From 2bb7bc38bb947feb190d0e3aa39e9a84ba0bf04a Mon Sep 17 00:00:00 2001 From: Lalith Kota Date: Fri, 20 Dec 2024 16:40:00 +0530 Subject: [PATCH] Removed sr-landing charts and reorg. Removed docker regsitries, prefer global. Reorged some minor istio values. Signed-off-by: Lalith Kota --- charts/openg2p-social-registry/.gitignore | 2 - charts/openg2p-social-registry/Chart.yaml | 3 - .../openg2p-social-registry/charts/sr-landing | 1 - .../templates/_helpers.tpl | 5 + .../templates/gateway.yaml | 41 ---- .../templates/landing/deployment.yaml | 96 +++++++++ .../templates/landing/gateway.yaml | 43 +++++ .../templates/landing/service.yaml | 27 +++ .../templates/landing/virtualservice.yaml | 40 ++++ .../templates/odoo/gateway.yaml | 43 +++++ .../templates/odoo/virtualservice.yaml | 40 ++++ .../templates/superset/virtualservice.yaml | 4 +- .../templates/virtualservice.yaml | 43 ----- charts/openg2p-social-registry/values.yaml | 182 +++++++++++++++--- charts/sr-landing/Chart.yaml | 5 - charts/sr-landing/templates/_helpers.tpl | 93 --------- charts/sr-landing/templates/deployment.yaml | 78 -------- charts/sr-landing/templates/gateway.yaml | 39 ---- charts/sr-landing/templates/hpa.yaml | 32 --- charts/sr-landing/templates/ingress.yaml | 61 ------ charts/sr-landing/templates/service.yaml | 15 -- .../sr-landing/templates/serviceaccount.yaml | 12 -- .../sr-landing/templates/virtualservice.yaml | 36 ---- charts/sr-landing/values.yaml | 147 -------------- 24 files changed, 453 insertions(+), 635 deletions(-) delete mode 120000 charts/openg2p-social-registry/charts/sr-landing delete mode 100644 charts/openg2p-social-registry/templates/gateway.yaml create mode 100644 charts/openg2p-social-registry/templates/landing/deployment.yaml create mode 100644 charts/openg2p-social-registry/templates/landing/gateway.yaml create mode 100644 charts/openg2p-social-registry/templates/landing/service.yaml create mode 100644 charts/openg2p-social-registry/templates/landing/virtualservice.yaml create mode 100644 charts/openg2p-social-registry/templates/odoo/gateway.yaml create mode 100644 charts/openg2p-social-registry/templates/odoo/virtualservice.yaml delete mode 100644 charts/openg2p-social-registry/templates/virtualservice.yaml delete mode 100644 charts/sr-landing/Chart.yaml delete mode 100644 charts/sr-landing/templates/_helpers.tpl delete mode 100644 charts/sr-landing/templates/deployment.yaml delete mode 100644 charts/sr-landing/templates/gateway.yaml delete mode 100644 charts/sr-landing/templates/hpa.yaml delete mode 100644 charts/sr-landing/templates/ingress.yaml delete mode 100644 charts/sr-landing/templates/service.yaml delete mode 100644 charts/sr-landing/templates/serviceaccount.yaml delete mode 100644 charts/sr-landing/templates/virtualservice.yaml delete mode 100644 charts/sr-landing/values.yaml diff --git a/charts/openg2p-social-registry/.gitignore b/charts/openg2p-social-registry/.gitignore index e28bbe8..a475a46 100644 --- a/charts/openg2p-social-registry/.gitignore +++ b/charts/openg2p-social-registry/.gitignore @@ -1,4 +1,2 @@ charts/* Chart.lock - -!charts/sr-landing diff --git a/charts/openg2p-social-registry/Chart.yaml b/charts/openg2p-social-registry/Chart.yaml index 7413d6b..ab33782 100644 --- a/charts/openg2p-social-registry/Chart.yaml +++ b/charts/openg2p-social-registry/Chart.yaml @@ -4,9 +4,6 @@ description: A Helm chart for OpenG2P Social Registry type: application version: 2.0.0-develop dependencies: -- name: sr-landing - version: 2.0.0-develop - condition: sr-landing.enabled - name: odoo version: 26.2.9 repository: oci://registry-1.docker.io/bitnamicharts diff --git a/charts/openg2p-social-registry/charts/sr-landing b/charts/openg2p-social-registry/charts/sr-landing deleted file mode 120000 index fe0f9fe..0000000 --- a/charts/openg2p-social-registry/charts/sr-landing +++ /dev/null @@ -1 +0,0 @@ -../../sr-landing \ No newline at end of file diff --git a/charts/openg2p-social-registry/templates/_helpers.tpl b/charts/openg2p-social-registry/templates/_helpers.tpl index 63c3c89..53f5a20 100644 --- a/charts/openg2p-social-registry/templates/_helpers.tpl +++ b/charts/openg2p-social-registry/templates/_helpers.tpl @@ -24,3 +24,8 @@ Render Env values section {{- $envVars := merge (deepCopy .Values.kafkaUi.envVars) (deepCopy .Values.kafkaUi.envVarsFrom) -}} {{- include "socialRegistry.baseEnvVars" (dict "envVars" $envVars "context" $) }} {{- end -}} + +{{- define "socialRegistry.landing.envVars" -}} +{{- $envVars := merge (deepCopy .Values.landing.envVars) (deepCopy .Values.landing.envVarsFrom) -}} +{{- include "socialRegistry.baseEnvVars" (dict "envVars" $envVars "context" $) }} +{{- end -}} diff --git a/charts/openg2p-social-registry/templates/gateway.yaml b/charts/openg2p-social-registry/templates/gateway.yaml deleted file mode 100644 index c2e87ec..0000000 --- a/charts/openg2p-social-registry/templates/gateway.yaml +++ /dev/null @@ -1,41 +0,0 @@ -{{- if .Values.istio.enabled }} -{{- if .Values.istio.gateway.enabled }} -{{- $istioGatewayHostname := include "common.tplvalues.render" (dict "value" .Values.istio.gateway.host "context" $) }} -{{- $mainHostname := include "common.tplvalues.render" (dict "value" .Values.hostname "context" $) }} -{{- $hostname := default $mainHostname $istioGatewayHostname }} -apiVersion: networking.istio.io/v1beta1 -kind: Gateway -metadata: - name: {{ template "common.names.fullname" . }} - labels: {{- include "common.labels.standard" (dict "customLabels" .Values.commonLabels "context" $) | nindent 4 }} - {{- if .Values.commonAnnotations }} - annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} - {{- end }} -spec: - selector: - {{ toYaml .Values.istio.gateway.ingressController | nindent 4 }} - servers: - {{- if .Values.istio.gateway.httpEnabled }} - - port: - name: http2 - number: 8080 - protocol: HTTP2 - hosts: - - {{ $hostname | quote }} - {{- if .Values.istio.gateway.httpTlsRedirect }} - tls: - httpsRedirect: true - {{- end }} - {{- end }} - {{- if .Values.istio.gateway.httpsEnabled }} - - port: - name: https - number: 8443 - protocol: HTTPS - hosts: - - {{ $hostname | quote }} - tls: - {{ toYaml (omit .Values.istio.gateway.tls "enabled") | nindent 6 }} - {{- end }} -{{- end }} -{{- end }} diff --git a/charts/openg2p-social-registry/templates/landing/deployment.yaml b/charts/openg2p-social-registry/templates/landing/deployment.yaml new file mode 100644 index 0000000..3b2a718 --- /dev/null +++ b/charts/openg2p-social-registry/templates/landing/deployment.yaml @@ -0,0 +1,96 @@ +{{- if .Values.landing.enabled }} +apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }} +kind: Deployment +metadata: + name: {{ include "common.names.fullname" . }}-landing + labels: {{ include "common.labels.standard" (dict "customLabels" .Values.landing.commonLabels "context" $) | nindent 4 }} + {{- if .Values.landing.commonAnnotations }} + annotations: {{ include "common.tplvalues.render" (dict "value" .Values.landing.commonAnnotations "context" $) | nindent 4 }} + {{- end }} +spec: + replicas: {{ .Values.landing.replicaCount }} + {{- if .Values.landing.updateStrategy }} + strategy: {{- toYaml .Values.landing.updateStrategy | nindent 4 }} + {{- end }} + selector: + matchLabels: {{- include "common.labels.matchLabels" (dict "customLabels" .Values.landing.podLabels "context" $) | nindent 6 }} + template: + metadata: + labels: {{ include "common.labels.standard" (dict "customLabels" .Values.landing.podLabels "context" $) | nindent 8 }} + {{- if .Values.landing.podAnnotations }} + annotations: {{ include "common.tplvalues.render" (dict "value" .Values.landing.podAnnotations "context" $) | nindent 8 }} + {{- end }} + spec: + {{- /* Using Odoo Service Account name for now */}} + serviceAccountName: {{ include "odoo.serviceAccountName" .Subcharts.odoo }} + {{- include "common.images.pullSecrets" (dict "images" (list .Values.landing.image) "global" .Values.global) | nindent 6 }} + {{- if .Values.landing.hostAliases }} + hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.landing.hostAliases "context" $) | nindent 8 }} + {{- end }} + {{- if .Values.landing.affinity }} + affinity: {{- include "common.tplvalues.render" ( dict "value" .Values.landing.affinity "context" $) | nindent 8 }} + {{- else }} + affinity: + podAffinity: {{- include "common.affinities.pods" (dict "type" .Values.landing.podAffinityPreset "context" $) | nindent 10 }} + podAntiAffinity: {{- include "common.affinities.pods" (dict "type" .Values.landing.podAntiAffinityPreset "context" $) | nindent 10 }} + nodeAffinity: {{- include "common.affinities.nodes" (dict "type" .Values.landing.nodeAffinityPreset.type "key" .Values.landing.nodeAffinityPreset.key "values" .Values.landing.nodeAffinityPreset.values) | nindent 10 }} + {{- end }} + {{- if .Values.landing.nodeSelector }} + nodeSelector: {{- include "common.tplvalues.render" ( dict "value" .Values.landing.nodeSelector "context" $) | nindent 8 }} + {{- end }} + {{- if .Values.landing.tolerations }} + tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.landing.tolerations "context" $) | nindent 8 }} + {{- end }} + {{- if .Values.landing.priorityClassName }} + priorityClassName: {{ .Values.landing.priorityClassName | quote }} + {{- end }} + {{- if .Values.landing.podSecurityContext.enabled }} + securityContext: {{- omit .Values.landing.podSecurityContext "enabled" | toYaml | nindent 8 }} + {{- end }} + {{- if .Values.landing.initContainers }} + initContainers: + {{- include "common.tplvalues.render" (dict "value" .Values.landing.initContainers "context" $) | nindent 8 }} + {{- end }} + containers: + - name: landing-page + image: {{ include "common.images.image" (dict "imageRoot" .Values.landing.image "global" .Values.global) }} + imagePullPolicy: {{ .Values.landing.image.pullPolicy }} + {{- if .Values.landing.lifecycleHooks }} + lifecycle: {{- include "common.tplvalues.render" (dict "value" .Values.landing.lifecycleHooks "context" $) | nindent 12 }} + {{- end }} + {{- if .Values.landing.containerSecurityContext.enabled }} + securityContext: {{- omit .Values.landing.containerSecurityContext "enabled" | toYaml | nindent 12 }} + {{- end }} + {{- if .Values.landing.command }} + command: {{- include "common.tplvalues.render" (dict "value" .Values.landing.command "context" $) | nindent 12 }} + {{- end }} + {{- if .Values.landing.args }} + args: {{- include "common.tplvalues.render" (dict "value" .Values.landing.args "context" $) | nindent 12 }} + {{- end }} + env: + {{- include "socialRegistry.landing.envVars" . | nindent 12 }} + ports: + - name: http + containerPort: {{ .Values.landing.containerPort }} + {{- if .Values.landing.resources }} + resources: {{- toYaml .Values.landing.resources | nindent 12 }} + {{- end }} + {{- if .Values.landing.startupProbe.enabled }} + startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.landing.startupProbe "enabled") "context" $) | nindent 12 }} + {{- end }} + {{- if .Values.landing.livenessProbe.enabled }} + livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.landing.livenessProbe "enabled") "context" $) | nindent 12 }} + {{- end }} + {{- if .Values.landing.readinessProbe.enabled }} + readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.landing.readinessProbe "enabled") "context" $) | nindent 12 }} + {{- end }} + {{- if .Values.landing.extraVolumeMounts }} + volumeMounts: {{- include "common.tplvalues.render" (dict "value" .Values.landing.extraVolumeMounts "context" $) | nindent 12 }} + {{- end }} + {{- if .Values.landing.sidecars }} + {{- include "common.tplvalues.render" ( dict "value" .Values.landing.sidecars "context" $) | nindent 8 }} + {{- end }} + {{- if .Values.landing.extraVolumes }} + volumes: {{- include "common.tplvalues.render" (dict "value" .Values.landing.extraVolumes "context" $) | nindent 8 }} + {{- end }} +{{- end }} diff --git a/charts/openg2p-social-registry/templates/landing/gateway.yaml b/charts/openg2p-social-registry/templates/landing/gateway.yaml new file mode 100644 index 0000000..42d405f --- /dev/null +++ b/charts/openg2p-social-registry/templates/landing/gateway.yaml @@ -0,0 +1,43 @@ +{{- if .Values.landing.enabled }} +{{- if .Values.landing.istio.enabled }} +{{- if .Values.landing.istio.gateway.enabled }} +{{- $istioGatewayHostname := include "common.tplvalues.render" (dict "value" .Values.landing.istio.gateway.host "context" $) }} +{{- $mainHostname := include "common.tplvalues.render" (dict "value" .Values.landing.hostname "context" $) }} +{{- $hostname := default $mainHostname $istioGatewayHostname }} +apiVersion: networking.istio.io/v1beta1 +kind: Gateway +metadata: + name: {{ include "common.names.fullname" . }}-landing + labels: {{ include "common.labels.standard" (dict "customLabels" .Values.landing.commonLabels "context" $) | nindent 4 }} + {{- if .Values.landing.commonAnnotations }} + annotations: {{ include "common.tplvalues.render" (dict "value" .Values.landing.commonAnnotations "context" $) | nindent 4 }} + {{- end }} +spec: + selector: + {{ toYaml .Values.landing.istio.gateway.ingressController | nindent 4 }} + servers: + {{- if .Values.landing.istio.gateway.httpEnabled }} + - port: + name: http2 + number: 8080 + protocol: HTTP2 + hosts: + - {{ $hostname | quote }} + {{- if .Values.landing.istio.gateway.httpTlsRedirect }} + tls: + httpsRedirect: true + {{- end }} + {{- end }} + {{- if .Values.landing.istio.gateway.httpsEnabled }} + - port: + name: https + number: 8443 + protocol: HTTPS + hosts: + - {{ $hostname | quote }} + tls: + {{ toYaml (omit .Values.landing.istio.gateway.tls "enabled") | nindent 6 }} + {{- end }} +{{- end }} +{{- end }} +{{- end }} diff --git a/charts/openg2p-social-registry/templates/landing/service.yaml b/charts/openg2p-social-registry/templates/landing/service.yaml new file mode 100644 index 0000000..01739af --- /dev/null +++ b/charts/openg2p-social-registry/templates/landing/service.yaml @@ -0,0 +1,27 @@ +{{- if .Values.landing.enabled }} +apiVersion: v1 +kind: Service +metadata: + name: {{ include "common.names.fullname" . }}-landing + labels: {{ include "common.labels.standard" (dict "customLabels" .Values.landing.commonLabels "context" $) | nindent 4 }} + {{- if .Values.landing.commonAnnotations }} + annotations: {{ include "common.tplvalues.render" (dict "value" .Values.landing.commonAnnotations "context" $) | nindent 4 }} + {{- end }} +spec: + type: {{ .Values.landing.service.type }} + {{- if (or (eq .Values.landing.service.type "LoadBalancer") (eq .Values.landing.service.type "NodePort")) }} + externalTrafficPolicy: {{ .Values.landing.service.externalTrafficPolicy | quote }} + {{- end }} + {{ if eq .Values.landing.service.type "LoadBalancer" }} + loadBalancerSourceRanges: {{ .Values.landing.service.loadBalancerSourceRanges }} + {{ end }} + {{- if (and (eq .Values.landing.service.type "LoadBalancer") (not (empty .Values.landing.service.loadBalancerIP))) }} + loadBalancerIP: {{ .Values.landing.service.loadBalancerIP }} + {{- end }} + ports: + - name: http + port: {{ .Values.landing.service.port }} + protocol: TCP + targetPort: {{ .Values.landing.containerPort }} + selector: {{- include "common.labels.matchLabels" (dict "customLabels" .Values.landing.podLabels "context" $) | nindent 4 }} +{{- end }} diff --git a/charts/openg2p-social-registry/templates/landing/virtualservice.yaml b/charts/openg2p-social-registry/templates/landing/virtualservice.yaml new file mode 100644 index 0000000..f08ac6e --- /dev/null +++ b/charts/openg2p-social-registry/templates/landing/virtualservice.yaml @@ -0,0 +1,40 @@ +{{- if .Values.landing.enabled }} +{{- if .Values.landing.istio.enabled }} +{{- if .Values.landing.istio.virtualservice.enabled }} +{{- $istioVsHostname := include "common.tplvalues.render" (dict "value" .Values.landing.istio.virtualservice.host "context" $) }} +{{- $mainHostname := include "common.tplvalues.render" (dict "value" .Values.landing.hostname "context" $) }} +{{- $hostname := default $mainHostname $istioVsHostname }} +apiVersion: networking.istio.io/v1alpha3 +kind: VirtualService +metadata: + name: {{ include "common.names.fullname" . }}-landing + labels: {{ include "common.labels.standard" (dict "customLabels" .Values.landing.commonLabels "context" $) | nindent 4 }} + {{- if .Values.landing.commonAnnotations }} + annotations: {{ include "common.tplvalues.render" (dict "value" .Values.landing.commonAnnotations "context" $) | nindent 4 }} + {{- end }} +spec: + hosts: + - {{ $hostname | quote }} + gateways: + - {{ default (include "common.names.fullname" .) .Values.landing.istio.virtualservice.gateway }} + http: + - headers: + request: + set: + x-forwarded-host: {{ $hostname | quote }} + x-forwarded-proto: https + match: + - uri: + prefix: {{ .Values.landing.istio.virtualservice.prefix }} + {{- if .Values.landing.istio.virtualservice.rewriteUri }} + rewrite: + uri: {{ .Values.landing.istio.virtualservice.rewriteUri }} + {{- end }} + route: + - destination: + host: {{ include "common.tplvalues.render" (dict "value" .Values.landing.istio.virtualservice.destination "context" $) }} + port: + number: {{ include "common.tplvalues.render" (dict "value" .Values.landing.istio.virtualservice.destinationPort "context" $) }} +{{- end }} +{{- end }} +{{- end }} diff --git a/charts/openg2p-social-registry/templates/odoo/gateway.yaml b/charts/openg2p-social-registry/templates/odoo/gateway.yaml new file mode 100644 index 0000000..8650a75 --- /dev/null +++ b/charts/openg2p-social-registry/templates/odoo/gateway.yaml @@ -0,0 +1,43 @@ +{{- if .Values.odoo.enabled }} +{{- if .Values.odoo.istio.enabled }} +{{- if .Values.odoo.istio.gateway.enabled }} +{{- $istioGatewayHostname := include "common.tplvalues.render" (dict "value" .Values.odoo.istio.gateway.host "context" .Subcharts.odoo) }} +{{- $mainHostname := include "common.tplvalues.render" (dict "value" .Values.odoo.hostname "context" .Subcharts.odoo) }} +{{- $hostname := default $mainHostname $istioGatewayHostname }} +apiVersion: networking.istio.io/v1beta1 +kind: Gateway +metadata: + name: {{ include "common.names.fullname" .Subcharts.odoo }} + labels: {{ include "common.labels.standard" (dict "customLabels" .Values.odoo.commonLabels "context" .Subcharts.odoo) | nindent 4 }} + {{- if .Values.odoo.commonAnnotations }} + annotations: {{ include "common.tplvalues.render" (dict "value" .Values.odoo.commonAnnotations "context" $) | nindent 4 }} + {{- end }} +spec: + selector: + {{ toYaml .Values.odoo.istio.gateway.ingressController | nindent 4 }} + servers: + {{- if .Values.odoo.istio.gateway.httpEnabled }} + - port: + name: http2 + number: 8080 + protocol: HTTP2 + hosts: + - {{ $hostname | quote }} + {{- if .Values.odoo.istio.gateway.httpTlsRedirect }} + tls: + httpsRedirect: true + {{- end }} + {{- end }} + {{- if .Values.odoo.istio.gateway.httpsEnabled }} + - port: + name: https + number: 8443 + protocol: HTTPS + hosts: + - {{ $hostname | quote }} + tls: + {{ toYaml (omit .Values.odoo.istio.gateway.tls "enabled") | nindent 6 }} + {{- end }} +{{- end }} +{{- end }} +{{- end }} diff --git a/charts/openg2p-social-registry/templates/odoo/virtualservice.yaml b/charts/openg2p-social-registry/templates/odoo/virtualservice.yaml new file mode 100644 index 0000000..1d40aff --- /dev/null +++ b/charts/openg2p-social-registry/templates/odoo/virtualservice.yaml @@ -0,0 +1,40 @@ +{{- if .Values.odoo.enabled }} +{{- if .Values.odoo.istio.enabled }} +{{- if .Values.odoo.istio.virtualservice.enabled }} +{{- $istioVsHostname := include "common.tplvalues.render" (dict "value" .Values.odoo.istio.virtualservice.host "context" .Subcharts.odoo) }} +{{- $mainHostname := include "common.tplvalues.render" (dict "value" .Values.odoo.hostname "context" .Subcharts.odoo) }} +{{- $hostname := default $mainHostname $istioVsHostname }} +apiVersion: networking.istio.io/v1alpha3 +kind: VirtualService +metadata: + name: {{ include "common.names.fullname" .Subcharts.odoo }} + labels: {{ include "common.labels.standard" (dict "customLabels" .Values.odoo.commonLabels "context" .Subcharts.odoo) | nindent 4 }} + {{- if .Values.odoo.commonAnnotations }} + annotations: {{ include "common.tplvalues.render" (dict "value" .Values.odoo.commonAnnotations "context" $) | nindent 4 }} + {{- end }} +spec: + hosts: + - {{ $hostname | quote }} + gateways: + - {{ default (include "common.names.fullname" .) .Values.odoo.istio.virtualservice.gateway }} + http: + - headers: + request: + set: + x-forwarded-host: {{ $hostname | quote }} + x-forwarded-proto: https + match: + - uri: + prefix: {{ .Values.odoo.istio.virtualservice.prefix }} + {{- if .Values.odoo.istio.virtualservice.rewriteUri }} + rewrite: + uri: {{ .Values.odoo.istio.virtualservice.rewriteUri }} + {{- end }} + route: + - destination: + host: {{ include "common.tplvalues.render" (dict "value" .Values.odoo.istio.virtualservice.destination "context" .Subcharts.odoo) }} + port: + number: {{ include "common.tplvalues.render" (dict "value" .Values.odoo.istio.virtualservice.destinationPort "context" .Subcharts.odoo) }} +{{- end }} +{{- end }} +{{- end }} diff --git a/charts/openg2p-social-registry/templates/superset/virtualservice.yaml b/charts/openg2p-social-registry/templates/superset/virtualservice.yaml index f621785..a746838 100644 --- a/charts/openg2p-social-registry/templates/superset/virtualservice.yaml +++ b/charts/openg2p-social-registry/templates/superset/virtualservice.yaml @@ -25,9 +25,9 @@ spec: x-forwarded-proto: https route: - destination: - host: {{ include "common.tplvalues.render" (dict "value" .Values.superset.istio.virtualservice.destination "context" $) }} + host: {{ include "common.tplvalues.render" (dict "value" .Values.superset.istio.virtualservice.destination "context" .Subcharts.superset) }} port: - number: {{ include "common.tplvalues.render" (dict "value" .Values.superset.istio.virtualservice.destinationPort "context" $) }} + number: {{ include "common.tplvalues.render" (dict "value" .Values.superset.istio.virtualservice.destinationPort "context" .Subcharts.superset) }} {{- end }} {{- end }} {{- end }} diff --git a/charts/openg2p-social-registry/templates/virtualservice.yaml b/charts/openg2p-social-registry/templates/virtualservice.yaml deleted file mode 100644 index 2a8e2c0..0000000 --- a/charts/openg2p-social-registry/templates/virtualservice.yaml +++ /dev/null @@ -1,43 +0,0 @@ -{{- if .Values.istio.enabled }} -{{- if .Values.istio.virtualservice.enabled }} -{{- $istioVsHostname := include "common.tplvalues.render" (dict "value" .Values.istio.virtualservice.host "context" $) }} -{{- $mainHostname := include "common.tplvalues.render" (dict "value" .Values.hostname "context" $) }} -{{- $hostname := default $mainHostname $istioVsHostname }} -apiVersion: networking.istio.io/v1alpha3 -kind: VirtualService -metadata: - name: {{ template "common.names.fullname" . }} - labels: {{- include "common.labels.standard" (dict "customLabels" .Values.commonLabels "context" $) | nindent 4 }} - {{- if .Values.commonAnnotations }} - annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} - {{- end }} -spec: - hosts: - - {{ $hostname | quote }} - gateways: - - {{ default (include "common.names.fullname" .) .Values.istio.virtualservice.gateway }} - http: - - match: - - uri: - exact: / - redirect: - uri: /web - - headers: - request: - set: - x-forwarded-host: {{ $hostname | quote }} - x-forwarded-proto: https - match: - - uri: - prefix: {{ include "common.tplvalues.render" (dict "value" .Values.istio.virtualservice.prefix "context" $) }} - {{- if .Values.istio.virtualservice.rewriteUri }} - rewrite: - uri: {{ include "common.tplvalues.render" (dict "value" .Values.istio.virtualservice.rewriteUri "context" $) }} - {{- end }} - route: - - destination: - host: {{ include "common.tplvalues.render" (dict "value" .Values.istio.virtualservice.destination "context" $) }} - port: - number: {{ include "common.tplvalues.render" (dict "value" .Values.istio.virtualservice.destinationPort "context" $) }} -{{- end }} -{{- end }} diff --git a/charts/openg2p-social-registry/values.yaml b/charts/openg2p-social-registry/values.yaml index 1d592fd..2e49ef0 100644 --- a/charts/openg2p-social-registry/values.yaml +++ b/charts/openg2p-social-registry/values.yaml @@ -142,6 +142,28 @@ odoo: - name: EXTRA_ADDONS_URLS_TO_PULL value: '{{ tpl .Values.extraAddonsUrlsToPull $ }}' + istio: + enabled: true + virtualservice: + enabled: true + host: "" + gateway: "internal" + destination: '{{ include "common.names.fullname" . }}' + destinationPort: '{{ .Values.service.port }}' + prefix: / + rewriteUri: "" + gateway: + enabled: false + host: "" + ingressController: + istio: ingressgateway + httpTlsRedirect: true + httpEnabled: true + httpsEnabled: false + tls: + mode: SIMPLE + credentialName: "" + mail: enabled: true mailname: openg2p.sandbox.net @@ -463,7 +485,6 @@ kafkaUi: externalTrafficPolicy: Cluster image: - registry: docker.io repository: provectuslabs/kafka-ui tag: v0.7.2 pullPolicy: Always @@ -615,6 +636,9 @@ kafkaUi: enabled: true host: "" gateway: "internal" + # In the following destination properties the context is root not ".Values.kafka" + # nor ".Values.kafkaUi" unlike other subcharts (like minio and opensearch) + # because of difference in structure. destination: '{{ include "common.names.fullname" .Subcharts.kafka }}-ui' destinationPort: '{{ .Values.kafkaUi.service.port }}' prefix: / @@ -672,7 +696,6 @@ loggingFlow: artifactory: enabled: true image: - registry: docker.io repository: mosipid/artifactory-server tag: 1.4.1-ES resources: {} @@ -733,7 +756,6 @@ idgenerator: mosipKernelPostgresInit: enabled: true image: - registry: docker.io repository: mosipid/postgres-init tag: 1.2.0.1-B4 pullPolicy: Always @@ -871,8 +893,8 @@ superset: enabled: true host: "" gateway: "internal" - destination: '{{ .Release.Name }}-superset' - destinationPort: "8088" + destination: '{{ include "superset.fullname" . }}' + destinationPort: '{{ .Values.service.port }}' gateway: enabled: false host: "" @@ -1006,27 +1028,137 @@ openg2p-sr-bg-tasks: SR_CELERY_WORKERS_AUTH_CLIENT_ID: '{{ tpl .Values.global.srOdooOidcClientId $ }}' SR_CELERY_WORKERS_AUTH_CLIENT_SECRET: '{{ tpl .Values.global.srOdooOidcClientSecret $ }}' -sr-landing: +landing: enabled: true + hostname: '{{ tpl .Values.global.srLandingPageHostname $ }}' -istio: - enabled: true - virtualservice: + commonLabels: + app.kubernetes.io/name: '{{ include "common.names.name" . }}-landing' + commonAnnotations: {} + podLabels: + app.kubernetes.io/name: '{{ include "common.names.name" . }}-landing' + podAnnotations: {} + + replicaCount: 1 + + service: + type: ClusterIP + port: 80 + nodePorts: + http: "" + https: "" + externalTrafficPolicy: Cluster + + image: + repository: openg2p/openg2p-social-registry-landing + tag: "develop" + pullPolicy: Always + pullSecrets: [] + + containerPort: 80 + + startupProbe: + enabled: true + httpGet: + path: / + port: http + initialDelaySeconds: 0 + periodSeconds: 10 + timeoutSeconds: 5 + failureThreshold: 30 + successThreshold: 1 + + livenessProbe: + enabled: true + httpGet: + path: / + port: http + initialDelaySeconds: 20 + periodSeconds: 30 + timeoutSeconds: 5 + failureThreshold: 6 + successThreshold: 1 + + readinessProbe: enabled: true - host: "" - gateway: "internal" - destination: '{{ include "common.names.fullname" .Subcharts.odoo }}' - destinationPort: '{{ .Values.odoo.service.port }}' - prefix: / - rewriteUri: "" - gateway: + httpGet: + path: / + port: http + initialDelaySeconds: 0 + periodSeconds: 10 + timeoutSeconds: 5 + failureThreshold: 6 + successThreshold: 1 + + command: [] + args: [] + + hostAliases: [] + + resources: {} + + containerSecurityContext: enabled: false - host: "" - ingressController: - istio: ingressgateway - httpTlsRedirect: true - httpEnabled: true - httpsEnabled: false - tls: - mode: SIMPLE - credentialName: "" + runAsUser: 1001 + runAsNonRoot: true + + podSecurityContext: + enabled: false + fsGroup: 1001 + + podAffinityPreset: "" + podAntiAffinityPreset: soft + nodeAffinityPreset: + type: "" + key: "" + values: [] + affinity: {} + nodeSelector: {} + tolerations: [] + + priorityClassName: "" + lifecycleHooks: {} + + updateStrategy: + type: RollingUpdate + + initContainers: [] + sidecars: [] + + extraVolumes: [] + extraVolumeMounts: [] + + envVars: + SR_ADMIN_URL: 'https://{{ tpl .Values.global.srAdminHostname $ }}' + SR_REPORTING_URL: 'https://{{ tpl .Values.global.srOpensearchHostname $ }}' + SR_LOGGING_URL: 'https://{{ tpl .Values.global.srOpensearchHostname $ }}' + SR_MINIO_URL: 'https://{{ tpl .Values.global.srMinioHostname $ }}' + SR_ODK_URL: 'https://{{ tpl .Values.global.srOdkCentralHostname $ }}' + SR_KAFKA_URL: 'https://{{ tpl .Values.global.srKafkaUiHostname $ }}' + SR_SUPERSET_URL: 'https://{{ tpl .Values.global.srSupersetHostname $ }}' + SR_VERSION: '{{ .Chart.Version }}' + SR_APP_VERSION: '{{ .Values.odoo.image.tag }}' + + envVarsFrom: {} + + istio: + enabled: true + virtualservice: + enabled: true + host: "" + gateway: "internal" + destination: '{{ include "common.names.fullname" . }}-landing' + destinationPort: '{{ .Values.landing.service.port }}' + prefix: / + rewriteUri: "" + gateway: + enabled: false + host: "" + ingressController: + istio: ingressgateway + httpTlsRedirect: true + httpEnabled: true + httpsEnabled: false + tls: + mode: SIMPLE + credentialName: "" diff --git a/charts/sr-landing/Chart.yaml b/charts/sr-landing/Chart.yaml deleted file mode 100644 index 891e958..0000000 --- a/charts/sr-landing/Chart.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: v2 -name: sr-landing -description: A Helm chart for installing landing page for the Social Registry -type: application -version: 2.0.0-develop diff --git a/charts/sr-landing/templates/_helpers.tpl b/charts/sr-landing/templates/_helpers.tpl deleted file mode 100644 index afbaadc..0000000 --- a/charts/sr-landing/templates/_helpers.tpl +++ /dev/null @@ -1,93 +0,0 @@ -{{/* -Expand the name of the chart. -*/}} -{{- define "landing.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "landing.fullname" -}} -{{- if .Values.fullnameOverride }} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- $name := default .Chart.Name .Values.nameOverride }} -{{- if contains $name .Release.Name }} -{{- .Release.Name | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} -{{- end }} -{{- end }} -{{- end }} - -{{/* -Create chart name and version as used by the chart label. -*/}} -{{- define "landing.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Common labels -*/}} -{{- define "landing.labels" -}} -helm.sh/chart: {{ include "landing.chart" . }} -{{ include "landing.selectorLabels" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- end }} - -{{/* -Selector labels -*/}} -{{- define "landing.selectorLabels" -}} -app.kubernetes.io/name: {{ include "landing.name" . }} -app.kubernetes.io/instance: {{ .Release.Name }} -{{- end }} - -{{/* -Create the name of the service account to use -*/}} -{{- define "landing.serviceAccountName" -}} -{{- if .Values.serviceAccount.create }} -{{- default (include "landing.fullname" .) .Values.serviceAccount.name }} -{{- else }} -{{- default "default" .Values.serviceAccount.name }} -{{- end }} -{{- end }} - -{{- define "landing.tpl" -}} -{{- $value := typeIs "string" .value | ternary .value (.value | toYaml) }} -{{- if contains "{{" (toJson .value) }} - {{- tpl $value .context }} -{{- else }} - {{- $value }} -{{- end }} -{{- end -}} - -{{/* -Render Env values section -*/}} -{{- define "landing.baseEnvVars" -}} -{{- $context := .context -}} -{{- range $k, $v := .envVars }} -- name: {{ $k }} -{{- if or (kindIs "int64" $v) (kindIs "float64" $v) (kindIs "bool" $v) }} - value: {{ $v | quote }} -{{- else if kindIs "string" $v }} - value: {{ include "landing.tpl" (dict "value" $v "context" $context) | squote }} -{{- else }} - valueFrom: {{- include "landing.tpl" (dict "value" $v "context" $context) | nindent 4}} -{{- end }} -{{- end }} -{{- end -}} - -{{- define "landing.envVars" -}} -{{- $envVars := merge (deepCopy .Values.envVars) (deepCopy .Values.envVarsFrom) -}} -{{- include "landing.baseEnvVars" (dict "envVars" $envVars "context" $) }} -{{- end -}} diff --git a/charts/sr-landing/templates/deployment.yaml b/charts/sr-landing/templates/deployment.yaml deleted file mode 100644 index ecbe643..0000000 --- a/charts/sr-landing/templates/deployment.yaml +++ /dev/null @@ -1,78 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ include "landing.fullname" . }} - labels: - {{- include "landing.labels" . | nindent 4 }} -spec: - {{- if not .Values.autoscaling.enabled }} - replicas: {{ .Values.replicaCount }} - {{- end }} - {{- with .Values.updateStrategy }} - strategy: {{- toYaml . | nindent 4 }} - {{- end }} - selector: - matchLabels: - {{- include "landing.selectorLabels" . | nindent 6 }} - template: - metadata: - {{- if .Values.podAnnotations }} - annotations: {{- include "landing.tpl" (dict "value" .Values.podAnnotations "context" $) | nindent 8 }} - {{- end }} - labels: - {{- include "landing.selectorLabels" . | nindent 8 }} - spec: - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - serviceAccountName: {{ include "landing.serviceAccountName" . }} - {{- with .Values.podSecurityContext }} - securityContext: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} - containers: - - name: {{ .Chart.Name }} - {{- with .Values.containerSecurityContext }} - securityContext: - {{- toYaml . | nindent 12 }} - {{- end }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} - ports: - - name: http - containerPort: {{ .Values.containerPort }} - protocol: TCP - env: {{- include "landing.envVars" . | nindent 12 }} - {{- with .Values.command }} - command: - {{- toYaml . | nindent 12 }} - {{- end }} - {{- with .Values.args }} - args: - {{- toYaml . | nindent 12 }} - {{- end }} - {{- with .Values.readinessProbe }} - readinessProbe: - {{- toYaml . | nindent 12 }} - {{- end }} - {{- with .Values.livenessProbe }} - livenessProbe: - {{- toYaml . | nindent 12 }} - {{- end }} - {{- with .Values.resources }} - resources: - {{- toYaml . | nindent 12 }} - {{- end }} diff --git a/charts/sr-landing/templates/gateway.yaml b/charts/sr-landing/templates/gateway.yaml deleted file mode 100644 index 706992d..0000000 --- a/charts/sr-landing/templates/gateway.yaml +++ /dev/null @@ -1,39 +0,0 @@ -{{- if .Values.istio.enabled }} -{{- if .Values.istio.gateway.enabled }} -{{- $istioGatewayHostname := tpl .Values.istio.gateway.host $ }} -{{- $mainHostname := tpl .Values.hostname $ }} -{{- $hostname := default $mainHostname $istioGatewayHostname }} -apiVersion: networking.istio.io/v1beta1 -kind: Gateway -metadata: - name: {{ include "landing.fullname" . }} - labels: - {{- include "landing.labels" . | nindent 4 }} -spec: - selector: - {{- toYaml .Values.istio.gateway.ingressController | nindent 4 }} - servers: - {{- if .Values.istio.gateway.httpEnabled }} - - port: - name: http2 - number: 8080 - protocol: HTTP2 - hosts: - - {{ $hostname | quote }} - {{- if .Values.istio.gateway.httpTlsRedirect }} - tls: - httpsRedirect: true - {{- end }} - {{- end }} - {{- if .Values.istio.gateway.httpsEnabled }} - - port: - name: https - number: 8443 - protocol: HTTPS - hosts: - - {{ $hostname | quote }} - tls: - {{- toYaml (omit .Values.istio.gateway.tls "enabled") | nindent 6 }} - {{- end }} -{{- end }} -{{- end }} diff --git a/charts/sr-landing/templates/hpa.yaml b/charts/sr-landing/templates/hpa.yaml deleted file mode 100644 index 26920b0..0000000 --- a/charts/sr-landing/templates/hpa.yaml +++ /dev/null @@ -1,32 +0,0 @@ -{{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2 -kind: HorizontalPodAutoscaler -metadata: - name: {{ include "landing.fullname" . }} - labels: - {{- include "landing.labels" . | nindent 4 }} -spec: - scaleTargetRef: - apiVersion: apps/v1 - kind: Deployment - name: {{ include "landing.fullname" . }} - minReplicas: {{ .Values.autoscaling.minReplicas }} - maxReplicas: {{ .Values.autoscaling.maxReplicas }} - metrics: - {{- if .Values.autoscaling.targetCPUUtilizationPercentage }} - - type: Resource - resource: - name: cpu - target: - type: Utilization - averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} - {{- end }} - {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - - type: Resource - resource: - name: memory - target: - type: Utilization - averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} - {{- end }} -{{- end }} diff --git a/charts/sr-landing/templates/ingress.yaml b/charts/sr-landing/templates/ingress.yaml deleted file mode 100644 index 043021d..0000000 --- a/charts/sr-landing/templates/ingress.yaml +++ /dev/null @@ -1,61 +0,0 @@ -{{- if .Values.ingress.enabled -}} -{{- $fullName := include "landing.fullname" . -}} -{{- $svcPort := .Values.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}} - {{- end }} -{{- end }} -{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} -apiVersion: networking.k8s.io/v1 -{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} -apiVersion: networking.k8s.io/v1beta1 -{{- else -}} -apiVersion: extensions/v1beta1 -{{- end }} -kind: Ingress -metadata: - name: {{ $fullName }} - labels: - {{- include "landing.labels" . | nindent 4 }} - {{- with .Values.ingress.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} - ingressClassName: {{ .Values.ingress.className }} - {{- end }} - {{- if .Values.ingress.tls }} - tls: - {{- range .Values.ingress.tls }} - - hosts: - {{- range .hosts }} - - {{ . | quote }} - {{- end }} - secretName: {{ .secretName }} - {{- end }} - {{- end }} - rules: - {{- range .Values.ingress.hosts }} - - host: {{- .host | ternary .host .Values.global.hostname | quote }} - http: - paths: - {{- range .paths }} - - path: {{ .path }} - {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} - pathType: {{ .pathType }} - {{- end }} - backend: - {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} - service: - name: {{ $fullName }} - port: - number: {{ $svcPort }} - {{- else }} - serviceName: {{ $fullName }} - servicePort: {{ $svcPort }} - {{- end }} - {{- end }} - {{- end }} -{{- end }} diff --git a/charts/sr-landing/templates/service.yaml b/charts/sr-landing/templates/service.yaml deleted file mode 100644 index 51b589c..0000000 --- a/charts/sr-landing/templates/service.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ include "landing.fullname" . }} - labels: - {{- include "landing.labels" . | nindent 4 }} -spec: - type: {{ .Values.service.type }} - ports: - - port: {{ .Values.service.port }} - targetPort: http - protocol: TCP - name: http - selector: - {{- include "landing.selectorLabels" . | nindent 4 }} diff --git a/charts/sr-landing/templates/serviceaccount.yaml b/charts/sr-landing/templates/serviceaccount.yaml deleted file mode 100644 index 7d87827..0000000 --- a/charts/sr-landing/templates/serviceaccount.yaml +++ /dev/null @@ -1,12 +0,0 @@ -{{- if .Values.serviceAccount.create -}} -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ include "landing.serviceAccountName" . }} - labels: - {{- include "landing.labels" . | nindent 4 }} - {{- with .Values.serviceAccount.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -{{- end }} diff --git a/charts/sr-landing/templates/virtualservice.yaml b/charts/sr-landing/templates/virtualservice.yaml deleted file mode 100644 index f19c65d..0000000 --- a/charts/sr-landing/templates/virtualservice.yaml +++ /dev/null @@ -1,36 +0,0 @@ -{{- if .Values.istio.enabled }} -{{- if .Values.istio.virtualservice.enabled }} -{{- $istioVsHostname := tpl .Values.istio.virtualservice.host $ }} -{{- $mainHostname := tpl .Values.hostname $ }} -{{- $hostname := default $mainHostname $istioVsHostname }} -apiVersion: networking.istio.io/v1alpha3 -kind: VirtualService -metadata: - name: {{ include "landing.fullname" . }} - labels: - {{- include "landing.labels" . | nindent 4 }} -spec: - hosts: - - {{ $hostname | quote }} - gateways: - - {{ default (include "landing.fullname" .) .Values.istio.virtualservice.gateway }} - http: - - headers: - request: - set: - x-forwarded-host: {{ $hostname | quote }} - x-forwarded-proto: https - match: - - uri: - prefix: {{ tpl .Values.istio.virtualservice.prefix $ }} - {{- if .Values.istio.virtualservice.rewriteUri }} - rewrite: - uri: {{ tpl .Values.istio.virtualservice.rewriteUri $ }} - {{- end }} - route: - - destination: - host: {{ tpl .Values.istio.virtualservice.destination $ }} - port: - number: {{ tpl .Values.istio.virtualservice.destinationPort $ }} -{{- end }} -{{- end }} diff --git a/charts/sr-landing/values.yaml b/charts/sr-landing/values.yaml deleted file mode 100644 index 263f9c8..0000000 --- a/charts/sr-landing/values.yaml +++ /dev/null @@ -1,147 +0,0 @@ -global: - srAdminHostname: admin-sr.openg2p.sandbox.net - srOdkCentralHostname: odk-sr.openg2p.sandbox.net - srMinioHostname: minio-sr.openg2p.sandbox.net - srOpensearchHostname: opensearch-sr.openg2p.sandbox.net - srKafkaUiHostname: kafka-sr.openg2p.sandbox.net - srSupersetHostname: superset-sr.openg2p.sandbox.net - srLandingPageHostname: socialregistry.openg2p.sandbox.net - -hostname: '{{ tpl .Values.global.srLandingPageHostname $ }}' - -replicaCount: 1 - -image: - repository: openg2p/openg2p-social-registry-landing - tag: "develop" - pullPolicy: Always - -imagePullSecrets: [] -nameOverride: "" -fullnameOverride: "" - -envVars: - SR_ADMIN_URL: 'https://{{ tpl .Values.global.srAdminHostname $ }}' - SR_REPORTING_URL: 'https://{{ tpl .Values.global.srOpensearchHostname $ }}' - SR_LOGGING_URL: 'https://{{ tpl .Values.global.srOpensearchHostname $ }}' - SR_MINIO_URL: 'https://{{ tpl .Values.global.srMinioHostname $ }}' - SR_ODK_URL: 'https://{{ tpl .Values.global.srOdkCentralHostname $ }}' - SR_KAFKA_URL: 'https://{{ tpl .Values.global.srKafkaUiHostname $ }}' - SR_SUPERSET_URL: 'https://{{ tpl .Values.global.srSupersetHostname $ }}' - -envVarsFrom: {} - -service: - type: ClusterIP - port: 80 - -containerPort: 80 - -ingress: - enabled: false - className: "" - annotations: - kubernetes.io/ingress.class: nginx - # kubernetes.io/tls-acme: "true" - hosts: - - host: "" - paths: - - path: / - pathType: ImplementationSpecific - tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local - # -serviceAccount: - # Specifies whether a service account should be created - create: false - # Annotations to add to the service account - annotations: {} - # The name of the service account to use. - # If not set and create is true, a name is generated using the fullname template - name: "" - -istio: - enabled: true - virtualservice: - enabled: true - host: "" - gateway: "internal" - destination: '{{ include "landing.fullname" . }}' - destinationPort: '{{ .Values.service.port }}' - prefix: "" - rewriteUri: "" - gateway: - enabled: false - host: "" - ingressController: - istio: ingressgateway - httpTlsRedirect: true - httpEnabled: true - httpsEnabled: false - tls: - mode: SIMPLE - credentialName: "" - -autoscaling: - enabled: false - minReplicas: 1 - maxReplicas: 1 - targetCPUUtilizationPercentage: 80 - # targetMemoryUtilizationPercentage: 80 - -readinessProbe: - httpGet: - path: / - port: 80 - failureThreshold: 20 - periodSeconds: 30 - timeoutSeconds: 10 - initialDelaySeconds: 30 - -livenessProbe: - httpGet: - path: / - port: 80 - initialDelaySeconds: 15 - periodSeconds: 60 - failureThreshold: 5 - -serviceAccount: - # Specifies whether a service account should be created - create: false - # Annotations to add to the service account - annotations: {} - # The name of the service account to use. - # If not set and create is true, a name is generated using the fullname template - name: "" - -podAnnotations: - helm.sh/revision: '{{ .Release.Revision }}' - -podSecurityContext: {} - # fsGroup: 2000 - -containerSecurityContext: {} - # capabilities: - # drop: - # - ALL - # readOnlyRootFilesystem: true - # runAsNonRoot: true - # runAsUser: 1000 - -nodeSelector: {} - -tolerations: [] - -affinity: {} - -updateStrategy: - type: RollingUpdate - -command: [] -args: [] - - -resources: {}