studio/docs
Archived
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🔧(helm) replace occurences of desk and people

Browse Source 
Replace naively all occurences of
desk and people with impress.
This commit is contained in:
Anthony LC
2024-04-04 12:01:10 +02:00
committed by Anthony LC
parent 17729e231b
commit 560dbf1c2e
16 changed files with 126 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/helm/env.d/dev/values.desk.yaml.gotmpl → src/helm/env.d/dev/values.impress.yaml.gotmpl
View File

@@ -1,15 +1,15 @@
image: image:
repository: localhost:5001/people-backend repository: localhost:5001/impress-backend
pullPolicy: Always pullPolicy: Always
tag: "latest" tag: "latest"
backend: backend:
envVars: 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_CONFIGURATION: Production
DJANGO_ALLOWED_HOSTS: "*" DJANGO_ALLOWED_HOSTS: "*"
DJANGO_SECRET_KEY: {{ .Values.djangoSecretKey }} DJANGO_SECRET_KEY: {{ .Values.djangoSecretKey }}
DJANGO_SETTINGS_MODULE: people.settings DJANGO_SETTINGS_MODULE: impress.settings
DJANGO_SUPERUSER_PASSWORD: admin DJANGO_SUPERUSER_PASSWORD: admin
DJANGO_EMAIL_HOST: "mailcatcher" DJANGO_EMAIL_HOST: "mailcatcher"
DJANGO_EMAIL_PORT: 1025 DJANGO_EMAIL_PORT: 1025
@@ -22,31 +22,31 @@ backend:
OIDC_RP_CLIENT_SECRET: {{ .Values.oidc.clientSecret }} OIDC_RP_CLIENT_SECRET: {{ .Values.oidc.clientSecret }}
OIDC_RP_SIGN_ALGO: RS256 OIDC_RP_SIGN_ALGO: RS256
OIDC_RP_SCOPES: "openid email" 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'}" OIDC_AUTH_REQUEST_EXTRA_PARAMS: "{'acr_values': 'eidas1'}"
LOGIN_REDIRECT_URL: https://desk.127.0.0.1.nip.io LOGIN_REDIRECT_URL: https://impress.127.0.0.1.nip.io
LOGIN_REDIRECT_URL_FAILURE: https://desk.127.0.0.1.nip.io LOGIN_REDIRECT_URL_FAILURE: https://impress.127.0.0.1.nip.io
LOGOUT_REDIRECT_URL: https://desk.127.0.0.1.nip.io/login LOGOUT_REDIRECT_URL: https://impress.127.0.0.1.nip.io/login
DB_HOST: postgres-postgresql DB_HOST: postgres-postgresql
DB_NAME: people DB_NAME: impress
DB_USER: dinum DB_USER: dinum
DB_PASSWORD: pass DB_PASSWORD: pass
DB_PORT: 5432 DB_PORT: 5432
POSTGRES_DB: people POSTGRES_DB: impress
POSTGRES_USER: dinum POSTGRES_USER: dinum
POSTGRES_PASSWORD: pass POSTGRES_PASSWORD: pass
REDIS_URL: redis://default:pass@redis-master:6379/1 REDIS_URL: redis://default:pass@redis-master:6379/1
frontend: frontend:
image: image:
repository: localhost:5001/people-frontend repository: localhost:5001/impress-frontend
pullPolicy: Always pullPolicy: Always
tag: "latest" tag: "latest"
ingress: ingress:
enabled: true enabled: true
host: desk.127.0.0.1.nip.io host: impress.127.0.0.1.nip.io
ingressAdmin: ingressAdmin:
enabled: true enabled: true
host: desk.127.0.0.1.nip.io host: impress.127.0.0.1.nip.io

20
src/helm/env.d/staging/values.desk.yaml.gotmpl → src/helm/env.d/staging/values.impress.yaml.gotmpl
View File

