From 43febb722c97285c4c4448fb57c35940fc2f8484 Mon Sep 17 00:00:00 2001 From: Madyo Date: Thu, 19 May 2022 01:08:36 +0200 Subject: [PATCH] fix: fix sealed secrets --- .kube-workflow/common/values.yaml | 2 +- .../{ => env/dev}/templates/app.configmap.yaml | 2 +- .../env/dev/templates/app.sealed-secret.yaml | 14 ++++++++++++++ .../env/preprod/templates/app.configmap.yaml | 7 +++++++ .../env/preprod/templates/app.sealed-secret.yaml | 14 ++++++++++++++ .../env/prod/templates/app.configmap.yaml | 7 +++++++ .../env/prod/templates/app.sealed-secret.yaml | 14 ++++++++++++++ .kube-workflow/templates/app.sealed-secret.yaml | 11 ----------- .kube-workflow/values.yaml | 15 --------------- 9 files changed, 58 insertions(+), 28 deletions(-) rename .kube-workflow/{ => env/dev}/templates/app.configmap.yaml (65%) create mode 100644 .kube-workflow/env/dev/templates/app.sealed-secret.yaml create mode 100644 .kube-workflow/env/preprod/templates/app.configmap.yaml create mode 100644 .kube-workflow/env/preprod/templates/app.sealed-secret.yaml create mode 100644 .kube-workflow/env/prod/templates/app.configmap.yaml create mode 100644 .kube-workflow/env/prod/templates/app.sealed-secret.yaml delete mode 100644 .kube-workflow/templates/app.sealed-secret.yaml delete mode 100644 .kube-workflow/values.yaml diff --git a/.kube-workflow/common/values.yaml b/.kube-workflow/common/values.yaml index 8bcfc2fc..2a7ddc15 100644 --- a/.kube-workflow/common/values.yaml +++ b/.kube-workflow/common/values.yaml @@ -10,6 +10,6 @@ app: name: app-sealed-secret - configMapRef: name: app-configmap - probesPath: /api/healthz + probesPath: /healthz replicas: 1 imagePackage: app diff --git a/.kube-workflow/templates/app.configmap.yaml b/.kube-workflow/env/dev/templates/app.configmap.yaml similarity index 65% rename from .kube-workflow/templates/app.configmap.yaml rename to .kube-workflow/env/dev/templates/app.configmap.yaml index bcee94d1..dc8de5c6 100644 --- a/.kube-workflow/templates/app.configmap.yaml +++ b/.kube-workflow/env/dev/templates/app.configmap.yaml @@ -4,4 +4,4 @@ metadata: name: app-configmap data: NODE_ENV: 'production' - NOTION_BASE: e4e03e2676c54de09cc3fb46a56c90df + NOTION_BASE: 'e4e03e2676c54de09cc3fb46a56c90df' diff --git a/.kube-workflow/env/dev/templates/app.sealed-secret.yaml b/.kube-workflow/env/dev/templates/app.sealed-secret.yaml new file mode 100644 index 00000000..ddba45f8 --- /dev/null +++ b/.kube-workflow/env/dev/templates/app.sealed-secret.yaml @@ -0,0 +1,14 @@ +apiVersion: bitnami.com/v1alpha1 +kind: SealedSecret +metadata: + annotations: {} + name: app-sealed-secret + namespace: ressourcerie +spec: + encryptedData: + NOTION_INTEGRATION_TOKEN: AgCq5fKtAlGYdIk3JRBmfm/basmo3rJralCTbxSBAtSn9tmDbGS3m16qiZhDr5QEdZLj2Sp+8bYc/dLoQuf3Oe6dGnTFSdgKYLH++5BWlg3WnQuToq2csOS96uRSWv7PQfSgy1pVYs1OjRIn08Vv9SWX/BCVajlss1+M/jXAuHpTXdppN5/EXrgc8H4/VvlzfWSryrKFL1xAr5PpeMBZACNZqTLKRU/oPOQuci4/bIKXUsfEd9iPgmMg0Bf0kc4CmSkdpmA0+bgOHyxEoYJyryKc5M20CyyKlhF0MrW9c8uwIwtjlzjsxo/EstJLz5UalvrW/KE5EOHK283a3pbsPscmTeJHL3466CVfaqlKOruAPtgr0ABrPNrYFOnWAZ51Fvt/uaMh2/FQcd+1bsrQspocMBRJGtoBzsndouGfe1jd4v4Som/DiV9fOeiCtJR3m3zJT4w7MojGNx2zEwcOQVx8kFJAAQ5gZ5nY8JOxj+py6kDpHjHL0lY9gHXmNprXBq30yhksfPnGngQAhxqPAkeE+eJWJSNbzzY3Tex742FwuAmzEbq9lJHK2m0ayxA/aUvXjPK9rnaOp7fuxl3VRVc/Vte8Nhmb6X7aJkg6/YqZ0PX5i8eTwGkrSiwVa+bYCf0WuSMCYFF+S9zOIrv6ZWYMe+MfeXjqKgE9EK0AFoPsB4uJF3zWBXP4101/F8oidUZxZ28I6jtOsoQ0jKtCLGKMN3dG2TB22c9Lrrvp/QiLieXB2loprq7wkOvEnbXp1+wcTw== + template: + metadata: + annotations: {} + name: app-sealed-secret + type: Opaque diff --git a/.kube-workflow/env/preprod/templates/app.configmap.yaml b/.kube-workflow/env/preprod/templates/app.configmap.yaml new file mode 100644 index 00000000..dc8de5c6 --- /dev/null +++ b/.kube-workflow/env/preprod/templates/app.configmap.yaml @@ -0,0 +1,7 @@ +kind: ConfigMap +apiVersion: v1 +metadata: + name: app-configmap +data: + NODE_ENV: 'production' + NOTION_BASE: 'e4e03e2676c54de09cc3fb46a56c90df' diff --git a/.kube-workflow/env/preprod/templates/app.sealed-secret.yaml b/.kube-workflow/env/preprod/templates/app.sealed-secret.yaml new file mode 100644 index 00000000..ddba45f8 --- /dev/null +++ b/.kube-workflow/env/preprod/templates/app.sealed-secret.yaml @@ -0,0 +1,14 @@ +apiVersion: bitnami.com/v1alpha1 +kind: SealedSecret +metadata: + annotations: {} + name: app-sealed-secret + namespace: ressourcerie +spec: + encryptedData: + NOTION_INTEGRATION_TOKEN: AgCq5fKtAlGYdIk3JRBmfm/basmo3rJralCTbxSBAtSn9tmDbGS3m16qiZhDr5QEdZLj2Sp+8bYc/dLoQuf3Oe6dGnTFSdgKYLH++5BWlg3WnQuToq2csOS96uRSWv7PQfSgy1pVYs1OjRIn08Vv9SWX/BCVajlss1+M/jXAuHpTXdppN5/EXrgc8H4/VvlzfWSryrKFL1xAr5PpeMBZACNZqTLKRU/oPOQuci4/bIKXUsfEd9iPgmMg0Bf0kc4CmSkdpmA0+bgOHyxEoYJyryKc5M20CyyKlhF0MrW9c8uwIwtjlzjsxo/EstJLz5UalvrW/KE5EOHK283a3pbsPscmTeJHL3466CVfaqlKOruAPtgr0ABrPNrYFOnWAZ51Fvt/uaMh2/FQcd+1bsrQspocMBRJGtoBzsndouGfe1jd4v4Som/DiV9fOeiCtJR3m3zJT4w7MojGNx2zEwcOQVx8kFJAAQ5gZ5nY8JOxj+py6kDpHjHL0lY9gHXmNprXBq30yhksfPnGngQAhxqPAkeE+eJWJSNbzzY3Tex742FwuAmzEbq9lJHK2m0ayxA/aUvXjPK9rnaOp7fuxl3VRVc/Vte8Nhmb6X7aJkg6/YqZ0PX5i8eTwGkrSiwVa+bYCf0WuSMCYFF+S9zOIrv6ZWYMe+MfeXjqKgE9EK0AFoPsB4uJF3zWBXP4101/F8oidUZxZ28I6jtOsoQ0jKtCLGKMN3dG2TB22c9Lrrvp/QiLieXB2loprq7wkOvEnbXp1+wcTw== + template: + metadata: + annotations: {} + name: app-sealed-secret + type: Opaque diff --git a/.kube-workflow/env/prod/templates/app.configmap.yaml b/.kube-workflow/env/prod/templates/app.configmap.yaml new file mode 100644 index 00000000..dc8de5c6 --- /dev/null +++ b/.kube-workflow/env/prod/templates/app.configmap.yaml @@ -0,0 +1,7 @@ +kind: ConfigMap +apiVersion: v1 +metadata: + name: app-configmap +data: + NODE_ENV: 'production' + NOTION_BASE: 'e4e03e2676c54de09cc3fb46a56c90df' diff --git a/.kube-workflow/env/prod/templates/app.sealed-secret.yaml b/.kube-workflow/env/prod/templates/app.sealed-secret.yaml new file mode 100644 index 00000000..ddba45f8 --- /dev/null +++ b/.kube-workflow/env/prod/templates/app.sealed-secret.yaml @@ -0,0 +1,14 @@ +apiVersion: bitnami.com/v1alpha1 +kind: SealedSecret +metadata: + annotations: {} + name: app-sealed-secret + namespace: ressourcerie +spec: + encryptedData: + NOTION_INTEGRATION_TOKEN: AgCq5fKtAlGYdIk3JRBmfm/basmo3rJralCTbxSBAtSn9tmDbGS3m16qiZhDr5QEdZLj2Sp+8bYc/dLoQuf3Oe6dGnTFSdgKYLH++5BWlg3WnQuToq2csOS96uRSWv7PQfSgy1pVYs1OjRIn08Vv9SWX/BCVajlss1+M/jXAuHpTXdppN5/EXrgc8H4/VvlzfWSryrKFL1xAr5PpeMBZACNZqTLKRU/oPOQuci4/bIKXUsfEd9iPgmMg0Bf0kc4CmSkdpmA0+bgOHyxEoYJyryKc5M20CyyKlhF0MrW9c8uwIwtjlzjsxo/EstJLz5UalvrW/KE5EOHK283a3pbsPscmTeJHL3466CVfaqlKOruAPtgr0ABrPNrYFOnWAZ51Fvt/uaMh2/FQcd+1bsrQspocMBRJGtoBzsndouGfe1jd4v4Som/DiV9fOeiCtJR3m3zJT4w7MojGNx2zEwcOQVx8kFJAAQ5gZ5nY8JOxj+py6kDpHjHL0lY9gHXmNprXBq30yhksfPnGngQAhxqPAkeE+eJWJSNbzzY3Tex742FwuAmzEbq9lJHK2m0ayxA/aUvXjPK9rnaOp7fuxl3VRVc/Vte8Nhmb6X7aJkg6/YqZ0PX5i8eTwGkrSiwVa+bYCf0WuSMCYFF+S9zOIrv6ZWYMe+MfeXjqKgE9EK0AFoPsB4uJF3zWBXP4101/F8oidUZxZ28I6jtOsoQ0jKtCLGKMN3dG2TB22c9Lrrvp/QiLieXB2loprq7wkOvEnbXp1+wcTw== + template: + metadata: + annotations: {} + name: app-sealed-secret + type: Opaque diff --git a/.kube-workflow/templates/app.sealed-secret.yaml b/.kube-workflow/templates/app.sealed-secret.yaml deleted file mode 100644 index 2c63557b..00000000 --- a/.kube-workflow/templates/app.sealed-secret.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: bitnami.com/v1alpha1 -kind: SealedSecret -metadata: - name: app-sealed-secret -spec: - encryptedData: - NOTION_INTEGRATION_TOKEN: AgCao4TJixjocSLWKmboopnbEtLXxRwnsahr2BRR+TrC9owBVRizxZqPy1VVNCDzxpFmKycoc+ZqL3dBqYyj6xafXgnJ/YkYSe+RxjMQGw9y/InhsNH/D/YV/C1luhTqq4Qu8zxqya9UsBAdCMEqtJBL9+qsYysN0UX1Tzac0P0obIMLx/EdU/LR8pFiGIlApsPIdw5ramf/ptYpZjuGQYPMhziVEOi0y39DiWE145pC3sd9oaZZH20ScoI3L1dgHB3HsX/bjUJq2p1MPKOkyqwymJH869/FwG0wkf6oCxHoHHmH3K2ZW6IL7wN1K/PuPQ6d9pxd2di+sK4AfmFL3iAWvu47OWNV19IGa6O1TCXB+hATmFHaBFyC1ZumTzl9wIjH27tQd566ox/dxC73qtub+WLK6IUvp7Bv14b1lpl5X2CuTAahqhVxSTFqjT9iFAf49Z7rLO67T620gxrMQHmRg1vRU5c5o7hu+TIexKjhlN9DY1bQLaLqjCNvIi72/GLt+H8pZvD/ut9HPirUxj33K+UeyhYcFWFmlJP2EVQBiqF4Gtzu0n3lT2SfTsa/kfsqU5Tw5NhN/YhoMgZ2OBF9oSeSbRuLbV5LlPTZ0abdinEaTHEHPy50g24WjQVWBmzfsFxJAUaBcKmngcZYBxiLZQC5zK2zSKx04u9n3/PcrdqyGk3ag5AfuBg+YSlM8WSwVbRPTYUaI5jESo6RBnTQSjAXA/9FdzHWt8hi5f6yuztIoNjo1YW5+2Ji3UBJ4fdexw== - template: - metadata: - name: app-sealed-secret - type: Opaque diff --git a/.kube-workflow/values.yaml b/.kube-workflow/values.yaml deleted file mode 100644 index 2a7ddc15..00000000 --- a/.kube-workflow/values.yaml +++ /dev/null @@ -1,15 +0,0 @@ -app: - enabled: true - env: - - name: APP_BASE_URL - value: 'https://{{ $.Values.global.host }}' - envFrom: - - secretRef: - name: pg-user - - secretRef: - name: app-sealed-secret - - configMapRef: - name: app-configmap - probesPath: /healthz - replicas: 1 - imagePackage: app