From c1cd98662366f5e7acee3447b28152382afb6923 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Pailharey?= <rpailharey@grandlyon.com>
Date: Tue, 11 Apr 2023 15:59:28 +0200
Subject: [PATCH] cicd: remove client
---
.gitlab-ci.yml | 2 ++
.../ecolyo-agent-client-deployment.yml | 27 -------------------
.../ecolyo-agent-server-deployment.yml | 2 +-
k8s/services/ecolyo-agent-client-service.yml | 12 ---------
4 files changed, 3 insertions(+), 40 deletions(-)
delete mode 100644 k8s/deployments/ecolyo-agent-client-deployment.yml
delete mode 100644 k8s/services/ecolyo-agent-client-service.yml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3b30faa..3af6b6d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -141,6 +141,7 @@ deploy_rec:
stage: deploy
before_script:
- NAMESPACE=ns-ecolyo-bo-r01-syn
+ - sed -i "s/{{IMAGE_TAG}}/dev/" ./k8s/deployments/ecolyo-agent-server-deployment.yml
- sed -i "s/{{DATABASE_PASSWORD}}/$REC_DATABASE_PASSWORD/" ./k8s/secrets/ecolyo-agent-database.yml
- sed -i "s/{{CLIENT_ID}}/$REC_CLIENT_ID/" ./k8s/secrets/ecolyo-agent-server-config.yml
- sed -i "s/{{CLIENT_SECRET}}/$REC_CLIENT_SECRET/" ./k8s/secrets/ecolyo-agent-server-config.yml
@@ -168,6 +169,7 @@ deploy_prod:
stage: deploy
before_script:
- NAMESPACE=ns-ecolyo-bo-p01-syn
+ - sed -i "s/{{IMAGE_TAG}}/master/" ./k8s/deployments/ecolyo-agent-server-deployment.yml
- sed -i "s/{{DATABASE_PASSWORD}}/$PROD_DATABASE_PASSWORD/" ./k8s/secrets/ecolyo-agent-database.yml
- sed -i "s/{{CLIENT_ID}}/$PROD_CLIENT_ID/" ./k8s/secrets/ecolyo-agent-server-config.yml
- sed -i "s/{{CLIENT_SECRET}}/$PROD_CLIENT_SECRET/" ./k8s/secrets/ecolyo-agent-server-config.yml
diff --git a/k8s/deployments/ecolyo-agent-client-deployment.yml b/k8s/deployments/ecolyo-agent-client-deployment.yml
deleted file mode 100644
index 62b2901..0000000
--- a/k8s/deployments/ecolyo-agent-client-deployment.yml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-kind: Deployment
-apiVersion: apps/v1
-metadata:
- name: ecolyo-agent-client
- namespace: {{NS}}
-spec:
- replicas: 1
- selector:
- matchLabels:
- app: ecolyo-agent-client
- template:
- metadata:
- labels:
- app: ecolyo-agent-client
- spec:
- containers:
- - name: ecolyo-agent-client
- image: registry.forge.grandlyon.com/web-et-numerique/factory/llle_project/backoffice-client:master
- imagePullPolicy: Always
- ports:
- - containerPort: 8080
- protocol: TCP
- nodeSelector:
- node-role.kubernetes.io/worker: ''
- imagePullSecrets:
- - name: llle-project
diff --git a/k8s/deployments/ecolyo-agent-server-deployment.yml b/k8s/deployments/ecolyo-agent-server-deployment.yml
index d116bce..2b733b8 100644
--- a/k8s/deployments/ecolyo-agent-server-deployment.yml
+++ b/k8s/deployments/ecolyo-agent-server-deployment.yml
@@ -19,7 +19,7 @@ spec:
claimName: pvc-01-{{NS}}-claim
containers:
- name: ecolyo-agent-server
- image: registry.forge.grandlyon.com/web-et-numerique/factory/llle_project/backoffice-server:master
+ image: registry.forge.grandlyon.com/web-et-numerique/factory/llle_project/backoffice-server:{{IMAGE_TAG}}
env:
- name: DATABASE_HOST
valueFrom:
diff --git a/k8s/services/ecolyo-agent-client-service.yml b/k8s/services/ecolyo-agent-client-service.yml
deleted file mode 100644
index f9a6def..0000000
--- a/k8s/services/ecolyo-agent-client-service.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
- name: ecolyo-agent-client-service
- namespace: {{NS}}
-spec:
- selector:
- app: ecolyo-agent-client
- ports:
- - protocol: TCP
- port: 80
- targetPort: 8080
--
GitLab