@@ -1,5 +1,5 @@
image: image:
repository: lasuite/people-backend repository: lasuite/impress-backend
pullPolicy: Always pullPolicy: Always
tag: "main" tag: "main"
@@ -8,11 +8,11 @@ backend:
argocd.argoproj.io/hook: PreSync argocd.argoproj.io/hook: PreSync
argocd.argoproj.io/hook-delete-policy: HookSucceeded argocd.argoproj.io/hook-delete-policy: HookSucceeded
envVars: 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_CONFIGURATION: Production
DJANGO_ALLOWED_HOSTS: "*" DJANGO_ALLOWED_HOSTS: "*"
DJANGO_SECRET_KEY: {{ .Values.djangoSecretKey }} DJANGO_SECRET_KEY: {{ .Values.djangoSecretKey }}
DJANGO_SETTINGS_MODULE: people.settings DJANGO_SETTINGS_MODULE: impress.settings
DJANGO_SUPERUSER_PASSWORD: admin DJANGO_SUPERUSER_PASSWORD: admin
DJANGO_EMAIL_HOST: "snap-mail.numerique.gouv.fr" DJANGO_EMAIL_HOST: "snap-mail.numerique.gouv.fr"
DJANGO_EMAIL_PORT: 465 DJANGO_EMAIL_PORT: 465
@@ -26,11 +26,11 @@ backend:
OIDC_RP_CLIENT_SECRET: {{ .Values.oidc.clientSecret }} OIDC_RP_CLIENT_SECRET: {{ .Values.oidc.clientSecret }}
OIDC_RP_SIGN_ALGO: RS256 OIDC_RP_SIGN_ALGO: RS256
OIDC_RP_SCOPES: "openid email" 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'}" OIDC_AUTH_REQUEST_EXTRA_PARAMS: "{'acr_values': 'eidas1'}"
LOGIN_REDIRECT_URL: https://desk-staging.beta.numerique.gouv.fr LOGIN_REDIRECT_URL: https://impress-staging.beta.numerique.gouv.fr
LOGIN_REDIRECT_URL_FAILURE: https://desk-staging.beta.numerique.gouv.fr LOGIN_REDIRECT_URL_FAILURE: https://impress-staging.beta.numerique.gouv.fr
LOGOUT_REDIRECT_URL: https://desk-staging.beta.numerique.gouv.fr/login LOGOUT_REDIRECT_URL: https://impress-staging.beta.numerique.gouv.fr/login
DB_HOST: DB_HOST:
secretKeyRef: secretKeyRef:
name: postgresql.postgres.libre.sh name: postgresql.postgres.libre.sh
@@ -70,20 +70,20 @@ backend:
frontend: frontend:
image: image:
repository: lasuite/people-frontend repository: lasuite/impress-frontend
pullPolicy: Always pullPolicy: Always
tag: "main" tag: "main"
ingress: ingress:
enabled: true enabled: true
host: desk-staging.beta.numerique.gouv.fr host: impress-staging.beta.numerique.gouv.fr
className: nginx className: nginx
annotations: annotations:
cert-manager.io/cluster-issuer: letsencrypt-prod cert-manager.io/cluster-issuer: letsencrypt-prod
ingressAdmin: ingressAdmin:
enabled: true enabled: true
host: desk-staging.beta.numerique.gouv.fr host: impress-staging.beta.numerique.gouv.fr
className: nginx className: nginx
annotations: annotations:
cert-manager.io/cluster-issuer: letsencrypt-prod cert-manager.io/cluster-issuer: letsencrypt-prod

2
src/helm/extra/Chart.yaml
View File

@@ -1,5 +1,5 @@
apiVersion: v2 apiVersion: v2
name: extra name: extra
description: A Helm chart to add some manifests to desk description: A Helm chart to add some manifests to impress
type: application type: application
version: 0.1.0 version: 0.1.0

2
src/helm/extra/templates/postgresql.yaml
View File

@@ -4,4 +4,4 @@ metadata:
name: postgresql name: postgresql
namespace: {{ .Release.Namespace | quote }} namespace: {{ .Release.Namespace | quote }}
spec: spec:
database: desk database: impress

8
src/helm/helmfile.yaml
View File

@@ -13,7 +13,7 @@ releases:
- auth: - auth:
username: dinum username: dinum
password: pass password: pass
database: people database: impress
- tls: - tls:
enabled: true enabled: true
autoGenerated: true autoGenerated: true
@@ -32,12 +32,12 @@ releases:
namespace: {{ .Namespace }} namespace: {{ .Namespace }}
chart: ./extra chart: ./extra
- name: desk - name: impress
version: {{ .Values.version }} version: {{ .Values.version }}
namespace: {{ .Namespace }} namespace: {{ .Namespace }}
chart: ./desk chart: ./impress
values: values:
- env.d/{{ .Environment.Name }}/values.desk.yaml.gotmpl - env.d/{{ .Environment.Name }}/values.impress.yaml.gotmpl
secrets: secrets:
- env.d/{{ .Environment.Name }}/secrets.enc.yaml - env.d/{{ .Environment.Name }}/secrets.enc.yaml

2
src/helm/impress/Chart.yaml
View File

@@ -1,4 +1,4 @@
apiVersion: v2 apiVersion: v2
type: application type: application
name: desk name: impress
version: 0.0.1 version: 0.0.1

14
src/helm/impress/README.md
View File

