From c07596aaf27eccfd13d87ab47623746d34c5fd64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Pailharey?= <rpailharey@grandlyon.com>
Date: Tue, 7 Feb 2023 16:51:20 +0100
Subject: [PATCH] fix: updated images + server config template
---
k8s/deployments/database-restore-deployment.yml | 4 ++--
k8s/deployments/ecolyo-agent-client-deployment.yml | 2 +-
...-config.yml => ecolyo-agent-server-config.template.yml} | 7 ++++---
3 files changed, 7 insertions(+), 6 deletions(-)
rename k8s/secrets/{ecolyo-agent-server-config.yml => ecolyo-agent-server-config.template.yml} (83%)
diff --git a/k8s/deployments/database-restore-deployment.yml b/k8s/deployments/database-restore-deployment.yml
index ee076b2..e70a469 100644
--- a/k8s/deployments/database-restore-deployment.yml
+++ b/k8s/deployments/database-restore-deployment.yml
@@ -18,7 +18,7 @@ spec:
claimName: pvc-4-ns-selfdata-d01-syn-claim
containers:
- name: mysql-restore
- image: 'mysql:5'
+ image: 'mysql:8'
env:
- name: MYSQL_DATABASE
valueFrom:
@@ -38,7 +38,7 @@ spec:
resources:
limits:
cpu: 100m
- memory: 256Mi
+ memory: 512Mi
requests:
cpu: 100m
memory: 256Mi
diff --git a/k8s/deployments/ecolyo-agent-client-deployment.yml b/k8s/deployments/ecolyo-agent-client-deployment.yml
index 6863fa4..c8aa5be 100644
--- a/k8s/deployments/ecolyo-agent-client-deployment.yml
+++ b/k8s/deployments/ecolyo-agent-client-deployment.yml
@@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: ecolyo-agent-client
- image: registry.forge.grandlyon.com/web-et-numerique/llle_project/backoffice-client:master
+ image: registry.forge.grandlyon.com/web-et-numerique/factory/llle_project/backoffice-client:master
imagePullPolicy: Always
ports:
- containerPort: 8080
diff --git a/k8s/secrets/ecolyo-agent-server-config.yml b/k8s/secrets/ecolyo-agent-server-config.template.yml
similarity index 83%
rename from k8s/secrets/ecolyo-agent-server-config.yml
rename to k8s/secrets/ecolyo-agent-server-config.template.yml
index 98869c9..7cc6776 100644
--- a/k8s/secrets/ecolyo-agent-server-config.yml
+++ b/k8s/secrets/ecolyo-agent-server-config.template.yml
@@ -4,17 +4,18 @@ metadata:
name: ecolyo-agent-server-config
stringData:
# Replace all values between <...>
+ # All values must be string ex: 1443 => '1443'
ADMIN_ROLE: <Admin group created in FIM>
AUTH_URL: <OAuth2 authentication URL>
CLIENT_ID: <OAuth2 client ID>
CLIENT_SECRET: <OAuth2 client secret>
DATABASE_USER: root
- DEBUG_MODE: <true/false>
+ DEBUG_MODE: 'false'
HOSTNAME: <ecolyo-agent(-rec).apps.grandlyon.com>
- HTTPS_PORT: 1143
+ HTTPS_PORT: '1143'
IMAGE_FOLDER: mnt/image-lib
MEILI_HOST: http://ecolyo-agent-meilisearch-service:7700
- MOCK_OAUTH2: false
+ MOCK_OAUTH2: 'false'
REDIRECT_URL: <HOSTNAME/OAuth2Callback>
SGE_API_TOKEN: <YOUR TOKEN>
TOKEN_URL: <OAuth2 token URL>
--
GitLab