diff --git a/src/helm/env.d/dev/values.desk.yaml.gotmpl b/src/helm/env.d/dev/values.impress.yaml.gotmpl similarity index 66% rename from src/helm/env.d/dev/values.desk.yaml.gotmpl rename to src/helm/env.d/dev/values.impress.yaml.gotmpl index dee8b7c7..260738c9 100644 --- a/src/helm/env.d/dev/values.desk.yaml.gotmpl +++ b/src/helm/env.d/dev/values.impress.yaml.gotmpl @@ -1,15 +1,15 @@ image: - repository: localhost:5001/people-backend + repository: localhost:5001/impress-backend pullPolicy: Always tag: "latest" backend: envVars: - DJANGO_CSRF_TRUSTED_ORIGINS: https://desk.127.0.0.1.nip.io,http://desk.127.0.0.1.nip.io + DJANGO_CSRF_TRUSTED_ORIGINS: https://impress.127.0.0.1.nip.io,http://impress.127.0.0.1.nip.io DJANGO_CONFIGURATION: Production DJANGO_ALLOWED_HOSTS: "*" DJANGO_SECRET_KEY: {{ .Values.djangoSecretKey }} - DJANGO_SETTINGS_MODULE: people.settings + DJANGO_SETTINGS_MODULE: impress.settings DJANGO_SUPERUSER_PASSWORD: admin DJANGO_EMAIL_HOST: "mailcatcher" DJANGO_EMAIL_PORT: 1025 @@ -22,31 +22,31 @@ backend: OIDC_RP_CLIENT_SECRET: {{ .Values.oidc.clientSecret }} OIDC_RP_SIGN_ALGO: RS256 OIDC_RP_SCOPES: "openid email" - OIDC_REDIRECT_ALLOWED_HOSTS: https://desk.127.0.0.1.nip.io + OIDC_REDIRECT_ALLOWED_HOSTS: https://impress.127.0.0.1.nip.io OIDC_AUTH_REQUEST_EXTRA_PARAMS: "{'acr_values': 'eidas1'}" - LOGIN_REDIRECT_URL: https://desk.127.0.0.1.nip.io - LOGIN_REDIRECT_URL_FAILURE: https://desk.127.0.0.1.nip.io - LOGOUT_REDIRECT_URL: https://desk.127.0.0.1.nip.io/login + LOGIN_REDIRECT_URL: https://impress.127.0.0.1.nip.io + LOGIN_REDIRECT_URL_FAILURE: https://impress.127.0.0.1.nip.io + LOGOUT_REDIRECT_URL: https://impress.127.0.0.1.nip.io/login DB_HOST: postgres-postgresql - DB_NAME: people + DB_NAME: impress DB_USER: dinum DB_PASSWORD: pass DB_PORT: 5432 - POSTGRES_DB: people + POSTGRES_DB: impress POSTGRES_USER: dinum POSTGRES_PASSWORD: pass REDIS_URL: redis://default:pass@redis-master:6379/1 frontend: image: - repository: localhost:5001/people-frontend + repository: localhost:5001/impress-frontend pullPolicy: Always tag: "latest" ingress: enabled: true - host: desk.127.0.0.1.nip.io + host: impress.127.0.0.1.nip.io ingressAdmin: enabled: true - host: desk.127.0.0.1.nip.io + host: impress.127.0.0.1.nip.io diff --git a/src/helm/env.d/staging/values.desk.yaml.gotmpl b/src/helm/env.d/staging/values.impress.yaml.gotmpl similarity index 79% rename from src/helm/env.d/staging/values.desk.yaml.gotmpl rename to src/helm/env.d/staging/values.impress.yaml.gotmpl index be64752d..6fd20bfe 100644 --- a/src/helm/env.d/staging/values.desk.yaml.gotmpl +++ b/src/helm/env.d/staging/values.impress.yaml.gotmpl @@ -1,5 +1,5 @@ image: - repository: lasuite/people-backend + repository: lasuite/impress-backend pullPolicy: Always tag: "main" @@ -8,11 +8,11 @@ backend: argocd.argoproj.io/hook: PreSync argocd.argoproj.io/hook-delete-policy: HookSucceeded envVars: - DJANGO_CSRF_TRUSTED_ORIGINS: http://desk-staging.beta.numerique.gouv.fr,https://desk-staging.beta.numerique.gouv.fr + DJANGO_CSRF_TRUSTED_ORIGINS: http://impress-staging.beta.numerique.gouv.fr,https://impress-staging.beta.numerique.gouv.fr DJANGO_CONFIGURATION: Production DJANGO_ALLOWED_HOSTS: "*" DJANGO_SECRET_KEY: {{ .Values.djangoSecretKey }} - DJANGO_SETTINGS_MODULE: people.settings + DJANGO_SETTINGS_MODULE: impress.settings DJANGO_SUPERUSER_PASSWORD: admin DJANGO_EMAIL_HOST: "snap-mail.numerique.gouv.fr" DJANGO_EMAIL_PORT: 465 @@ -26,11 +26,11 @@ backend: OIDC_RP_CLIENT_SECRET: {{ .Values.oidc.clientSecret }} OIDC_RP_SIGN_ALGO: RS256 OIDC_RP_SCOPES: "openid email" - OIDC_REDIRECT_ALLOWED_HOSTS: https://desk-staging.beta.numerique.gouv.fr + OIDC_REDIRECT_ALLOWED_HOSTS: https://impress-staging.beta.numerique.gouv.fr OIDC_AUTH_REQUEST_EXTRA_PARAMS: "{'acr_values': 'eidas1'}" - LOGIN_REDIRECT_URL: https://desk-staging.beta.numerique.gouv.fr - LOGIN_REDIRECT_URL_FAILURE: https://desk-staging.beta.numerique.gouv.fr - LOGOUT_REDIRECT_URL: https://desk-staging.beta.numerique.gouv.fr/login + LOGIN_REDIRECT_URL: https://impress-staging.beta.numerique.gouv.fr + LOGIN_REDIRECT_URL_FAILURE: https://impress-staging.beta.numerique.gouv.fr + LOGOUT_REDIRECT_URL: https://impress-staging.beta.numerique.gouv.fr/login DB_HOST: secretKeyRef: name: postgresql.postgres.libre.sh @@ -70,20 +70,20 @@ backend: frontend: image: - repository: lasuite/people-frontend + repository: lasuite/impress-frontend pullPolicy: Always tag: "main" ingress: enabled: true - host: desk-staging.beta.numerique.gouv.fr + host: impress-staging.beta.numerique.gouv.fr className: nginx annotations: cert-manager.io/cluster-issuer: letsencrypt-prod ingressAdmin: enabled: true - host: desk-staging.beta.numerique.gouv.fr + host: impress-staging.beta.numerique.gouv.fr className: nginx annotations: cert-manager.io/cluster-issuer: letsencrypt-prod diff --git a/src/helm/extra/Chart.yaml b/src/helm/extra/Chart.yaml index f489dbf1..f3a2b2fc 100644 --- a/src/helm/extra/Chart.yaml +++ b/src/helm/extra/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 name: extra -description: A Helm chart to add some manifests to desk +description: A Helm chart to add some manifests to impress type: application version: 0.1.0 diff --git a/src/helm/extra/templates/postgresql.yaml b/src/helm/extra/templates/postgresql.yaml index c5a77c5c..24d22c47 100644 --- a/src/helm/extra/templates/postgresql.yaml +++ b/src/helm/extra/templates/postgresql.yaml @@ -4,4 +4,4 @@ metadata: name: postgresql namespace: {{ .Release.Namespace | quote }} spec: - database: desk + database: impress diff --git a/src/helm/helmfile.yaml b/src/helm/helmfile.yaml index 3b7f11f6..c2ed6314 100644 --- a/src/helm/helmfile.yaml +++ b/src/helm/helmfile.yaml @@ -13,7 +13,7 @@ releases: - auth: username: dinum password: pass - database: people + database: impress - tls: enabled: true autoGenerated: true @@ -32,12 +32,12 @@ releases: namespace: {{ .Namespace }} chart: ./extra - - name: desk + - name: impress version: {{ .Values.version }} namespace: {{ .Namespace }} - chart: ./desk + chart: ./impress values: - - env.d/{{ .Environment.Name }}/values.desk.yaml.gotmpl + - env.d/{{ .Environment.Name }}/values.impress.yaml.gotmpl secrets: - env.d/{{ .Environment.Name }}/secrets.enc.yaml diff --git a/src/helm/impress/Chart.yaml b/src/helm/impress/Chart.yaml index 7bedeeb2..a9f05c77 100644 --- a/src/helm/impress/Chart.yaml +++ b/src/helm/impress/Chart.yaml @@ -1,4 +1,4 @@ apiVersion: v2 type: application -name: desk +name: impress version: 0.0.1 diff --git a/src/helm/impress/README.md b/src/helm/impress/README.md index 2ece71ef..2b16874e 100644 --- a/src/helm/impress/README.md +++ b/src/helm/impress/README.md @@ -1,4 +1,4 @@ -# Desk helm chart +# Impress helm chart ## Parameters @@ -6,8 +6,8 @@ | Name | Description | Value | | ------------------------------------------ | ---------------------------------------------------- | ------------------------ | -| `image.repository` | Repository to use to pull desk's container image | `lasuite/people-backend` | -| `image.tag` | desk's container tag | `latest` | +| `image.repository` | Repository to use to pull impress's container image | `lasuite/impress-backend` | +| `image.tag` | impress's container tag | `latest` | | `image.pullPolicy` | Container image pull policy | `IfNotPresent` | | `image.credentials.username` | Username for container registry authentication | | | `image.credentials.password` | Password for container registry authentication | | @@ -17,7 +17,7 @@ | `fullnameOverride` | Override the full application name | `""` | | `ingress.enabled` | whether to enable the Ingress or not | `false` | | `ingress.className` | IngressClass to use for the Ingress | `nil` | -| `ingress.host` | Host for the Ingress | `desk.example.com` | +| `ingress.host` | Host for the Ingress | `impress.example.com` | | `ingress.path` | Path to use for the Ingress | `/` | | `ingress.hosts` | Additional host to configure for the Ingress | `[]` | | `ingress.tls.enabled` | Weather to enable TLS for the Ingress | `true` | @@ -26,7 +26,7 @@ | `ingress.customBackends` | Add custom backends to ingress | `[]` | | `ingressAdmin.enabled` | whether to enable the Ingress or not | `false` | | `ingressAdmin.className` | IngressClass to use for the Ingress | `nil` | -| `ingressAdmin.host` | Host for the Ingress | `desk.example.com` | +| `ingressAdmin.host` | Host for the Ingress | `impress.example.com` | | `ingressAdmin.path` | Path to use for the Ingress | `/admin` | | `ingressAdmin.hosts` | Additional host to configure for the Ingress | `[]` | | `ingressAdmin.tls.enabled` | Weather to enable TLS for the Ingress | `true` | @@ -83,8 +83,8 @@ | Name | Description | Value | | ------------------------------------------------------ | ----------------------------------------------------------------------------------- | ------------------------- | -| `frontend.image.repository` | Repository to use to pull desk's frontend container image | `lasuite/people-frontend` | -| `frontend.image.tag` | desk's frontend container tag | `latest` | +| `frontend.image.repository` | Repository to use to pull impress's frontend container image | `lasuite/impress-frontend` | +| `frontend.image.tag` | impress's frontend container tag | `latest` | | `frontend.image.pullPolicy` | frontend container image pull policy | `IfNotPresent` | | `frontend.command` | Override the frontend container command | `[]` | | `frontend.args` | Override the frontend container args | `[]` | diff --git a/src/helm/impress/templates/_helpers.tpl b/src/helm/impress/templates/_helpers.tpl index 2c3b4da3..b09d8c37 100644 --- a/src/helm/impress/templates/_helpers.tpl +++ b/src/helm/impress/templates/_helpers.tpl @@ -1,7 +1,7 @@ {{/* Expand the name of the chart. */}} -{{- define "desk.name" -}} +{{- define "impress.name" -}} {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} {{- end }} @@ -10,7 +10,7 @@ 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 "desk.fullname" -}} +{{- define "impress.fullname" -}} {{- if .Values.fullnameOverride }} {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} {{- else }} @@ -26,16 +26,16 @@ If release name contains chart name it will be used as a full name. {{/* Create chart name and version as used by the chart label. */}} -{{- define "desk.chart" -}} +{{- define "impress.chart" -}} {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} {{- end }} {{/* -desk.labels +impress.labels */}} -{{- define "desk.labels" -}} -helm.sh/chart: {{ include "desk.chart" . }} -{{ include "desk.selectorLabels" . }} +{{- define "impress.labels" -}} +helm.sh/chart: {{ include "impress.chart" . }} +{{ include "impress.selectorLabels" . }} {{- if .Chart.AppVersion }} app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} {{- end }} @@ -45,14 +45,14 @@ app.kubernetes.io/managed-by: {{ .Release.Service }} {{/* Selector labels */}} -{{- define "desk.selectorLabels" -}} -app.kubernetes.io/name: {{ include "desk.name" . }} +{{- define "impress.selectorLabels" -}} +app.kubernetes.io/name: {{ include "impress.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} {{- end }} {{/* transform dictionnary of environment variables -Usage : {{ include "desk.env.transformDict" .Values.envVars }} +Usage : {{ include "impress.env.transformDict" .Values.envVars }} Example: envVars: @@ -69,7 +69,7 @@ envVars: name: secret-name key: "key_in_secret" */}} -{{- define "desk.env.transformDict" -}} +{{- define "impress.env.transformDict" -}} {{- range $key, $value := . }} - name: {{ $key | quote }} {{- if $value | kindIs "map" }} @@ -82,12 +82,12 @@ envVars: {{/* -desk env vars +impress env vars */}} -{{- define "desk.common.env" -}} +{{- define "impress.common.env" -}} {{- $topLevelScope := index . 0 -}} {{- $workerScope := index . 1 -}} -{{- include "desk.env.transformDict" $workerScope.envVars -}} +{{- include "impress.env.transformDict" $workerScope.envVars -}} {{- end }} {{/* @@ -95,10 +95,10 @@ Common labels Requires array with top level scope and component name */}} -{{- define "desk.common.labels" -}} +{{- define "impress.common.labels" -}} {{- $topLevelScope := index . 0 -}} {{- $component := index . 1 -}} -{{- include "desk.labels" $topLevelScope }} +{{- include "impress.labels" $topLevelScope }} app.kubernetes.io/component: {{ $component }} {{- end }} @@ -107,14 +107,14 @@ Common selector labels Requires array with top level scope and component name */}} -{{- define "desk.common.selectorLabels" -}} +{{- define "impress.common.selectorLabels" -}} {{- $topLevelScope := index . 0 -}} {{- $component := index . 1 -}} -{{- include "desk.selectorLabels" $topLevelScope }} +{{- include "impress.selectorLabels" $topLevelScope }} app.kubernetes.io/component: {{ $component }} {{- end }} -{{- define "desk.probes.abstract" -}} +{{- define "impress.probes.abstract" -}} {{- if .exec -}} exec: {{- toYaml .exec | nindent 2 }} @@ -135,8 +135,8 @@ Full name for the backend Requires top level scope */}} -{{- define "desk.backend.fullname" -}} -{{ include "desk.fullname" . }}-backend +{{- define "impress.backend.fullname" -}} +{{ include "impress.fullname" . }}-backend {{- end }} {{/* @@ -144,32 +144,32 @@ Full name for the frontend Requires top level scope */}} -{{- define "desk.frontend.fullname" -}} -{{ include "desk.fullname" . }}-frontend +{{- define "impress.frontend.fullname" -}} +{{ include "impress.fullname" . }}-frontend {{- end }} {{/* -Usage : {{ include "desk.secret.dockerconfigjson.name" (dict "fullname" (include "desk.fullname" .) "imageCredentials" .Values.path.to.the.image1) }} +Usage : {{ include "impress.secret.dockerconfigjson.name" (dict "fullname" (include "impress.fullname" .) "imageCredentials" .Values.path.to.the.image1) }} */}} -{{- define "desk.secret.dockerconfigjson.name" }} +{{- define "impress.secret.dockerconfigjson.name" }} {{- if (default (dict) .imageCredentials).name }}{{ .imageCredentials.name }}{{ else }}{{ .fullname | trunc 63 | trimSuffix "-" }}-dockerconfig{{ end -}} {{- end }} {{/* -Usage : {{ include "desk.secret.dockerconfigjson" (dict "fullname" (include "desk.fullname" .) "imageCredentials" .Values.path.to.the.image1) }} +Usage : {{ include "impress.secret.dockerconfigjson" (dict "fullname" (include "impress.fullname" .) "imageCredentials" .Values.path.to.the.image1) }} */}} -{{- define "desk.secret.dockerconfigjson" }} +{{- define "impress.secret.dockerconfigjson" }} {{- if .imageCredentials -}} apiVersion: v1 kind: Secret metadata: - name: {{ template "desk.secret.dockerconfigjson.name" (dict "fullname" .fullname "imageCredentials" .imageCredentials) }} + name: {{ template "impress.secret.dockerconfigjson.name" (dict "fullname" .fullname "imageCredentials" .imageCredentials) }} annotations: "helm.sh/hook": pre-install,pre-upgrade "helm.sh/hook-weight": "-5" "helm.sh/hook-delete-policy": before-hook-creation type: kubernetes.io/dockerconfigjson data: - .dockerconfigjson: {{ template "desk.secret.dockerconfigjson.data" .imageCredentials }} + .dockerconfigjson: {{ template "impress.secret.dockerconfigjson.data" .imageCredentials }} {{- end -}} {{- end }} diff --git a/src/helm/impress/templates/backend_deployment.yaml b/src/helm/impress/templates/backend_deployment.yaml index 55243d5e..eec6bc39 100644 --- a/src/helm/impress/templates/backend_deployment.yaml +++ b/src/helm/impress/templates/backend_deployment.yaml @@ -1,17 +1,17 @@ -{{- $envVars := include "desk.common.env" (list . .Values.backend) -}} -{{- $fullName := include "desk.backend.fullname" . -}} +{{- $envVars := include "impress.common.env" (list . .Values.backend) -}} +{{- $fullName := include "impress.backend.fullname" . -}} {{- $component := "backend" -}} apiVersion: apps/v1 kind: Deployment metadata: name: {{ $fullName }} labels: - {{- include "desk.common.labels" (list . $component) | nindent 4 }} + {{- include "impress.common.labels" (list . $component) | nindent 4 }} spec: replicas: {{ .Values.backend.replicas }} selector: matchLabels: - {{- include "desk.common.selectorLabels" (list . $component) | nindent 6 }} + {{- include "impress.common.selectorLabels" (list . $component) | nindent 6 }} template: metadata: annotations: @@ -19,11 +19,11 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} labels: - {{- include "desk.common.selectorLabels" (list . $component) | nindent 8 }} + {{- include "impress.common.selectorLabels" (list . $component) | nindent 8 }} spec: {{- if $.Values.image.credentials }} imagePullSecrets: - - name: {{ include "desk.secret.dockerconfigjson.name" (dict "fullname" (include "desk.fullname" .) "imageCredentials" $.Values.image.credentials) }} + - name: {{ include "impress.secret.dockerconfigjson.name" (dict "fullname" (include "impress.fullname" .) "imageCredentials" $.Values.image.credentials) }} {{- end}} shareProcessNamespace: {{ .Values.backend.shareProcessNamespace }} containers: @@ -55,15 +55,15 @@ spec: protocol: TCP {{- if .Values.backend.probes.liveness }} livenessProbe: - {{- include "desk.probes.abstract" (merge .Values.backend.probes.liveness (dict "targetPort" .Values.backend.service.targetPort )) | nindent 12 }} + {{- include "impress.probes.abstract" (merge .Values.backend.probes.liveness (dict "targetPort" .Values.backend.service.targetPort )) | nindent 12 }} {{- end }} {{- if .Values.backend.probes.readiness }} readinessProbe: - {{- include "desk.probes.abstract" (merge .Values.backend.probes.readiness (dict "targetPort" .Values.backend.service.targetPort )) | nindent 12 }} + {{- include "impress.probes.abstract" (merge .Values.backend.probes.readiness (dict "targetPort" .Values.backend.service.targetPort )) | nindent 12 }} {{- end }} {{- if .Values.backend.probes.startup }} startupProbe: - {{- include "desk.probes.abstract" (merge .Values.backend.probes.startup (dict "targetPort" .Values.backend.service.targetPort )) | nindent 12 }} + {{- include "impress.probes.abstract" (merge .Values.backend.probes.startup (dict "targetPort" .Values.backend.service.targetPort )) | nindent 12 }} {{- end }} {{- with .Values.backend.resources }} resources: @@ -101,7 +101,7 @@ spec: {{- range $index, $value := .Values.mountFiles }} - name: "files-{{ $index }}" configMap: - name: "{{ include "desk.fullname" $ }}-files-{{ $index }}" + name: "{{ include "impress.fullname" $ }}-files-{{ $index }}" {{- end }} {{- range $name, $volume := .Values.backend.persistence }} - name: "{{ $name }}" diff --git a/src/helm/impress/templates/backend_job.yaml b/src/helm/impress/templates/backend_job.yaml index 32e32d54..5be5d556 100644 --- a/src/helm/impress/templates/backend_job.yaml +++ b/src/helm/impress/templates/backend_job.yaml @@ -1,5 +1,5 @@ -{{- $envVars := include "desk.common.env" (list . .Values.backend) -}} -{{- $fullName := include "desk.backend.fullname" . -}} +{{- $envVars := include "impress.common.env" (list . .Values.backend) -}} +{{- $fullName := include "impress.backend.fullname" . -}} {{- $component := "backend" -}} apiVersion: batch/v1 kind: Job @@ -10,7 +10,7 @@ metadata: {{- toYaml . | nindent 4 }} {{- end }} labels: - {{- include "desk.common.labels" (list . $component) | nindent 4 }} + {{- include "impress.common.labels" (list . $component) | nindent 4 }} spec: template: metadata: @@ -19,11 +19,11 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} labels: - {{- include "desk.common.selectorLabels" (list . $component) | nindent 8 }} + {{- include "impress.common.selectorLabels" (list . $component) | nindent 8 }} spec: {{- if $.Values.image.credentials }} imagePullSecrets: - - name: {{ include "desk.secret.dockerconfigjson.name" (dict "fullname" (include "desk.fullname" .) "imageCredentials" $.Values.image.credentials) }} + - name: {{ include "impress.secret.dockerconfigjson.name" (dict "fullname" (include "impress.fullname" .) "imageCredentials" $.Values.image.credentials) }} {{- end}} shareProcessNamespace: {{ .Values.backend.shareProcessNamespace }} containers: @@ -86,7 +86,7 @@ spec: {{- range $index, $value := .Values.mountFiles }} - name: "files-{{ $index }}" configMap: - name: "{{ include "desk.fullname" $ }}-files-{{ $index }}" + name: "{{ include "impress.fullname" $ }}-files-{{ $index }}" {{- end }} {{- range $name, $volume := .Values.backend.persistence }} - name: "{{ $name }}" diff --git a/src/helm/impress/templates/backend_svc.yaml b/src/helm/impress/templates/backend_svc.yaml index b87678d1..a80997aa 100644 --- a/src/helm/impress/templates/backend_svc.yaml +++ b/src/helm/impress/templates/backend_svc.yaml @@ -1,12 +1,12 @@ -{{- $envVars := include "desk.common.env" (list . .Values.backend) -}} -{{- $fullName := include "desk.backend.fullname" . -}} +{{- $envVars := include "impress.common.env" (list . .Values.backend) -}} +{{- $fullName := include "impress.backend.fullname" . -}} {{- $component := "backend" -}} apiVersion: v1 kind: Service metadata: name: {{ $fullName }} labels: - {{- include "desk.common.labels" (list . $component) | nindent 4 }} + {{- include "impress.common.labels" (list . $component) | nindent 4 }} annotations: {{- toYaml $.Values.backend.service.annotations | nindent 4 }} spec: @@ -17,4 +17,4 @@ spec: protocol: TCP name: http selector: - {{- include "desk.common.selectorLabels" (list . $component) | nindent 4 }} + {{- include "impress.common.selectorLabels" (list . $component) | nindent 4 }} diff --git a/src/helm/impress/templates/frontend_deployment.yaml b/src/helm/impress/templates/frontend_deployment.yaml index db9ae60c..4407f79a 100644 --- a/src/helm/impress/templates/frontend_deployment.yaml +++ b/src/helm/impress/templates/frontend_deployment.yaml @@ -1,17 +1,17 @@ -{{- $envVars := include "desk.common.env" (list . .Values.frontend) -}} -{{- $fullName := include "desk.frontend.fullname" . -}} +{{- $envVars := include "impress.common.env" (list . .Values.frontend) -}} +{{- $fullName := include "impress.frontend.fullname" . -}} {{- $component := "frontend" -}} apiVersion: apps/v1 kind: Deployment metadata: name: {{ $fullName }} labels: - {{- include "desk.common.labels" (list . $component) | nindent 4 }} + {{- include "impress.common.labels" (list . $component) | nindent 4 }} spec: replicas: {{ .Values.frontend.replicas }} selector: matchLabels: - {{- include "desk.common.selectorLabels" (list . $component) | nindent 6 }} + {{- include "impress.common.selectorLabels" (list . $component) | nindent 6 }} template: metadata: annotations: @@ -19,11 +19,11 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} labels: - {{- include "desk.common.selectorLabels" (list . $component) | nindent 8 }} + {{- include "impress.common.selectorLabels" (list . $component) | nindent 8 }} spec: {{- if $.Values.image.credentials }} imagePullSecrets: - - name: {{ include "desk.secret.dockerconfigjson.name" (dict "fullname" (include "desk.fullname" .) "imageCredentials" $.Values.image.credentials) }} + - name: {{ include "impress.secret.dockerconfigjson.name" (dict "fullname" (include "impress.fullname" .) "imageCredentials" $.Values.image.credentials) }} {{- end}} shareProcessNamespace: {{ .Values.frontend.shareProcessNamespace }} containers: @@ -55,15 +55,15 @@ spec: protocol: TCP {{- if .Values.frontend.probes.liveness }} livenessProbe: - {{- include "desk.probes.abstract" (merge .Values.frontend.probes.liveness (dict "targetPort" .Values.frontend.service.targetPort )) | nindent 12 }} + {{- include "impress.probes.abstract" (merge .Values.frontend.probes.liveness (dict "targetPort" .Values.frontend.service.targetPort )) | nindent 12 }} {{- end }} {{- if .Values.frontend.probes.readiness }} readinessProbe: - {{- include "desk.probes.abstract" (merge .Values.frontend.probes.readiness (dict "targetPort" .Values.frontend.service.targetPort )) | nindent 12 }} + {{- include "impress.probes.abstract" (merge .Values.frontend.probes.readiness (dict "targetPort" .Values.frontend.service.targetPort )) | nindent 12 }} {{- end }} {{- if .Values.frontend.probes.startup }} startupProbe: - {{- include "desk.probes.abstract" (merge .Values.frontend.probes.startup (dict "targetPort" .Values.frontend.service.targetPort )) | nindent 12 }} + {{- include "impress.probes.abstract" (merge .Values.frontend.probes.startup (dict "targetPort" .Values.frontend.service.targetPort )) | nindent 12 }} {{- end }} {{- with .Values.frontend.resources }} resources: @@ -101,7 +101,7 @@ spec: {{- range $index, $value := .Values.mountFiles }} - name: "files-{{ $index }}" configMap: - name: "{{ include "desk.fullname" $ }}-files-{{ $index }}" + name: "{{ include "impress.fullname" $ }}-files-{{ $index }}" {{- end }} {{- range $name, $volume := .Values.frontend.persistence }} - name: "{{ $name }}" diff --git a/src/helm/impress/templates/frontend_svc.yaml b/src/helm/impress/templates/frontend_svc.yaml index 6a0413f3..e6bbff18 100644 --- a/src/helm/impress/templates/frontend_svc.yaml +++ b/src/helm/impress/templates/frontend_svc.yaml @@ -1,12 +1,12 @@ -{{- $envVars := include "desk.common.env" (list . .Values.frontend) -}} -{{- $fullName := include "desk.frontend.fullname" . -}} +{{- $envVars := include "impress.common.env" (list . .Values.frontend) -}} +{{- $fullName := include "impress.frontend.fullname" . -}} {{- $component := "frontend" -}} apiVersion: v1 kind: Service metadata: name: {{ $fullName }} labels: - {{- include "desk.common.labels" (list . $component) | nindent 4 }} + {{- include "impress.common.labels" (list . $component) | nindent 4 }} annotations: {{- toYaml $.Values.frontend.service.annotations | nindent 4 }} spec: @@ -17,4 +17,4 @@ spec: protocol: TCP name: http selector: - {{- include "desk.common.selectorLabels" (list . $component) | nindent 4 }} + {{- include "impress.common.selectorLabels" (list . $component) | nindent 4 }} diff --git a/src/helm/impress/templates/ingress.yaml b/src/helm/impress/templates/ingress.yaml index cc31dbb2..9a551876 100644 --- a/src/helm/impress/templates/ingress.yaml +++ b/src/helm/impress/templates/ingress.yaml @@ -1,5 +1,5 @@ {{- if .Values.ingress.enabled -}} -{{- $fullName := include "desk.fullname" . -}} +{{- $fullName := include "impress.fullname" . -}} {{- 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}} @@ -16,7 +16,7 @@ kind: Ingress metadata: name: {{ $fullName }} labels: - {{- include "desk.labels" . | nindent 4 }} + {{- include "impress.labels" . | nindent 4 }} {{- with .Values.ingress.annotations }} annotations: {{- toYaml . | nindent 4 }} @@ -52,11 +52,11 @@ spec: backend: {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} service: - name: {{ include "desk.frontend.fullname" . }} + name: {{ include "impress.frontend.fullname" . }} port: number: {{ .Values.frontend.service.port }} {{- else }} - serviceName: {{ include "desk.frontend.fullname" . }} + serviceName: {{ include "impress.frontend.fullname" . }} servicePort: {{ .Values.frontend.service.port }} {{- end }} - path: /api @@ -66,11 +66,11 @@ spec: backend: {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} service: - name: {{ include "desk.backend.fullname" . }} + name: {{ include "impress.backend.fullname" . }} port: number: {{ .Values.backend.service.port }} {{- else }} - serviceName: {{ include "desk.backend.fullname" . }} + serviceName: {{ include "impress.backend.fullname" . }} servicePort: {{ .Values.backend.service.port }} {{- end }} {{- with .Values.ingress.customBackends }} @@ -88,11 +88,11 @@ spec: backend: {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} service: - name: {{ include "desk.frontend.fullname" $ }} + name: {{ include "impress.frontend.fullname" $ }} port: number: {{ $.Values.frontend.service.port }} {{- else }} - serviceName: {{ include "desk.frontend.fullname" $ }} + serviceName: {{ include "impress.frontend.fullname" $ }} servicePort: {{ $.Values.frontend.service.port }} {{- end }} - path: /api @@ -102,11 +102,11 @@ spec: backend: {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} service: - name: {{ include "desk.backend.fullname" $ }} + name: {{ include "impress.backend.fullname" $ }} port: number: {{ $.Values.backend.service.port }} {{- else }} - serviceName: {{ include "desk.backend.fullname" $ }} + serviceName: {{ include "impress.backend.fullname" $ }} servicePort: {{ $.Values.backend.service.port }} {{- end }} {{- with $.Values.ingress.customBackends }} diff --git a/src/helm/impress/templates/ingress_admin.yaml b/src/helm/impress/templates/ingress_admin.yaml index de66e7aa..70e9ca24 100644 --- a/src/helm/impress/templates/ingress_admin.yaml +++ b/src/helm/impress/templates/ingress_admin.yaml @@ -1,5 +1,5 @@ {{- if .Values.ingressAdmin.enabled -}} -{{- $fullName := include "desk.fullname" . -}} +{{- $fullName := include "impress.fullname" . -}} {{- if and .Values.ingressAdmin.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }} {{- if not (hasKey .Values.ingressAdmin.annotations "kubernetes.io/ingress.class") }} {{- $_ := set .Values.ingressAdmin.annotations "kubernetes.io/ingress.class" .Values.ingressAdmin.className}} @@ -16,7 +16,7 @@ kind: Ingress metadata: name: {{ $fullName }}-admin labels: - {{- include "desk.labels" . | nindent 4 }} + {{- include "impress.labels" . | nindent 4 }} {{- with .Values.ingressAdmin.annotations }} annotations: {{- toYaml . | nindent 4 }} @@ -52,11 +52,11 @@ spec: backend: {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} service: - name: {{ include "desk.backend.fullname" . }} + name: {{ include "impress.backend.fullname" . }} port: number: {{ .Values.backend.service.port }} {{- else }} - serviceName: {{ include "desk.backend.fullname" . }} + serviceName: {{ include "impress.backend.fullname" . }} servicePort: {{ .Values.backend.service.port }} {{- end }} - path: /static @@ -66,11 +66,11 @@ spec: backend: {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} service: - name: {{ include "desk.backend.fullname" . }} + name: {{ include "impress.backend.fullname" . }} port: number: {{ .Values.backend.service.port }} {{- else }} - serviceName: {{ include "desk.backend.fullname" . }} + serviceName: {{ include "impress.backend.fullname" . }} servicePort: {{ .Values.backend.service.port }} {{- end }} {{- end }} @@ -85,11 +85,11 @@ spec: backend: {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} service: - name: {{ include "desk.backend.fullname" $ }} + name: {{ include "impress.backend.fullname" $ }} port: number: {{ $.Values.backend.service.port }} {{- else }} - serviceName: {{ include "desk.backend.fullname" $ }} + serviceName: {{ include "impress.backend.fullname" $ }} servicePort: {{ $.Values.backend.service.port }} {{- end }} {{- end }} diff --git a/src/helm/impress/values.yaml b/src/helm/impress/values.yaml index ab76642d..451e01da 100644 --- a/src/helm/impress/values.yaml +++ b/src/helm/impress/values.yaml @@ -1,18 +1,18 @@ -# Default values for desk. +# Default values for impress. # This is a YAML-formatted file. # Declare variables to be passed into your templates. ## @section General configuration -## @param image.repository Repository to use to pull desk's container image -## @param image.tag desk's container tag +## @param image.repository Repository to use to pull impress's container image +## @param image.tag impress's container tag ## @param image.pullPolicy Container image pull policy ## @extra image.credentials.username Username for container registry authentication ## @extra image.credentials.password Password for container registry authentication ## @extra image.credentials.registry Registry url for which the credentials are specified ## @extra image.credentials.name Name of the generated secret for imagePullSecrets image: - repository: lasuite/people-backend + repository: lasuite/impress-backend pullPolicy: IfNotPresent tag: "latest" @@ -32,7 +32,7 @@ commonEnvVars: &commonEnvVars ingress: enabled: false className: null - host: desk.example.com + host: impress.example.com path: / ## @param ingress.hosts Additional host to configure for the Ingress hosts: [] @@ -55,7 +55,7 @@ ingress: ingressAdmin: enabled: false className: null - host: desk.example.com + host: impress.example.com path: /admin ## @param ingressAdmin.hosts Additional host to configure for the Ingress hosts: [ ] @@ -175,11 +175,11 @@ backend: ## @section frontend frontend: - ## @param frontend.image.repository Repository to use to pull desk's frontend container image - ## @param frontend.image.tag desk's frontend container tag + ## @param frontend.image.repository Repository to use to pull impress's frontend container image + ## @param frontend.image.tag impress's frontend container tag ## @param frontend.image.pullPolicy frontend container image pull policy image: - repository: lasuite/people-frontend + repository: lasuite/impress-frontend pullPolicy: IfNotPresent tag: "latest"