@@ -1,4 +1,4 @@
# Desk helm chart # Impress helm chart
## Parameters ## Parameters
@@ -6,8 +6,8 @@
| Name | Description | Value | | Name | Description | Value |
| ------------------------------------------ | ---------------------------------------------------- | ------------------------ | | ------------------------------------------ | ---------------------------------------------------- | ------------------------ |
| `image.repository` | Repository to use to pull desk's container image | `lasuite/people-backend` | | `image.repository` | Repository to use to pull impress's container image | `lasuite/impress-backend` |
| `image.tag` | desk's container tag | `latest` | | `image.tag` | impress's container tag | `latest` |
| `image.pullPolicy` | Container image pull policy | `IfNotPresent` | | `image.pullPolicy` | Container image pull policy | `IfNotPresent` |
| `image.credentials.username` | Username for container registry authentication | | | `image.credentials.username` | Username for container registry authentication | |
| `image.credentials.password` | Password for container registry authentication | | | `image.credentials.password` | Password for container registry authentication | |
@@ -17,7 +17,7 @@
| `fullnameOverride` | Override the full application name | `""` | | `fullnameOverride` | Override the full application name | `""` |
| `ingress.enabled` | whether to enable the Ingress or not | `false` | | `ingress.enabled` | whether to enable the Ingress or not | `false` |
| `ingress.className` | IngressClass to use for the Ingress | `nil` | | `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.path` | Path to use for the Ingress | `/` |
| `ingress.hosts` | Additional host to configure for the Ingress | `[]` | | `ingress.hosts` | Additional host to configure for the Ingress | `[]` |
| `ingress.tls.enabled` | Weather to enable TLS for the Ingress | `true` | | `ingress.tls.enabled` | Weather to enable TLS for the Ingress | `true` |
@@ -26,7 +26,7 @@
| `ingress.customBackends` | Add custom backends to ingress | `[]` | | `ingress.customBackends` | Add custom backends to ingress | `[]` |
| `ingressAdmin.enabled` | whether to enable the Ingress or not | `false` | | `ingressAdmin.enabled` | whether to enable the Ingress or not | `false` |
| `ingressAdmin.className` | IngressClass to use for the Ingress | `nil` | | `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.path` | Path to use for the Ingress | `/admin` |
| `ingressAdmin.hosts` | Additional host to configure for the Ingress | `[]` | | `ingressAdmin.hosts` | Additional host to configure for the Ingress | `[]` |
| `ingressAdmin.tls.enabled` | Weather to enable TLS for the Ingress | `true` | | `ingressAdmin.tls.enabled` | Weather to enable TLS for the Ingress | `true` |
@@ -83,8 +83,8 @@
| Name | Description | Value | | Name | Description | Value |
| ------------------------------------------------------ | ----------------------------------------------------------------------------------- | ------------------------- | | ------------------------------------------------------ | ----------------------------------------------------------------------------------- | ------------------------- |
| `frontend.image.repository` | Repository to use to pull desk's frontend container image | `lasuite/people-frontend` | | `frontend.image.repository` | Repository to use to pull impress's frontend container image | `lasuite/impress-frontend` |
| `frontend.image.tag` | desk's frontend container tag | `latest` | | `frontend.image.tag` | impress's frontend container tag | `latest` |
| `frontend.image.pullPolicy` | frontend container image pull policy | `IfNotPresent` | | `frontend.image.pullPolicy` | frontend container image pull policy | `IfNotPresent` |
| `frontend.command` | Override the frontend container command | `[]` | | `frontend.command` | Override the frontend container command | `[]` |
| `frontend.args` | Override the frontend container args | `[]` | | `frontend.args` | Override the frontend container args | `[]` |

58
src/helm/impress/templates/_helpers.tpl
View File

