From 15124450fe6ecfc9f356f48287466a8ee050947a Mon Sep 17 00:00:00 2001 From: Vins Date: Wed, 20 Sep 2023 16:20:00 +0200 Subject: [PATCH 01/12] test --- src/app/HomeController.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/HomeController.ts b/src/app/HomeController.ts index 2d84c394..1f19e512 100644 --- a/src/app/HomeController.ts +++ b/src/app/HomeController.ts @@ -6,6 +6,7 @@ import ApiController from "@Common/system/controller-pattern/ApiController"; @Controller() @Service() export default class HomeController extends ApiController { + @Get("/") protected async get(req: Request, res: Response) { // const query = processFindManyQuery(req.query); From ab2ea50f6337077fcac49ba2678887ddc747d4aa Mon Sep 17 00:00:00 2001 From: Vins Date: Wed, 20 Sep 2023 16:24:13 +0200 Subject: [PATCH 02/12] Trying to switch service account --- devops/ppd.values.yaml | 4 ++-- devops/templates/service-account.yaml | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/devops/ppd.values.yaml b/devops/ppd.values.yaml index dce7e33f..92e2a10b 100644 --- a/devops/ppd.values.yaml +++ b/devops/ppd.values.yaml @@ -3,7 +3,7 @@ dockerPullSecret: docker-pull-secret scwSecretKey: AgCgjF5QEzxT3GYTS5B6cmQ0e+0/qFWzKaUDSi+Vjc7RoameuvaIJvTXMBkS3he1oy1ulbB34v6vpZI2kxnGNqERA/U5BaYDAyfKSBwMAy4br7HVKhhuwkoF5qoG5JzJXseSmqB1U9vncVIGOZWzJc1Y4/eGlWcvLcLyfw2z/WEpyeNiWJfEhTYpJOB7gv0XnRb2U/JM3jRy1QgEUIk1WR6kgBalF+xaczPQ6uKh+PR2pqkbZa3WaKUrddmzNsgEz4d8PZMWt8IBwR2JOQEHUqCd34p/pJNyLdUgcdDhg02DKwn1oRoAxKTbAio/a7WrMbodjCb3TNWIYGal5mFmItZ7Ok/EBmUf4E85eOkTR+j8ynuuiexld3Q5Kw3o8LsHjgzVL9uP+T2rYaKkjtVt+YQRX1U8l9CrsdUEz0/wEBA0jwCWMfnh1qhD5pM/xwwjsEEAcK4rYV+Q7iAgGZZvZBCQ5aEHzrtn5D95tr1GZCV2hmrW6Seu+LKKLVBS1JmsuEsOuhudYsEK9m2RYVcxbjuS5eokKEjNrGobf2oB8rhBByavfw1JTBixR5JrI8lcYlnCa+oEhxXKJY+4Fx5SAB4YaLCMSo5vw6zsFQ3WKQzlEmCFt+EnapS+a+MGrdlwq07OHTDpvgk/1z39hopoCuhhKckGGfErLXsTYQvDOkFu+EPzgY7m7qDw/d9pSiht5tuSOkAqeOgm7tpNkUufZhaXmP+1aT7i+H5gq1JILGAmXzTI5Wc= lecoffreBack: - serviceAccountName: lecoffre-back-sa + serviceAccountName: lecoffre-back-sa-ppd command: "'sh', '-c', 'export $(xargs Date: Wed, 20 Sep 2023 16:31:17 +0200 Subject: [PATCH 03/12] revert --- devops/templates/service-account.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/devops/templates/service-account.yaml b/devops/templates/service-account.yaml index 8f58833d..7796d3cb 100644 --- a/devops/templates/service-account.yaml +++ b/devops/templates/service-account.yaml @@ -1,30 +1,30 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: {{ .Values.lecoffreBack.serviceAccountName }}-ppd + name: {{ .Values.lecoffreBack.serviceAccountName }} --- apiVersion: v1 kind: Secret metadata: - name: {{ .Values.lecoffreBack.serviceAccountName }}-token-ppd + name: {{ .Values.lecoffreBack.serviceAccountName }}-token annotations: - kubernetes.io/service-account.name: {{ .Values.lecoffreBack.serviceAccountName }}-ppd + kubernetes.io/service-account.name: {{ .Values.lecoffreBack.serviceAccountName }} type: kubernetes.io/service-account-token --- apiVersion: v1 kind: ServiceAccount metadata: - name: {{ .Values.lecoffreCron.serviceAccountName }}-ppd + name: {{ .Values.lecoffreCron.serviceAccountName }} --- apiVersion: v1 kind: Secret metadata: - name: {{ .Values.lecoffreCron.serviceAccountName }}-token-ppd + name: {{ .Values.lecoffreCron.serviceAccountName }}-token annotations: - kubernetes.io/service-account.name: {{ .Values.lecoffreCron.serviceAccountName }}-ppd + kubernetes.io/service-account.name: {{ .Values.lecoffreCron.serviceAccountName }} type: kubernetes.io/service-account-token \ No newline at end of file From e7d15b9c1c9aae952d1ccdbe73a3c88fcb20967a Mon Sep 17 00:00:00 2001 From: Vins Date: Wed, 20 Sep 2023 16:37:57 +0200 Subject: [PATCH 04/12] Removed cron --- devops/ppd.values.yaml | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/devops/ppd.values.yaml b/devops/ppd.values.yaml index 92e2a10b..fd65754f 100644 --- a/devops/ppd.values.yaml +++ b/devops/ppd.values.yaml @@ -32,23 +32,23 @@ lecoffreBack: - key: .env scwID: "id:430001f8-68ab-47b2-92e8-38024c35a80d" -lecoffreCron: - serviceAccountName: lecoffre-cron-sa-ppd - envSecrets: ppd-env - command: "'sh', '-c', 'export $(xargs Date: Wed, 20 Sep 2023 16:41:13 +0200 Subject: [PATCH 05/12] Removed more cron stuff --- .circleci/config.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6f2d2815..d3e77b9e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -47,9 +47,7 @@ jobs: -n lecoffre-<> --create-namespace --set lecoffreBack.image.repository='rg.fr-par.scw.cloud/lecoffre/back' - --set lecoffreBack.image.tag=${CIRCLE_SHA1:0:7} - --set lecoffreCron.image.repository='rg.fr-par.scw.cloud/lecoffre/back' - --set lecoffreCron.image.tag=${CIRCLE_SHA1:0:7} + --set lecoffreBack.image.tag=${CIRCLE_SHA1:0:7} From 3a79f456f8ac33c542c29fe9d6bedef51572c337 Mon Sep 17 00:00:00 2001 From: Vins Date: Wed, 20 Sep 2023 16:43:45 +0200 Subject: [PATCH 06/12] Revert --- .circleci/config.yml | 4 +++- devops/ppd.values.yaml | 38 +++++++++++++++++++------------------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d3e77b9e..6f2d2815 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -47,7 +47,9 @@ jobs: -n lecoffre-<> --create-namespace --set lecoffreBack.image.repository='rg.fr-par.scw.cloud/lecoffre/back' - --set lecoffreBack.image.tag=${CIRCLE_SHA1:0:7} + --set lecoffreBack.image.tag=${CIRCLE_SHA1:0:7} + --set lecoffreCron.image.repository='rg.fr-par.scw.cloud/lecoffre/back' + --set lecoffreCron.image.tag=${CIRCLE_SHA1:0:7} diff --git a/devops/ppd.values.yaml b/devops/ppd.values.yaml index fd65754f..92e2a10b 100644 --- a/devops/ppd.values.yaml +++ b/devops/ppd.values.yaml @@ -32,23 +32,23 @@ lecoffreBack: - key: .env scwID: "id:430001f8-68ab-47b2-92e8-38024c35a80d" -# lecoffreCron: -# serviceAccountName: lecoffre-cron-sa-ppd -# envSecrets: ppd-env -# command: "'sh', '-c', 'export $(xargs Date: Wed, 20 Sep 2023 16:51:52 +0200 Subject: [PATCH 07/12] test --- devops/ppd.values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devops/ppd.values.yaml b/devops/ppd.values.yaml index 92e2a10b..525e4790 100644 --- a/devops/ppd.values.yaml +++ b/devops/ppd.values.yaml @@ -1,6 +1,6 @@ dockerPullSecret: docker-pull-secret -scwSecretKey: AgCgjF5QEzxT3GYTS5B6cmQ0e+0/qFWzKaUDSi+Vjc7RoameuvaIJvTXMBkS3he1oy1ulbB34v6vpZI2kxnGNqERA/U5BaYDAyfKSBwMAy4br7HVKhhuwkoF5qoG5JzJXseSmqB1U9vncVIGOZWzJc1Y4/eGlWcvLcLyfw2z/WEpyeNiWJfEhTYpJOB7gv0XnRb2U/JM3jRy1QgEUIk1WR6kgBalF+xaczPQ6uKh+PR2pqkbZa3WaKUrddmzNsgEz4d8PZMWt8IBwR2JOQEHUqCd34p/pJNyLdUgcdDhg02DKwn1oRoAxKTbAio/a7WrMbodjCb3TNWIYGal5mFmItZ7Ok/EBmUf4E85eOkTR+j8ynuuiexld3Q5Kw3o8LsHjgzVL9uP+T2rYaKkjtVt+YQRX1U8l9CrsdUEz0/wEBA0jwCWMfnh1qhD5pM/xwwjsEEAcK4rYV+Q7iAgGZZvZBCQ5aEHzrtn5D95tr1GZCV2hmrW6Seu+LKKLVBS1JmsuEsOuhudYsEK9m2RYVcxbjuS5eokKEjNrGobf2oB8rhBByavfw1JTBixR5JrI8lcYlnCa+oEhxXKJY+4Fx5SAB4YaLCMSo5vw6zsFQ3WKQzlEmCFt+EnapS+a+MGrdlwq07OHTDpvgk/1z39hopoCuhhKckGGfErLXsTYQvDOkFu+EPzgY7m7qDw/d9pSiht5tuSOkAqeOgm7tpNkUufZhaXmP+1aT7i+H5gq1JILGAmXzTI5Wc= +scwSecretKey: AgChoEnPitXp4Ny/rVMEcevaWKNVpyj2cJYAcq+yFqKwVwnLB+ffDvwqz9XBHu+6d4Nyyjkf37zUAMoaM21lEDWA7x3zfG2/D/j+rvX1qxzZgLD0mjBk7fGElVm332I6JA83oInes8AMMYEDPLElzHnpKRb9KtkIP4NzgOcCeW0ijft3N7Vroez6LEHsBPCA1I9XjKSkGEDvrO0MhWX3iJOlfz+SPMfJAV7rPawOs0ZmohTHrPW8qIvGDn8HCzKyU8zRBoMt+Ogpf5pH4U3JryEFuqD61KAQgablAM8edPIvsgNno9HAEuC2QtRLYA9aUhuKdaKuS58c9P2E80PHWXIlbpFCg6EugQTgNfnYp+3qDUNz8edeCfapYLvF4s9eCMGyMsGnpDR8EDNOyuGy7Y3l7okX8Xqu464gMp9E+hX7bHkcD6a4xfyIgJcWxsku0tm1TH1dpn4M1UXRuyZZif8P08nuE6MTUL67sAR9J1lpn4lVEL4kflk0pP2tZ5ncgPQFafJrRz05krMb0eU5tb2H4gs7ao/LL6idWo8MM9K1yr8lIuT5x2WW5CX+RjA+i50ex114V6vX3PNP5oVyt+DynTUB9QmXzVm3oLfDc3Cae1uqh7X0CFd+xiztJBtg0VtJaD/xUJcuWfY4cV2lERo9fRrykltzlJqiXHO4nowt8OtN0BcViVV8NJhPhYFzyb4ympxpOlTjm3GETuT2TYhUqdgS9nzleEAbOmOHZdIO2COunPE= lecoffreBack: serviceAccountName: lecoffre-back-sa-ppd From bf7c6d9eb75807918c5fa1518dad1119c91a5f29 Mon Sep 17 00:00:00 2001 From: Vins Date: Wed, 20 Sep 2023 16:54:48 +0200 Subject: [PATCH 08/12] removed -ppd --- devops/ppd.values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/devops/ppd.values.yaml b/devops/ppd.values.yaml index 525e4790..45b3ccce 100644 --- a/devops/ppd.values.yaml +++ b/devops/ppd.values.yaml @@ -3,7 +3,7 @@ dockerPullSecret: docker-pull-secret scwSecretKey: AgChoEnPitXp4Ny/rVMEcevaWKNVpyj2cJYAcq+yFqKwVwnLB+ffDvwqz9XBHu+6d4Nyyjkf37zUAMoaM21lEDWA7x3zfG2/D/j+rvX1qxzZgLD0mjBk7fGElVm332I6JA83oInes8AMMYEDPLElzHnpKRb9KtkIP4NzgOcCeW0ijft3N7Vroez6LEHsBPCA1I9XjKSkGEDvrO0MhWX3iJOlfz+SPMfJAV7rPawOs0ZmohTHrPW8qIvGDn8HCzKyU8zRBoMt+Ogpf5pH4U3JryEFuqD61KAQgablAM8edPIvsgNno9HAEuC2QtRLYA9aUhuKdaKuS58c9P2E80PHWXIlbpFCg6EugQTgNfnYp+3qDUNz8edeCfapYLvF4s9eCMGyMsGnpDR8EDNOyuGy7Y3l7okX8Xqu464gMp9E+hX7bHkcD6a4xfyIgJcWxsku0tm1TH1dpn4M1UXRuyZZif8P08nuE6MTUL67sAR9J1lpn4lVEL4kflk0pP2tZ5ncgPQFafJrRz05krMb0eU5tb2H4gs7ao/LL6idWo8MM9K1yr8lIuT5x2WW5CX+RjA+i50ex114V6vX3PNP5oVyt+DynTUB9QmXzVm3oLfDc3Cae1uqh7X0CFd+xiztJBtg0VtJaD/xUJcuWfY4cV2lERo9fRrykltzlJqiXHO4nowt8OtN0BcViVV8NJhPhYFzyb4ympxpOlTjm3GETuT2TYhUqdgS9nzleEAbOmOHZdIO2COunPE= lecoffreBack: - serviceAccountName: lecoffre-back-sa-ppd + serviceAccountName: lecoffre-back-sa command: "'sh', '-c', 'export $(xargs Date: Thu, 21 Sep 2023 10:23:17 +0200 Subject: [PATCH 09/12] test --- devops/ppd.values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devops/ppd.values.yaml b/devops/ppd.values.yaml index 45b3ccce..ad2fd2b9 100644 --- a/devops/ppd.values.yaml +++ b/devops/ppd.values.yaml @@ -1,4 +1,4 @@ -dockerPullSecret: docker-pull-secret +dockerPullSecret: "id:47c1c301-1f02-49cc-9e5c-c1225a770aa8" scwSecretKey: AgChoEnPitXp4Ny/rVMEcevaWKNVpyj2cJYAcq+yFqKwVwnLB+ffDvwqz9XBHu+6d4Nyyjkf37zUAMoaM21lEDWA7x3zfG2/D/j+rvX1qxzZgLD0mjBk7fGElVm332I6JA83oInes8AMMYEDPLElzHnpKRb9KtkIP4NzgOcCeW0ijft3N7Vroez6LEHsBPCA1I9XjKSkGEDvrO0MhWX3iJOlfz+SPMfJAV7rPawOs0ZmohTHrPW8qIvGDn8HCzKyU8zRBoMt+Ogpf5pH4U3JryEFuqD61KAQgablAM8edPIvsgNno9HAEuC2QtRLYA9aUhuKdaKuS58c9P2E80PHWXIlbpFCg6EugQTgNfnYp+3qDUNz8edeCfapYLvF4s9eCMGyMsGnpDR8EDNOyuGy7Y3l7okX8Xqu464gMp9E+hX7bHkcD6a4xfyIgJcWxsku0tm1TH1dpn4M1UXRuyZZif8P08nuE6MTUL67sAR9J1lpn4lVEL4kflk0pP2tZ5ncgPQFafJrRz05krMb0eU5tb2H4gs7ao/LL6idWo8MM9K1yr8lIuT5x2WW5CX+RjA+i50ex114V6vX3PNP5oVyt+DynTUB9QmXzVm3oLfDc3Cae1uqh7X0CFd+xiztJBtg0VtJaD/xUJcuWfY4cV2lERo9fRrykltzlJqiXHO4nowt8OtN0BcViVV8NJhPhYFzyb4ympxpOlTjm3GETuT2TYhUqdgS9nzleEAbOmOHZdIO2COunPE= From 87195ce29e73271ec17cf1856fa8adf664ea765e Mon Sep 17 00:00:00 2001 From: Vins Date: Thu, 21 Sep 2023 10:32:06 +0200 Subject: [PATCH 10/12] revert --- devops/ppd.values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devops/ppd.values.yaml b/devops/ppd.values.yaml index ad2fd2b9..45b3ccce 100644 --- a/devops/ppd.values.yaml +++ b/devops/ppd.values.yaml @@ -1,4 +1,4 @@ -dockerPullSecret: "id:47c1c301-1f02-49cc-9e5c-c1225a770aa8" +dockerPullSecret: docker-pull-secret scwSecretKey: AgChoEnPitXp4Ny/rVMEcevaWKNVpyj2cJYAcq+yFqKwVwnLB+ffDvwqz9XBHu+6d4Nyyjkf37zUAMoaM21lEDWA7x3zfG2/D/j+rvX1qxzZgLD0mjBk7fGElVm332I6JA83oInes8AMMYEDPLElzHnpKRb9KtkIP4NzgOcCeW0ijft3N7Vroez6LEHsBPCA1I9XjKSkGEDvrO0MhWX3iJOlfz+SPMfJAV7rPawOs0ZmohTHrPW8qIvGDn8HCzKyU8zRBoMt+Ogpf5pH4U3JryEFuqD61KAQgablAM8edPIvsgNno9HAEuC2QtRLYA9aUhuKdaKuS58c9P2E80PHWXIlbpFCg6EugQTgNfnYp+3qDUNz8edeCfapYLvF4s9eCMGyMsGnpDR8EDNOyuGy7Y3l7okX8Xqu464gMp9E+hX7bHkcD6a4xfyIgJcWxsku0tm1TH1dpn4M1UXRuyZZif8P08nuE6MTUL67sAR9J1lpn4lVEL4kflk0pP2tZ5ncgPQFafJrRz05krMb0eU5tb2H4gs7ao/LL6idWo8MM9K1yr8lIuT5x2WW5CX+RjA+i50ex114V6vX3PNP5oVyt+DynTUB9QmXzVm3oLfDc3Cae1uqh7X0CFd+xiztJBtg0VtJaD/xUJcuWfY4cV2lERo9fRrykltzlJqiXHO4nowt8OtN0BcViVV8NJhPhYFzyb4ympxpOlTjm3GETuT2TYhUqdgS9nzleEAbOmOHZdIO2COunPE= From 4f5bbd66358f1e7fe29c6f06ce1a7f250ae9bd17 Mon Sep 17 00:00:00 2001 From: Vins Date: Thu, 21 Sep 2023 10:46:55 +0200 Subject: [PATCH 11/12] test --- src/app/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/index.ts b/src/app/index.ts index e10e2e4e..aaa40cc1 100644 --- a/src/app/index.ts +++ b/src/app/index.ts @@ -52,6 +52,7 @@ import LiveVoteController from "./api/super-admin/LiveVoteController"; * @description This allow to declare all controllers used in the application */ export default { + start: () => { Container.get(HomeController); Container.get(UsersControllerSuperAdmin); From fbfd197eb505bdb8a90ba1f56a5872efb5daaf51 Mon Sep 17 00:00:00 2001 From: Vins Date: Thu, 21 Sep 2023 10:50:27 +0200 Subject: [PATCH 12/12] Switched stg env --- devops/ppd.values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/devops/ppd.values.yaml b/devops/ppd.values.yaml index 45b3ccce..3300e6cf 100644 --- a/devops/ppd.values.yaml +++ b/devops/ppd.values.yaml @@ -30,7 +30,7 @@ lecoffreBack: nginx.ingress.kubernetes.io/force-ssl-redirect: "true" env: - key: .env - scwID: "id:430001f8-68ab-47b2-92e8-38024c35a80d" + scwID: "id:2be9510b-bb1f-4fbe-ab3e-3dc11fb49051" lecoffreCron: serviceAccountName: lecoffre-cron-sa @@ -50,5 +50,5 @@ lecoffreCron: # key is name of the environment variable, scwID is the secret ID in SCW with "id:" in front env: - key: .env - scwID: "id:430001f8-68ab-47b2-92e8-38024c35a80d" + scwID: "id:2be9510b-bb1f-4fbe-ab3e-3dc11fb49051"