From 6f0cb4edc17f78d1a867a54afe598e16c18186b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Herv=C3=A9?= <lherve@takima.fr>
Date: Wed, 28 Jun 2023 15:06:49 +0200
Subject: [PATCH] staged
---
templates/api/api-config.yaml | 4 ++--
templates/api/api-deployment.yaml | 3 +++
templates/database/pg-config.yaml | 2 +-
templates/database/pg-deployment.yaml | 2 ++
templates/front/front-deployment.yaml | 2 ++
values.staging.yaml | 13 +++++++++++++
6 files changed, 23 insertions(+), 3 deletions(-)
create mode 100644 values.staging.yaml
diff --git a/templates/api/api-config.yaml b/templates/api/api-config.yaml
index 1a3ee02..d19846f 100644
--- a/templates/api/api-config.yaml
+++ b/templates/api/api-config.yaml
@@ -4,6 +4,6 @@ kind: ConfigMap
metadata:
name: {{ include "MyAppCtx.fullname" . }}-api-config
data:
- DB_ENDPOINT: "postgres:5432"
- DB_NAME: "{{ .Values.name }}-db"
+ DB_ENDPOINT: "{{ include "MyAppCtx.fullname" . }}-service:5432"
+ DB_NAME: "computerdb-db"
{{- end}}
diff --git a/templates/api/api-deployment.yaml b/templates/api/api-deployment.yaml
index 706f493..276926e 100644
--- a/templates/api/api-deployment.yaml
+++ b/templates/api/api-deployment.yaml
@@ -14,6 +14,9 @@ spec:
metadata:
labels:
app: {{ include "MyAppCtx.fullname" . }}-api
+ annotations:
+ checksum/config: {{ include (print $.Template.BasePath "/api/api-config.yaml") . | sha256sum }}
+ checksum/config-db: {{ include (print $.Template.BasePath "/database/pg-config.yaml") . | sha256sum }}
spec:
securityContext:
runAsUser: 1001
diff --git a/templates/database/pg-config.yaml b/templates/database/pg-config.yaml
index 7c118c9..ad40444 100644
--- a/templates/database/pg-config.yaml
+++ b/templates/database/pg-config.yaml
@@ -4,6 +4,6 @@ kind: ConfigMap
metadata:
name: {{ include "MyAppCtx.fullname" . }}-pg-config
data:
- db_name: "{{ .Values.name }}-db"
+ db_name: "computerdb-db"
db_path: "/var/lib/postgresql/data/pgdata"
{{- end}}
diff --git a/templates/database/pg-deployment.yaml b/templates/database/pg-deployment.yaml
index d6d5524..0dc10cd 100644
--- a/templates/database/pg-deployment.yaml
+++ b/templates/database/pg-deployment.yaml
@@ -14,6 +14,8 @@ spec:
metadata:
labels:
app: {{ include "MyAppCtx.fullname" . }}-pg
+ annotations:
+ checksum/config: {{ include (print $.Template.BasePath "/database/pg-config.yaml") . | sha256sum }}
spec:
containers:
- name: postgres
diff --git a/templates/front/front-deployment.yaml b/templates/front/front-deployment.yaml
index fe164b0..9c28870 100644
--- a/templates/front/front-deployment.yaml
+++ b/templates/front/front-deployment.yaml
@@ -14,6 +14,8 @@ spec:
metadata:
labels:
app: {{ include "MyAppCtx.fullname" . }}-front
+ annotations:
+ checksum/config: {{ include (print $.Template.BasePath "/front/front-config.yaml") . | sha256sum }}
spec:
imagePullSecrets:
- name: takima-school-registry
diff --git a/values.staging.yaml b/values.staging.yaml
new file mode 100644
index 0000000..169b5b3
--- /dev/null
+++ b/values.staging.yaml
@@ -0,0 +1,13 @@
+# Default values for CDB app.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+# We have only done front for now
+nameOverride: cdb-stage
+
+api:
+ ingress:
+ host: api-staging.lherve.takima.school
+
+front:
+ ingress:
+ host: www-staging.lherve.takima.school
\ No newline at end of file
--
GitLab