@@ -1,7 +1,7 @@
{{/* {{/*
Expand the name of the chart. Expand the name of the chart.
*/}} */}}
{{- define "desk.name" -}} {{- define "impress.name" -}}
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
{{- end }} {{- 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). 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. If release name contains chart name it will be used as a full name.
*/}} */}}
{{- define "desk.fullname" -}} {{- define "impress.fullname" -}}
{{- if .Values.fullnameOverride }} {{- if .Values.fullnameOverride }}
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
{{- else }} {{- 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. 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 "-" }} {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
{{- end }} {{- end }}
{{/* {{/*
desk.labels impress.labels
*/}} */}}
{{- define "desk.labels" -}} {{- define "impress.labels" -}}
helm.sh/chart: {{ include "desk.chart" . }} helm.sh/chart: {{ include "impress.chart" . }}
{{ include "desk.selectorLabels" . }} {{ include "impress.selectorLabels" . }}
{{- if .Chart.AppVersion }} {{- if .Chart.AppVersion }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
{{- end }} {{- end }}
@@ -45,14 +45,14 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
{{/* {{/*
Selector labels Selector labels
*/}} */}}
{{- define "desk.selectorLabels" -}} {{- define "impress.selectorLabels" -}}
app.kubernetes.io/name: {{ include "desk.name" . }} app.kubernetes.io/name: {{ include "impress.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Name }}
{{- end }} {{- end }}
{{/* {{/*
transform dictionnary of environment variables transform dictionnary of environment variables
Usage : {{ include "desk.env.transformDict" .Values.envVars }} Usage : {{ include "impress.env.transformDict" .Values.envVars }}
Example: Example:
envVars: envVars:
@@ -69,7 +69,7 @@ envVars:
name: secret-name name: secret-name
key: "key_in_secret" key: "key_in_secret"
*/}} */}}
{{- define "desk.env.transformDict" -}} {{- define "impress.env.transformDict" -}}
{{- range $key, $value := . }} {{- range $key, $value := . }}
- name: {{ $key | quote }} - name: {{ $key | quote }}
{{- if $value | kindIs "map" }} {{- 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 -}} {{- $topLevelScope := index . 0 -}}
{{- $workerScope := index . 1 -}} {{- $workerScope := index . 1 -}}
{{- include "desk.env.transformDict" $workerScope.envVars -}} {{- include "impress.env.transformDict" $workerScope.envVars -}}
{{- end }} {{- end }}
{{/* {{/*
@@ -95,10 +95,10 @@ Common labels
Requires array with top level scope and component name Requires array with top level scope and component name
*/}} */}}
{{- define "desk.common.labels" -}} {{- define "impress.common.labels" -}}
{{- $topLevelScope := index . 0 -}} {{- $topLevelScope := index . 0 -}}
{{- $component := index . 1 -}} {{- $component := index . 1 -}}
{{- include "desk.labels" $topLevelScope }} {{- include "impress.labels" $topLevelScope }}
app.kubernetes.io/component: {{ $component }} app.kubernetes.io/component: {{ $component }}
{{- end }} {{- end }}
@@ -107,14 +107,14 @@ Common selector labels
Requires array with top level scope and component name Requires array with top level scope and component name
*/}} */}}
{{- define "desk.common.selectorLabels" -}} {{- define "impress.common.selectorLabels" -}}
{{- $topLevelScope := index . 0 -}} {{- $topLevelScope := index . 0 -}}
{{- $component := index . 1 -}} {{- $component := index . 1 -}}
{{- include "desk.selectorLabels" $topLevelScope }} {{- include "impress.selectorLabels" $topLevelScope }}
app.kubernetes.io/component: {{ $component }} app.kubernetes.io/component: {{ $component }}
{{- end }} {{- end }}
{{- define "desk.probes.abstract" -}} {{- define "impress.probes.abstract" -}}
{{- if .exec -}} {{- if .exec -}}
exec: exec:
{{- toYaml .exec | nindent 2 }} {{- toYaml .exec | nindent 2 }}
@@ -135,8 +135,8 @@ Full name for the backend
Requires top level scope Requires top level scope
*/}} */}}
{{- define "desk.backend.fullname" -}} {{- define "impress.backend.fullname" -}}
{{ include "desk.fullname" . }}-backend {{ include "impress.fullname" . }}-backend
{{- end }} {{- end }}
{{/* {{/*
@@ -144,32 +144,32 @@ Full name for the frontend
Requires top level scope Requires top level scope
*/}} */}}
{{- define "desk.frontend.fullname" -}} {{- define "impress.frontend.fullname" -}}
{{ include "desk.fullname" . }}-frontend {{ include "impress.fullname" . }}-frontend
{{- end }} {{- 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 -}} {{- if (default (dict) .imageCredentials).name }}{{ .imageCredentials.name }}{{ else }}{{ .fullname | trunc 63 | trimSuffix "-" }}-dockerconfig{{ end -}}
{{- 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 -}} {{- if .imageCredentials -}}
apiVersion: v1 apiVersion: v1
kind: Secret kind: Secret
metadata: metadata:
name: {{ template "desk.secret.dockerconfigjson.name" (dict "fullname" .fullname "imageCredentials" .imageCredentials) }} name: {{ template "impress.secret.dockerconfigjson.name" (dict "fullname" .fullname "imageCredentials" .imageCredentials) }}
annotations: annotations:
"helm.sh/hook": pre-install,pre-upgrade "helm.sh/hook": pre-install,pre-upgrade
"helm.sh/hook-weight": "-5" "helm.sh/hook-weight": "-5"
"helm.sh/hook-delete-policy": before-hook-creation "helm.sh/hook-delete-policy": before-hook-creation
type: kubernetes.io/dockerconfigjson type: kubernetes.io/dockerconfigjson
data: data:
.dockerconfigjson: {{ template "desk.secret.dockerconfigjson.data" .imageCredentials }} .dockerconfigjson: {{ template "impress.secret.dockerconfigjson.data" .imageCredentials }}
{{- end -}} {{- end -}}
{{- end }} {{- end }}

