diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4b69ef0..52bf249 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,7 +11,7 @@ jobs: - name: Build/Push uses: coopTilleuls/action-docker-build-push@v10 with: - IMAGE_NAME: plateformcoop-ebs-php + IMAGE_NAME: plateforme-ebs-php BUILD_CONTEXT: . BUILD_TARGET: app_php REGISTRY_JSON_KEY: ${{ secrets.GITHUB_TOKEN }} @@ -26,7 +26,7 @@ jobs: - name: Build/Push uses: coopTilleuls/action-docker-build-push@v10 with: - IMAGE_NAME: plateformcoop-ebs-caddy + IMAGE_NAME: plateforme-ebs-caddy BUILD_CONTEXT: . BUILD_TARGET: app_caddy REGISTRY_JSON_KEY: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 8389605..7b66316 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -47,7 +47,7 @@ jobs: id: meta run: | set -xo pipefail - PROJECT=plateformcoop-ebs + PROJECT=plateforme-ebs # Tags are deployed in prod CONTEXT=prod ENVIRONMENT=prod diff --git a/helm/chart/Chart.yaml b/helm/chart/Chart.yaml index df55e68..c26efd0 100644 --- a/helm/chart/Chart.yaml +++ b/helm/chart/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -name: plateformcoop-ebs -description: A Helm chart for the PlateformCoop-EBS project -# home: https://plateformcoop-ebs.dev -# icon: https://plateformcoop-ebs.dev/logo-250x250.png +name: plateforme-ebs +description: A Helm chart for the plateforme-EBS project +# home: https://plateforme-ebs.dev +# icon: https://plateforme-ebs.dev/logo-250x250.png # A chart can be either an 'application' or a 'library' chart. # diff --git a/helm/chart/README.md b/helm/chart/README.md index 00aa363..bee0dbc 100644 --- a/helm/chart/README.md +++ b/helm/chart/README.md @@ -6,8 +6,8 @@ to test locally with [minikube](https://minikube.sigs.k8s.io/docs/) minikube start minikube addons enable ingress kubectx minikube -kubectl create ns plateformcoop-ebs -kubens plateformcoop-ebs +kubectl create ns plateforme-ebs +kubens plateforme-ebs ``` get minikube ip via `minikube ip` diff --git a/helm/chart/templates/NOTES.txt b/helm/chart/templates/NOTES.txt index 873860f..059053a 100644 --- a/helm/chart/templates/NOTES.txt +++ b/helm/chart/templates/NOTES.txt @@ -6,16 +6,16 @@ {{- end }} {{- end }} {{- else if contains "NodePort" .Values.service.type }} - export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "plateformcoop-ebs" . }}) + export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "plateforme-ebs" . }}) export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") echo http://$NODE_IP:$NODE_PORT {{- else if contains "LoadBalancer" .Values.service.type }} NOTE: It may take a few minutes for the LoadBalancer IP to be available. - You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "plateformcoop-ebs" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "plateformcoop-ebs" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") + You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "plateforme-ebs" . }}' + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "plateforme-ebs" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") echo http://$SERVICE_IP:{{ .Values.service.port }} {{- else if contains "ClusterIP" .Values.service.type }} - export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "plateformcoop-ebs.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") + export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "plateforme-ebs.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}") echo "Visit http://127.0.0.1:8080 to use your application" kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT diff --git a/helm/chart/templates/_helpers.tpl b/helm/chart/templates/_helpers.tpl index 2d0c2c3..b6a5d3b 100644 --- a/helm/chart/templates/_helpers.tpl +++ b/helm/chart/templates/_helpers.tpl @@ -1,7 +1,7 @@ {{/* Expand the name of the chart. */}} -{{- define "plateformcoop-ebs.name" -}} +{{- define "plateforme-ebs.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 "plateformcoop-ebs" -}} +{{- define "plateforme-ebs" -}} {{- 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 "plateformcoop-ebs.chart" -}} +{{- define "plateforme-ebs.chart" -}} {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} {{- end }} {{/* Common labels */}} -{{- define "plateformcoop-ebs.labels" -}} -helm.sh/chart: {{ include "plateformcoop-ebs.chart" . }} -{{ include "plateformcoop-ebs.selectorLabels" . }} +{{- define "plateforme-ebs.labels" -}} +helm.sh/chart: {{ include "plateforme-ebs.chart" . }} +{{ include "plateforme-ebs.selectorLabels" . }} {{- if .Chart.AppVersion }} app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} {{- end }} @@ -45,9 +45,9 @@ app.kubernetes.io/managed-by: {{ .Release.Service }} {{/* Common labels PWA */}} -{{- define "plateformcoop-ebs.labelsPWA" -}} -helm.sh/chart: {{ include "plateformcoop-ebs.chart" . }} -{{ include "plateformcoop-ebs.selectorLabelsPWA" . }} +{{- define "plateforme-ebs.labelsPWA" -}} +helm.sh/chart: {{ include "plateforme-ebs.chart" . }} +{{ include "plateforme-ebs.selectorLabelsPWA" . }} {{- if .Chart.AppVersion }} app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} {{- end }} @@ -57,35 +57,35 @@ app.kubernetes.io/managed-by: {{ .Release.Service }} {{/* Selector labels */}} -{{- define "plateformcoop-ebs.selectorLabels" -}} -app.kubernetes.io/name: {{ include "plateformcoop-ebs.name" . }} +{{- define "plateforme-ebs.selectorLabels" -}} +app.kubernetes.io/name: {{ include "plateforme-ebs.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} -app.kubernetes.io/part-of: {{ include "plateformcoop-ebs.name" . }} +app.kubernetes.io/part-of: {{ include "plateforme-ebs.name" . }} {{- end }} {{/* Selector labels PWA */}} -{{- define "plateformcoop-ebs.selectorLabelsPWA" -}} -app.kubernetes.io/name: {{ include "plateformcoop-ebs.name" . }}-pwa +{{- define "plateforme-ebs.selectorLabelsPWA" -}} +app.kubernetes.io/name: {{ include "plateforme-ebs.name" . }}-pwa app.kubernetes.io/instance: {{ .Release.Name }} -app.kubernetes.io/part-of: {{ include "plateformcoop-ebs.name" . }} +app.kubernetes.io/part-of: {{ include "plateforme-ebs.name" . }} {{- end }} {{/* Selector labels Fixtures job */}} -{{- define "plateformcoop-ebs.selectorLabelsFixtures" -}} -app.kubernetes.io/name: {{ include "plateformcoop-ebs.name" . }}-pwa +{{- define "plateforme-ebs.selectorLabelsFixtures" -}} +app.kubernetes.io/name: {{ include "plateforme-ebs.name" . }}-pwa app.kubernetes.io/instance: {{ .Release.Name }} {{- end }} {{/* Create the name of the service account to use */}} -{{- define "plateformcoop-ebs.serviceAccountName" -}} +{{- define "plateforme-ebs.serviceAccountName" -}} {{- if .Values.serviceAccount.create }} -{{- default (include "plateformcoop-ebs" .) .Values.serviceAccount.name }} +{{- default (include "plateforme-ebs" .) .Values.serviceAccount.name }} {{- else }} {{- default "default" .Values.serviceAccount.name }} {{- end }} diff --git a/helm/chart/templates/configmap.yaml b/helm/chart/templates/configmap.yaml index 2d8a088..f15cbd2 100644 --- a/helm/chart/templates/configmap.yaml +++ b/helm/chart/templates/configmap.yaml @@ -1,9 +1,9 @@ apiVersion: v1 kind: ConfigMap metadata: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} labels: - {{- include "plateformcoop-ebs.labels" . | nindent 4 }} + {{- include "plateforme-ebs.labels" . | nindent 4 }} data: payum-gateway: {{ .Values.payum.gateway | quote }} php-host: {{ .Values.php.host | quote }} @@ -12,7 +12,7 @@ data: php-cors-allow-origin: {{ .Values.php.corsAllowOrigin | quote }} php-trusted-hosts: {{ .Values.php.trustedHosts | quote }} php-trusted-proxies: "{{ join "," .Values.php.trustedProxies }}" - mercure-url: "http://{{ include "plateformcoop-ebs" . }}/.well-known/mercure" + mercure-url: "http://{{ include "plateforme-ebs" . }}/.well-known/mercure" mercure-public-url: {{ .Values.mercure.publicUrl | default "http://127.0.0.1/.well-known/mercure" | quote }} mercure-extra-directives: {{ .Values.mercure.extraDirectives | quote }} {{- if .Values.meilisearch.enabled }} diff --git a/helm/chart/templates/cronjob-fixture-reset.yaml b/helm/chart/templates/cronjob-fixture-reset.yaml index 7074ecb..fa244e2 100644 --- a/helm/chart/templates/cronjob-fixture-reset.yaml +++ b/helm/chart/templates/cronjob-fixture-reset.yaml @@ -1,9 +1,9 @@ apiVersion: batch/v1 kind: CronJob metadata: - name: {{ include "plateformcoop-ebs" . }}-fixture-reset + name: {{ include "plateforme-ebs" . }}-fixture-reset labels: - {{- include "plateformcoop-ebs.labels" . | nindent 4 }} + {{- include "plateforme-ebs.labels" . | nindent 4 }} spec: schedule: '0 0 * * *' jobTemplate: @@ -11,7 +11,7 @@ spec: annotations: rollme: {{ randAlphaNum 5 | quote }} labels: - {{- include "plateformcoop-ebs.selectorLabels" . | nindent 8 }} + {{- include "plateforme-ebs.selectorLabels" . | nindent 8 }} spec: template: spec: @@ -19,7 +19,7 @@ spec: imagePullSecrets: {{- toYaml . | nindent 12 }} {{- end }} - serviceAccountName: {{ include "plateformcoop-ebs.serviceAccountName" . }} + serviceAccountName: {{ include "plateforme-ebs.serviceAccountName" . }} restartPolicy: Never containers: - name: {{ .Chart.Name }}-cronjob-notify-ms-e-7 @@ -39,77 +39,77 @@ spec: - name: API_ENTRYPOINT_HOST valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-host - name: JWT_PASSPHRASE valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-jwt-passphrase - name: JWT_PUBLIC_KEY valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-jwt-public-key - name: JWT_SECRET_KEY valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-jwt-secret-key - name: TRUSTED_HOSTS valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-trusted-hosts - name: TRUSTED_PROXIES valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-trusted-proxies - name: APP_ENV valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-app-env - name: APP_DEBUG valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-app-debug - name: APP_SECRET valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-app-secret - name: CORS_ALLOW_ORIGIN valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-cors-allow-origin - name: DATABASE_URL valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: database-url - name: MAILER_DSN valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: mailer-dsn - name: MERCURE_URL valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: mercure-url - name: MERCURE_PUBLIC_URL valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: mercure-public-url - name: MERCURE_JWT_SECRET valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: mercure-jwt-secret {{- if .Values.meilisearch.enabled }} - name: MEILISEARCH_API_KEY @@ -120,60 +120,60 @@ spec: - name: MEILISEARCH_URL valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: meilisearch-url {{- end }} {{- if .Values.redis.enabled }} - name: REDIS_URL valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: redis-url {{- end }} - name: SMS_DSN valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: sms-dsn - name: PAYUM_APIKEY valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: payum-apikey - name: PAYUM_GATEWAY valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: payum-gateway - name: STORAGE_BUCKET valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-storage-bucket - name: STORAGE_ENDPOINT valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-storage-endpoint - name: STORAGE_REGION valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-storage-region - name: STORAGE_USE_PATH_STYLE_ENDPOINT valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-storage-use-path-style-endpoint - name: STORAGE_KEY valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-storage-key - name: STORAGE_SECRET valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-storage-secret lifecycle: preStop: diff --git a/helm/chart/templates/cronjobs/cronjobEndMembership.yaml b/helm/chart/templates/cronjobs/cronjobEndMembership.yaml index 5bef8b7..e94f215 100644 --- a/helm/chart/templates/cronjobs/cronjobEndMembership.yaml +++ b/helm/chart/templates/cronjobs/cronjobEndMembership.yaml @@ -2,9 +2,9 @@ apiVersion: batch/v1 kind: CronJob metadata: - name: {{ include "plateformcoop-ebs" . }}-cronjob-end-membership + name: {{ include "plateforme-ebs" . }}-cronjob-end-membership labels: - {{- include "plateformcoop-ebs.labels" . | nindent 4 }} + {{- include "plateforme-ebs.labels" . | nindent 4 }} spec: schedule: '6 1 * * *' jobTemplate: @@ -12,7 +12,7 @@ spec: annotations: rollme: {{ randAlphaNum 5 | quote }} labels: - {{- include "plateformcoop-ebs.selectorLabels" . | nindent 8 }} + {{- include "plateforme-ebs.selectorLabels" . | nindent 8 }} spec: template: spec: @@ -20,7 +20,7 @@ spec: imagePullSecrets: {{- toYaml . | nindent 12 }} {{- end }} - serviceAccountName: {{ include "plateformcoop-ebs.serviceAccountName" . }} + serviceAccountName: {{ include "plateforme-ebs.serviceAccountName" . }} restartPolicy: Never containers: - name: {{ .Chart.Name }}-cronjob-end-membership @@ -32,32 +32,32 @@ spec: - name: API_ENTRYPOINT_HOST valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-host - name: JWT_PASSPHRASE valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-jwt-passphrase - name: JWT_PUBLIC_KEY valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-jwt-public-key - name: JWT_SECRET_KEY valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-jwt-secret-key - name: TRUSTED_HOSTS valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-trusted-hosts - name: TRUSTED_PROXIES valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-trusted-proxies - name: APP_ENV value: "prod" @@ -66,62 +66,62 @@ spec: - name: APP_SECRET valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-app-secret - name: CORS_ALLOW_ORIGIN valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-cors-allow-origin - name: DATABASE_URL valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: database-url - name: MERCURE_URL valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: mercure-url - name: MERCURE_PUBLIC_URL valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: mercure-public-url - name: MERCURE_JWT_SECRET valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: mercure-jwt-secret - name: STORAGE_BUCKET valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-storage-bucket - name: STORAGE_ENDPOINT valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-storage-endpoint - name: STORAGE_REGION valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-storage-region - name: STORAGE_USE_PATH_STYLE_ENDPOINT valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-storage-use-path-style-endpoint - name: STORAGE_KEY valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-storage-key - name: STORAGE_SECRET valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-storage-secret lifecycle: preStop: diff --git a/helm/chart/templates/cronjobs/cronjobNotifyMembershipExpiration1.yaml b/helm/chart/templates/cronjobs/cronjobNotifyMembershipExpiration1.yaml index c783b9a..e7324b0 100644 --- a/helm/chart/templates/cronjobs/cronjobNotifyMembershipExpiration1.yaml +++ b/helm/chart/templates/cronjobs/cronjobNotifyMembershipExpiration1.yaml @@ -2,9 +2,9 @@ apiVersion: batch/v1 kind: CronJob metadata: - name: {{ include "plateformcoop-ebs" . }}-cronjob-notify-ms-e-1 + name: {{ include "plateforme-ebs" . }}-cronjob-notify-ms-e-1 labels: - {{- include "plateformcoop-ebs.labels" . | nindent 4 }} + {{- include "plateforme-ebs.labels" . | nindent 4 }} spec: schedule: '12 2 * * *' jobTemplate: @@ -12,7 +12,7 @@ spec: annotations: rollme: {{ randAlphaNum 5 | quote }} labels: - {{- include "plateformcoop-ebs.selectorLabels" . | nindent 8 }} + {{- include "plateforme-ebs.selectorLabels" . | nindent 8 }} spec: template: spec: @@ -20,7 +20,7 @@ spec: imagePullSecrets: {{- toYaml . | nindent 12 }} {{- end }} - serviceAccountName: {{ include "plateformcoop-ebs.serviceAccountName" . }} + serviceAccountName: {{ include "plateforme-ebs.serviceAccountName" . }} restartPolicy: Never containers: - name: {{ .Chart.Name }}-cronjob-notify-ms-e-1 @@ -32,32 +32,32 @@ spec: - name: API_ENTRYPOINT_HOST valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-host - name: JWT_PASSPHRASE valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-jwt-passphrase - name: JWT_PUBLIC_KEY valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-jwt-public-key - name: JWT_SECRET_KEY valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-jwt-secret-key - name: TRUSTED_HOSTS valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-trusted-hosts - name: TRUSTED_PROXIES valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-trusted-proxies - name: APP_ENV value: "prod" @@ -66,62 +66,62 @@ spec: - name: APP_SECRET valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-app-secret - name: CORS_ALLOW_ORIGIN valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-cors-allow-origin - name: DATABASE_URL valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: database-url - name: MERCURE_URL valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: mercure-url - name: MERCURE_PUBLIC_URL valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: mercure-public-url - name: MERCURE_JWT_SECRET valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: mercure-jwt-secret - name: STORAGE_BUCKET valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-storage-bucket - name: STORAGE_ENDPOINT valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-storage-endpoint - name: STORAGE_REGION valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-storage-region - name: STORAGE_USE_PATH_STYLE_ENDPOINT valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-storage-use-path-style-endpoint - name: STORAGE_KEY valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-storage-key - name: STORAGE_SECRET valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-storage-secret lifecycle: preStop: diff --git a/helm/chart/templates/cronjobs/cronjobNotifyMembershipExpiration7.yaml b/helm/chart/templates/cronjobs/cronjobNotifyMembershipExpiration7.yaml index 400b9e5..44f2f0e 100644 --- a/helm/chart/templates/cronjobs/cronjobNotifyMembershipExpiration7.yaml +++ b/helm/chart/templates/cronjobs/cronjobNotifyMembershipExpiration7.yaml @@ -2,9 +2,9 @@ apiVersion: batch/v1 kind: CronJob metadata: - name: {{ include "plateformcoop-ebs" . }}-cronjob-notify-ms-e-7 + name: {{ include "plateforme-ebs" . }}-cronjob-notify-ms-e-7 labels: - {{- include "plateformcoop-ebs.labels" . | nindent 4 }} + {{- include "plateforme-ebs.labels" . | nindent 4 }} spec: schedule: '3 21 * * *' jobTemplate: @@ -12,7 +12,7 @@ spec: annotations: rollme: {{ randAlphaNum 5 | quote }} labels: - {{- include "plateformcoop-ebs.selectorLabels" . | nindent 8 }} + {{- include "plateforme-ebs.selectorLabels" . | nindent 8 }} spec: template: spec: @@ -20,7 +20,7 @@ spec: imagePullSecrets: {{- toYaml . | nindent 12 }} {{- end }} - serviceAccountName: {{ include "plateformcoop-ebs.serviceAccountName" . }} + serviceAccountName: {{ include "plateforme-ebs.serviceAccountName" . }} restartPolicy: Never containers: - name: {{ .Chart.Name }}-cronjob-notify-ms-e-7 @@ -32,32 +32,32 @@ spec: - name: API_ENTRYPOINT_HOST valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-host - name: JWT_PASSPHRASE valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-jwt-passphrase - name: JWT_PUBLIC_KEY valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-jwt-public-key - name: JWT_SECRET_KEY valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-jwt-secret-key - name: TRUSTED_HOSTS valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-trusted-hosts - name: TRUSTED_PROXIES valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-trusted-proxies - name: APP_ENV value: "prod" @@ -66,62 +66,62 @@ spec: - name: APP_SECRET valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-app-secret - name: CORS_ALLOW_ORIGIN valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-cors-allow-origin - name: DATABASE_URL valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: database-url - name: MERCURE_URL valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: mercure-url - name: MERCURE_PUBLIC_URL valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: mercure-public-url - name: MERCURE_JWT_SECRET valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: mercure-jwt-secret - name: STORAGE_BUCKET valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-storage-bucket - name: STORAGE_ENDPOINT valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-storage-endpoint - name: STORAGE_REGION valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-storage-region - name: STORAGE_USE_PATH_STYLE_ENDPOINT valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-storage-use-path-style-endpoint - name: STORAGE_KEY valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-storage-key - name: STORAGE_SECRET valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-storage-secret lifecycle: preStop: diff --git a/helm/chart/templates/cronjobs/cronjobNotifyServiceRequestDatesEnd.yaml b/helm/chart/templates/cronjobs/cronjobNotifyServiceRequestDatesEnd.yaml index 8431875..19079e9 100644 --- a/helm/chart/templates/cronjobs/cronjobNotifyServiceRequestDatesEnd.yaml +++ b/helm/chart/templates/cronjobs/cronjobNotifyServiceRequestDatesEnd.yaml @@ -2,9 +2,9 @@ apiVersion: batch/v1 kind: CronJob metadata: - name: {{ include "plateformcoop-ebs" . }}-cronjob-notify-srq-end + name: {{ include "plateforme-ebs" . }}-cronjob-notify-srq-end labels: - {{- include "plateformcoop-ebs.labels" . | nindent 4 }} + {{- include "plateforme-ebs.labels" . | nindent 4 }} spec: schedule: '44 4 * * *' jobTemplate: @@ -12,7 +12,7 @@ spec: annotations: rollme: {{ randAlphaNum 5 | quote }} labels: - {{- include "plateformcoop-ebs.selectorLabels" . | nindent 8 }} + {{- include "plateforme-ebs.selectorLabels" . | nindent 8 }} spec: template: spec: @@ -20,7 +20,7 @@ spec: imagePullSecrets: {{- toYaml . | nindent 12 }} {{- end }} - serviceAccountName: {{ include "plateformcoop-ebs.serviceAccountName" . }} + serviceAccountName: {{ include "plateforme-ebs.serviceAccountName" . }} restartPolicy: Never containers: - name: {{ .Chart.Name }}-cronjob-notify-srq-end @@ -32,32 +32,32 @@ spec: - name: API_ENTRYPOINT_HOST valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-host - name: JWT_PASSPHRASE valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-jwt-passphrase - name: JWT_PUBLIC_KEY valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-jwt-public-key - name: JWT_SECRET_KEY valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-jwt-secret-key - name: TRUSTED_HOSTS valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-trusted-hosts - name: TRUSTED_PROXIES valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-trusted-proxies - name: APP_ENV value: "prod" @@ -66,62 +66,62 @@ spec: - name: APP_SECRET valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-app-secret - name: CORS_ALLOW_ORIGIN valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-cors-allow-origin - name: DATABASE_URL valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: database-url - name: MERCURE_URL valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: mercure-url - name: MERCURE_PUBLIC_URL valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: mercure-public-url - name: MERCURE_JWT_SECRET valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: mercure-jwt-secret - name: STORAGE_BUCKET valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-storage-bucket - name: STORAGE_ENDPOINT valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-storage-endpoint - name: STORAGE_REGION valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-storage-region - name: STORAGE_USE_PATH_STYLE_ENDPOINT valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-storage-use-path-style-endpoint - name: STORAGE_KEY valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-storage-key - name: STORAGE_SECRET valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-storage-secret lifecycle: preStop: diff --git a/helm/chart/templates/cronjobs/cronjobNotifyServiceRequestDatesStart.yaml b/helm/chart/templates/cronjobs/cronjobNotifyServiceRequestDatesStart.yaml index d362f62..8b434c1 100644 --- a/helm/chart/templates/cronjobs/cronjobNotifyServiceRequestDatesStart.yaml +++ b/helm/chart/templates/cronjobs/cronjobNotifyServiceRequestDatesStart.yaml @@ -2,9 +2,9 @@ apiVersion: batch/v1 kind: CronJob metadata: - name: {{ include "plateformcoop-ebs" . }}-cronjob-notify-srq-start + name: {{ include "plateforme-ebs" . }}-cronjob-notify-srq-start labels: - {{- include "plateformcoop-ebs.labels" . | nindent 4 }} + {{- include "plateforme-ebs.labels" . | nindent 4 }} spec: schedule: '2 4 * * *' jobTemplate: @@ -12,7 +12,7 @@ spec: annotations: rollme: {{ randAlphaNum 5 | quote }} labels: - {{- include "plateformcoop-ebs.selectorLabels" . | nindent 8 }} + {{- include "plateforme-ebs.selectorLabels" . | nindent 8 }} spec: template: spec: @@ -20,7 +20,7 @@ spec: imagePullSecrets: {{- toYaml . | nindent 12 }} {{- end }} - serviceAccountName: {{ include "plateformcoop-ebs.serviceAccountName" . }} + serviceAccountName: {{ include "plateforme-ebs.serviceAccountName" . }} restartPolicy: Never containers: - name: {{ .Chart.Name }}-cronjob-notify-srq-start @@ -32,32 +32,32 @@ spec: - name: API_ENTRYPOINT_HOST valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-host - name: JWT_PASSPHRASE valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-jwt-passphrase - name: JWT_PUBLIC_KEY valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-jwt-public-key - name: JWT_SECRET_KEY valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-jwt-secret-key - name: TRUSTED_HOSTS valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-trusted-hosts - name: TRUSTED_PROXIES valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-trusted-proxies - name: APP_ENV value: "prod" @@ -66,62 +66,62 @@ spec: - name: APP_SECRET valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-app-secret - name: CORS_ALLOW_ORIGIN valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-cors-allow-origin - name: DATABASE_URL valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: database-url - name: MERCURE_URL valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: mercure-url - name: MERCURE_PUBLIC_URL valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: mercure-public-url - name: MERCURE_JWT_SECRET valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: mercure-jwt-secret - name: STORAGE_BUCKET valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-storage-bucket - name: STORAGE_ENDPOINT valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-storage-endpoint - name: STORAGE_REGION valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-storage-region - name: STORAGE_USE_PATH_STYLE_ENDPOINT valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-storage-use-path-style-endpoint - name: STORAGE_KEY valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-storage-key - name: STORAGE_SECRET valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-storage-secret lifecycle: preStop: diff --git a/helm/chart/templates/deployment.yaml b/helm/chart/templates/deployment.yaml index de00972..105f11c 100644 --- a/helm/chart/templates/deployment.yaml +++ b/helm/chart/templates/deployment.yaml @@ -1,16 +1,16 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} labels: - {{- include "plateformcoop-ebs.labels" . | nindent 4 }} + {{- include "plateforme-ebs.labels" . | nindent 4 }} spec: {{- if not .Values.autoscaling.enabled }} replicas: {{ .Values.replicaCount }} {{- end }} selector: matchLabels: - {{- include "plateformcoop-ebs.selectorLabels" . | nindent 6 }} + {{- include "plateforme-ebs.selectorLabels" . | nindent 6 }} template: metadata: {{- with .Values.podAnnotations }} @@ -18,13 +18,13 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} labels: - {{- include "plateformcoop-ebs.selectorLabels" . | nindent 8 }} + {{- include "plateforme-ebs.selectorLabels" . | nindent 8 }} spec: {{- with .Values.imagePullSecrets }} imagePullSecrets: {{- toYaml . | nindent 8 }} {{- end }} - serviceAccountName: {{ include "plateformcoop-ebs.serviceAccountName" . }} + serviceAccountName: {{ include "plateforme-ebs.serviceAccountName" . }} securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }} initContainers: @@ -48,21 +48,21 @@ spec: - name: SERVER_NAME value: :80 - name: PWA_UPSTREAM - value: {{ include "plateformcoop-ebs" . }}-pwa:3000 + value: {{ include "plateforme-ebs" . }}-pwa:3000 - name: MERCURE_EXTRA_DIRECTIVES valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: mercure-extra-directives - name: MERCURE_PUBLISHER_JWT_KEY valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: mercure-jwt-secret - name: MERCURE_SUBSCRIBER_JWT_KEY valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: mercure-jwt-secret ports: - name: http @@ -99,77 +99,77 @@ spec: - name: API_ENTRYPOINT_HOST valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-host - name: JWT_PASSPHRASE valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-jwt-passphrase - name: JWT_PUBLIC_KEY valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-jwt-public-key - name: JWT_SECRET_KEY valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-jwt-secret-key - name: TRUSTED_HOSTS valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-trusted-hosts - name: TRUSTED_PROXIES valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-trusted-proxies - name: APP_ENV valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-app-env - name: APP_DEBUG valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-app-debug - name: APP_SECRET valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-app-secret - name: CORS_ALLOW_ORIGIN valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-cors-allow-origin - name: DATABASE_URL valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: database-url - name: MAILER_DSN valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: mailer-dsn - name: MERCURE_URL valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: mercure-url - name: MERCURE_PUBLIC_URL valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: mercure-public-url - name: MERCURE_JWT_SECRET valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: mercure-jwt-secret {{- if .Values.meilisearch.enabled }} - name: MEILISEARCH_API_KEY @@ -180,60 +180,60 @@ spec: - name: MEILISEARCH_URL valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: meilisearch-url {{- end }} {{- if .Values.redis.enabled }} - name: REDIS_URL valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: redis-url {{- end }} - name: SMS_DSN valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: sms-dsn - name: PAYUM_APIKEY valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: payum-apikey - name: PAYUM_GATEWAY valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: payum-gateway - name: STORAGE_BUCKET valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-storage-bucket - name: STORAGE_ENDPOINT valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-storage-endpoint - name: STORAGE_REGION valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-storage-region - name: STORAGE_USE_PATH_STYLE_ENDPOINT valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-storage-use-path-style-endpoint - name: STORAGE_KEY valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-storage-key - name: STORAGE_SECRET valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-storage-secret volumeMounts: - mountPath: /srv/app/public/storage @@ -270,72 +270,72 @@ spec: - name: API_ENTRYPOINT_HOST valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-host - name: JWT_PASSPHRASE valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-jwt-passphrase - name: JWT_PUBLIC_KEY valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-jwt-public-key - name: JWT_SECRET_KEY valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-jwt-secret-key - name: TRUSTED_HOSTS valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-trusted-hosts - name: TRUSTED_PROXIES valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-trusted-proxies - name: APP_ENV valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-app-env - name: APP_DEBUG valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-app-debug - name: APP_SECRET valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-app-secret - name: CORS_ALLOW_ORIGIN valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-cors-allow-origin - name: DATABASE_URL valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: database-url - name: MERCURE_URL valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: mercure-url - name: MERCURE_PUBLIC_URL valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: mercure-public-url - name: MERCURE_JWT_SECRET valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: mercure-jwt-secret startupProbe: exec: diff --git a/helm/chart/templates/fixtures-job.yaml b/helm/chart/templates/fixtures-job.yaml index d142b13..45f9245 100644 --- a/helm/chart/templates/fixtures-job.yaml +++ b/helm/chart/templates/fixtures-job.yaml @@ -1,9 +1,9 @@ apiVersion: batch/v1 kind: Job metadata: - name: {{ include "plateformcoop-ebs" . }}-fixtures + name: {{ include "plateforme-ebs" . }}-fixtures labels: - {{- include "plateformcoop-ebs.labels" . | nindent 4 }} + {{- include "plateforme-ebs.labels" . | nindent 4 }} annotations: "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-delete-policy": "before-hook-creation" @@ -13,13 +13,13 @@ spec: annotations: rollme: {{ randAlphaNum 5 | quote }} labels: - {{- include "plateformcoop-ebs.selectorLabelsFixtures" . | nindent 8 }} + {{- include "plateforme-ebs.selectorLabelsFixtures" . | nindent 8 }} spec: {{- with .Values.imagePullSecrets }} imagePullSecrets: {{- toYaml . | nindent 8 }} {{- end }} - serviceAccountName: {{ include "plateformcoop-ebs.serviceAccountName" . }} + serviceAccountName: {{ include "plateforme-ebs.serviceAccountName" . }} securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }} restartPolicy: Never @@ -48,72 +48,72 @@ spec: - name: API_ENTRYPOINT_HOST valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-host - name: JWT_PASSPHRASE valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-jwt-passphrase - name: JWT_PUBLIC_KEY valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-jwt-public-key - name: JWT_SECRET_KEY valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-jwt-secret-key - name: TRUSTED_HOSTS valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-trusted-hosts - name: TRUSTED_PROXIES valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-trusted-proxies - name: APP_ENV valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-app-env - name: APP_DEBUG valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-app-debug - name: APP_SECRET valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-app-secret - name: CORS_ALLOW_ORIGIN valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-cors-allow-origin - name: DATABASE_URL valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: database-url - name: MERCURE_URL valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: mercure-url - name: MERCURE_PUBLIC_URL valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: mercure-public-url - name: MERCURE_JWT_SECRET valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: mercure-jwt-secret {{- if .Values.meilisearch.enabled }} - name: MEILISEARCH_API_KEY @@ -124,55 +124,55 @@ spec: - name: MEILISEARCH_URL valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: meilisearch-url {{- end }} {{- if .Values.redis.enabled }} - name: REDIS_URL valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: redis-url {{- end }} - name: PAYUM_APIKEY valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: payum-apikey - name: PAYUM_GATEWAY valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: payum-gateway - name: STORAGE_BUCKET valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-storage-bucket - name: STORAGE_ENDPOINT valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-storage-endpoint - name: STORAGE_REGION valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-storage-region - name: STORAGE_USE_PATH_STYLE_ENDPOINT valueFrom: configMapKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-storage-use-path-style-endpoint - name: STORAGE_KEY valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-storage-key - name: STORAGE_SECRET valueFrom: secretKeyRef: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} key: php-storage-secret lifecycle: preStop: diff --git a/helm/chart/templates/hpa.yaml b/helm/chart/templates/hpa.yaml index d62b748..ff2249f 100644 --- a/helm/chart/templates/hpa.yaml +++ b/helm/chart/templates/hpa.yaml @@ -2,14 +2,14 @@ apiVersion: autoscaling/v2beta1 kind: HorizontalPodAutoscaler metadata: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} labels: - {{- include "plateformcoop-ebs.labels" . | nindent 4 }} + {{- include "plateforme-ebs.labels" . | nindent 4 }} spec: scaleTargetRef: apiVersion: apps/v1 kind: Deployment - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} minReplicas: {{ .Values.autoscaling.minReplicas }} maxReplicas: {{ .Values.autoscaling.maxReplicas }} metrics: diff --git a/helm/chart/templates/ingress.yaml b/helm/chart/templates/ingress.yaml index 709664d..f72bf02 100644 --- a/helm/chart/templates/ingress.yaml +++ b/helm/chart/templates/ingress.yaml @@ -1,5 +1,5 @@ {{- if .Values.ingress.enabled -}} -{{- $fullName := include "plateformcoop-ebs" . -}} +{{- $fullName := include "plateforme-ebs" . -}} {{- $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") }} @@ -17,7 +17,7 @@ kind: Ingress metadata: name: {{ $fullName }} labels: - {{- include "plateformcoop-ebs.labels" . | nindent 4 }} + {{- include "plateforme-ebs.labels" . | nindent 4 }} {{- with .Values.ingress.annotations }} annotations: {{- toYaml . | nindent 4 }} diff --git a/helm/chart/templates/secrets.yaml b/helm/chart/templates/secrets.yaml index 10f4d72..3efba32 100644 --- a/helm/chart/templates/secrets.yaml +++ b/helm/chart/templates/secrets.yaml @@ -1,9 +1,9 @@ apiVersion: v1 kind: Secret metadata: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} labels: - {{- include "plateformcoop-ebs.labels" . | nindent 4 }} + {{- include "plateforme-ebs.labels" . | nindent 4 }} type: Opaque data: {{- if .Values.postgresql.enabled }} diff --git a/helm/chart/templates/service.yaml b/helm/chart/templates/service.yaml index 5cc67a1..280956f 100644 --- a/helm/chart/templates/service.yaml +++ b/helm/chart/templates/service.yaml @@ -1,9 +1,9 @@ apiVersion: v1 kind: Service metadata: - name: {{ include "plateformcoop-ebs" . }} + name: {{ include "plateforme-ebs" . }} labels: - {{- include "plateformcoop-ebs.labels" . | nindent 4 }} + {{- include "plateforme-ebs.labels" . | nindent 4 }} spec: type: {{ .Values.service.type }} ports: @@ -12,4 +12,4 @@ spec: protocol: TCP name: http selector: - {{- include "plateformcoop-ebs.selectorLabels" . | nindent 4 }} + {{- include "plateforme-ebs.selectorLabels" . | nindent 4 }} diff --git a/helm/chart/templates/serviceaccount.yaml b/helm/chart/templates/serviceaccount.yaml index da060f6..ecd747c 100644 --- a/helm/chart/templates/serviceaccount.yaml +++ b/helm/chart/templates/serviceaccount.yaml @@ -2,9 +2,9 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: {{ include "plateformcoop-ebs.serviceAccountName" . }} + name: {{ include "plateforme-ebs.serviceAccountName" . }} labels: - {{- include "plateformcoop-ebs.labels" . | nindent 4 }} + {{- include "plateforme-ebs.labels" . | nindent 4 }} {{- with .Values.serviceAccount.annotations }} annotations: {{- toYaml . | nindent 4 }} diff --git a/helm/chart/templates/tests/test-connection.yaml b/helm/chart/templates/tests/test-connection.yaml index 020d31e..0e25aa7 100644 --- a/helm/chart/templates/tests/test-connection.yaml +++ b/helm/chart/templates/tests/test-connection.yaml @@ -1,9 +1,9 @@ apiVersion: v1 kind: Pod metadata: - name: "{{ include "plateformcoop-ebs" . }}-test-connection" + name: "{{ include "plateforme-ebs" . }}-test-connection" labels: - {{- include "plateformcoop-ebs.labels" . | nindent 4 }} + {{- include "plateforme-ebs.labels" . | nindent 4 }} annotations: "helm.sh/hook": test spec: @@ -11,5 +11,5 @@ spec: - name: wget image: busybox command: ['wget'] - args: ['{{ include "plateformcoop-ebs" . }}:{{ .Values.service.port }}'] + args: ['{{ include "plateforme-ebs" . }}:{{ .Values.service.port }}'] restartPolicy: Never diff --git a/helm/chart/test_minikube.sh b/helm/chart/test_minikube.sh index acbf009..1271385 100755 --- a/helm/chart/test_minikube.sh +++ b/helm/chart/test_minikube.sh @@ -8,22 +8,22 @@ cd $(dirname $0)/../../ docker compose -f docker-compose.yml build # tag image with sha to force rollingUpdate -php_sha=$(docker inspect plateformcoop-ebs-php --format='{{.Id}}' | cut -d: -f2) -caddy_sha=$(docker inspect plateformcoop-ebs-caddy --format='{{.Id}}' | cut -d: -f2) -docker tag plateformcoop-ebs-php plateformcoop-ebs-php:$php_sha -docker tag plateformcoop-ebs-caddy plateformcoop-ebs-caddy:$caddy_sha +php_sha=$(docker inspect plateforme-ebs-php --format='{{.Id}}' | cut -d: -f2) +caddy_sha=$(docker inspect plateforme-ebs-caddy --format='{{.Id}}' | cut -d: -f2) +docker tag plateforme-ebs-php plateforme-ebs-php:$php_sha +docker tag plateforme-ebs-caddy plateforme-ebs-caddy:$caddy_sha # push images to minikube -#minikube image load plateformcoop-ebs-php:$php_sha -#minikube image load plateformcoop-ebs-caddy:$caddy_sha -for image in plateformcoop-ebs-php:$php_sha plateformcoop-ebs-caddy:$caddy_sha; do +#minikube image load plateforme-ebs-php:$php_sha +#minikube image load plateforme-ebs-caddy:$caddy_sha +for image in plateforme-ebs-php:$php_sha plateforme-ebs-caddy:$caddy_sha; do minikube image ls | grep $image || minikube image load $image done # install or update deployment on minikube helm upgrade --install demo ./helm/chart \ --kube-context minikube \ - --namespace plateformcoop-ebs --create-namespace \ + --namespace plateforme-ebs --create-namespace \ --atomic \ --wait \ --debug \ diff --git a/helm/chart/values-minikube.yml b/helm/chart/values-minikube.yml index 5acd85e..3f3a035 100644 --- a/helm/chart/values-minikube.yml +++ b/helm/chart/values-minikube.yml @@ -28,7 +28,7 @@ maildev: php: image: - repository: plateformcoop-ebs-php + repository: plateforme-ebs-php tag: latest storage: bucket: "toto" @@ -40,5 +40,5 @@ php: caddy: image: - repository: plateformcoop-ebs-caddy + repository: plateforme-ebs-caddy tag: latest diff --git a/helm/chart/values.yaml b/helm/chart/values.yaml index 00fb6e6..d9a56fe 100644 --- a/helm/chart/values.yaml +++ b/helm/chart/values.yaml @@ -1,10 +1,10 @@ -# Default values for plateformcoop-ebs. +# Default values for plateforme-ebs. # This is a YAML-formatted file. # Declare variables to be passed into your templates. php: image: - repository: "ghcr.io/apes-hdf/plateformcoop-ebs-php" # CHANGE ME + repository: "ghcr.io/apes-hdf/plateforme-ebs-php" # CHANGE ME pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. tag: "" @@ -50,7 +50,7 @@ consumer: caddy: image: - repository: "ghcr.io/apes-hdf/plateformcoop-ebs-caddy" # CHANGE ME + repository: "ghcr.io/apes-hdf/plateforme-ebs-caddy" # CHANGE ME pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. tag: "" @@ -66,7 +66,7 @@ mercure: postgresql: enabled: true # If bringing your own PostgreSQL, the full uri to use - # url: postgresql://plateformcoop-ebs:!ChangeMe!@database:5432/api?serverVersion=13&charset=utf8 + # url: postgresql://plateforme-ebs:!ChangeMe!@database:5432/api?serverVersion=13&charset=utf8 global: postgresql: auth: