From 75d27180621dd7426cfddb3d05acbde80edda0b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20S=C3=A9journ=C3=A9?= <asejourne@takima.fr>
Date: Wed, 2 Aug 2023 15:44:02 +0200
Subject: [PATCH] templating du nom avec la version 2
---
api/api-config.yml | 6 ----
api/api-deployment.yml | 50 ------------------------------
api/api-ingress.yml | 18 -----------
api/api-service.yml | 11 -------
pg-operator/operator.yml | 17 ----------
pg/database-service.yml | 11 -------
pg/database-stateful-set.yml | 60 ------------------------------------
pg/pg-config.yml | 7 -----
pg/pg-credentials.yml | 8 -----
pg/pg-pvc.yml | 12 --------
values.yaml | 4 +--
11 files changed, 2 insertions(+), 202 deletions(-)
delete mode 100644 api/api-config.yml
delete mode 100644 api/api-deployment.yml
delete mode 100644 api/api-ingress.yml
delete mode 100644 api/api-service.yml
delete mode 100644 pg-operator/operator.yml
delete mode 100644 pg/database-service.yml
delete mode 100644 pg/database-stateful-set.yml
delete mode 100644 pg/pg-config.yml
delete mode 100644 pg/pg-credentials.yml
delete mode 100644 pg/pg-pvc.yml
diff --git a/api/api-config.yml b/api/api-config.yml
deleted file mode 100644
index ad003a7..0000000
--- a/api/api-config.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: api-config
-data:
- endpoint: database-service:5432
diff --git a/api/api-deployment.yml b/api/api-deployment.yml
deleted file mode 100644
index a6a45d8..0000000
--- a/api/api-deployment.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- labels:
- app: api-deployment
- name: api-deployment
-spec:
- replicas: 3
- selector:
- matchLabels:
- app: api-deployment
- strategy: {}
- template:
- metadata:
- labels:
- app: api-deployment
- spec:
- containers:
- - image: registry.gitlab.com/takima-school/images/cdb/api:latest
- name: simple-app
- resources:
- limits:
- memory: "720Mi"
- cpu: "390m"
- ports:
- - containerPort: 8080
- env:
- - name: POSTGRES_DB
- valueFrom:
- configMapKeyRef:
- name: database-config
- key: name
- - name: POSTGRES_USER
- valueFrom:
- secretKeyRef:
- name: db-secret
- key: user
- - name: POSTGRES_PASSWORD
- valueFrom:
- secretKeyRef:
- name: db-secret
- key: password
- - name: DB_ENDPOINT
- valueFrom:
- configMapKeyRef:
- name: api-config
- key: endpoint
- imagePullSecrets:
- - name: takima-school-registry
-status: {}
diff --git a/api/api-ingress.yml b/api/api-ingress.yml
deleted file mode 100644
index 3ff7ab1..0000000
--- a/api/api-ingress.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
- annotations:
- kubernetes.io/ingress.class: nginx
- name: api-ingress
-spec:
- rules:
- - host: api.asejourne.takima.school
- http:
- paths:
- - backend:
- service:
- name: api-service
- port:
- number: 80
- path: /
- pathType: Prefix
diff --git a/api/api-service.yml b/api/api-service.yml
deleted file mode 100644
index 3b52a4a..0000000
--- a/api/api-service.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
- name: api-service
-spec:
- selector:
- app: api-deployment
- ports:
- - protocol: TCP
- port: 80
- targetPort: 8080
diff --git a/pg-operator/operator.yml b/pg-operator/operator.yml
deleted file mode 100644
index 593b428..0000000
--- a/pg-operator/operator.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-apiVersion: "acid.zalan.do/v1"
-kind: postgresql
-metadata:
- name: formation-cdb
-spec:
- teamId: "formation" # le team id doit matcher le préfixe dans le metadata.name, ici formation
- volume:
- size: 1Gi
- numberOfInstances: 2
- users:
- cdb: # database owner
- - superuser
- - createdb
- databases:
- cdb: cdb # dbname: owner
- postgresql:
- version: "14"
diff --git a/pg/database-service.yml b/pg/database-service.yml
deleted file mode 100644
index 7d4b35c..0000000
--- a/pg/database-service.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
- name: database-service
-spec:
- selector:
- app: database-deployment
- ports:
- - protocol: TCP
- port: 5432
- targetPort: 5432
diff --git a/pg/database-stateful-set.yml b/pg/database-stateful-set.yml
deleted file mode 100644
index d0ae1e4..0000000
--- a/pg/database-stateful-set.yml
+++ /dev/null
@@ -1,60 +0,0 @@
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
- labels:
- app: database-deployment
- name: database-deployment
-spec:
- replicas: 1
- selector:
- matchLabels:
- app: database-deployment
- serviceName: database-service
- template:
- metadata:
- labels:
- app: database-deployment
- spec:
- containers:
- - image: registry.takima.io/school/proxy/postgres:latest
- volumeMounts:
- - mountPath: /var/lib/postgresql/data
- name: pg-data
- name: simple-database
- resources:
- limits:
- memory: "512Mi"
- cpu: "390m"
- ports:
- - containerPort: 5432
- env:
- - name: POSTGRES_DB
- valueFrom:
- configMapKeyRef:
- name: database-config
- key: name
- - name: POSTGRES_USER
- valueFrom:
- secretKeyRef:
- name: db-secret
- key: user
- - name: POSTGRES_PASSWORD
- valueFrom:
- secretKeyRef:
- name: db-secret
- key: password
- - name: PGDATA
- valueFrom:
- configMapKeyRef:
- name: database-config
- key: db_path
- imagePullSecrets:
- - name: takima-school-registry
- volumeClaimTemplates:
- - metadata:
- name: pg-data
- spec:
- accessModes: [ "ReadWriteOnce" ]
- resources:
- requests:
- storage: 1Gi
diff --git a/pg/pg-config.yml b/pg/pg-config.yml
deleted file mode 100644
index d5274fb..0000000
--- a/pg/pg-config.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: database-config
-data:
- name: "cdb-db"
- db_path: "/var/lib/postgresql/data/pgdata"
diff --git a/pg/pg-credentials.yml b/pg/pg-credentials.yml
deleted file mode 100644
index 642c1b0..0000000
--- a/pg/pg-credentials.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
- name: db-secret
-type: Opaque
-data:
- user: ZGItdXNlcg==
- password: ZGItcGFzc3dvcmQ=
\ No newline at end of file
diff --git a/pg/pg-pvc.yml b/pg/pg-pvc.yml
deleted file mode 100644
index acc28fc..0000000
--- a/pg/pg-pvc.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
- name: pg-db
-spec:
- storageClassName: gp2
- accessModes:
- - ReadWriteOnce
- volumeMode: Filesystem
- resources:
- requests:
- storage: 3Gi
\ No newline at end of file
diff --git a/values.yaml b/values.yaml
index 9ab42ef..b6b2005 100644
--- a/values.yaml
+++ b/values.yaml
@@ -7,7 +7,7 @@ name: cdb
api:
ingress:
tlsEnabled: false
- host: api.to-replace.takima.school
+ host: api.asejourne.takima.school
front:
enabled: true
@@ -17,4 +17,4 @@ front:
replicaCount: 1
ingress:
tlsEnabled: false
- host: www.to-replace.takima.school
\ No newline at end of file
+ host: www.asejourne.takima.school
\ No newline at end of file
--
GitLab