20
src/helm/impress/templates/backend_deployment.yaml
View File

@@ -1,17 +1,17 @@
{{- $envVars := include "desk.common.env" (list . .Values.backend) -}} {{- $envVars := include "impress.common.env" (list . .Values.backend) -}}
{{- $fullName := include "desk.backend.fullname" . -}} {{- $fullName := include "impress.backend.fullname" . -}}
{{- $component := "backend" -}} {{- $component := "backend" -}}
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
name: {{ $fullName }} name: {{ $fullName }}
labels: labels:
{{- include "desk.common.labels" (list . $component) | nindent 4 }} {{- include "impress.common.labels" (list . $component) | nindent 4 }}
spec: spec:
replicas: {{ .Values.backend.replicas }} replicas: {{ .Values.backend.replicas }}
selector: selector:
matchLabels: matchLabels:
{{- include "desk.common.selectorLabels" (list . $component) | nindent 6 }} {{- include "impress.common.selectorLabels" (list . $component) | nindent 6 }}
template: template:
metadata: metadata:
annotations: annotations:
@@ -19,11 +19,11 @@ spec:
{{- toYaml . | nindent 8 }} {{- toYaml . | nindent 8 }}
{{- end }} {{- end }}
labels: labels:
{{- include "desk.common.selectorLabels" (list . $component) | nindent 8 }} {{- include "impress.common.selectorLabels" (list . $component) | nindent 8 }}
spec: spec:
{{- if $.Values.image.credentials }} {{- if $.Values.image.credentials }}
imagePullSecrets: 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}} {{- end}}
shareProcessNamespace: {{ .Values.backend.shareProcessNamespace }} shareProcessNamespace: {{ .Values.backend.shareProcessNamespace }}
containers: containers:
@@ -55,15 +55,15 @@ spec:
protocol: TCP protocol: TCP
{{- if .Values.backend.probes.liveness }} {{- if .Values.backend.probes.liveness }}
livenessProbe: 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 }} {{- end }}
{{- if .Values.backend.probes.readiness }} {{- if .Values.backend.probes.readiness }}
readinessProbe: 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 }} {{- end }}
{{- if .Values.backend.probes.startup }} {{- if .Values.backend.probes.startup }}
startupProbe: 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 }} {{- end }}
{{- with .Values.backend.resources }} {{- with .Values.backend.resources }}
resources: resources:
@@ -101,7 +101,7 @@ spec:
{{- range $index, $value := .Values.mountFiles }} {{- range $index, $value := .Values.mountFiles }}
- name: "files-{{ $index }}" - name: "files-{{ $index }}"
configMap: configMap:
name: "{{ include "desk.fullname" $ }}-files-{{ $index }}" name: "{{ include "impress.fullname" $ }}-files-{{ $index }}"
{{- end }} {{- end }}
{{- range $name, $volume := .Values.backend.persistence }} {{- range $name, $volume := .Values.backend.persistence }}
- name: "{{ $name }}" - name: "{{ $name }}"

12
src/helm/impress/templates/backend_job.yaml
View File

@@ -1,5 +1,5 @@
{{- $envVars := include "desk.common.env" (list . .Values.backend) -}} {{- $envVars := include "impress.common.env" (list . .Values.backend) -}}
{{- $fullName := include "desk.backend.fullname" . -}} {{- $fullName := include "impress.backend.fullname" . -}}
{{- $component := "backend" -}} {{- $component := "backend" -}}
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
@@ -10,7 +10,7 @@ metadata:
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
labels: labels:
{{- include "desk.common.labels" (list . $component) | nindent 4 }} {{- include "impress.common.labels" (list . $component) | nindent 4 }}
spec: spec:
template: template:
metadata: metadata:
@@ -19,11 +19,11 @@ spec:
{{- toYaml . | nindent 8 }} {{- toYaml . | nindent 8 }}
{{- end }} {{- end }}
labels: labels:
{{- include "desk.common.selectorLabels" (list . $component) | nindent 8 }} {{- include "impress.common.selectorLabels" (list . $component) | nindent 8 }}
spec: spec:
{{- if $.Values.image.credentials }} {{- if $.Values.image.credentials }}
imagePullSecrets: 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}} {{- end}}
shareProcessNamespace: {{ .Values.backend.shareProcessNamespace }} shareProcessNamespace: {{ .Values.backend.shareProcessNamespace }}
containers: containers:
@@ -86,7 +86,7 @@ spec:
{{- range $index, $value := .Values.mountFiles }} {{- range $index, $value := .Values.mountFiles }}
- name: "files-{{ $index }}" - name: "files-{{ $index }}"
configMap: configMap:
name: "{{ include "desk.fullname" $ }}-files-{{ $index }}" name: "{{ include "impress.fullname" $ }}-files-{{ $index }}"
{{- end }} {{- end }}
{{- range $name, $volume := .Values.backend.persistence }} {{- range $name, $volume := .Values.backend.persistence }}
- name: "{{ $name }}" - name: "{{ $name }}"

8
src/helm/impress/templates/backend_svc.yaml
View File

@@ -1,12 +1,12 @@
{{- $envVars := include "desk.common.env" (list . .Values.backend) -}} {{- $envVars := include "impress.common.env" (list . .Values.backend) -}}
{{- $fullName := include "desk.backend.fullname" . -}} {{- $fullName := include "impress.backend.fullname" . -}}
{{- $component := "backend" -}} {{- $component := "backend" -}}
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
name: {{ $fullName }} name: {{ $fullName }}
labels: labels:
{{- include "desk.common.labels" (list . $component) | nindent 4 }} {{- include "impress.common.labels" (list . $component) | nindent 4 }}
annotations: annotations:
{{- toYaml $.Values.backend.service.annotations | nindent 4 }} {{- toYaml $.Values.backend.service.annotations | nindent 4 }}
spec: spec:
@@ -17,4 +17,4 @@ spec:
protocol: TCP protocol: TCP
name: http name: http
selector: selector:
{{- include "desk.common.selectorLabels" (list . $component) | nindent 4 }} {{- include "impress.common.selectorLabels" (list . $component) | nindent 4 }}

20
src/helm/impress/templates/frontend_deployment.yaml
View File

@@ -1,17 +1,17 @@
{{- $envVars := include "desk.common.env" (list . .Values.frontend) -}} {{- $envVars := include "impress.common.env" (list . .Values.frontend) -}}
{{- $fullName := include "desk.frontend.fullname" . -}} {{- $fullName := include "impress.frontend.fullname" . -}}
{{- $component := "frontend" -}} {{- $component := "frontend" -}}
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
name: {{ $fullName }} name: {{ $fullName }}
labels: labels:
{{- include "desk.common.labels" (list . $component) | nindent 4 }} {{- include "impress.common.labels" (list . $component) | nindent 4 }}
spec: spec:
replicas: {{ .Values.frontend.replicas }} replicas: {{ .Values.frontend.replicas }}
selector: selector:
matchLabels: matchLabels:
{{- include "desk.common.selectorLabels" (list . $component) | nindent 6 }} {{- include "impress.common.selectorLabels" (list . $component) | nindent 6 }}
template: template:
metadata: metadata:
annotations: annotations:
@@ -19,11 +19,11 @@ spec:
{{- toYaml . | nindent 8 }} {{- toYaml . | nindent 8 }}
{{- end }} {{- end }}
labels: labels:
{{- include "desk.common.selectorLabels" (list . $component) | nindent 8 }} {{- include "impress.common.selectorLabels" (list . $component) | nindent 8 }}
spec: spec:
{{- if $.Values.image.credentials }} {{- if $.Values.image.credentials }}
imagePullSecrets: 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}} {{- end}}
shareProcessNamespace: {{ .Values.frontend.shareProcessNamespace }} shareProcessNamespace: {{ .Values.frontend.shareProcessNamespace }}
containers: containers:
@@ -55,15 +55,15 @@ spec:
protocol: TCP protocol: TCP
{{- if .Values.frontend.probes.liveness }} {{- if .Values.frontend.probes.liveness }}
livenessProbe: 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 }} {{- end }}
{{- if .Values.frontend.probes.readiness }} {{- if .Values.frontend.probes.readiness }}
readinessProbe: 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 }} {{- end }}
{{- if .Values.frontend.probes.startup }} {{- if .Values.frontend.probes.startup }}
startupProbe: 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 }} {{- end }}
{{- with .Values.frontend.resources }} {{- with .Values.frontend.resources }}
resources: resources:
@@ -101,7 +101,7 @@ spec:
{{- range $index, $value := .Values.mountFiles }} {{- range $index, $value := .Values.mountFiles }}
- name: "files-{{ $index }}" - name: "files-{{ $index }}"
configMap: configMap:
name: "{{ include "desk.fullname" $ }}-files-{{ $index }}" name: "{{ include "impress.fullname" $ }}-files-{{ $index }}"
{{- end }} {{- end }}
{{- range $name, $volume := .Values.frontend.persistence }} {{- range $name, $volume := .Values.frontend.persistence }}
- name: "{{ $name }}" - name: "{{ $name }}"

8
src/helm/impress/templates/frontend_svc.yaml
View File

@@ -1,12 +1,12 @@
{{- $envVars := include "desk.common.env" (list . .Values.frontend) -}} {{- $envVars := include "impress.common.env" (list . .Values.frontend) -}}
{{- $fullName := include "desk.frontend.fullname" . -}} {{- $fullName := include "impress.frontend.fullname" . -}}
{{- $component := "frontend" -}} {{- $component := "frontend" -}}
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
name: {{ $fullName }} name: {{ $fullName }}
labels: labels:
{{- include "desk.common.labels" (list . $component) | nindent 4 }} {{- include "impress.common.labels" (list . $component) | nindent 4 }}
annotations: annotations:
{{- toYaml $.Values.frontend.service.annotations | nindent 4 }} {{- toYaml $.Values.frontend.service.annotations | nindent 4 }}
spec: spec:
@@ -17,4 +17,4 @@ spec:
protocol: TCP protocol: TCP
name: http name: http
selector: selector:
{{- include "desk.common.selectorLabels" (list . $component) | nindent 4 }} {{- include "impress.common.selectorLabels" (list . $component) | nindent 4 }}

20
src/helm/impress/templates/ingress.yaml
View File

@@ -1,5 +1,5 @@
{{- if .Values.ingress.enabled -}} {{- 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 and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
{{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }} {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }}
{{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}} {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}}
@@ -16,7 +16,7 @@ kind: Ingress
metadata: metadata:
name: {{ $fullName }} name: {{ $fullName }}
labels: labels:
{{- include "desk.labels" . | nindent 4 }} {{- include "impress.labels" . | nindent 4 }}
{{- with .Values.ingress.annotations }} {{- with .Values.ingress.annotations }}
annotations: annotations:
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
@@ -52,11 +52,11 @@ spec:
backend: backend:
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
service: service:
name: {{ include "desk.frontend.fullname" . }} name: {{ include "impress.frontend.fullname" . }}
port: port:
number: {{ .Values.frontend.service.port }} number: {{ .Values.frontend.service.port }}
{{- else }} {{- else }}
serviceName: {{ include "desk.frontend.fullname" . }} serviceName: {{ include "impress.frontend.fullname" . }}
servicePort: {{ .Values.frontend.service.port }} servicePort: {{ .Values.frontend.service.port }}
{{- end }} {{- end }}
- path: /api - path: /api
@@ -66,11 +66,11 @@ spec:
backend: backend:
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
service: service:
name: {{ include "desk.backend.fullname" . }} name: {{ include "impress.backend.fullname" . }}
port: port:
number: {{ .Values.backend.service.port }} number: {{ .Values.backend.service.port }}
{{- else }} {{- else }}
serviceName: {{ include "desk.backend.fullname" . }} serviceName: {{ include "impress.backend.fullname" . }}
servicePort: {{ .Values.backend.service.port }} servicePort: {{ .Values.backend.service.port }}
{{- end }} {{- end }}
{{- with .Values.ingress.customBackends }} {{- with .Values.ingress.customBackends }}
@@ -88,11 +88,11 @@ spec:
backend: backend:
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
service: service:
name: {{ include "desk.frontend.fullname" $ }} name: {{ include "impress.frontend.fullname" $ }}
port: port:
number: {{ $.Values.frontend.service.port }} number: {{ $.Values.frontend.service.port }}
{{- else }} {{- else }}
serviceName: {{ include "desk.frontend.fullname" $ }} serviceName: {{ include "impress.frontend.fullname" $ }}
servicePort: {{ $.Values.frontend.service.port }} servicePort: {{ $.Values.frontend.service.port }}
{{- end }} {{- end }}
- path: /api - path: /api
@@ -102,11 +102,11 @@ spec:
backend: backend:
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
service: service:
name: {{ include "desk.backend.fullname" $ }} name: {{ include "impress.backend.fullname" $ }}
port: port:
number: {{ $.Values.backend.service.port }} number: {{ $.Values.backend.service.port }}
{{- else }} {{- else }}
serviceName: {{ include "desk.backend.fullname" $ }} serviceName: {{ include "impress.backend.fullname" $ }}
servicePort: {{ $.Values.backend.service.port }} servicePort: {{ $.Values.backend.service.port }}
{{- end }} {{- end }}
{{- with $.Values.ingress.customBackends }} {{- with $.Values.ingress.customBackends }}

16
src/helm/impress/templates/ingress_admin.yaml
View File

@@ -1,5 +1,5 @@
{{- if .Values.ingressAdmin.enabled -}} {{- 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 and .Values.ingressAdmin.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
{{- if not (hasKey .Values.ingressAdmin.annotations "kubernetes.io/ingress.class") }} {{- if not (hasKey .Values.ingressAdmin.annotations "kubernetes.io/ingress.class") }}
{{- $_ := set .Values.ingressAdmin.annotations "kubernetes.io/ingress.class" .Values.ingressAdmin.className}} {{- $_ := set .Values.ingressAdmin.annotations "kubernetes.io/ingress.class" .Values.ingressAdmin.className}}
@@ -16,7 +16,7 @@ kind: Ingress
metadata: metadata:
name: {{ $fullName }}-admin name: {{ $fullName }}-admin
labels: labels:
{{- include "desk.labels" . | nindent 4 }} {{- include "impress.labels" . | nindent 4 }}
{{- with .Values.ingressAdmin.annotations }} {{- with .Values.ingressAdmin.annotations }}
annotations: annotations:
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
@@ -52,11 +52,11 @@ spec:
backend: backend:
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
service: service:
name: {{ include "desk.backend.fullname" . }} name: {{ include "impress.backend.fullname" . }}
port: port:
number: {{ .Values.backend.service.port }} number: {{ .Values.backend.service.port }}
{{- else }} {{- else }}
serviceName: {{ include "desk.backend.fullname" . }} serviceName: {{ include "impress.backend.fullname" . }}
servicePort: {{ .Values.backend.service.port }} servicePort: {{ .Values.backend.service.port }}
{{- end }} {{- end }}
- path: /static - path: /static
@@ -66,11 +66,11 @@ spec:
backend: backend:
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
service: service:
name: {{ include "desk.backend.fullname" . }} name: {{ include "impress.backend.fullname" . }}
port: port:
number: {{ .Values.backend.service.port }} number: {{ .Values.backend.service.port }}
{{- else }} {{- else }}
serviceName: {{ include "desk.backend.fullname" . }} serviceName: {{ include "impress.backend.fullname" . }}
servicePort: {{ .Values.backend.service.port }} servicePort: {{ .Values.backend.service.port }}
{{- end }} {{- end }}
{{- end }} {{- end }}
@@ -85,11 +85,11 @@ spec:
backend: backend:
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
service: service:
name: {{ include "desk.backend.fullname" $ }} name: {{ include "impress.backend.fullname" $ }}
port: port:
number: {{ $.Values.backend.service.port }} number: {{ $.Values.backend.service.port }}
{{- else }} {{- else }}
serviceName: {{ include "desk.backend.fullname" $ }} serviceName: {{ include "impress.backend.fullname" $ }}
servicePort: {{ $.Values.backend.service.port }} servicePort: {{ $.Values.backend.service.port }}
{{- end }} {{- end }}
{{- end }} {{- end }}

18
src/helm/impress/values.yaml
View File

@@ -1,18 +1,18 @@
# Default values for desk. # Default values for impress.
# This is a YAML-formatted file. # This is a YAML-formatted file.
# Declare variables to be passed into your templates. # Declare variables to be passed into your templates.
## @section General configuration ## @section General configuration
## @param image.repository Repository to use to pull desk's container image ## @param image.repository Repository to use to pull impress's container image
## @param image.tag desk's container tag ## @param image.tag impress's container tag
## @param image.pullPolicy Container image pull policy ## @param image.pullPolicy Container image pull policy
## @extra image.credentials.username Username for container registry authentication ## @extra image.credentials.username Username for container registry authentication
## @extra image.credentials.password Password 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.registry Registry url for which the credentials are specified
## @extra image.credentials.name Name of the generated secret for imagePullSecrets ## @extra image.credentials.name Name of the generated secret for imagePullSecrets
image: image:
repository: lasuite/people-backend repository: lasuite/impress-backend
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
tag: "latest" tag: "latest"
@@ -32,7 +32,7 @@ commonEnvVars: &commonEnvVars
ingress: ingress:
enabled: false enabled: false
className: null className: null
host: desk.example.com host: impress.example.com
path: / path: /
## @param ingress.hosts Additional host to configure for the Ingress ## @param ingress.hosts Additional host to configure for the Ingress
hosts: [] hosts: []
@@ -55,7 +55,7 @@ ingress:
ingressAdmin: ingressAdmin:
enabled: false enabled: false
className: null className: null
host: desk.example.com host: impress.example.com
path: /admin path: /admin
## @param ingressAdmin.hosts Additional host to configure for the Ingress ## @param ingressAdmin.hosts Additional host to configure for the Ingress
hosts: [ ] hosts: [ ]
@@ -175,11 +175,11 @@ backend:
## @section frontend ## @section frontend
frontend: frontend:
## @param frontend.image.repository Repository to use to pull desk's frontend container image ## @param frontend.image.repository Repository to use to pull impress's frontend container image
## @param frontend.image.tag desk's frontend container tag ## @param frontend.image.tag impress's frontend container tag
## @param frontend.image.pullPolicy frontend container image pull policy ## @param frontend.image.pullPolicy frontend container image pull policy
image: image:
repository: lasuite/people-frontend repository: lasuite/impress-frontend
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
tag: "latest" tag: "latest"