From 360601da9a8946aa162bad3727a4dc97a15ca469 Mon Sep 17 00:00:00 2001 From: Gary van Woerkens Date: Mon, 20 Jul 2020 00:26:18 +0200 Subject: [PATCH 01/61] generate yaml with create_db --- .k8s/components/create-db.ts | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/.k8s/components/create-db.ts b/.k8s/components/create-db.ts index eec414bb..12762008 100644 --- a/.k8s/components/create-db.ts +++ b/.k8s/components/create-db.ts @@ -9,9 +9,23 @@ ok(process.env.CI_COMMIT_SHORT_SHA, "Expect CI_COMMIT_SHORT_SHA to be defined"); const defaultExport = []; -const { createDbJob: job } = createDb(env.component("create-db")); +console.log("CI_COMMIT_SHORT_SHA", process.env.CI_COMMIT_SHORT_SHA); +console.log("env.component('create-db')", env.component("create-db")); +let params = env.component("create-db"); +params.database = "yopyop"; +params.password = "yopyop"; +params.user = "yopyop"; + +const { createDbJob: job } = createDb(params); // creates azure-pg-user secret -const { createSecret: secret } = createSecret(env.component("pg-secret")); +params = env.component("pg-secret"); +params.database = "yopyop"; +params.password = "yopyop"; +params.user = "yopyop"; +params.host = "yopyop"; + +// const { createSecret: secret } = createSecret(env.component("pg-secret")); +const { createSecret: secret } = createSecret(params); export default [job, secret]; From ed55b9a426e40913d3d705843999806fb69c18f0 Mon Sep 17 00:00:00 2001 From: Gary van Woerkens Date: Mon, 20 Jul 2020 00:37:24 +0200 Subject: [PATCH 02/61] add toml parser --- .k8s/main.ts | 5 +++++ .k8s/package.json | 3 ++- .k8s/yarn.lock | 5 +++++ 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 .k8s/main.ts diff --git a/.k8s/main.ts b/.k8s/main.ts new file mode 100644 index 00000000..5e990a15 --- /dev/null +++ b/.k8s/main.ts @@ -0,0 +1,5 @@ +import { readFileSync } from "fs"; +import { parse } from "toml"; + +const data = parse(readFileSync("./socialgouv.toml", "utf-8")); +console.dir(data); diff --git a/.k8s/package.json b/.k8s/package.json index 19fae2aa..2e62bb58 100644 --- a/.k8s/package.json +++ b/.k8s/package.json @@ -11,7 +11,8 @@ "dependencies": { "@kosko/env": "^0.5.2", "@socialgouv/kosko-charts": "2.0.0-beta.17", - "kubernetes-models": "^0.8.0" + "kubernetes-models": "^0.8.0", + "toml": "^3.0.0" }, "devDependencies": { "@kubernetes-models/sealed-secrets": "^0.1.3", diff --git a/.k8s/yarn.lock b/.k8s/yarn.lock index 7a051b44..7ae79b31 100644 --- a/.k8s/yarn.lock +++ b/.k8s/yarn.lock @@ -839,6 +839,11 @@ to-regex-range@^5.0.1: dependencies: is-number "^7.0.0" +toml@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/toml/-/toml-3.0.0.tgz#342160f1af1904ec9d204d03a5d61222d762c5ee" + integrity sha512-y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w== + ts-node@^8.10.2: version "8.10.2" resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-8.10.2.tgz#eee03764633b1234ddd37f8db9ec10b75ec7fb8d" From e3fb042449d9315b93b80ae7909b7cea1ade9d8f Mon Sep 17 00:00:00 2001 From: Gary van Woerkens Date: Mon, 20 Jul 2020 14:36:16 +0200 Subject: [PATCH 03/61] [skip ci] WIP: trying to trigger kosko generate from function call --- .k8s/components/_namespace.ts | 24 ++++++++++++++++++- .k8s/main.js | 43 +++++++++++++++++++++++++++++++++++ .k8s/main.ts | 5 ---- .k8s/package.json | 3 ++- socialgouv.toml | 43 +++++++++++++++++++++++++++++++++++ 5 files changed, 111 insertions(+), 7 deletions(-) create mode 100644 .k8s/main.js delete mode 100644 .k8s/main.ts create mode 100644 socialgouv.toml diff --git a/.k8s/components/_namespace.ts b/.k8s/components/_namespace.ts index 152174ca..a5780ba5 100644 --- a/.k8s/components/_namespace.ts +++ b/.k8s/components/_namespace.ts @@ -2,6 +2,28 @@ import { create } from "@socialgouv/kosko-charts/components/namespace"; import env from "@kosko/env"; const params = env.component("namespace"); -const { namespace } = create(params); +console.log("NAMESPACE PARAMS", params); +console.log("\nKUBE_NAMESPACE", process.env.KUBE_NAMESPACE, "\n"); +const params2 = { + annotations: { + "app.gitlab.com/app": "socialgouv-sample-next-app", + "app.gitlab.com/env": "beta-db-12-dev2", + "app.gitlab.com/env.name": "beta-db-12-dev2", + "field.cattle.io/creatorId": "gitlab", + "field.cattle.io/projectId": "c-f8qps:p-46tj7", + "git/branch": "beta-db-12", + "git/remote": "", + }, + domain: "dev2.fabrique.social.gouv.fr", + labels: { + application: "beta-db-12-dev2-sample-next-app", + owner: "sample-next-app", + team: "sample-next-app", + cert: "wildcard", + }, + namespace: { name: "sample-next-app-85-beta-db-12-dev2" }, + subdomain: "beta-db-12-dev2-sample-next-app", +}; +const { namespace } = create(params2); export default [namespace]; diff --git a/.k8s/main.js b/.k8s/main.js new file mode 100644 index 00000000..38e5c88c --- /dev/null +++ b/.k8s/main.js @@ -0,0 +1,43 @@ +const fs = require("fs"); +const toml = require("toml"); + +const data = toml.parse( + fs.readFileSync(`${__dirname}/../socialgouv.toml`, "utf-8") +); +console.dir(data); + +const kosko = require("@kosko/generate"); +console.log("GENERATE:", kosko); +const options = { + path: "/Users/gvanwoerkens/Work/dsi/sample-next-app/.k8s/components", + components: ["*"], + require: ["ts-node/register"], + baseEnvironment: "_base", +}; + +// console.log("\nKUBE_NAMESPACE", process.env.KUBE_NAMESPACE, "\n"); + +kosko.generate(options); +// import { generate, print, PrintFormat, Result } from "@kosko/generate"; +// ****** MAPPER ******** { name: 'sample-next-app-85-beta-db-12-dev2' } + +// $$$$$$$$$$ PARAMS $$$$$$$$$$ { +// annotations: { +// 'app.gitlab.com/app': 'socialgouv-sample-next-app', +// 'app.gitlab.com/env': 'beta-db-12-dev2', +// 'app.gitlab.com/env.name': 'beta-db-12-dev2', +// 'field.cattle.io/creatorId': 'gitlab', +// 'field.cattle.io/projectId': 'c-f8qps:p-46tj7', +// 'git/branch': 'beta-db-12', +// 'git/remote': '' +// }, +// domain: 'dev2.fabrique.social.gouv.fr', +// labels: { +// application: 'beta-db-12-dev2-sample-next-app', +// owner: 'sample-next-app', +// team: 'sample-next-app', +// cert: 'wildcard' +// }, +// namespace: { name: 'sample-next-app-85-beta-db-12-dev2' }, +// subdomain: 'beta-db-12-dev2-sample-next-app' +// } diff --git a/.k8s/main.ts b/.k8s/main.ts deleted file mode 100644 index 5e990a15..00000000 --- a/.k8s/main.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { readFileSync } from "fs"; -import { parse } from "toml"; - -const data = parse(readFileSync("./socialgouv.toml", "utf-8")); -console.dir(data); diff --git a/.k8s/package.json b/.k8s/package.json index 2e62bb58..1ef3b3c4 100644 --- a/.k8s/package.json +++ b/.k8s/package.json @@ -6,7 +6,8 @@ "generate:prod": "kosko generate --env prod", "gitlab": "DOTENV_CONFIG_PATH=./environments/.gitlab-ci.env kosko generate --require dotenv/config", "gitlab:dev": "yarn --silent gitlab --env dev", - "gitlab:prod": "yarn --silent gitlab --env prod" + "gitlab:prod": "yarn --silent gitlab --env prod", + "xxx": "DOTENV_CONFIG_PATH=./environments/.gitlab-ci.env npx ts-node --require dotenv/config ./main.js" }, "dependencies": { "@kosko/env": "^0.5.2", diff --git a/socialgouv.toml b/socialgouv.toml new file mode 100644 index 00000000..f1f8f7b4 --- /dev/null +++ b/socialgouv.toml @@ -0,0 +1,43 @@ +version="v0.0.0" + +[services.standup] + +[services.app] +# covid.prod2.fabrique.social.gouv.fr +name = "covid" +hosts = ["covid-19.sante.gouv.fr", "covid.fabrique.social.gouv.fr"] + +[services.app.config] +NODE_ENV = "production" +GRAPHQL_ENDPOINT="http=//hasura/v1/graphql" +ACCOUNT_MAIL_SENDER="contact@fabrique.social.gouv.fr" +FRONTEND_PORT="3000" +PRODUCTION="false" + +[services.app.dev.secret] +SMTP_EMAIL_PASSWORD="AgAGdvTnBpg52nSwcqvGIoTRkxweutFd7x1hbU/HHAH9gxPa4ICT5AOZyb+Ec9OeaSBQjf9T+4qYGC5FngtbhqfSiloVvir2NvXZOUy+O3ME33QCzfw4+nANvHmsngFDVsJdjvSz2ykT9dyNbiyFrqRBhV5RnIAqgTfvXozVOFdFeUVRelL+tZQC0miGdHUOmjjOSh4T8LntBwJOj9lv/oW1g+Vai2zOwfSGFRTeWHv/Y5WYXCiuprOzgrYUEEzxDb/ELD45S5fcwYM4KVezHe1NAWqjPhcVwLq1q4iqSaHBwGBH528pxcFcPUn3u1uK/ip3lsPiA32vi5bFantUoBiL8HfB5NedJMls/3AeyIQl53Ymu55kr/NZ5YugXExs+uCgm3aRE8EyMWnVjvYZ2npSXS9hiTsBm0jyEHOSfdLiuWvGK5r+1zz6mHuBYemQQnLjEpmRhrG5XJyJmHAsRNR1P7H1+3pqSDD8iw0yXinth3URP/4L9JrTaI4Mx2LmDmVj34oGrbMx1Ekqe7t8MjrHy/fIXRqct7X+F+GFjklALzYNuBqNUg+HxbdVKxuo9STbUVhxTXkSvlgOaT9sUiyYFybiqj8vX9VPKhKBxrUmEPue4d63v/ud3YhyHcFENUQ7PKteBUKjzPOaMNi4xvmUi6Wk/sSCBi5BZiin0obLdUGplnmO0rzX9wxllUBS+o14T5m6kWk0b1oUesVOORk9mBR1rUPKHJWCmkFYcoqTjQ==" +SMTP_EMAIL_USER="AgCVO/tUEz52Bt2Az91fIjWN6MYoV+eHqyufJ1N1RzkzgF/sw5DRdpKR5+s9ZOJvPlsEBUoUtd+iH16ZJz/vx4oSR5+KeTg4fXyOIi+jL/AB4hBYP8cQvvC9kXvK4KiS1FXiYvXKATcusvTkHdJZf/CfYB7jyXpyvMdmefiOexjwyieIP//YqPygqgOvi7RGnqohrk2S28YW17/oJA1QatbUh84wNG/6sSAfyy7coYaSU+6gTjHdommuypMRN7QKts/Hj0ZdM8xzXjQ630NzIPjZha6gG++ZDhR2hyo+vGuUESKuE37ifeEJlBhnWr/T9Qm2xE29UDChUpmtGtFz5xoxLabk8eU32qWy3WzclX26D2Ctcl1zy8atbaHq7A5JeWrV9wowhrUMVg/uiDXbt4NTcegHwCfSXl1kqNMVtJl7HijmUBMy+Yf7ntKyhdA6AoLZFQxrypzY3lgIS+2p46Ig1CP/DXakOn7yyoRW+k1KkzKv9E18QlvaRn6coyq705brLLM3/RuISw+FwGbD/VLgiHMIpCarY+Uy+K/c28320DXvoMLopAJekUnbdiPzL7vPLs2ao7BPZ+a0GDvpp+f+/T/EoVIHgiZoHiXEYmc/n2fmYd7Gb0UCa1og2ovhiegLnaFewD2OKMuP/gDuIwvnX9jU093dVupOw1muX0wgB+NH4xl7rTB42nvxLZK6N/ymfqg+LzQnqU+3drEWunSgepvKYem+86aKq2BkoJF+Ng==" +TOTO="AgDVilgKuupA5C2U/aA69wX3hl3Rbv58xFS7WGeUjq7ubq5meZhRyT3QG3Ly1rXzoPCfB3LDC0JDjRMJ1G2jmn9o0znEXYks/49m6hDaKhcwnnlIE/ThBJ/BBqnZtoAjxzoeBSvaEhV/dd/a7GrIQYiswfT8P3LVza4gKdj1li5vs7htCLnZfOrAgAqfXSxILDfHlEk9lmbL5J4JdYlVKesp6XNjcnUWaP2ycc0vW3qWlwrFU2DJw45wZCoE/76hG2s+Tk3VF5Q6kiNJCKTCf88jpeiggxIpntjLJk8nmrr9/aZ8fl8gDWUYV+15UFgh5jSP0nlWlCTmxAMmEL2lwBb9289rt0o3ZM7L+yfzLGD9QTy/Ns0hm2M4Cynwh0SD1ti/lMv/GO73XFShUO2glHM96isPFqvbBdBGua8ksp59W0TYQRMFFHbygZEj4k5K516w3gV4XonZN6INOqKt4s27R9oiOoFup2mQo0ns1sH7XB8q/wXVmro3km/dqToSOFRa/0v+fZNfzlh1X0JlqI+940CQz7I3rusrFDR5kfryVt0A6AP9tjyG9jQAjiM0lwcJgHrDARpNXuo9qzLf0yDK68NrR49XGWNugRuKHEA8Ka7vLmbeIvZOElsfn/ZCpnWrUNcRO/5dvxIQgNRIKiHVcqM1QV6V31YZMa6ZfJI/zhLaWEoOV0svcYrO9jy9H0rRtrMEqXZO0IQ8pYVfHhNxbA==" + +[services.app.prod.secret] +ACCOUNT_EMAIL_SECRET="AgAJUDKWW5mJ+ZYtqHp6uw1tFAU95wU7wS7DekdSDKBFR/4KfSUqeDpstH1lXpWg5Am3iO0oALQwXLYAtOGPi3ojHcoZojezmWvfp7oiWVaCKaIFW05tRO1j+vGsS/J5EMSCeCxjZo0QC1xVVwybwgqbYByzKpSi7qgZiVTbRSut9A9JyHXAi5hPT/CW1y8IGM02KaIfFXYHdbHLt0hK6g6X8ZV/rTGpDwkPrC5dToQ43nfTiTZpwwaJ6PbSfHueFYAnEFPeRHITRP/JUSgxtLFraWT/Q2i4etW4z3kaBNdsxpIqMKtbz1BD+quk6Do/2LfadtT+c26DCobKi9GEZP4rlzi14XET4R7uBbCrjMjXkLzDMyqbiwS7hy37fCntfWH3PwVj0d9+wU3wFgcKYQYPXdVv/Xuv+fvSvJqfH94cixjC7bDpSSrar30cnrgZSZcCqCElzXwSJpkVrExEcMtB7CywqcWFj930eyO+M5/uHGNYy/3ceWZ2WGGLY1yYcLOUriuPrJvyVk/g8HGaRtnRq3JYoq/IxIyFhAWK/mYkEI7wkdLPMZnTBv9ytMYic0t7wPjDNLk0nxZVO/UVkj/lYayZyNrqN8nWoXQ3eH0fVn++PAr0XugQjiKrTNfEOxfKz8b2IouIra3jlIZ8jgNkJEW/DcJiVKtqNIrJyyY8ZiGxn81nR67NzccstGg0/5GGmEb3g1jLw/l0qqJtd9CSyTj+JFNDeKquNAZjhqSaWcywP/VvLOPiONJF7lRprzl1L7A9Eyt2KjjrDfyARikXiUs1lpIJij5eSkkwhDznhZdF2WXuLE3Pn1h31vJ4YbpbrievKEaheu7rxvfSnoP4SAGDZydg4iSeE+Ufp/KymU4KbaVjmLFk944bcoykPnJZNvcvK1AQM9snt4e05Ky+59mRVDumx+s1IlVncT5g2u8xhSIF3rb7JE1x/1CX+y4R+H8csnvrqSoXiVqo/PbfBNDvfqmjP4SO702jbV799OcgqtiNqOY6VD3wjXBhwNOB7DQj/r1Uq6FAabWnBB2163U42M2Tu4TgUgsgRMFIfpqNWK49wIcLEBQx/5DGPP8vtSTJidDWWG/jvd3rwyexc5U99kvv5Fxpp+sOzdQ3cuMyEJU9vqS2s0S+YqSSNZLZRBeIg+GTdgo=" +HASURA_GRAPHQL_ADMIN_SECRET="AgA1vUG0gC65EPAKpTAPtum7CEzz3s24h4l6HFYrRZRE+89Hp0PgItIwNKfqaBpn3C9NwRKIh9QKvMw6CpMiRvUrp/JsRGJkdlX86CTeitQd+s112Y18yWyZA9N4rWaIVG8tdIXoJmhWrj/lsWkTEbpYUCS1iS4/geE08afe8BVKuM2yRYfWySgue1WaoDeHFUNZNdd/lDXheGG3RrltnqsiutdUQWAt7vt4VwsgpeiU0coCma9H/lrtm9Yilra6E0vqQE/IsFwk9tHt6PAZAencp5084G9KLj0rsLnKvOU3V0/8tv+cA9ZEz1VH3brZDJw1xke2yn0N4OYtjfkJJ0BT1P6QRxR8TrdofLJWRz6vrfGexSqEq2toB9jxDHNZBtTry+k41gDzft7a3KY1loFXLrrxjW/wPqLpo/xfLwiR84OMsSN3uql1s30oRjpPJxA/cb0TgEF6xi3Xi2xoe85P4XEaLUB1jm80HZjlNsIqBNB9RPjg36V1yd26OpdBmWtdzeMs/rnA5NvJWqS3bExQApTkBtqjXiXvGCTI1NSml/CCNDLcqSyPHe06a53YHGifidtt7sUDFjBKoPibW+AZEXsjGozNCTBTPMKLBQL8FzoE56MdfxcOSi5d8gYO/WXuiYLOCf5bqvOXhyfiAuYcObdEa1oP/9z1fTdcfcCcjq1pev8jAx/gVkMaDy5lnfVaBn/0Py8D+emSVGe/bqwV3Y/qxdRTSYwQqCpoXbAmMbK7ptP1ioyrloIpQAKPZvlHQj6CcfnxfY9fq+wsremhIIIxQcrDMEKV4ycVYzu98JLPbzwBPXTgud3ukLIzYqPTCPN5cm3KQFaF2A7YLNdbBl7m6Zz3MZkZnL35fDjWmf/03KAcoBV7tOi6YcAlrvBXSBoZDGTtRJORRsm6RzbS0ovobWXL3QdsNm76JwUsUczp72tFXm9btm5xEcvL2YkkDBwUuESgsi1b8tdUIWRUgQdK5cyyVa2kJL/pIFPCUffpmZrp2Wgw96Yc94PiDLJQkGBZ4YyNl9E3MwqRA1Xg6OdEZ3zVAFckSwkO9rFGiheLGVleZw5ORNtJjYBuf3AvYneyDIJ5cQFDo1t6neu2/Xpz5aCYBWCJmJkGRdr13MqOkqZEOMDrI1mBpGHxuBpjmvbGm7/IABc=" +HASURA_GRAPHQL_DATABASE_URL="AgCMIkNOWYOzWsy0nOyQ2JLRzKuU0csHyzxvia26h3z7axFC6V3v83Vhnb9ebnsHl+W7R0m5uLulCmPbw4oUZw090SnGVKH7RQebvp1N21Scc2swO+zGaGYLUVTpEhK5yWlZ6BTmoSLn1LIfrLCWcMbzueHka7jI8vXu22M/STc6ZD9tctFcmJ2uewo0XL9acXSNk+guQk9FEMxvgrROnAj5eFlVUDZJ8wHq6Du6Zni9w0Zpv6nmwOYhQBastMYx98pSlvDq6f+PEP+BrY0Mvqg8IbVQ8Hur3a3NRpkKhiDGX4VbykYfruJKDivEf/WSMBgfOr982/vlYozBgugk8NxZw9r6nP/nx1lkv74Fy82NaxupUscUeBqt+uhy7Aw1zAeWHVDKUN7KWWVVIZt/rEoz1c8t+D5Ea829hR+pqO+tAbzl5Ng1RSlMmyKlxEM3b/TRsOK1ZQ/qTbHUY+9estLhZKXwdRiTeRRz7MI7u2RFJEubByVXJ2oMcsgf7t2H5yFpFL4tCKz8sxOHQo9sjv3Kl8ZUNkekO3zhCjC53/Fby4vIVptiXAh9SDRaywRyThqkUtDWg75wNsLNv/U9wykRYeoc+eWVIt58biGWL/D7W6lvzg0TwFEIl3MbLkK/MwYHOMi9HdguKVOWdmcxH+6uUCqwRzbsCfYlRNIPChWUuUuoZs6dHdu874YynTuLJspgzOV4Qp0OW98zC+QmgP1mKhtAOjxPuKGPypzmtAEF7UFP91W/pSIZLq6CAbCfwAjh+H7n21QK81VdFX3pKBqCbWLlLS0vJuFiCJ82PyYXHn6ZZexFfk9R860sRHgZvIEoWCwy6mrfWbNF9NQOt/p/VNjK0QTPVVImWC8My5kw3D4j7cB7HWo=" +HASURA_GRAPHQL_JWT_SECRET="AgCDLmtLt7nSKvfv1e078lGOnS4gNoC4TEbvjtgnTuaYUwav8rJviKygc3c7gy0X7QK5wJquQF/pBjUMcPoLzi9VBvnZWgdG5xyuZKaupBLOjzoo7YyzCpPU/Y3xMFhE5oVsRIisnidng+g1gAodn9IX5q1+xlmd8F5B/NUp5Nl2NxQvnWV2JRtHhFgEnYMWX1IKT3GhYt0/RnfOzmeKX4ZSlM9gGsbhaftfm+krAX5sRxF++NY8dqPEyQ524gzPwABv6Exjsp+fi5gUI3lFcl/lFgdHOB50WJ4pMnVUZ77Y8Suvi6HVFt+zsLmkzsWe4kpVJU5YP1N2QPZxx0pdG6YsQHhIKf++pGr0ao6gzgEjewqhhOHtBFfdaXKtD3q1luKkOz38TXYy1cBIkFhWlO0p18wkUK++FnCeAMmTKvAxr6gX2cjzbAFM3b2bI6ZHJM1GoLhlewXqWnMVxdTc0Rpuhg1wSSSrHzkf/UVU/QPU+IEyyW/zDNVgggF/kQdNNa8Zb873YxnXPepbKG0rs5/ePUXqrx6sKireC+RaK7hfUXJXqzEBksXIHxpkHrVqGNbUPzG48AJOBJXGAS7uit2cj7pawEekR2YkHW7ck+/pFvg5/Qm10DhcMRGiI3E6ETmy0/FR3i74h2eTAXLoXSBWccq0VSPybIGGOtov6P2PuQ8EmshiSwcaJL4i4m7/3iFuhR2N3bjkk8Vmlm7I6FEzICsGVBgVvCGXy1+EYFlKBhQICKo2XKnfGF4iNTNR3Ohp8/PNZPYb6aI0vPGm5Oe/uL4C4BXhVySdxEutzVVyIi7yXLypCBUl+2DwSkYE//kHb4vfPou0OxQJ6dlym81tAFrranY2PknpDPdqcHPIxzwG4J2MopHu8sqy9+F2oQNgcw50mZClhR+bQVWlSN3YXpRrrFy5qSGLTJsVBjqiuKzaJNpb2QJgaT1y6MOdNM3pZ2qOiNnnvZUt9GJiZlNO7sUF1p0RYOKDhf5mK8qphcChNw5JnX9o3Q9ca9wHjOo3o1WuXUSzMwthd9ERedpn3GHtoJCzZ0zOQ/6IOpRJQBFZFN0i2PBzwI6RTMi2vmYwRG2KAMBnQAuJTiCyvqAVW+a2s75E+hzWoB5yUBFRByvILEv7tAkSk1q/KfevY0UUyJwiDoIPJzCRhN0dhsXhRD5v3pzhValEaKPV1XHBj9WFGDfBDU97SAVsQeBkgI06WsUHNN41Er90KDCb+QCpnhVce61FaVtoL/7Y1tkb+T3ITACSajrlpZDS08kfSVjcEDcYd6xeJDXPOI8Zo/b/pTP2dtS8kgAGbkvEkBjCkEtzZnmZuACQZTCp7/hNC8ktzGWbAX6z1U0g8qnehxL5HP7Y4Y5Lx6nvvgThqbLvlrUEPzqzZOQBFNGKqEN65b+PCuFsA0tPU2yDfdoPxLVWp8vCQRQQWIuo+m6FiW1lsDkhnUBVosBPxhXJ9mj/HtW/fAXrl1vzHEW/tCE0ufKRA+npDRu1ToOQkcqZVjwno4VL4Qg5tyVPiUmjwEVEawaUx9eN9zs5UeM7GkpPJSTHPaueGkD70AYvLzqmZIs1WKChbnSi4wiXzHAWKeEBxK+1xZJn5D5Wx0LgRmnBSyqxPp74NM0htx5rkzbGqZNcrYIF2K5AtA==" + +[services.postgres.dev] +PGUSER="AgCDLmtLt7nSKvfv1e078lGOnS4gNoC4TEbvjtgnTuaYUwav8rJviKygc3c7gy0X7QK5wJquQF/pBjUMcPoLzi9VBvnZWgdG5xyuZKaupBLOjzoo7YyzCpPU/Y3xMFhE5oVsRIisnidng+g1gAodn9IX5q1+xlmd8F5B/NUp5Nl2NxQvnWV2JRtHhFgEnYMWX1IKT3GhYt0/RnfOzmeKX4ZSlM9gGsbhaftfm+krAX5sRxF++NY8dqPEyQ524gzPwABv6Exjsp+fi5gUI3lFcl/lFgdHOB50WJ4pMnVUZ77Y8Suvi6HVFt+zsLmkzsWe4kpVJU5YP1N2QPZxx0pdG6YsQHhIKf++pGr0ao6gzgEjewqhhOHtBFfdaXKtD3q1luKkOz38TXYy1cBIkFhWlO0p18wkUK++FnCeAMmTKvAxr6gX2cjzbAFM3b2bI6ZHJM1GoLhlewXqWnMVxdTc0Rpuhg1wSSSrHzkf/UVU/QPU+IEyyW/zDNVgggF/kQdNNa8Zb873YxnXPepbKG0rs5/ePUXqrx6sKireC+RaK7hfUXJXqzEBksXIHxpkHrVqGNbUPzG48AJOBJXGAS7uit2cj7pawEekR2YkHW7ck+/pFvg5/Qm10DhcMRGiI3E6ETmy0/FR3i74h2eTAXLoXSBWccq0VSPybIGGOtov6P2PuQ8EmshiSwcaJL4i4m7/3iFuhR2N3bjkk8Vmlm7I6FEzICsGVBgVvCGXy1+EYFlKBhQICKo2XKnfGF4iNTNR3Ohp8/PNZPYb6aI0vPGm5Oe/uL4C4BXhVySdxEutzVVyIi7yXLypCBUl+2DwSkYE//kHb4vfPou0OxQJ6dlym81tAFrranY2PknpDPdqcHPIxzwG4J2MopHu8sqy9+F2oQNgcw50mZClhR+bQVWlSN3YXpRrrFy5qSGLTJsVBjqiuKzaJNpb2QJgaT1y6MOdNM3pZ2qOiNnnvZUt9GJiZlNO7sUF1p0RYOKDhf5mK8qphcChNw5JnX9o3Q9ca9wHjOo3o1WuXUSzMwthd9ERedpn3GHtoJCzZ0zOQ/6IOpRJQBFZFN0i2PBzwI6RTMi2vmYwRG2KAMBnQAuJTiCyvqAVW+a2s75E+hzWoB5yUBFRByvILEv7tAkSk1q/KfevY0UUyJwiDoIPJzCRhN0dhsXhRD5v3pzhValEaKPV1XHBj9WFGDfBDU97SAVsQeBkgI06WsUHNN41Er90KDCb+QCpnhVce61FaVtoL/7Y1tkb+T3ITACSajrlpZDS08kfSVjcEDcYd6xeJDXPOI8Zo/b/pTP2dtS8kgAGbkvEkBjCkEtzZnmZuACQZTCp7/hNC8ktzGWbAX6z1U0g8qnehxL5HP7Y4Y5Lx6nvvgThqbLvlrUEPzqzZOQBFNGKqEN65b+PCuFsA0tPU2yDfdoPxLVWp8vCQRQQWIuo+m6FiW1lsDkhnUBVosBPxhXJ9mj/HtW/fAXrl1vzHEW/tCE0ufKRA+npDRu1ToOQkcqZVjwno4VL4Qg5tyVPiUmjwEVEawaUx9eN9zs5UeM7GkpPJSTHPaueGkD70AYvLzqmZIs1WKChbnSi4wiXzHAWKeEBxK+1xZJn5D5Wx0LgRmnBSyqxPp74NM0htx5rkzbGqZNcrYIF2K5AtA==" + +[services.postgres.prod] +PGUSER="AgCDLmtLt7nSKvfv1e078lGOnS4gNoC4TEbvjtgnTuaYUwav8rJviKygc3c7gy0X7QK5wJquQF/pBjUMcPoLzi9VBvnZWgdG5xyuZKaupBLOjzoo7YyzCpPU/Y3xMFhE5oVsRIisnidng+g1gAodn9IX5q1+xlmd8F5B/NUp5Nl2NxQvnWV2JRtHhFgEnYMWX1IKT3GhYt0/RnfOzmeKX4ZSlM9gGsbhaftfm+krAX5sRxF++NY8dqPEyQ524gzPwABv6Exjsp+fi5gUI3lFcl/lFgdHOB50WJ4pMnVUZ77Y8Suvi6HVFt+zsLmkzsWe4kpVJU5YP1N2QPZxx0pdG6YsQHhIKf++pGr0ao6gzgEjewqhhOHtBFfdaXKtD3q1luKkOz38TXYy1cBIkFhWlO0p18wkUK++FnCeAMmTKvAxr6gX2cjzbAFM3b2bI6ZHJM1GoLhlewXqWnMVxdTc0Rpuhg1wSSSrHzkf/UVU/QPU+IEyyW/zDNVgggF/kQdNNa8Zb873YxnXPepbKG0rs5/ePUXqrx6sKireC+RaK7hfUXJXqzEBksXIHxpkHrVqGNbUPzG48AJOBJXGAS7uit2cj7pawEekR2YkHW7ck+/pFvg5/Qm10DhcMRGiI3E6ETmy0/FR3i74h2eTAXLoXSBWccq0VSPybIGGOtov6P2PuQ8EmshiSwcaJL4i4m7/3iFuhR2N3bjkk8Vmlm7I6FEzICsGVBgVvCGXy1+EYFlKBhQICKo2XKnfGF4iNTNR3Ohp8/PNZPYb6aI0vPGm5Oe/uL4C4BXhVySdxEutzVVyIi7yXLypCBUl+2DwSkYE//kHb4vfPou0OxQJ6dlym81tAFrranY2PknpDPdqcHPIxzwG4J2MopHu8sqy9+F2oQNgcw50mZClhR+bQVWlSN3YXpRrrFy5qSGLTJsVBjqiuKzaJNpb2QJgaT1y6MOdNM3pZ2qOiNnnvZUt9GJiZlNO7sUF1p0RYOKDhf5mK8qphcChNw5JnX9o3Q9ca9wHjOo3o1WuXUSzMwthd9ERedpn3GHtoJCzZ0zOQ/6IOpRJQBFZFN0i2PBzwI6RTMi2vmYwRG2KAMBnQAuJTiCyvqAVW+a2s75E+hzWoB5yUBFRByvILEv7tAkSk1q/KfevY0UUyJwiDoIPJzCRhN0dhsXhRD5v3pzhValEaKPV1XHBj9WFGDfBDU97SAVsQeBkgI06WsUHNN41Er90KDCb+QCpnhVce61FaVtoL/7Y1tkb+T3ITACSajrlpZDS08kfSVjcEDcYd6xeJDXPOI8Zo/b/pTP2dtS8kgAGbkvEkBjCkEtzZnmZuACQZTCp7/hNC8ktzGWbAX6z1U0g8qnehxL5HP7Y4Y5Lx6nvvgThqbLvlrUEPzqzZOQBFNGKqEN65b+PCuFsA0tPU2yDfdoPxLVWp8vCQRQQWIuo+m6FiW1lsDkhnUBVosBPxhXJ9mj/HtW/fAXrl1vzHEW/tCE0ufKRA+npDRu1ToOQkcqZVjwno4VL4Qg5tyVPiUmjwEVEawaUx9eN9zs5UeM7GkpPJSTHPaueGkD70AYvLzqmZIs1WKChbnSi4wiXzHAWKeEBxK+1xZJn5D5Wx0LgRmnBSyqxPp74NM0htx5rkzbGqZNcrYIF2K5AtA==" + +[services.hasura.config] +HASURA_GRAPHQL_DATABASE_URL = "postgres=//postgres=postgrespassword@postgres=5432/postgres" +HASURA_GRAPHQL_ENABLE_CONSOLE="false" +HASURA_GRAPHQL_ENABLED_LOG_TYPES="startup, http-log, webhook-log, websocket-log, query-log" + +[services.hasura.prod.secret] +ACCOUNT_EMAIL_SECRET="AgAJUDKWW5mJ+ZYtqHp6uw1tFAU95wU7wS7DekdSDKBFR/4KfSUqeDpstH1lXpWg5Am3iO0oALQwXLYAtOGPi3ojHcoZojezmWvfp7oiWVaCKaIFW05tRO1j+vGsS/J5EMSCeCxjZo0QC1xVVwybwgqbYByzKpSi7qgZiVTbRSut9A9JyHXAi5hPT/CW1y8IGM02KaIfFXYHdbHLt0hK6g6X8ZV/rTGpDwkPrC5dToQ43nfTiTZpwwaJ6PbSfHueFYAnEFPeRHITRP/JUSgxtLFraWT/Q2i4etW4z3kaBNdsxpIqMKtbz1BD+quk6Do/2LfadtT+c26DCobKi9GEZP4rlzi14XET4R7uBbCrjMjXkLzDMyqbiwS7hy37fCntfWH3PwVj0d9+wU3wFgcKYQYPXdVv/Xuv+fvSvJqfH94cixjC7bDpSSrar30cnrgZSZcCqCElzXwSJpkVrExEcMtB7CywqcWFj930eyO+M5/uHGNYy/3ceWZ2WGGLY1yYcLOUriuPrJvyVk/g8HGaRtnRq3JYoq/IxIyFhAWK/mYkEI7wkdLPMZnTBv9ytMYic0t7wPjDNLk0nxZVO/UVkj/lYayZyNrqN8nWoXQ3eH0fVn++PAr0XugQjiKrTNfEOxfKz8b2IouIra3jlIZ8jgNkJEW/DcJiVKtqNIrJyyY8ZiGxn81nR67NzccstGg0/5GGmEb3g1jLw/l0qqJtd9CSyTj+JFNDeKquNAZjhqSaWcywP/VvLOPiONJF7lRprzl1L7A9Eyt2KjjrDfyARikXiUs1lpIJij5eSkkwhDznhZdF2WXuLE3Pn1h31vJ4YbpbrievKEaheu7rxvfSnoP4SAGDZydg4iSeE+Ufp/KymU4KbaVjmLFk944bcoykPnJZNvcvK1AQM9snt4e05Ky+59mRVDumx+s1IlVncT5g2u8xhSIF3rb7JE1x/1CX+y4R+H8csnvrqSoXiVqo/PbfBNDvfqmjP4SO702jbV799OcgqtiNqOY6VD3wjXBhwNOB7DQj/r1Uq6FAabWnBB2163U42M2Tu4TgUgsgRMFIfpqNWK49wIcLEBQx/5DGPP8vtSTJidDWWG/jvd3rwyexc5U99kvv5Fxpp+sOzdQ3cuMyEJU9vqS2s0S+YqSSNZLZRBeIg+GTdgo=" +HASURA_GRAPHQL_ADMIN_SECRET="AgA1vUG0gC65EPAKpTAPtum7CEzz3s24h4l6HFYrRZRE+89Hp0PgItIwNKfqaBpn3C9NwRKIh9QKvMw6CpMiRvUrp/JsRGJkdlX86CTeitQd+s112Y18yWyZA9N4rWaIVG8tdIXoJmhWrj/lsWkTEbpYUCS1iS4/geE08afe8BVKuM2yRYfWySgue1WaoDeHFUNZNdd/lDXheGG3RrltnqsiutdUQWAt7vt4VwsgpeiU0coCma9H/lrtm9Yilra6E0vqQE/IsFwk9tHt6PAZAencp5084G9KLj0rsLnKvOU3V0/8tv+cA9ZEz1VH3brZDJw1xke2yn0N4OYtjfkJJ0BT1P6QRxR8TrdofLJWRz6vrfGexSqEq2toB9jxDHNZBtTry+k41gDzft7a3KY1loFXLrrxjW/wPqLpo/xfLwiR84OMsSN3uql1s30oRjpPJxA/cb0TgEF6xi3Xi2xoe85P4XEaLUB1jm80HZjlNsIqBNB9RPjg36V1yd26OpdBmWtdzeMs/rnA5NvJWqS3bExQApTkBtqjXiXvGCTI1NSml/CCNDLcqSyPHe06a53YHGifidtt7sUDFjBKoPibW+AZEXsjGozNCTBTPMKLBQL8FzoE56MdfxcOSi5d8gYO/WXuiYLOCf5bqvOXhyfiAuYcObdEa1oP/9z1fTdcfcCcjq1pev8jAx/gVkMaDy5lnfVaBn/0Py8D+emSVGe/bqwV3Y/qxdRTSYwQqCpoXbAmMbK7ptP1ioyrloIpQAKPZvlHQj6CcfnxfY9fq+wsremhIIIxQcrDMEKV4ycVYzu98JLPbzwBPXTgud3ukLIzYqPTCPN5cm3KQFaF2A7YLNdbBl7m6Zz3MZkZnL35fDjWmf/03KAcoBV7tOi6YcAlrvBXSBoZDGTtRJORRsm6RzbS0ovobWXL3QdsNm76JwUsUczp72tFXm9btm5xEcvL2YkkDBwUuESgsi1b8tdUIWRUgQdK5cyyVa2kJL/pIFPCUffpmZrp2Wgw96Yc94PiDLJQkGBZ4YyNl9E3MwqRA1Xg6OdEZ3zVAFckSwkO9rFGiheLGVleZw5ORNtJjYBuf3AvYneyDIJ5cQFDo1t6neu2/Xpz5aCYBWCJmJkGRdr13MqOkqZEOMDrI1mBpGHxuBpjmvbGm7/IABc=" +HASURA_GRAPHQL_DATABASE_URL="AgCMIkNOWYOzWsy0nOyQ2JLRzKuU0csHyzxvia26h3z7axFC6V3v83Vhnb9ebnsHl+W7R0m5uLulCmPbw4oUZw090SnGVKH7RQebvp1N21Scc2swO+zGaGYLUVTpEhK5yWlZ6BTmoSLn1LIfrLCWcMbzueHka7jI8vXu22M/STc6ZD9tctFcmJ2uewo0XL9acXSNk+guQk9FEMxvgrROnAj5eFlVUDZJ8wHq6Du6Zni9w0Zpv6nmwOYhQBastMYx98pSlvDq6f+PEP+BrY0Mvqg8IbVQ8Hur3a3NRpkKhiDGX4VbykYfruJKDivEf/WSMBgfOr982/vlYozBgugk8NxZw9r6nP/nx1lkv74Fy82NaxupUscUeBqt+uhy7Aw1zAeWHVDKUN7KWWVVIZt/rEoz1c8t+D5Ea829hR+pqO+tAbzl5Ng1RSlMmyKlxEM3b/TRsOK1ZQ/qTbHUY+9estLhZKXwdRiTeRRz7MI7u2RFJEubByVXJ2oMcsgf7t2H5yFpFL4tCKz8sxOHQo9sjv3Kl8ZUNkekO3zhCjC53/Fby4vIVptiXAh9SDRaywRyThqkUtDWg75wNsLNv/U9wykRYeoc+eWVIt58biGWL/D7W6lvzg0TwFEIl3MbLkK/MwYHOMi9HdguKVOWdmcxH+6uUCqwRzbsCfYlRNIPChWUuUuoZs6dHdu874YynTuLJspgzOV4Qp0OW98zC+QmgP1mKhtAOjxPuKGPypzmtAEF7UFP91W/pSIZLq6CAbCfwAjh+H7n21QK81VdFX3pKBqCbWLlLS0vJuFiCJ82PyYXHn6ZZexFfk9R860sRHgZvIEoWCwy6mrfWbNF9NQOt/p/VNjK0QTPVVImWC8My5kw3D4j7cB7HWo=" +HASURA_GRAPHQL_JWT_SECRET="AgCDLmtLt7nSKvfv1e078lGOnS4gNoC4TEbvjtgnTuaYUwav8rJviKygc3c7gy0X7QK5wJquQF/pBjUMcPoLzi9VBvnZWgdG5xyuZKaupBLOjzoo7YyzCpPU/Y3xMFhE5oVsRIisnidng+g1gAodn9IX5q1+xlmd8F5B/NUp5Nl2NxQvnWV2JRtHhFgEnYMWX1IKT3GhYt0/RnfOzmeKX4ZSlM9gGsbhaftfm+krAX5sRxF++NY8dqPEyQ524gzPwABv6Exjsp+fi5gUI3lFcl/lFgdHOB50WJ4pMnVUZ77Y8Suvi6HVFt+zsLmkzsWe4kpVJU5YP1N2QPZxx0pdG6YsQHhIKf++pGr0ao6gzgEjewqhhOHtBFfdaXKtD3q1luKkOz38TXYy1cBIkFhWlO0p18wkUK++FnCeAMmTKvAxr6gX2cjzbAFM3b2bI6ZHJM1GoLhlewXqWnMVxdTc0Rpuhg1wSSSrHzkf/UVU/QPU+IEyyW/zDNVgggF/kQdNNa8Zb873YxnXPepbKG0rs5/ePUXqrx6sKireC+RaK7hfUXJXqzEBksXIHxpkHrVqGNbUPzG48AJOBJXGAS7uit2cj7pawEekR2YkHW7ck+/pFvg5/Qm10DhcMRGiI3E6ETmy0/FR3i74h2eTAXLoXSBWccq0VSPybIGGOtov6P2PuQ8EmshiSwcaJL4i4m7/3iFuhR2N3bjkk8Vmlm7I6FEzICsGVBgVvCGXy1+EYFlKBhQICKo2XKnfGF4iNTNR3Ohp8/PNZPYb6aI0vPGm5Oe/uL4C4BXhVySdxEutzVVyIi7yXLypCBUl+2DwSkYE//kHb4vfPou0OxQJ6dlym81tAFrranY2PknpDPdqcHPIxzwG4J2MopHu8sqy9+F2oQNgcw50mZClhR+bQVWlSN3YXpRrrFy5qSGLTJsVBjqiuKzaJNpb2QJgaT1y6MOdNM3pZ2qOiNnnvZUt9GJiZlNO7sUF1p0RYOKDhf5mK8qphcChNw5JnX9o3Q9ca9wHjOo3o1WuXUSzMwthd9ERedpn3GHtoJCzZ0zOQ/6IOpRJQBFZFN0i2PBzwI6RTMi2vmYwRG2KAMBnQAuJTiCyvqAVW+a2s75E+hzWoB5yUBFRByvILEv7tAkSk1q/KfevY0UUyJwiDoIPJzCRhN0dhsXhRD5v3pzhValEaKPV1XHBj9WFGDfBDU97SAVsQeBkgI06WsUHNN41Er90KDCb+QCpnhVce61FaVtoL/7Y1tkb+T3ITACSajrlpZDS08kfSVjcEDcYd6xeJDXPOI8Zo/b/pTP2dtS8kgAGbkvEkBjCkEtzZnmZuACQZTCp7/hNC8ktzGWbAX6z1U0g8qnehxL5HP7Y4Y5Lx6nvvgThqbLvlrUEPzqzZOQBFNGKqEN65b+PCuFsA0tPU2yDfdoPxLVWp8vCQRQQWIuo+m6FiW1lsDkhnUBVosBPxhXJ9mj/HtW/fAXrl1vzHEW/tCE0ufKRA+npDRu1ToOQkcqZVjwno4VL4Qg5tyVPiUmjwEVEawaUx9eN9zs5UeM7GkpPJSTHPaueGkD70AYvLzqmZIs1WKChbnSi4wiXzHAWKeEBxK+1xZJn5D5Wx0LgRmnBSyqxPp74NM0htx5rkzbGqZNcrYIF2K5AtA==" From ab1e0e9754cb8e6233c82cac65235a859c368cd8 Mon Sep 17 00:00:00 2001 From: Julien Bouquillon Date: Fri, 24 Jul 2020 07:23:02 +0200 Subject: [PATCH 04/61] wip --- .k8s/components/_namespace.ts | 30 ++---------- .k8s/components/app.ts | 68 ++-------------------------- .k8s/environments/.gitlab-ci.env | 1 + .k8s/environments/_base/namespace.ts | 3 -- .k8s/package.json | 2 +- .k8s/yarn.lock | 24 +++------- 6 files changed, 16 insertions(+), 112 deletions(-) delete mode 100644 .k8s/environments/_base/namespace.ts diff --git a/.k8s/components/_namespace.ts b/.k8s/components/_namespace.ts index a5780ba5..8de65e4f 100644 --- a/.k8s/components/_namespace.ts +++ b/.k8s/components/_namespace.ts @@ -1,29 +1,5 @@ -import { create } from "@socialgouv/kosko-charts/components/namespace"; -import env from "@kosko/env"; +import { createNamespace } from "@socialgouv/kosko-charts/utils/createNamespace"; -const params = env.component("namespace"); -console.log("NAMESPACE PARAMS", params); -console.log("\nKUBE_NAMESPACE", process.env.KUBE_NAMESPACE, "\n"); -const params2 = { - annotations: { - "app.gitlab.com/app": "socialgouv-sample-next-app", - "app.gitlab.com/env": "beta-db-12-dev2", - "app.gitlab.com/env.name": "beta-db-12-dev2", - "field.cattle.io/creatorId": "gitlab", - "field.cattle.io/projectId": "c-f8qps:p-46tj7", - "git/branch": "beta-db-12", - "git/remote": "", - }, - domain: "dev2.fabrique.social.gouv.fr", - labels: { - application: "beta-db-12-dev2-sample-next-app", - owner: "sample-next-app", - team: "sample-next-app", - cert: "wildcard", - }, - namespace: { name: "sample-next-app-85-beta-db-12-dev2" }, - subdomain: "beta-db-12-dev2-sample-next-app", -}; -const { namespace } = create(params2); +const manifests = createNamespace(); -export default [namespace]; +export default manifests; diff --git a/.k8s/components/app.ts b/.k8s/components/app.ts index 67d1df5c..b831375b 100644 --- a/.k8s/components/app.ts +++ b/.k8s/components/app.ts @@ -1,71 +1,11 @@ import { ok } from "assert"; import { create } from "@socialgouv/kosko-charts/components/app"; -import { metadataFromParams } from "@socialgouv/kosko-charts/components/app/metadata"; -import env from "@kosko/env"; -import { addToEnvFrom } from "@socialgouv/kosko-charts/utils/addToEnvFrom"; -import { ConfigMap } from "kubernetes-models/v1/ConfigMap"; -import { EnvFromSource } from "kubernetes-models/v1/EnvFromSource"; -import { SealedSecret } from "@kubernetes-models/sealed-secrets/bitnami.com/v1alpha1/SealedSecret"; -import { loadYaml } from "../getEnvironmentComponent"; ok(process.env.CI_COMMIT_SHORT_SHA, "Expect CI_COMMIT_SHORT_SHA to be defined"); -const params = env.component("app"); -const { deployment, ingress, service } = create(params); +//const params = env.component("app"); +const manifests = create(); -const secret = new SealedSecret({ - ...loadYaml(env, "app-env.sealed-secret.yaml"), - metadata: { - ...metadataFromParams(params), - name: `app-env`, - annotations: { - "sealedsecrets.bitnami.com/cluster-wide": "true", - }, - }, -}); +console.log("manifests", manifests); -const configMap = new ConfigMap({ - ...loadYaml(env, "app-env.configmap.yaml"), - metadata: { - ...metadataFromParams(params), - name: `app-env`, - }, - data: { - FRONTEND_HOST: ingress.spec!.rules![0].host!, - }, -}); - -// - -const secretSource = new EnvFromSource({ - secretRef: { - name: `app-env`, - }, -}); - -const configMapSource = new EnvFromSource({ - configMapRef: { - name: `app-env`, - }, -}); - -addToEnvFrom({ - deployment, - data: [secretSource, configMapSource], -}); - -if (process.env.ENABLE_AZURE_POSTGRES) { - const azureSecretSource = new EnvFromSource({ - secretRef: { - name: `azure-pg-user-${process.env.CI_COMMIT_SHORT_SHA}`, - }, - }); - addToEnvFrom({ - deployment, - data: [azureSecretSource], - }); -} - -// - -export default [secret, configMap, deployment, ingress, service]; +export default manifests; diff --git a/.k8s/environments/.gitlab-ci.env b/.k8s/environments/.gitlab-ci.env index b8b7a251..545702c6 100644 --- a/.k8s/environments/.gitlab-ci.env +++ b/.k8s/environments/.gitlab-ci.env @@ -6,6 +6,7 @@ CI_COMMIT_REF_NAME=beta-db-12 CI_COMMIT_REF_PROTECTED=false CI_COMMIT_REF_SLUG=beta-db-12 CI_COMMIT_SHA=c58c0974f7023063b1296d3a5a285b46b92771f8 +CI_COMMIT_TAG=xyz42 CI_COMMIT_SHORT_SHA=c58c0974 CI_COMMIT_TITLE=build(k8s): add dummy drop-db job CI_ENVIRONMENT_NAME=beta-db-12-dev2 diff --git a/.k8s/environments/_base/namespace.ts b/.k8s/environments/_base/namespace.ts deleted file mode 100644 index 7dbfb8e8..00000000 --- a/.k8s/environments/_base/namespace.ts +++ /dev/null @@ -1,3 +0,0 @@ -import gitlab from "@socialgouv/kosko-charts/environments/gitlab/namespaces"; - -export default gitlab(process.env); diff --git a/.k8s/package.json b/.k8s/package.json index 1ef3b3c4..c7bf421e 100644 --- a/.k8s/package.json +++ b/.k8s/package.json @@ -11,7 +11,7 @@ }, "dependencies": { "@kosko/env": "^0.5.2", - "@socialgouv/kosko-charts": "2.0.0-beta.17", + "@socialgouv/kosko-charts": "link:../../kosko-charts", "kubernetes-models": "^0.8.0", "toml": "^3.0.0" }, diff --git a/.k8s/yarn.lock b/.k8s/yarn.lock index 7ae79b31..c7a9af91 100644 --- a/.k8s/yarn.lock +++ b/.k8s/yarn.lock @@ -125,19 +125,9 @@ "@nodelib/fs.scandir" "2.1.3" fastq "^1.6.0" -"@sindresorhus/is@^3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-3.0.0.tgz#78fabc5e295adb6e1ef57eaafe4cc5d7aa35b183" - integrity sha512-kqA5I6Yun7PBHk8WN9BBP1c7FfN2SrD05GuVSEYPqDb4nerv7HqYfgBfMIKmT/EuejURkJKLZuLyGKGs6WEG9w== - -"@socialgouv/kosko-charts@2.0.0-beta.17": - version "2.0.0-beta.17" - resolved "https://registry.yarnpkg.com/@socialgouv/kosko-charts/-/kosko-charts-2.0.0-beta.17.tgz#c3338973d69ec908ed5aee571404afaf1e2da51a" - integrity sha512-u2BcfrOvMQKJtoVmU9uarToA3r4qmBL0IclLeYdAyJ7pLEmQePd+r140xNdviF1ZLwd7h0NeHjAhH1XvM6eSaA== - dependencies: - "@sindresorhus/is" "^3.0.0" - fp-ts "^2.6.6" - io-ts "2.2.7" +"@socialgouv/kosko-charts@link:../../kosko-charts": + version "0.0.0" + uid "" "@types/color-name@^1.1.1": version "1.1.1" @@ -462,10 +452,10 @@ import-local@^3.0.2: pkg-dir "^4.2.0" resolve-cwd "^3.0.0" -io-ts@2.2.7: - version "2.2.7" - resolved "https://registry.yarnpkg.com/io-ts/-/io-ts-2.2.7.tgz#5c05477580bff4c0154b474316c8916253e87c44" - integrity sha512-kCusyu/Fa0oax5ue2Id/ZqVLEk5JOWyrXHcLbD4kHoVM50MhDEWUtcHlN7RrD94I8OrWILcVltM6OllnZiHJmg== +io-ts@2.2.6: + version "2.2.6" + resolved "https://registry.yarnpkg.com/io-ts/-/io-ts-2.2.6.tgz#809305ef9af646c4edf79145671298835e321758" + integrity sha512-UcO9I/ptnGttBKRAF3KW0G6fiS7uqfjUSDdeq+qmMKH0k8sZrbDMnNP8I/TTSkoztPr5OZstnQxb1Vo5Ua8MOg== is-arrayish@^0.2.1: version "0.2.1" From e26560d4f5ae4bcfd2acccdc1d36707313673250 Mon Sep 17 00:00:00 2001 From: Julien Bouquillon Date: Fri, 24 Jul 2020 13:28:27 +0200 Subject: [PATCH 05/61] wip --- .k8s/components/app.ts | 3 ++- .../dev/{app-env.sealed-secret.yaml => app.sealed-secret.yaml} | 0 2 files changed, 2 insertions(+), 1 deletion(-) rename .k8s/environments/dev/{app-env.sealed-secret.yaml => app.sealed-secret.yaml} (100%) diff --git a/.k8s/components/app.ts b/.k8s/components/app.ts index b831375b..6e652cc1 100644 --- a/.k8s/components/app.ts +++ b/.k8s/components/app.ts @@ -1,10 +1,11 @@ import { ok } from "assert"; import { create } from "@socialgouv/kosko-charts/components/app"; +import env from "@kosko/env"; ok(process.env.CI_COMMIT_SHORT_SHA, "Expect CI_COMMIT_SHORT_SHA to be defined"); //const params = env.component("app"); -const manifests = create(); +const manifests = create(env); console.log("manifests", manifests); diff --git a/.k8s/environments/dev/app-env.sealed-secret.yaml b/.k8s/environments/dev/app.sealed-secret.yaml similarity index 100% rename from .k8s/environments/dev/app-env.sealed-secret.yaml rename to .k8s/environments/dev/app.sealed-secret.yaml From d18be1ec9acea787163d53ae02f790db849953cf Mon Sep 17 00:00:00 2001 From: Julien Bouquillon Date: Fri, 24 Jul 2020 15:18:09 +0200 Subject: [PATCH 06/61] wip --- .k8s/components/app.ts | 9 ++------- .../dev/{app-env.configmap.yaml => app.configmap.yaml} | 2 +- .k8s/environments/dev/app.sealed-secret.yaml | 4 ++-- .../{hasura-env.configmap.yaml => hasura.configmap.yaml} | 0 ...-env.sealed-secret.yaml => hasura.sealed-secret.yaml} | 0 5 files changed, 5 insertions(+), 10 deletions(-) rename .k8s/environments/dev/{app-env.configmap.yaml => app.configmap.yaml} (90%) rename .k8s/environments/dev/{hasura-env.configmap.yaml => hasura.configmap.yaml} (100%) rename .k8s/environments/dev/{hasura-env.sealed-secret.yaml => hasura.sealed-secret.yaml} (100%) diff --git a/.k8s/components/app.ts b/.k8s/components/app.ts index 6e652cc1..b3e91705 100644 --- a/.k8s/components/app.ts +++ b/.k8s/components/app.ts @@ -1,12 +1,7 @@ -import { ok } from "assert"; -import { create } from "@socialgouv/kosko-charts/components/app"; - import env from "@kosko/env"; -ok(process.env.CI_COMMIT_SHORT_SHA, "Expect CI_COMMIT_SHORT_SHA to be defined"); -//const params = env.component("app"); -const manifests = create(env); +import { create } from "@socialgouv/kosko-charts/components/app"; -console.log("manifests", manifests); +const manifests = create("app", env); export default manifests; diff --git a/.k8s/environments/dev/app-env.configmap.yaml b/.k8s/environments/dev/app.configmap.yaml similarity index 90% rename from .k8s/environments/dev/app-env.configmap.yaml rename to .k8s/environments/dev/app.configmap.yaml index eab24217..4c0c9c62 100644 --- a/.k8s/environments/dev/app-env.configmap.yaml +++ b/.k8s/environments/dev/app.configmap.yaml @@ -1,7 +1,7 @@ kind: ConfigMap apiVersion: v1 metadata: - name: app-env + name: app-configmap data: NODE_ENV: "production" GRAPHQL_ENDPOINT: "http://hasura/v1/graphql" diff --git a/.k8s/environments/dev/app.sealed-secret.yaml b/.k8s/environments/dev/app.sealed-secret.yaml index 90cb3f5b..f86aaea3 100644 --- a/.k8s/environments/dev/app.sealed-secret.yaml +++ b/.k8s/environments/dev/app.sealed-secret.yaml @@ -2,7 +2,7 @@ apiVersion: bitnami.com/v1alpha1 kind: SealedSecret metadata: creationTimestamp: null - name: app-env + name: app-sealed-secret spec: encryptedData: SMTP_EMAIL_PASSWORD: AgAGdvTnBpg52nSwcqvGIoTRkxweutFd7x1hbU/HHAH9gxPa4ICT5AOZyb+Ec9OeaSBQjf9T+4qYGC5FngtbhqfSiloVvir2NvXZOUy+O3ME33QCzfw4+nANvHmsngFDVsJdjvSz2ykT9dyNbiyFrqRBhV5RnIAqgTfvXozVOFdFeUVRelL+tZQC0miGdHUOmjjOSh4T8LntBwJOj9lv/oW1g+Vai2zOwfSGFRTeWHv/Y5WYXCiuprOzgrYUEEzxDb/ELD45S5fcwYM4KVezHe1NAWqjPhcVwLq1q4iqSaHBwGBH528pxcFcPUn3u1uK/ip3lsPiA32vi5bFantUoBiL8HfB5NedJMls/3AeyIQl53Ymu55kr/NZ5YugXExs+uCgm3aRE8EyMWnVjvYZ2npSXS9hiTsBm0jyEHOSfdLiuWvGK5r+1zz6mHuBYemQQnLjEpmRhrG5XJyJmHAsRNR1P7H1+3pqSDD8iw0yXinth3URP/4L9JrTaI4Mx2LmDmVj34oGrbMx1Ekqe7t8MjrHy/fIXRqct7X+F+GFjklALzYNuBqNUg+HxbdVKxuo9STbUVhxTXkSvlgOaT9sUiyYFybiqj8vX9VPKhKBxrUmEPue4d63v/ud3YhyHcFENUQ7PKteBUKjzPOaMNi4xvmUi6Wk/sSCBi5BZiin0obLdUGplnmO0rzX9wxllUBS+o14T5m6kWk0b1oUesVOORk9mBR1rUPKHJWCmkFYcoqTjQ== @@ -13,5 +13,5 @@ spec: annotations: sealedsecrets.bitnami.com/cluster-wide: "true" creationTimestamp: null - name: app-env + name: app-sealed-secret type: Opaque diff --git a/.k8s/environments/dev/hasura-env.configmap.yaml b/.k8s/environments/dev/hasura.configmap.yaml similarity index 100% rename from .k8s/environments/dev/hasura-env.configmap.yaml rename to .k8s/environments/dev/hasura.configmap.yaml diff --git a/.k8s/environments/dev/hasura-env.sealed-secret.yaml b/.k8s/environments/dev/hasura.sealed-secret.yaml similarity index 100% rename from .k8s/environments/dev/hasura-env.sealed-secret.yaml rename to .k8s/environments/dev/hasura.sealed-secret.yaml From 9c61802619345fb67bb36b077c3d2b6d57f6cabe Mon Sep 17 00:00:00 2001 From: Julien Bouquillon Date: Fri, 24 Jul 2020 16:53:44 +0200 Subject: [PATCH 07/61] progrss --- .k8s/components/hasura.ts | 79 ++++--------------- .k8s/environments/_base/app.ts | 14 +--- .k8s/environments/dev/hasura.configmap.yaml | 2 +- .../dev/hasura.sealed-secret.yaml | 2 +- 4 files changed, 18 insertions(+), 79 deletions(-) diff --git a/.k8s/components/hasura.ts b/.k8s/components/hasura.ts index 7b471652..60f34145 100644 --- a/.k8s/components/hasura.ts +++ b/.k8s/components/hasura.ts @@ -1,72 +1,21 @@ -import { ok } from "assert"; -import { create } from "@socialgouv/kosko-charts/components/app"; -import { metadataFromParams } from "@socialgouv/kosko-charts/components/app/metadata"; import env from "@kosko/env"; -import { ConfigMap } from "kubernetes-models/v1/ConfigMap"; -import { addToEnvFrom } from "@socialgouv/kosko-charts/utils/addToEnvFrom"; -import { EnvFromSource } from "kubernetes-models/v1/EnvFromSource"; -import { loadYaml } from "../getEnvironmentComponent"; -import { SealedSecret } from "@kubernetes-models/sealed-secrets/bitnami.com/v1alpha1/SealedSecret"; - -ok(process.env.CI_COMMIT_SHORT_SHA, "Expect CI_COMMIT_SHORT_SHA to be defined"); -const params = env.component("hasura"); -const { deployment, ingress, service } = create(params); - -// - -const secret = new SealedSecret({ - ...loadYaml(env, "hasura-env.sealed-secret.yaml"), - metadata: { - ...metadataFromParams(params), - name: `hasura-env`, - annotations: { - "sealedsecrets.bitnami.com/cluster-wide": "true", - }, - }, -}); - -// - -const configMap = new ConfigMap({ - ...loadYaml(env, "hasura-env.configmap.yaml"), - metadata: { - ...metadataFromParams(params), - name: `hasura-env`, - }, -}); - -// - -const secretSource = new EnvFromSource({ - secretRef: { - name: `hasura-env`, - }, -}); - -const configMapSource = new EnvFromSource({ - configMapRef: { - name: `hasura-env`, - }, -}); +import { create } from "@socialgouv/kosko-charts/components/app"; -addToEnvFrom({ - deployment, - data: [secretSource, configMapSource], -}); +const manifests = create("app", env); -if (process.env.ENABLE_AZURE_POSTGRES) { - const azureSecretSource = new EnvFromSource({ - secretRef: { - name: `azure-pg-user-${process.env.CI_COMMIT_SHORT_SHA}`, - }, - }); - addToEnvFrom({ - deployment, - data: [azureSecretSource], - }); -} +// if (process.env.ENABLE_AZURE_POSTGRES) { +// const azureSecretSource = new EnvFromSource({ +// secretRef: { +// name: `azure-pg-user-${process.env.CI_COMMIT_SHORT_SHA}`, +// }, +// }); +// addToEnvFrom({ +// deployment, +// data: [azureSecretSource], +// }); +// } // -export default [deployment, ingress, service, configMap, secret]; +export default manifests; diff --git a/.k8s/environments/_base/app.ts b/.k8s/environments/_base/app.ts index c5c61aa6..d317fdd5 100644 --- a/.k8s/environments/_base/app.ts +++ b/.k8s/environments/_base/app.ts @@ -1,16 +1,6 @@ -import { AppComponentEnvironment } from "@socialgouv/kosko-charts/components/app/params"; +//import { AppComponentEnvironment } from "@socialgouv/kosko-charts/components/app/params"; export default { - name: "app", - image: { - name: process.env.CI_REGISTRY_IMAGE, - tag: process.env.CI_COMMIT_TAG - ? process.env.CI_COMMIT_TAG.slice(1) - : process.env.CI_COMMIT_SHA, - }, - ingress: { - secretName: process.env.PRODUCTION ? "www-crt" : "wildcard-crt", - }, labels: { component: "next", }, @@ -24,4 +14,4 @@ export default { }, containerPort: 3000, servicePort: 3000, -} as Readonly; +}; diff --git a/.k8s/environments/dev/hasura.configmap.yaml b/.k8s/environments/dev/hasura.configmap.yaml index 9ac9d11b..8f404c60 100644 --- a/.k8s/environments/dev/hasura.configmap.yaml +++ b/.k8s/environments/dev/hasura.configmap.yaml @@ -1,7 +1,7 @@ kind: ConfigMap apiVersion: v1 metadata: - name: hasura-env + name: hasura-configmap data: ACCOUNT_EMAIL_SECRET: "ACCOUNT_EMAIL_SECRET" ACCOUNT_EMAIL_WEBHOOK_URL: "http://app:3000/api/webhooks/account" diff --git a/.k8s/environments/dev/hasura.sealed-secret.yaml b/.k8s/environments/dev/hasura.sealed-secret.yaml index f8cfcce1..92614571 100644 --- a/.k8s/environments/dev/hasura.sealed-secret.yaml +++ b/.k8s/environments/dev/hasura.sealed-secret.yaml @@ -10,5 +10,5 @@ spec: annotations: sealedsecrets.bitnami.com/cluster-wide: "true" creationTimestamp: null - name: hasura-env + name: hasura-sealed-secret type: Opaque From eb777f0c15339b188dac14fd0ddc4418fb1cf46b Mon Sep 17 00:00:00 2001 From: Julien Bouquillon Date: Sat, 25 Jul 2020 01:26:25 +0200 Subject: [PATCH 08/61] progress --- .k8s/components/app.ts | 15 ++++- .../azure-pg-admin-user.sealed-secret.ts | 4 +- .k8s/components/hasura.ts | 16 ++++- .k8s/components/pgweb.ts | 65 ++++++++----------- .k8s/environments/_base/app.ts | 17 ----- .k8s/environments/_base/hasura.ts | 29 --------- .k8s/environments/_base/index.ts | 30 --------- .k8s/environments/_base/pgweb.ts | 26 -------- .k8s/environments/dev/index.ts | 11 ---- 9 files changed, 59 insertions(+), 154 deletions(-) delete mode 100644 .k8s/environments/_base/app.ts delete mode 100644 .k8s/environments/_base/hasura.ts delete mode 100644 .k8s/environments/_base/index.ts delete mode 100644 .k8s/environments/_base/pgweb.ts delete mode 100644 .k8s/environments/dev/index.ts diff --git a/.k8s/components/app.ts b/.k8s/components/app.ts index b3e91705..ed0dd701 100644 --- a/.k8s/components/app.ts +++ b/.k8s/components/app.ts @@ -2,6 +2,19 @@ import env from "@kosko/env"; import { create } from "@socialgouv/kosko-charts/components/app"; -const manifests = create("app", env); +const manifests = create("app", { + env, + config: { + requests: { + cpu: "1m", + memory: "64Mi", + }, + limits: { + cpu: "50m", + memory: "128Mi", + }, + containerPort: 3000, + }, +}); export default manifests; diff --git a/.k8s/components/azure-pg-admin-user.sealed-secret.ts b/.k8s/components/azure-pg-admin-user.sealed-secret.ts index 6a8e03a2..78bb3912 100644 --- a/.k8s/components/azure-pg-admin-user.sealed-secret.ts +++ b/.k8s/components/azure-pg-admin-user.sealed-secret.ts @@ -1,12 +1,12 @@ import { SealedSecret } from "@kubernetes-models/sealed-secrets/bitnami.com/v1alpha1/SealedSecret"; import env from "@kosko/env"; -import { metadataFromParams } from "@socialgouv/kosko-charts/components/app/metadata"; +//import { metadataFromParams } from "@socialgouv/kosko-charts/components/app/metadata"; const params = env.component("create-db"); const secret = new SealedSecret({ metadata: { - ...metadataFromParams(params), + // ...metadataFromParams(params), name: `azure-pg-admin-user`, annotations: { "sealedsecrets.bitnami.com/cluster-wide": "true", diff --git a/.k8s/components/hasura.ts b/.k8s/components/hasura.ts index 60f34145..a0a4dae2 100644 --- a/.k8s/components/hasura.ts +++ b/.k8s/components/hasura.ts @@ -2,7 +2,21 @@ import env from "@kosko/env"; import { create } from "@socialgouv/kosko-charts/components/app"; -const manifests = create("app", env); +const manifests = create("hasura", { + env, + config: { + subdomain: `hasura-${process.env.CI_PROJECT_NAME as string}`, + requests: { + cpu: "100m", + memory: "64Mi", + }, + limits: { + cpu: "500m", + memory: "256Mi", + }, + containerPort: 80, + }, +}); // if (process.env.ENABLE_AZURE_POSTGRES) { // const azureSecretSource = new EnvFromSource({ diff --git a/.k8s/components/pgweb.ts b/.k8s/components/pgweb.ts index ec6a00e2..74a0a119 100644 --- a/.k8s/components/pgweb.ts +++ b/.k8s/components/pgweb.ts @@ -1,41 +1,34 @@ -import { ok } from "assert"; -import { create } from "@socialgouv/kosko-charts/components/app"; -import { metadataFromParams } from "@socialgouv/kosko-charts/components/app/metadata"; import env from "@kosko/env"; -import { merge } from "@socialgouv/kosko-charts/utils/merge"; -import { ConfigMap } from "kubernetes-models/v1/ConfigMap"; -import { SealedSecret } from "@kubernetes-models/sealed-secrets/bitnami.com/v1alpha1/SealedSecret"; - -const params = env.component("pgweb"); -const { deployment, ingress, service } = create(params); -// -ok(process.env.CI_ENVIRONMENT_NAME); -if ( - process.env.CI_ENVIRONMENT_NAME.endsWith("-dev") || - process.env.CI_ENVIRONMENT_NAME.endsWith("prod") -) { - // HACK(douglasduteil): our cluster v1 is not supporting the `startupProbe` - // Our cluster v1 is stuck in k8s v1.14 :( - delete deployment.spec!.template.spec!.containers[0].startupProbe; -} +import { create } from "@socialgouv/kosko-charts/components/app"; -deployment.spec!.template.spec!.containers[0].livenessProbe = { - httpGet: { - path: "/", - port: "http", - }, - initialDelaySeconds: 5, - timeoutSeconds: 3, -}; -deployment.spec!.template.spec!.containers[0].readinessProbe = { - httpGet: { - path: "/", - port: "http", +const manifests = create("pgweb", { + env, + config: { + subdomain: `pgweb-${process.env.CI_PROJECT_NAME as string}`, + livenessProbe: { + httpGet: { + path: "/", + port: "http", + }, + initialDelaySeconds: 5, + timeoutSeconds: 3, + }, + readinessProbe: { + httpGet: { + path: "/", + port: "http", + }, + initialDelaySeconds: 5, + timeoutSeconds: 3, + }, + containerPort: 8081, }, - initialDelaySeconds: 5, - timeoutSeconds: 3, -}; +}); + +export default manifests; + +/* if (process.env.ENABLE_AZURE_POSTGRES) { deployment.spec!.template.spec!.containers[0].envFrom = [ @@ -47,6 +40,4 @@ if (process.env.ENABLE_AZURE_POSTGRES) { ]; } -// - -export default [deployment, ingress, service]; +*/ diff --git a/.k8s/environments/_base/app.ts b/.k8s/environments/_base/app.ts deleted file mode 100644 index d317fdd5..00000000 --- a/.k8s/environments/_base/app.ts +++ /dev/null @@ -1,17 +0,0 @@ -//import { AppComponentEnvironment } from "@socialgouv/kosko-charts/components/app/params"; - -export default { - labels: { - component: "next", - }, - requests: { - cpu: "1m", - memory: "64Mi", - }, - limits: { - cpu: "50m", - memory: "128Mi", - }, - containerPort: 3000, - servicePort: 3000, -}; diff --git a/.k8s/environments/_base/hasura.ts b/.k8s/environments/_base/hasura.ts deleted file mode 100644 index 71156098..00000000 --- a/.k8s/environments/_base/hasura.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { AppComponentEnvironment } from "@socialgouv/kosko-charts/components/app/params"; -import { GlobalEnvironment } from "@socialgouv/kosko-charts/types"; - -export default { - name: "hasura", - subdomain: `hasura-${process.env.CI_PROJECT_NAME as string}`, - image: { - name: process.env.CI_REGISTRY_IMAGE + "/hasura", - tag: process.env.CI_COMMIT_TAG - ? process.env.CI_COMMIT_TAG.slice(1) - : process.env.CI_COMMIT_SHA, - }, - ingress: { - secretName: process.env.PRODUCTION ? "hasura-crt" : "wildcard-crt", - }, - labels: { - component: "hasura", - }, - requests: { - cpu: "100m", - memory: "64Mi", - }, - limits: { - cpu: "500m", - memory: "256Mi", - }, - containerPort: 80, - servicePort: 80, -} as Readonly; diff --git a/.k8s/environments/_base/index.ts b/.k8s/environments/_base/index.ts deleted file mode 100644 index cfec5b57..00000000 --- a/.k8s/environments/_base/index.ts +++ /dev/null @@ -1,30 +0,0 @@ -import gitlab from "@socialgouv/kosko-charts/environments/gitlab"; -import { ok } from "assert"; - -const gitlabEnv = - process.env.AUTO_DEVOPS_DEV_ENVIRONMENT_NAME || - process.env.AUTO_DEVOPS_PREPROD_ENVIRONMENT_NAME || - process.env.AUTO_DEVOPS_PROD_ENVIRONMENT_NAME; - -ok( - gitlabEnv, - "Expect an AUTO_DEVOPS_*_ENVIRONMENT_NAME to be defined\n" + - "HACK(douglasduteil): ensure that the sample-next-app is still deployable to our cluster v1\n" + - "We should remove this section in the future ;)" -); - -const ingress = gitlabEnv.endsWith("-dev") - ? { - ingress: { - annotations: { - "appgw.ingress.kubernetes.io/ssl-redirect": "true", - "kubernetes.io/ingress.class": "azure/application-gateway", - }, - secretName: "wildcard-crt", - }, - } - : {}; -export default { - ...gitlab(process.env), - ...ingress, -}; diff --git a/.k8s/environments/_base/pgweb.ts b/.k8s/environments/_base/pgweb.ts deleted file mode 100644 index 3771e807..00000000 --- a/.k8s/environments/_base/pgweb.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { AppComponentEnvironment } from "@socialgouv/kosko-charts/components/app/params"; - -export default { - name: "pgweb", - subdomain: `pgweb-${process.env.CI_PROJECT_NAME as string}`, - image: { - name: "sosedoff/pgweb", - tag: "0.11.6", - }, - ingress: { - secretName: process.env.PRODUCTION ? "www-crt" : "wildcard-crt", - }, - labels: { - component: "pgweb", - }, - requests: { - cpu: "1m", - memory: "64Mi", - }, - limits: { - cpu: "50m", - memory: "128Mi", - }, - containerPort: 8081, - servicePort: 8081, -} as Readonly; diff --git a/.k8s/environments/dev/index.ts b/.k8s/environments/dev/index.ts deleted file mode 100644 index 03b68cec..00000000 --- a/.k8s/environments/dev/index.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { GlobalEnvironment } from "@socialgouv/kosko-charts/types"; - -export default { - ingress: { - annotations: { - "kubernetes.io/tls-acme": undefined, - "certmanager.k8s.io/cluster-issuer": undefined, - }, - secretName: "wildcard-crt", - }, -} as Partial; From 4e84b9125aca072d0cbbd3ffdeb41651760949c4 Mon Sep 17 00:00:00 2001 From: Julien Bouquillon Date: Sat, 25 Jul 2020 01:56:02 +0200 Subject: [PATCH 09/61] progress --- .k8s/app.values.yml | 40 ---------- ...v.configmap.yaml => hasura.configmap.yaml} | 0 ...-secret.yaml => hasura.sealed-secret.yaml} | 0 .k8s/environments/prod/app.ts | 4 +- ...v.configmap.yaml => hasura.configmap.yaml} | 0 ...-secret.yaml => hasura.sealed-secret.yaml} | 0 .k8s/getEnvironmentComponent.ts | 76 ------------------- .k8s/hasura.values.yml | 32 -------- .k8s/index.d.ts | 36 --------- .k8s/yarn.lock | 28 +++++++ 10 files changed, 29 insertions(+), 187 deletions(-) delete mode 100644 .k8s/app.values.yml rename .k8s/environments/preprod/{hasura-env.configmap.yaml => hasura.configmap.yaml} (100%) rename .k8s/environments/preprod/{hasura-env.sealed-secret.yaml => hasura.sealed-secret.yaml} (100%) rename .k8s/environments/prod/{hasura-env.configmap.yaml => hasura.configmap.yaml} (100%) rename .k8s/environments/prod/{hasura-env.sealed-secret.yaml => hasura.sealed-secret.yaml} (100%) delete mode 100644 .k8s/getEnvironmentComponent.ts delete mode 100644 .k8s/hasura.values.yml delete mode 100644 .k8s/index.d.ts diff --git a/.k8s/app.values.yml b/.k8s/app.values.yml deleted file mode 100644 index 8f6b1deb..00000000 --- a/.k8s/app.values.yml +++ /dev/null @@ -1,40 +0,0 @@ -# Default values for Mas webapp. https://github.com/SocialGouv/helm-charts/blob/master/charts/webapp/values.yaml -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -# See https://github.com/SocialGouv/helm-charts/tree/master/charts/app ---- -image: - repository: $CI_REGISTRY_IMAGE - tag: master - -fullnameOverride: app - -deployment: - resources: - requests: - memory: 128Mi - limits: - memory: 256Mi - - livenessProbe: - initialDelaySeconds: 30 - path: /health - periodSeconds: 15 - readinessProbe: - initialDelaySeconds: 30 - path: /health - periodSeconds: 15 - - envFrom: - - configMapRef: - name: app-env - - secretRef: - name: app-env -ingress: - enabled: true - annotations: - appgw.ingress.kubernetes.io/ssl-redirect: "" - certmanager.k8s.io/cluster-issuer: letsencrypt-prod - kubernetes.io/ingress.class: nginx - kubernetes.io/tls-acme: "true" diff --git a/.k8s/environments/preprod/hasura-env.configmap.yaml b/.k8s/environments/preprod/hasura.configmap.yaml similarity index 100% rename from .k8s/environments/preprod/hasura-env.configmap.yaml rename to .k8s/environments/preprod/hasura.configmap.yaml diff --git a/.k8s/environments/preprod/hasura-env.sealed-secret.yaml b/.k8s/environments/preprod/hasura.sealed-secret.yaml similarity index 100% rename from .k8s/environments/preprod/hasura-env.sealed-secret.yaml rename to .k8s/environments/preprod/hasura.sealed-secret.yaml diff --git a/.k8s/environments/prod/app.ts b/.k8s/environments/prod/app.ts index d5d882bb..9d308743 100644 --- a/.k8s/environments/prod/app.ts +++ b/.k8s/environments/prod/app.ts @@ -1,5 +1,3 @@ -import { GlobalEnvironment } from "@socialgouv/kosko-charts/types"; - export default { subdomain: `beta-${process.env.CI_PROJECT_NAME as string}`, -} as Partial; +}; diff --git a/.k8s/environments/prod/hasura-env.configmap.yaml b/.k8s/environments/prod/hasura.configmap.yaml similarity index 100% rename from .k8s/environments/prod/hasura-env.configmap.yaml rename to .k8s/environments/prod/hasura.configmap.yaml diff --git a/.k8s/environments/prod/hasura-env.sealed-secret.yaml b/.k8s/environments/prod/hasura.sealed-secret.yaml similarity index 100% rename from .k8s/environments/prod/hasura-env.sealed-secret.yaml rename to .k8s/environments/prod/hasura.sealed-secret.yaml diff --git a/.k8s/getEnvironmentComponent.ts b/.k8s/getEnvironmentComponent.ts deleted file mode 100644 index 0ed164d2..00000000 --- a/.k8s/getEnvironmentComponent.ts +++ /dev/null @@ -1,76 +0,0 @@ -// -// -// -// -// - -// TODO(douglasduteil): move this function to `@socialgouv/kosko-chart` - -// -// -// -// -// - -import { readFileSync } from "fs"; -import { Environment } from "@kosko/env"; -import { join } from "path"; -// @ts-ignore -import { formatPath } from "@kosko/env/dist/paths.js"; -import { migrateString } from "@kosko/migrate"; -import { Module } from "module"; -import { runInThisContext } from "vm"; - -export function getEnvironmentComponent( - { env, cwd, paths: { component } }: Environment, - filename: string, - { loader }: { loader: (id: string) => string } -) { - if (!env) return []; - const envs = Array.isArray(env) ? env : [env]; - const legitEnv = envs.reverse().find((env) => { - const path = formatPath(component, { - environment: env, - component: filename, - }); - try { - return readFileSync(join(cwd, path)); - } catch (e) { - // console.log(e); - } - }); - - if (!legitEnv) return []; - return tryRequireComponent(loader)( - formatPath(component, { - environment: legitEnv, - component: filename, - }) - ); -} - -export function tryRequireComponent(loader: (id: string) => string) { - return (id: string) => { - const mod = new Module(""); - runInThisContext(Module.wrap(loader(id)))( - mod.exports, - require, - mod, - "", - "" - ); - return mod.exports; - }; -} - -// TODO: export to kosko-charts -export function loadYaml(env: Environment, path: string) { - const [obj] = getEnvironmentComponent(env, path, { - loader: koskoMigrateLoader, - }); - return obj; -} - -export function koskoMigrateLoader(id: string) { - return migrateString(readFileSync(id, "utf-8")); -} diff --git a/.k8s/hasura.values.yml b/.k8s/hasura.values.yml deleted file mode 100644 index 16d0328e..00000000 --- a/.k8s/hasura.values.yml +++ /dev/null @@ -1,32 +0,0 @@ -image: - repository: $CI_REGISTRY_IMAGE/hasura - tag: master - -fullnameOverride: hasura - -deployment: - livenessProbe: - path: /healthz - initialDelaySeconds: 30 - periodSeconds: 20 - readinessProbe: - path: /healthz - initialDelaySeconds: 30 - periodSeconds: 20 - - resources: - requests: - cpu: 5m - memory: 256Mi - limits: - cpu: 1000m - memory: 1024Mi - - envFrom: - - configMapRef: - name: hasura-env - - secretRef: - name: hasura-env - -ingress: - enabled: false diff --git a/.k8s/index.d.ts b/.k8s/index.d.ts deleted file mode 100644 index acb65a4a..00000000 --- a/.k8s/index.d.ts +++ /dev/null @@ -1,36 +0,0 @@ -// - -import type { - GlobalEnvironment, - NamespaceComponentEnvironment, - NamedComponentEnvironment, -} from "@socialgouv/kosko-charts/types"; -import { AppComponentEnvironment } from "@socialgouv/kosko-charts/components/app/params"; -import { CreateDbJobParameters } from "@socialgouv/kosko-charts/components/azure-db/params"; -import { PostresSecretParameters } from "@socialgouv/kosko-charts/components/pg-secret/params"; - -// Declare types for component environment variables -export interface ComponentEnvironment { - // Fallback type of all other component variables which are not specified below - [key: string]: {}; - - // Specify types for each component - namespace: NamespaceComponentEnvironment; - app: AppComponentEnvironment; - hasura: AppComponentEnvironment; - pgweb: AppComponentEnvironment; - "create-db": CreateDbJobParameters; - "pg-secret": PostresSecretParameters; -} - -// Extend type declarations of "@kosko/env" module -declare module "@kosko/env" { - // Extend Environment interface - interface Environment { - global(): GlobalEnvironment; - - component( - name: K - ): GlobalEnvironment & ComponentEnvironment[K]; - } -} diff --git a/.k8s/yarn.lock b/.k8s/yarn.lock index c7a9af91..62114fd1 100644 --- a/.k8s/yarn.lock +++ b/.k8s/yarn.lock @@ -85,6 +85,15 @@ is-plain-object "^3.0.0" tslib "^1.10.0" +"@kubernetes-models/base@^0.1.4": + version "0.1.4" + resolved "https://registry.yarnpkg.com/@kubernetes-models/base/-/base-0.1.4.tgz#0022a8f324b5886c7ae384319618080d74ca7f52" + integrity sha512-M0Gzpb2UGBoGSy++7CYXyN4F8+cZm6DU9Ba6iS5zFEwD1eL6n3h256E3kX2ZEOZHVe/mcgWPuhUqyo0er0ZmnQ== + dependencies: + "@kubernetes-models/validate" "^0.1.2" + is-plain-object "^3.0.0" + tslib "^1.10.0" + "@kubernetes-models/sealed-secrets@^0.1.3": version "0.1.3" resolved "https://registry.yarnpkg.com/@kubernetes-models/sealed-secrets/-/sealed-secrets-0.1.3.tgz#52323deeda649fdffb88f09234376af577c6a8c0" @@ -95,6 +104,16 @@ kubernetes-models "^0.8.0" tslib "^1.10.0" +"@kubernetes-models/sealed-secrets@^0.1.4": + version "0.1.4" + resolved "https://registry.yarnpkg.com/@kubernetes-models/sealed-secrets/-/sealed-secrets-0.1.4.tgz#a6bfedd4f916ff85ccb9f2edf9ebcbf53b015091" + integrity sha512-2jzvOpCK7tirMMm0ChcbphMBJv1wJ9SzhD/Q9IpNPcQFwbjirk+v4QDVBLQN1yBBw3c5Ky2rI9w9BGHb/VZC1A== + dependencies: + "@kubernetes-models/base" "^0.1.4" + "@kubernetes-models/validate" "^0.1.2" + kubernetes-models "^0.8.1" + tslib "^1.10.0" + "@kubernetes-models/validate@^0.1.2": version "0.1.2" resolved "https://registry.yarnpkg.com/@kubernetes-models/validate/-/validate-0.1.2.tgz#49954fcbf8b9076f3b6e6f9eb67c457b65ceef52" @@ -533,6 +552,15 @@ kubernetes-models@^0.8.0: "@kubernetes-models/validate" "^0.1.2" tslib "^1.10.0" +kubernetes-models@^0.8.1: + version "0.8.1" + resolved "https://registry.yarnpkg.com/kubernetes-models/-/kubernetes-models-0.8.1.tgz#478072f62fea7425fe14a205f4161a4268296993" + integrity sha512-zJDKVBlP74hC95iqi6fItXz8KOFHbqOnsLVRNf4OsSS+xF/v21mk0ms5zp5enlQgJ6VNhGarYzLKejFXQPoqeg== + dependencies: + "@kubernetes-models/base" "^0.1.4" + "@kubernetes-models/validate" "^0.1.2" + tslib "^1.10.0" + levn@~0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee" From e5ad489336a69c778cbc57352c08b76c81dd3101 Mon Sep 17 00:00:00 2001 From: Julien Bouquillon Date: Sat, 25 Jul 2020 01:58:07 +0200 Subject: [PATCH 10/61] progress --- .k8s/environments/preprod/hasura.configmap.yaml | 1 - .k8s/environments/preprod/hasura.sealed-secret.yaml | 1 - .k8s/environments/prod/hasura.configmap.yaml | 2 +- .k8s/environments/prod/hasura.sealed-secret.yaml | 4 ++-- 4 files changed, 3 insertions(+), 5 deletions(-) delete mode 120000 .k8s/environments/preprod/hasura.configmap.yaml delete mode 120000 .k8s/environments/preprod/hasura.sealed-secret.yaml diff --git a/.k8s/environments/preprod/hasura.configmap.yaml b/.k8s/environments/preprod/hasura.configmap.yaml deleted file mode 120000 index 5d4a5bd4..00000000 --- a/.k8s/environments/preprod/hasura.configmap.yaml +++ /dev/null @@ -1 +0,0 @@ -../dev/hasura-env.configmap.yaml \ No newline at end of file diff --git a/.k8s/environments/preprod/hasura.sealed-secret.yaml b/.k8s/environments/preprod/hasura.sealed-secret.yaml deleted file mode 120000 index 2552847e..00000000 --- a/.k8s/environments/preprod/hasura.sealed-secret.yaml +++ /dev/null @@ -1 +0,0 @@ -../dev/hasura-env.sealed-secret.yaml \ No newline at end of file diff --git a/.k8s/environments/prod/hasura.configmap.yaml b/.k8s/environments/prod/hasura.configmap.yaml index ba45ce0a..d3071b77 100644 --- a/.k8s/environments/prod/hasura.configmap.yaml +++ b/.k8s/environments/prod/hasura.configmap.yaml @@ -1,7 +1,7 @@ kind: ConfigMap apiVersion: v1 metadata: - name: hasura-env + name: hasura-configmap data: HASURA_GRAPHQL_ENABLE_CONSOLE: "false" HASURA_GRAPHQL_SERVER_PORT: "80" diff --git a/.k8s/environments/prod/hasura.sealed-secret.yaml b/.k8s/environments/prod/hasura.sealed-secret.yaml index 616d7ad0..222c2cf0 100644 --- a/.k8s/environments/prod/hasura.sealed-secret.yaml +++ b/.k8s/environments/prod/hasura.sealed-secret.yaml @@ -2,7 +2,7 @@ apiVersion: bitnami.com/v1alpha1 kind: SealedSecret metadata: creationTimestamp: null - name: hasura-env + name: hasura-sealed-secret spec: encryptedData: ACCOUNT_EMAIL_SECRET: AgAJUDKWW5mJ+ZYtqHp6uw1tFAU95wU7wS7DekdSDKBFR/4KfSUqeDpstH1lXpWg5Am3iO0oALQwXLYAtOGPi3ojHcoZojezmWvfp7oiWVaCKaIFW05tRO1j+vGsS/J5EMSCeCxjZo0QC1xVVwybwgqbYByzKpSi7qgZiVTbRSut9A9JyHXAi5hPT/CW1y8IGM02KaIfFXYHdbHLt0hK6g6X8ZV/rTGpDwkPrC5dToQ43nfTiTZpwwaJ6PbSfHueFYAnEFPeRHITRP/JUSgxtLFraWT/Q2i4etW4z3kaBNdsxpIqMKtbz1BD+quk6Do/2LfadtT+c26DCobKi9GEZP4rlzi14XET4R7uBbCrjMjXkLzDMyqbiwS7hy37fCntfWH3PwVj0d9+wU3wFgcKYQYPXdVv/Xuv+fvSvJqfH94cixjC7bDpSSrar30cnrgZSZcCqCElzXwSJpkVrExEcMtB7CywqcWFj930eyO+M5/uHGNYy/3ceWZ2WGGLY1yYcLOUriuPrJvyVk/g8HGaRtnRq3JYoq/IxIyFhAWK/mYkEI7wkdLPMZnTBv9ytMYic0t7wPjDNLk0nxZVO/UVkj/lYayZyNrqN8nWoXQ3eH0fVn++PAr0XugQjiKrTNfEOxfKz8b2IouIra3jlIZ8jgNkJEW/DcJiVKtqNIrJyyY8ZiGxn81nR67NzccstGg0/5GGmEb3g1jLw/l0qqJtd9CSyTj+JFNDeKquNAZjhqSaWcywP/VvLOPiONJF7lRprzl1L7A9Eyt2KjjrDfyARikXiUs1lpIJij5eSkkwhDznhZdF2WXuLE3Pn1h31vJ4YbpbrievKEaheu7rxvfSnoP4SAGDZydg4iSeE+Ufp/KymU4KbaVjmLFk944bcoykPnJZNvcvK1AQM9snt4e05Ky+59mRVDumx+s1IlVncT5g2u8xhSIF3rb7JE1x/1CX+y4R+H8csnvrqSoXiVqo/PbfBNDvfqmjP4SO702jbV799OcgqtiNqOY6VD3wjXBhwNOB7DQj/r1Uq6FAabWnBB2163U42M2Tu4TgUgsgRMFIfpqNWK49wIcLEBQx/5DGPP8vtSTJidDWWG/jvd3rwyexc5U99kvv5Fxpp+sOzdQ3cuMyEJU9vqS2s0S+YqSSNZLZRBeIg+GTdgo= @@ -12,5 +12,5 @@ spec: template: metadata: creationTimestamp: null - name: hasura-env + name: hasura-sealed-secret type: Opaque From 5988f4c4c84bdd84be7f49575f988406b011e577 Mon Sep 17 00:00:00 2001 From: Julien Bouquillon Date: Sat, 25 Jul 2020 02:03:48 +0200 Subject: [PATCH 11/61] progress --- .k8s/components/pgweb.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/.k8s/components/pgweb.ts b/.k8s/components/pgweb.ts index 74a0a119..9f1a0036 100644 --- a/.k8s/components/pgweb.ts +++ b/.k8s/components/pgweb.ts @@ -5,6 +5,7 @@ import { create } from "@socialgouv/kosko-charts/components/app"; const manifests = create("pgweb", { env, config: { + image: "pouet:42", subdomain: `pgweb-${process.env.CI_PROJECT_NAME as string}`, livenessProbe: { httpGet: { From e4d8ef41521c34a8a1c80917fa19dd8191069a88 Mon Sep 17 00:00:00 2001 From: Julien Bouquillon Date: Sat, 25 Jul 2020 03:51:23 +0200 Subject: [PATCH 12/61] simpler DB --- .k8s/components/.drop-db.ts | 61 ------------------- .../azure-pg-admin-user.sealed-secret.ts | 33 ---------- .k8s/components/azure-pg.ts | 16 +++++ .k8s/components/create-db.ts | 31 ---------- .k8s/environments/_base/create-db.ts | 3 - .../dev/azure-pg.sealed-secret.yaml | 20 ++++++ .k8s/environments/dev/create-db.ts | 9 --- .k8s/environments/dev/pg-secret.ts | 17 ------ .k8s/environments/preprod/create-db.ts | 9 --- .k8s/environments/preprod/index.ts | 12 ---- .k8s/environments/prod/create-db.ts | 5 -- 11 files changed, 36 insertions(+), 180 deletions(-) delete mode 100644 .k8s/components/.drop-db.ts delete mode 100644 .k8s/components/azure-pg-admin-user.sealed-secret.ts create mode 100644 .k8s/components/azure-pg.ts delete mode 100644 .k8s/components/create-db.ts delete mode 100644 .k8s/environments/_base/create-db.ts create mode 100644 .k8s/environments/dev/azure-pg.sealed-secret.yaml delete mode 100644 .k8s/environments/dev/create-db.ts delete mode 100644 .k8s/environments/dev/pg-secret.ts delete mode 100644 .k8s/environments/preprod/create-db.ts delete mode 100644 .k8s/environments/preprod/index.ts delete mode 100644 .k8s/environments/prod/create-db.ts diff --git a/.k8s/components/.drop-db.ts b/.k8s/components/.drop-db.ts deleted file mode 100644 index f47958c8..00000000 --- a/.k8s/components/.drop-db.ts +++ /dev/null @@ -1,61 +0,0 @@ -import env from "@kosko/env"; -import { metadataFromParams } from "@socialgouv/kosko-charts/components/app/metadata"; -import { Job } from "kubernetes-models/batch/v1/Job"; - -const params = env.component("create-db"); - -const job = new Job({ - metadata: { - ...metadataFromParams(params), - name: `drop-azure-db-${process.env.CI_COMMIT_SHORT_SHA}`, - }, - spec: { - backoffLimit: 0, - template: { - metadata: { - ...metadataFromParams(params), - }, - spec: { - restartPolicy: "Never", - containers: [ - { - name: "drop-db-user", - image: - "registry.gitlab.factory.social.gouv.fr/socialgouv/docker/azure-db:0.28.0", - imagePullPolicy: "IfNotPresent", - command: ["drop-db-user"], - resources: { - limits: { - cpu: "300m", - memory: "256Mi", - }, - requests: { - cpu: "100m", - memory: "64Mi", - }, - }, - envFrom: [ - { - secretRef: { - name: `azure-pg-admin-user`, - }, - }, - ], - env: [ - { - name: "DROP_DATABASE", - value: params.dbName, - }, - { - name: "DROP_USER", - value: params.dbUser, - }, - ], - }, - ], - }, - }, - }, -}); - -export default [job]; diff --git a/.k8s/components/azure-pg-admin-user.sealed-secret.ts b/.k8s/components/azure-pg-admin-user.sealed-secret.ts deleted file mode 100644 index 78bb3912..00000000 --- a/.k8s/components/azure-pg-admin-user.sealed-secret.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { SealedSecret } from "@kubernetes-models/sealed-secrets/bitnami.com/v1alpha1/SealedSecret"; -import env from "@kosko/env"; -//import { metadataFromParams } from "@socialgouv/kosko-charts/components/app/metadata"; - -const params = env.component("create-db"); - -const secret = new SealedSecret({ - metadata: { - // ...metadataFromParams(params), - name: `azure-pg-admin-user`, - annotations: { - "sealedsecrets.bitnami.com/cluster-wide": "true", - }, - }, - spec: { - encryptedData: { - DATABASE_URL: - "AgAG3SvDWchEgYLNTsRufT6cMfhRuJCi3J01k74eUNkAbICGmN0zdxOBjS2hT8Me5HOb2np9+layH4QJRw/TAYzrj0qmUeXoRRCfzzxcpIWCs37nF12Y3hCqBHIwIp4Qb/s9jk2gjkYOZWGfpHwaplDkOGwPGHvXJhI626hf5yIZIq7rCVhcG8MiL+xEBRW/k/9nJ+QKh70EEK31JSNyRs5eSadg3+LIKJKjYNJmzX3h61I6Bdc727evA4iM8YNPbJ2XpFNZ4e3kDv85se8DdjCMjtKvXHg5Cb/trYto3iBH9BkhajOTomQlcFSk1tqA2hD3WVI5PaLqMC4PlbLAy+THLNTHUQvkjTuxnDXbW4ZKbizYvHQjq14h3S8RpmOxO1UZAzdPyhxJRVNPche4hdMmMnsy0Vwt0aH7CjhBp/LBRgWhAGAuJyr6jcM406HnXoroCiblh0PHSJa4PuiS5TZRCZt1XKbOgB0L4TCCIPrsnU3up5ja07N5rAGcMExHcR8TV4kU+6s1AOEB/1O1MqvMAXcHQnigYYCDwLMu73OMsEmRAATUtUOoaUJe1T0dT7tkM048+MzRg89Z6WJ9uwA0UDZWFbsjzSw3YTvmeLep8A01U1xNWMfM489qnN4nQ8mrSVSBmyvaSA3evE5OXs6Nnuk2QLQzD8ncYHmh0mwl6o56yPAlMIVBSmOHn5DVFFTwK644LtFJofd/LsYpRCOGhKuFF0dPizyOwSav9aTfYOD36sQjvPya1Yn4PLfECUsbFs2nekpJz9j3r9Q/6AskGKrTC2UwIWHCT7LZ56D967BgF+QvYOAlkKAeesE/0Djvm3IPfEZXCPswjWhQ0YH3sKB8laFmWSKfGcGxjRkluSYjjg==", - PGDATABASE: - "AgCYuZ32FAlfM/4PzwYo82TCMa/zjqoS+OYThLKJbhAABpeRnDeWto+8E1jYhJYSnwIKTw32Zm6WGe2XFi2nfKhxOZi0+lzSzyLzGK4Z/fus1PhgBmvdKOeE/Y167GspE+PNS0Ju+JL6CPIBEX16mbfEycbFJxowXbJcxGJJ1LhYNvqNVnS2SnP9URe5QPki1PHN2blcSBxrPTfY0efufm+0s5MbTVcHwh9eXBrBBV0jO2y6GW5PfWLgl6vv1RpVsUJgNEcxPWKGt430t4Wof0PaMhBQQeXk4FOXET9QBsgFVbaQCOXqtGB1HSc+q+ZGbE7OFjP5q9Q0QifcLTg7lzzkrqH542joTgNjWc6pMgJismNbBLFGRULumdaPs3c7dWeFklicmFARPII2JhigHKuh5C5JEEYdtaeX0FPjy+WKstjHjZrKHTGgojI0Y/SDRyEK8UeZBZotqWsqvwdB6RX/8Wb+3mwzQrNWoOqDMbgi32wALyt/nvWu6epvg1GSfTSQ5YpHS0QNnOab5z93M6JqFxjhjnkDxBQC/bjoYbU8VRanSve8x5WAZ0FAh/4JJKgedwmZ1oTh7r4Hvzmq/31IGG009yAnR6Pu64hP2YJl+9lTOZS2RuHkW84tVP7jGTQOxmzh3ewtFgkzAOGefvKkmmOEXugjw40q2VNd92P2bkgAZs0BoVbQOzkQZmrEJh3+3dWwuS0yIw==", - PGHOST: - "AgAkPATmbfX0+lrLdbSccDKSz5kYwJjinCmowPNMuYTSIHtuxqt3migh0rwFOwt7GF4Mc7lif18JR6v1upXAEzsSQ2YIT37LqHgbBxzkQvoOmLNVPHeMV0hujWXsxncMtoIOwm8J3hgAQVqn7ah6T+axz3WeKGHIp7GOQOy7ZJsPQtpeIm/I58ULffvGxuo5MTybo9lQ1x74ULJ0b7q3z5/cRsdf08WncJX67JLl5yBypFhee86BdE4aBvV2ORy4nLY/2sCt/ZFhg+5zEJaoHdVlGxZRF4zTsiYj7nEGWuw7fSFTVcvAiBC30jrLRCj7hMWq+mxeyHsjvI/O+6nfEiDIfAdoBFRTBLTnVJZaUZkfrvnvOmTEEX47fkSmSkNv00ti4Z6uwrgBGUj7axODeLZuzQATs0LXwNou+OsoUkv+gLxlLkbr+uGLr2XAWI0vQJpyMGnt/H00OI8C/A+Hw5YQJM9nNKIljXmqJDzcuh0snmXrY/u/9g1Gv2u14fOExZCm80dhAeiGp94QaWYC7hYaOXeE0lCIDnQI2T7DE4LRopqq0oYkrQdyM4xe7MNCWu+quvzY57rZUO3VL+aZHNhLvARmri+7P9T5st5J8CwOBxmyBxSCB/ltJIBOfkvl3sZcvBLp1XI+366t7RlYdktTvCr8WbzsU2GdLcmHU0Yf4SySziJFaar58aW1+7lbYMsfoq4v5CuWWNjPVphIu2zncrDHTM6T4HBb2ki/aBg04ZR6FFHKehwNvyNJBfBy6rERtQ==", - PGPASSWORD: - "AgC6F1Vg9nr6E7X1w/Tlvnlx8YKOcpVQicdPQhbOhojYyKF9YUMF+OhMcobu5MzaRqDbu+TGIn/cQGwbs90Wk+lGbQ5MRudEVyZMVVcZz1PijmAkbh4JkmLYBvMqAk6J0foHmcZG/3bzojzbOAQZy8Xc5kIFTQlcLCf5i7ELaUXubnJXngtnTxPxv23otVRTSYd2oAuO7EDbPJxyMlwCtMeUbnrbiBcpGCfCcbLiyWM7uikmsy6645DzEjQJ0D8q8bh2M+Ooz4a43G7VSxXDygoKr0MoRhrTTmpOXK7UJwt2e6ZRZj6sWmbNVFgBwQopn4csIzM+qPtF6c3WuEd2ffDDMgubA8ma6UCRZCYyrg7wEFxx1yd+HXf7VNg6kItmWGqrzfy66gPQlNqen0pNFLlVMWe1jLi0Un0nayRTRCI+AcGctZjY1s9QTkxOXXYUsBNUbYf/zKgr7kiJc5ZIR26UuiMj/yuXWBmHDgzhuNQQWWiHpsoUCj3Y6ZUN9wt3cNi2rXAWS3YGhidd6pyjaJx25weNqxbAICksyGI5nnZ+JUgOvpqFioEv/1cL/m+NTlp33nUWk3SvhMLJPu2if8rIo059gRWtU+QNtu0u2vLOdg3mEWrbzuuDCG7tVoO6YJBq3p2molf1+x7P7qNf0uIG4mnfFXJEUlHELqwswEY7ZFC83AfAtFvG2IIeaoWIdfhd4SZyxSaxZ+np15FUIRwnS6jI/jseNScxj0W22E2Y7pWz6UMApBe0", - PGSSLMODE: - "AgCuL/IR2M2KOkLGSjLtu1mXk7K6z4Vl+fsnko+9n/7o61fBZrtJSiXiL2APg0jCL9SfALrTNQUWiqgMtpCc76hoKKD5AgWwMydYaR+pw5CFql3qKJQJ0xGJ4X34C31suJYkWQq2nof53JYssGMDq8TyvG6+vkXAPkdl2/98taTvbyz/vNKU5gRPdizyfSV9Xonntw3KyaQ3yqj+/dD8LEUm4w/TCVhYb2jVrPIinoJiIrxtIs99d/dJIHB+nDSXkF3paPNJ2OSEvMTfLXUYM/ZNHAq+kPh1vyDKMrtfxxM1Rq0SgbuPXNfZOuLtdch2VUewZGqYqpBUtKoSNOUFwLs2qwdK62tvFyGnJP2dWmekO2KGyKe9mHvyMGIHW/W1hxTiYOK5xW0qvobgEWCmgAloj3k3xDqQ0eD7qc2OlUQtvqBFzQETjwaV59wNJsqOUHQI9gQBsfeCE3o7UbghpPSAQvCFwMOUQxuWOdm8gc6d3F0dTsIIiJ/xydnqMxdfMyogno4g9Q8VEUkUux9Ui4vAp5Z9psucYYMNc8sgDxA09BVtZgtKpm8RFf3QO0tcSaHjz5+cb5iuLxQ2EnU4HLJ1gZ+MpFOvcxUV4apSKsX2Y7VJZcbePB+FQiZT6u4Dsx1HyuYnA2nYku93XkDdlXrxsCL7ThkDgtlfNz1JFm1LX1g5i+nlu+/HfkbtdtKMAI7yqhrZsbcO", - PGUSER: - "AgBtaw5O4rJRlik4q2qU+OfvMBgQH6X7MfDS8OdqhoZSwT0diM4o0bW8vmwhhYYsd7BBOUFnDDSFiiqNn7/TgwP+KJEjZEel8Aea+zn3C5v7bJ0oTiJozQzjcURXnhPjQfR9O/LRoBqHvisxMNYf2fxbxR/oKrhvLUd6YihFwdOlqPql4o86fh/BIjA9XRXLX8YwG3eQq4G2396HcaI4Ufm1s0IuGUFsZYWUY56CKFH4UQDsnI+bH+WvBRDkhifQXvWFTz2iyb2cwi6oUmnzGWNG93vxAv88auLpj4/5gkcjCLHUNgzKfk+A8cYszU9wZLo4Lmdz9sHks20slxTmQwf/S8TCfFpaoDO4MJKFnG+h8KnPIf0PazHVguJp3frYuXc0rvk4pyBlekUIkPKWTzh3p81iQCYbhHXTKaSdX7ksBC/gVvu/0Z9s5KjSSnqWkkLpTtIdygiTt99+FGnjmYHBRcDOm1mhH0s6wscv9pMprQzZQvLx1+JMT7ibYwdE+xG5bTrDoOiYV675tIqVGorniU/Lj/BjlcB0ByLCvEjLfWZm6bKs0EtPfJXC7m4ISUW4XeY86qJyR/FiIcx0ymbiK9UIGqEG64Nw+6qml6qDIHag2vJZdqPiUN32j7m246255Y76ZqdUl5gWVrXcrRudgbS09yDQ83LsZGL6d4tN9aYXfGY93zyHfS3lh3Z5bY+/ENKPstLiFH3mIsfiDTl3ATLvi+CoKnkz4IAOfkGK89Kz2HokXYe5ug==", - }, - }, -}); - -export default [secret]; diff --git a/.k8s/components/azure-pg.ts b/.k8s/components/azure-pg.ts new file mode 100644 index 00000000..67b3fe4c --- /dev/null +++ b/.k8s/components/azure-pg.ts @@ -0,0 +1,16 @@ +import env from "@kosko/env"; +import { ok } from "assert"; + +import { create } from "@socialgouv/kosko-charts/components/azure-pg"; + +ok(process.env.CI_PROJECT_NAME, "Expect CI_PROJECT_NAME to be defined"); +ok(process.env.CI_COMMIT_SHORT_SHA, "Expect CI_COMMIT_SHORT_SHA to be defined"); + +let params = env.component("azure-pg"); + +const manifests = create({ + env, + config: {}, +}); + +export default manifests; diff --git a/.k8s/components/create-db.ts b/.k8s/components/create-db.ts deleted file mode 100644 index 12762008..00000000 --- a/.k8s/components/create-db.ts +++ /dev/null @@ -1,31 +0,0 @@ -import env from "@kosko/env"; -import { ok } from "assert"; - -import { create as createDb } from "@socialgouv/kosko-charts/components/azure-db"; -import { create as createSecret } from "@socialgouv/kosko-charts/components/pg-secret"; - -ok(process.env.CI_PROJECT_NAME, "Expect CI_PROJECT_NAME to be defined"); -ok(process.env.CI_COMMIT_SHORT_SHA, "Expect CI_COMMIT_SHORT_SHA to be defined"); - -const defaultExport = []; - -console.log("CI_COMMIT_SHORT_SHA", process.env.CI_COMMIT_SHORT_SHA); -console.log("env.component('create-db')", env.component("create-db")); -let params = env.component("create-db"); -params.database = "yopyop"; -params.password = "yopyop"; -params.user = "yopyop"; - -const { createDbJob: job } = createDb(params); - -// creates azure-pg-user secret -params = env.component("pg-secret"); -params.database = "yopyop"; -params.password = "yopyop"; -params.user = "yopyop"; -params.host = "yopyop"; - -// const { createSecret: secret } = createSecret(env.component("pg-secret")); -const { createSecret: secret } = createSecret(params); - -export default [job, secret]; diff --git a/.k8s/environments/_base/create-db.ts b/.k8s/environments/_base/create-db.ts deleted file mode 100644 index f978e6c1..00000000 --- a/.k8s/environments/_base/create-db.ts +++ /dev/null @@ -1,3 +0,0 @@ -import { ok } from "assert"; - -export default {}; diff --git a/.k8s/environments/dev/azure-pg.sealed-secret.yaml b/.k8s/environments/dev/azure-pg.sealed-secret.yaml new file mode 100644 index 00000000..28a01840 --- /dev/null +++ b/.k8s/environments/dev/azure-pg.sealed-secret.yaml @@ -0,0 +1,20 @@ +apiVersion: bitnami.com/v1alpha1 +kind: SealedSecret +metadata: + creationTimestamp: null + name: azure-pg-admin-user +spec: + encryptedData: + DATABASE_URL: AgAG3SvDWchEgYLNTsRufT6cMfhRuJCi3J01k74eUNkAbICGmN0zdxOBjS2hT8Me5HOb2np9+layH4QJRw/TAYzrj0qmUeXoRRCfzzxcpIWCs37nF12Y3hCqBHIwIp4Qb/s9jk2gjkYOZWGfpHwaplDkOGwPGHvXJhI626hf5yIZIq7rCVhcG8MiL+xEBRW/k/9nJ+QKh70EEK31JSNyRs5eSadg3+LIKJKjYNJmzX3h61I6Bdc727evA4iM8YNPbJ2XpFNZ4e3kDv85se8DdjCMjtKvXHg5Cb/trYto3iBH9BkhajOTomQlcFSk1tqA2hD3WVI5PaLqMC4PlbLAy+THLNTHUQvkjTuxnDXbW4ZKbizYvHQjq14h3S8RpmOxO1UZAzdPyhxJRVNPche4hdMmMnsy0Vwt0aH7CjhBp/LBRgWhAGAuJyr6jcM406HnXoroCiblh0PHSJa4PuiS5TZRCZt1XKbOgB0L4TCCIPrsnU3up5ja07N5rAGcMExHcR8TV4kU+6s1AOEB/1O1MqvMAXcHQnigYYCDwLMu73OMsEmRAATUtUOoaUJe1T0dT7tkM048+MzRg89Z6WJ9uwA0UDZWFbsjzSw3YTvmeLep8A01U1xNWMfM489qnN4nQ8mrSVSBmyvaSA3evE5OXs6Nnuk2QLQzD8ncYHmh0mwl6o56yPAlMIVBSmOHn5DVFFTwK644LtFJofd/LsYpRCOGhKuFF0dPizyOwSav9aTfYOD36sQjvPya1Yn4PLfECUsbFs2nekpJz9j3r9Q/6AskGKrTC2UwIWHCT7LZ56D967BgF+QvYOAlkKAeesE/0Djvm3IPfEZXCPswjWhQ0YH3sKB8laFmWSKfGcGxjRkluSYjjg== + PGDATABASE: AgCYuZ32FAlfM/4PzwYo82TCMa/zjqoS+OYThLKJbhAABpeRnDeWto+8E1jYhJYSnwIKTw32Zm6WGe2XFi2nfKhxOZi0+lzSzyLzGK4Z/fus1PhgBmvdKOeE/Y167GspE+PNS0Ju+JL6CPIBEX16mbfEycbFJxowXbJcxGJJ1LhYNvqNVnS2SnP9URe5QPki1PHN2blcSBxrPTfY0efufm+0s5MbTVcHwh9eXBrBBV0jO2y6GW5PfWLgl6vv1RpVsUJgNEcxPWKGt430t4Wof0PaMhBQQeXk4FOXET9QBsgFVbaQCOXqtGB1HSc+q+ZGbE7OFjP5q9Q0QifcLTg7lzzkrqH542joTgNjWc6pMgJismNbBLFGRULumdaPs3c7dWeFklicmFARPII2JhigHKuh5C5JEEYdtaeX0FPjy+WKstjHjZrKHTGgojI0Y/SDRyEK8UeZBZotqWsqvwdB6RX/8Wb+3mwzQrNWoOqDMbgi32wALyt/nvWu6epvg1GSfTSQ5YpHS0QNnOab5z93M6JqFxjhjnkDxBQC/bjoYbU8VRanSve8x5WAZ0FAh/4JJKgedwmZ1oTh7r4Hvzmq/31IGG009yAnR6Pu64hP2YJl+9lTOZS2RuHkW84tVP7jGTQOxmzh3ewtFgkzAOGefvKkmmOEXugjw40q2VNd92P2bkgAZs0BoVbQOzkQZmrEJh3+3dWwuS0yIw== + PGHOST: AgAkPATmbfX0+lrLdbSccDKSz5kYwJjinCmowPNMuYTSIHtuxqt3migh0rwFOwt7GF4Mc7lif18JR6v1upXAEzsSQ2YIT37LqHgbBxzkQvoOmLNVPHeMV0hujWXsxncMtoIOwm8J3hgAQVqn7ah6T+axz3WeKGHIp7GOQOy7ZJsPQtpeIm/I58ULffvGxuo5MTybo9lQ1x74ULJ0b7q3z5/cRsdf08WncJX67JLl5yBypFhee86BdE4aBvV2ORy4nLY/2sCt/ZFhg+5zEJaoHdVlGxZRF4zTsiYj7nEGWuw7fSFTVcvAiBC30jrLRCj7hMWq+mxeyHsjvI/O+6nfEiDIfAdoBFRTBLTnVJZaUZkfrvnvOmTEEX47fkSmSkNv00ti4Z6uwrgBGUj7axODeLZuzQATs0LXwNou+OsoUkv+gLxlLkbr+uGLr2XAWI0vQJpyMGnt/H00OI8C/A+Hw5YQJM9nNKIljXmqJDzcuh0snmXrY/u/9g1Gv2u14fOExZCm80dhAeiGp94QaWYC7hYaOXeE0lCIDnQI2T7DE4LRopqq0oYkrQdyM4xe7MNCWu+quvzY57rZUO3VL+aZHNhLvARmri+7P9T5st5J8CwOBxmyBxSCB/ltJIBOfkvl3sZcvBLp1XI+366t7RlYdktTvCr8WbzsU2GdLcmHU0Yf4SySziJFaar58aW1+7lbYMsfoq4v5CuWWNjPVphIu2zncrDHTM6T4HBb2ki/aBg04ZR6FFHKehwNvyNJBfBy6rERtQ== + PGPASSWORD: AgC6F1Vg9nr6E7X1w/Tlvnlx8YKOcpVQicdPQhbOhojYyKF9YUMF+OhMcobu5MzaRqDbu+TGIn/cQGwbs90Wk+lGbQ5MRudEVyZMVVcZz1PijmAkbh4JkmLYBvMqAk6J0foHmcZG/3bzojzbOAQZy8Xc5kIFTQlcLCf5i7ELaUXubnJXngtnTxPxv23otVRTSYd2oAuO7EDbPJxyMlwCtMeUbnrbiBcpGCfCcbLiyWM7uikmsy6645DzEjQJ0D8q8bh2M+Ooz4a43G7VSxXDygoKr0MoRhrTTmpOXK7UJwt2e6ZRZj6sWmbNVFgBwQopn4csIzM+qPtF6c3WuEd2ffDDMgubA8ma6UCRZCYyrg7wEFxx1yd+HXf7VNg6kItmWGqrzfy66gPQlNqen0pNFLlVMWe1jLi0Un0nayRTRCI+AcGctZjY1s9QTkxOXXYUsBNUbYf/zKgr7kiJc5ZIR26UuiMj/yuXWBmHDgzhuNQQWWiHpsoUCj3Y6ZUN9wt3cNi2rXAWS3YGhidd6pyjaJx25weNqxbAICksyGI5nnZ+JUgOvpqFioEv/1cL/m+NTlp33nUWk3SvhMLJPu2if8rIo059gRWtU+QNtu0u2vLOdg3mEWrbzuuDCG7tVoO6YJBq3p2molf1+x7P7qNf0uIG4mnfFXJEUlHELqwswEY7ZFC83AfAtFvG2IIeaoWIdfhd4SZyxSaxZ+np15FUIRwnS6jI/jseNScxj0W22E2Y7pWz6UMApBe0 + PGSSLMODE: AgCuL/IR2M2KOkLGSjLtu1mXk7K6z4Vl+fsnko+9n/7o61fBZrtJSiXiL2APg0jCL9SfALrTNQUWiqgMtpCc76hoKKD5AgWwMydYaR+pw5CFql3qKJQJ0xGJ4X34C31suJYkWQq2nof53JYssGMDq8TyvG6+vkXAPkdl2/98taTvbyz/vNKU5gRPdizyfSV9Xonntw3KyaQ3yqj+/dD8LEUm4w/TCVhYb2jVrPIinoJiIrxtIs99d/dJIHB+nDSXkF3paPNJ2OSEvMTfLXUYM/ZNHAq+kPh1vyDKMrtfxxM1Rq0SgbuPXNfZOuLtdch2VUewZGqYqpBUtKoSNOUFwLs2qwdK62tvFyGnJP2dWmekO2KGyKe9mHvyMGIHW/W1hxTiYOK5xW0qvobgEWCmgAloj3k3xDqQ0eD7qc2OlUQtvqBFzQETjwaV59wNJsqOUHQI9gQBsfeCE3o7UbghpPSAQvCFwMOUQxuWOdm8gc6d3F0dTsIIiJ/xydnqMxdfMyogno4g9Q8VEUkUux9Ui4vAp5Z9psucYYMNc8sgDxA09BVtZgtKpm8RFf3QO0tcSaHjz5+cb5iuLxQ2EnU4HLJ1gZ+MpFOvcxUV4apSKsX2Y7VJZcbePB+FQiZT6u4Dsx1HyuYnA2nYku93XkDdlXrxsCL7ThkDgtlfNz1JFm1LX1g5i+nlu+/HfkbtdtKMAI7yqhrZsbcO + PGUSER: AgBtaw5O4rJRlik4q2qU+OfvMBgQH6X7MfDS8OdqhoZSwT0diM4o0bW8vmwhhYYsd7BBOUFnDDSFiiqNn7/TgwP+KJEjZEel8Aea+zn3C5v7bJ0oTiJozQzjcURXnhPjQfR9O/LRoBqHvisxMNYf2fxbxR/oKrhvLUd6YihFwdOlqPql4o86fh/BIjA9XRXLX8YwG3eQq4G2396HcaI4Ufm1s0IuGUFsZYWUY56CKFH4UQDsnI+bH+WvBRDkhifQXvWFTz2iyb2cwi6oUmnzGWNG93vxAv88auLpj4/5gkcjCLHUNgzKfk+A8cYszU9wZLo4Lmdz9sHks20slxTmQwf/S8TCfFpaoDO4MJKFnG+h8KnPIf0PazHVguJp3frYuXc0rvk4pyBlekUIkPKWTzh3p81iQCYbhHXTKaSdX7ksBC/gVvu/0Z9s5KjSSnqWkkLpTtIdygiTt99+FGnjmYHBRcDOm1mhH0s6wscv9pMprQzZQvLx1+JMT7ibYwdE+xG5bTrDoOiYV675tIqVGorniU/Lj/BjlcB0ByLCvEjLfWZm6bKs0EtPfJXC7m4ISUW4XeY86qJyR/FiIcx0ymbiK9UIGqEG64Nw+6qml6qDIHag2vJZdqPiUN32j7m246255Y76ZqdUl5gWVrXcrRudgbS09yDQ83LsZGL6d4tN9aYXfGY93zyHfS3lh3Z5bY+/ENKPstLiFH3mIsfiDTl3ATLvi+CoKnkz4IAOfkGK89Kz2HokXYe5ug== + template: + metadata: + annotations: + sealedsecrets.bitnami.com/cluster-wide: "true" + creationTimestamp: null + name: azure-pg-admin-user + type: Opaque diff --git a/.k8s/environments/dev/create-db.ts b/.k8s/environments/dev/create-db.ts deleted file mode 100644 index 8deb8b80..00000000 --- a/.k8s/environments/dev/create-db.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { ok } from "assert"; -import { getDevDatabaseParameters } from "@socialgouv/kosko-charts/components/azure-db/params"; - -ok(process.env.CI_COMMIT_SHORT_SHA, "Expect CI_COMMIT_SHORT_SHA to be defined"); - -const sha = process.env.CI_COMMIT_SHORT_SHA; - -// create database autodevops_[sha] and user_[sha] -export default getDevDatabaseParameters({ suffix: sha }); diff --git a/.k8s/environments/dev/pg-secret.ts b/.k8s/environments/dev/pg-secret.ts deleted file mode 100644 index fdcdfe53..00000000 --- a/.k8s/environments/dev/pg-secret.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { ok } from "assert"; -import { PostresSecretParameters } from "@socialgouv/kosko-charts/components/pg-secret/params"; -import { getPgServerHostname } from "@socialgouv/kosko-charts/utils/getPgServerHostname"; - -ok(process.env.CI_COMMIT_SHORT_SHA, "Expect CI_COMMIT_SHORT_SHA to be defined"); -ok(process.env.CI_PROJECT_NAME, "Expect CI_PROJECT_NAME to be defined"); - -const sha = process.env.CI_COMMIT_SHORT_SHA; -const projectName = process.env.CI_PROJECT_NAME; - -export default { - name: `azure-pg-user-${sha}`, - database: `autodevops_${sha}`, - user: `user_${sha}`, - password: `password_${sha}`, - host: getPgServerHostname(projectName, "dev"), -} as PostresSecretParameters; diff --git a/.k8s/environments/preprod/create-db.ts b/.k8s/environments/preprod/create-db.ts deleted file mode 100644 index 96b3d9f8..00000000 --- a/.k8s/environments/preprod/create-db.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { ok } from "assert"; -import { getDevDatabaseParameters } from "@socialgouv/kosko-charts/components/azure-db/params"; - -ok(process.env.CI_COMMIT_SHORT_SHA, "Expect CI_COMMIT_SHORT_SHA to be defined"); - -const sha = process.env.CI_COMMIT_SHORT_SHA; - -// create database autodevops_preprod_[sha] and user_preprod_[sha] -export default getDevDatabaseParameters({ suffix: `preprod_${sha}` }); diff --git a/.k8s/environments/preprod/index.ts b/.k8s/environments/preprod/index.ts deleted file mode 100644 index 4c50cd47..00000000 --- a/.k8s/environments/preprod/index.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { GlobalEnvironment } from "@socialgouv/kosko-charts/types"; - -export default { - subdomain: `preprod-${process.env.CI_PROJECT_NAME}`, - ingress: { - annotations: { - "kubernetes.io/tls-acme": undefined, - "certmanager.k8s.io/cluster-issuer": undefined, - }, - secretName: "wildcard-crt", - }, -} as Partial; diff --git a/.k8s/environments/prod/create-db.ts b/.k8s/environments/prod/create-db.ts deleted file mode 100644 index a87eb3b9..00000000 --- a/.k8s/environments/prod/create-db.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { ok } from "assert"; -import { getProdDatabaseParameters } from "@socialgouv/kosko-charts/components/azure-db/params"; - -// create production database -export default getProdDatabaseParameters(); From 6ec3620d5cdeb6424f7f87da79b15b9423e9d23d Mon Sep 17 00:00:00 2001 From: Julien Bouquillon Date: Sat, 25 Jul 2020 03:55:22 +0200 Subject: [PATCH 13/61] add prod env files --- .k8s/environments/prod/app.configmap.yaml | 10 ++++++++++ .k8s/environments/prod/app.sealed-secret.yaml | 17 +++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 .k8s/environments/prod/app.configmap.yaml create mode 100644 .k8s/environments/prod/app.sealed-secret.yaml diff --git a/.k8s/environments/prod/app.configmap.yaml b/.k8s/environments/prod/app.configmap.yaml new file mode 100644 index 00000000..655ab6f0 --- /dev/null +++ b/.k8s/environments/prod/app.configmap.yaml @@ -0,0 +1,10 @@ +kind: ConfigMap +apiVersion: v1 +metadata: + name: app-configmap +data: + NODE_ENV: "production" + GRAPHQL_ENDPOINT: "http://hasura/v1/graphql" + ACCOUNT_MAIL_SENDER: "contact@fabrique.social.gouv.fr" + FRONTEND_PORT: "3000" + PRODUCTION: "true" diff --git a/.k8s/environments/prod/app.sealed-secret.yaml b/.k8s/environments/prod/app.sealed-secret.yaml new file mode 100644 index 00000000..f86aaea3 --- /dev/null +++ b/.k8s/environments/prod/app.sealed-secret.yaml @@ -0,0 +1,17 @@ +apiVersion: bitnami.com/v1alpha1 +kind: SealedSecret +metadata: + creationTimestamp: null + name: app-sealed-secret +spec: + encryptedData: + SMTP_EMAIL_PASSWORD: AgAGdvTnBpg52nSwcqvGIoTRkxweutFd7x1hbU/HHAH9gxPa4ICT5AOZyb+Ec9OeaSBQjf9T+4qYGC5FngtbhqfSiloVvir2NvXZOUy+O3ME33QCzfw4+nANvHmsngFDVsJdjvSz2ykT9dyNbiyFrqRBhV5RnIAqgTfvXozVOFdFeUVRelL+tZQC0miGdHUOmjjOSh4T8LntBwJOj9lv/oW1g+Vai2zOwfSGFRTeWHv/Y5WYXCiuprOzgrYUEEzxDb/ELD45S5fcwYM4KVezHe1NAWqjPhcVwLq1q4iqSaHBwGBH528pxcFcPUn3u1uK/ip3lsPiA32vi5bFantUoBiL8HfB5NedJMls/3AeyIQl53Ymu55kr/NZ5YugXExs+uCgm3aRE8EyMWnVjvYZ2npSXS9hiTsBm0jyEHOSfdLiuWvGK5r+1zz6mHuBYemQQnLjEpmRhrG5XJyJmHAsRNR1P7H1+3pqSDD8iw0yXinth3URP/4L9JrTaI4Mx2LmDmVj34oGrbMx1Ekqe7t8MjrHy/fIXRqct7X+F+GFjklALzYNuBqNUg+HxbdVKxuo9STbUVhxTXkSvlgOaT9sUiyYFybiqj8vX9VPKhKBxrUmEPue4d63v/ud3YhyHcFENUQ7PKteBUKjzPOaMNi4xvmUi6Wk/sSCBi5BZiin0obLdUGplnmO0rzX9wxllUBS+o14T5m6kWk0b1oUesVOORk9mBR1rUPKHJWCmkFYcoqTjQ== + SMTP_EMAIL_USER: AgCVO/tUEz52Bt2Az91fIjWN6MYoV+eHqyufJ1N1RzkzgF/sw5DRdpKR5+s9ZOJvPlsEBUoUtd+iH16ZJz/vx4oSR5+KeTg4fXyOIi+jL/AB4hBYP8cQvvC9kXvK4KiS1FXiYvXKATcusvTkHdJZf/CfYB7jyXpyvMdmefiOexjwyieIP//YqPygqgOvi7RGnqohrk2S28YW17/oJA1QatbUh84wNG/6sSAfyy7coYaSU+6gTjHdommuypMRN7QKts/Hj0ZdM8xzXjQ630NzIPjZha6gG++ZDhR2hyo+vGuUESKuE37ifeEJlBhnWr/T9Qm2xE29UDChUpmtGtFz5xoxLabk8eU32qWy3WzclX26D2Ctcl1zy8atbaHq7A5JeWrV9wowhrUMVg/uiDXbt4NTcegHwCfSXl1kqNMVtJl7HijmUBMy+Yf7ntKyhdA6AoLZFQxrypzY3lgIS+2p46Ig1CP/DXakOn7yyoRW+k1KkzKv9E18QlvaRn6coyq705brLLM3/RuISw+FwGbD/VLgiHMIpCarY+Uy+K/c28320DXvoMLopAJekUnbdiPzL7vPLs2ao7BPZ+a0GDvpp+f+/T/EoVIHgiZoHiXEYmc/n2fmYd7Gb0UCa1og2ovhiegLnaFewD2OKMuP/gDuIwvnX9jU093dVupOw1muX0wgB+NH4xl7rTB42nvxLZK6N/ymfqg+LzQnqU+3drEWunSgepvKYem+86aKq2BkoJF+Ng== + SMTP_URL: AgDVilgKuupA5C2U/aA69wX3hl3Rbv58xFS7WGeUjq7ubq5meZhRyT3QG3Ly1rXzoPCfB3LDC0JDjRMJ1G2jmn9o0znEXYks/49m6hDaKhcwnnlIE/ThBJ/BBqnZtoAjxzoeBSvaEhV/dd/a7GrIQYiswfT8P3LVza4gKdj1li5vs7htCLnZfOrAgAqfXSxILDfHlEk9lmbL5J4JdYlVKesp6XNjcnUWaP2ycc0vW3qWlwrFU2DJw45wZCoE/76hG2s+Tk3VF5Q6kiNJCKTCf88jpeiggxIpntjLJk8nmrr9/aZ8fl8gDWUYV+15UFgh5jSP0nlWlCTmxAMmEL2lwBb9289rt0o3ZM7L+yfzLGD9QTy/Ns0hm2M4Cynwh0SD1ti/lMv/GO73XFShUO2glHM96isPFqvbBdBGua8ksp59W0TYQRMFFHbygZEj4k5K516w3gV4XonZN6INOqKt4s27R9oiOoFup2mQo0ns1sH7XB8q/wXVmro3km/dqToSOFRa/0v+fZNfzlh1X0JlqI+940CQz7I3rusrFDR5kfryVt0A6AP9tjyG9jQAjiM0lwcJgHrDARpNXuo9qzLf0yDK68NrR49XGWNugRuKHEA8Ka7vLmbeIvZOElsfn/ZCpnWrUNcRO/5dvxIQgNRIKiHVcqM1QV6V31YZMa6ZfJI/zhLaWEoOV0svcYrO9jy9H0rRtrMEqXZO0IQ8pYVfHhNxbA== + template: + metadata: + annotations: + sealedsecrets.bitnami.com/cluster-wide: "true" + creationTimestamp: null + name: app-sealed-secret + type: Opaque From 655842c34c1369d6cf7b21bfe6f57802650c7f20 Mon Sep 17 00:00:00 2001 From: Julien Bouquillon Date: Sat, 25 Jul 2020 04:10:43 +0200 Subject: [PATCH 14/61] cleanup --- .k8s/components/azure-pg.ts | 3 --- .k8s/components/pgweb.ts | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.k8s/components/azure-pg.ts b/.k8s/components/azure-pg.ts index 67b3fe4c..a2053c2c 100644 --- a/.k8s/components/azure-pg.ts +++ b/.k8s/components/azure-pg.ts @@ -3,9 +3,6 @@ import { ok } from "assert"; import { create } from "@socialgouv/kosko-charts/components/azure-pg"; -ok(process.env.CI_PROJECT_NAME, "Expect CI_PROJECT_NAME to be defined"); -ok(process.env.CI_COMMIT_SHORT_SHA, "Expect CI_COMMIT_SHORT_SHA to be defined"); - let params = env.component("azure-pg"); const manifests = create({ diff --git a/.k8s/components/pgweb.ts b/.k8s/components/pgweb.ts index 9f1a0036..54138095 100644 --- a/.k8s/components/pgweb.ts +++ b/.k8s/components/pgweb.ts @@ -5,7 +5,7 @@ import { create } from "@socialgouv/kosko-charts/components/app"; const manifests = create("pgweb", { env, config: { - image: "pouet:42", + image: "sosedoff/pgweb:latest", subdomain: `pgweb-${process.env.CI_PROJECT_NAME as string}`, livenessProbe: { httpGet: { From 509d6d4954183a470aa0df9d76ffac6fa05fa440 Mon Sep 17 00:00:00 2001 From: Julien Bouquillon Date: Sun, 26 Jul 2020 00:06:42 +0200 Subject: [PATCH 15/61] use registered images --- .k8s/components/app.ts | 4 +++- .k8s/components/hasura.ts | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.k8s/components/app.ts b/.k8s/components/app.ts index ed0dd701..e27b1cf5 100644 --- a/.k8s/components/app.ts +++ b/.k8s/components/app.ts @@ -5,6 +5,8 @@ import { create } from "@socialgouv/kosko-charts/components/app"; const manifests = create("app", { env, config: { + image: + "registry.gitlab.factory.social.gouv.fr/socialgouv/sample-next-app:002b0f68266e5243e733fe7c896b610f49757718", requests: { cpu: "1m", memory: "64Mi", @@ -13,7 +15,7 @@ const manifests = create("app", { cpu: "50m", memory: "128Mi", }, - containerPort: 3000, + containerPort: 3030, }, }); diff --git a/.k8s/components/hasura.ts b/.k8s/components/hasura.ts index a0a4dae2..546d5a5c 100644 --- a/.k8s/components/hasura.ts +++ b/.k8s/components/hasura.ts @@ -5,6 +5,8 @@ import { create } from "@socialgouv/kosko-charts/components/app"; const manifests = create("hasura", { env, config: { + image: + "registry.gitlab.factory.social.gouv.fr/socialgouv/sample-next-app/hasura:002b0f68266e5243e733fe7c896b610f49757718", subdomain: `hasura-${process.env.CI_PROJECT_NAME as string}`, requests: { cpu: "100m", From a0b9089d7c2effec607de4f4a7f9512316691fad Mon Sep 17 00:00:00 2001 From: Julien Bouquillon Date: Sun, 26 Jul 2020 00:39:50 +0200 Subject: [PATCH 16/61] add pg user to pgweb+hasura --- .k8s/components/hasura.ts | 29 ++++++++++++------- .k8s/components/pgweb.ts | 18 ++++++++++++ .../dev/hasura.sealed-secret.yaml | 2 +- 3 files changed, 37 insertions(+), 12 deletions(-) diff --git a/.k8s/components/hasura.ts b/.k8s/components/hasura.ts index 546d5a5c..6f7fa6f2 100644 --- a/.k8s/components/hasura.ts +++ b/.k8s/components/hasura.ts @@ -1,10 +1,13 @@ import env from "@kosko/env"; import { create } from "@socialgouv/kosko-charts/components/app"; +import { addToEnvFrom } from "@socialgouv/kosko-charts/utils/addToEnvFrom"; +import { EnvFromSource } from "kubernetes-models/v1/EnvFromSource"; const manifests = create("hasura", { env, config: { + //ingress: false, image: "registry.gitlab.factory.social.gouv.fr/socialgouv/sample-next-app/hasura:002b0f68266e5243e733fe7c896b610f49757718", subdomain: `hasura-${process.env.CI_PROJECT_NAME as string}`, @@ -20,17 +23,21 @@ const manifests = create("hasura", { }, }); -// if (process.env.ENABLE_AZURE_POSTGRES) { -// const azureSecretSource = new EnvFromSource({ -// secretRef: { -// name: `azure-pg-user-${process.env.CI_COMMIT_SHORT_SHA}`, -// }, -// }); -// addToEnvFrom({ -// deployment, -// data: [azureSecretSource], -// }); -// } +// DEV: add secret to access DB +//@ts-expect-error +const deployment = manifests.find((manifest) => manifest.kind === "Deployment"); +if (deployment) { + const azureSecretSource = new EnvFromSource({ + secretRef: { + name: `azure-pg-user-${process.env.CI_COMMIT_SHORT_SHA}`, + }, + }); + addToEnvFrom({ + //@ts-expect-error + deployment, + data: [azureSecretSource], + }); +} // diff --git a/.k8s/components/pgweb.ts b/.k8s/components/pgweb.ts index 54138095..fdf657c0 100644 --- a/.k8s/components/pgweb.ts +++ b/.k8s/components/pgweb.ts @@ -1,6 +1,8 @@ import env from "@kosko/env"; import { create } from "@socialgouv/kosko-charts/components/app"; +import { addToEnvFrom } from "@socialgouv/kosko-charts/utils/addToEnvFrom"; +import { EnvFromSource } from "kubernetes-models/v1/EnvFromSource"; const manifests = create("pgweb", { env, @@ -27,6 +29,22 @@ const manifests = create("pgweb", { }, }); +// DEV: add secret to access DB +//@ts-expect-error +const deployment = manifests.find((manifest) => manifest.kind === "Deployment"); +if (deployment) { + const azureSecretSource = new EnvFromSource({ + secretRef: { + name: `azure-pg-user-${process.env.CI_COMMIT_SHORT_SHA}`, + }, + }); + addToEnvFrom({ + //@ts-expect-error + deployment, + data: [azureSecretSource], + }); +} + export default manifests; /* diff --git a/.k8s/environments/dev/hasura.sealed-secret.yaml b/.k8s/environments/dev/hasura.sealed-secret.yaml index 92614571..2b76aa72 100644 --- a/.k8s/environments/dev/hasura.sealed-secret.yaml +++ b/.k8s/environments/dev/hasura.sealed-secret.yaml @@ -2,7 +2,7 @@ apiVersion: bitnami.com/v1alpha1 kind: SealedSecret metadata: creationTimestamp: null - name: hasura-env + name: hasura-sealed-secret spec: encryptedData: {} template: From 7ed0eb2ead0f58927b38f432e39b35282570f11e Mon Sep 17 00:00:00 2001 From: Julien Bouquillon Date: Sun, 26 Jul 2020 00:55:36 +0200 Subject: [PATCH 17/61] cleanup --- .k8s/components/hasura.ts | 16 ++-------------- .k8s/components/pgweb.ts | 30 ++---------------------------- 2 files changed, 4 insertions(+), 42 deletions(-) diff --git a/.k8s/components/hasura.ts b/.k8s/components/hasura.ts index 6f7fa6f2..206ba6d3 100644 --- a/.k8s/components/hasura.ts +++ b/.k8s/components/hasura.ts @@ -1,8 +1,7 @@ import env from "@kosko/env"; import { create } from "@socialgouv/kosko-charts/components/app"; -import { addToEnvFrom } from "@socialgouv/kosko-charts/utils/addToEnvFrom"; -import { EnvFromSource } from "kubernetes-models/v1/EnvFromSource"; +import { addPostgresUserSecret } from "@socialgouv/kosko-charts/utils/addPostgresUserSecret"; const manifests = create("hasura", { env, @@ -26,18 +25,7 @@ const manifests = create("hasura", { // DEV: add secret to access DB //@ts-expect-error const deployment = manifests.find((manifest) => manifest.kind === "Deployment"); -if (deployment) { - const azureSecretSource = new EnvFromSource({ - secretRef: { - name: `azure-pg-user-${process.env.CI_COMMIT_SHORT_SHA}`, - }, - }); - addToEnvFrom({ - //@ts-expect-error - deployment, - data: [azureSecretSource], - }); -} +addPostgresUserSecret(deployment); // diff --git a/.k8s/components/pgweb.ts b/.k8s/components/pgweb.ts index fdf657c0..4a442f4c 100644 --- a/.k8s/components/pgweb.ts +++ b/.k8s/components/pgweb.ts @@ -1,8 +1,7 @@ import env from "@kosko/env"; import { create } from "@socialgouv/kosko-charts/components/app"; -import { addToEnvFrom } from "@socialgouv/kosko-charts/utils/addToEnvFrom"; -import { EnvFromSource } from "kubernetes-models/v1/EnvFromSource"; +import { addPostgresUserSecret } from "@socialgouv/kosko-charts/utils/addPostgresUserSecret"; const manifests = create("pgweb", { env, @@ -32,31 +31,6 @@ const manifests = create("pgweb", { // DEV: add secret to access DB //@ts-expect-error const deployment = manifests.find((manifest) => manifest.kind === "Deployment"); -if (deployment) { - const azureSecretSource = new EnvFromSource({ - secretRef: { - name: `azure-pg-user-${process.env.CI_COMMIT_SHORT_SHA}`, - }, - }); - addToEnvFrom({ - //@ts-expect-error - deployment, - data: [azureSecretSource], - }); -} +addPostgresUserSecret(deployment); export default manifests; - -/* - -if (process.env.ENABLE_AZURE_POSTGRES) { - deployment.spec!.template.spec!.containers[0].envFrom = [ - { - secretRef: { - name: `azure-pg-user-${process.env.CI_COMMIT_SHORT_SHA}`, - }, - }, - ]; -} - -*/ From 1b45142054554fb52c9d5222ee598ae7627761f1 Mon Sep 17 00:00:00 2001 From: Julien Bouquillon Date: Mon, 27 Jul 2020 14:00:06 +0200 Subject: [PATCH 18/61] fix module mode --- .k8s/main.js | 55 ++++++++++++++++++++++------------------------------ 1 file changed, 23 insertions(+), 32 deletions(-) diff --git a/.k8s/main.js b/.k8s/main.js index 38e5c88c..f1795a8d 100644 --- a/.k8s/main.js +++ b/.k8s/main.js @@ -6,38 +6,29 @@ const data = toml.parse( ); console.dir(data); -const kosko = require("@kosko/generate"); -console.log("GENERATE:", kosko); -const options = { - path: "/Users/gvanwoerkens/Work/dsi/sample-next-app/.k8s/components", - components: ["*"], - require: ["ts-node/register"], - baseEnvironment: "_base", -}; +("use strict"); -// console.log("\nKUBE_NAMESPACE", process.env.KUBE_NAMESPACE, "\n"); +const env = require("@kosko/env"); +const { generate, print, PrintFormat } = require("@kosko/generate"); +const { join } = require("path"); -kosko.generate(options); -// import { generate, print, PrintFormat, Result } from "@kosko/generate"; -// ****** MAPPER ******** { name: 'sample-next-app-85-beta-db-12-dev2' } +(async () => { + // Set environment + env.env = "dev"; -// $$$$$$$$$$ PARAMS $$$$$$$$$$ { -// annotations: { -// 'app.gitlab.com/app': 'socialgouv-sample-next-app', -// 'app.gitlab.com/env': 'beta-db-12-dev2', -// 'app.gitlab.com/env.name': 'beta-db-12-dev2', -// 'field.cattle.io/creatorId': 'gitlab', -// 'field.cattle.io/projectId': 'c-f8qps:p-46tj7', -// 'git/branch': 'beta-db-12', -// 'git/remote': '' -// }, -// domain: 'dev2.fabrique.social.gouv.fr', -// labels: { -// application: 'beta-db-12-dev2-sample-next-app', -// owner: 'sample-next-app', -// team: 'sample-next-app', -// cert: 'wildcard' -// }, -// namespace: { name: 'sample-next-app-85-beta-db-12-dev2' }, -// subdomain: 'beta-db-12-dev2-sample-next-app' -// } + // Set CWD (Optional) + env.cwd = __dirname; + + // Generate manifests + const result = await generate({ + path: join(env.cwd, "components"), + components: ["*"], + baseEnvironment: "_base", + }); + + // Print manifests to stdout + print(result, { + format: PrintFormat.YAML, + writer: process.stdout, + }); +})(); From ac8e18455ed0bf6030a5b0af1e0fe6dd227752de Mon Sep 17 00:00:00 2001 From: Julien Bouquillon Date: Mon, 27 Jul 2020 16:53:22 +0200 Subject: [PATCH 19/61] update kosko-charts --- .k8s/package.json | 2 +- .k8s/yarn.lock | 25 ++++++++++++++++++------- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/.k8s/package.json b/.k8s/package.json index c7bf421e..8e5adba7 100644 --- a/.k8s/package.json +++ b/.k8s/package.json @@ -11,7 +11,7 @@ }, "dependencies": { "@kosko/env": "^0.5.2", - "@socialgouv/kosko-charts": "link:../../kosko-charts", + "@socialgouv/kosko-charts": "v2.0.0-alpha.12", "kubernetes-models": "^0.8.0", "toml": "^3.0.0" }, diff --git a/.k8s/yarn.lock b/.k8s/yarn.lock index 62114fd1..aa2a3e54 100644 --- a/.k8s/yarn.lock +++ b/.k8s/yarn.lock @@ -144,9 +144,20 @@ "@nodelib/fs.scandir" "2.1.3" fastq "^1.6.0" -"@socialgouv/kosko-charts@link:../../kosko-charts": - version "0.0.0" - uid "" +"@sindresorhus/is@^3.0.0": + version "3.1.0" + resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-3.1.0.tgz#d8735532635bea69ad39119df5f0f10099bd09dc" + integrity sha512-n4J+zu52VdY43kdi/XdI9DzuMr1Mur8zFL5ZRG2opCans9aiFwkPxHYFEb5Xgy7n1Z4K6WfI4FpqUqsh3E8BPQ== + +"@socialgouv/kosko-charts@v2.0.0-alpha.12": + version "2.0.0-alpha.12" + resolved "https://registry.yarnpkg.com/@socialgouv/kosko-charts/-/kosko-charts-2.0.0-alpha.12.tgz#27d0014bb3756076e5d6362445a225410121f4ad" + integrity sha512-uopoOiGQ3IgW7c+704UL003KdR9bZQzDFhUAqRvaLrHtN1Y1deLfk+r0fwfy10X5OyyHZ4skKVIAA9hcecSLfQ== + dependencies: + "@kubernetes-models/sealed-secrets" "^0.1.4" + "@sindresorhus/is" "^3.0.0" + fp-ts "^2.6.6" + io-ts "2.2.7" "@types/color-name@^1.1.1": version "1.1.1" @@ -471,10 +482,10 @@ import-local@^3.0.2: pkg-dir "^4.2.0" resolve-cwd "^3.0.0" -io-ts@2.2.6: - version "2.2.6" - resolved "https://registry.yarnpkg.com/io-ts/-/io-ts-2.2.6.tgz#809305ef9af646c4edf79145671298835e321758" - integrity sha512-UcO9I/ptnGttBKRAF3KW0G6fiS7uqfjUSDdeq+qmMKH0k8sZrbDMnNP8I/TTSkoztPr5OZstnQxb1Vo5Ua8MOg== +io-ts@2.2.7: + version "2.2.7" + resolved "https://registry.yarnpkg.com/io-ts/-/io-ts-2.2.7.tgz#5c05477580bff4c0154b474316c8916253e87c44" + integrity sha512-kCusyu/Fa0oax5ue2Id/ZqVLEk5JOWyrXHcLbD4kHoVM50MhDEWUtcHlN7RrD94I8OrWILcVltM6OllnZiHJmg== is-arrayish@^0.2.1: version "0.2.1" From c37bc2fefe42706ed10f4b3d586b2d1230025b66 Mon Sep 17 00:00:00 2001 From: Julien Bouquillon Date: Mon, 27 Jul 2020 17:13:23 +0200 Subject: [PATCH 20/61] fix dev/app.sealed-secret.yaml --- .k8s/environments/dev/app.sealed-secret.yaml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.k8s/environments/dev/app.sealed-secret.yaml b/.k8s/environments/dev/app.sealed-secret.yaml index f86aaea3..b06380fc 100644 --- a/.k8s/environments/dev/app.sealed-secret.yaml +++ b/.k8s/environments/dev/app.sealed-secret.yaml @@ -1,17 +1,19 @@ apiVersion: bitnami.com/v1alpha1 kind: SealedSecret metadata: + annotations: + sealedsecrets.bitnami.com/cluster-wide: "true" creationTimestamp: null name: app-sealed-secret spec: encryptedData: - SMTP_EMAIL_PASSWORD: AgAGdvTnBpg52nSwcqvGIoTRkxweutFd7x1hbU/HHAH9gxPa4ICT5AOZyb+Ec9OeaSBQjf9T+4qYGC5FngtbhqfSiloVvir2NvXZOUy+O3ME33QCzfw4+nANvHmsngFDVsJdjvSz2ykT9dyNbiyFrqRBhV5RnIAqgTfvXozVOFdFeUVRelL+tZQC0miGdHUOmjjOSh4T8LntBwJOj9lv/oW1g+Vai2zOwfSGFRTeWHv/Y5WYXCiuprOzgrYUEEzxDb/ELD45S5fcwYM4KVezHe1NAWqjPhcVwLq1q4iqSaHBwGBH528pxcFcPUn3u1uK/ip3lsPiA32vi5bFantUoBiL8HfB5NedJMls/3AeyIQl53Ymu55kr/NZ5YugXExs+uCgm3aRE8EyMWnVjvYZ2npSXS9hiTsBm0jyEHOSfdLiuWvGK5r+1zz6mHuBYemQQnLjEpmRhrG5XJyJmHAsRNR1P7H1+3pqSDD8iw0yXinth3URP/4L9JrTaI4Mx2LmDmVj34oGrbMx1Ekqe7t8MjrHy/fIXRqct7X+F+GFjklALzYNuBqNUg+HxbdVKxuo9STbUVhxTXkSvlgOaT9sUiyYFybiqj8vX9VPKhKBxrUmEPue4d63v/ud3YhyHcFENUQ7PKteBUKjzPOaMNi4xvmUi6Wk/sSCBi5BZiin0obLdUGplnmO0rzX9wxllUBS+o14T5m6kWk0b1oUesVOORk9mBR1rUPKHJWCmkFYcoqTjQ== - SMTP_EMAIL_USER: AgCVO/tUEz52Bt2Az91fIjWN6MYoV+eHqyufJ1N1RzkzgF/sw5DRdpKR5+s9ZOJvPlsEBUoUtd+iH16ZJz/vx4oSR5+KeTg4fXyOIi+jL/AB4hBYP8cQvvC9kXvK4KiS1FXiYvXKATcusvTkHdJZf/CfYB7jyXpyvMdmefiOexjwyieIP//YqPygqgOvi7RGnqohrk2S28YW17/oJA1QatbUh84wNG/6sSAfyy7coYaSU+6gTjHdommuypMRN7QKts/Hj0ZdM8xzXjQ630NzIPjZha6gG++ZDhR2hyo+vGuUESKuE37ifeEJlBhnWr/T9Qm2xE29UDChUpmtGtFz5xoxLabk8eU32qWy3WzclX26D2Ctcl1zy8atbaHq7A5JeWrV9wowhrUMVg/uiDXbt4NTcegHwCfSXl1kqNMVtJl7HijmUBMy+Yf7ntKyhdA6AoLZFQxrypzY3lgIS+2p46Ig1CP/DXakOn7yyoRW+k1KkzKv9E18QlvaRn6coyq705brLLM3/RuISw+FwGbD/VLgiHMIpCarY+Uy+K/c28320DXvoMLopAJekUnbdiPzL7vPLs2ao7BPZ+a0GDvpp+f+/T/EoVIHgiZoHiXEYmc/n2fmYd7Gb0UCa1og2ovhiegLnaFewD2OKMuP/gDuIwvnX9jU093dVupOw1muX0wgB+NH4xl7rTB42nvxLZK6N/ymfqg+LzQnqU+3drEWunSgepvKYem+86aKq2BkoJF+Ng== - SMTP_URL: AgDVilgKuupA5C2U/aA69wX3hl3Rbv58xFS7WGeUjq7ubq5meZhRyT3QG3Ly1rXzoPCfB3LDC0JDjRMJ1G2jmn9o0znEXYks/49m6hDaKhcwnnlIE/ThBJ/BBqnZtoAjxzoeBSvaEhV/dd/a7GrIQYiswfT8P3LVza4gKdj1li5vs7htCLnZfOrAgAqfXSxILDfHlEk9lmbL5J4JdYlVKesp6XNjcnUWaP2ycc0vW3qWlwrFU2DJw45wZCoE/76hG2s+Tk3VF5Q6kiNJCKTCf88jpeiggxIpntjLJk8nmrr9/aZ8fl8gDWUYV+15UFgh5jSP0nlWlCTmxAMmEL2lwBb9289rt0o3ZM7L+yfzLGD9QTy/Ns0hm2M4Cynwh0SD1ti/lMv/GO73XFShUO2glHM96isPFqvbBdBGua8ksp59W0TYQRMFFHbygZEj4k5K516w3gV4XonZN6INOqKt4s27R9oiOoFup2mQo0ns1sH7XB8q/wXVmro3km/dqToSOFRa/0v+fZNfzlh1X0JlqI+940CQz7I3rusrFDR5kfryVt0A6AP9tjyG9jQAjiM0lwcJgHrDARpNXuo9qzLf0yDK68NrR49XGWNugRuKHEA8Ka7vLmbeIvZOElsfn/ZCpnWrUNcRO/5dvxIQgNRIKiHVcqM1QV6V31YZMa6ZfJI/zhLaWEoOV0svcYrO9jy9H0rRtrMEqXZO0IQ8pYVfHhNxbA== + SMTP_EMAIL_PASSWORD: AgAHmih6Z8mUwB35+j9CnS6xJ0H8P3oZoZeT1mk6lluwpRlSXnn9ElexuNVGGI72rizH8pkl411ciTGxb4crXPso+z9SkpsTKgqCUy8GAHkjTULTxBX81LkoiaWJ0Su5PaVBe/0tPK3lreaNlU1cK+6L0/+rja0Owkz2McedQRydj6iHfuH9rLTXiYXebTTY1/Hnajh25yEoM9TqYzNdnuiKKpoOY1qFl26mUYje90a7evkK8NOG1JAvpl/8cma9OIK031hzEM+/3lWuPniGSOfwPNR0PR6xaFDswbbLJCyedQrkFXHSQRG4tZPTEZTaXtQ2JORr/b8DWNOmX2pAF6FC1oENed6fQP3/4NEVirBnBkBK8f+kv2x1sZei4XlkgjUNMg19DGh2rz9mRjBo61pB3GkirCm/DzZ5qt8DmfG3wOLgKFPJwCE+EL5lxKl6USRWCDU73S0Ewt8Q33iU8g8j292dInGXp1lnKaN/Q3yNmrsseCvSNccmUf9PJvQ+MUiz/6xmWn3Wjp1NirSTsJKSAxkGV+MvEA71POPRIAolEuekzJfYf021r+bbOiqSCSL9sMaiV6OmjRuWW3N/EEx/un/9jETwv3NTWUgmNGbnY0np7hJtXDWeWg1Tv07j729bbVe9kjrlBaQX93E93SIKyog6+v11I5iCuPC0qIOe8hj65Irn+WACY4VnR9ooGZ03KsoPDEWQJ9lVJ03PLJml8G6rB8Fj5O6yUYIHWRy5fw== + SMTP_EMAIL_USER: AgAMfVSmtsRfyAQGoyQdzNACLxQfd7Zk1CWJmV1K7oh7ixZGE9DpqFp1cQ107mAFFyjrxEMMhVvIU3GODWoTuZ751nOem8EObToEcExqrnzTai4l2+cgl4tuWEXgW/5pkeKm2+haCHYFAkjVCp13DhbbRIVeudFU3c3k+ZBXNSDYZzHuAZOa8hM/yYuUiz4vhu6xc2/2cRpRgDoOrL/6NUTQiq3zm0Z/1yO38xirw485Wo9aFac+pldo7FM8d7fsvMup3omchoeXXRuRBBgUT/JgPIWMrXal7MUh1UwLFp4LEgFEvAa9yw5pdAFHf7wIBLJRvw0QpfwX9p8l1y/H1PQMTSHLlA93mhuQkRhBTEKSMqCAl3XkGUUTuGqW9WdyFOBfyyj7BHUul072LqmSiKmwHOVzt+m4qdMUPeZwxj44+Q+Ff4ifU+na4si+K5Fu5GYLUBCYUk+k9QF+HcFKdCO5UCeTWLJWZqhwXWG9O0r4av6HGNG9IChU2ozwaFyeavaDHEBxCUqgDzPJbqIP6zU+tq8RNfacehx3KGRYqhLZNhK7Xy8+AkpI2ZZmyXzubvttIC1KQ+TVd0mY/XjE+rx5eWko5VweUFEwo4KI6oJtb8cUldNBYAINlQl3I4G9U6XcgiT+slk9p+4P0Jzkmc/UvfPuqTISoA58chz7kls03XkEaCzhfamkzhsr1+NUvuwHFXtedHNun8be0amZE8WoBPyp093p5r6fzG/I+uk9GA== + SMTP_URL: AgCFKowZYaBBRXeK6Eru7I13QidmTS1iZVxAlcOWVitLJi3wN0OOggIIVzfr8/cUBW7kxw7+RpIJOfsjCmhY5qYmjmteMq+so5tH/UKSeV4q7xhHAIaY96rZt/dX3JermN3fR9AkM7OyfwONdej6986hbvpI3EQNBT40wcM7WvZz1uSu/0oUm8xdg2fJeUUPfxvoHr+oYb8ApbHArdeRbLpYi+oRqkTGoLTTAnpA4JQCOOMDhfKKZxmps6LlojFKoLrWGMLzWCbkjxMVjCtIL7eXfJfA6/GekyifDG7/M8gkvZdVcpSFJOAjG+tCJLsQ8oAb4A1eurFHSImr1S5BuatxaAzvRS3tOWYtnSLt6M3Xgj9Imtl0SI0J/Ca0KJGPMMPPOra/FKCnPAFQ9N1huUWkHUhdkiOf48J7zI49TONDq7ICHQIb0K3FDMGlHNdsKKSnvlZcuDXe0/8i/dyrSjyrUqpDk68T4FizJjVX80ukNAVi/vV7WTHnfEijN/rGV168rteO+4Hy3/KGLfJ2UZCWVYxDiNX0wkk4CN0yfkJBnYbDZgTbAZRVNchsHo82d19AP6qZuY7Yunl1nCUTzMcIZL6O9xtVH99bVUNYhwHNrZRTBeocSuxVCmSaH+O9mc1QeaRCEANj588j+nF3/JL0SITsdfxd2AMqZVgwDYzxF3b3xyT6s37wg0avvo1Z1KH/ayen808/QRzJ2tbKKNsgEA== template: metadata: annotations: sealedsecrets.bitnami.com/cluster-wide: "true" creationTimestamp: null name: app-sealed-secret - type: Opaque + From 79e03b58662201f409da5cadc94c241426756f95 Mon Sep 17 00:00:00 2001 From: Julien Bouquillon Date: Mon, 27 Jul 2020 17:21:06 +0200 Subject: [PATCH 21/61] use @socialgouv/kosko-charts:v2.0.0-alpha.13 --- .k8s/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.k8s/package.json b/.k8s/package.json index 8e5adba7..ace9b404 100644 --- a/.k8s/package.json +++ b/.k8s/package.json @@ -11,7 +11,7 @@ }, "dependencies": { "@kosko/env": "^0.5.2", - "@socialgouv/kosko-charts": "v2.0.0-alpha.12", + "@socialgouv/kosko-charts": "v2.0.0-alpha.13", "kubernetes-models": "^0.8.0", "toml": "^3.0.0" }, From 9862b7e03b833cbff75196e39a58aed571aaff90 Mon Sep 17 00:00:00 2001 From: Julien Bouquillon Date: Mon, 27 Jul 2020 17:27:55 +0200 Subject: [PATCH 22/61] lock: use @socialgouv/kosko-charts:v2.0.0-alpha.13 --- .k8s/yarn.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.k8s/yarn.lock b/.k8s/yarn.lock index aa2a3e54..15e06da4 100644 --- a/.k8s/yarn.lock +++ b/.k8s/yarn.lock @@ -149,10 +149,10 @@ resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-3.1.0.tgz#d8735532635bea69ad39119df5f0f10099bd09dc" integrity sha512-n4J+zu52VdY43kdi/XdI9DzuMr1Mur8zFL5ZRG2opCans9aiFwkPxHYFEb5Xgy7n1Z4K6WfI4FpqUqsh3E8BPQ== -"@socialgouv/kosko-charts@v2.0.0-alpha.12": - version "2.0.0-alpha.12" - resolved "https://registry.yarnpkg.com/@socialgouv/kosko-charts/-/kosko-charts-2.0.0-alpha.12.tgz#27d0014bb3756076e5d6362445a225410121f4ad" - integrity sha512-uopoOiGQ3IgW7c+704UL003KdR9bZQzDFhUAqRvaLrHtN1Y1deLfk+r0fwfy10X5OyyHZ4skKVIAA9hcecSLfQ== +"@socialgouv/kosko-charts@v2.0.0-alpha.13": + version "2.0.0-alpha.13" + resolved "https://registry.yarnpkg.com/@socialgouv/kosko-charts/-/kosko-charts-2.0.0-alpha.13.tgz#e2a43dc24a84c89fd747d424844c083815fbb383" + integrity sha512-aQTGBoMma5rfMsSOmkD0s2zjWZerqc9vk+HAuSQidHNVPCsqfXYK5qqqtEPnWobSgMvpaqSHlzZOo6la3MAo7A== dependencies: "@kubernetes-models/sealed-secrets" "^0.1.4" "@sindresorhus/is" "^3.0.0" From 674f70efd886056b23cdbab49f407b6201040ade Mon Sep 17 00:00:00 2001 From: Julien Bouquillon Date: Mon, 27 Jul 2020 17:32:28 +0200 Subject: [PATCH 23/61] fix dev/*.sealed-secret.yaml --- .k8s/environments/dev/app.sealed-secret.yaml | 11 ++++++---- .k8s/environments/dev/hasura.configmap.yaml | 3 --- .../dev/hasura.sealed-secret.yaml | 7 ++++++- .k8s/environments/local/app.configmap.yaml | 10 ++++++++++ .../environments/local/app.sealed-secret.yaml | 16 +++++++++++++++ .../local/azure-pg.sealed-secret.yaml | 20 +++++++++++++++++++ .k8s/environments/local/hasura.configmap.yaml | 15 ++++++++++++++ .../local/hasura.sealed-secret.yaml | 14 +++++++++++++ 8 files changed, 88 insertions(+), 8 deletions(-) create mode 100644 .k8s/environments/local/app.configmap.yaml create mode 100644 .k8s/environments/local/app.sealed-secret.yaml create mode 100644 .k8s/environments/local/azure-pg.sealed-secret.yaml create mode 100644 .k8s/environments/local/hasura.configmap.yaml create mode 100644 .k8s/environments/local/hasura.sealed-secret.yaml diff --git a/.k8s/environments/dev/app.sealed-secret.yaml b/.k8s/environments/dev/app.sealed-secret.yaml index b06380fc..c1de2ea7 100644 --- a/.k8s/environments/dev/app.sealed-secret.yaml +++ b/.k8s/environments/dev/app.sealed-secret.yaml @@ -7,13 +7,16 @@ metadata: name: app-sealed-secret spec: encryptedData: - SMTP_EMAIL_PASSWORD: AgAHmih6Z8mUwB35+j9CnS6xJ0H8P3oZoZeT1mk6lluwpRlSXnn9ElexuNVGGI72rizH8pkl411ciTGxb4crXPso+z9SkpsTKgqCUy8GAHkjTULTxBX81LkoiaWJ0Su5PaVBe/0tPK3lreaNlU1cK+6L0/+rja0Owkz2McedQRydj6iHfuH9rLTXiYXebTTY1/Hnajh25yEoM9TqYzNdnuiKKpoOY1qFl26mUYje90a7evkK8NOG1JAvpl/8cma9OIK031hzEM+/3lWuPniGSOfwPNR0PR6xaFDswbbLJCyedQrkFXHSQRG4tZPTEZTaXtQ2JORr/b8DWNOmX2pAF6FC1oENed6fQP3/4NEVirBnBkBK8f+kv2x1sZei4XlkgjUNMg19DGh2rz9mRjBo61pB3GkirCm/DzZ5qt8DmfG3wOLgKFPJwCE+EL5lxKl6USRWCDU73S0Ewt8Q33iU8g8j292dInGXp1lnKaN/Q3yNmrsseCvSNccmUf9PJvQ+MUiz/6xmWn3Wjp1NirSTsJKSAxkGV+MvEA71POPRIAolEuekzJfYf021r+bbOiqSCSL9sMaiV6OmjRuWW3N/EEx/un/9jETwv3NTWUgmNGbnY0np7hJtXDWeWg1Tv07j729bbVe9kjrlBaQX93E93SIKyog6+v11I5iCuPC0qIOe8hj65Irn+WACY4VnR9ooGZ03KsoPDEWQJ9lVJ03PLJml8G6rB8Fj5O6yUYIHWRy5fw== - SMTP_EMAIL_USER: AgAMfVSmtsRfyAQGoyQdzNACLxQfd7Zk1CWJmV1K7oh7ixZGE9DpqFp1cQ107mAFFyjrxEMMhVvIU3GODWoTuZ751nOem8EObToEcExqrnzTai4l2+cgl4tuWEXgW/5pkeKm2+haCHYFAkjVCp13DhbbRIVeudFU3c3k+ZBXNSDYZzHuAZOa8hM/yYuUiz4vhu6xc2/2cRpRgDoOrL/6NUTQiq3zm0Z/1yO38xirw485Wo9aFac+pldo7FM8d7fsvMup3omchoeXXRuRBBgUT/JgPIWMrXal7MUh1UwLFp4LEgFEvAa9yw5pdAFHf7wIBLJRvw0QpfwX9p8l1y/H1PQMTSHLlA93mhuQkRhBTEKSMqCAl3XkGUUTuGqW9WdyFOBfyyj7BHUul072LqmSiKmwHOVzt+m4qdMUPeZwxj44+Q+Ff4ifU+na4si+K5Fu5GYLUBCYUk+k9QF+HcFKdCO5UCeTWLJWZqhwXWG9O0r4av6HGNG9IChU2ozwaFyeavaDHEBxCUqgDzPJbqIP6zU+tq8RNfacehx3KGRYqhLZNhK7Xy8+AkpI2ZZmyXzubvttIC1KQ+TVd0mY/XjE+rx5eWko5VweUFEwo4KI6oJtb8cUldNBYAINlQl3I4G9U6XcgiT+slk9p+4P0Jzkmc/UvfPuqTISoA58chz7kls03XkEaCzhfamkzhsr1+NUvuwHFXtedHNun8be0amZE8WoBPyp093p5r6fzG/I+uk9GA== - SMTP_URL: AgCFKowZYaBBRXeK6Eru7I13QidmTS1iZVxAlcOWVitLJi3wN0OOggIIVzfr8/cUBW7kxw7+RpIJOfsjCmhY5qYmjmteMq+so5tH/UKSeV4q7xhHAIaY96rZt/dX3JermN3fR9AkM7OyfwONdej6986hbvpI3EQNBT40wcM7WvZz1uSu/0oUm8xdg2fJeUUPfxvoHr+oYb8ApbHArdeRbLpYi+oRqkTGoLTTAnpA4JQCOOMDhfKKZxmps6LlojFKoLrWGMLzWCbkjxMVjCtIL7eXfJfA6/GekyifDG7/M8gkvZdVcpSFJOAjG+tCJLsQ8oAb4A1eurFHSImr1S5BuatxaAzvRS3tOWYtnSLt6M3Xgj9Imtl0SI0J/Ca0KJGPMMPPOra/FKCnPAFQ9N1huUWkHUhdkiOf48J7zI49TONDq7ICHQIb0K3FDMGlHNdsKKSnvlZcuDXe0/8i/dyrSjyrUqpDk68T4FizJjVX80ukNAVi/vV7WTHnfEijN/rGV168rteO+4Hy3/KGLfJ2UZCWVYxDiNX0wkk4CN0yfkJBnYbDZgTbAZRVNchsHo82d19AP6qZuY7Yunl1nCUTzMcIZL6O9xtVH99bVUNYhwHNrZRTBeocSuxVCmSaH+O9mc1QeaRCEANj588j+nF3/JL0SITsdfxd2AMqZVgwDYzxF3b3xyT6s37wg0avvo1Z1KH/ayen808/QRzJ2tbKKNsgEA== + ACCOUNT_EMAIL_SECRET: AgCYU5zQRAGub/7BY2VzhhQ/Y5EtYeWcgdBrHMfOdhK6DLDbkiYTVBvdIVbvUp/AtHP8V3UwT0zoQfKRiECwdH6oJ92GJ2DQ6svTNJH+x4EyQRJTeRMOrx6y+iVAcFx6I5RbT6SdKkpzGztpY4t4pGt3IOUoKNrJRqshj170LQqsw57NyxzSgZ0HONNsHE+HUK6AijgZXBthAfWqlFyrg6WIBY1f/jyuZ7jvzlotTI9JXXSBz8LryNYG7kth2weHcmlQKiqERPbWGFuGwM77hzgFwixjqnrGJEjWXDfsAmBLk+B9nVht2H54pPYCD+cyRea5NeisxnNCAOw10BJHEX1gxgNzSwQDVfOSINWT1a8R81tm7Dz7j3LyKKT+UH8BREHMlu4qv7+D6PjrRXJXtAMGN6Vsz0Hqvf6vlZou7O4ygcAtirRaSPvsuU1FOg2JvwfheUVZ7StBGhsTBWyQ0jw9UqAXcjtcbqfzeOc8sEEe/5xyRJctT+A4s4XNGxiF/Mnaa9XB5OHtz55FUDzy2o0S21JXFjnNs2kmDji3gjPwYJzg+qat7ZcGBNMR4KNvu2SiUoDdQMKzmh7mi4nwqlOv08eJVP8ZzXGS3F8QcsMFXPfrH/53hunKq6gQ61D3+CsCN6Hz89X7FgWnMroMv52gNwtUc0yeQ+klIB2RsY6+NefWx0p+ikxHY9MG64qMPtFNG+RW2TwRgcdbD6CC31GUVmGVLpEF95RF7v1i66H9EvNwiRZCagnZ4qYcrQ== + HASURA_GRAPHQL_ADMIN_SECRET: AgCAqhKgc3PtqkQnkPeR0pAyh5bkICHiNpYkHBwRAhRCSo4kktC4p1/OJapMewk2glYBZHdUIad4JEn1V7/EvfMkWs7Eh7CXLYQB8xdJxbl7tyopNSppQxLA2YkMTPmnja5kGJrf2nvZNR1u7aQ7z5ZuP9KFzPsWTj/pFQiczsoyhNrKJmSeAUMRKophVfgKDdvNuM6ZEuSiR9iGhhrGJVD1gHlQaOW0JKCjweuC0opYdP/rlZOD6BvqzlaYc+dHVYbot7ktDzYT98YCIJdS0sKe0/6+L/CQgWeqAUxZxyPrtOk5BsBOXKNuXIrG9sQQ8SXSykubqYRGdClVv6TlazMXvBtuoind14bkJ1G4Are0FsokIPoJxrYAM1Nd4hKvRJvT3BiiEY2JdqRbmeHyZc+yCYUeUkvbtVIHFHGnSjVzAfriR6mLj4psmUGAtjq7qqaa6fJQb1fRr6pnb6//i6B6NjspyMHNi5uwLCn3Rvrqbq0abgtZCh1PUPZeqA/kAENyg3FunPzxiCdlHJnKch7lQDSkoQDukEGWipUnr9/ICfMuAMlu1uTHqjjGrsZoewqY00MHkPNyFiHVwYmEqY9INfmEH9G5UBLaWTorLyvleJUK60d8ZteFArZlskOs82gtcVhYGtE1TZ3VSn/sGKHdC53BlWJ5b65GKP8bn1xKmuu+ah3+NNWkgTydoKzTjHxOiX3FVeDHyVM9v3Xyv/6/Z8KCvRw9cgbmcX+PkTifzsT/10iGvP+aa/8+3tOmikLHHGpTyALG9YOZ4MPOHR5owd1xI0TUm++0+JgxYfeNny+Ybk0O0x/ikVx+gSDR7MKDD9sI2V6wX8cJKpl6hLFIxFV0EUCwHiWW0N5ZnXJarMMhMWzV+4YaD0c6ZxhDgizvIX6nOs0aEihvFBVBgZuiIiO3RW0fUDel0kcqzg== + HASURA_GRAPHQL_JWT_SECRET: AgAnThMc6uuayn1BR4rLy65IoFDsv8pzBpphbYxf36e4OJooSi9s2upWe8g3HpVfdb5SthH77uw+64Ks+Tvku1gHrUOOXh89F+RS1mLwBfNhe4Nlf55AosasYsUOjE5mWOd0Czdp723ujL9T1SoZNyGeGyG2ZPxR+clgBJIgX5fRMvfi76SSq5trUasItHflHp+io2leMD8QBB0jukLf8vmHHCZ36S1hwtISj7NMHtiv4bl2AQPj6KjyO2U0AB+Uf+Un21RwCRsXv4mDkKNZAGSMn67IkqLRK02TFJQRz4qn+WrX4DPkgNG+fELYHBK0CSi8orSN07Z0qY4y86IYbXRiqJDDKIXq6jNQ2V3Ffox8uNNPk8BJ4lrxz4Bn9r9/rTWRLS70Uzv+OXViJ2xcb4HxBZFSKucOVK4Gx8kFf5xoKd6LV6g6kbjtYQUR4FGQihvZYsDrr5qGv1rxHO7EkY4o9Hre2iHVQJ08imfDoXscfzeJC9lxo/e5M7LusDtIkzwkMkmsv8WXMlGjfg4JoYiQzVA8oMsmeWQLHNdJUdSkZF8tFc3skvgYEeMuDi89KRiuCOwnShrVLzPzYbWO+7dwnyay5NVvtvNE9kXYn5U4EwGExeLGWoRRrDCOUM9sgwAJF7AcDcQUQ+MWupWacW7YE+VjBMuDmJR+1Gx9qDXGUspG1DkDfKqLCxT1L2RoMlbIfubACEYYbZ5IiooqjwbHCMUzbr4aRNSM2C3KqN8wSlB18xVfrgVpWYqZFtXWjJAgvLbn5Pi6ryaBPy/adnlBpGf1S2EakV9uR6gdpsKR1yTmzNT7MCIiInzvq/KijQCiJwAyqIkpU+tQv+HInHxWZQ== + SMTP_EMAIL_PASSWORD: AgAGdvTnBpg52nSwcqvGIoTRkxweutFd7x1hbU/HHAH9gxPa4ICT5AOZyb+Ec9OeaSBQjf9T+4qYGC5FngtbhqfSiloVvir2NvXZOUy+O3ME33QCzfw4+nANvHmsngFDVsJdjvSz2ykT9dyNbiyFrqRBhV5RnIAqgTfvXozVOFdFeUVRelL+tZQC0miGdHUOmjjOSh4T8LntBwJOj9lv/oW1g+Vai2zOwfSGFRTeWHv/Y5WYXCiuprOzgrYUEEzxDb/ELD45S5fcwYM4KVezHe1NAWqjPhcVwLq1q4iqSaHBwGBH528pxcFcPUn3u1uK/ip3lsPiA32vi5bFantUoBiL8HfB5NedJMls/3AeyIQl53Ymu55kr/NZ5YugXExs+uCgm3aRE8EyMWnVjvYZ2npSXS9hiTsBm0jyEHOSfdLiuWvGK5r+1zz6mHuBYemQQnLjEpmRhrG5XJyJmHAsRNR1P7H1+3pqSDD8iw0yXinth3URP/4L9JrTaI4Mx2LmDmVj34oGrbMx1Ekqe7t8MjrHy/fIXRqct7X+F+GFjklALzYNuBqNUg+HxbdVKxuo9STbUVhxTXkSvlgOaT9sUiyYFybiqj8vX9VPKhKBxrUmEPue4d63v/ud3YhyHcFENUQ7PKteBUKjzPOaMNi4xvmUi6Wk/sSCBi5BZiin0obLdUGplnmO0rzX9wxllUBS+o14T5m6kWk0b1oUesVOORk9mBR1rUPKHJWCmkFYcoqTjQ== + SMTP_EMAIL_USER: AgCVO/tUEz52Bt2Az91fIjWN6MYoV+eHqyufJ1N1RzkzgF/sw5DRdpKR5+s9ZOJvPlsEBUoUtd+iH16ZJz/vx4oSR5+KeTg4fXyOIi+jL/AB4hBYP8cQvvC9kXvK4KiS1FXiYvXKATcusvTkHdJZf/CfYB7jyXpyvMdmefiOexjwyieIP//YqPygqgOvi7RGnqohrk2S28YW17/oJA1QatbUh84wNG/6sSAfyy7coYaSU+6gTjHdommuypMRN7QKts/Hj0ZdM8xzXjQ630NzIPjZha6gG++ZDhR2hyo+vGuUESKuE37ifeEJlBhnWr/T9Qm2xE29UDChUpmtGtFz5xoxLabk8eU32qWy3WzclX26D2Ctcl1zy8atbaHq7A5JeWrV9wowhrUMVg/uiDXbt4NTcegHwCfSXl1kqNMVtJl7HijmUBMy+Yf7ntKyhdA6AoLZFQxrypzY3lgIS+2p46Ig1CP/DXakOn7yyoRW+k1KkzKv9E18QlvaRn6coyq705brLLM3/RuISw+FwGbD/VLgiHMIpCarY+Uy+K/c28320DXvoMLopAJekUnbdiPzL7vPLs2ao7BPZ+a0GDvpp+f+/T/EoVIHgiZoHiXEYmc/n2fmYd7Gb0UCa1og2ovhiegLnaFewD2OKMuP/gDuIwvnX9jU093dVupOw1muX0wgB+NH4xl7rTB42nvxLZK6N/ymfqg+LzQnqU+3drEWunSgepvKYem+86aKq2BkoJF+Ng== + SMTP_URL: AgDVilgKuupA5C2U/aA69wX3hl3Rbv58xFS7WGeUjq7ubq5meZhRyT3QG3Ly1rXzoPCfB3LDC0JDjRMJ1G2jmn9o0znEXYks/49m6hDaKhcwnnlIE/ThBJ/BBqnZtoAjxzoeBSvaEhV/dd/a7GrIQYiswfT8P3LVza4gKdj1li5vs7htCLnZfOrAgAqfXSxILDfHlEk9lmbL5J4JdYlVKesp6XNjcnUWaP2ycc0vW3qWlwrFU2DJw45wZCoE/76hG2s+Tk3VF5Q6kiNJCKTCf88jpeiggxIpntjLJk8nmrr9/aZ8fl8gDWUYV+15UFgh5jSP0nlWlCTmxAMmEL2lwBb9289rt0o3ZM7L+yfzLGD9QTy/Ns0hm2M4Cynwh0SD1ti/lMv/GO73XFShUO2glHM96isPFqvbBdBGua8ksp59W0TYQRMFFHbygZEj4k5K516w3gV4XonZN6INOqKt4s27R9oiOoFup2mQo0ns1sH7XB8q/wXVmro3km/dqToSOFRa/0v+fZNfzlh1X0JlqI+940CQz7I3rusrFDR5kfryVt0A6AP9tjyG9jQAjiM0lwcJgHrDARpNXuo9qzLf0yDK68NrR49XGWNugRuKHEA8Ka7vLmbeIvZOElsfn/ZCpnWrUNcRO/5dvxIQgNRIKiHVcqM1QV6V31YZMa6ZfJI/zhLaWEoOV0svcYrO9jy9H0rRtrMEqXZO0IQ8pYVfHhNxbA== + template: metadata: annotations: sealedsecrets.bitnami.com/cluster-wide: "true" creationTimestamp: null name: app-sealed-secret - diff --git a/.k8s/environments/dev/hasura.configmap.yaml b/.k8s/environments/dev/hasura.configmap.yaml index 8f404c60..023850ec 100644 --- a/.k8s/environments/dev/hasura.configmap.yaml +++ b/.k8s/environments/dev/hasura.configmap.yaml @@ -3,12 +3,9 @@ apiVersion: v1 metadata: name: hasura-configmap data: - ACCOUNT_EMAIL_SECRET: "ACCOUNT_EMAIL_SECRET" ACCOUNT_EMAIL_WEBHOOK_URL: "http://app:3000/api/webhooks/account" - HASURA_GRAPHQL_ADMIN_SECRET: "adm1n" HASURA_GRAPHQL_ENABLE_CONSOLE: "true" HASURA_GRAPHQL_ENABLED_LOG_TYPES: "startup, http-log, webhook-log, websocket-log, query-log" - HASURA_GRAPHQL_JWT_SECRET: '{"type": "HS256", "key": "a_pretty_long_secret_key_that_should_be_at_least_32_char"}' HASURA_GRAPHQL_LOG_LEVEL: "debug" HASURA_GRAPHQL_NO_OF_RETRIES: "5" HASURA_GRAPHQL_SERVER_PORT: "80" diff --git a/.k8s/environments/dev/hasura.sealed-secret.yaml b/.k8s/environments/dev/hasura.sealed-secret.yaml index 2b76aa72..e6bef772 100644 --- a/.k8s/environments/dev/hasura.sealed-secret.yaml +++ b/.k8s/environments/dev/hasura.sealed-secret.yaml @@ -1,10 +1,15 @@ apiVersion: bitnami.com/v1alpha1 kind: SealedSecret metadata: + annotations: + sealedsecrets.bitnami.com/cluster-wide: "true" creationTimestamp: null name: hasura-sealed-secret spec: - encryptedData: {} + encryptedData: + ACCOUNT_EMAIL_SECRET: AgCYU5zQRAGub/7BY2VzhhQ/Y5EtYeWcgdBrHMfOdhK6DLDbkiYTVBvdIVbvUp/AtHP8V3UwT0zoQfKRiECwdH6oJ92GJ2DQ6svTNJH+x4EyQRJTeRMOrx6y+iVAcFx6I5RbT6SdKkpzGztpY4t4pGt3IOUoKNrJRqshj170LQqsw57NyxzSgZ0HONNsHE+HUK6AijgZXBthAfWqlFyrg6WIBY1f/jyuZ7jvzlotTI9JXXSBz8LryNYG7kth2weHcmlQKiqERPbWGFuGwM77hzgFwixjqnrGJEjWXDfsAmBLk+B9nVht2H54pPYCD+cyRea5NeisxnNCAOw10BJHEX1gxgNzSwQDVfOSINWT1a8R81tm7Dz7j3LyKKT+UH8BREHMlu4qv7+D6PjrRXJXtAMGN6Vsz0Hqvf6vlZou7O4ygcAtirRaSPvsuU1FOg2JvwfheUVZ7StBGhsTBWyQ0jw9UqAXcjtcbqfzeOc8sEEe/5xyRJctT+A4s4XNGxiF/Mnaa9XB5OHtz55FUDzy2o0S21JXFjnNs2kmDji3gjPwYJzg+qat7ZcGBNMR4KNvu2SiUoDdQMKzmh7mi4nwqlOv08eJVP8ZzXGS3F8QcsMFXPfrH/53hunKq6gQ61D3+CsCN6Hz89X7FgWnMroMv52gNwtUc0yeQ+klIB2RsY6+NefWx0p+ikxHY9MG64qMPtFNG+RW2TwRgcdbD6CC31GUVmGVLpEF95RF7v1i66H9EvNwiRZCagnZ4qYcrQ== + HASURA_GRAPHQL_ADMIN_SECRET: AgCAqhKgc3PtqkQnkPeR0pAyh5bkICHiNpYkHBwRAhRCSo4kktC4p1/OJapMewk2glYBZHdUIad4JEn1V7/EvfMkWs7Eh7CXLYQB8xdJxbl7tyopNSppQxLA2YkMTPmnja5kGJrf2nvZNR1u7aQ7z5ZuP9KFzPsWTj/pFQiczsoyhNrKJmSeAUMRKophVfgKDdvNuM6ZEuSiR9iGhhrGJVD1gHlQaOW0JKCjweuC0opYdP/rlZOD6BvqzlaYc+dHVYbot7ktDzYT98YCIJdS0sKe0/6+L/CQgWeqAUxZxyPrtOk5BsBOXKNuXIrG9sQQ8SXSykubqYRGdClVv6TlazMXvBtuoind14bkJ1G4Are0FsokIPoJxrYAM1Nd4hKvRJvT3BiiEY2JdqRbmeHyZc+yCYUeUkvbtVIHFHGnSjVzAfriR6mLj4psmUGAtjq7qqaa6fJQb1fRr6pnb6//i6B6NjspyMHNi5uwLCn3Rvrqbq0abgtZCh1PUPZeqA/kAENyg3FunPzxiCdlHJnKch7lQDSkoQDukEGWipUnr9/ICfMuAMlu1uTHqjjGrsZoewqY00MHkPNyFiHVwYmEqY9INfmEH9G5UBLaWTorLyvleJUK60d8ZteFArZlskOs82gtcVhYGtE1TZ3VSn/sGKHdC53BlWJ5b65GKP8bn1xKmuu+ah3+NNWkgTydoKzTjHxOiX3FVeDHyVM9v3Xyv/6/Z8KCvRw9cgbmcX+PkTifzsT/10iGvP+aa/8+3tOmikLHHGpTyALG9YOZ4MPOHR5owd1xI0TUm++0+JgxYfeNny+Ybk0O0x/ikVx+gSDR7MKDD9sI2V6wX8cJKpl6hLFIxFV0EUCwHiWW0N5ZnXJarMMhMWzV+4YaD0c6ZxhDgizvIX6nOs0aEihvFBVBgZuiIiO3RW0fUDel0kcqzg== + HASURA_GRAPHQL_JWT_SECRET: AgAnThMc6uuayn1BR4rLy65IoFDsv8pzBpphbYxf36e4OJooSi9s2upWe8g3HpVfdb5SthH77uw+64Ks+Tvku1gHrUOOXh89F+RS1mLwBfNhe4Nlf55AosasYsUOjE5mWOd0Czdp723ujL9T1SoZNyGeGyG2ZPxR+clgBJIgX5fRMvfi76SSq5trUasItHflHp+io2leMD8QBB0jukLf8vmHHCZ36S1hwtISj7NMHtiv4bl2AQPj6KjyO2U0AB+Uf+Un21RwCRsXv4mDkKNZAGSMn67IkqLRK02TFJQRz4qn+WrX4DPkgNG+fELYHBK0CSi8orSN07Z0qY4y86IYbXRiqJDDKIXq6jNQ2V3Ffox8uNNPk8BJ4lrxz4Bn9r9/rTWRLS70Uzv+OXViJ2xcb4HxBZFSKucOVK4Gx8kFf5xoKd6LV6g6kbjtYQUR4FGQihvZYsDrr5qGv1rxHO7EkY4o9Hre2iHVQJ08imfDoXscfzeJC9lxo/e5M7LusDtIkzwkMkmsv8WXMlGjfg4JoYiQzVA8oMsmeWQLHNdJUdSkZF8tFc3skvgYEeMuDi89KRiuCOwnShrVLzPzYbWO+7dwnyay5NVvtvNE9kXYn5U4EwGExeLGWoRRrDCOUM9sgwAJF7AcDcQUQ+MWupWacW7YE+VjBMuDmJR+1Gx9qDXGUspG1DkDfKqLCxT1L2RoMlbIfubACEYYbZ5IiooqjwbHCMUzbr4aRNSM2C3KqN8wSlB18xVfrgVpWYqZFtXWjJAgvLbn5Pi6ryaBPy/adnlBpGf1S2EakV9uR6gdpsKR1yTmzNT7MCIiInzvq/KijQCiJwAyqIkpU+tQv+HInHxWZQ== template: metadata: annotations: diff --git a/.k8s/environments/local/app.configmap.yaml b/.k8s/environments/local/app.configmap.yaml new file mode 100644 index 00000000..4c0c9c62 --- /dev/null +++ b/.k8s/environments/local/app.configmap.yaml @@ -0,0 +1,10 @@ +kind: ConfigMap +apiVersion: v1 +metadata: + name: app-configmap +data: + NODE_ENV: "production" + GRAPHQL_ENDPOINT: "http://hasura/v1/graphql" + ACCOUNT_MAIL_SENDER: "contact@fabrique.social.gouv.fr" + FRONTEND_PORT: "3000" + PRODUCTION: "false" diff --git a/.k8s/environments/local/app.sealed-secret.yaml b/.k8s/environments/local/app.sealed-secret.yaml new file mode 100644 index 00000000..ce162483 --- /dev/null +++ b/.k8s/environments/local/app.sealed-secret.yaml @@ -0,0 +1,16 @@ +kind: SealedSecret +apiVersion: bitnami.com/v1alpha1 +metadata: + name: app-sealed-secret + creationTimestamp: null + annotations: + sealedsecrets.bitnami.com/cluster-wide: "true" +spec: + template: + metadata: + name: app-sealed-secret + creationTimestamp: null + annotations: + sealedsecrets.bitnami.com/cluster-wide: "true" + encryptedData: + foo: AgBDjF9DG2mPCtpPvqusk5BwnwuF9CSlbIsPAEKwtbg0aPgRQa3lmbP+jFNc6ZiP4+Qv9QSYK3AUy1Wu3Kuj1LrDV82+1yLbJzv/Gx95SGHmjXre0Vf3CHF9aH7QBtWFAxi/45h/VDwLgO4NrpD5GumII24sNWuRCbbHLVhKOzhHfuMsHYY1ufw2fvkQpAJtd3DoshFFMM66CdAprSxZMfQ2JF4z3Qaw/grvvgKpcYhUobMvuT3qGAYO9wlQxTZB8dhBulQ9+3Pp3L9VZe/ju3Zg1e+O8ai6V32VUMtaTq+g4dsc5ntj8BzVr8rrc2bASIlyGfhnLnGL0cnNzwvAt3N0duEjT+unbGR0xAjxKdRi3jEjeRI/aLEsTHLh6jZhTpTBASGiDV8r7M5EYop948X/+5JgHe+/tZq8x2/Pap+AEtOPPU5bM8yYsLaKXf7xxImZdO8MeoDOaPx932oKtlObJvjTQRHAZMVyaZdDgBg2i/g+H6qBHTU2O+eXKJFAFAozPN7+gF6F/qHTKjFj/llryOb9POVcXUd0LTHy5rsat+rzh9GdV9n1qa7mxNDpehw7hERpGi91hW2EfiqH/xvOhD/IECeoPTIWiaxzEprUOzNboGjRY1Tf5PmnE3FjeJT/Z0F/fUi1zQzqzDoF7tYmTDr1oXqx6+INET+143epWLW1Jhe8F0cfiRc+QGVWJHKRh0w= diff --git a/.k8s/environments/local/azure-pg.sealed-secret.yaml b/.k8s/environments/local/azure-pg.sealed-secret.yaml new file mode 100644 index 00000000..28a01840 --- /dev/null +++ b/.k8s/environments/local/azure-pg.sealed-secret.yaml @@ -0,0 +1,20 @@ +apiVersion: bitnami.com/v1alpha1 +kind: SealedSecret +metadata: + creationTimestamp: null + name: azure-pg-admin-user +spec: + encryptedData: + DATABASE_URL: AgAG3SvDWchEgYLNTsRufT6cMfhRuJCi3J01k74eUNkAbICGmN0zdxOBjS2hT8Me5HOb2np9+layH4QJRw/TAYzrj0qmUeXoRRCfzzxcpIWCs37nF12Y3hCqBHIwIp4Qb/s9jk2gjkYOZWGfpHwaplDkOGwPGHvXJhI626hf5yIZIq7rCVhcG8MiL+xEBRW/k/9nJ+QKh70EEK31JSNyRs5eSadg3+LIKJKjYNJmzX3h61I6Bdc727evA4iM8YNPbJ2XpFNZ4e3kDv85se8DdjCMjtKvXHg5Cb/trYto3iBH9BkhajOTomQlcFSk1tqA2hD3WVI5PaLqMC4PlbLAy+THLNTHUQvkjTuxnDXbW4ZKbizYvHQjq14h3S8RpmOxO1UZAzdPyhxJRVNPche4hdMmMnsy0Vwt0aH7CjhBp/LBRgWhAGAuJyr6jcM406HnXoroCiblh0PHSJa4PuiS5TZRCZt1XKbOgB0L4TCCIPrsnU3up5ja07N5rAGcMExHcR8TV4kU+6s1AOEB/1O1MqvMAXcHQnigYYCDwLMu73OMsEmRAATUtUOoaUJe1T0dT7tkM048+MzRg89Z6WJ9uwA0UDZWFbsjzSw3YTvmeLep8A01U1xNWMfM489qnN4nQ8mrSVSBmyvaSA3evE5OXs6Nnuk2QLQzD8ncYHmh0mwl6o56yPAlMIVBSmOHn5DVFFTwK644LtFJofd/LsYpRCOGhKuFF0dPizyOwSav9aTfYOD36sQjvPya1Yn4PLfECUsbFs2nekpJz9j3r9Q/6AskGKrTC2UwIWHCT7LZ56D967BgF+QvYOAlkKAeesE/0Djvm3IPfEZXCPswjWhQ0YH3sKB8laFmWSKfGcGxjRkluSYjjg== + PGDATABASE: AgCYuZ32FAlfM/4PzwYo82TCMa/zjqoS+OYThLKJbhAABpeRnDeWto+8E1jYhJYSnwIKTw32Zm6WGe2XFi2nfKhxOZi0+lzSzyLzGK4Z/fus1PhgBmvdKOeE/Y167GspE+PNS0Ju+JL6CPIBEX16mbfEycbFJxowXbJcxGJJ1LhYNvqNVnS2SnP9URe5QPki1PHN2blcSBxrPTfY0efufm+0s5MbTVcHwh9eXBrBBV0jO2y6GW5PfWLgl6vv1RpVsUJgNEcxPWKGt430t4Wof0PaMhBQQeXk4FOXET9QBsgFVbaQCOXqtGB1HSc+q+ZGbE7OFjP5q9Q0QifcLTg7lzzkrqH542joTgNjWc6pMgJismNbBLFGRULumdaPs3c7dWeFklicmFARPII2JhigHKuh5C5JEEYdtaeX0FPjy+WKstjHjZrKHTGgojI0Y/SDRyEK8UeZBZotqWsqvwdB6RX/8Wb+3mwzQrNWoOqDMbgi32wALyt/nvWu6epvg1GSfTSQ5YpHS0QNnOab5z93M6JqFxjhjnkDxBQC/bjoYbU8VRanSve8x5WAZ0FAh/4JJKgedwmZ1oTh7r4Hvzmq/31IGG009yAnR6Pu64hP2YJl+9lTOZS2RuHkW84tVP7jGTQOxmzh3ewtFgkzAOGefvKkmmOEXugjw40q2VNd92P2bkgAZs0BoVbQOzkQZmrEJh3+3dWwuS0yIw== + PGHOST: AgAkPATmbfX0+lrLdbSccDKSz5kYwJjinCmowPNMuYTSIHtuxqt3migh0rwFOwt7GF4Mc7lif18JR6v1upXAEzsSQ2YIT37LqHgbBxzkQvoOmLNVPHeMV0hujWXsxncMtoIOwm8J3hgAQVqn7ah6T+axz3WeKGHIp7GOQOy7ZJsPQtpeIm/I58ULffvGxuo5MTybo9lQ1x74ULJ0b7q3z5/cRsdf08WncJX67JLl5yBypFhee86BdE4aBvV2ORy4nLY/2sCt/ZFhg+5zEJaoHdVlGxZRF4zTsiYj7nEGWuw7fSFTVcvAiBC30jrLRCj7hMWq+mxeyHsjvI/O+6nfEiDIfAdoBFRTBLTnVJZaUZkfrvnvOmTEEX47fkSmSkNv00ti4Z6uwrgBGUj7axODeLZuzQATs0LXwNou+OsoUkv+gLxlLkbr+uGLr2XAWI0vQJpyMGnt/H00OI8C/A+Hw5YQJM9nNKIljXmqJDzcuh0snmXrY/u/9g1Gv2u14fOExZCm80dhAeiGp94QaWYC7hYaOXeE0lCIDnQI2T7DE4LRopqq0oYkrQdyM4xe7MNCWu+quvzY57rZUO3VL+aZHNhLvARmri+7P9T5st5J8CwOBxmyBxSCB/ltJIBOfkvl3sZcvBLp1XI+366t7RlYdktTvCr8WbzsU2GdLcmHU0Yf4SySziJFaar58aW1+7lbYMsfoq4v5CuWWNjPVphIu2zncrDHTM6T4HBb2ki/aBg04ZR6FFHKehwNvyNJBfBy6rERtQ== + PGPASSWORD: AgC6F1Vg9nr6E7X1w/Tlvnlx8YKOcpVQicdPQhbOhojYyKF9YUMF+OhMcobu5MzaRqDbu+TGIn/cQGwbs90Wk+lGbQ5MRudEVyZMVVcZz1PijmAkbh4JkmLYBvMqAk6J0foHmcZG/3bzojzbOAQZy8Xc5kIFTQlcLCf5i7ELaUXubnJXngtnTxPxv23otVRTSYd2oAuO7EDbPJxyMlwCtMeUbnrbiBcpGCfCcbLiyWM7uikmsy6645DzEjQJ0D8q8bh2M+Ooz4a43G7VSxXDygoKr0MoRhrTTmpOXK7UJwt2e6ZRZj6sWmbNVFgBwQopn4csIzM+qPtF6c3WuEd2ffDDMgubA8ma6UCRZCYyrg7wEFxx1yd+HXf7VNg6kItmWGqrzfy66gPQlNqen0pNFLlVMWe1jLi0Un0nayRTRCI+AcGctZjY1s9QTkxOXXYUsBNUbYf/zKgr7kiJc5ZIR26UuiMj/yuXWBmHDgzhuNQQWWiHpsoUCj3Y6ZUN9wt3cNi2rXAWS3YGhidd6pyjaJx25weNqxbAICksyGI5nnZ+JUgOvpqFioEv/1cL/m+NTlp33nUWk3SvhMLJPu2if8rIo059gRWtU+QNtu0u2vLOdg3mEWrbzuuDCG7tVoO6YJBq3p2molf1+x7P7qNf0uIG4mnfFXJEUlHELqwswEY7ZFC83AfAtFvG2IIeaoWIdfhd4SZyxSaxZ+np15FUIRwnS6jI/jseNScxj0W22E2Y7pWz6UMApBe0 + PGSSLMODE: AgCuL/IR2M2KOkLGSjLtu1mXk7K6z4Vl+fsnko+9n/7o61fBZrtJSiXiL2APg0jCL9SfALrTNQUWiqgMtpCc76hoKKD5AgWwMydYaR+pw5CFql3qKJQJ0xGJ4X34C31suJYkWQq2nof53JYssGMDq8TyvG6+vkXAPkdl2/98taTvbyz/vNKU5gRPdizyfSV9Xonntw3KyaQ3yqj+/dD8LEUm4w/TCVhYb2jVrPIinoJiIrxtIs99d/dJIHB+nDSXkF3paPNJ2OSEvMTfLXUYM/ZNHAq+kPh1vyDKMrtfxxM1Rq0SgbuPXNfZOuLtdch2VUewZGqYqpBUtKoSNOUFwLs2qwdK62tvFyGnJP2dWmekO2KGyKe9mHvyMGIHW/W1hxTiYOK5xW0qvobgEWCmgAloj3k3xDqQ0eD7qc2OlUQtvqBFzQETjwaV59wNJsqOUHQI9gQBsfeCE3o7UbghpPSAQvCFwMOUQxuWOdm8gc6d3F0dTsIIiJ/xydnqMxdfMyogno4g9Q8VEUkUux9Ui4vAp5Z9psucYYMNc8sgDxA09BVtZgtKpm8RFf3QO0tcSaHjz5+cb5iuLxQ2EnU4HLJ1gZ+MpFOvcxUV4apSKsX2Y7VJZcbePB+FQiZT6u4Dsx1HyuYnA2nYku93XkDdlXrxsCL7ThkDgtlfNz1JFm1LX1g5i+nlu+/HfkbtdtKMAI7yqhrZsbcO + PGUSER: AgBtaw5O4rJRlik4q2qU+OfvMBgQH6X7MfDS8OdqhoZSwT0diM4o0bW8vmwhhYYsd7BBOUFnDDSFiiqNn7/TgwP+KJEjZEel8Aea+zn3C5v7bJ0oTiJozQzjcURXnhPjQfR9O/LRoBqHvisxMNYf2fxbxR/oKrhvLUd6YihFwdOlqPql4o86fh/BIjA9XRXLX8YwG3eQq4G2396HcaI4Ufm1s0IuGUFsZYWUY56CKFH4UQDsnI+bH+WvBRDkhifQXvWFTz2iyb2cwi6oUmnzGWNG93vxAv88auLpj4/5gkcjCLHUNgzKfk+A8cYszU9wZLo4Lmdz9sHks20slxTmQwf/S8TCfFpaoDO4MJKFnG+h8KnPIf0PazHVguJp3frYuXc0rvk4pyBlekUIkPKWTzh3p81iQCYbhHXTKaSdX7ksBC/gVvu/0Z9s5KjSSnqWkkLpTtIdygiTt99+FGnjmYHBRcDOm1mhH0s6wscv9pMprQzZQvLx1+JMT7ibYwdE+xG5bTrDoOiYV675tIqVGorniU/Lj/BjlcB0ByLCvEjLfWZm6bKs0EtPfJXC7m4ISUW4XeY86qJyR/FiIcx0ymbiK9UIGqEG64Nw+6qml6qDIHag2vJZdqPiUN32j7m246255Y76ZqdUl5gWVrXcrRudgbS09yDQ83LsZGL6d4tN9aYXfGY93zyHfS3lh3Z5bY+/ENKPstLiFH3mIsfiDTl3ATLvi+CoKnkz4IAOfkGK89Kz2HokXYe5ug== + template: + metadata: + annotations: + sealedsecrets.bitnami.com/cluster-wide: "true" + creationTimestamp: null + name: azure-pg-admin-user + type: Opaque diff --git a/.k8s/environments/local/hasura.configmap.yaml b/.k8s/environments/local/hasura.configmap.yaml new file mode 100644 index 00000000..8f404c60 --- /dev/null +++ b/.k8s/environments/local/hasura.configmap.yaml @@ -0,0 +1,15 @@ +kind: ConfigMap +apiVersion: v1 +metadata: + name: hasura-configmap +data: + ACCOUNT_EMAIL_SECRET: "ACCOUNT_EMAIL_SECRET" + ACCOUNT_EMAIL_WEBHOOK_URL: "http://app:3000/api/webhooks/account" + HASURA_GRAPHQL_ADMIN_SECRET: "adm1n" + HASURA_GRAPHQL_ENABLE_CONSOLE: "true" + HASURA_GRAPHQL_ENABLED_LOG_TYPES: "startup, http-log, webhook-log, websocket-log, query-log" + HASURA_GRAPHQL_JWT_SECRET: '{"type": "HS256", "key": "a_pretty_long_secret_key_that_should_be_at_least_32_char"}' + HASURA_GRAPHQL_LOG_LEVEL: "debug" + HASURA_GRAPHQL_NO_OF_RETRIES: "5" + HASURA_GRAPHQL_SERVER_PORT: "80" + HASURA_GRAPHQL_UNAUTHORIZED_ROLE: "anonymous" diff --git a/.k8s/environments/local/hasura.sealed-secret.yaml b/.k8s/environments/local/hasura.sealed-secret.yaml new file mode 100644 index 00000000..2b76aa72 --- /dev/null +++ b/.k8s/environments/local/hasura.sealed-secret.yaml @@ -0,0 +1,14 @@ +apiVersion: bitnami.com/v1alpha1 +kind: SealedSecret +metadata: + creationTimestamp: null + name: hasura-sealed-secret +spec: + encryptedData: {} + template: + metadata: + annotations: + sealedsecrets.bitnami.com/cluster-wide: "true" + creationTimestamp: null + name: hasura-sealed-secret + type: Opaque From 60bc52e957edac93806f072521f82d018bb16fbc Mon Sep 17 00:00:00 2001 From: Julien Bouquillon Date: Mon, 27 Jul 2020 17:37:00 +0200 Subject: [PATCH 24/61] fix: use default images names --- .gitlab-ci.yml | 5 +++++ .k8s/components/app.ts | 2 -- .k8s/components/hasura.ts | 2 -- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f7b86095..4486f428 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,6 +19,11 @@ Test: rules: - when: never +Register image: + extends: .autodevops_register_image + variables: + IMAGE_NAME: $CI_REGISTRY_IMAGE/app + Register image Hasura: extends: .autodevops_register_image dependencies: [] diff --git a/.k8s/components/app.ts b/.k8s/components/app.ts index e27b1cf5..c4a4e395 100644 --- a/.k8s/components/app.ts +++ b/.k8s/components/app.ts @@ -5,8 +5,6 @@ import { create } from "@socialgouv/kosko-charts/components/app"; const manifests = create("app", { env, config: { - image: - "registry.gitlab.factory.social.gouv.fr/socialgouv/sample-next-app:002b0f68266e5243e733fe7c896b610f49757718", requests: { cpu: "1m", memory: "64Mi", diff --git a/.k8s/components/hasura.ts b/.k8s/components/hasura.ts index 206ba6d3..e7dcc54d 100644 --- a/.k8s/components/hasura.ts +++ b/.k8s/components/hasura.ts @@ -7,8 +7,6 @@ const manifests = create("hasura", { env, config: { //ingress: false, - image: - "registry.gitlab.factory.social.gouv.fr/socialgouv/sample-next-app/hasura:002b0f68266e5243e733fe7c896b610f49757718", subdomain: `hasura-${process.env.CI_PROJECT_NAME as string}`, requests: { cpu: "100m", From d5eea8de35f329342e4b42b59ca6fcdc26a86a37 Mon Sep 17 00:00:00 2001 From: Julien Bouquillon Date: Mon, 27 Jul 2020 17:52:59 +0200 Subject: [PATCH 25/61] fix: update pg admin secrets --- .k8s/environments/dev/azure-pg.sealed-secret.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.k8s/environments/dev/azure-pg.sealed-secret.yaml b/.k8s/environments/dev/azure-pg.sealed-secret.yaml index 28a01840..24b39666 100644 --- a/.k8s/environments/dev/azure-pg.sealed-secret.yaml +++ b/.k8s/environments/dev/azure-pg.sealed-secret.yaml @@ -5,12 +5,12 @@ metadata: name: azure-pg-admin-user spec: encryptedData: - DATABASE_URL: AgAG3SvDWchEgYLNTsRufT6cMfhRuJCi3J01k74eUNkAbICGmN0zdxOBjS2hT8Me5HOb2np9+layH4QJRw/TAYzrj0qmUeXoRRCfzzxcpIWCs37nF12Y3hCqBHIwIp4Qb/s9jk2gjkYOZWGfpHwaplDkOGwPGHvXJhI626hf5yIZIq7rCVhcG8MiL+xEBRW/k/9nJ+QKh70EEK31JSNyRs5eSadg3+LIKJKjYNJmzX3h61I6Bdc727evA4iM8YNPbJ2XpFNZ4e3kDv85se8DdjCMjtKvXHg5Cb/trYto3iBH9BkhajOTomQlcFSk1tqA2hD3WVI5PaLqMC4PlbLAy+THLNTHUQvkjTuxnDXbW4ZKbizYvHQjq14h3S8RpmOxO1UZAzdPyhxJRVNPche4hdMmMnsy0Vwt0aH7CjhBp/LBRgWhAGAuJyr6jcM406HnXoroCiblh0PHSJa4PuiS5TZRCZt1XKbOgB0L4TCCIPrsnU3up5ja07N5rAGcMExHcR8TV4kU+6s1AOEB/1O1MqvMAXcHQnigYYCDwLMu73OMsEmRAATUtUOoaUJe1T0dT7tkM048+MzRg89Z6WJ9uwA0UDZWFbsjzSw3YTvmeLep8A01U1xNWMfM489qnN4nQ8mrSVSBmyvaSA3evE5OXs6Nnuk2QLQzD8ncYHmh0mwl6o56yPAlMIVBSmOHn5DVFFTwK644LtFJofd/LsYpRCOGhKuFF0dPizyOwSav9aTfYOD36sQjvPya1Yn4PLfECUsbFs2nekpJz9j3r9Q/6AskGKrTC2UwIWHCT7LZ56D967BgF+QvYOAlkKAeesE/0Djvm3IPfEZXCPswjWhQ0YH3sKB8laFmWSKfGcGxjRkluSYjjg== - PGDATABASE: AgCYuZ32FAlfM/4PzwYo82TCMa/zjqoS+OYThLKJbhAABpeRnDeWto+8E1jYhJYSnwIKTw32Zm6WGe2XFi2nfKhxOZi0+lzSzyLzGK4Z/fus1PhgBmvdKOeE/Y167GspE+PNS0Ju+JL6CPIBEX16mbfEycbFJxowXbJcxGJJ1LhYNvqNVnS2SnP9URe5QPki1PHN2blcSBxrPTfY0efufm+0s5MbTVcHwh9eXBrBBV0jO2y6GW5PfWLgl6vv1RpVsUJgNEcxPWKGt430t4Wof0PaMhBQQeXk4FOXET9QBsgFVbaQCOXqtGB1HSc+q+ZGbE7OFjP5q9Q0QifcLTg7lzzkrqH542joTgNjWc6pMgJismNbBLFGRULumdaPs3c7dWeFklicmFARPII2JhigHKuh5C5JEEYdtaeX0FPjy+WKstjHjZrKHTGgojI0Y/SDRyEK8UeZBZotqWsqvwdB6RX/8Wb+3mwzQrNWoOqDMbgi32wALyt/nvWu6epvg1GSfTSQ5YpHS0QNnOab5z93M6JqFxjhjnkDxBQC/bjoYbU8VRanSve8x5WAZ0FAh/4JJKgedwmZ1oTh7r4Hvzmq/31IGG009yAnR6Pu64hP2YJl+9lTOZS2RuHkW84tVP7jGTQOxmzh3ewtFgkzAOGefvKkmmOEXugjw40q2VNd92P2bkgAZs0BoVbQOzkQZmrEJh3+3dWwuS0yIw== - PGHOST: AgAkPATmbfX0+lrLdbSccDKSz5kYwJjinCmowPNMuYTSIHtuxqt3migh0rwFOwt7GF4Mc7lif18JR6v1upXAEzsSQ2YIT37LqHgbBxzkQvoOmLNVPHeMV0hujWXsxncMtoIOwm8J3hgAQVqn7ah6T+axz3WeKGHIp7GOQOy7ZJsPQtpeIm/I58ULffvGxuo5MTybo9lQ1x74ULJ0b7q3z5/cRsdf08WncJX67JLl5yBypFhee86BdE4aBvV2ORy4nLY/2sCt/ZFhg+5zEJaoHdVlGxZRF4zTsiYj7nEGWuw7fSFTVcvAiBC30jrLRCj7hMWq+mxeyHsjvI/O+6nfEiDIfAdoBFRTBLTnVJZaUZkfrvnvOmTEEX47fkSmSkNv00ti4Z6uwrgBGUj7axODeLZuzQATs0LXwNou+OsoUkv+gLxlLkbr+uGLr2XAWI0vQJpyMGnt/H00OI8C/A+Hw5YQJM9nNKIljXmqJDzcuh0snmXrY/u/9g1Gv2u14fOExZCm80dhAeiGp94QaWYC7hYaOXeE0lCIDnQI2T7DE4LRopqq0oYkrQdyM4xe7MNCWu+quvzY57rZUO3VL+aZHNhLvARmri+7P9T5st5J8CwOBxmyBxSCB/ltJIBOfkvl3sZcvBLp1XI+366t7RlYdktTvCr8WbzsU2GdLcmHU0Yf4SySziJFaar58aW1+7lbYMsfoq4v5CuWWNjPVphIu2zncrDHTM6T4HBb2ki/aBg04ZR6FFHKehwNvyNJBfBy6rERtQ== - PGPASSWORD: AgC6F1Vg9nr6E7X1w/Tlvnlx8YKOcpVQicdPQhbOhojYyKF9YUMF+OhMcobu5MzaRqDbu+TGIn/cQGwbs90Wk+lGbQ5MRudEVyZMVVcZz1PijmAkbh4JkmLYBvMqAk6J0foHmcZG/3bzojzbOAQZy8Xc5kIFTQlcLCf5i7ELaUXubnJXngtnTxPxv23otVRTSYd2oAuO7EDbPJxyMlwCtMeUbnrbiBcpGCfCcbLiyWM7uikmsy6645DzEjQJ0D8q8bh2M+Ooz4a43G7VSxXDygoKr0MoRhrTTmpOXK7UJwt2e6ZRZj6sWmbNVFgBwQopn4csIzM+qPtF6c3WuEd2ffDDMgubA8ma6UCRZCYyrg7wEFxx1yd+HXf7VNg6kItmWGqrzfy66gPQlNqen0pNFLlVMWe1jLi0Un0nayRTRCI+AcGctZjY1s9QTkxOXXYUsBNUbYf/zKgr7kiJc5ZIR26UuiMj/yuXWBmHDgzhuNQQWWiHpsoUCj3Y6ZUN9wt3cNi2rXAWS3YGhidd6pyjaJx25weNqxbAICksyGI5nnZ+JUgOvpqFioEv/1cL/m+NTlp33nUWk3SvhMLJPu2if8rIo059gRWtU+QNtu0u2vLOdg3mEWrbzuuDCG7tVoO6YJBq3p2molf1+x7P7qNf0uIG4mnfFXJEUlHELqwswEY7ZFC83AfAtFvG2IIeaoWIdfhd4SZyxSaxZ+np15FUIRwnS6jI/jseNScxj0W22E2Y7pWz6UMApBe0 - PGSSLMODE: AgCuL/IR2M2KOkLGSjLtu1mXk7K6z4Vl+fsnko+9n/7o61fBZrtJSiXiL2APg0jCL9SfALrTNQUWiqgMtpCc76hoKKD5AgWwMydYaR+pw5CFql3qKJQJ0xGJ4X34C31suJYkWQq2nof53JYssGMDq8TyvG6+vkXAPkdl2/98taTvbyz/vNKU5gRPdizyfSV9Xonntw3KyaQ3yqj+/dD8LEUm4w/TCVhYb2jVrPIinoJiIrxtIs99d/dJIHB+nDSXkF3paPNJ2OSEvMTfLXUYM/ZNHAq+kPh1vyDKMrtfxxM1Rq0SgbuPXNfZOuLtdch2VUewZGqYqpBUtKoSNOUFwLs2qwdK62tvFyGnJP2dWmekO2KGyKe9mHvyMGIHW/W1hxTiYOK5xW0qvobgEWCmgAloj3k3xDqQ0eD7qc2OlUQtvqBFzQETjwaV59wNJsqOUHQI9gQBsfeCE3o7UbghpPSAQvCFwMOUQxuWOdm8gc6d3F0dTsIIiJ/xydnqMxdfMyogno4g9Q8VEUkUux9Ui4vAp5Z9psucYYMNc8sgDxA09BVtZgtKpm8RFf3QO0tcSaHjz5+cb5iuLxQ2EnU4HLJ1gZ+MpFOvcxUV4apSKsX2Y7VJZcbePB+FQiZT6u4Dsx1HyuYnA2nYku93XkDdlXrxsCL7ThkDgtlfNz1JFm1LX1g5i+nlu+/HfkbtdtKMAI7yqhrZsbcO - PGUSER: AgBtaw5O4rJRlik4q2qU+OfvMBgQH6X7MfDS8OdqhoZSwT0diM4o0bW8vmwhhYYsd7BBOUFnDDSFiiqNn7/TgwP+KJEjZEel8Aea+zn3C5v7bJ0oTiJozQzjcURXnhPjQfR9O/LRoBqHvisxMNYf2fxbxR/oKrhvLUd6YihFwdOlqPql4o86fh/BIjA9XRXLX8YwG3eQq4G2396HcaI4Ufm1s0IuGUFsZYWUY56CKFH4UQDsnI+bH+WvBRDkhifQXvWFTz2iyb2cwi6oUmnzGWNG93vxAv88auLpj4/5gkcjCLHUNgzKfk+A8cYszU9wZLo4Lmdz9sHks20slxTmQwf/S8TCfFpaoDO4MJKFnG+h8KnPIf0PazHVguJp3frYuXc0rvk4pyBlekUIkPKWTzh3p81iQCYbhHXTKaSdX7ksBC/gVvu/0Z9s5KjSSnqWkkLpTtIdygiTt99+FGnjmYHBRcDOm1mhH0s6wscv9pMprQzZQvLx1+JMT7ibYwdE+xG5bTrDoOiYV675tIqVGorniU/Lj/BjlcB0ByLCvEjLfWZm6bKs0EtPfJXC7m4ISUW4XeY86qJyR/FiIcx0ymbiK9UIGqEG64Nw+6qml6qDIHag2vJZdqPiUN32j7m246255Y76ZqdUl5gWVrXcrRudgbS09yDQ83LsZGL6d4tN9aYXfGY93zyHfS3lh3Z5bY+/ENKPstLiFH3mIsfiDTl3ATLvi+CoKnkz4IAOfkGK89Kz2HokXYe5ug== + DATABASE_URL: AgAfUWzKu5wvMnuFiHl3tFXL/swfy8jQrMbUpefW0ANweDy8234wi1V6JV5fEfFgkKNDCY5/+MseRj8Kjx+/yvydTSIWvuIRclA8cJOI+Acbz7Vj8HnRaUV48WEalkRiaFCKcHv34s0fbhkVvLnhhoRriJ563xgPEg22+f7eGMMXRn97YFwNt51Uin9fWaMJ7cVSTg4GyUo4AD/4FCx02duqvcv0jcihlVcOkzS/tK+oeZi2idVkxbTP3HaNcy4P3ruTqTLPKF8YLPCUlEX7rNdPkdoC42H4b97Fyg+RzSW/8ZyKPwAV2BB3wvgQfnDLqGEV025+CnnPVDcc7H6kjr8/pkK11bq3WJ3C3COi6LgrOYbm5z2iBdVtWMgBZqnLTSfZgALq6z7vohUfK4sXUt3VLAEvYQaqluAw68hVvaTCR5h6D+1jVxQfOVX3FnXJMLu12X04jsp9bpC759vxl5omzSWyE7lTqmf49ERULykhUjdT0XL/4qKDWXjd4ySubSiwWPUUN+ZmhRkRVmXpKHpvjTSrdFsBUuYjsarYbYOJtC6WuBz6SFVzHoAbYd7PylfN2VX2JEyirJ2/e16MRrTwagw5oO54F/CMpprVPM3E9LjzCmxMHbAzEJInasbGkjI7hcTpUDwmTtKx7ZGHhtzlcsTIhauVjobxYWB5niFbrDB/BFDDV5pS1hECRBL+PSsdoUGwS+RQcipFWM7wf9vi3/2MQdf0lCYKUsoNu4aUqmzvhsI6SaeF7q8D8zwzybfu0PJePg7n9CIOlXyL2URBMuh+ANZKCez/Zh0oS+5VwLGMVDePZnZdL6PXz9VwPwqu+BuSqZC8AGlkmHcawDQBRWEHaw+tq8llNl5VZ15w/9c8nskT4sbdw7+fgvLGY9y4o1cg + PGDATABASE: AgAF74QonHWZ/71zPISZ0AQWlx6eKt0U7W6CrqrMePvRqgVhutgylJxk22MjEz8KRarVvqa8nYaBVdgXnWALWElZi9FP7qmHZm3Jx3l2hv2FAESWCFO89GSkE54hnyAjeDU3JwVJ7YIxeuiP7Yit404T/XeZBPieU9AVMf3yJFbZYrrhIH9LDR7O8I/E7vbLhqV34A6X03fptviyP+iF7W4g3Fwe5Cea6q+1l5XMKd2Ubupw15K09vf1lVhUb2K8GyTGT9kOMURLa36Lc4FYoTE/7LaTIqfjcbT5rlFThiDQh0ZlJL8VjjFCTTGMmEBC0Qa9BnQuw+hhpHmnLUu+sj6MDrKuEdy7Ff2OMKtecsS8Oxalbm3AjSzS02FElzjX3H95kbaEYiwt5umwG1lAeG2gTjj0IImHLXW6C36CPN9xQ0EbBwLYExo49hZ9uRYNseFjr7FD9lcPHTj/xaO8en0aNjbzUkvZZGAxpud2H1OSpr8KebLVBSetghZma8/0PXSmRFqTKQ6dby9pZmVe2ZPCDW5bq8cGr32iC4U5yFr6IVbZs2PnLg+S3nhOHpimFMfkeqC4WyM7RYjVrv878E5aH7mhjH+QyKYo8kMD+gsWKsB+xvEaL9uAW6eJL9OGmc8uYXog+fHaPMjV385HsMHlPFq19a5ClUnbFswG2evKRnS11T3AZM+Bms+PTMX+dCPluAUeBFsw1g== + PGHOST: AgA77wRiUsW0SE+mTkeC8/sKIw9O/KbNDnOhDp4oepiE/MdnNAxBIKw7NKQOJc0tpkURqoTdCwIIHr7r4S4QcAYX1gJqn3uLoKQsa7+P5Ta2YzijVqFFjDte0o7OWD/xjyGLEev8IIL7gBfWEg0vS+8PPtwjY2RUBl7paqAr+VFwuBEV3JzsG73OUAU2HqB17Z7ThFEx/QFe4mEJHYRy5O1qwsi5EDT2kgt2zY95t8MoZLvvdhRnzsB/fxfRGrL9+68wEW4H358wWuH3gWtxAZUG9iuwgSJLG82xqtkl9arL/TpaZg9ztsNI+JW8UwmPyAp/fYDGQO34YiQdk3G45al50GZuIKqq4RgiKSkx3MUlbFMAlm1mOAl4jI5Te4qCyqs9cNyHo74tP3aaH1txhzzw0k6qXSukn62V2KL9/5M4YNWV9WMSK0z270ExYyb6jq58n34A9DNNlaFo+c9qAs114PC9eLyj2Pff7bs0ZM9HLv33rMrZg47nNYF32KoRo3rO7KqCH7h9st5cVmrf/LUGFBKO6uPAgsCWP9HAPHoAJfkm5p34fYS3atmZlLIf9tSUOHtrxGzGakwQvHcJiuBXxR8PqvATk2C+Bn+OT6LlGRLeOFaJDDrSlzHfIW9LiVY9sW1ak7805wY5+55lmBK+PJot/ICd+liOTWpV9gC7joYMWnvrul+1KiCjrQpgpXZJigZqiBYaC5sph1Tk9Lg591ezrgAIYr/N/2Gnx8yoPopIqhdeSCEC0vnMpkLzCMAyXQ== + PGPASSWORD: AgCI/4OYxm6Cr2NNBm9lRlMZlJrLLGoNlGE7nk69Tlx2okPsjxVA8Lfyr38V93K+DKF1AopjM6MEDlqesVHP3W/yL3Z7cL0BoIdF/hcSMH82fLKTG/fDb9t6mUch0/I9WKDByT6FczAzLhvBdgq2OKD1FlSdeEJlX8Jj05xzVqP7R4Xk+dTAPa8hacXx2tymrfnjrfVoXD5tdFAlG4mk/UZjuGeAt+OgSXQjr7ybN28Xp23M/WIqMihm8RwLi43jHTzF+uGPZ5o47SA9vcCjDa/4ktyRVZG/V8C1fp/4bXnSN0tAGwJ5LhmTbOIDnCNyXPxWojByIvl3kBMo1WPVk5SLxn+rcyq4hPtw0KISxDn4SnukZV/6YRvrlDO6Gdtk2WAWVUpF5I1gaxx1ChSPtsPpMz5Z7v5Esq7xuGIqLtR2A253vr6TdPmpV6q+HONR1WXcjJWnrR+VJ8jt/Y+gyBOFl99JeyHatHVpLxK3/+FmSkJ5VCQK/RjFm1ACofHSGyd/aNj0QaLzVm7P3txTSr2Z8LQivl+P28jS1JrPHLPV5uJ72Q0EA4WSahlAy0lYKs3jebdOeYo25eCA9kgaCnu2Zo/W925vkSe6+Ulc6V+9D0nkt1qwjTw9WmykRi56p195ECIlImxKqyDCybGQ/SJ6qDJnXrGkJwFae7QAQed+B7HFrnAFGqYPLR7DwFpOUeHoeqb6avj9aRIEQW2vaCitWfK0TFiwh3K6/qd5yPzfsxdPxeFtbtJM + PGSSLMODE: AgBXdmcyqCQuOcXZ+eC6pYXtXT6pPSozFz5M7NkkW8bIaH4t95MzRZnUH8lTGn0Xk6vkWpsvDbK+KT0lqc9iWf6ya+rX3PWMfvuYVm3y7rguMNCxLeJfUql9LraCdiD++g6FIY/C33BWNp76r36DAS/kkXzaJblwwgP9AzgioCbleyaXcmzAPG+eL4OG84e8E0v8LF8G0pXn0Vb6gptYaKFCxLhtng7gLA+JnDNyOSz0wcPBruCzjZzOl1gHCoJR8Cw1BH7QiK+6rT0ceEzl8olTxXTB1BNBgtLp5AMO7zeKsUrP23REiENHGtZHxhGoPWuOcbVkiSCLqJhXGrg04MqCLKmZ8pfpcQzvodzAMwEocd9Bldkg2rQBIiMd1vDYDzDUymq40tZPkwOoUhnt6lw7IDG+z/XKjcQBggOYRnWtZzKyN6O/KZc/yVEyPRamI0/1iMwnm93Mm+dUaYOlQb7V73jPr+g9YALi4zlOQfX/NZdXzLDoZ3UB2Ir1xDlSCfGIC4Rzugj8bcwKmAwaZEh4GZWBt48gyjpafinsEtEkHhQb0Y1tiKEwMWpySh0FiSSB4prkAKJKg+00LMia4vDFJzYJ5Z+3Y79Vbch067Rka55/niqiUw/yf9Rmf7OH5UsVV7Yqq/kSWZQz4pVDKpBDVR7V0DPJiMiKxmgRm7+nPhXVZt3yC40ujL860KBmSbdMduES62ttuK0pXg== + PGUSER: AgA9+AZF3+m6i4gKKFNQhZNLYUkdMayU7Z8PP3gt+wVfh5EAIiTvdrXZSzXpvqoITXumXf9EvEtKiB1DDljC1PPgLvHPZBaCTf816kbmKEbSuytzJM5OJ0wGkfGKI6IN99pEL35yjpwntw1bXxX6J+/cNDe1Nz+e+HM3g98SFouqpnGo2uZI60Vw6PVZ7UZtGneADdneCy+6tbxQzETje6xY0p2V1A55HO2OoDgJpvvfORSnXRwUWZw/PMPWvOhXerAsUfyKfZdwlNYp++Ma/mT3l7SvH50f/iKMVbGqchkpCKR4LdNXqguSQhmJePmfvpMlBtxIUX2nWJT2kQgy4m9FYl18F3jzTSWVgiUIvFv8eFmsEUw4FZ8EAi+6hMzhk+Ge7ojPAmpqwIrVbyEE8lnOQtvdVpY7UM0oL2Cj7BFpD5IbJMezTdnV0BvRp5h2kJ7OmRY1oaKPKyqjYkaoH4NoxYtJoiCMKYetVeAxTCVBH6qm4mSFaAnk+wEGVqZeJUQhpbgpWzK8U9e+ULrjQoO/fO8v9jUPpzKsWlm8pYj54bcb89LRccDoz8pM4EGCVDibBqrX6a9nG3LUWw3Zy2AXvK/2kHqaT8xrYy8XefzlBGUdQZVoLQn0LK0dcJ913AkIQe5idED33DhRmiyhaRnkh1Gzy8KaK9oGtZba6//BqTUhI+7uTPGM6oR1hOKYCrpUW8rj94+vgvDDZi/2bYI4Q8S1D8blOhFwzNJzZP/XIsRwy9Q08YM4qg== template: metadata: annotations: From 09f5be669d309838702e3f2868d8c32228ddd0ff Mon Sep 17 00:00:00 2001 From: Julien Bouquillon Date: Mon, 27 Jul 2020 17:58:28 +0200 Subject: [PATCH 26/61] fix: update pg admin secrets --- .k8s/environments/dev/azure-pg.sealed-secret.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.k8s/environments/dev/azure-pg.sealed-secret.yaml b/.k8s/environments/dev/azure-pg.sealed-secret.yaml index 24b39666..d674581d 100644 --- a/.k8s/environments/dev/azure-pg.sealed-secret.yaml +++ b/.k8s/environments/dev/azure-pg.sealed-secret.yaml @@ -5,12 +5,12 @@ metadata: name: azure-pg-admin-user spec: encryptedData: - DATABASE_URL: AgAfUWzKu5wvMnuFiHl3tFXL/swfy8jQrMbUpefW0ANweDy8234wi1V6JV5fEfFgkKNDCY5/+MseRj8Kjx+/yvydTSIWvuIRclA8cJOI+Acbz7Vj8HnRaUV48WEalkRiaFCKcHv34s0fbhkVvLnhhoRriJ563xgPEg22+f7eGMMXRn97YFwNt51Uin9fWaMJ7cVSTg4GyUo4AD/4FCx02duqvcv0jcihlVcOkzS/tK+oeZi2idVkxbTP3HaNcy4P3ruTqTLPKF8YLPCUlEX7rNdPkdoC42H4b97Fyg+RzSW/8ZyKPwAV2BB3wvgQfnDLqGEV025+CnnPVDcc7H6kjr8/pkK11bq3WJ3C3COi6LgrOYbm5z2iBdVtWMgBZqnLTSfZgALq6z7vohUfK4sXUt3VLAEvYQaqluAw68hVvaTCR5h6D+1jVxQfOVX3FnXJMLu12X04jsp9bpC759vxl5omzSWyE7lTqmf49ERULykhUjdT0XL/4qKDWXjd4ySubSiwWPUUN+ZmhRkRVmXpKHpvjTSrdFsBUuYjsarYbYOJtC6WuBz6SFVzHoAbYd7PylfN2VX2JEyirJ2/e16MRrTwagw5oO54F/CMpprVPM3E9LjzCmxMHbAzEJInasbGkjI7hcTpUDwmTtKx7ZGHhtzlcsTIhauVjobxYWB5niFbrDB/BFDDV5pS1hECRBL+PSsdoUGwS+RQcipFWM7wf9vi3/2MQdf0lCYKUsoNu4aUqmzvhsI6SaeF7q8D8zwzybfu0PJePg7n9CIOlXyL2URBMuh+ANZKCez/Zh0oS+5VwLGMVDePZnZdL6PXz9VwPwqu+BuSqZC8AGlkmHcawDQBRWEHaw+tq8llNl5VZ15w/9c8nskT4sbdw7+fgvLGY9y4o1cg - PGDATABASE: AgAF74QonHWZ/71zPISZ0AQWlx6eKt0U7W6CrqrMePvRqgVhutgylJxk22MjEz8KRarVvqa8nYaBVdgXnWALWElZi9FP7qmHZm3Jx3l2hv2FAESWCFO89GSkE54hnyAjeDU3JwVJ7YIxeuiP7Yit404T/XeZBPieU9AVMf3yJFbZYrrhIH9LDR7O8I/E7vbLhqV34A6X03fptviyP+iF7W4g3Fwe5Cea6q+1l5XMKd2Ubupw15K09vf1lVhUb2K8GyTGT9kOMURLa36Lc4FYoTE/7LaTIqfjcbT5rlFThiDQh0ZlJL8VjjFCTTGMmEBC0Qa9BnQuw+hhpHmnLUu+sj6MDrKuEdy7Ff2OMKtecsS8Oxalbm3AjSzS02FElzjX3H95kbaEYiwt5umwG1lAeG2gTjj0IImHLXW6C36CPN9xQ0EbBwLYExo49hZ9uRYNseFjr7FD9lcPHTj/xaO8en0aNjbzUkvZZGAxpud2H1OSpr8KebLVBSetghZma8/0PXSmRFqTKQ6dby9pZmVe2ZPCDW5bq8cGr32iC4U5yFr6IVbZs2PnLg+S3nhOHpimFMfkeqC4WyM7RYjVrv878E5aH7mhjH+QyKYo8kMD+gsWKsB+xvEaL9uAW6eJL9OGmc8uYXog+fHaPMjV385HsMHlPFq19a5ClUnbFswG2evKRnS11T3AZM+Bms+PTMX+dCPluAUeBFsw1g== - PGHOST: AgA77wRiUsW0SE+mTkeC8/sKIw9O/KbNDnOhDp4oepiE/MdnNAxBIKw7NKQOJc0tpkURqoTdCwIIHr7r4S4QcAYX1gJqn3uLoKQsa7+P5Ta2YzijVqFFjDte0o7OWD/xjyGLEev8IIL7gBfWEg0vS+8PPtwjY2RUBl7paqAr+VFwuBEV3JzsG73OUAU2HqB17Z7ThFEx/QFe4mEJHYRy5O1qwsi5EDT2kgt2zY95t8MoZLvvdhRnzsB/fxfRGrL9+68wEW4H358wWuH3gWtxAZUG9iuwgSJLG82xqtkl9arL/TpaZg9ztsNI+JW8UwmPyAp/fYDGQO34YiQdk3G45al50GZuIKqq4RgiKSkx3MUlbFMAlm1mOAl4jI5Te4qCyqs9cNyHo74tP3aaH1txhzzw0k6qXSukn62V2KL9/5M4YNWV9WMSK0z270ExYyb6jq58n34A9DNNlaFo+c9qAs114PC9eLyj2Pff7bs0ZM9HLv33rMrZg47nNYF32KoRo3rO7KqCH7h9st5cVmrf/LUGFBKO6uPAgsCWP9HAPHoAJfkm5p34fYS3atmZlLIf9tSUOHtrxGzGakwQvHcJiuBXxR8PqvATk2C+Bn+OT6LlGRLeOFaJDDrSlzHfIW9LiVY9sW1ak7805wY5+55lmBK+PJot/ICd+liOTWpV9gC7joYMWnvrul+1KiCjrQpgpXZJigZqiBYaC5sph1Tk9Lg591ezrgAIYr/N/2Gnx8yoPopIqhdeSCEC0vnMpkLzCMAyXQ== - PGPASSWORD: AgCI/4OYxm6Cr2NNBm9lRlMZlJrLLGoNlGE7nk69Tlx2okPsjxVA8Lfyr38V93K+DKF1AopjM6MEDlqesVHP3W/yL3Z7cL0BoIdF/hcSMH82fLKTG/fDb9t6mUch0/I9WKDByT6FczAzLhvBdgq2OKD1FlSdeEJlX8Jj05xzVqP7R4Xk+dTAPa8hacXx2tymrfnjrfVoXD5tdFAlG4mk/UZjuGeAt+OgSXQjr7ybN28Xp23M/WIqMihm8RwLi43jHTzF+uGPZ5o47SA9vcCjDa/4ktyRVZG/V8C1fp/4bXnSN0tAGwJ5LhmTbOIDnCNyXPxWojByIvl3kBMo1WPVk5SLxn+rcyq4hPtw0KISxDn4SnukZV/6YRvrlDO6Gdtk2WAWVUpF5I1gaxx1ChSPtsPpMz5Z7v5Esq7xuGIqLtR2A253vr6TdPmpV6q+HONR1WXcjJWnrR+VJ8jt/Y+gyBOFl99JeyHatHVpLxK3/+FmSkJ5VCQK/RjFm1ACofHSGyd/aNj0QaLzVm7P3txTSr2Z8LQivl+P28jS1JrPHLPV5uJ72Q0EA4WSahlAy0lYKs3jebdOeYo25eCA9kgaCnu2Zo/W925vkSe6+Ulc6V+9D0nkt1qwjTw9WmykRi56p195ECIlImxKqyDCybGQ/SJ6qDJnXrGkJwFae7QAQed+B7HFrnAFGqYPLR7DwFpOUeHoeqb6avj9aRIEQW2vaCitWfK0TFiwh3K6/qd5yPzfsxdPxeFtbtJM - PGSSLMODE: AgBXdmcyqCQuOcXZ+eC6pYXtXT6pPSozFz5M7NkkW8bIaH4t95MzRZnUH8lTGn0Xk6vkWpsvDbK+KT0lqc9iWf6ya+rX3PWMfvuYVm3y7rguMNCxLeJfUql9LraCdiD++g6FIY/C33BWNp76r36DAS/kkXzaJblwwgP9AzgioCbleyaXcmzAPG+eL4OG84e8E0v8LF8G0pXn0Vb6gptYaKFCxLhtng7gLA+JnDNyOSz0wcPBruCzjZzOl1gHCoJR8Cw1BH7QiK+6rT0ceEzl8olTxXTB1BNBgtLp5AMO7zeKsUrP23REiENHGtZHxhGoPWuOcbVkiSCLqJhXGrg04MqCLKmZ8pfpcQzvodzAMwEocd9Bldkg2rQBIiMd1vDYDzDUymq40tZPkwOoUhnt6lw7IDG+z/XKjcQBggOYRnWtZzKyN6O/KZc/yVEyPRamI0/1iMwnm93Mm+dUaYOlQb7V73jPr+g9YALi4zlOQfX/NZdXzLDoZ3UB2Ir1xDlSCfGIC4Rzugj8bcwKmAwaZEh4GZWBt48gyjpafinsEtEkHhQb0Y1tiKEwMWpySh0FiSSB4prkAKJKg+00LMia4vDFJzYJ5Z+3Y79Vbch067Rka55/niqiUw/yf9Rmf7OH5UsVV7Yqq/kSWZQz4pVDKpBDVR7V0DPJiMiKxmgRm7+nPhXVZt3yC40ujL860KBmSbdMduES62ttuK0pXg== - PGUSER: AgA9+AZF3+m6i4gKKFNQhZNLYUkdMayU7Z8PP3gt+wVfh5EAIiTvdrXZSzXpvqoITXumXf9EvEtKiB1DDljC1PPgLvHPZBaCTf816kbmKEbSuytzJM5OJ0wGkfGKI6IN99pEL35yjpwntw1bXxX6J+/cNDe1Nz+e+HM3g98SFouqpnGo2uZI60Vw6PVZ7UZtGneADdneCy+6tbxQzETje6xY0p2V1A55HO2OoDgJpvvfORSnXRwUWZw/PMPWvOhXerAsUfyKfZdwlNYp++Ma/mT3l7SvH50f/iKMVbGqchkpCKR4LdNXqguSQhmJePmfvpMlBtxIUX2nWJT2kQgy4m9FYl18F3jzTSWVgiUIvFv8eFmsEUw4FZ8EAi+6hMzhk+Ge7ojPAmpqwIrVbyEE8lnOQtvdVpY7UM0oL2Cj7BFpD5IbJMezTdnV0BvRp5h2kJ7OmRY1oaKPKyqjYkaoH4NoxYtJoiCMKYetVeAxTCVBH6qm4mSFaAnk+wEGVqZeJUQhpbgpWzK8U9e+ULrjQoO/fO8v9jUPpzKsWlm8pYj54bcb89LRccDoz8pM4EGCVDibBqrX6a9nG3LUWw3Zy2AXvK/2kHqaT8xrYy8XefzlBGUdQZVoLQn0LK0dcJ913AkIQe5idED33DhRmiyhaRnkh1Gzy8KaK9oGtZba6//BqTUhI+7uTPGM6oR1hOKYCrpUW8rj94+vgvDDZi/2bYI4Q8S1D8blOhFwzNJzZP/XIsRwy9Q08YM4qg== + DATABASE_URL: AgCN6Ne9oaL+VyJyxOsoSOEZJk/vCuybsCZUeSMo685yypCoYtGymw5RYrKsHItCzGP4RhqQFNKAcg1mte3mxIQerpqo0rKC+DBWm0AfObDwrQlhD+D96hj3uva7YGbQXNtYVy9AEqbVsOfr9UDUwQKKUYHqSa0cPbJlORpO6U307PKcutg1AqRX7SzWUQV7P3Wad9n6BRdjs+46qsN1xKopymxYMsu4I1NUaKtAfHO4RIdCW1yDXpBPnC9xHicJ61W44jMiksw5wRRyRgpPrexsR4l/NRsBb99K1v3KnEznhLYT3g7NhPcScKkDBwfv0+Pro+SR7uny43nq7ta1bXOycuwj2c4IfwKGXnI2K4OVL3NJ0w135R9J3m5isRFQ7DNYRMethQ+cmFkDPZnf5Au1hibpZ1AB6+Eml9vXBosGA4MJvkmSPiP4E4tEhK+eyNKH60fi2l3mSw0Tlv3TYcVmP1RPyKX2qNTgsu3SL/tmOFoPzxzB/q413Wbs4mbbt633CLo/jsFARJsqAk6NH/9reJWI/lUSIZ951qhZMOVQ7vcjt1KuPcih2DF+ZsUSzi2SOtUROLY0JKPRL/pY+57YUYIFeRhl8xLX3nNyfhxLcaSKdDyO7fVmGMOFgYzS7/Rxlb7mhxAz3fIqz1Kj3qL7x7WQzZnOb/RZFpgNwTcGWgObD9n8v56pDSNMp17Oj2dU7ovOZbuAY3ldD+v3ijKaE41i9zKm+7IIfBdrnHl6twXm02s4SKvR+FoWqEhf4nTEf/QRcGawK3udB9WG9LDCY1pbUlq+C/q97DS8O43C5KVbrXrSKHans9xqEe63aiM4G+cTNsebgWfr5b7ULN+EfJ42ljp49lVDeBnQ4sIm77f1gZ8R5DwDof25AZROZcX6SsYQ + PGDATABASE: AgBD5hMYAiaXIPNFuPFn9HbVF1YmYb3VyVee5xnIA5PXOfLKALjs8fiJHph8+ipsXtA6YeibUxjWLCKzs+mu7QT0suxlk6WVAaNQHuja1kxHEYxMNtoOOH4Hu5aAeHR5+U3IW5bg7X6phafCh0rZJcKSjQTdYniNUsKv+ooyxFhYW6ijgin8YHomb9C9YwCv00FlgeH7eIbsQuBnpoHhgtQhAVJuOogt5bhMdDepvTCx3r8ehe2cZwyryFElRqblRB3vCMBbbFZ+nAQPfRXp+tOyuB3pjq4e3hb0TdVVy/utgkGPnPaYiDF8QVjdEHFbHBy5c5BNNVUBfP24+/z41nhc9a/ykLSbZVyreppOib7wTonvFGFf1hnFCefY1xYONI46am6dweEvXXtae3N1NoSqoYNAS8meNrNAwYIbKQFOZCQKkVpiu1dWvKC4ATDgmMYQUv6KTJWpy7byHUtGOKgIlLsdBIqPxAujkqNaZYUp8C8kQDlzirAiW1gAIyctdftcKQu0SlJfMizykaAzLYahiCL20AC2gcX4LFnDmrGk5PQ2QadTX0im6t1fVZc6H4PM2/uaw5+Q9/SM510lyJ4nfapwN/buiAW7wett0ha1/JreP+P+gl8SfaLc/MlMNaX5SyQU9ejw/NjGJdKsbN7To9ljIizw5rY3xRWnlLsN5VfaLMzK+QXOOTtUCFx2U6By/zsw6SkCgA== + PGHOST: AgAQSmUkijMYRgCeZR9hZ+TrR+pRYASyVPdXYZL4ZU8uoP7b/BJsOM7ypjX8VgyA5SEvhLrmtp0OZVPV3X+lZ/uRj5g7twbZnxURm4f29TFK1+Vcw0A+2AU6kRFATVXjeZ9h/IX4oNYFk51DevSXWHtACJlokIMLrIH379yaEfNG4PsCZvPm42sCrLTvTOefBn3c9q9/t+2AQf4TSuALHA+GATTFQMIGLXM+s0ab/LASdHv0GorabzuO44N2cTyIislqlHPRJaUBKd4l7JtcpeD3Og0q62L5yD+3J7ZhFV1i+oRnL9ePx3yLpvsXFGvWx2nKFS4pgrzuRTMdyAiitEeUVMLxmiegZPTMZ+THNFyZQbG2immzCfKThDXlpSC1w3UAPVKwTqV6HuxxJfS5fpxssgvDoi4Nql544CjHmXMjiRdqdmf2J0EZzoH2ynVNHEaFpSEzYg9k2LZqRiktY1WTZkPKROIAcMJNMsoaz5UqO0c4RhXB+a0UNc0YpwhIIPeIAiRjrJW3s5xu3bMQOqldCaETD2oVfYByyI82VfEJNQiT1WZR8mNNKBzsLnatR9jpj9R4q4cE0X9KIcoklstp/2y0kqQuDMTdgryW78LJh2Kctz7zlAHr4noa7B8JO6y0MI9MXVrL44IjU5m2zUUHYuxT31cz5egCmou3S4uYvp5WcQoONDCDKwx5xkKwwY2ODoHTemfbhNSLBlSUU2v8wQIxlQtU7sVgOXxssC+suWEHOpb7VW/KzFB6+eSfv0WnBA== + PGPASSWORD: AgB694ENQQmkOUNb6XDYGlIreWi83tHO18BJs062JeN247Q7gzAjUYFL0BOtjSmzXuQyxrKEIsAuRKrOzfwu6G68n2e7X3p7rw76EVbhdMzSB3zOMD07L5LRyoFRPUf8V5CNrfC4g4p2hs9P/4aoA09aFq4V9m3vPBrUL5WiJqRIRS8WbXwP4EIV8LvKmmZG09jSLQ1972F2KgI7IVR5Ur352wKcc7k4+g2XHuGOg2YM8Vm1o3cjjt4yXWymcIsDogiTjGSLg6T8P/e6X22LgZqlcKun2uFJDQ/iWEBJrxpG9MnOL2S5Wml3pBP/6r0Fi7D/yrJEJ15w5tsWSZQvfjh22R8s8ERX+1rsrFPUW1QyV92MW5ZSLollecRRIFosoRdMztGynKAeAdZrYrt/m0rbT7O4qXsBbtvutP1j0p1hGI+cRu56hGeFnpL+cZPX2+4ca/ceN0+r+TIU4QK+iCwBpJ6sdrPFO2UW4AKdD4dhK34SLHSC0EnX1Ds3GR19jlIfh2uOw0RToMybKqPJCG2UwvISGQqcenSLl7vT5Mdp+Eb2dVm58w9UL3C2yXk3yFVZH3DFL6qPSeRII4D7ox1uVIIO1S9ur/mhWUWlQ6cQb8/wF1wJ7vW/fY0TXdsejR8+VBmv8gc6sn9E4uyv5Xzqjs9rQ9oAy9iHDu9CUpFoCYB15YmDNRoxGHeB1/qXK8ChtnGU2DfHjJEEfIknvroeX4z7mfdLShvuAKCQ4vGudXSpLUEbn+aq + PGSSLMODE: AgAuT5hlnu1vHJ2TOrlC4x9CM202MgevS+t+Fm6ptzJc97k/m03NGJ+KDUMI7TfX7EdZJyRKcbYwADt3bCjqsPH84tY7u7dl8xL84bfPJpBa3imdKcmnH9mp1boDIuRDofX9JCtfOIemWLkOxmBho3Zb7qreYUtcC8El8wDGseS07n54NH0rfgrwCDM/jv2+gd2Mbye13KtTgYfYTAA9PYgCZ/H1NIV1oonqQePpCPUc7+qp+LAC/UhQKLjqMi1GfTQYU0i90EqzNC1X46qrvMtdVdxzXUplP5cHulGK/NaPqWiuFh+MGHWDcA66zjKVIpeRCzVG/gctx9HiGTmXPS0gmrEFJpGd2MrfMOlUoLCp8B2rY2DwZD1YKvSNiNRzWJun+rVV7KUXNmBIrXCZOdyW9Vb+XB7143uXoLcaKbIsduYy3Kqu7cTM0jJr03gWiqkjT/xQfHnHsYOPHuoCxhfq14tJcNDISjjjAgvDssAtIm1TlL2P9YLo6zPI4FXTYDn6XkBXIsN0v1iay1ZCRMtvRuPvej8bAegZ2u2dYVHRFSs8IfmRjkF0tPlolQZE1gw3sSGTJAUyr5jVOf/G3w7vaH2Jx65p+oX7e2X2GQvMTrY7OFdOSNZNQohlTAJnG8J2h7nRkLCwgvdc5ULHwOWkt1Kf8PygByT4c4MAnf/HM0rGDV4JsvOJDdP52Xr4i1/F6BpuLQkb + PGUSER: AgBng/9ajYOWMVLWquoZD8Ey1kMCBGsBv0NGFxACNK6FsbgsGwZ8mmBfup/oILw7iSUjusj844LAIBMlpwh05Cvemwrh84PnZAJrq2fTSh20F7Dz2SgSd99wGvUmKRjZK+Q66PkWf3VLIHaoEiHA1VYozEvaDvYMIJq1Bindo8Cx88OwIAG5e6PWRMH13NYbBHT3cgrkNyr4MEVMOgM+w4cwrf83f54lQ+9GNNO5ZqZ1iHZ3xhmtnRfP9SL9Q6GIfUcz1dP5O8zjuidBqjSKk8itUSlvZAkjVX8+oQwxw05EvJIsv5O+pwl5GIvVelZwctqxXtuHMswTPF20/9SRyM+VFOJhbTXJ3QuOdehdulTgawrCLMHhe8JcG7YiJENEutGoRrGMVUNOhxve36Oof74pN9QqLWqNPCFE8SkQIgV0vw2+jVok6kOl0igQMVWjwXQCcunw96vjcZC2beeMWc+3VqROOnmWJJuz0BzOtNNvV4YdbbYOtBLVRysaB5LbIgPMORffKbS2FHJ7FC3AEYEVDD/AWpYiJl+xwoxkxQNiq+72C3BG1i41zQc0Jy327uSrc1areUtib2jnEm16BXGx1YkB2KSK5KtrCpMtgq4VBUGfx/3uWd4T48Oc8+1llJXTNmnzTMGr3FCE7NAEHVgLl/HE72oe7R5+yzsQk2cTpGzvsQIHQLhtgHRJfdPGaoyQtyIYLqk88Qw3BRcN+8tubGJbitE9QKGe89RiP6dFfu9MVU/oOERaCg== template: metadata: annotations: From 37e6510043c984ec90986a4ba102541b7d424d3d Mon Sep 17 00:00:00 2001 From: Julien Bouquillon Date: Mon, 27 Jul 2020 18:06:28 +0200 Subject: [PATCH 27/61] fix: update pg admin secrets --- .k8s/environments/dev/azure-pg.sealed-secret.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.k8s/environments/dev/azure-pg.sealed-secret.yaml b/.k8s/environments/dev/azure-pg.sealed-secret.yaml index d674581d..6d601d0a 100644 --- a/.k8s/environments/dev/azure-pg.sealed-secret.yaml +++ b/.k8s/environments/dev/azure-pg.sealed-secret.yaml @@ -5,12 +5,12 @@ metadata: name: azure-pg-admin-user spec: encryptedData: - DATABASE_URL: AgCN6Ne9oaL+VyJyxOsoSOEZJk/vCuybsCZUeSMo685yypCoYtGymw5RYrKsHItCzGP4RhqQFNKAcg1mte3mxIQerpqo0rKC+DBWm0AfObDwrQlhD+D96hj3uva7YGbQXNtYVy9AEqbVsOfr9UDUwQKKUYHqSa0cPbJlORpO6U307PKcutg1AqRX7SzWUQV7P3Wad9n6BRdjs+46qsN1xKopymxYMsu4I1NUaKtAfHO4RIdCW1yDXpBPnC9xHicJ61W44jMiksw5wRRyRgpPrexsR4l/NRsBb99K1v3KnEznhLYT3g7NhPcScKkDBwfv0+Pro+SR7uny43nq7ta1bXOycuwj2c4IfwKGXnI2K4OVL3NJ0w135R9J3m5isRFQ7DNYRMethQ+cmFkDPZnf5Au1hibpZ1AB6+Eml9vXBosGA4MJvkmSPiP4E4tEhK+eyNKH60fi2l3mSw0Tlv3TYcVmP1RPyKX2qNTgsu3SL/tmOFoPzxzB/q413Wbs4mbbt633CLo/jsFARJsqAk6NH/9reJWI/lUSIZ951qhZMOVQ7vcjt1KuPcih2DF+ZsUSzi2SOtUROLY0JKPRL/pY+57YUYIFeRhl8xLX3nNyfhxLcaSKdDyO7fVmGMOFgYzS7/Rxlb7mhxAz3fIqz1Kj3qL7x7WQzZnOb/RZFpgNwTcGWgObD9n8v56pDSNMp17Oj2dU7ovOZbuAY3ldD+v3ijKaE41i9zKm+7IIfBdrnHl6twXm02s4SKvR+FoWqEhf4nTEf/QRcGawK3udB9WG9LDCY1pbUlq+C/q97DS8O43C5KVbrXrSKHans9xqEe63aiM4G+cTNsebgWfr5b7ULN+EfJ42ljp49lVDeBnQ4sIm77f1gZ8R5DwDof25AZROZcX6SsYQ - PGDATABASE: AgBD5hMYAiaXIPNFuPFn9HbVF1YmYb3VyVee5xnIA5PXOfLKALjs8fiJHph8+ipsXtA6YeibUxjWLCKzs+mu7QT0suxlk6WVAaNQHuja1kxHEYxMNtoOOH4Hu5aAeHR5+U3IW5bg7X6phafCh0rZJcKSjQTdYniNUsKv+ooyxFhYW6ijgin8YHomb9C9YwCv00FlgeH7eIbsQuBnpoHhgtQhAVJuOogt5bhMdDepvTCx3r8ehe2cZwyryFElRqblRB3vCMBbbFZ+nAQPfRXp+tOyuB3pjq4e3hb0TdVVy/utgkGPnPaYiDF8QVjdEHFbHBy5c5BNNVUBfP24+/z41nhc9a/ykLSbZVyreppOib7wTonvFGFf1hnFCefY1xYONI46am6dweEvXXtae3N1NoSqoYNAS8meNrNAwYIbKQFOZCQKkVpiu1dWvKC4ATDgmMYQUv6KTJWpy7byHUtGOKgIlLsdBIqPxAujkqNaZYUp8C8kQDlzirAiW1gAIyctdftcKQu0SlJfMizykaAzLYahiCL20AC2gcX4LFnDmrGk5PQ2QadTX0im6t1fVZc6H4PM2/uaw5+Q9/SM510lyJ4nfapwN/buiAW7wett0ha1/JreP+P+gl8SfaLc/MlMNaX5SyQU9ejw/NjGJdKsbN7To9ljIizw5rY3xRWnlLsN5VfaLMzK+QXOOTtUCFx2U6By/zsw6SkCgA== - PGHOST: AgAQSmUkijMYRgCeZR9hZ+TrR+pRYASyVPdXYZL4ZU8uoP7b/BJsOM7ypjX8VgyA5SEvhLrmtp0OZVPV3X+lZ/uRj5g7twbZnxURm4f29TFK1+Vcw0A+2AU6kRFATVXjeZ9h/IX4oNYFk51DevSXWHtACJlokIMLrIH379yaEfNG4PsCZvPm42sCrLTvTOefBn3c9q9/t+2AQf4TSuALHA+GATTFQMIGLXM+s0ab/LASdHv0GorabzuO44N2cTyIislqlHPRJaUBKd4l7JtcpeD3Og0q62L5yD+3J7ZhFV1i+oRnL9ePx3yLpvsXFGvWx2nKFS4pgrzuRTMdyAiitEeUVMLxmiegZPTMZ+THNFyZQbG2immzCfKThDXlpSC1w3UAPVKwTqV6HuxxJfS5fpxssgvDoi4Nql544CjHmXMjiRdqdmf2J0EZzoH2ynVNHEaFpSEzYg9k2LZqRiktY1WTZkPKROIAcMJNMsoaz5UqO0c4RhXB+a0UNc0YpwhIIPeIAiRjrJW3s5xu3bMQOqldCaETD2oVfYByyI82VfEJNQiT1WZR8mNNKBzsLnatR9jpj9R4q4cE0X9KIcoklstp/2y0kqQuDMTdgryW78LJh2Kctz7zlAHr4noa7B8JO6y0MI9MXVrL44IjU5m2zUUHYuxT31cz5egCmou3S4uYvp5WcQoONDCDKwx5xkKwwY2ODoHTemfbhNSLBlSUU2v8wQIxlQtU7sVgOXxssC+suWEHOpb7VW/KzFB6+eSfv0WnBA== - PGPASSWORD: AgB694ENQQmkOUNb6XDYGlIreWi83tHO18BJs062JeN247Q7gzAjUYFL0BOtjSmzXuQyxrKEIsAuRKrOzfwu6G68n2e7X3p7rw76EVbhdMzSB3zOMD07L5LRyoFRPUf8V5CNrfC4g4p2hs9P/4aoA09aFq4V9m3vPBrUL5WiJqRIRS8WbXwP4EIV8LvKmmZG09jSLQ1972F2KgI7IVR5Ur352wKcc7k4+g2XHuGOg2YM8Vm1o3cjjt4yXWymcIsDogiTjGSLg6T8P/e6X22LgZqlcKun2uFJDQ/iWEBJrxpG9MnOL2S5Wml3pBP/6r0Fi7D/yrJEJ15w5tsWSZQvfjh22R8s8ERX+1rsrFPUW1QyV92MW5ZSLollecRRIFosoRdMztGynKAeAdZrYrt/m0rbT7O4qXsBbtvutP1j0p1hGI+cRu56hGeFnpL+cZPX2+4ca/ceN0+r+TIU4QK+iCwBpJ6sdrPFO2UW4AKdD4dhK34SLHSC0EnX1Ds3GR19jlIfh2uOw0RToMybKqPJCG2UwvISGQqcenSLl7vT5Mdp+Eb2dVm58w9UL3C2yXk3yFVZH3DFL6qPSeRII4D7ox1uVIIO1S9ur/mhWUWlQ6cQb8/wF1wJ7vW/fY0TXdsejR8+VBmv8gc6sn9E4uyv5Xzqjs9rQ9oAy9iHDu9CUpFoCYB15YmDNRoxGHeB1/qXK8ChtnGU2DfHjJEEfIknvroeX4z7mfdLShvuAKCQ4vGudXSpLUEbn+aq - PGSSLMODE: AgAuT5hlnu1vHJ2TOrlC4x9CM202MgevS+t+Fm6ptzJc97k/m03NGJ+KDUMI7TfX7EdZJyRKcbYwADt3bCjqsPH84tY7u7dl8xL84bfPJpBa3imdKcmnH9mp1boDIuRDofX9JCtfOIemWLkOxmBho3Zb7qreYUtcC8El8wDGseS07n54NH0rfgrwCDM/jv2+gd2Mbye13KtTgYfYTAA9PYgCZ/H1NIV1oonqQePpCPUc7+qp+LAC/UhQKLjqMi1GfTQYU0i90EqzNC1X46qrvMtdVdxzXUplP5cHulGK/NaPqWiuFh+MGHWDcA66zjKVIpeRCzVG/gctx9HiGTmXPS0gmrEFJpGd2MrfMOlUoLCp8B2rY2DwZD1YKvSNiNRzWJun+rVV7KUXNmBIrXCZOdyW9Vb+XB7143uXoLcaKbIsduYy3Kqu7cTM0jJr03gWiqkjT/xQfHnHsYOPHuoCxhfq14tJcNDISjjjAgvDssAtIm1TlL2P9YLo6zPI4FXTYDn6XkBXIsN0v1iay1ZCRMtvRuPvej8bAegZ2u2dYVHRFSs8IfmRjkF0tPlolQZE1gw3sSGTJAUyr5jVOf/G3w7vaH2Jx65p+oX7e2X2GQvMTrY7OFdOSNZNQohlTAJnG8J2h7nRkLCwgvdc5ULHwOWkt1Kf8PygByT4c4MAnf/HM0rGDV4JsvOJDdP52Xr4i1/F6BpuLQkb - PGUSER: AgBng/9ajYOWMVLWquoZD8Ey1kMCBGsBv0NGFxACNK6FsbgsGwZ8mmBfup/oILw7iSUjusj844LAIBMlpwh05Cvemwrh84PnZAJrq2fTSh20F7Dz2SgSd99wGvUmKRjZK+Q66PkWf3VLIHaoEiHA1VYozEvaDvYMIJq1Bindo8Cx88OwIAG5e6PWRMH13NYbBHT3cgrkNyr4MEVMOgM+w4cwrf83f54lQ+9GNNO5ZqZ1iHZ3xhmtnRfP9SL9Q6GIfUcz1dP5O8zjuidBqjSKk8itUSlvZAkjVX8+oQwxw05EvJIsv5O+pwl5GIvVelZwctqxXtuHMswTPF20/9SRyM+VFOJhbTXJ3QuOdehdulTgawrCLMHhe8JcG7YiJENEutGoRrGMVUNOhxve36Oof74pN9QqLWqNPCFE8SkQIgV0vw2+jVok6kOl0igQMVWjwXQCcunw96vjcZC2beeMWc+3VqROOnmWJJuz0BzOtNNvV4YdbbYOtBLVRysaB5LbIgPMORffKbS2FHJ7FC3AEYEVDD/AWpYiJl+xwoxkxQNiq+72C3BG1i41zQc0Jy327uSrc1areUtib2jnEm16BXGx1YkB2KSK5KtrCpMtgq4VBUGfx/3uWd4T48Oc8+1llJXTNmnzTMGr3FCE7NAEHVgLl/HE72oe7R5+yzsQk2cTpGzvsQIHQLhtgHRJfdPGaoyQtyIYLqk88Qw3BRcN+8tubGJbitE9QKGe89RiP6dFfu9MVU/oOERaCg== + DATABASE_URL: AgCkdubuU9cqZOZK8ZrLpL3Z52mZ7u0NXiqzxZqj8cT9p0198KFe+AeBjB8AWIlPGuJq6uUeJqL+x0oRiNCAtlCFBPvO/uPTKMdgR1WgbV4O/aBDayHJXLASPnGL46QzL/atW3KgftXK9Q/nHBJspuucT5yhfNne/oKMb0hKx3dzWF19Bnr1bUNCSp9Y5E7IIV7MU3ETyXKH56ZRWsMxrjv63+94hLZvCbIwg6UXNWMt+5prMNxv1zVxnc/OpTK7AjAMElq4WsPgET1+NTZuWhBoRSATT0OZNoPXpbtV++XxKGZZjcK1KD/uhFmTuIZFXp4X1mnq0EI0WKJxjB6tIOkM18BGqTw6jD7CBRNGW5py33cPvQYDt7L6PaT10GDoewLLCBgvn7LD1bMwR7ZqGJIsAMqRs/2/TJUaUWALUynwlL9QqF36ZVu8iF7liCrALleG+DvWmEO0f4wyLnyABaRF3S0idW4OtbWNO2SohDlg9wRJU+/pTI9iqg+1myafLSHKVTVXP87gvSbxL9c06/FUzn0pMp8c3B+AYZF7GLKvQsCEqWccjFTMP6F5gVswcye1wiPe4Htouqvd8EZg1+wfYtHCrjKfSuj5GApcoGj49VdkhozOfYgEapaj9fD2Yzrl3l9UgZKEzXtbP8wLAwZwwTs45ps+9QIudZj8b8rOT6/Wbsp6fcb7EZcVrk8FfIHRms3Xmc63LzHtGchs4woEHD600mVIUrrvxKYUxktjXcElND2qmlwnBFLFxVcFTKue02xRwLxgwMUlVW4/va3TlV9c5QSEqoRU1tu/queJcPtq9RvY3n/OvDb/uCa4spVEQw5uysR4yA1N+IKhHlkJlRZU9JFZSTefWd5lG1E6sOO4jpF32l8K9oktGTABKMi9Ta6e + PGDATABASE: AgAl7jNH2rFv0VPGywUXreUFbVlR35y7kxKFNtxH/tZ1sT5RYqGXfuS3pNhBcXBZ6SQyShm9Xj/zIPRoDqd2vSTta7oNoJ7O0oN+BZTZeIXU2d1baEcWyJwoeGL1VBcqNDnglZqUDj8RmUtid0L08+4z2ZOmHIiwbTmm3v0+GaBIN4dgrD6ePiHnOZif3eLocL9zddh46CLNi1duFcccISVms9xCfzssyiA+938EisO5S8GLpqxIQdk82lRqCy6fzaOYZyJ87QNp59RbUmfn1Eg+Ew54kGBtRdsf1ZoqnLYV8toveOsYVehrMfHwCYWmy2Qom/uomECluRq1brDU1xOTpcPVtTb5S1BjpWSXdP4vuc/7Q+qCyI89aARN03yrAyvjwKfX+esfPWuujXnR2KPyVYEO9FaM2KHewi515bSQ7/b+HuB6+RMGn3M4R+ZF9UTfCPD71SUrEKaKtXDUNPP/UImPB1yRpRGCFdsZXSd1XJf+vzJ3NCs2vTzmHWgzZvms/Iiv/CeOY63dAV+/wC2pGpjdZzri67rok/uVSeQ+9VD1TStdBLK0SygpuXZyQKS569hhW0kUbDQJK7CJIDNGDpJ25DVUEOex0Su7H6WoKW6aVwrj1Bl5vnhQ7LoWUC2DVxzObgK0TRxYwgFYstMeVLfqUEgjvplTDFfeXdLPJ8ElANJR65OKJJ1KnjMTbSygcdJ7bg/bbw== + PGHOST: AgCenWEQZz3hE7yrbCrYndeHJdDhPK+iX+DyCH8NzgWWJ+v+jx9eYSNpXCQCXh0wJzWjRjxXKsXNliEDLPKnQ0Qcuh9Fk2gTg36cJgL8yNS20SrNQt6B0nND+pqeAjqO0dcy8mVA3WsKW1dEvly6wnJrBTEq9pvLFxKCFx11jXSuN4sF7U1+B1/qfRU27K7MSHL5tFuUTvdowiAWmT3VU8tRLs9xjMUgc2SIpV9aQIB6Y9Ni2V28/sdmrQDAYJvUbWqoKZ8RVGBM8inKizT/HYPq4tHNeSJBmd4Iz9Sp5R5xQrZqbXcEIMBOOsiCSxFcEuPXDX/D3axWw7Xq9gvnCsILr8lsJ/K7qZjra5lNd8lAXFuW5GyZHBHIJKVwI5vh+fvSQctfk/I42Hjp4dG/Te9GvYzSdudud1XJmHBlq6NIAi2QrG2VUmQyamad+K+yYlM6+dp+jtn1dIv2VREfeRzFQc9NjNUbi3eA3cD5X/N0H8daZxywDf0f6Cda9VjRnL8JfpI3YYCamGfxPacaLiXvp2AGjvN6gKxA1znuA7A38KF6ZsRgGzvoQvZGzjylJTqZrepP/pCuvT1c6vFmRyax1b8QcLEvzaIrsLwG8ofU7MQNiSDdr25xKJe11kEay3iR2R4JTy75EOF34ctEa8jH4C/hhjQvEnQrTB2MVa6yEJSIVNSNv1Bg6CnAeEcbmdDaOkfCfnwJhTPZcaLdNLaoyEaVYC0VvDd6n0hrFu4wq2YHffnnqTjs3WDVDgL1CGcJhA== + PGPASSWORD: AgBS88uSaPNyDr7jwQWj4T4Dsj2fEv8f0uu+tWZEe0pdhTBh8EyBaNAezjShBJ1CkLzCJu3A8D648q1FDaUGBzAAViMKiETRyWt/Cfkx3Ed5iPKkuRsfWky8S//cHAMejpdSKbOVPGvzB+1IzjvOT7pG59Wz5aAeXaU4Ue4RjS+ANbn1rT9jS321sxotjYaxo+I8DUfejEDZYHam5nVnCN2DRopxDC3XvHkbMS2Q3WxCol2z9CHa0ZNaPWDKSDSJV0MtbwltG7KquLzVmxz22RT5y1EwhADer/gGMG/+/6EbNbfOcsnNWEAFi4mqU6b2DDmamaymwZDFxGYKXQLdrT7cTa+BvqfF/lQ4J0kbJX5/8Z9CtC3fwEs/mv6f7oVOeRzkb7pdvuYR0B7x+30QGEBvSqT+/Ox6GPzMMdezuOI/HnWB3jIWIxvxzcw0ukCR9MJon4/YZS8S6Eo+5Ha5ON2LRH3EcKnuRErv0CSmBueopF5z2R+sfStlL6vPO1JSCTQDRgHu2rJYV9MRYwww+wFEnUWVgRiKuXpRyGLhhlUoHDW7WisVQXdKfyzHt7QWj4A8W990SMaQKl8gM7k5xInMtj5lCZSsB3HBDTrI6lhX8jPUuMg/Hg5nPT+mCIDvmahkSSBd/Z/mclzP6qEOxfOcf1jbH+W5Y5WOU4doOXx/Jgh6hTo32WVtcbadLjLrYKNRrseE4L+8yri3SpLegykO1uzo5MQLc+QHLHXf7JEqtJCFtho3ggq7 + PGSSLMODE: AgCN9nD5nkHs2mp5qjtNRM6b3zli2gW+d0LfC8JbQm6+u4paJMG+5On/8jYd17uYcvMf0odyz6M86EpPGhHPySRFDKVT4OIoe+/+Rbyd1LLmH+g7eJUdVXtga4N4K1YvmVVi2E9HGF9j6oTSzWZGzCkKibCzMzdBYyy3pJwPFSSnUCsS+Pn9x0qKShGLGSWPnOV+VwQK+DB/0R/YUiSTJQWZv5dd4GRxK3Xar1XEZC7xpLe8zwiAy5aK1HyfW/NG1lp7k1/0ikxTloQd6zLrwPDPvC0mEChzlLjQfJNOUCnb3mujPW9Z9Ml9pf5gg8ye5HOlLCjatFgr9eXanq01We2HlcL7eGMzyDNejpdxt3BlEmlEJoNpM0tkxnDJtnlRUxUiot1lbkVNc9aM07C0brbzDPynl1tRX0y9ZmDmlUWdshecexHBi5j4drK/uBCtyKEKETtzY2+n1Sv8civo/1X8ydLiZPx1I6jz3D/NDZpsVJeMPRQBaAdrdByfofho80zrAGNgOCzSNcww1i+dzXTPecgMDbXrFocbf3KNX/Yn6lDPytGeAXHgYMwRWys0oHqDJpRp9AB/Stx2YyaNG98Jrnn0Ob2KlhRKao7vQNqDjs+eiCkf13hiSAk4G+n0pjFoPN6wZNDD336RUMMW16QJOq2G/6j3o5x575EFW26ZobVSs8egtqckBzyzPzEu7dE7K3J2M39c + PGUSER: AgABDp/DJL1OkgapzuG8l1hE1HyqTtV5wBXPX8twhAuRxxU7Yn8SrpCMrchGtK+NB9uSXML9QYdmzcdy3RYT1UOo4AeSYP1P3bh9DTSy0ydNuqU2MIq0B9V7HIHfvW5KEwlU2xi9nQzdXam7qbY2fI9iy3lgCc5kt58+tMNtzFA3iV04HYhfjCxImUOmh/Zce2jIzcAQHRXWfvIujf7/FKQn70Ta/yPiBEwbJCxg7OpmjN+ISNdcEfOUosdHRbXyqBHrhXSIXh67+jcqVsyKnPEXpN9XVN7ftMm0qlQlQ9WrzqiIyYhF7njH42mSzyV4TiuykmsIWKZoTHFK6OkGHKyo+3CkdYXIhv59PMR6P/hqGSguZmrKe9CdJ6Y9fzlqyFU/6a8JRsKh8cHw58qLkTQx5nARs8eSL2RiZ2p1tXISmpEOt+M7q+X3IQc6sl5b7it8WkLtY3CGxz06xjNs457iLdS6zHpqeq89OrKtcDbyrQxVGstJcaoaUwKa60B07HN77S+HnSg8wAKh2OFJSjKI5aZs3boEjdnX7QfUxYg2WtLnxPEgNQ8QcQvEdYsoMSUal5CLSPNyUqplfAfcJ2m+er6GAP9r7FzlO4ekRvdGnXZqi8rvR3qh43GguGjmzMK9ttx9Scc10704Bn4AbsN1ZpzDANYzvaurWPENXwzNRBkhslp0dxRRZWvJrVS1Tw4QVV0MUD1bj99F5MKT4xWSONqQ2wgPrzJCfX7q6SMJwa2bkgCCLSSLeg== template: metadata: annotations: From 796af74861e4f9105da40f7e004323502a416058 Mon Sep 17 00:00:00 2001 From: Julien Bouquillon Date: Mon, 27 Jul 2020 18:12:28 +0200 Subject: [PATCH 28/61] fix: update pg admin secrets --- .k8s/environments/dev/azure-pg.sealed-secret.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.k8s/environments/dev/azure-pg.sealed-secret.yaml b/.k8s/environments/dev/azure-pg.sealed-secret.yaml index 6d601d0a..2133257a 100644 --- a/.k8s/environments/dev/azure-pg.sealed-secret.yaml +++ b/.k8s/environments/dev/azure-pg.sealed-secret.yaml @@ -1,6 +1,8 @@ apiVersion: bitnami.com/v1alpha1 kind: SealedSecret metadata: + annotations: + sealedsecrets.bitnami.com/cluster-wide: "true" creationTimestamp: null name: azure-pg-admin-user spec: From b365a5312b16e033f23a4d790501213ea5b75780 Mon Sep 17 00:00:00 2001 From: Julien Bouquillon Date: Mon, 27 Jul 2020 18:18:26 +0200 Subject: [PATCH 29/61] fix: update pg admin secrets --- .k8s/environments/dev/azure-pg.sealed-secret.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.k8s/environments/dev/azure-pg.sealed-secret.yaml b/.k8s/environments/dev/azure-pg.sealed-secret.yaml index 2133257a..01f3adbe 100644 --- a/.k8s/environments/dev/azure-pg.sealed-secret.yaml +++ b/.k8s/environments/dev/azure-pg.sealed-secret.yaml @@ -7,12 +7,12 @@ metadata: name: azure-pg-admin-user spec: encryptedData: - DATABASE_URL: AgCkdubuU9cqZOZK8ZrLpL3Z52mZ7u0NXiqzxZqj8cT9p0198KFe+AeBjB8AWIlPGuJq6uUeJqL+x0oRiNCAtlCFBPvO/uPTKMdgR1WgbV4O/aBDayHJXLASPnGL46QzL/atW3KgftXK9Q/nHBJspuucT5yhfNne/oKMb0hKx3dzWF19Bnr1bUNCSp9Y5E7IIV7MU3ETyXKH56ZRWsMxrjv63+94hLZvCbIwg6UXNWMt+5prMNxv1zVxnc/OpTK7AjAMElq4WsPgET1+NTZuWhBoRSATT0OZNoPXpbtV++XxKGZZjcK1KD/uhFmTuIZFXp4X1mnq0EI0WKJxjB6tIOkM18BGqTw6jD7CBRNGW5py33cPvQYDt7L6PaT10GDoewLLCBgvn7LD1bMwR7ZqGJIsAMqRs/2/TJUaUWALUynwlL9QqF36ZVu8iF7liCrALleG+DvWmEO0f4wyLnyABaRF3S0idW4OtbWNO2SohDlg9wRJU+/pTI9iqg+1myafLSHKVTVXP87gvSbxL9c06/FUzn0pMp8c3B+AYZF7GLKvQsCEqWccjFTMP6F5gVswcye1wiPe4Htouqvd8EZg1+wfYtHCrjKfSuj5GApcoGj49VdkhozOfYgEapaj9fD2Yzrl3l9UgZKEzXtbP8wLAwZwwTs45ps+9QIudZj8b8rOT6/Wbsp6fcb7EZcVrk8FfIHRms3Xmc63LzHtGchs4woEHD600mVIUrrvxKYUxktjXcElND2qmlwnBFLFxVcFTKue02xRwLxgwMUlVW4/va3TlV9c5QSEqoRU1tu/queJcPtq9RvY3n/OvDb/uCa4spVEQw5uysR4yA1N+IKhHlkJlRZU9JFZSTefWd5lG1E6sOO4jpF32l8K9oktGTABKMi9Ta6e - PGDATABASE: AgAl7jNH2rFv0VPGywUXreUFbVlR35y7kxKFNtxH/tZ1sT5RYqGXfuS3pNhBcXBZ6SQyShm9Xj/zIPRoDqd2vSTta7oNoJ7O0oN+BZTZeIXU2d1baEcWyJwoeGL1VBcqNDnglZqUDj8RmUtid0L08+4z2ZOmHIiwbTmm3v0+GaBIN4dgrD6ePiHnOZif3eLocL9zddh46CLNi1duFcccISVms9xCfzssyiA+938EisO5S8GLpqxIQdk82lRqCy6fzaOYZyJ87QNp59RbUmfn1Eg+Ew54kGBtRdsf1ZoqnLYV8toveOsYVehrMfHwCYWmy2Qom/uomECluRq1brDU1xOTpcPVtTb5S1BjpWSXdP4vuc/7Q+qCyI89aARN03yrAyvjwKfX+esfPWuujXnR2KPyVYEO9FaM2KHewi515bSQ7/b+HuB6+RMGn3M4R+ZF9UTfCPD71SUrEKaKtXDUNPP/UImPB1yRpRGCFdsZXSd1XJf+vzJ3NCs2vTzmHWgzZvms/Iiv/CeOY63dAV+/wC2pGpjdZzri67rok/uVSeQ+9VD1TStdBLK0SygpuXZyQKS569hhW0kUbDQJK7CJIDNGDpJ25DVUEOex0Su7H6WoKW6aVwrj1Bl5vnhQ7LoWUC2DVxzObgK0TRxYwgFYstMeVLfqUEgjvplTDFfeXdLPJ8ElANJR65OKJJ1KnjMTbSygcdJ7bg/bbw== - PGHOST: AgCenWEQZz3hE7yrbCrYndeHJdDhPK+iX+DyCH8NzgWWJ+v+jx9eYSNpXCQCXh0wJzWjRjxXKsXNliEDLPKnQ0Qcuh9Fk2gTg36cJgL8yNS20SrNQt6B0nND+pqeAjqO0dcy8mVA3WsKW1dEvly6wnJrBTEq9pvLFxKCFx11jXSuN4sF7U1+B1/qfRU27K7MSHL5tFuUTvdowiAWmT3VU8tRLs9xjMUgc2SIpV9aQIB6Y9Ni2V28/sdmrQDAYJvUbWqoKZ8RVGBM8inKizT/HYPq4tHNeSJBmd4Iz9Sp5R5xQrZqbXcEIMBOOsiCSxFcEuPXDX/D3axWw7Xq9gvnCsILr8lsJ/K7qZjra5lNd8lAXFuW5GyZHBHIJKVwI5vh+fvSQctfk/I42Hjp4dG/Te9GvYzSdudud1XJmHBlq6NIAi2QrG2VUmQyamad+K+yYlM6+dp+jtn1dIv2VREfeRzFQc9NjNUbi3eA3cD5X/N0H8daZxywDf0f6Cda9VjRnL8JfpI3YYCamGfxPacaLiXvp2AGjvN6gKxA1znuA7A38KF6ZsRgGzvoQvZGzjylJTqZrepP/pCuvT1c6vFmRyax1b8QcLEvzaIrsLwG8ofU7MQNiSDdr25xKJe11kEay3iR2R4JTy75EOF34ctEa8jH4C/hhjQvEnQrTB2MVa6yEJSIVNSNv1Bg6CnAeEcbmdDaOkfCfnwJhTPZcaLdNLaoyEaVYC0VvDd6n0hrFu4wq2YHffnnqTjs3WDVDgL1CGcJhA== - PGPASSWORD: AgBS88uSaPNyDr7jwQWj4T4Dsj2fEv8f0uu+tWZEe0pdhTBh8EyBaNAezjShBJ1CkLzCJu3A8D648q1FDaUGBzAAViMKiETRyWt/Cfkx3Ed5iPKkuRsfWky8S//cHAMejpdSKbOVPGvzB+1IzjvOT7pG59Wz5aAeXaU4Ue4RjS+ANbn1rT9jS321sxotjYaxo+I8DUfejEDZYHam5nVnCN2DRopxDC3XvHkbMS2Q3WxCol2z9CHa0ZNaPWDKSDSJV0MtbwltG7KquLzVmxz22RT5y1EwhADer/gGMG/+/6EbNbfOcsnNWEAFi4mqU6b2DDmamaymwZDFxGYKXQLdrT7cTa+BvqfF/lQ4J0kbJX5/8Z9CtC3fwEs/mv6f7oVOeRzkb7pdvuYR0B7x+30QGEBvSqT+/Ox6GPzMMdezuOI/HnWB3jIWIxvxzcw0ukCR9MJon4/YZS8S6Eo+5Ha5ON2LRH3EcKnuRErv0CSmBueopF5z2R+sfStlL6vPO1JSCTQDRgHu2rJYV9MRYwww+wFEnUWVgRiKuXpRyGLhhlUoHDW7WisVQXdKfyzHt7QWj4A8W990SMaQKl8gM7k5xInMtj5lCZSsB3HBDTrI6lhX8jPUuMg/Hg5nPT+mCIDvmahkSSBd/Z/mclzP6qEOxfOcf1jbH+W5Y5WOU4doOXx/Jgh6hTo32WVtcbadLjLrYKNRrseE4L+8yri3SpLegykO1uzo5MQLc+QHLHXf7JEqtJCFtho3ggq7 - PGSSLMODE: AgCN9nD5nkHs2mp5qjtNRM6b3zli2gW+d0LfC8JbQm6+u4paJMG+5On/8jYd17uYcvMf0odyz6M86EpPGhHPySRFDKVT4OIoe+/+Rbyd1LLmH+g7eJUdVXtga4N4K1YvmVVi2E9HGF9j6oTSzWZGzCkKibCzMzdBYyy3pJwPFSSnUCsS+Pn9x0qKShGLGSWPnOV+VwQK+DB/0R/YUiSTJQWZv5dd4GRxK3Xar1XEZC7xpLe8zwiAy5aK1HyfW/NG1lp7k1/0ikxTloQd6zLrwPDPvC0mEChzlLjQfJNOUCnb3mujPW9Z9Ml9pf5gg8ye5HOlLCjatFgr9eXanq01We2HlcL7eGMzyDNejpdxt3BlEmlEJoNpM0tkxnDJtnlRUxUiot1lbkVNc9aM07C0brbzDPynl1tRX0y9ZmDmlUWdshecexHBi5j4drK/uBCtyKEKETtzY2+n1Sv8civo/1X8ydLiZPx1I6jz3D/NDZpsVJeMPRQBaAdrdByfofho80zrAGNgOCzSNcww1i+dzXTPecgMDbXrFocbf3KNX/Yn6lDPytGeAXHgYMwRWys0oHqDJpRp9AB/Stx2YyaNG98Jrnn0Ob2KlhRKao7vQNqDjs+eiCkf13hiSAk4G+n0pjFoPN6wZNDD336RUMMW16QJOq2G/6j3o5x575EFW26ZobVSs8egtqckBzyzPzEu7dE7K3J2M39c - PGUSER: AgABDp/DJL1OkgapzuG8l1hE1HyqTtV5wBXPX8twhAuRxxU7Yn8SrpCMrchGtK+NB9uSXML9QYdmzcdy3RYT1UOo4AeSYP1P3bh9DTSy0ydNuqU2MIq0B9V7HIHfvW5KEwlU2xi9nQzdXam7qbY2fI9iy3lgCc5kt58+tMNtzFA3iV04HYhfjCxImUOmh/Zce2jIzcAQHRXWfvIujf7/FKQn70Ta/yPiBEwbJCxg7OpmjN+ISNdcEfOUosdHRbXyqBHrhXSIXh67+jcqVsyKnPEXpN9XVN7ftMm0qlQlQ9WrzqiIyYhF7njH42mSzyV4TiuykmsIWKZoTHFK6OkGHKyo+3CkdYXIhv59PMR6P/hqGSguZmrKe9CdJ6Y9fzlqyFU/6a8JRsKh8cHw58qLkTQx5nARs8eSL2RiZ2p1tXISmpEOt+M7q+X3IQc6sl5b7it8WkLtY3CGxz06xjNs457iLdS6zHpqeq89OrKtcDbyrQxVGstJcaoaUwKa60B07HN77S+HnSg8wAKh2OFJSjKI5aZs3boEjdnX7QfUxYg2WtLnxPEgNQ8QcQvEdYsoMSUal5CLSPNyUqplfAfcJ2m+er6GAP9r7FzlO4ekRvdGnXZqi8rvR3qh43GguGjmzMK9ttx9Scc10704Bn4AbsN1ZpzDANYzvaurWPENXwzNRBkhslp0dxRRZWvJrVS1Tw4QVV0MUD1bj99F5MKT4xWSONqQ2wgPrzJCfX7q6SMJwa2bkgCCLSSLeg== + DATABASE_URL: AgAEQMB+0ukO5Ec6ff4kkxQPEVdi4Vb/iQYjXD3EGKNUnZzyvPAwEl9x8fy/hvzGXBY3xfvdp8pzKU1Nek4y5F2JyCz2f8j640IBLtnNNyw3FfufhcrD197m1K83nhHpAC5PxA8UPaCsCWDbYZ/e9jpk+fKNvNXIu7JJBZng7occIiyivlyL/Ydma5poxtHVstWk5HEtj5QK8HTrY7XOn/IG/4Ow7sG6fkfz0AKZaJt4Tt4KE+FoltZQ10bYhjMYWrFkKeA3/HL14t49fKPh/VIeqyNumqb5QmdbipEM37f8vQwWgU+6m73L2MFNaW5NBCCfcyhnIXKpZaX5mobIHRQ9w77J5V5DF9nIpGvlOE5yLxcacNJ2R4y1iWbC5/E1gBg3rvrZDCYHc1ozNpTujYksiA7Xu0cEwL0+tH64+ZfSqF3yQkb6wQZoFmredgCohwPjcJC1a1nvgFHuCjTCGWS70HdRY/MbXaZfYWMUkMdQQDpXb/3jJpvEfiQdwXyTebUgt2NM8ZcOCR+c/tYAe3A1Cm9PaDqMA/k4dO+LGYy38hn2LxJOaMSCmQaTbX2P8idQMJppD+9XxnzB/QpBKDJAnQP9MokdRFBclnG3vau0cPpS0LdXYOBnic/3otURM4p4fd3tEdWXqlFUqweiGcdJLjPLbXkH9y/23RYOoqOJci1y39h07EAn1Tul6ayL1+9T4zM+CjYyfe1PLNmaXgzSbOEpdNxTNRnh1+bA8TyhiOi+x9O5rUrT3auUj+DohVRVNxvqoUf86eWrLW/9nVFNaDDps9F5a1qAe1cQ0/7OvhFnVEiijElBS3yEdEgBrsr3Jr+JiNkrzneGExXc2/0cpyivE5PLfyIh+g34o4/XjSMR2+dmmX3Y9jFqr7ql1PVjwPb0 + PGDATABASE: AgCMMUMgNEOtroIMWP0YbIYkbtgBA0sPcP6GxG8xiux1cvwrf0wJGhS2zYzA/doO23Gbg7mE8Vh7RQnOIT/p+0jgOmWlqOZ6tHaR9OPBwQInQBj19nTb8eDQyKRpiNBH8DpxMRH95v3L6cAnd47zfSRQo2lkiTtjHIdXdhRy42ZcatYq2wDs23jFbDbxdnnH7YrC7DG9x0INI6i1vx6j6unVqxJt7yABCJRTUlVuCQx0p25MFjEvnIcVEbPwDg61YL9VGB6/F93JxmS85b0wg1tEM1bKm1f9oddiGeFkPGFQFFkMOrklZlViTBfWYnqTGYvDC1jth4PuhaWVTCDecoZodBAah4ZLRBxjisoQmQNfYHRTT5pflivncjnRbvFySs7iBqm8D84YBLbNrN6jXzghh1/SwMuCZ8G70ax2g/R8KvVTtnwtr0h98s1/qFqRag9zWPqHt27Gefj7sqISthDSLwxL1CIApJpLR72VtdHNgr0KR/Tp0qTne0dnV0TLuSF5+8q51kZDW0kDuLaHlOzcibhiirOFOTgTYpZOmWorjMuKb/RHZmJqDDL7ps0KCccFFycKFSX1nPwUcv2XZwzqtjFFdswYwBzcers7AWhRQukZK8maWfX5cnANNsueOAQCNBiyFoWkHW9VZz6zeghZ1fX/KrzW9Dsb0gv4RXnlEO72btdzGRgOGYzKRpLiof0aIJMDTbK3DA== + PGHOST: AgB/LDR8qkRLRr81+rxHzOeAWjQKeOljkKGj22EnXC/VQFbdJuih1vTeTV4YWgSc+aHX8C9IixOYZL8zxeVGNCrW2Cxghwgk2EIDUBoDleI6EQIOeOrFmQq/PqwAYIgdOwjImmH8wyn8QfvolEiEV5pwGW3HquGRULgehxbVZQMy1jteYpsWq71o9muaPs0zbVLFh5Zh7CZSUbwTchvWRWBcgQKBIj0GQ5PLkmRoPqHNXqw6vMhX5kBxdWAra0m6cXglUfYW0cnvSuoAGWCTu+HLBJ50seeeCmK18g7yMDXyJl8prvtWVK8ALEhqums8s6D/yBGmkss0HK+YNbmhrP0MRxDRWvYODYCMXPdy5mEJheFObZlYFYOGZAk/Mp3YPj7d0pz0MJPVmI+QI/+Mo3+FUFdlUAo5CMyTUbGazGENbMt3kPTE98mEPe7PcTXzFGHCYG3OS2dz6ebp2HiS2wlzzKRtEm792od1Ltrfm3507m8ihDnjkzPPt8C0hoBG7ELJn5r2HBDp5ibxQhJ3gi+t25QrUB/6dgp4MdXkBGIgbFvmeRN3vffi4Ora5ZmRjhkOocNc7RyeHlq6OocsuKAKaBIANJpMbqiqcjbDny2L61y4J5K33F5xQzJpWnyflYH2XMxZkVZEEPl7EnPd/DuivE9/F9OAeJT3TpkhUAOcG9vSZdZyxeo7ljP0Z+A9soWPQ7XO8f5grpp3Kyskxrrjhi4BrJ7SLfRz4bxkcDTdFXvBjuOUWROwv4rBbKWANuM/Lg== + PGPASSWORD: AgBzluI2R/lohdrvZ4Hekkh3CD5wteddz+IyfQycDiozSaX70tCQAr8fZS81qDoM+qTzjerpIdqIXm3guP4Qw/xa7hUCGvIj46BxjLN4plsYtyYK4f2HhDLU1OE+6P/M2o1D1PlOI2X49ktwo5yx06v7xhD1cnDqNwk//XbjkHQSgvAZW5c8gweCf5tphGqBFjq2vP8KEXbAn1tVOM4uck+Cm1Ppphvzz0/OemKlkaqhGi7hJ/OJW1jzfLVwC6iHnhQ21/B0d95Agf4g+E4Kd0wOKMOFCrZcVjTUPktO2KgDwTsXl6xxvaAvrcM6Azp1NTLhQriJUs8No7+hwf0lpFl/bsyQs+005rBmQWPxe5p/s9oLQQV788WqaoKgpdYEonIgy6J1vi565CIzNJhDBo8AqXHb7zmBGOcoRhZcX12tCQFtsKbAb2iyZ/qUNJ+sUuO6lw3IG1lTYljbs/nZ17u+jl8Kr7uJ7cevXx1lsLu6wjibgcqZ+rIre7MGLqvG1Pur4BELhqijvIyFp4tfoxm1Ce4F0P8ds5S2AxQXKwELf7VS11SDYesEYKYY9Ca6MQuWj03pqyLyUjJiWmKame45eamthXFKjbeIHef9kp9jmv80zEn6bcpLu7PQ97UuUlUNJhpbLt9HMjm/racFkZxi79S9nfRC9iGjzmkq3Gdmo2YjXExg5RFEUOTw11C89hsp1lEV3ti33pDZ+UNIR0ua1JdhXGn72aIcl6KPTZEcUjWLhcjBafOE + PGSSLMODE: AgBo1MIGbSbo4SNRWe8/TInYdnDR8rRpTF0F6HLkmuQ9IuJv8NoQDPcI5pUmZO8strxokAKt2B+WWFkBeEhoBQVtgFVfLFoG41uhrhCzgwHKskGzNA5/G34VhP3QoR+D79/wb587Y0N6HHhphPhdW01JmrUAINDSnibKcnvKejInegkAf3q3d1FLIX+9VcMVf/NSr601JOiDMzqvFgFhVBnjL7iBk8yyP7sDoUp/Zqd2eFsuaMj8nTjsUR2iGCudrEHEFFGOm/GJTnqFc/HPhK02Jjwb0z+9ebc2kUQdO7b6tOHTfk56Is/hZcLIvdjee48xXx2Aen70oqOWs2ao2NlsBiy+gGMooj+xUrrX0ZXfmw1nJ91UWi9q8G/OWmjtyqHNP+8VT574ZHkF/VSZ35PuZknfh190DB3tbzme9t9Iqo647M6Om0wIcwmDsrsAB5ad9QYpyOoP2Ys42DcMsm8vCJNTJNVUpUeiLzfQKdcWm+8n3jrAtaWpuykArSo55cqTOhZ+/ijUiJhwf10e154Onz5pgOVfkc5N3AqW8CUPyEoRAHN7Jt1JkzzOGNxQbeKJvwWTKtv9NEHYt2k7sdHAWKCB4fe4AwiGbynb+isCyiaIAMk+ydVy53rzvADHl26AOZG0rx4yXnCU210RZLQl7YwfKubL1AV4Tv35cHgvm4NArsq34kd3zbrfmu9NeIN52JJWwg0N + PGUSER: AgBW9nM0PMt7F/d5AELHFX6bI7tsK8M7gPa3P9FwCIdgS/P0oc4+cTGN0tr4KaiqylhFsRZUQMJJ2waa7QGzu5p8npjSsY8NRVMqXkjRpqHRbUUmx7TxL6GJSlA56ZcY/Sj32FH0t7zJ5Swsr7xY1Ien1trT04UBEWF4mipP051D6LaAMq6MbNeU4LFde1ONW8P7d2dOWMmx38xFugG3DQqvbedQXAzdF6bbozue2zrKBRF9YvWtAvpCdJs0wGsvrGVSftef3dClaAiBFjaJn/oteVFbmTFxZS0sx1l3nEm9AdFnVf+Txs7/jZytIlhkvrUqM5EbmvW3pCRCOzf8kJlFM+EeqY4fNsUTVN3xbRcYcX+9/T5DxvgptKPwD8kzAFZrmigjpHTVnxBBK+2rE/nGTYDIpda5yGI55xxtYAWJvcL9WXRq9pv8DCohZLC3stEeAiri0sKPNBfJPxbieVVz78ZejC67txDagAixDzzZV33bP1/OWeTFrl23Gy1LZ1KqHwB0m9JDNSoeyHhEqApXbtRghPuX1aiLWES/B5XwKdyLUJfnOi3EjxrYT08pBr6iQxvx/NMKlz2LloCn7kCKaMAGFArkozaFtJjDxKy/5O9agxxq5k+4zhn0eDWMfBUbNKmC7zT94C1H6GJ7qPv6TbAvQTEQs4oDq59sCPZp03iCIhmSLu2YdQykAwppaLRS27QBbcfMM6lZZ4rwrY2EnfGZC1j3aGO1nRGhngGjF/SzIyY3zx7qEA== template: metadata: annotations: From 4f40672d99c1b20c95b444fe5a356bbe0834895c Mon Sep 17 00:00:00 2001 From: Julien Bouquillon Date: Mon, 27 Jul 2020 18:32:04 +0200 Subject: [PATCH 30/61] fix: update pg admin secrets --- .k8s/environments/dev/azure-pg.sealed-secret.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.k8s/environments/dev/azure-pg.sealed-secret.yaml b/.k8s/environments/dev/azure-pg.sealed-secret.yaml index 01f3adbe..a21323e8 100644 --- a/.k8s/environments/dev/azure-pg.sealed-secret.yaml +++ b/.k8s/environments/dev/azure-pg.sealed-secret.yaml @@ -7,12 +7,12 @@ metadata: name: azure-pg-admin-user spec: encryptedData: - DATABASE_URL: AgAEQMB+0ukO5Ec6ff4kkxQPEVdi4Vb/iQYjXD3EGKNUnZzyvPAwEl9x8fy/hvzGXBY3xfvdp8pzKU1Nek4y5F2JyCz2f8j640IBLtnNNyw3FfufhcrD197m1K83nhHpAC5PxA8UPaCsCWDbYZ/e9jpk+fKNvNXIu7JJBZng7occIiyivlyL/Ydma5poxtHVstWk5HEtj5QK8HTrY7XOn/IG/4Ow7sG6fkfz0AKZaJt4Tt4KE+FoltZQ10bYhjMYWrFkKeA3/HL14t49fKPh/VIeqyNumqb5QmdbipEM37f8vQwWgU+6m73L2MFNaW5NBCCfcyhnIXKpZaX5mobIHRQ9w77J5V5DF9nIpGvlOE5yLxcacNJ2R4y1iWbC5/E1gBg3rvrZDCYHc1ozNpTujYksiA7Xu0cEwL0+tH64+ZfSqF3yQkb6wQZoFmredgCohwPjcJC1a1nvgFHuCjTCGWS70HdRY/MbXaZfYWMUkMdQQDpXb/3jJpvEfiQdwXyTebUgt2NM8ZcOCR+c/tYAe3A1Cm9PaDqMA/k4dO+LGYy38hn2LxJOaMSCmQaTbX2P8idQMJppD+9XxnzB/QpBKDJAnQP9MokdRFBclnG3vau0cPpS0LdXYOBnic/3otURM4p4fd3tEdWXqlFUqweiGcdJLjPLbXkH9y/23RYOoqOJci1y39h07EAn1Tul6ayL1+9T4zM+CjYyfe1PLNmaXgzSbOEpdNxTNRnh1+bA8TyhiOi+x9O5rUrT3auUj+DohVRVNxvqoUf86eWrLW/9nVFNaDDps9F5a1qAe1cQ0/7OvhFnVEiijElBS3yEdEgBrsr3Jr+JiNkrzneGExXc2/0cpyivE5PLfyIh+g34o4/XjSMR2+dmmX3Y9jFqr7ql1PVjwPb0 - PGDATABASE: AgCMMUMgNEOtroIMWP0YbIYkbtgBA0sPcP6GxG8xiux1cvwrf0wJGhS2zYzA/doO23Gbg7mE8Vh7RQnOIT/p+0jgOmWlqOZ6tHaR9OPBwQInQBj19nTb8eDQyKRpiNBH8DpxMRH95v3L6cAnd47zfSRQo2lkiTtjHIdXdhRy42ZcatYq2wDs23jFbDbxdnnH7YrC7DG9x0INI6i1vx6j6unVqxJt7yABCJRTUlVuCQx0p25MFjEvnIcVEbPwDg61YL9VGB6/F93JxmS85b0wg1tEM1bKm1f9oddiGeFkPGFQFFkMOrklZlViTBfWYnqTGYvDC1jth4PuhaWVTCDecoZodBAah4ZLRBxjisoQmQNfYHRTT5pflivncjnRbvFySs7iBqm8D84YBLbNrN6jXzghh1/SwMuCZ8G70ax2g/R8KvVTtnwtr0h98s1/qFqRag9zWPqHt27Gefj7sqISthDSLwxL1CIApJpLR72VtdHNgr0KR/Tp0qTne0dnV0TLuSF5+8q51kZDW0kDuLaHlOzcibhiirOFOTgTYpZOmWorjMuKb/RHZmJqDDL7ps0KCccFFycKFSX1nPwUcv2XZwzqtjFFdswYwBzcers7AWhRQukZK8maWfX5cnANNsueOAQCNBiyFoWkHW9VZz6zeghZ1fX/KrzW9Dsb0gv4RXnlEO72btdzGRgOGYzKRpLiof0aIJMDTbK3DA== - PGHOST: AgB/LDR8qkRLRr81+rxHzOeAWjQKeOljkKGj22EnXC/VQFbdJuih1vTeTV4YWgSc+aHX8C9IixOYZL8zxeVGNCrW2Cxghwgk2EIDUBoDleI6EQIOeOrFmQq/PqwAYIgdOwjImmH8wyn8QfvolEiEV5pwGW3HquGRULgehxbVZQMy1jteYpsWq71o9muaPs0zbVLFh5Zh7CZSUbwTchvWRWBcgQKBIj0GQ5PLkmRoPqHNXqw6vMhX5kBxdWAra0m6cXglUfYW0cnvSuoAGWCTu+HLBJ50seeeCmK18g7yMDXyJl8prvtWVK8ALEhqums8s6D/yBGmkss0HK+YNbmhrP0MRxDRWvYODYCMXPdy5mEJheFObZlYFYOGZAk/Mp3YPj7d0pz0MJPVmI+QI/+Mo3+FUFdlUAo5CMyTUbGazGENbMt3kPTE98mEPe7PcTXzFGHCYG3OS2dz6ebp2HiS2wlzzKRtEm792od1Ltrfm3507m8ihDnjkzPPt8C0hoBG7ELJn5r2HBDp5ibxQhJ3gi+t25QrUB/6dgp4MdXkBGIgbFvmeRN3vffi4Ora5ZmRjhkOocNc7RyeHlq6OocsuKAKaBIANJpMbqiqcjbDny2L61y4J5K33F5xQzJpWnyflYH2XMxZkVZEEPl7EnPd/DuivE9/F9OAeJT3TpkhUAOcG9vSZdZyxeo7ljP0Z+A9soWPQ7XO8f5grpp3Kyskxrrjhi4BrJ7SLfRz4bxkcDTdFXvBjuOUWROwv4rBbKWANuM/Lg== - PGPASSWORD: AgBzluI2R/lohdrvZ4Hekkh3CD5wteddz+IyfQycDiozSaX70tCQAr8fZS81qDoM+qTzjerpIdqIXm3guP4Qw/xa7hUCGvIj46BxjLN4plsYtyYK4f2HhDLU1OE+6P/M2o1D1PlOI2X49ktwo5yx06v7xhD1cnDqNwk//XbjkHQSgvAZW5c8gweCf5tphGqBFjq2vP8KEXbAn1tVOM4uck+Cm1Ppphvzz0/OemKlkaqhGi7hJ/OJW1jzfLVwC6iHnhQ21/B0d95Agf4g+E4Kd0wOKMOFCrZcVjTUPktO2KgDwTsXl6xxvaAvrcM6Azp1NTLhQriJUs8No7+hwf0lpFl/bsyQs+005rBmQWPxe5p/s9oLQQV788WqaoKgpdYEonIgy6J1vi565CIzNJhDBo8AqXHb7zmBGOcoRhZcX12tCQFtsKbAb2iyZ/qUNJ+sUuO6lw3IG1lTYljbs/nZ17u+jl8Kr7uJ7cevXx1lsLu6wjibgcqZ+rIre7MGLqvG1Pur4BELhqijvIyFp4tfoxm1Ce4F0P8ds5S2AxQXKwELf7VS11SDYesEYKYY9Ca6MQuWj03pqyLyUjJiWmKame45eamthXFKjbeIHef9kp9jmv80zEn6bcpLu7PQ97UuUlUNJhpbLt9HMjm/racFkZxi79S9nfRC9iGjzmkq3Gdmo2YjXExg5RFEUOTw11C89hsp1lEV3ti33pDZ+UNIR0ua1JdhXGn72aIcl6KPTZEcUjWLhcjBafOE - PGSSLMODE: AgBo1MIGbSbo4SNRWe8/TInYdnDR8rRpTF0F6HLkmuQ9IuJv8NoQDPcI5pUmZO8strxokAKt2B+WWFkBeEhoBQVtgFVfLFoG41uhrhCzgwHKskGzNA5/G34VhP3QoR+D79/wb587Y0N6HHhphPhdW01JmrUAINDSnibKcnvKejInegkAf3q3d1FLIX+9VcMVf/NSr601JOiDMzqvFgFhVBnjL7iBk8yyP7sDoUp/Zqd2eFsuaMj8nTjsUR2iGCudrEHEFFGOm/GJTnqFc/HPhK02Jjwb0z+9ebc2kUQdO7b6tOHTfk56Is/hZcLIvdjee48xXx2Aen70oqOWs2ao2NlsBiy+gGMooj+xUrrX0ZXfmw1nJ91UWi9q8G/OWmjtyqHNP+8VT574ZHkF/VSZ35PuZknfh190DB3tbzme9t9Iqo647M6Om0wIcwmDsrsAB5ad9QYpyOoP2Ys42DcMsm8vCJNTJNVUpUeiLzfQKdcWm+8n3jrAtaWpuykArSo55cqTOhZ+/ijUiJhwf10e154Onz5pgOVfkc5N3AqW8CUPyEoRAHN7Jt1JkzzOGNxQbeKJvwWTKtv9NEHYt2k7sdHAWKCB4fe4AwiGbynb+isCyiaIAMk+ydVy53rzvADHl26AOZG0rx4yXnCU210RZLQl7YwfKubL1AV4Tv35cHgvm4NArsq34kd3zbrfmu9NeIN52JJWwg0N - PGUSER: AgBW9nM0PMt7F/d5AELHFX6bI7tsK8M7gPa3P9FwCIdgS/P0oc4+cTGN0tr4KaiqylhFsRZUQMJJ2waa7QGzu5p8npjSsY8NRVMqXkjRpqHRbUUmx7TxL6GJSlA56ZcY/Sj32FH0t7zJ5Swsr7xY1Ien1trT04UBEWF4mipP051D6LaAMq6MbNeU4LFde1ONW8P7d2dOWMmx38xFugG3DQqvbedQXAzdF6bbozue2zrKBRF9YvWtAvpCdJs0wGsvrGVSftef3dClaAiBFjaJn/oteVFbmTFxZS0sx1l3nEm9AdFnVf+Txs7/jZytIlhkvrUqM5EbmvW3pCRCOzf8kJlFM+EeqY4fNsUTVN3xbRcYcX+9/T5DxvgptKPwD8kzAFZrmigjpHTVnxBBK+2rE/nGTYDIpda5yGI55xxtYAWJvcL9WXRq9pv8DCohZLC3stEeAiri0sKPNBfJPxbieVVz78ZejC67txDagAixDzzZV33bP1/OWeTFrl23Gy1LZ1KqHwB0m9JDNSoeyHhEqApXbtRghPuX1aiLWES/B5XwKdyLUJfnOi3EjxrYT08pBr6iQxvx/NMKlz2LloCn7kCKaMAGFArkozaFtJjDxKy/5O9agxxq5k+4zhn0eDWMfBUbNKmC7zT94C1H6GJ7qPv6TbAvQTEQs4oDq59sCPZp03iCIhmSLu2YdQykAwppaLRS27QBbcfMM6lZZ4rwrY2EnfGZC1j3aGO1nRGhngGjF/SzIyY3zx7qEA== + DATABASE_URL: AgCfvPQsgcUWT518/ogRvMFNDNa8hKv9golwGJH+4ukT77tse5gFoI4vzN1XuJiHqiBzyWv2ym7KQFw8DXofy1rvaDJsERuwqGvUYWxA2M+zNOgy0vY3W5Creliuzsbkh9x1AOkZFTUYfoYB8BoR/YNobsnBzHmPJ6o6wLbwvndHOlRdMNHDoM48ANrAgLqJKdT83FsEbKE64TE/rwJNWwrDgKJtn/TD5GJJw8bgxZJkPAUkRg+lzvHmO7In/JgP6aGBw1+nQAXTUGE6shMHaC+m9N3bI1cCYhzrj01FxU+w3YBfDolrrOrFgqWemjN9C1AnDbt+0dLY/WvgHa8IbGjF/XJc2VYGqNofhtikyu05M+dT8YvywF0dqxlyiAav5d3c+xwtBRDLYVeCalzm7g94VVyRAwbV1iSOY7asa4wUK7EMuetv/GXKJ72/AjyRpbyoMIqiMK6+rIWxEJ97j1fYwT1ZgYDKjdBmsg5HoyFOrkeRHglU9vxkpSWigXUhHZ1Ye7laEFhubd2MhVQO0M2qwles5W70cOdH6G6KwUKRfL1MEr4Oq38NReDGCgZJ+0Totjn9BPMbXhLi1iGLBbYrz93GrPFPrV23UFNBRLG0AM1eQPfS8Sv8Nx5/hEYWsr+GInQtfAH1aSGfefKWFOxVLb3OGGOnAoQlSYYBWj9zi1B7cmxXhH/7pVxFp/7gw2rZ6oORNxRzlOk0CIc/iYXUbavP8HfOGTp2Ne89fJrSlBr9VkmlDC2AYQgF4c0omizXM757TCvtKhC539NkhfbmU7Q5AVm6lz+/weJ0PIeTSVIbBBQ71EL5KgIELMfGVhhmsLKFWKEaOGrM4lE3VBBqSDrcauGH/NzwTvpnyxH6cS+tIrWupUNQ1HeZ9J6zYpj6d7DC + PGDATABASE: AgAsAZ+16YlSFwlSL31wYkr3kCRWlQGSWIFkVOx9XAL6UDl/njDorhBp/azuw06GSjqJcatrqlqq17b8H1h8EtYFl2oFFPniN0ASAMwjuN49AT7kwvhPxBp8rNiMS3mQ0Ov3GDIpKXcmgXiNk3SePrn7R/sUxDd1XSDrjtkE4zWxstBaIz2JzaJ7Zgwvd/zD3bLjjoQrAqfOSJA78IvGq7K5fO2P/Qxj/72g1E4CrE7h5Ufb7pqjQprUtAdE01otwJwreaRvW49Ntx2HVf5DmqAfP1CroezQl+BSys7Bfq0IzvQp9P3ubscjyko/W0KJ0La8G0VWbld/nBePD+hvuW/QibTUXAhmI7WkVaxzGB/WUcosXtacHs8uJXFR4WUNbC47/NnDH+DGDVMM1n9lqFvnSuT1UZn3RTk9gzFwaerABhK9KqoLZ2islUwdZTT2sHXIc8XrJ9A1yJGBcaGbKQPq4Al21foYP1z1aZYsUZJu58JUtOIuN2AqZIVLiel2oNqBqYJl1YIp8QcWssLlp+9ApqSXWVZyeb0I/aGoadbrb9v8vB/Iy5AGU9kbH9TB80tu78nRr/q5Hm9yBqAhkaW6hwJx8zfUywiZRFds0K35ytpocswWLr3oj8/t4HhpsngCox3THz81Xay2evzei3ngFkQ/rVRxHYY+SI15hood1am+d/rKzTPj8UwXYTuF2NxBW6LqB//88A== + PGHOST: AgAWKoi9b1SstcuArNFGbQ1Lztxv130daFhutRcIpOwHz/sjGd1XldT+vL184aVfHDt1aZXy17NXFkNmzYfUeyXteQX7eGHJrAM4banNMQr4gf+PelU8KILxsdQ53xX5MiWeKFXumssTjn/XyS58zKEbeFCmSCJVOo+9aAUoa9C1lVClrq2RLLfCMjqZDG6JsqG9nakTF5VZwCn/M5XdjunL8vBrdaOl0V6yPebdJHTa9NiDcWqpZ8MvLL+4uFlQOHYnUEVvOewagmKUYQ8w0XfWoe3Cn4rPUcYwfq8YFVmcW4kgWmNvh6AXxG9T1uX0TMszzISpF2DjUPSRFL3hNTQBHW9ExdcLF9j/0+/PkhcKbHnKYerl26o8jbqk1Q5jS5WX4z++X0WfCIGfMUcVpS51c8huSw1I5PZTVwXij+WcLxU7jHHD/oF8jS4iROm2XjL5V1/l6xdid+toCMzp0hsOM/fsfHKzk1I4l0DxAVzK+1ZWq+QVBMCLlNZKb8l2paFDw8AzYoDWlcsw0N0kY2NyUSLHnTpM62TsRS4pqBmaNNNnXposIOGLYBFvBSN654iQ/Q2hajAD4Fggfp1pu4CJy8Sn39zBL5PGF+UxR6q9ZG2gLYQu2XfdEUVYD5hI0mx+OOr7Kc6n/OPYwPPRqLUXFe3XbE1vB0zPrMAq7YPiraTDtpAD4vQ4hOFvgfSwwE4glFheLkfaKhyxNeOb4Y7MezOV2lZYAZFOw5XtKJO2dUx3O6segkHS2jofdGvsx2x/Dg== + PGPASSWORD: AgBs6A/+ZEOaT3QorRQekG4eAHdo1hHqqMmaoeA2sIv3/YWVb4z9Uho4mftk9HN//RwZNTWt/EQEodKJZ4jjAmq3inv1c4+D1M/LhTYjUajpjJq80+7VJjF3S4FDeFUS72YRXV1jClCJbfV1lD5o3nCMoudAVr64rpnZIo6bEOHoAdxt0JSUFrq6BmalagvYLMPYefFBN3lCLH+VcBhaUm0JHJ6pmpuB39v+lrYd3MbNhKTRiHWcNryurHQ+6PmCKK9Q3wGsY8vrRwLqq+QZc/cGcyL7k166P8gAqBuAb8Hb2Nznk1esZl08lfJDMXYwolXL0uuFccnNfsKNMWSYguQvVMgOzazzEDlUFJlzAj2VJvKgfsfm71f+6F+fRCzn6sijoW+Y8dBF/9/czvGMxxziUc4uWN6ROqXCCOxn/d22b25LWJrtcsGALyrQuCBlIjrzY363zzfvB16GT74x75J/mo/j4Y4Cz8aGvjNlgncgfHLfpR5NNskb6Ho1sbG8QsrbUdv8YJ652+oRMXJKrAFNz35ecgzzyNtNZmigGnMZxYVOY0XzIC8hRuLZJmp9cK4dnkxenUEqp5gfYc4pwQTdaeP/4oqGSA+Z/X0VLPGrEJpDLVyovt/rlMWIsgElIYYBPvyxCg0HE2hCQ7+F6WgNxsmZ4I/LiDaVFbNceY+SnEf1P3wiQEzOk0g14wH3sRGMGdDIE4yASyWZ7d/a65+cJcYTuffJvYSsA1+nYswKxgbCWVrf2EQV + PGSSLMODE: AgAHPcEAhaiwTBaqSb5UsTnhgwSUfhCXfRbrhpmmtqHPvo8IfyVvl0j37WeD/8210oHtFeT7GHPCnJa5cEv0LYrmCMwnGoQCh082gHCMO0meAT/tS0HS5DgAJRjWs7UPpuqCB2NVjwEGr3g6L0S15TqH6eC1Zb7p9sajqs+M9F7Rl3ceJihYljr7MeIjUMczRwiho4h7MtxZMRSnZIMYZKwxR5ko59azdzsfnVcGrIh7UCBo2SngDt+rZe7CJTTYPzqTCBoxs4Wpmk+hTJ0+zkAPkivTggCcGA9a8Kbog67xzudRyPD9yDZ1DVxMk0Hd/UZC3nWq7dkRxzAyzP8x7z7vhSeDuE/eUhAy22HU0UZmmKn4v7MvxEun6pZh26PBQtE2ahZRBK1BI6IK/YPY5B90O3La7W4jP9kzCuiIrujmitbpwEgu/iWgGrYnjKSWt7hBqwKxsj+kPgoOy6YxqyCvKNWk+sb2MQvOLUWsaMTiEP19xbfD61FScmp9wcZhfaDr5isn2ZnlAYh5x0x4a68y9C5VjGRxfCkfuxsl7WzV6NYga7hnFpaLXb3DVELejYFgoabGdd5f2vkWvJplKgCX6U5mT5oBiw25s6KVGWRv1NRkV7WRj3s9zz3eMnzDWB1huN+Mmpq4iutaV4GU8k53JmiH2RD61B6J+7qXR5rsnbzGb7bpFbIRzx2fA5TajJRkLZ+Faim2 + PGUSER: AgCNmO6syuuk3GeKycFGyHAs3ZeI49hPoxQECHqTeZqF4Svo1B6rpXL/l13A7NKAlLgP5qPfIwexK/L5NHhDF9qKxrcIL13VB+nKhqIzZbNtzHKvrmlKjwGa8+fQfWOP+NU5l1G2hiBzRo9OqYW6QvJa7BO+j9mh2J9vxvafmH9YVx5UhSoLrLg+dabMRa0PFj8HIoTEEQXWO7JfqcSyQjnmmas2hyh1Nvdyb154z+4roqTzo5BQhcvbliD5NgRuOhxuG15H6JqjW9IMqPtFijAJNqobYMPS9RV2Ea75A7kfeR8WaCW5kr2wuPreUrRLD7u1yRrJ45/JO+zrt0W/Gm1+CUfhT0SKdm+bdAM7CXOu3hRtCd5bhrUmNbZzZkQyzbuP04ejf8if3jAXgckOcjqbxWZV4WV4knrB2ujoLrRoxvG2u1c69cnqMUJvkmt1mwXcaUry3T4PbJn3fRG1l+dqxAZzXf4v1wBO3vBG4N2S/PRVgjkG3oyO5amcxMbwgBiGqwho8xfpmISfdXiLMjaaCR42cjJU4bw5mqtnoz/VlGsu80vS8n/DCqTBNpOzsPQm7xdvWEOwMPe12t8dOlBQnEfeqtafizYyjXQijo3IDfhX0GedMvfQiKAOuouY4LOxE+npxzfJ5+caiUU2EFtYOk4WfWvEV4wIz+ktiaS2rIkSiF5dJQkulrUyEdVBCBeWmcieg3T7E6vldWoXA7tY74sc1uQzmXEXePh7Nq23z0JeSFhLWCpDHA== template: metadata: annotations: From d43cd8bf971a3f2c5ec7e5bac94df131aa2d9d25 Mon Sep 17 00:00:00 2001 From: Julien Bouquillon Date: Tue, 28 Jul 2020 00:08:17 +0200 Subject: [PATCH 31/61] fix: azure secrets --- .k8s/environments/dev/azure-pg.sealed-secret.yaml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.k8s/environments/dev/azure-pg.sealed-secret.yaml b/.k8s/environments/dev/azure-pg.sealed-secret.yaml index a21323e8..e1d482aa 100644 --- a/.k8s/environments/dev/azure-pg.sealed-secret.yaml +++ b/.k8s/environments/dev/azure-pg.sealed-secret.yaml @@ -7,12 +7,12 @@ metadata: name: azure-pg-admin-user spec: encryptedData: - DATABASE_URL: AgCfvPQsgcUWT518/ogRvMFNDNa8hKv9golwGJH+4ukT77tse5gFoI4vzN1XuJiHqiBzyWv2ym7KQFw8DXofy1rvaDJsERuwqGvUYWxA2M+zNOgy0vY3W5Creliuzsbkh9x1AOkZFTUYfoYB8BoR/YNobsnBzHmPJ6o6wLbwvndHOlRdMNHDoM48ANrAgLqJKdT83FsEbKE64TE/rwJNWwrDgKJtn/TD5GJJw8bgxZJkPAUkRg+lzvHmO7In/JgP6aGBw1+nQAXTUGE6shMHaC+m9N3bI1cCYhzrj01FxU+w3YBfDolrrOrFgqWemjN9C1AnDbt+0dLY/WvgHa8IbGjF/XJc2VYGqNofhtikyu05M+dT8YvywF0dqxlyiAav5d3c+xwtBRDLYVeCalzm7g94VVyRAwbV1iSOY7asa4wUK7EMuetv/GXKJ72/AjyRpbyoMIqiMK6+rIWxEJ97j1fYwT1ZgYDKjdBmsg5HoyFOrkeRHglU9vxkpSWigXUhHZ1Ye7laEFhubd2MhVQO0M2qwles5W70cOdH6G6KwUKRfL1MEr4Oq38NReDGCgZJ+0Totjn9BPMbXhLi1iGLBbYrz93GrPFPrV23UFNBRLG0AM1eQPfS8Sv8Nx5/hEYWsr+GInQtfAH1aSGfefKWFOxVLb3OGGOnAoQlSYYBWj9zi1B7cmxXhH/7pVxFp/7gw2rZ6oORNxRzlOk0CIc/iYXUbavP8HfOGTp2Ne89fJrSlBr9VkmlDC2AYQgF4c0omizXM757TCvtKhC539NkhfbmU7Q5AVm6lz+/weJ0PIeTSVIbBBQ71EL5KgIELMfGVhhmsLKFWKEaOGrM4lE3VBBqSDrcauGH/NzwTvpnyxH6cS+tIrWupUNQ1HeZ9J6zYpj6d7DC - PGDATABASE: AgAsAZ+16YlSFwlSL31wYkr3kCRWlQGSWIFkVOx9XAL6UDl/njDorhBp/azuw06GSjqJcatrqlqq17b8H1h8EtYFl2oFFPniN0ASAMwjuN49AT7kwvhPxBp8rNiMS3mQ0Ov3GDIpKXcmgXiNk3SePrn7R/sUxDd1XSDrjtkE4zWxstBaIz2JzaJ7Zgwvd/zD3bLjjoQrAqfOSJA78IvGq7K5fO2P/Qxj/72g1E4CrE7h5Ufb7pqjQprUtAdE01otwJwreaRvW49Ntx2HVf5DmqAfP1CroezQl+BSys7Bfq0IzvQp9P3ubscjyko/W0KJ0La8G0VWbld/nBePD+hvuW/QibTUXAhmI7WkVaxzGB/WUcosXtacHs8uJXFR4WUNbC47/NnDH+DGDVMM1n9lqFvnSuT1UZn3RTk9gzFwaerABhK9KqoLZ2islUwdZTT2sHXIc8XrJ9A1yJGBcaGbKQPq4Al21foYP1z1aZYsUZJu58JUtOIuN2AqZIVLiel2oNqBqYJl1YIp8QcWssLlp+9ApqSXWVZyeb0I/aGoadbrb9v8vB/Iy5AGU9kbH9TB80tu78nRr/q5Hm9yBqAhkaW6hwJx8zfUywiZRFds0K35ytpocswWLr3oj8/t4HhpsngCox3THz81Xay2evzei3ngFkQ/rVRxHYY+SI15hood1am+d/rKzTPj8UwXYTuF2NxBW6LqB//88A== - PGHOST: AgAWKoi9b1SstcuArNFGbQ1Lztxv130daFhutRcIpOwHz/sjGd1XldT+vL184aVfHDt1aZXy17NXFkNmzYfUeyXteQX7eGHJrAM4banNMQr4gf+PelU8KILxsdQ53xX5MiWeKFXumssTjn/XyS58zKEbeFCmSCJVOo+9aAUoa9C1lVClrq2RLLfCMjqZDG6JsqG9nakTF5VZwCn/M5XdjunL8vBrdaOl0V6yPebdJHTa9NiDcWqpZ8MvLL+4uFlQOHYnUEVvOewagmKUYQ8w0XfWoe3Cn4rPUcYwfq8YFVmcW4kgWmNvh6AXxG9T1uX0TMszzISpF2DjUPSRFL3hNTQBHW9ExdcLF9j/0+/PkhcKbHnKYerl26o8jbqk1Q5jS5WX4z++X0WfCIGfMUcVpS51c8huSw1I5PZTVwXij+WcLxU7jHHD/oF8jS4iROm2XjL5V1/l6xdid+toCMzp0hsOM/fsfHKzk1I4l0DxAVzK+1ZWq+QVBMCLlNZKb8l2paFDw8AzYoDWlcsw0N0kY2NyUSLHnTpM62TsRS4pqBmaNNNnXposIOGLYBFvBSN654iQ/Q2hajAD4Fggfp1pu4CJy8Sn39zBL5PGF+UxR6q9ZG2gLYQu2XfdEUVYD5hI0mx+OOr7Kc6n/OPYwPPRqLUXFe3XbE1vB0zPrMAq7YPiraTDtpAD4vQ4hOFvgfSwwE4glFheLkfaKhyxNeOb4Y7MezOV2lZYAZFOw5XtKJO2dUx3O6segkHS2jofdGvsx2x/Dg== - PGPASSWORD: AgBs6A/+ZEOaT3QorRQekG4eAHdo1hHqqMmaoeA2sIv3/YWVb4z9Uho4mftk9HN//RwZNTWt/EQEodKJZ4jjAmq3inv1c4+D1M/LhTYjUajpjJq80+7VJjF3S4FDeFUS72YRXV1jClCJbfV1lD5o3nCMoudAVr64rpnZIo6bEOHoAdxt0JSUFrq6BmalagvYLMPYefFBN3lCLH+VcBhaUm0JHJ6pmpuB39v+lrYd3MbNhKTRiHWcNryurHQ+6PmCKK9Q3wGsY8vrRwLqq+QZc/cGcyL7k166P8gAqBuAb8Hb2Nznk1esZl08lfJDMXYwolXL0uuFccnNfsKNMWSYguQvVMgOzazzEDlUFJlzAj2VJvKgfsfm71f+6F+fRCzn6sijoW+Y8dBF/9/czvGMxxziUc4uWN6ROqXCCOxn/d22b25LWJrtcsGALyrQuCBlIjrzY363zzfvB16GT74x75J/mo/j4Y4Cz8aGvjNlgncgfHLfpR5NNskb6Ho1sbG8QsrbUdv8YJ652+oRMXJKrAFNz35ecgzzyNtNZmigGnMZxYVOY0XzIC8hRuLZJmp9cK4dnkxenUEqp5gfYc4pwQTdaeP/4oqGSA+Z/X0VLPGrEJpDLVyovt/rlMWIsgElIYYBPvyxCg0HE2hCQ7+F6WgNxsmZ4I/LiDaVFbNceY+SnEf1P3wiQEzOk0g14wH3sRGMGdDIE4yASyWZ7d/a65+cJcYTuffJvYSsA1+nYswKxgbCWVrf2EQV - PGSSLMODE: AgAHPcEAhaiwTBaqSb5UsTnhgwSUfhCXfRbrhpmmtqHPvo8IfyVvl0j37WeD/8210oHtFeT7GHPCnJa5cEv0LYrmCMwnGoQCh082gHCMO0meAT/tS0HS5DgAJRjWs7UPpuqCB2NVjwEGr3g6L0S15TqH6eC1Zb7p9sajqs+M9F7Rl3ceJihYljr7MeIjUMczRwiho4h7MtxZMRSnZIMYZKwxR5ko59azdzsfnVcGrIh7UCBo2SngDt+rZe7CJTTYPzqTCBoxs4Wpmk+hTJ0+zkAPkivTggCcGA9a8Kbog67xzudRyPD9yDZ1DVxMk0Hd/UZC3nWq7dkRxzAyzP8x7z7vhSeDuE/eUhAy22HU0UZmmKn4v7MvxEun6pZh26PBQtE2ahZRBK1BI6IK/YPY5B90O3La7W4jP9kzCuiIrujmitbpwEgu/iWgGrYnjKSWt7hBqwKxsj+kPgoOy6YxqyCvKNWk+sb2MQvOLUWsaMTiEP19xbfD61FScmp9wcZhfaDr5isn2ZnlAYh5x0x4a68y9C5VjGRxfCkfuxsl7WzV6NYga7hnFpaLXb3DVELejYFgoabGdd5f2vkWvJplKgCX6U5mT5oBiw25s6KVGWRv1NRkV7WRj3s9zz3eMnzDWB1huN+Mmpq4iutaV4GU8k53JmiH2RD61B6J+7qXR5rsnbzGb7bpFbIRzx2fA5TajJRkLZ+Faim2 - PGUSER: AgCNmO6syuuk3GeKycFGyHAs3ZeI49hPoxQECHqTeZqF4Svo1B6rpXL/l13A7NKAlLgP5qPfIwexK/L5NHhDF9qKxrcIL13VB+nKhqIzZbNtzHKvrmlKjwGa8+fQfWOP+NU5l1G2hiBzRo9OqYW6QvJa7BO+j9mh2J9vxvafmH9YVx5UhSoLrLg+dabMRa0PFj8HIoTEEQXWO7JfqcSyQjnmmas2hyh1Nvdyb154z+4roqTzo5BQhcvbliD5NgRuOhxuG15H6JqjW9IMqPtFijAJNqobYMPS9RV2Ea75A7kfeR8WaCW5kr2wuPreUrRLD7u1yRrJ45/JO+zrt0W/Gm1+CUfhT0SKdm+bdAM7CXOu3hRtCd5bhrUmNbZzZkQyzbuP04ejf8if3jAXgckOcjqbxWZV4WV4knrB2ujoLrRoxvG2u1c69cnqMUJvkmt1mwXcaUry3T4PbJn3fRG1l+dqxAZzXf4v1wBO3vBG4N2S/PRVgjkG3oyO5amcxMbwgBiGqwho8xfpmISfdXiLMjaaCR42cjJU4bw5mqtnoz/VlGsu80vS8n/DCqTBNpOzsPQm7xdvWEOwMPe12t8dOlBQnEfeqtafizYyjXQijo3IDfhX0GedMvfQiKAOuouY4LOxE+npxzfJ5+caiUU2EFtYOk4WfWvEV4wIz+ktiaS2rIkSiF5dJQkulrUyEdVBCBeWmcieg3T7E6vldWoXA7tY74sc1uQzmXEXePh7Nq23z0JeSFhLWCpDHA== + DATABASE_URL: AgAoheeEt4wFq73knAJrw/mFJnjL5p1xAKdymDX9vZw7Dq21v4AsPYH9kDazq5GD1/aWwCvcnpNtSoJmfB2s2Mh22Fl1Tcbynf0pVr+2eHtOsNFBqhMu5YICAddqervHhEfC9qLsqfMtN9DX07c8MlgY9YDdulSPAJ2XIqRe/F4I07hF2KpuKK1wyLoOvEhXDJie785B0Me13OqcD2RJlLMa6lvbhnLVbun+F1hziFBEt6guQ0rMdIjZ2kOlbhtOV8clhlIwYMuIlnmkoGepiuldEMSqurmWafs+EBJv8r2ujdE8sNMHKdKr3lGK9266Xh+VRDwvhjQAwSMbyUPGyg6KPgV+f/ERDlSW7y1FeQJnsh6rmSmgv7tG/S2G/pWsHW/TCZ2v/Amo450sg4Y4H1yaPKgXnA47oqjiZVAt4WHdZLKWcucuoXkWKp9eihuVVhBRO/jaehT9HHmdOnzm2GFbsasoeUKG8doQb+1Dd22hMKsIn3388HAyII7xdyu+Id2aEpHmMXzNtmmhsE/egXQyrB7mfuf7Q2QO92/XpNr05yPA/QqFlGAWZKusiZeHKtC5FyMG1OxU+E6vXnD2/2QI+VVJ6fXufg95MP+SCYn+N/J632OPZcYhER41Z42c983HfwaIkKjhXz1FUlLOkZ6qyBW6Rl+IELzGzLXgqEWNq5YJO/0LVGyaAlkxUm7XVNy3Qy6SIcOyaoxCislY+x/m3J+YG3VlOYtoQxVbICHjmvx4qboPo1kTfD1OK4FxxVOsbH65dZUqSY/xXYCAy4lf+zYHPEK2GN2sPnWqld4gIJBKEDCxUQzqkkMJ3gvp/R2/wh9D8nVJzYHIKP7xvZm05LmfZ7zpwQx5S1Iu3whSkm5F39ZH7i3u++7vHTxkaQKQi6YO + PGDATABASE: AgBrY8ATdR2DiUFEiAa+rX6Cw4/t0MqvO/VycipUnqf3aYDFNUZrfk+c8CCtsY17z+AFHAGz7w23qif8eu9TT2GiZgLBQB37Km94Xli+elqXOug4Smfpwu2m4RKX9lji7IXGnrz4YoIRWNd3lKSwp55jtZTqA664GKpzbEEGznFJai0ykLj0oS2mdg0n36o0vBh2gkBMu9jwj5fybkf+8Hq67/4xHy2RGwVBIKo+E00OvgCaMrtlgEcZuevaoJ+VYQqv+L6evsLJIAAUmZEt/uYmO7sNatl9jIG7yTgrfugsCjk6HgLhzSoNyHOJOybEoa/iRaBDLtDQiwhaq6PccyByHfWuhVwsN79ldYFoazMA1BgMwT1pJ5cXrpVrULiDQgKf2Q2igg4PRPPnd/JZNioWYFDoCGWDKPOEDZqNPOZFjs6P/+UU6pJ8Vga5aNM3Rfp18Tm1IdHVaAQEI9mk4B0oCwqLkBwqriE8DUW9eUmRQrSluQkxH0cpnIFfLy0wJZu7PNxcsgr09Myw/dsBFMFF9HTWqs6uQjuhXu/YnxRAfQF1uG1SWVsT5t4HxMqOmS8o6LDbeslnDNQZiyhEQAjZiyXStnvwldqh45RQCvQTf+YDdBpFmxwHn7ZFBDHvp2lXOXvscGU9eIniiHWM5uNUTKJ6X3n61bxfSLFh36G1pEfAtkuL/QvCD/F2DHbTxgZYSYtHR96ktw== + PGHOST: AgAPLxfKYcDA3lIC8ABx1g+MzI9xI8Wp7BY04FBth+3WV0GIpaCKIEfaE6t0wXdWUbj3X78YXmYbplCh6bMl4x1f5Zd6CC2hzLV9+PoYTzYsLxmiLYRzrNlbrcR/DQchU1o+ZqzMnNVjWTWLI0odBg0LTmRdz8r2XJEscl4yHQj3EytxmROPWYzSCU44DcP6jsr4ByFLnKr0Kux0bqDLcwpZQn5SW45E8JQ93c+ukg4+eL1cGQb/+v2D5uw/J9tQGkmBG68186HjPhg/RVF3Yu/Pq9WFC26+SV9vetkEL1cyDoUsMvLLht6kqt+CIv4/ENMdCrILNIgwLgH4TH+0afxrkF9i8bOA4+ai1lKwxNXzKlyJSJmUX1ip3RHzqXAIsSKp+rtb+iu3ET7H/IeLLA8DWeEE/2yYaDUT5gnYW8fxyK4q197IYA0jdkY8uIV2EJScIzpvJWYDNFE8fd11fy7aTC8JCSyy2ukH8pZuVUk+7W5XNpS1yM+VUOzh1pZyX3O9k8IkxzCV+TzbddasjvvbdaTMtznzaDjHDd71h1SJAdiiHiF1mAk5LfEzfpypi7If0vO1jP1jXsF0Tw+maifSPFQpxUG+7ofLDplTVmmfh1hYCspoiY9xHgnSQJaFKb4NsubnnT5FttQtGCs9e47AoXQmg0uy3GVIkrfKPN3R8HVlWy32V1Mzd2d6bSvwwUj7Mu9+TD5t4WYGLuGpU6N2MPlPlmPgFMOEOPMmW8OQuOTjCwrPgdTpecpUqlh5SD0M/g== + PGPASSWORD: AgBdcpbpKYqchJltAjYtmiAknb7m2YNMWteFrXK26ncr8NFzvdyCH4igNsunUoYZftz/u0uDDrg40f82cw1IVk1EMmfidexda7eEGDvpOVr77gbQ2K4TzkGF8lVxx9+P9pZ6Gg7E6jTPZ8cV0eIzcUv43Tp8XJn3iO7RMrSX4lqdCA6sRzho/UUoxPu2J2eJBEFhF3nYHi/aAWtW1MhXYWpx6siVipZa6IKJ8A96mo1747HqtBFUiCDIGBTomCVAtkwdh9nxMoJYIR7ip8KdvfdEqRkkNYGa/YNxhpPyq6UhSQI2JhYzXNyjHZMhWy77qwzcPPl9b6qCyLB7M4bX2H9wsLOjzMZ4htqOWumFrV65wwYBNX47aXIhJi15D70W3JMih0RjQ/uJzJEny7+sZBc+FKX/l+228JPEsqqkZtT1ne+lXYH9sHweUWJPs9QpJgh4gB4FNNMDYD82DR6QcLWud71cZF1zPUaKu29YgRsmYa8XtF0rYMqdsoz2+ZT+i9gAYyZSDRkY5XrLHItGFpZIigXxOBkzW/dYLvn04wfqTjwtM1394C2SrqsmjNAuEKxDi7/uVcFE8weqo48tJovcdz/0tzCFEnjbJ1L9SDbjPrLOHClwnCt+ZlPKGmOqmQwyCpXOUwnlFXo6NaMSHpCID7/07XvU0EdfhcJLhOwfcLWLlRPoCnj4Gf87xid1lS4yU8YP/Xjdc7iNL/zrq8jnsb5PLs6GgDHkZZy5Pu5z/RYvhnyX9BYB + PGSSLMODE: AgCViCoNfG8erw5w1QauVrErUQXeC9ofSoWpGTt+WIT8isghOoclvjUk8yJ6EVfxoTPxoz+8OSSbtIaVQTznUi/5sHNhXYUkzzqLzsE+kFFpcNxEaZ+yMMVeOQJmmGBPIql9Ss9rIEQ+O2ZzAOKYt2qF9j8lssAeQdmhPbmNi9ianJDFVxPtqe4ftlb+aoPaSzs1uPKg8LO/htf+kyKXAcURzUwAtxhuN1qCFk1tcAQ5DsXbrIuaWnwor07F5VWWPmEUJJZ8eEdvH3FOtcwSeXjwGE3Sq+V0y1sqfY2hFTFsvrkAxQnRuzHPixan+vkpqa57VRkMajUZcJDWweFJbbTKwexMtCddswmV5rHLMPCGyCMKaU2x5PeJpzIC/DOXWk5vg7AdH/cJp5u7g27XG1uSLJ8a5XJgW1xfo+Tz8XmeykK8aBnGlR6g4iSLYLvsyD/n+fXQYJi2RS+KBBb+BY9eDv07s90Em9IlMGagqpXGsis/tm3OO93PKuJbzY9tA5LFoSvmviVeiYfltiHWqSjXqt5VrNDwFojtNxxw1K6xqlhAowamLuPcY7UIKPyCHuPJ++QAiLK33rffpkdir1mwJiABldq35uI23bCCkBOwEY5sUUK+LtFCD1Aadk3dWBKY3i3wOuZliHeLK2n+yKZxLiHNVq/RZnomsQNiTLiOAX9zJ30fOTJN2iumYFAjM/lQbC5tB08R + PGUSER: AgArEFNe4qsmxRXh6y9lcpcn4USCCoKFKHOlDjYrDMi7/NZk2Z2GZlea04gBHqGtL2d0Fv/Z0trWGdXdeanJEwx/xKTkDTfXHp0Wyh1H2sHntLfWL6do5abJ8vZ/ZxZP/H4ym/GF3/Xmev57zqwwuO5u81OwgcHVaGWzKg4K0YnLCkBIdGd6C0FT6BlMfBp7np28V1wOt87ivr505veQr/EVlas6YyY7wzthI8jOVAypYhVadNqt5TQLYG3/ADjjhNRjZ5fti2PQ9KUkleXvPHGoIvkz7e/pMZ4eIz7asTdzrcsDoR+JT/jYCGQNZzuP8VgrCdkkyD8BmimMKpUJXpg2oQxmjGP9YJiogXfLS00BAJF/yaCazM128zkYubJrhyD1g9hPkOVVrmPBVE42slr3AsvETLUbCn976odGL/BCvt0dDqAHXJ+EZIQQdFSThaTqteZY+npmumBlo9hQRUCgWuAWHkClAAG+k5NsLyRisihuVJm7rf66ZubypIzuvsHCA3JizzR4IlvWXudb6xrk5yEDk8zaRqma4UzO31TZWpkUQwpdIKHXcrbmV4VQHCulvNy2/x8N+E48UroJhpn/xMM40oDK6PzbKpY5+ojNfYKliASslsvJ7XteaC0L3SKzS0rI8Vchr+Sdb42kAAKizEW+KmDGwnF+BVWN/wSFBuAtPyH8LwKNeUJ5FqCt0XmhpKfS/hb4wxVN8fCHLg3g5iw3gF5HEcc0of7Qpji7rckgqJh2ZxXWNg== template: metadata: annotations: @@ -20,3 +20,4 @@ spec: creationTimestamp: null name: azure-pg-admin-user type: Opaque + From 364a3018477c3ebdb146d71006521877b1322541 Mon Sep 17 00:00:00 2001 From: Julien Bouquillon Date: Tue, 28 Jul 2020 00:15:42 +0200 Subject: [PATCH 32/61] fix: FRONTEND_PORT --- .k8s/environments/dev/app.configmap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.k8s/environments/dev/app.configmap.yaml b/.k8s/environments/dev/app.configmap.yaml index 4c0c9c62..06c6d705 100644 --- a/.k8s/environments/dev/app.configmap.yaml +++ b/.k8s/environments/dev/app.configmap.yaml @@ -6,5 +6,5 @@ data: NODE_ENV: "production" GRAPHQL_ENDPOINT: "http://hasura/v1/graphql" ACCOUNT_MAIL_SENDER: "contact@fabrique.social.gouv.fr" - FRONTEND_PORT: "3000" + FRONTEND_PORT: "3030" PRODUCTION: "false" From ed606039668720d30f57340aeb449216c3016d5b Mon Sep 17 00:00:00 2001 From: Julien Bouquillon Date: Tue, 28 Jul 2020 00:48:54 +0200 Subject: [PATCH 33/61] fix: ACCOUNT_EMAIL_WEBHOOK_URL HASURA_GRAPHQL_JWT_SECRET --- .k8s/environments/dev/hasura.configmap.yaml | 2 +- .k8s/environments/dev/hasura.sealed-secret.yaml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.k8s/environments/dev/hasura.configmap.yaml b/.k8s/environments/dev/hasura.configmap.yaml index 023850ec..7180d034 100644 --- a/.k8s/environments/dev/hasura.configmap.yaml +++ b/.k8s/environments/dev/hasura.configmap.yaml @@ -3,7 +3,7 @@ apiVersion: v1 metadata: name: hasura-configmap data: - ACCOUNT_EMAIL_WEBHOOK_URL: "http://app:3000/api/webhooks/account" + ACCOUNT_EMAIL_WEBHOOK_URL: "http://app:80/api/webhooks/account" HASURA_GRAPHQL_ENABLE_CONSOLE: "true" HASURA_GRAPHQL_ENABLED_LOG_TYPES: "startup, http-log, webhook-log, websocket-log, query-log" HASURA_GRAPHQL_LOG_LEVEL: "debug" diff --git a/.k8s/environments/dev/hasura.sealed-secret.yaml b/.k8s/environments/dev/hasura.sealed-secret.yaml index e6bef772..1fadbf73 100644 --- a/.k8s/environments/dev/hasura.sealed-secret.yaml +++ b/.k8s/environments/dev/hasura.sealed-secret.yaml @@ -9,7 +9,7 @@ spec: encryptedData: ACCOUNT_EMAIL_SECRET: AgCYU5zQRAGub/7BY2VzhhQ/Y5EtYeWcgdBrHMfOdhK6DLDbkiYTVBvdIVbvUp/AtHP8V3UwT0zoQfKRiECwdH6oJ92GJ2DQ6svTNJH+x4EyQRJTeRMOrx6y+iVAcFx6I5RbT6SdKkpzGztpY4t4pGt3IOUoKNrJRqshj170LQqsw57NyxzSgZ0HONNsHE+HUK6AijgZXBthAfWqlFyrg6WIBY1f/jyuZ7jvzlotTI9JXXSBz8LryNYG7kth2weHcmlQKiqERPbWGFuGwM77hzgFwixjqnrGJEjWXDfsAmBLk+B9nVht2H54pPYCD+cyRea5NeisxnNCAOw10BJHEX1gxgNzSwQDVfOSINWT1a8R81tm7Dz7j3LyKKT+UH8BREHMlu4qv7+D6PjrRXJXtAMGN6Vsz0Hqvf6vlZou7O4ygcAtirRaSPvsuU1FOg2JvwfheUVZ7StBGhsTBWyQ0jw9UqAXcjtcbqfzeOc8sEEe/5xyRJctT+A4s4XNGxiF/Mnaa9XB5OHtz55FUDzy2o0S21JXFjnNs2kmDji3gjPwYJzg+qat7ZcGBNMR4KNvu2SiUoDdQMKzmh7mi4nwqlOv08eJVP8ZzXGS3F8QcsMFXPfrH/53hunKq6gQ61D3+CsCN6Hz89X7FgWnMroMv52gNwtUc0yeQ+klIB2RsY6+NefWx0p+ikxHY9MG64qMPtFNG+RW2TwRgcdbD6CC31GUVmGVLpEF95RF7v1i66H9EvNwiRZCagnZ4qYcrQ== HASURA_GRAPHQL_ADMIN_SECRET: AgCAqhKgc3PtqkQnkPeR0pAyh5bkICHiNpYkHBwRAhRCSo4kktC4p1/OJapMewk2glYBZHdUIad4JEn1V7/EvfMkWs7Eh7CXLYQB8xdJxbl7tyopNSppQxLA2YkMTPmnja5kGJrf2nvZNR1u7aQ7z5ZuP9KFzPsWTj/pFQiczsoyhNrKJmSeAUMRKophVfgKDdvNuM6ZEuSiR9iGhhrGJVD1gHlQaOW0JKCjweuC0opYdP/rlZOD6BvqzlaYc+dHVYbot7ktDzYT98YCIJdS0sKe0/6+L/CQgWeqAUxZxyPrtOk5BsBOXKNuXIrG9sQQ8SXSykubqYRGdClVv6TlazMXvBtuoind14bkJ1G4Are0FsokIPoJxrYAM1Nd4hKvRJvT3BiiEY2JdqRbmeHyZc+yCYUeUkvbtVIHFHGnSjVzAfriR6mLj4psmUGAtjq7qqaa6fJQb1fRr6pnb6//i6B6NjspyMHNi5uwLCn3Rvrqbq0abgtZCh1PUPZeqA/kAENyg3FunPzxiCdlHJnKch7lQDSkoQDukEGWipUnr9/ICfMuAMlu1uTHqjjGrsZoewqY00MHkPNyFiHVwYmEqY9INfmEH9G5UBLaWTorLyvleJUK60d8ZteFArZlskOs82gtcVhYGtE1TZ3VSn/sGKHdC53BlWJ5b65GKP8bn1xKmuu+ah3+NNWkgTydoKzTjHxOiX3FVeDHyVM9v3Xyv/6/Z8KCvRw9cgbmcX+PkTifzsT/10iGvP+aa/8+3tOmikLHHGpTyALG9YOZ4MPOHR5owd1xI0TUm++0+JgxYfeNny+Ybk0O0x/ikVx+gSDR7MKDD9sI2V6wX8cJKpl6hLFIxFV0EUCwHiWW0N5ZnXJarMMhMWzV+4YaD0c6ZxhDgizvIX6nOs0aEihvFBVBgZuiIiO3RW0fUDel0kcqzg== - HASURA_GRAPHQL_JWT_SECRET: AgAnThMc6uuayn1BR4rLy65IoFDsv8pzBpphbYxf36e4OJooSi9s2upWe8g3HpVfdb5SthH77uw+64Ks+Tvku1gHrUOOXh89F+RS1mLwBfNhe4Nlf55AosasYsUOjE5mWOd0Czdp723ujL9T1SoZNyGeGyG2ZPxR+clgBJIgX5fRMvfi76SSq5trUasItHflHp+io2leMD8QBB0jukLf8vmHHCZ36S1hwtISj7NMHtiv4bl2AQPj6KjyO2U0AB+Uf+Un21RwCRsXv4mDkKNZAGSMn67IkqLRK02TFJQRz4qn+WrX4DPkgNG+fELYHBK0CSi8orSN07Z0qY4y86IYbXRiqJDDKIXq6jNQ2V3Ffox8uNNPk8BJ4lrxz4Bn9r9/rTWRLS70Uzv+OXViJ2xcb4HxBZFSKucOVK4Gx8kFf5xoKd6LV6g6kbjtYQUR4FGQihvZYsDrr5qGv1rxHO7EkY4o9Hre2iHVQJ08imfDoXscfzeJC9lxo/e5M7LusDtIkzwkMkmsv8WXMlGjfg4JoYiQzVA8oMsmeWQLHNdJUdSkZF8tFc3skvgYEeMuDi89KRiuCOwnShrVLzPzYbWO+7dwnyay5NVvtvNE9kXYn5U4EwGExeLGWoRRrDCOUM9sgwAJF7AcDcQUQ+MWupWacW7YE+VjBMuDmJR+1Gx9qDXGUspG1DkDfKqLCxT1L2RoMlbIfubACEYYbZ5IiooqjwbHCMUzbr4aRNSM2C3KqN8wSlB18xVfrgVpWYqZFtXWjJAgvLbn5Pi6ryaBPy/adnlBpGf1S2EakV9uR6gdpsKR1yTmzNT7MCIiInzvq/KijQCiJwAyqIkpU+tQv+HInHxWZQ== + HASURA_GRAPHQL_JWT_SECRET: AgB0yHuBM57mDtyon+1dEC9PTgejHVGA5uOHbdu5P4tH6CuOgpH2cnbXnBaeD+7d52aCNto7a0qD5TN4MtwMQZbJuyXdH8QIsZSvvVmKK0Tf5dgYBnTqDKfJnaH/frlIyrFrZs9aj84uHpZPMw1jP6Rrn/gHLn6oNdvkJS668c5ALSvjJoNoqT2l+2TC0p4fNq9H/q0HaLkL+s5Jfkb9ZqPevo3sBQKJvGEEZmgld0U6S95hiGRVhEGqLR90ZbnYpKpHXk09fxva/UgRGGniK4yAJ7noeUsB2HZU8+X88I0TeX7vx0+WHAqV65eA14e2BegKI55JPeX8rXte/Iy0KRkyBQ8KtD5jkfTsmdeLMchdnmys7pu4CGiRXyAANT8uWzP0QifqfZhG6fHqZiMPhOa8XM2Z8KhFgtWH0m8IG/OUZCllWeRyAFTcupa5Jsq3jn+Y/0N2sgeALvBEmhGSN8jTAWa4cetoF//1kk67BaLFpLrc9P2nSGqd5HII7HGL1C8kCbV9Fmz/etX705sB9g9Sg0xFVhNqUvwYUOs9h51MQJLn64zO1Bd0q/U8LN3k71tqidJbsEc9P1JX90U6QbGu2FpQrPFAIz3Y0UnAiCfxyfVxwGvciwAQw5yIo8S2/XbB1wyGY/hWCYy0s4qOl11Dj1YpNwe7Xjbq7cnGfxp2BFC5Ps4O42jeSj7mhpUSyacLG6MavSdSPdrnOAMGKD7Gdz7jBd5/EBFhGmN8roCR+8H/Q5kbUlKfS5kEQR3Xkx8uNHqW8mr8ka7Fbn06vlmCDc09L9sXC6rJOXwIsZ6peqD7e1gPnotGfARHh5D07R3x6v491eS/FVCWao19XUHsaA== template: metadata: annotations: @@ -17,3 +17,4 @@ spec: creationTimestamp: null name: hasura-sealed-secret type: Opaque + From 80da3134082224409e8230370ad1dfc8a00b6075 Mon Sep 17 00:00:00 2001 From: Julien Bouquillon Date: Tue, 28 Jul 2020 00:56:08 +0200 Subject: [PATCH 34/61] fix: increase hasura probe delays --- .k8s/components/hasura.ts | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.k8s/components/hasura.ts b/.k8s/components/hasura.ts index e7dcc54d..d14cbe3c 100644 --- a/.k8s/components/hasura.ts +++ b/.k8s/components/hasura.ts @@ -16,6 +16,16 @@ const manifests = create("hasura", { cpu: "500m", memory: "256Mi", }, + livenessProbe: { + path: "/healthz", + initialDelaySeconds: 60, + periodSeconds: 20, + }, + readinessProbe: { + path: "/healthz", + initialDelaySeconds: 60, + periodSeconds: 20, + }, containerPort: 80, }, }); From 93de6a49d09c6d74367b8205a82c60b5aa8581d5 Mon Sep 17 00:00:00 2001 From: Julien Bouquillon Date: Tue, 28 Jul 2020 01:00:30 +0200 Subject: [PATCH 35/61] fix: increase hasura probe delays --- .k8s/components/hasura.ts | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.k8s/components/hasura.ts b/.k8s/components/hasura.ts index d14cbe3c..bfc46f82 100644 --- a/.k8s/components/hasura.ts +++ b/.k8s/components/hasura.ts @@ -17,12 +17,18 @@ const manifests = create("hasura", { memory: "256Mi", }, livenessProbe: { - path: "/healthz", + httpGet: { + path: "/healthz", + port: "http", + }, initialDelaySeconds: 60, periodSeconds: 20, }, readinessProbe: { - path: "/healthz", + httpGet: { + path: "/healthz", + port: "http", + }, initialDelaySeconds: 60, periodSeconds: 20, }, From 2cceb338320c54d6a6d80386cc1dca7dee869c25 Mon Sep 17 00:00:00 2001 From: Julien Bouquillon Date: Tue, 28 Jul 2020 01:11:37 +0200 Subject: [PATCH 36/61] fix: fix hasura secret --- .k8s/components/hasura.ts | 1 + .k8s/environments/dev/hasura.sealed-secret.yaml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.k8s/components/hasura.ts b/.k8s/components/hasura.ts index bfc46f82..be3dd874 100644 --- a/.k8s/components/hasura.ts +++ b/.k8s/components/hasura.ts @@ -3,6 +3,7 @@ import env from "@kosko/env"; import { create } from "@socialgouv/kosko-charts/components/app"; import { addPostgresUserSecret } from "@socialgouv/kosko-charts/utils/addPostgresUserSecret"; +// todo: extract to @socialgouv/kosko-charts/components/hasura const manifests = create("hasura", { env, config: { diff --git a/.k8s/environments/dev/hasura.sealed-secret.yaml b/.k8s/environments/dev/hasura.sealed-secret.yaml index 1fadbf73..ecfa8f4e 100644 --- a/.k8s/environments/dev/hasura.sealed-secret.yaml +++ b/.k8s/environments/dev/hasura.sealed-secret.yaml @@ -8,7 +8,7 @@ metadata: spec: encryptedData: ACCOUNT_EMAIL_SECRET: AgCYU5zQRAGub/7BY2VzhhQ/Y5EtYeWcgdBrHMfOdhK6DLDbkiYTVBvdIVbvUp/AtHP8V3UwT0zoQfKRiECwdH6oJ92GJ2DQ6svTNJH+x4EyQRJTeRMOrx6y+iVAcFx6I5RbT6SdKkpzGztpY4t4pGt3IOUoKNrJRqshj170LQqsw57NyxzSgZ0HONNsHE+HUK6AijgZXBthAfWqlFyrg6WIBY1f/jyuZ7jvzlotTI9JXXSBz8LryNYG7kth2weHcmlQKiqERPbWGFuGwM77hzgFwixjqnrGJEjWXDfsAmBLk+B9nVht2H54pPYCD+cyRea5NeisxnNCAOw10BJHEX1gxgNzSwQDVfOSINWT1a8R81tm7Dz7j3LyKKT+UH8BREHMlu4qv7+D6PjrRXJXtAMGN6Vsz0Hqvf6vlZou7O4ygcAtirRaSPvsuU1FOg2JvwfheUVZ7StBGhsTBWyQ0jw9UqAXcjtcbqfzeOc8sEEe/5xyRJctT+A4s4XNGxiF/Mnaa9XB5OHtz55FUDzy2o0S21JXFjnNs2kmDji3gjPwYJzg+qat7ZcGBNMR4KNvu2SiUoDdQMKzmh7mi4nwqlOv08eJVP8ZzXGS3F8QcsMFXPfrH/53hunKq6gQ61D3+CsCN6Hz89X7FgWnMroMv52gNwtUc0yeQ+klIB2RsY6+NefWx0p+ikxHY9MG64qMPtFNG+RW2TwRgcdbD6CC31GUVmGVLpEF95RF7v1i66H9EvNwiRZCagnZ4qYcrQ== - HASURA_GRAPHQL_ADMIN_SECRET: AgCAqhKgc3PtqkQnkPeR0pAyh5bkICHiNpYkHBwRAhRCSo4kktC4p1/OJapMewk2glYBZHdUIad4JEn1V7/EvfMkWs7Eh7CXLYQB8xdJxbl7tyopNSppQxLA2YkMTPmnja5kGJrf2nvZNR1u7aQ7z5ZuP9KFzPsWTj/pFQiczsoyhNrKJmSeAUMRKophVfgKDdvNuM6ZEuSiR9iGhhrGJVD1gHlQaOW0JKCjweuC0opYdP/rlZOD6BvqzlaYc+dHVYbot7ktDzYT98YCIJdS0sKe0/6+L/CQgWeqAUxZxyPrtOk5BsBOXKNuXIrG9sQQ8SXSykubqYRGdClVv6TlazMXvBtuoind14bkJ1G4Are0FsokIPoJxrYAM1Nd4hKvRJvT3BiiEY2JdqRbmeHyZc+yCYUeUkvbtVIHFHGnSjVzAfriR6mLj4psmUGAtjq7qqaa6fJQb1fRr6pnb6//i6B6NjspyMHNi5uwLCn3Rvrqbq0abgtZCh1PUPZeqA/kAENyg3FunPzxiCdlHJnKch7lQDSkoQDukEGWipUnr9/ICfMuAMlu1uTHqjjGrsZoewqY00MHkPNyFiHVwYmEqY9INfmEH9G5UBLaWTorLyvleJUK60d8ZteFArZlskOs82gtcVhYGtE1TZ3VSn/sGKHdC53BlWJ5b65GKP8bn1xKmuu+ah3+NNWkgTydoKzTjHxOiX3FVeDHyVM9v3Xyv/6/Z8KCvRw9cgbmcX+PkTifzsT/10iGvP+aa/8+3tOmikLHHGpTyALG9YOZ4MPOHR5owd1xI0TUm++0+JgxYfeNny+Ybk0O0x/ikVx+gSDR7MKDD9sI2V6wX8cJKpl6hLFIxFV0EUCwHiWW0N5ZnXJarMMhMWzV+4YaD0c6ZxhDgizvIX6nOs0aEihvFBVBgZuiIiO3RW0fUDel0kcqzg== + HASURA_GRAPHQL_ADMIN_SECRET: AgDZX0nGJWSkGYaaTpArKf3L1jsBEzKzsE1qkDIziGJHgVuqdPUhvZwmd6/9yPtkw7ohLh4/yqpQFELURajvHPJy4ZBok5bRhX4eC2tbsEQ+20YmL86KGNUhGSdJ9Ua3m/jV5qEyFnLPBG4cPJL4OjEDNvm/WwJvQfTlXaV4YoZMzlZmPMLFKAQ/8jKoefaIjtTXPq3YSeULlEx94Pv08C5b6o0US4fQwhtBAUOlUmhPEDXo0u4r4yM5w7HGWSCD4Dsb+rHlcRi7ulCCafeaBLITq3BMhzS1eO5XNrLGzh4iDh4rTtv83Y8kFFvb/zXlq/uiPZMoTxaH5eTqYQkCRA3L/2T7hWWiINDB9kbNTIyIZ2uF0W1RLnwgq2VASruNEhxXHYKeQfnhxcqTxGAsTgJgAGhMm17vALEAHt+72L4O822WJw39TB9ozqbnZ0I++ZAmd+kIrZ3Uxp7WfzmM7bKzdqn8L2k0jxHCOKWxChXayONqTFUq9YfJdqSHtNnfi5Bt610SjmD62Vil1hmxIhQv6xmzRwo2pfbhrUj6gNsNdDTrV5fxfZzEOtvwl6C+bPuHmD+qbke78eiJp8A4WIgn1CayHsSoaokH36Q1IW+ETuyQHhz8RMd8ZmrGAeSWUm71SR0nKCWgCwtRX4NhBR5fGR8M7CLTJm3ofrv1fyZ8WKPC7OcnhHmKYBeaw6qku9K+0qRCuvIp/6/dd28SC1obdir77d924ZTkFxUVIAu9J0u0AOEu6UZS HASURA_GRAPHQL_JWT_SECRET: AgB0yHuBM57mDtyon+1dEC9PTgejHVGA5uOHbdu5P4tH6CuOgpH2cnbXnBaeD+7d52aCNto7a0qD5TN4MtwMQZbJuyXdH8QIsZSvvVmKK0Tf5dgYBnTqDKfJnaH/frlIyrFrZs9aj84uHpZPMw1jP6Rrn/gHLn6oNdvkJS668c5ALSvjJoNoqT2l+2TC0p4fNq9H/q0HaLkL+s5Jfkb9ZqPevo3sBQKJvGEEZmgld0U6S95hiGRVhEGqLR90ZbnYpKpHXk09fxva/UgRGGniK4yAJ7noeUsB2HZU8+X88I0TeX7vx0+WHAqV65eA14e2BegKI55JPeX8rXte/Iy0KRkyBQ8KtD5jkfTsmdeLMchdnmys7pu4CGiRXyAANT8uWzP0QifqfZhG6fHqZiMPhOa8XM2Z8KhFgtWH0m8IG/OUZCllWeRyAFTcupa5Jsq3jn+Y/0N2sgeALvBEmhGSN8jTAWa4cetoF//1kk67BaLFpLrc9P2nSGqd5HII7HGL1C8kCbV9Fmz/etX705sB9g9Sg0xFVhNqUvwYUOs9h51MQJLn64zO1Bd0q/U8LN3k71tqidJbsEc9P1JX90U6QbGu2FpQrPFAIz3Y0UnAiCfxyfVxwGvciwAQw5yIo8S2/XbB1wyGY/hWCYy0s4qOl11Dj1YpNwe7Xjbq7cnGfxp2BFC5Ps4O42jeSj7mhpUSyacLG6MavSdSPdrnOAMGKD7Gdz7jBd5/EBFhGmN8roCR+8H/Q5kbUlKfS5kEQR3Xkx8uNHqW8mr8ka7Fbn06vlmCDc09L9sXC6rJOXwIsZ6peqD7e1gPnotGfARHh5D07R3x6v491eS/FVCWao19XUHsaA== template: metadata: From e8483cf7119c40c5a18e3124ec39e831926cf725 Mon Sep 17 00:00:00 2001 From: Julien Bouquillon Date: Tue, 28 Jul 2020 01:25:51 +0200 Subject: [PATCH 37/61] fix: up @socialgouv/kosko-charts:v2.0.0-alpha.14 --- .k8s/package.json | 2 +- .k8s/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.k8s/package.json b/.k8s/package.json index ace9b404..d71b7916 100644 --- a/.k8s/package.json +++ b/.k8s/package.json @@ -11,7 +11,7 @@ }, "dependencies": { "@kosko/env": "^0.5.2", - "@socialgouv/kosko-charts": "v2.0.0-alpha.13", + "@socialgouv/kosko-charts": "v2.0.0-alpha.14", "kubernetes-models": "^0.8.0", "toml": "^3.0.0" }, diff --git a/.k8s/yarn.lock b/.k8s/yarn.lock index 15e06da4..27dbe407 100644 --- a/.k8s/yarn.lock +++ b/.k8s/yarn.lock @@ -149,10 +149,10 @@ resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-3.1.0.tgz#d8735532635bea69ad39119df5f0f10099bd09dc" integrity sha512-n4J+zu52VdY43kdi/XdI9DzuMr1Mur8zFL5ZRG2opCans9aiFwkPxHYFEb5Xgy7n1Z4K6WfI4FpqUqsh3E8BPQ== -"@socialgouv/kosko-charts@v2.0.0-alpha.13": - version "2.0.0-alpha.13" - resolved "https://registry.yarnpkg.com/@socialgouv/kosko-charts/-/kosko-charts-2.0.0-alpha.13.tgz#e2a43dc24a84c89fd747d424844c083815fbb383" - integrity sha512-aQTGBoMma5rfMsSOmkD0s2zjWZerqc9vk+HAuSQidHNVPCsqfXYK5qqqtEPnWobSgMvpaqSHlzZOo6la3MAo7A== +"@socialgouv/kosko-charts@v2.0.0-alpha.14": + version "2.0.0-alpha.14" + resolved "https://registry.yarnpkg.com/@socialgouv/kosko-charts/-/kosko-charts-2.0.0-alpha.14.tgz#5c24c7298f8baeb58db78d861c3be4b723b0a5c0" + integrity sha512-ov4ExLfV8c78M1K9UwClpCy4FOI5KrWW9RoRCy2n8Vgy0eu0zcG+bCq1f3XxFhkp6xreKlnte76tsdJDD6NOrA== dependencies: "@kubernetes-models/sealed-secrets" "^0.1.4" "@sindresorhus/is" "^3.0.0" From ccdc9e964481cd24461a5d9013c4161842aa3024 Mon Sep 17 00:00:00 2001 From: Julien Bouquillon Date: Tue, 28 Jul 2020 01:38:35 +0200 Subject: [PATCH 38/61] WORKIN From 56c76f1efae2742aecbea334695d43b9843ae3be Mon Sep 17 00:00:00 2001 From: Julien Bouquillon Date: Tue, 28 Jul 2020 02:05:58 +0200 Subject: [PATCH 39/61] fix: up @socialgouv/kosko-charts:v2.0.0-alpha.15 --- .k8s/components/hasura.ts | 39 +-------------------------------------- .k8s/package.json | 2 +- .k8s/yarn.lock | 8 ++++---- 3 files changed, 6 insertions(+), 43 deletions(-) diff --git a/.k8s/components/hasura.ts b/.k8s/components/hasura.ts index be3dd874..ec8d8433 100644 --- a/.k8s/components/hasura.ts +++ b/.k8s/components/hasura.ts @@ -1,47 +1,10 @@ import env from "@kosko/env"; -import { create } from "@socialgouv/kosko-charts/components/app"; -import { addPostgresUserSecret } from "@socialgouv/kosko-charts/utils/addPostgresUserSecret"; +import { create } from "@socialgouv/kosko-charts/components/hasura"; // todo: extract to @socialgouv/kosko-charts/components/hasura const manifests = create("hasura", { env, - config: { - //ingress: false, - subdomain: `hasura-${process.env.CI_PROJECT_NAME as string}`, - requests: { - cpu: "100m", - memory: "64Mi", - }, - limits: { - cpu: "500m", - memory: "256Mi", - }, - livenessProbe: { - httpGet: { - path: "/healthz", - port: "http", - }, - initialDelaySeconds: 60, - periodSeconds: 20, - }, - readinessProbe: { - httpGet: { - path: "/healthz", - port: "http", - }, - initialDelaySeconds: 60, - periodSeconds: 20, - }, - containerPort: 80, - }, }); -// DEV: add secret to access DB -//@ts-expect-error -const deployment = manifests.find((manifest) => manifest.kind === "Deployment"); -addPostgresUserSecret(deployment); - -// - export default manifests; diff --git a/.k8s/package.json b/.k8s/package.json index d71b7916..4c05a5f8 100644 --- a/.k8s/package.json +++ b/.k8s/package.json @@ -11,7 +11,7 @@ }, "dependencies": { "@kosko/env": "^0.5.2", - "@socialgouv/kosko-charts": "v2.0.0-alpha.14", + "@socialgouv/kosko-charts": "v2.0.0-alpha.15", "kubernetes-models": "^0.8.0", "toml": "^3.0.0" }, diff --git a/.k8s/yarn.lock b/.k8s/yarn.lock index 27dbe407..0a428da8 100644 --- a/.k8s/yarn.lock +++ b/.k8s/yarn.lock @@ -149,10 +149,10 @@ resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-3.1.0.tgz#d8735532635bea69ad39119df5f0f10099bd09dc" integrity sha512-n4J+zu52VdY43kdi/XdI9DzuMr1Mur8zFL5ZRG2opCans9aiFwkPxHYFEb5Xgy7n1Z4K6WfI4FpqUqsh3E8BPQ== -"@socialgouv/kosko-charts@v2.0.0-alpha.14": - version "2.0.0-alpha.14" - resolved "https://registry.yarnpkg.com/@socialgouv/kosko-charts/-/kosko-charts-2.0.0-alpha.14.tgz#5c24c7298f8baeb58db78d861c3be4b723b0a5c0" - integrity sha512-ov4ExLfV8c78M1K9UwClpCy4FOI5KrWW9RoRCy2n8Vgy0eu0zcG+bCq1f3XxFhkp6xreKlnte76tsdJDD6NOrA== +"@socialgouv/kosko-charts@v2.0.0-alpha.15": + version "2.0.0-alpha.15" + resolved "https://registry.yarnpkg.com/@socialgouv/kosko-charts/-/kosko-charts-2.0.0-alpha.15.tgz#b8bed6ee9ef666f66bfd908f32870fbe2d787aa1" + integrity sha512-rsOC+8xptOROFlg4jxL507RgZ8U1D4G2mv8UhF2mjFx3NCM/RHZeCtElkFN3cQZQyeQgAIq1BodJ3NdaKYqc2A== dependencies: "@kubernetes-models/sealed-secrets" "^0.1.4" "@sindresorhus/is" "^3.0.0" From 98976d4b4bb61aaf6a7a53fe51155fafcc770a45 Mon Sep 17 00:00:00 2001 From: Julien Bouquillon Date: Tue, 28 Jul 2020 02:28:48 +0200 Subject: [PATCH 40/61] fix: use components/hasura --- .k8s/components/hasura.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.k8s/components/hasura.ts b/.k8s/components/hasura.ts index ec8d8433..19a21c2e 100644 --- a/.k8s/components/hasura.ts +++ b/.k8s/components/hasura.ts @@ -3,8 +3,9 @@ import env from "@kosko/env"; import { create } from "@socialgouv/kosko-charts/components/hasura"; // todo: extract to @socialgouv/kosko-charts/components/hasura -const manifests = create("hasura", { +const manifests = create({ env, + config: {}, }); export default manifests; From 83c6caabb708a8b7d318668d357e1ca794dc23dc Mon Sep 17 00:00:00 2001 From: Julien Bouquillon Date: Tue, 28 Jul 2020 03:09:16 +0200 Subject: [PATCH 41/61] fix: up @socialgouv/kosko-charts:v2.0.0-alpha.16 --- .k8s/package.json | 2 +- .k8s/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.k8s/package.json b/.k8s/package.json index 4c05a5f8..f9eb89ae 100644 --- a/.k8s/package.json +++ b/.k8s/package.json @@ -11,7 +11,7 @@ }, "dependencies": { "@kosko/env": "^0.5.2", - "@socialgouv/kosko-charts": "v2.0.0-alpha.15", + "@socialgouv/kosko-charts": "v2.0.0-alpha.16", "kubernetes-models": "^0.8.0", "toml": "^3.0.0" }, diff --git a/.k8s/yarn.lock b/.k8s/yarn.lock index 0a428da8..7001b5c9 100644 --- a/.k8s/yarn.lock +++ b/.k8s/yarn.lock @@ -149,10 +149,10 @@ resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-3.1.0.tgz#d8735532635bea69ad39119df5f0f10099bd09dc" integrity sha512-n4J+zu52VdY43kdi/XdI9DzuMr1Mur8zFL5ZRG2opCans9aiFwkPxHYFEb5Xgy7n1Z4K6WfI4FpqUqsh3E8BPQ== -"@socialgouv/kosko-charts@v2.0.0-alpha.15": - version "2.0.0-alpha.15" - resolved "https://registry.yarnpkg.com/@socialgouv/kosko-charts/-/kosko-charts-2.0.0-alpha.15.tgz#b8bed6ee9ef666f66bfd908f32870fbe2d787aa1" - integrity sha512-rsOC+8xptOROFlg4jxL507RgZ8U1D4G2mv8UhF2mjFx3NCM/RHZeCtElkFN3cQZQyeQgAIq1BodJ3NdaKYqc2A== +"@socialgouv/kosko-charts@v2.0.0-alpha.16": + version "2.0.0-alpha.16" + resolved "https://registry.yarnpkg.com/@socialgouv/kosko-charts/-/kosko-charts-2.0.0-alpha.16.tgz#e33ac763ccb68ac8131376d2d6e0e164b444a5f7" + integrity sha512-40TF8hlKvRxhpFMmX83LPe1yWnbGZAA+awz5rAElZx4ccmF9iZZaSXmWVFXJEA4ozPUbK8NeUeiVmX1qeKN8Eg== dependencies: "@kubernetes-models/sealed-secrets" "^0.1.4" "@sindresorhus/is" "^3.0.0" From c261d8e08bfc7b6929512be80624d2c9f630ecf7 Mon Sep 17 00:00:00 2001 From: Julien Bouquillon Date: Tue, 28 Jul 2020 03:21:11 +0200 Subject: [PATCH 42/61] fix: move pgweb and azure-pg to dev only --- .k8s/components/{azure-pg.ts => _azure-pg.ts} | 0 .k8s/components/{pgweb.ts => _pgweb.ts} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename .k8s/components/{azure-pg.ts => _azure-pg.ts} (100%) rename .k8s/components/{pgweb.ts => _pgweb.ts} (100%) diff --git a/.k8s/components/azure-pg.ts b/.k8s/components/_azure-pg.ts similarity index 100% rename from .k8s/components/azure-pg.ts rename to .k8s/components/_azure-pg.ts diff --git a/.k8s/components/pgweb.ts b/.k8s/components/_pgweb.ts similarity index 100% rename from .k8s/components/pgweb.ts rename to .k8s/components/_pgweb.ts From f5096bb7808a17c32da66f164655abf66bae0e5d Mon Sep 17 00:00:00 2001 From: Julien Bouquillon Date: Tue, 28 Jul 2020 03:21:52 +0200 Subject: [PATCH 43/61] fix: up @socialgouv/kosko-charts:v2.0.0-alpha.17 --- .k8s/package.json | 2 +- .k8s/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.k8s/package.json b/.k8s/package.json index f9eb89ae..0d541b7d 100644 --- a/.k8s/package.json +++ b/.k8s/package.json @@ -11,7 +11,7 @@ }, "dependencies": { "@kosko/env": "^0.5.2", - "@socialgouv/kosko-charts": "v2.0.0-alpha.16", + "@socialgouv/kosko-charts": "v2.0.0-alpha.17", "kubernetes-models": "^0.8.0", "toml": "^3.0.0" }, diff --git a/.k8s/yarn.lock b/.k8s/yarn.lock index 7001b5c9..7a78323d 100644 --- a/.k8s/yarn.lock +++ b/.k8s/yarn.lock @@ -149,10 +149,10 @@ resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-3.1.0.tgz#d8735532635bea69ad39119df5f0f10099bd09dc" integrity sha512-n4J+zu52VdY43kdi/XdI9DzuMr1Mur8zFL5ZRG2opCans9aiFwkPxHYFEb5Xgy7n1Z4K6WfI4FpqUqsh3E8BPQ== -"@socialgouv/kosko-charts@v2.0.0-alpha.16": - version "2.0.0-alpha.16" - resolved "https://registry.yarnpkg.com/@socialgouv/kosko-charts/-/kosko-charts-2.0.0-alpha.16.tgz#e33ac763ccb68ac8131376d2d6e0e164b444a5f7" - integrity sha512-40TF8hlKvRxhpFMmX83LPe1yWnbGZAA+awz5rAElZx4ccmF9iZZaSXmWVFXJEA4ozPUbK8NeUeiVmX1qeKN8Eg== +"@socialgouv/kosko-charts@v2.0.0-alpha.17": + version "2.0.0-alpha.17" + resolved "https://registry.yarnpkg.com/@socialgouv/kosko-charts/-/kosko-charts-2.0.0-alpha.17.tgz#7d2c07f73f1a847bf002b331dac3c6d6c58c8d5e" + integrity sha512-54gff2grmYfAEOJd3mmcOhlXqMU+SCcg1mfvQgmHE/KRxzOraYaqL29NgSXFBxjliwS35bxdVGOROMbZZrucnw== dependencies: "@kubernetes-models/sealed-secrets" "^0.1.4" "@sindresorhus/is" "^3.0.0" From 7e0cdfd0d66d0223377d298802df63cfe3dcdff8 Mon Sep 17 00:00:00 2001 From: Julien Bouquillon Date: Tue, 28 Jul 2020 03:37:57 +0200 Subject: [PATCH 44/61] fix: up @socialgouv/kosko-charts:v2.0.0-alpha.18 --- .k8s/package.json | 2 +- .k8s/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.k8s/package.json b/.k8s/package.json index 0d541b7d..138913b2 100644 --- a/.k8s/package.json +++ b/.k8s/package.json @@ -11,7 +11,7 @@ }, "dependencies": { "@kosko/env": "^0.5.2", - "@socialgouv/kosko-charts": "v2.0.0-alpha.17", + "@socialgouv/kosko-charts": "v2.0.0-alpha.18", "kubernetes-models": "^0.8.0", "toml": "^3.0.0" }, diff --git a/.k8s/yarn.lock b/.k8s/yarn.lock index 7a78323d..a9f5c64a 100644 --- a/.k8s/yarn.lock +++ b/.k8s/yarn.lock @@ -149,10 +149,10 @@ resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-3.1.0.tgz#d8735532635bea69ad39119df5f0f10099bd09dc" integrity sha512-n4J+zu52VdY43kdi/XdI9DzuMr1Mur8zFL5ZRG2opCans9aiFwkPxHYFEb5Xgy7n1Z4K6WfI4FpqUqsh3E8BPQ== -"@socialgouv/kosko-charts@v2.0.0-alpha.17": - version "2.0.0-alpha.17" - resolved "https://registry.yarnpkg.com/@socialgouv/kosko-charts/-/kosko-charts-2.0.0-alpha.17.tgz#7d2c07f73f1a847bf002b331dac3c6d6c58c8d5e" - integrity sha512-54gff2grmYfAEOJd3mmcOhlXqMU+SCcg1mfvQgmHE/KRxzOraYaqL29NgSXFBxjliwS35bxdVGOROMbZZrucnw== +"@socialgouv/kosko-charts@v2.0.0-alpha.18": + version "2.0.0-alpha.18" + resolved "https://registry.yarnpkg.com/@socialgouv/kosko-charts/-/kosko-charts-2.0.0-alpha.18.tgz#0f1f6c2dc0a08d7b603a5c1ef2bcb92886e4ea15" + integrity sha512-BnWN7hc3FSwm1Xav8mN9DkmbcCr8z3T4OmjZlPgOYx2c0zuDVlkuMhh8tsN+qqBHkQBhtev2dAvY9KDUUu7cYg== dependencies: "@kubernetes-models/sealed-secrets" "^0.1.4" "@sindresorhus/is" "^3.0.0" From 8224bb88b0f7150a4ef3fbea38ad77648a30e3f7 Mon Sep 17 00:00:00 2001 From: Julien Bouquillon Date: Wed, 29 Jul 2020 11:10:09 +0200 Subject: [PATCH 45/61] upgrade kosko-charts --- .k8s/components/_pgweb.ts | 31 +++++++++++++++++-------------- .k8s/components/app.ts | 21 +++++++++++++-------- .k8s/package.json | 2 +- .k8s/yarn.lock | 8 ++++---- 4 files changed, 35 insertions(+), 27 deletions(-) diff --git a/.k8s/components/_pgweb.ts b/.k8s/components/_pgweb.ts index 4a442f4c..a0be5261 100644 --- a/.k8s/components/_pgweb.ts +++ b/.k8s/components/_pgweb.ts @@ -8,28 +8,31 @@ const manifests = create("pgweb", { config: { image: "sosedoff/pgweb:latest", subdomain: `pgweb-${process.env.CI_PROJECT_NAME as string}`, - livenessProbe: { - httpGet: { - path: "/", - port: "http", + }, + deployment: { + container: { + livenessProbe: { + httpGet: { + path: "/", + port: "http", + }, + initialDelaySeconds: 5, + timeoutSeconds: 3, }, - initialDelaySeconds: 5, - timeoutSeconds: 3, - }, - readinessProbe: { - httpGet: { - path: "/", - port: "http", + readinessProbe: { + httpGet: { + path: "/", + port: "http", + }, + initialDelaySeconds: 5, + timeoutSeconds: 3, }, - initialDelaySeconds: 5, - timeoutSeconds: 3, }, containerPort: 8081, }, }); // DEV: add secret to access DB -//@ts-expect-error const deployment = manifests.find((manifest) => manifest.kind === "Deployment"); addPostgresUserSecret(deployment); diff --git a/.k8s/components/app.ts b/.k8s/components/app.ts index c4a4e395..300eae58 100644 --- a/.k8s/components/app.ts +++ b/.k8s/components/app.ts @@ -4,14 +4,19 @@ import { create } from "@socialgouv/kosko-charts/components/app"; const manifests = create("app", { env, - config: { - requests: { - cpu: "1m", - memory: "64Mi", - }, - limits: { - cpu: "50m", - memory: "128Mi", + config: {}, + deployment: { + container: { + resources: { + requests: { + cpu: "1m", + memory: "64Mi", + }, + limits: { + cpu: "50m", + memory: "128Mi", + }, + }, }, containerPort: 3030, }, diff --git a/.k8s/package.json b/.k8s/package.json index 138913b2..8f65739f 100644 --- a/.k8s/package.json +++ b/.k8s/package.json @@ -11,7 +11,7 @@ }, "dependencies": { "@kosko/env": "^0.5.2", - "@socialgouv/kosko-charts": "v2.0.0-alpha.18", + "@socialgouv/kosko-charts": "v2.0.0-alpha.19", "kubernetes-models": "^0.8.0", "toml": "^3.0.0" }, diff --git a/.k8s/yarn.lock b/.k8s/yarn.lock index a9f5c64a..df95efc5 100644 --- a/.k8s/yarn.lock +++ b/.k8s/yarn.lock @@ -149,10 +149,10 @@ resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-3.1.0.tgz#d8735532635bea69ad39119df5f0f10099bd09dc" integrity sha512-n4J+zu52VdY43kdi/XdI9DzuMr1Mur8zFL5ZRG2opCans9aiFwkPxHYFEb5Xgy7n1Z4K6WfI4FpqUqsh3E8BPQ== -"@socialgouv/kosko-charts@v2.0.0-alpha.18": - version "2.0.0-alpha.18" - resolved "https://registry.yarnpkg.com/@socialgouv/kosko-charts/-/kosko-charts-2.0.0-alpha.18.tgz#0f1f6c2dc0a08d7b603a5c1ef2bcb92886e4ea15" - integrity sha512-BnWN7hc3FSwm1Xav8mN9DkmbcCr8z3T4OmjZlPgOYx2c0zuDVlkuMhh8tsN+qqBHkQBhtev2dAvY9KDUUu7cYg== +"@socialgouv/kosko-charts@v2.0.0-alpha.19": + version "2.0.0-alpha.19" + resolved "https://registry.yarnpkg.com/@socialgouv/kosko-charts/-/kosko-charts-2.0.0-alpha.19.tgz#5474af37b206bf65f4fbe58513b767366c1074c7" + integrity sha512-dMaXP7ihrnFEIuwCDhUMHEoM/Yd+nMmyslGPc85SjQU/VPQvY4yE/DT1IHw6vwvj3UKPYOJkBADuLvPtVaaN/A== dependencies: "@kubernetes-models/sealed-secrets" "^0.1.4" "@sindresorhus/is" "^3.0.0" From 63ddc7655f6897e0813d5822910dd0a9643a4668 Mon Sep 17 00:00:00 2001 From: Julien Bouquillon Date: Wed, 29 Jul 2020 11:27:12 +0200 Subject: [PATCH 46/61] upgrade kosko-charts --- .k8s/package.json | 2 +- .k8s/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.k8s/package.json b/.k8s/package.json index 8f65739f..cd8c89d3 100644 --- a/.k8s/package.json +++ b/.k8s/package.json @@ -11,7 +11,7 @@ }, "dependencies": { "@kosko/env": "^0.5.2", - "@socialgouv/kosko-charts": "v2.0.0-alpha.19", + "@socialgouv/kosko-charts": "v2.0.0-alpha.20", "kubernetes-models": "^0.8.0", "toml": "^3.0.0" }, diff --git a/.k8s/yarn.lock b/.k8s/yarn.lock index df95efc5..946784d9 100644 --- a/.k8s/yarn.lock +++ b/.k8s/yarn.lock @@ -149,10 +149,10 @@ resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-3.1.0.tgz#d8735532635bea69ad39119df5f0f10099bd09dc" integrity sha512-n4J+zu52VdY43kdi/XdI9DzuMr1Mur8zFL5ZRG2opCans9aiFwkPxHYFEb5Xgy7n1Z4K6WfI4FpqUqsh3E8BPQ== -"@socialgouv/kosko-charts@v2.0.0-alpha.19": - version "2.0.0-alpha.19" - resolved "https://registry.yarnpkg.com/@socialgouv/kosko-charts/-/kosko-charts-2.0.0-alpha.19.tgz#5474af37b206bf65f4fbe58513b767366c1074c7" - integrity sha512-dMaXP7ihrnFEIuwCDhUMHEoM/Yd+nMmyslGPc85SjQU/VPQvY4yE/DT1IHw6vwvj3UKPYOJkBADuLvPtVaaN/A== +"@socialgouv/kosko-charts@v2.0.0-alpha.20": + version "2.0.0-alpha.20" + resolved "https://registry.yarnpkg.com/@socialgouv/kosko-charts/-/kosko-charts-2.0.0-alpha.20.tgz#4b9649cb0bd28e751b8aef9be4c2a0f2055bea3a" + integrity sha512-zduri6HC9CMg7e/sUARjwxCWRMeBstzJ4OEN/GQAQLU5+G3L5zJZhPDOVQDo21Z4fjVM/PBxLUE2RtxpovBuhg== dependencies: "@kubernetes-models/sealed-secrets" "^0.1.4" "@sindresorhus/is" "^3.0.0" From b9f7d22ad2aa52b4ead64500a6a675e9d7659c41 Mon Sep 17 00:00:00 2001 From: Douglas Duteil Date: Wed, 29 Jul 2020 12:50:20 +0200 Subject: [PATCH 47/61] build(k8s): add typing help --- .k8s/environments/prod/app.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.k8s/environments/prod/app.ts b/.k8s/environments/prod/app.ts index 9d308743..7d4e5d70 100644 --- a/.k8s/environments/prod/app.ts +++ b/.k8s/environments/prod/app.ts @@ -1,3 +1,5 @@ +import { AppConfig } from "@socialgouv/kosko-charts/components/app"; + export default { - subdomain: `beta-${process.env.CI_PROJECT_NAME as string}`, -}; + subdomain: `beta-${process.env.CI_PROJECT_NAME}`, +} as Partial; From 8733a231850909fe5777a4b59978852254211a80 Mon Sep 17 00:00:00 2001 From: Douglas Duteil Date: Wed, 29 Jul 2020 12:57:26 +0200 Subject: [PATCH 48/61] fix(k8s): update @socialgouv/kosko-charts to 2.0.0-alpha.23 --- .k8s/components/_pgweb.ts | 2 +- .k8s/components/app.ts | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.k8s/components/_pgweb.ts b/.k8s/components/_pgweb.ts index a0be5261..da22942f 100644 --- a/.k8s/components/_pgweb.ts +++ b/.k8s/components/_pgweb.ts @@ -8,6 +8,7 @@ const manifests = create("pgweb", { config: { image: "sosedoff/pgweb:latest", subdomain: `pgweb-${process.env.CI_PROJECT_NAME as string}`, + containerPort: 8081, }, deployment: { container: { @@ -28,7 +29,6 @@ const manifests = create("pgweb", { timeoutSeconds: 3, }, }, - containerPort: 8081, }, }); diff --git a/.k8s/components/app.ts b/.k8s/components/app.ts index 300eae58..a4f7c994 100644 --- a/.k8s/components/app.ts +++ b/.k8s/components/app.ts @@ -4,7 +4,9 @@ import { create } from "@socialgouv/kosko-charts/components/app"; const manifests = create("app", { env, - config: {}, + config: { + containerPort: 3030, + }, deployment: { container: { resources: { @@ -18,7 +20,6 @@ const manifests = create("app", { }, }, }, - containerPort: 3030, }, }); From a88cd0b3e565ae2eebfee8e6c468e74710c86bc7 Mon Sep 17 00:00:00 2001 From: Douglas Duteil Date: Wed, 29 Jul 2020 12:59:03 +0200 Subject: [PATCH 49/61] fix(k8s): rename _azure-pg to _pg --- .k8s/components/{_azure-pg.ts => _pg.ts} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .k8s/components/{_azure-pg.ts => _pg.ts} (100%) diff --git a/.k8s/components/_azure-pg.ts b/.k8s/components/_pg.ts similarity index 100% rename from .k8s/components/_azure-pg.ts rename to .k8s/components/_pg.ts From 7604c6cba09ae5a4a9e956f617f86bd6604f144f Mon Sep 17 00:00:00 2001 From: Douglas Duteil Date: Wed, 29 Jul 2020 13:13:18 +0200 Subject: [PATCH 50/61] build(pgweb): remove hard coded url --- .k8s/components/_pgweb.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/.k8s/components/_pgweb.ts b/.k8s/components/_pgweb.ts index da22942f..39524460 100644 --- a/.k8s/components/_pgweb.ts +++ b/.k8s/components/_pgweb.ts @@ -7,7 +7,6 @@ const manifests = create("pgweb", { env, config: { image: "sosedoff/pgweb:latest", - subdomain: `pgweb-${process.env.CI_PROJECT_NAME as string}`, containerPort: 8081, }, deployment: { From 53612507046526227726dec882f4d17681983c96 Mon Sep 17 00:00:00 2001 From: Douglas Duteil Date: Wed, 29 Jul 2020 13:55:21 +0200 Subject: [PATCH 51/61] fix(k8s): update @socialgouv/kosko-charts to 2.0.0-alpha.24 --- .k8s/package.json | 2 +- .k8s/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.k8s/package.json b/.k8s/package.json index cd8c89d3..6084f443 100644 --- a/.k8s/package.json +++ b/.k8s/package.json @@ -11,7 +11,7 @@ }, "dependencies": { "@kosko/env": "^0.5.2", - "@socialgouv/kosko-charts": "v2.0.0-alpha.20", + "@socialgouv/kosko-charts": "2.0.0-alpha.24", "kubernetes-models": "^0.8.0", "toml": "^3.0.0" }, diff --git a/.k8s/yarn.lock b/.k8s/yarn.lock index 946784d9..1b30720d 100644 --- a/.k8s/yarn.lock +++ b/.k8s/yarn.lock @@ -149,10 +149,10 @@ resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-3.1.0.tgz#d8735532635bea69ad39119df5f0f10099bd09dc" integrity sha512-n4J+zu52VdY43kdi/XdI9DzuMr1Mur8zFL5ZRG2opCans9aiFwkPxHYFEb5Xgy7n1Z4K6WfI4FpqUqsh3E8BPQ== -"@socialgouv/kosko-charts@v2.0.0-alpha.20": - version "2.0.0-alpha.20" - resolved "https://registry.yarnpkg.com/@socialgouv/kosko-charts/-/kosko-charts-2.0.0-alpha.20.tgz#4b9649cb0bd28e751b8aef9be4c2a0f2055bea3a" - integrity sha512-zduri6HC9CMg7e/sUARjwxCWRMeBstzJ4OEN/GQAQLU5+G3L5zJZhPDOVQDo21Z4fjVM/PBxLUE2RtxpovBuhg== +"@socialgouv/kosko-charts@2.0.0-alpha.24": + version "2.0.0-alpha.24" + resolved "https://registry.yarnpkg.com/@socialgouv/kosko-charts/-/kosko-charts-2.0.0-alpha.24.tgz#e3c533aa947c33fb39b20ed04720fbaa4d90e500" + integrity sha512-Qom23c1+fZGUAtYV6RQssZ0x9Y4ot/0BwAXsmpIkO5qWeBg1O4tmfMW91pzrY3au4Mdkt2VQwPhAZ1+bo1i9tw== dependencies: "@kubernetes-models/sealed-secrets" "^0.1.4" "@sindresorhus/is" "^3.0.0" From 9f922d16d49e7f4007491357077265dbfe765f3a Mon Sep 17 00:00:00 2001 From: Douglas Duteil Date: Wed, 29 Jul 2020 14:15:07 +0200 Subject: [PATCH 52/61] fix(k8s): update @socialgouv/kosko-charts to 2.0.0-alpha.26 `yarn k8s upgrade @socialgouv/kosko-charts@alpha` --- .k8s/components/hasura.ts | 2 -- .k8s/package.json | 2 +- .k8s/yarn.lock | 8 ++++---- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.k8s/components/hasura.ts b/.k8s/components/hasura.ts index 19a21c2e..da281362 100644 --- a/.k8s/components/hasura.ts +++ b/.k8s/components/hasura.ts @@ -2,10 +2,8 @@ import env from "@kosko/env"; import { create } from "@socialgouv/kosko-charts/components/hasura"; -// todo: extract to @socialgouv/kosko-charts/components/hasura const manifests = create({ env, - config: {}, }); export default manifests; diff --git a/.k8s/package.json b/.k8s/package.json index 6084f443..0567be49 100644 --- a/.k8s/package.json +++ b/.k8s/package.json @@ -11,7 +11,7 @@ }, "dependencies": { "@kosko/env": "^0.5.2", - "@socialgouv/kosko-charts": "2.0.0-alpha.24", + "@socialgouv/kosko-charts": "^2.0.0-alpha.26", "kubernetes-models": "^0.8.0", "toml": "^3.0.0" }, diff --git a/.k8s/yarn.lock b/.k8s/yarn.lock index 1b30720d..1ddd62bb 100644 --- a/.k8s/yarn.lock +++ b/.k8s/yarn.lock @@ -149,10 +149,10 @@ resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-3.1.0.tgz#d8735532635bea69ad39119df5f0f10099bd09dc" integrity sha512-n4J+zu52VdY43kdi/XdI9DzuMr1Mur8zFL5ZRG2opCans9aiFwkPxHYFEb5Xgy7n1Z4K6WfI4FpqUqsh3E8BPQ== -"@socialgouv/kosko-charts@2.0.0-alpha.24": - version "2.0.0-alpha.24" - resolved "https://registry.yarnpkg.com/@socialgouv/kosko-charts/-/kosko-charts-2.0.0-alpha.24.tgz#e3c533aa947c33fb39b20ed04720fbaa4d90e500" - integrity sha512-Qom23c1+fZGUAtYV6RQssZ0x9Y4ot/0BwAXsmpIkO5qWeBg1O4tmfMW91pzrY3au4Mdkt2VQwPhAZ1+bo1i9tw== +"@socialgouv/kosko-charts@^2.0.0-alpha.26": + version "2.0.0-alpha.26" + resolved "https://registry.yarnpkg.com/@socialgouv/kosko-charts/-/kosko-charts-2.0.0-alpha.26.tgz#078eba137ff41a43fda07e08b282111feed13e8a" + integrity sha512-gnGYkRnztI3DZFv6KT7TNfCO016YwJjYOl3vZW4eqW8rPdJ5CG5y4mVkAY5bWEe3/EindEtwi1ne1iwzS1p1qQ== dependencies: "@kubernetes-models/sealed-secrets" "^0.1.4" "@sindresorhus/is" "^3.0.0" From 8054aa2bee6d8806abb730f760f866d8e2e04c3e Mon Sep 17 00:00:00 2001 From: Julien Bouquillon Date: Wed, 29 Jul 2020 14:13:28 +0200 Subject: [PATCH 53/61] rename pg secrets --- .k8s/components/_pg.ts | 3 +-- .../dev/{azure-pg.sealed-secret.yaml => pg.sealed-secret.yaml} | 0 .../{azure-pg.sealed-secret.yaml => pg.sealed-secret.yaml} | 0 3 files changed, 1 insertion(+), 2 deletions(-) rename .k8s/environments/dev/{azure-pg.sealed-secret.yaml => pg.sealed-secret.yaml} (100%) rename .k8s/environments/local/{azure-pg.sealed-secret.yaml => pg.sealed-secret.yaml} (100%) diff --git a/.k8s/components/_pg.ts b/.k8s/components/_pg.ts index a2053c2c..d4bfa31a 100644 --- a/.k8s/components/_pg.ts +++ b/.k8s/components/_pg.ts @@ -3,11 +3,10 @@ import { ok } from "assert"; import { create } from "@socialgouv/kosko-charts/components/azure-pg"; -let params = env.component("azure-pg"); +let params = env.component("pg"); const manifests = create({ env, - config: {}, }); export default manifests; diff --git a/.k8s/environments/dev/azure-pg.sealed-secret.yaml b/.k8s/environments/dev/pg.sealed-secret.yaml similarity index 100% rename from .k8s/environments/dev/azure-pg.sealed-secret.yaml rename to .k8s/environments/dev/pg.sealed-secret.yaml diff --git a/.k8s/environments/local/azure-pg.sealed-secret.yaml b/.k8s/environments/local/pg.sealed-secret.yaml similarity index 100% rename from .k8s/environments/local/azure-pg.sealed-secret.yaml rename to .k8s/environments/local/pg.sealed-secret.yaml From 57686035cf383b8507a2dc3f0c13da0466fe49d7 Mon Sep 17 00:00:00 2001 From: Julien Bouquillon Date: Wed, 29 Jul 2020 14:15:44 +0200 Subject: [PATCH 54/61] upgrade kosko-charts, small fixes --- .k8s/components/_pgweb.ts | 10 ++++++++-- .k8s/components/app.ts | 4 +--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.k8s/components/_pgweb.ts b/.k8s/components/_pgweb.ts index 39524460..f01e9f63 100644 --- a/.k8s/components/_pgweb.ts +++ b/.k8s/components/_pgweb.ts @@ -1,7 +1,10 @@ import env from "@kosko/env"; +import { ok } from "assert"; +import { Deployment } from "kubernetes-models/apps/v1/Deployment"; import { create } from "@socialgouv/kosko-charts/components/app"; import { addPostgresUserSecret } from "@socialgouv/kosko-charts/utils/addPostgresUserSecret"; +import { addWaitForPostgres } from "@socialgouv/kosko-charts/utils/addWaitForPostgres"; const manifests = create("pgweb", { env, @@ -32,7 +35,10 @@ const manifests = create("pgweb", { }); // DEV: add secret to access DB -const deployment = manifests.find((manifest) => manifest.kind === "Deployment"); +const deployment = manifests.find( + (manifest): manifest is Deployment => manifest.kind === "Deployment" +); +ok(deployment); addPostgresUserSecret(deployment); - +addWaitForPostgres(deployment); export default manifests; diff --git a/.k8s/components/app.ts b/.k8s/components/app.ts index a4f7c994..ee1bb6c8 100644 --- a/.k8s/components/app.ts +++ b/.k8s/components/app.ts @@ -4,9 +4,7 @@ import { create } from "@socialgouv/kosko-charts/components/app"; const manifests = create("app", { env, - config: { - containerPort: 3030, - }, + config: { containerPort: 3030 }, deployment: { container: { resources: { From 248110eee2f1465e512b3609eff8aa5d0b077598 Mon Sep 17 00:00:00 2001 From: Julien Bouquillon Date: Wed, 29 Jul 2020 14:37:30 +0200 Subject: [PATCH 55/61] fix: use @socialgouv/kosko-charts:2.0.0-alpha.27 --- .k8s/package.json | 2 +- .k8s/yarn.lock | 74 +++++++++++++++-------------------------------- 2 files changed, 24 insertions(+), 52 deletions(-) diff --git a/.k8s/package.json b/.k8s/package.json index 0567be49..ad225a73 100644 --- a/.k8s/package.json +++ b/.k8s/package.json @@ -11,7 +11,7 @@ }, "dependencies": { "@kosko/env": "^0.5.2", - "@socialgouv/kosko-charts": "^2.0.0-alpha.26", + "@socialgouv/kosko-charts": "2.0.0-alpha.27", "kubernetes-models": "^0.8.0", "toml": "^3.0.0" }, diff --git a/.k8s/yarn.lock b/.k8s/yarn.lock index 1ddd62bb..6be3b324 100644 --- a/.k8s/yarn.lock +++ b/.k8s/yarn.lock @@ -76,15 +76,6 @@ resolve "^1.17.0" tslib "^1.11.1" -"@kubernetes-models/base@^0.1.3": - version "0.1.3" - resolved "https://registry.yarnpkg.com/@kubernetes-models/base/-/base-0.1.3.tgz#18f567d28e8d7422ed2bb8869f93c0eee800030b" - integrity sha512-6CcZtcXvfZXstKvkMALjGinlbcP8wTpKOjaJ0i5lNwr0uaRSUjRCL4R7Hq2LW25Fc3E7wk6ObckmKi3uGLou4Q== - dependencies: - "@kubernetes-models/validate" "^0.1.2" - is-plain-object "^3.0.0" - tslib "^1.10.0" - "@kubernetes-models/base@^0.1.4": version "0.1.4" resolved "https://registry.yarnpkg.com/@kubernetes-models/base/-/base-0.1.4.tgz#0022a8f324b5886c7ae384319618080d74ca7f52" @@ -94,17 +85,7 @@ is-plain-object "^3.0.0" tslib "^1.10.0" -"@kubernetes-models/sealed-secrets@^0.1.3": - version "0.1.3" - resolved "https://registry.yarnpkg.com/@kubernetes-models/sealed-secrets/-/sealed-secrets-0.1.3.tgz#52323deeda649fdffb88f09234376af577c6a8c0" - integrity sha512-h/SRnqokGxtotUH7NgZfqB2CYGuBEf5Rc2dlzTCBuHkwstNgCZ0XSPlAtvWbTOre1Z9CQC50iIygH+VqkQQppA== - dependencies: - "@kubernetes-models/base" "^0.1.3" - "@kubernetes-models/validate" "^0.1.2" - kubernetes-models "^0.8.0" - tslib "^1.10.0" - -"@kubernetes-models/sealed-secrets@^0.1.4": +"@kubernetes-models/sealed-secrets@^0.1.3", "@kubernetes-models/sealed-secrets@^0.1.4": version "0.1.4" resolved "https://registry.yarnpkg.com/@kubernetes-models/sealed-secrets/-/sealed-secrets-0.1.4.tgz#a6bfedd4f916ff85ccb9f2edf9ebcbf53b015091" integrity sha512-2jzvOpCK7tirMMm0ChcbphMBJv1wJ9SzhD/Q9IpNPcQFwbjirk+v4QDVBLQN1yBBw3c5Ky2rI9w9BGHb/VZC1A== @@ -149,10 +130,10 @@ resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-3.1.0.tgz#d8735532635bea69ad39119df5f0f10099bd09dc" integrity sha512-n4J+zu52VdY43kdi/XdI9DzuMr1Mur8zFL5ZRG2opCans9aiFwkPxHYFEb5Xgy7n1Z4K6WfI4FpqUqsh3E8BPQ== -"@socialgouv/kosko-charts@^2.0.0-alpha.26": - version "2.0.0-alpha.26" - resolved "https://registry.yarnpkg.com/@socialgouv/kosko-charts/-/kosko-charts-2.0.0-alpha.26.tgz#078eba137ff41a43fda07e08b282111feed13e8a" - integrity sha512-gnGYkRnztI3DZFv6KT7TNfCO016YwJjYOl3vZW4eqW8rPdJ5CG5y4mVkAY5bWEe3/EindEtwi1ne1iwzS1p1qQ== +"@socialgouv/kosko-charts@2.0.0-alpha.27": + version "2.0.0-alpha.27" + resolved "https://registry.yarnpkg.com/@socialgouv/kosko-charts/-/kosko-charts-2.0.0-alpha.27.tgz#1b540cf6fa89bff234e40d31da0ca00d75ae4db7" + integrity sha512-3F2+YlApxjWKecNJAIjuJYOMMjo8ijpy7CS6BZ6d9qffAKqiXw2giH+8PtSI8OPpP3ZW1SeM3XsRJ/TTea6frw== dependencies: "@kubernetes-models/sealed-secrets" "^0.1.4" "@sindresorhus/is" "^3.0.0" @@ -165,14 +146,14 @@ integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ== "@types/node@^14.0.14": - version "14.0.14" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.14.tgz#24a0b5959f16ac141aeb0c5b3cd7a15b7c64cbce" - integrity sha512-syUgf67ZQpaJj01/tRTknkMNoBBLWJOBODF0Zm4NrXmiSuxjymFrxnTu1QVYRubhVkRcZLYZG8STTwJRdVm/WQ== + version "14.0.27" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.27.tgz#a151873af5a5e851b51b3b065c9e63390a9e0eb1" + integrity sha512-kVrqXhbclHNHGu9ztnAwSncIgJv/FaxmzXJvGXNdcCpV1b8u1/Mi6z6m0vwy0LzKeXFTPLH0NzwmoJ3fNCIq0g== ajv@^6.10.2: - version "6.12.2" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.2.tgz#c629c5eced17baf314437918d2da88c99d5958cd" - integrity sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ== + version "6.12.3" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.3.tgz#18c5af38a111ddeb4f2697bd78d68abc1cabd706" + integrity sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA== dependencies: fast-deep-equal "^3.1.1" fast-json-stable-stringify "^2.0.0" @@ -438,9 +419,9 @@ find-up@^4.0.0, find-up@^4.1.0: path-exists "^4.0.0" fp-ts@^2.6.6: - version "2.6.7" - resolved "https://registry.yarnpkg.com/fp-ts/-/fp-ts-2.6.7.tgz#a86f904b86c93cd63300e6d40005e4caa57ccb6b" - integrity sha512-Uklx0kKrjwbYb142tbQZqWVHhvNzxZwJhr+gkIbwPt/exV0n8/dHDkAmB05vNKNnJMwoJr7i6pM3XW0bicrE7Q== + version "2.7.1" + resolved "https://registry.yarnpkg.com/fp-ts/-/fp-ts-2.7.1.tgz#7bd754f3362f4b9bc4d272a97c0658e9a1bc16bc" + integrity sha512-rYy41jF1gVhBNYbPwup50dtyT686OKOoa86PXwh8aKpBRfmvPhnBh2zUkOYj84GIMSCsgY+oJ/RVhVKRvWNPTA== get-caller-file@^2.0.1: version "2.0.5" @@ -554,16 +535,7 @@ kosko@^0.9.2: "@kosko/cli" "^0.9.2" import-local "^3.0.2" -kubernetes-models@^0.8.0: - version "0.8.0" - resolved "https://registry.yarnpkg.com/kubernetes-models/-/kubernetes-models-0.8.0.tgz#25417dedb8b01aa2152a5accdf412dd6e58df45b" - integrity sha512-X77njuENDnSmomiezGL+kyUAvGPPUvCt3+ZlRR59+HN+TIJEUhgMXtIiYpdqvXuWp6QOePxiKYFPW4zRpm5FRg== - dependencies: - "@kubernetes-models/base" "^0.1.3" - "@kubernetes-models/validate" "^0.1.2" - tslib "^1.10.0" - -kubernetes-models@^0.8.1: +kubernetes-models@^0.8.0, kubernetes-models@^0.8.1: version "0.8.1" resolved "https://registry.yarnpkg.com/kubernetes-models/-/kubernetes-models-0.8.1.tgz#478072f62fea7425fe14a205f4161a4268296993" integrity sha512-zJDKVBlP74hC95iqi6fItXz8KOFHbqOnsLVRNf4OsSS+xF/v21mk0ms5zp5enlQgJ6VNhGarYzLKejFXQPoqeg== @@ -897,9 +869,9 @@ type-check@~0.3.2: prelude-ls "~1.1.2" typescript@^3.9.5: - version "3.9.5" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.5.tgz#586f0dba300cde8be52dd1ac4f7e1009c1b13f36" - integrity sha512-hSAifV3k+i6lEoCJ2k6R2Z/rp/H3+8sdmcn5NrS3/3kE7+RyZXm9aqvxWqjEXHAd8b0pShatpcdMTvEdvAJltQ== + version "3.9.7" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz#98d600a5ebdc38f40cb277522f12dc800e9e25fa" + integrity sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw== underscore@1.7.0: version "1.7.0" @@ -937,7 +909,7 @@ y18n@^4.0.0: resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b" integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w== -yargs-parser@^18.1.1: +yargs-parser@^18.1.2: version "18.1.3" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0" integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ== @@ -946,9 +918,9 @@ yargs-parser@^18.1.1: decamelize "^1.2.0" yargs@^15.3.1: - version "15.3.1" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.3.1.tgz#9505b472763963e54afe60148ad27a330818e98b" - integrity sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA== + version "15.4.1" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8" + integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A== dependencies: cliui "^6.0.0" decamelize "^1.2.0" @@ -960,7 +932,7 @@ yargs@^15.3.1: string-width "^4.2.0" which-module "^2.0.0" y18n "^4.0.0" - yargs-parser "^18.1.1" + yargs-parser "^18.1.2" yn@3.1.1: version "3.1.1" From 79ac31507a1e06f60d9f083b60564251d438b147 Mon Sep 17 00:00:00 2001 From: Julien Bouquillon Date: Wed, 29 Jul 2020 14:48:38 +0200 Subject: [PATCH 56/61] fix: use @socialgouv/kosko-charts:2.0.0-alpha.28 --- .k8s/package.json | 2 +- .k8s/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.k8s/package.json b/.k8s/package.json index ad225a73..247a339b 100644 --- a/.k8s/package.json +++ b/.k8s/package.json @@ -11,7 +11,7 @@ }, "dependencies": { "@kosko/env": "^0.5.2", - "@socialgouv/kosko-charts": "2.0.0-alpha.27", + "@socialgouv/kosko-charts": "2.0.0-alpha.28", "kubernetes-models": "^0.8.0", "toml": "^3.0.0" }, diff --git a/.k8s/yarn.lock b/.k8s/yarn.lock index 6be3b324..da30bc04 100644 --- a/.k8s/yarn.lock +++ b/.k8s/yarn.lock @@ -130,10 +130,10 @@ resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-3.1.0.tgz#d8735532635bea69ad39119df5f0f10099bd09dc" integrity sha512-n4J+zu52VdY43kdi/XdI9DzuMr1Mur8zFL5ZRG2opCans9aiFwkPxHYFEb5Xgy7n1Z4K6WfI4FpqUqsh3E8BPQ== -"@socialgouv/kosko-charts@2.0.0-alpha.27": - version "2.0.0-alpha.27" - resolved "https://registry.yarnpkg.com/@socialgouv/kosko-charts/-/kosko-charts-2.0.0-alpha.27.tgz#1b540cf6fa89bff234e40d31da0ca00d75ae4db7" - integrity sha512-3F2+YlApxjWKecNJAIjuJYOMMjo8ijpy7CS6BZ6d9qffAKqiXw2giH+8PtSI8OPpP3ZW1SeM3XsRJ/TTea6frw== +"@socialgouv/kosko-charts@2.0.0-alpha.28": + version "2.0.0-alpha.28" + resolved "https://registry.yarnpkg.com/@socialgouv/kosko-charts/-/kosko-charts-2.0.0-alpha.28.tgz#a89f5d52b01ba6ed7c02dee1a31160dfd614063d" + integrity sha512-Cs9eHyahFxWEGBjZFm50weYTOKLSrAyQdAElOE3m6PHs5h8P0tkKjzNk6L/s9j40xEkt6IU2NAlbB53hNFevqg== dependencies: "@kubernetes-models/sealed-secrets" "^0.1.4" "@sindresorhus/is" "^3.0.0" From 1df29891ed2a31773dc6e6232b336cb793df004e Mon Sep 17 00:00:00 2001 From: Douglas Duteil Date: Wed, 29 Jul 2020 15:07:17 +0200 Subject: [PATCH 57/61] build(k8s): add subDomainPrefix --- .k8s/components/_pgweb.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/.k8s/components/_pgweb.ts b/.k8s/components/_pgweb.ts index f01e9f63..4a383425 100644 --- a/.k8s/components/_pgweb.ts +++ b/.k8s/components/_pgweb.ts @@ -11,6 +11,7 @@ const manifests = create("pgweb", { config: { image: "sosedoff/pgweb:latest", containerPort: 8081, + subDomainPrefix: "pgweb-", }, deployment: { container: { From 3d975ef461a5ad411904929f5da0f97d4b363d3c Mon Sep 17 00:00:00 2001 From: Douglas Duteil Date: Wed, 29 Jul 2020 15:34:05 +0200 Subject: [PATCH 58/61] build(k8s): symlink the dev and preprod env --- .k8s/environments/preprod | 1 + .k8s/package.json | 1 + 2 files changed, 2 insertions(+) create mode 120000 .k8s/environments/preprod diff --git a/.k8s/environments/preprod b/.k8s/environments/preprod new file mode 120000 index 00000000..90012116 --- /dev/null +++ b/.k8s/environments/preprod @@ -0,0 +1 @@ +dev \ No newline at end of file diff --git a/.k8s/package.json b/.k8s/package.json index 247a339b..8b2f2705 100644 --- a/.k8s/package.json +++ b/.k8s/package.json @@ -6,6 +6,7 @@ "generate:prod": "kosko generate --env prod", "gitlab": "DOTENV_CONFIG_PATH=./environments/.gitlab-ci.env kosko generate --require dotenv/config", "gitlab:dev": "yarn --silent gitlab --env dev", + "gitlab:preprod": "yarn --silent gitlab --env preprod", "gitlab:prod": "yarn --silent gitlab --env prod", "xxx": "DOTENV_CONFIG_PATH=./environments/.gitlab-ci.env npx ts-node --require dotenv/config ./main.js" }, From 442aa9c54c171a9ffb2d3a18cc407f7920bd7c1d Mon Sep 17 00:00:00 2001 From: Julien Bouquillon Date: Wed, 29 Jul 2020 15:39:24 +0200 Subject: [PATCH 59/61] feat: add prod/pg.sealed-secret.yaml --- .k8s/environments/prod/pg.sealed-secret.yaml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .k8s/environments/prod/pg.sealed-secret.yaml diff --git a/.k8s/environments/prod/pg.sealed-secret.yaml b/.k8s/environments/prod/pg.sealed-secret.yaml new file mode 100644 index 00000000..1987c78f --- /dev/null +++ b/.k8s/environments/prod/pg.sealed-secret.yaml @@ -0,0 +1,19 @@ +apiVersion: bitnami.com/v1alpha1 +kind: SealedSecret +metadata: + creationTimestamp: null + name: azure-pg-admin-user +spec: + encryptedData: + DATABASE_URL: AgB/GubhlI+FJ8FTgArLFSyk+X8wRcpAanWlxmShtfWmxA9ajVNLX1dkIjJtPm+c8PKe6lgj/rg1an7R8+vtGpoDfWhez/oHFU3x9Q+DlcZZ6e23gLXhHt95k+FIuMSbBInMtYRyI3Zym0VxO7zQR4OsfiwRox5EgwYCcS00zTxAr1Wl8KVnmYX7vKeXDO+CGQ8snPSP2g87HkKEne77DIdxKJjkp9WUZnUhRdQl4W4wNO/5cSMnV5rT7wPhADJ7S7HmRyoc1pcK+t82LZAd/e7GfxD81ivFg9KwQSfsrPsdZ68qHii3is/fpFGuOwfkK6InCXlxwJaeIpSLOqf/5ai8VD1MU8UxXM2aeRT8xDOCiS372OK0autliMMLPoRCtd0k9LEQ9ykAltiD0VPrvnF1GOYfnLv9NYAQ7HfF23FEDqJFx/sjbG46TB12d2T+OxDNkQLF8m2NRNAMBE7Y+y/i8vnp/OodVcjG7eKMSfZuDuQG1obKwarlvpeKt43FmTqxP3ZUR411mN9kfCj38e28pEeWtqlX/cpF7vtEsd9w6E1VwGu7jPX0yUCXaDbsP3SZ0uxrrr8NRAZ1FqcGMkmj/12iwzfLMDgOc9n7IRqegujs/CyCb6ZCvih9ILZUvHpXI1/jntK1YkxQMHYEvRu9hQK8v8FB38R+je0Ohhs0LiOhVgBd5MPjLMES6U9xATnZdxFdTpejnO77jXIa072zLZCexzjscdfcQsvgMaBcy6PeEVAWqvQOKqz9f6ii+WkMnmPdA7+JLVmA/LJ1kEJldTYYu8wZT98gqDCms/+5dnhXel0qP9T2X3GWCCFcwt8chnpg42zKG6ogaG+znoQ5fHYnbXOxv3/hsdzWfiHK5xWK3F3xbBQ= + PGDATABASE: AgCLA7hykwf/sX1qTx9r2vT5zzWKEgf4vw6rHdrLs/ZxtG7LQ3K5oJPdkNagW6KbdO61Sn32XHao57dP7zCpiMa1WAoBEx2e2kQ2gJltzW08cnSDXjpXrbet75haZlEZ+kYY3bEPfDcpZu6+kwDxldjyb2WfQMWUI4K/rLVvYNB+Fnt49Iodj+42hozIgIglXYkIZ7CmQe5chRFnknYgDyAtnrBjNlIVExSx7yM4STzSLPAx3PE47yyw5pULWMFByWFILXZ1nrdDeVVCGZblhiy/l7EG1/YiJ487kyShSMwpuu5pxrMwPtH5SH9Ve2WEInbQEHgHTdSADFzn3ueiDcOeyWR0daiRWXbBMvjjz2nerV53GY0x/e8v0DUlPsaKFYHHzj4yyMEN49O/1JFlHwPBZl0T8nXEK3GJeJv9as1JQHKe+qWvICf5h57MsxJtSkCTWydX8fKnwZc5mwxXtBWvepDvPpKPiSrCdlSKA4JnStvqxR8MWzpUlNau8z6idXPzNQXiMFDZsAApjbiJK0LdWWPqJUgEggAEtSNWaz+m4rMr+9dIhZDu/sUB34RT5TTLqa5BjP4Dl+NDiZZMlpWVgU4QE7gaxq62Y53Fh80macSPt7Bmu2mnn/+tSmkI9IISL2q5Qo/diy6yzjyr0nKCwWNNGp0uAmxrFDaUCjEdehvJMaR2MJk9KZEZ0/B74m3+HjM/bzv1w8mX + PGHOST: AgCp1FMrs3wuImZ4qB3Y0O5ffxZ5/nT2krgbR8ZvkhmuEwTAp3JQtV2VRhNzcxs0p4Mnx/U+8MTIe0ODWsMsDsIUt0eGdS2fq3pnhqTvMmpDwzhdebULBmXqCar8eDoKOpacKsLU/boLUBRfH8531/I4itZjy6ZgqvAg6zxHRD0kun3o/P4VntEHzz9C3NGjbKEvD+xrj65CuiABfRydVgotkMfc734OP4XjE2bBWOUnCDjpH8TsPmN3P3NqprbTYMAiWGYXaz1gWRymFUAFSWpmHHFnz+4YG1//UXgJJSKyQ6ZWPzGe/tWZUh8FbnQzgly2xvwvsWPluBHqBULuGLsVsWbk+kXPoWvmvYA+IHea4NuPb42lErChMKH3dWfNRiXLDg7RvvfvLd9eJa1LPycdZuUQFVY8zE497USGaP0uObpM1ylnEfzocEMU2iFbJOXckb6c7bLNwMw9BlHhYYMQv6xO+wf2A4KL5GX6Jw17M18OFH1zjWPqaHJfJU/oNY5gsTf+jxifq+wj8zzaoBW9LObou96GnumKx2Fij2HQr4LHSaguT+4ZpJ4p4YsmVoK4z0hR3EuDoqog/EoY8JajrPh3LeN9mSid2IfL2u9KTsMuoId4B0n/8zKsJzoKd/dUP1oe995sDXzuB4qrWlXFC3t+bLA0b3M97Qt/xV1qQcLkE4a+eDvonmSVFpNPe/nokEyt+0Q/I1PtgxVCU+eY6bUQoHoJxtKudMJ15tyLpDYx9BmSqzasPqZfTMTfTsUUfE4= + PGPASSWORD: AgCmQGAQCFvuBqVOAiHHhpLmn69F/bRMCxyVvngtdXSsBe/ncBI3hsnSBIYaozaAGm0FAb/igMOhSrc1hjKgDh7aUqkoG7YO/YdBXswxw0P0N+4W5E1H5d3T4sDccrta9gB8+eQ9AKjjFjgq7JStcI9jrsPZgAwFmpn5PUDyO151fFIN14Qr/3l6fuQ2Zt08SLETXbX6PIpAX0CbSlMqxr70StgYULcyaKsb96fuDAqW0xO/rnda6qiM/7cqWASKNjyVlKRWhVEJgagNuQhil9SW9d5vxfsjz0EwCKO2t+/AcbToJz+CtGMqCKTTd/WKQg3FZUNAiXmTkH0uX9JljqE9ecBhPntj77DSHV5dkiyyYrAggM8ora+tlN7GhEVeNXYZTunuDo6AM1yhRQaSFgdhduxIn3en/0gZKtFMEX4G7GQHa9jmOBHo2bZ6pzcMMSkhPPcwjdAqJVcwhkwOGD4FRCyWNvIJ+7AcYMvvrjhtr1mzhk/p7345wNmKen6xVwl10PpNNj+GFcm1f9Ad8SmUgsfkPY48d8qaXEZBlbrlqyzFptd1PvqlxorTsgeGgcRzeE8gbtOFO/dOtg81lKM36HgVr3GftxqkkOKytLrRrYcJjoNi6ZxBXf5E5agQCMEcoYTJdkZVzzoNSmwGcnhzrFbK6INZyhNkzO2qP5g3bpKYEEcf2k1q7x20dfVriDQsRMPUMyQgWRcgsoyxynE= + PGSSLMODE: AgBjGS6SXAThL5rJJli8OsB3pCK8p49hmCvyRrTlsjPcA95Mb+h8Mb2U6Zw9BivgHaky+wsovwe/TSOn+YipW/tXvifjVHyGOyh3sNx6zEqpfU/ZHJ1Dau8plBGRPHK7anhDthHBvzUhtRRRANaS4bkanNL9uyGO/Ti6TuGd4DAY+u1o6xFq/7nhmSLoDsc4E5mXOP9lYdKBOhKOOLtK2k7SHQUe+NILUyQwlkdLjX967SKBM41c9hF00GUTXP+KoT+Ftl/jBZszm3x73X3kLhi3dFTVjvndY8gobwzYRz/PfmEecemEMu8nGAWpR7alkTqdGoO35XC7XgfXO29um2gRaIEPna7QfuMZDtwTMFROenc10anW9+8tvtNPoPDewm5C5tixCdOU2wtyNEvYFp7GDXf/Kx5zzzJkvHK1RX/cTc0s0Smdi6m6npFgjc9lDFzd6VFp+AO/IktFsw9CBWE6ZImYKe1jwYYLXAnQbXLOtzlEOGp+/vdN4YhedufF0GUtxJGRlINeFIOEH0v5fFPVEZMhwB9ZlgUiWOtKmg2BSCUgNGurOMBd+70OtSttOTdx70tkKKxaX1Ig1zlGQRSs2OcGrYwlq2iFreuVUZuBhyy9xQWyxoqrNH9JbekNZADR1iBSvR4xhwqpTfdhmx+hYhnMZPrXVMaNBKJxBCmNKeHilPJwPvlmkjn8VjNXlJPV8C9ulLjr + PGUSER: AgAuAs0BNZM6LZRX9ZrZS34785WyUwYef5rChX7yWvFxhxJ6QmMqXd54YQk2WQzA/oHVACEcCkbJemoh/p4ON84vD6ZlO6iNKaA/nfHJjmqmgbhaO1Wjl5My+y6KnPE2SSeTJiI4sPGtJjWGdIDfiZ2loZIPb3idY7HjUx8rsf02brUOeF3j/+d8ZC9FHCHOuBR+9MpUsY3FttI+9DpbSMQuLJl7+jemIGqYHvJAr2h9jFdemswNkg7yNSx58a3A/gvqxKdsGcm2JBCztj33qvUJkULL0bhzTGMTsJn35FVvANfyxJhR+OSBXaHCSKsvPFKWGspskXzx/lzUZ2m6gJmksN5Vj9YrqTNw3pgsXXw80emEBaF5MNVYp1Vu4a02lqh7++LikNZZostqoFoTHOlQ7QtxNU7MGcNGbCt1AOzbCsbpxfeF4VvEVATGm2dOM0M7Bx8eIHaQAQssfqA719ij0cIx1GzKy6wepRGT5XJqPrQZWllrnY5TR6y22mfa2IaUPU30hvN5+MpZ5MVGbGzXDaAsOknQX/9hjdo0aawBeg20tzn/cG5D8xTwXIHUl2WQ40iOshfzVfHunzGtRsZhx5yavTCI5cFVSTpg6cU58OAQM2HEDj8RAaYubNOamhGLgiAcIZzIMPyS9YL79kVaIRSBV6ZviXqgyK2AoVzs439M9ob20V2AX2r/c6ZIm6UoFzHEIiYGXoVhnxoG27P2E0vwWIlZyWWu4lKlGdpkDZU7l3dKq09mPPs= + template: + metadata: + creationTimestamp: null + name: azure-pg-admin-user + type: Opaque + From a5b6ca881f31acc5267a56fbdead3d68963f24d3 Mon Sep 17 00:00:00 2001 From: Julien Bouquillon Date: Wed, 29 Jul 2020 15:42:16 +0200 Subject: [PATCH 60/61] feat: add prod/pg.sealed-secret.yaml --- .k8s/environments/prod/pg.sealed-secret.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.k8s/environments/prod/pg.sealed-secret.yaml b/.k8s/environments/prod/pg.sealed-secret.yaml index 1987c78f..6eedb7a0 100644 --- a/.k8s/environments/prod/pg.sealed-secret.yaml +++ b/.k8s/environments/prod/pg.sealed-secret.yaml @@ -5,12 +5,12 @@ metadata: name: azure-pg-admin-user spec: encryptedData: - DATABASE_URL: AgB/GubhlI+FJ8FTgArLFSyk+X8wRcpAanWlxmShtfWmxA9ajVNLX1dkIjJtPm+c8PKe6lgj/rg1an7R8+vtGpoDfWhez/oHFU3x9Q+DlcZZ6e23gLXhHt95k+FIuMSbBInMtYRyI3Zym0VxO7zQR4OsfiwRox5EgwYCcS00zTxAr1Wl8KVnmYX7vKeXDO+CGQ8snPSP2g87HkKEne77DIdxKJjkp9WUZnUhRdQl4W4wNO/5cSMnV5rT7wPhADJ7S7HmRyoc1pcK+t82LZAd/e7GfxD81ivFg9KwQSfsrPsdZ68qHii3is/fpFGuOwfkK6InCXlxwJaeIpSLOqf/5ai8VD1MU8UxXM2aeRT8xDOCiS372OK0autliMMLPoRCtd0k9LEQ9ykAltiD0VPrvnF1GOYfnLv9NYAQ7HfF23FEDqJFx/sjbG46TB12d2T+OxDNkQLF8m2NRNAMBE7Y+y/i8vnp/OodVcjG7eKMSfZuDuQG1obKwarlvpeKt43FmTqxP3ZUR411mN9kfCj38e28pEeWtqlX/cpF7vtEsd9w6E1VwGu7jPX0yUCXaDbsP3SZ0uxrrr8NRAZ1FqcGMkmj/12iwzfLMDgOc9n7IRqegujs/CyCb6ZCvih9ILZUvHpXI1/jntK1YkxQMHYEvRu9hQK8v8FB38R+je0Ohhs0LiOhVgBd5MPjLMES6U9xATnZdxFdTpejnO77jXIa072zLZCexzjscdfcQsvgMaBcy6PeEVAWqvQOKqz9f6ii+WkMnmPdA7+JLVmA/LJ1kEJldTYYu8wZT98gqDCms/+5dnhXel0qP9T2X3GWCCFcwt8chnpg42zKG6ogaG+znoQ5fHYnbXOxv3/hsdzWfiHK5xWK3F3xbBQ= - PGDATABASE: AgCLA7hykwf/sX1qTx9r2vT5zzWKEgf4vw6rHdrLs/ZxtG7LQ3K5oJPdkNagW6KbdO61Sn32XHao57dP7zCpiMa1WAoBEx2e2kQ2gJltzW08cnSDXjpXrbet75haZlEZ+kYY3bEPfDcpZu6+kwDxldjyb2WfQMWUI4K/rLVvYNB+Fnt49Iodj+42hozIgIglXYkIZ7CmQe5chRFnknYgDyAtnrBjNlIVExSx7yM4STzSLPAx3PE47yyw5pULWMFByWFILXZ1nrdDeVVCGZblhiy/l7EG1/YiJ487kyShSMwpuu5pxrMwPtH5SH9Ve2WEInbQEHgHTdSADFzn3ueiDcOeyWR0daiRWXbBMvjjz2nerV53GY0x/e8v0DUlPsaKFYHHzj4yyMEN49O/1JFlHwPBZl0T8nXEK3GJeJv9as1JQHKe+qWvICf5h57MsxJtSkCTWydX8fKnwZc5mwxXtBWvepDvPpKPiSrCdlSKA4JnStvqxR8MWzpUlNau8z6idXPzNQXiMFDZsAApjbiJK0LdWWPqJUgEggAEtSNWaz+m4rMr+9dIhZDu/sUB34RT5TTLqa5BjP4Dl+NDiZZMlpWVgU4QE7gaxq62Y53Fh80macSPt7Bmu2mnn/+tSmkI9IISL2q5Qo/diy6yzjyr0nKCwWNNGp0uAmxrFDaUCjEdehvJMaR2MJk9KZEZ0/B74m3+HjM/bzv1w8mX - PGHOST: AgCp1FMrs3wuImZ4qB3Y0O5ffxZ5/nT2krgbR8ZvkhmuEwTAp3JQtV2VRhNzcxs0p4Mnx/U+8MTIe0ODWsMsDsIUt0eGdS2fq3pnhqTvMmpDwzhdebULBmXqCar8eDoKOpacKsLU/boLUBRfH8531/I4itZjy6ZgqvAg6zxHRD0kun3o/P4VntEHzz9C3NGjbKEvD+xrj65CuiABfRydVgotkMfc734OP4XjE2bBWOUnCDjpH8TsPmN3P3NqprbTYMAiWGYXaz1gWRymFUAFSWpmHHFnz+4YG1//UXgJJSKyQ6ZWPzGe/tWZUh8FbnQzgly2xvwvsWPluBHqBULuGLsVsWbk+kXPoWvmvYA+IHea4NuPb42lErChMKH3dWfNRiXLDg7RvvfvLd9eJa1LPycdZuUQFVY8zE497USGaP0uObpM1ylnEfzocEMU2iFbJOXckb6c7bLNwMw9BlHhYYMQv6xO+wf2A4KL5GX6Jw17M18OFH1zjWPqaHJfJU/oNY5gsTf+jxifq+wj8zzaoBW9LObou96GnumKx2Fij2HQr4LHSaguT+4ZpJ4p4YsmVoK4z0hR3EuDoqog/EoY8JajrPh3LeN9mSid2IfL2u9KTsMuoId4B0n/8zKsJzoKd/dUP1oe995sDXzuB4qrWlXFC3t+bLA0b3M97Qt/xV1qQcLkE4a+eDvonmSVFpNPe/nokEyt+0Q/I1PtgxVCU+eY6bUQoHoJxtKudMJ15tyLpDYx9BmSqzasPqZfTMTfTsUUfE4= - PGPASSWORD: AgCmQGAQCFvuBqVOAiHHhpLmn69F/bRMCxyVvngtdXSsBe/ncBI3hsnSBIYaozaAGm0FAb/igMOhSrc1hjKgDh7aUqkoG7YO/YdBXswxw0P0N+4W5E1H5d3T4sDccrta9gB8+eQ9AKjjFjgq7JStcI9jrsPZgAwFmpn5PUDyO151fFIN14Qr/3l6fuQ2Zt08SLETXbX6PIpAX0CbSlMqxr70StgYULcyaKsb96fuDAqW0xO/rnda6qiM/7cqWASKNjyVlKRWhVEJgagNuQhil9SW9d5vxfsjz0EwCKO2t+/AcbToJz+CtGMqCKTTd/WKQg3FZUNAiXmTkH0uX9JljqE9ecBhPntj77DSHV5dkiyyYrAggM8ora+tlN7GhEVeNXYZTunuDo6AM1yhRQaSFgdhduxIn3en/0gZKtFMEX4G7GQHa9jmOBHo2bZ6pzcMMSkhPPcwjdAqJVcwhkwOGD4FRCyWNvIJ+7AcYMvvrjhtr1mzhk/p7345wNmKen6xVwl10PpNNj+GFcm1f9Ad8SmUgsfkPY48d8qaXEZBlbrlqyzFptd1PvqlxorTsgeGgcRzeE8gbtOFO/dOtg81lKM36HgVr3GftxqkkOKytLrRrYcJjoNi6ZxBXf5E5agQCMEcoYTJdkZVzzoNSmwGcnhzrFbK6INZyhNkzO2qP5g3bpKYEEcf2k1q7x20dfVriDQsRMPUMyQgWRcgsoyxynE= - PGSSLMODE: AgBjGS6SXAThL5rJJli8OsB3pCK8p49hmCvyRrTlsjPcA95Mb+h8Mb2U6Zw9BivgHaky+wsovwe/TSOn+YipW/tXvifjVHyGOyh3sNx6zEqpfU/ZHJ1Dau8plBGRPHK7anhDthHBvzUhtRRRANaS4bkanNL9uyGO/Ti6TuGd4DAY+u1o6xFq/7nhmSLoDsc4E5mXOP9lYdKBOhKOOLtK2k7SHQUe+NILUyQwlkdLjX967SKBM41c9hF00GUTXP+KoT+Ftl/jBZszm3x73X3kLhi3dFTVjvndY8gobwzYRz/PfmEecemEMu8nGAWpR7alkTqdGoO35XC7XgfXO29um2gRaIEPna7QfuMZDtwTMFROenc10anW9+8tvtNPoPDewm5C5tixCdOU2wtyNEvYFp7GDXf/Kx5zzzJkvHK1RX/cTc0s0Smdi6m6npFgjc9lDFzd6VFp+AO/IktFsw9CBWE6ZImYKe1jwYYLXAnQbXLOtzlEOGp+/vdN4YhedufF0GUtxJGRlINeFIOEH0v5fFPVEZMhwB9ZlgUiWOtKmg2BSCUgNGurOMBd+70OtSttOTdx70tkKKxaX1Ig1zlGQRSs2OcGrYwlq2iFreuVUZuBhyy9xQWyxoqrNH9JbekNZADR1iBSvR4xhwqpTfdhmx+hYhnMZPrXVMaNBKJxBCmNKeHilPJwPvlmkjn8VjNXlJPV8C9ulLjr - PGUSER: AgAuAs0BNZM6LZRX9ZrZS34785WyUwYef5rChX7yWvFxhxJ6QmMqXd54YQk2WQzA/oHVACEcCkbJemoh/p4ON84vD6ZlO6iNKaA/nfHJjmqmgbhaO1Wjl5My+y6KnPE2SSeTJiI4sPGtJjWGdIDfiZ2loZIPb3idY7HjUx8rsf02brUOeF3j/+d8ZC9FHCHOuBR+9MpUsY3FttI+9DpbSMQuLJl7+jemIGqYHvJAr2h9jFdemswNkg7yNSx58a3A/gvqxKdsGcm2JBCztj33qvUJkULL0bhzTGMTsJn35FVvANfyxJhR+OSBXaHCSKsvPFKWGspskXzx/lzUZ2m6gJmksN5Vj9YrqTNw3pgsXXw80emEBaF5MNVYp1Vu4a02lqh7++LikNZZostqoFoTHOlQ7QtxNU7MGcNGbCt1AOzbCsbpxfeF4VvEVATGm2dOM0M7Bx8eIHaQAQssfqA719ij0cIx1GzKy6wepRGT5XJqPrQZWllrnY5TR6y22mfa2IaUPU30hvN5+MpZ5MVGbGzXDaAsOknQX/9hjdo0aawBeg20tzn/cG5D8xTwXIHUl2WQ40iOshfzVfHunzGtRsZhx5yavTCI5cFVSTpg6cU58OAQM2HEDj8RAaYubNOamhGLgiAcIZzIMPyS9YL79kVaIRSBV6ZviXqgyK2AoVzs439M9ob20V2AX2r/c6ZIm6UoFzHEIiYGXoVhnxoG27P2E0vwWIlZyWWu4lKlGdpkDZU7l3dKq09mPPs= + DATABASE_URL: AgAydyltFii4JRSChFo+hzxvzBQ1UexpMzLvGTd02uf2OZPWM+U+tT3Y0hx3MfYZYe77ZrZKGLE/vAFzjvdGSuj+Zw3rBAyHzw6m4+F7dtVe9b0vWy6+77TxqLJPEDhduZRZ0FnifV3O/BhICXd74jw06YDD64nrbDHiW7crwTNJ36G1VOqYhrMJTu699xZl0wIdlkM8TAa3PiqKBeStiMnuft27B+/PvxuSb6F6JE7NPiBn1ocqRP4rIIjzx4i82ewytseCKHN8hkh18MDRV356rXR1ae1f0F9i9TV+ewgm7g2ZSqWX0hyk+BLxO5hLQak9AgUjdeipsRmAN+bIQ7dnMm7YlQSbOxT6s5r673oxAC5Sf3Mk+NiJ3vLNHpcW5p7HrAvRRVPR2jQUA+UZPcGAMae10R9fgwaCmp0TEzAOkAiAZDvzaAw0gGj/cfHPtUyWKGc1jrNb5RA+ZEb97zRiLzOuxNDiXIaerfnNb1TAHWiROoYIdRQNK3AgKj5GYJixSabJ8FRmI627THGddrbRtlxnqQPopq4qy7EclIU0M0u9p1WVATyov1ckpUPWPTBC+HWI9D8bvfGbS25ZdWLf1W4qDa/KaCxJtjzbQCsRQG+WGYpcDwApiP5Vn6/L3YtmVgKuE0o5ckVuJbT/6bQ/RH6hDrZg1TKbkpYwQzOupMP4fDRh53enTH07jYAV7qGFygZdbQ0d24dMYykwAQAqxGj2aYuK1+DY6TyvLr8RDm4Tqx38RVMSRfoIcMrkOx4T5Y1nXum6XKB1XqbXKDwNAuMYwhdBNJ+7JM6z+1tvMZROf/qYcWvp6nRmQj9eSHJKmWZHIj3FtcaOd8pAoNFWjndy40brqW1CmhqLE2b4cDlgG/gC3Q0= + PGDATABASE: AgCL8A3K0CpEOQfGeOpWYjbuPzaE0q1lxoM7YYjz+/hcphSScpxLcZuxEl1DtnlWXD2xEIE7W7xzDBajiKroLUj/QjPY+ptlgNOM2IOksioHGCboewzt7Z8RmOhXX0Tx2Bk6j7dZrt5G1G5TUEATYa/vT83OZm6zCzO+HNkbX43ul3Fopm/5OqIcrUJuPFaqPiFT4fUt8KV6sV+oqBPs5zupUNKIBR6Vuhb42l3Z0EkrfIgXhYUGnwUsJjDHoOcuJDkjdxnAVlHu3no1xxtVYzbkDjyLSPTtAgMYHFf/BRkC/DDZlWBa//nN7WY5dp5oIzBFQCpmfvqY6fQDAoJPFybQx6Zo3ysGREipgEBp3LGXk95XBCceHwl5IK4A2HeEG2vLMFlswygU+sof+jHnW0tKonyEkJ1Jor16cj9C1jghX411fzTBWPFaGCNk6I2dkTd9emUsvK79foTsPn4a4M5kQwHLP/0ZgcrZpZCFgs+QyPOcrIqiI7bECz9zDIAz4nGeTRoua5vGSVRrCVJxsqu7tcctgmC1vgyggmMLN1jzltpCXmcgWmFL2gDAWw4MvxULaVNkE9pl/S1cHN5YO/C1kZ3BRnYbolX5TCUNmUOjg0ke3QWW4qtLF2kfOwKmGfAKrRfaCv66QwwwBJNQ7rMc79PkY40zzZhMsvtBgIyiQssGfJBASYJTfCzaiE7lmiSC9nGPSL4S3UZE + PGHOST: AgBQ4odEG5ttlinwhDAcFKKXN7rZgaLV8lN3rqjLPQtFsZ53xagYIGLtLM16xth1JJxMCdHh3BeJyDOHxse+gN4h2TYP2Xl8LEchwzGks1mxGUqp9gXAVp2P24hRp9q5kk09Xk8cqeXNl8I9lgfZmhqz6JTvD7yDPL86+uG7SB4/f9a5z4Dgxxq8tOaLve8VKr/G9VHhJaodO/S5LqqsmaHklf6jEQybDvuVAZP0DDBgJzLO6Ck85/mfTcqFC7BekdchyLdKDTb6LDdhPmG2MtSqLsF1EYaZ11aCW/bd96mBD5d6+GmCyhWPoTk9Xa93b+5h02WI4UJ8yMpaO3dAZg52SW7E1LlmnCxbBmvWoZNxYI0zPYhcGwF/q0yqPwQ1ATaCeSd7kog861Aw6XxdzYuZxbmSSlT0jq7/hH5z1moAtqwZjtXZY74SsG+qIasOGJrEAnT883yPP/uTPuqzx2zIut9RG1stH9TEbwCgaywwx/P2rJJpBL7zThDOmx/wUzksuu4XH+LtGtHfbUYZ7TxttqpI6zRhMzn0f1AYnccFtIS1VZwMyX5vTieitpMup+Yd7RO3oS+uhDgg5fnKCCrMljNACX5VGqqEliC/kmEGk3L2m/hY9BIly4PL/mJ7ORtqcEkEum7dzwy4ktcGIXv1lmFUhw96tOAI31esySibhmeB/m99+JHumG80N7AZEobbZ38U39vdf3/3az1FC/2KSQZHvG9JuOLj5J8xJXrOVrw2ZJdlLUzf3dY9OSr+zShZJJo= + PGPASSWORD: AgALMvZhngqTbhywxbK2I8r7E5hmJuGoizAAFO2BU24ha5iB+Ll+Mv9u91C9Z6OWzkL9IeBQ7KZayAzrOKhca+9VGrruRBrdKNJ1VJklPsB9satsiMhkRaQHW/7MpmFfY4t4c9KjahxKNd26SmOgfUBtnU8G4hdTfZg0TsCj7NXmhpbVfMuDwLef3cCOb+NnktcTqf0X2/fEr74gja9qfQOE2K2jFghJ1MhpHy5lSRh+7VWry+07WvgxyLXiUfXoV9mgpqi6EyIe3fryxmCq+6EKvAL7kf2gaLkeDTDBD94ctE49YgpBAFkob+JBg6/nmVLxWgZiDEHvSsh/Pr/nJtHe1aiZo+k0b/IrWpuhZxPYaIpnP2InSzqz44is+b66mRM3GuVNXwpY5BySyu9uuyXMwNPNbBIZgFGJF5o4MfkEgHxk3oVvsyci3xd4K4h//90T9ZNYivpgy2XU8P+9ZozAfR35h/m0yCIAEKq0O1Wl1JRJlcXdwU2hZIzVRyjWuhCCQ8ZOdLzj6H92jaAMDtGxgISzYryyLlZjxdjboNw6Z+qyF5LiBlZfWzMRwmyv6xOBEpJRc1JY9hcsysQzgD3/Q+ncNiKdVqWkSnD9fIMZeDKbHDt5RNy4CkaN58URC1d+SuA9b6WUQl9d2Wi26gQLoYcpBw5jvlGGmSflevr1WkiZ0+jo1RW8WBVCH+vFBxLYbteujcFCOYuESL9DsIU= + PGSSLMODE: AgCkUctdThUrPURx5R+cqskYur5qTA6uOqwj+7xnKzm474bm0a+lORBwxLLkLd77Px4VJLRV8KbQ0Btcj90A1PR1d4NrweRFrGeosSfsQxygTUYfY/kYEkF5hDUK69LhgmOqKG2nMOzxLpYbVaibVTRH5TD0qm+dJ6abWoLvvTvKp/P31M3hpD0qT1VEySvJX8Sn8yy5wHZNOotIMvrCjXfjxzjPYjbVwTfK6IjM0pD+6i7M+4Pq84XzvKt//rk9i2DSbYq3lhRIA9xVMuQjJy/Eg/bONCSHyxuEFXWQ78eMx85uldfGaiMU/X/H4mLikuiGasXN5b3s5gtWsgFh2J8VmU8ZDP3uhHF1o/n37UPTZoD5AnzVYqQq1DBG278KVirKdZTg6m83/xoJ/STLlSHNO83Pzp4i2aml64XHLq8lUYiiRtkvv9WGpTyyeP3L7Euam4cMCRHu81P0uddgW9mvoP08Ohra1HRHWLcQjcFw0lKyDCZ1cwjq2r0zu6cuHs2MmNyTRZx9WI+GZ0oloyO2RT2TUbnB+DJ2TSx4ADEVIgefG2CEC39kZT8L7hxQ4LneMnDRlSp8lpk5U374Fw20pJ2Tw484vVs08d2CF+LZ4yYiTXJ0jKKss84OXtKzDaSHgsK9xRvvJCsHX49KFNQa++3QYzJtM5s6n5sltK8L4/He6+qkPOA85bcSS/mQLaZxBSjkQ+OU + PGUSER: AgCQLJ/GhUudgbD0nLej7G2EXiwdCy2oe+dpb/J24vf7Ik8k0Zv39Z1agwRO9PM8i068HfD5xVIhp9Kr/QIQeiQ/CNzXyK3z2puQ4DUSU0M4RgPtpQ67hgT0WTSL5dN9xP73GoRGGCYl0uODyrwBJzxFmWtoPxdqemwK/C3T9FzNN3cEPKwNQ4g5GTwhMnqZm/esspxf2A3jCVgU2l8HL7TS2DuyV09Uzlla1JZy7Zryi9sD0NeRIY7Gm79oNALai9q01OY/EqYLm8fFU9PP1e87BpXxnsqyH/La5EJDKT84/A7zM4wZWQW5uUHjXnaRaUVo7+dUolwj9D4q70Sro48+gGY9x6keON30iAqvzd/fQCn7MPofpWE3TTxm8Io54YgfiISBPJKGUwyTQhdyByrLCC0KqkpTkumgvkgQqRXj+EreFTlqI3GDiGKZfLHj0U7FaTnhshhvvPKmpHMqm08fiSodDIbx/SKu13B3mBwbz437TDNQe6dj/Ms9gSdfWyMewQM5VWL1rDzkiDftBPPDKKk3N6NzV2ZQlX9W3H96dL16sKN7KiGl1rs4arCIbEvqaVmHzc//qUo7ktnspQYQqccYtTtvr3XelEuO2+bHJ0wqZB4BsBBE8nTUGuNq2w0r83Y2BknhW8f3H1k3CQDm7dY3qKEzFtjCZGNvzkvl+REdB0hjEFLH/ExdqLRddyH6A8rW4bT5HOB/3qtIwV3nziK9lWPlfHV2bZz1fa9pfi/uHLHXZoM8z/U= template: metadata: creationTimestamp: null From a33da16dddc9db91f9f411f422f5c48008035810 Mon Sep 17 00:00:00 2001 From: Julien Bouquillon Date: Wed, 29 Jul 2020 15:45:24 +0200 Subject: [PATCH 61/61] fix: remove envs/local --- .k8s/environments/local/app.configmap.yaml | 10 ---------- .../environments/local/app.sealed-secret.yaml | 16 --------------- .k8s/environments/local/hasura.configmap.yaml | 15 -------------- .../local/hasura.sealed-secret.yaml | 14 ------------- .k8s/environments/local/pg.sealed-secret.yaml | 20 ------------------- 5 files changed, 75 deletions(-) delete mode 100644 .k8s/environments/local/app.configmap.yaml delete mode 100644 .k8s/environments/local/app.sealed-secret.yaml delete mode 100644 .k8s/environments/local/hasura.configmap.yaml delete mode 100644 .k8s/environments/local/hasura.sealed-secret.yaml delete mode 100644 .k8s/environments/local/pg.sealed-secret.yaml diff --git a/.k8s/environments/local/app.configmap.yaml b/.k8s/environments/local/app.configmap.yaml deleted file mode 100644 index 4c0c9c62..00000000 --- a/.k8s/environments/local/app.configmap.yaml +++ /dev/null @@ -1,10 +0,0 @@ -kind: ConfigMap -apiVersion: v1 -metadata: - name: app-configmap -data: - NODE_ENV: "production" - GRAPHQL_ENDPOINT: "http://hasura/v1/graphql" - ACCOUNT_MAIL_SENDER: "contact@fabrique.social.gouv.fr" - FRONTEND_PORT: "3000" - PRODUCTION: "false" diff --git a/.k8s/environments/local/app.sealed-secret.yaml b/.k8s/environments/local/app.sealed-secret.yaml deleted file mode 100644 index ce162483..00000000 --- a/.k8s/environments/local/app.sealed-secret.yaml +++ /dev/null @@ -1,16 +0,0 @@ -kind: SealedSecret -apiVersion: bitnami.com/v1alpha1 -metadata: - name: app-sealed-secret - creationTimestamp: null - annotations: - sealedsecrets.bitnami.com/cluster-wide: "true" -spec: - template: - metadata: - name: app-sealed-secret - creationTimestamp: null - annotations: - sealedsecrets.bitnami.com/cluster-wide: "true" - encryptedData: - foo: AgBDjF9DG2mPCtpPvqusk5BwnwuF9CSlbIsPAEKwtbg0aPgRQa3lmbP+jFNc6ZiP4+Qv9QSYK3AUy1Wu3Kuj1LrDV82+1yLbJzv/Gx95SGHmjXre0Vf3CHF9aH7QBtWFAxi/45h/VDwLgO4NrpD5GumII24sNWuRCbbHLVhKOzhHfuMsHYY1ufw2fvkQpAJtd3DoshFFMM66CdAprSxZMfQ2JF4z3Qaw/grvvgKpcYhUobMvuT3qGAYO9wlQxTZB8dhBulQ9+3Pp3L9VZe/ju3Zg1e+O8ai6V32VUMtaTq+g4dsc5ntj8BzVr8rrc2bASIlyGfhnLnGL0cnNzwvAt3N0duEjT+unbGR0xAjxKdRi3jEjeRI/aLEsTHLh6jZhTpTBASGiDV8r7M5EYop948X/+5JgHe+/tZq8x2/Pap+AEtOPPU5bM8yYsLaKXf7xxImZdO8MeoDOaPx932oKtlObJvjTQRHAZMVyaZdDgBg2i/g+H6qBHTU2O+eXKJFAFAozPN7+gF6F/qHTKjFj/llryOb9POVcXUd0LTHy5rsat+rzh9GdV9n1qa7mxNDpehw7hERpGi91hW2EfiqH/xvOhD/IECeoPTIWiaxzEprUOzNboGjRY1Tf5PmnE3FjeJT/Z0F/fUi1zQzqzDoF7tYmTDr1oXqx6+INET+143epWLW1Jhe8F0cfiRc+QGVWJHKRh0w= diff --git a/.k8s/environments/local/hasura.configmap.yaml b/.k8s/environments/local/hasura.configmap.yaml deleted file mode 100644 index 8f404c60..00000000 --- a/.k8s/environments/local/hasura.configmap.yaml +++ /dev/null @@ -1,15 +0,0 @@ -kind: ConfigMap -apiVersion: v1 -metadata: - name: hasura-configmap -data: - ACCOUNT_EMAIL_SECRET: "ACCOUNT_EMAIL_SECRET" - ACCOUNT_EMAIL_WEBHOOK_URL: "http://app:3000/api/webhooks/account" - HASURA_GRAPHQL_ADMIN_SECRET: "adm1n" - HASURA_GRAPHQL_ENABLE_CONSOLE: "true" - HASURA_GRAPHQL_ENABLED_LOG_TYPES: "startup, http-log, webhook-log, websocket-log, query-log" - HASURA_GRAPHQL_JWT_SECRET: '{"type": "HS256", "key": "a_pretty_long_secret_key_that_should_be_at_least_32_char"}' - HASURA_GRAPHQL_LOG_LEVEL: "debug" - HASURA_GRAPHQL_NO_OF_RETRIES: "5" - HASURA_GRAPHQL_SERVER_PORT: "80" - HASURA_GRAPHQL_UNAUTHORIZED_ROLE: "anonymous" diff --git a/.k8s/environments/local/hasura.sealed-secret.yaml b/.k8s/environments/local/hasura.sealed-secret.yaml deleted file mode 100644 index 2b76aa72..00000000 --- a/.k8s/environments/local/hasura.sealed-secret.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: bitnami.com/v1alpha1 -kind: SealedSecret -metadata: - creationTimestamp: null - name: hasura-sealed-secret -spec: - encryptedData: {} - template: - metadata: - annotations: - sealedsecrets.bitnami.com/cluster-wide: "true" - creationTimestamp: null - name: hasura-sealed-secret - type: Opaque diff --git a/.k8s/environments/local/pg.sealed-secret.yaml b/.k8s/environments/local/pg.sealed-secret.yaml deleted file mode 100644 index 28a01840..00000000 --- a/.k8s/environments/local/pg.sealed-secret.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: bitnami.com/v1alpha1 -kind: SealedSecret -metadata: - creationTimestamp: null - name: azure-pg-admin-user -spec: - encryptedData: - DATABASE_URL: AgAG3SvDWchEgYLNTsRufT6cMfhRuJCi3J01k74eUNkAbICGmN0zdxOBjS2hT8Me5HOb2np9+layH4QJRw/TAYzrj0qmUeXoRRCfzzxcpIWCs37nF12Y3hCqBHIwIp4Qb/s9jk2gjkYOZWGfpHwaplDkOGwPGHvXJhI626hf5yIZIq7rCVhcG8MiL+xEBRW/k/9nJ+QKh70EEK31JSNyRs5eSadg3+LIKJKjYNJmzX3h61I6Bdc727evA4iM8YNPbJ2XpFNZ4e3kDv85se8DdjCMjtKvXHg5Cb/trYto3iBH9BkhajOTomQlcFSk1tqA2hD3WVI5PaLqMC4PlbLAy+THLNTHUQvkjTuxnDXbW4ZKbizYvHQjq14h3S8RpmOxO1UZAzdPyhxJRVNPche4hdMmMnsy0Vwt0aH7CjhBp/LBRgWhAGAuJyr6jcM406HnXoroCiblh0PHSJa4PuiS5TZRCZt1XKbOgB0L4TCCIPrsnU3up5ja07N5rAGcMExHcR8TV4kU+6s1AOEB/1O1MqvMAXcHQnigYYCDwLMu73OMsEmRAATUtUOoaUJe1T0dT7tkM048+MzRg89Z6WJ9uwA0UDZWFbsjzSw3YTvmeLep8A01U1xNWMfM489qnN4nQ8mrSVSBmyvaSA3evE5OXs6Nnuk2QLQzD8ncYHmh0mwl6o56yPAlMIVBSmOHn5DVFFTwK644LtFJofd/LsYpRCOGhKuFF0dPizyOwSav9aTfYOD36sQjvPya1Yn4PLfECUsbFs2nekpJz9j3r9Q/6AskGKrTC2UwIWHCT7LZ56D967BgF+QvYOAlkKAeesE/0Djvm3IPfEZXCPswjWhQ0YH3sKB8laFmWSKfGcGxjRkluSYjjg== - PGDATABASE: AgCYuZ32FAlfM/4PzwYo82TCMa/zjqoS+OYThLKJbhAABpeRnDeWto+8E1jYhJYSnwIKTw32Zm6WGe2XFi2nfKhxOZi0+lzSzyLzGK4Z/fus1PhgBmvdKOeE/Y167GspE+PNS0Ju+JL6CPIBEX16mbfEycbFJxowXbJcxGJJ1LhYNvqNVnS2SnP9URe5QPki1PHN2blcSBxrPTfY0efufm+0s5MbTVcHwh9eXBrBBV0jO2y6GW5PfWLgl6vv1RpVsUJgNEcxPWKGt430t4Wof0PaMhBQQeXk4FOXET9QBsgFVbaQCOXqtGB1HSc+q+ZGbE7OFjP5q9Q0QifcLTg7lzzkrqH542joTgNjWc6pMgJismNbBLFGRULumdaPs3c7dWeFklicmFARPII2JhigHKuh5C5JEEYdtaeX0FPjy+WKstjHjZrKHTGgojI0Y/SDRyEK8UeZBZotqWsqvwdB6RX/8Wb+3mwzQrNWoOqDMbgi32wALyt/nvWu6epvg1GSfTSQ5YpHS0QNnOab5z93M6JqFxjhjnkDxBQC/bjoYbU8VRanSve8x5WAZ0FAh/4JJKgedwmZ1oTh7r4Hvzmq/31IGG009yAnR6Pu64hP2YJl+9lTOZS2RuHkW84tVP7jGTQOxmzh3ewtFgkzAOGefvKkmmOEXugjw40q2VNd92P2bkgAZs0BoVbQOzkQZmrEJh3+3dWwuS0yIw== - PGHOST: AgAkPATmbfX0+lrLdbSccDKSz5kYwJjinCmowPNMuYTSIHtuxqt3migh0rwFOwt7GF4Mc7lif18JR6v1upXAEzsSQ2YIT37LqHgbBxzkQvoOmLNVPHeMV0hujWXsxncMtoIOwm8J3hgAQVqn7ah6T+axz3WeKGHIp7GOQOy7ZJsPQtpeIm/I58ULffvGxuo5MTybo9lQ1x74ULJ0b7q3z5/cRsdf08WncJX67JLl5yBypFhee86BdE4aBvV2ORy4nLY/2sCt/ZFhg+5zEJaoHdVlGxZRF4zTsiYj7nEGWuw7fSFTVcvAiBC30jrLRCj7hMWq+mxeyHsjvI/O+6nfEiDIfAdoBFRTBLTnVJZaUZkfrvnvOmTEEX47fkSmSkNv00ti4Z6uwrgBGUj7axODeLZuzQATs0LXwNou+OsoUkv+gLxlLkbr+uGLr2XAWI0vQJpyMGnt/H00OI8C/A+Hw5YQJM9nNKIljXmqJDzcuh0snmXrY/u/9g1Gv2u14fOExZCm80dhAeiGp94QaWYC7hYaOXeE0lCIDnQI2T7DE4LRopqq0oYkrQdyM4xe7MNCWu+quvzY57rZUO3VL+aZHNhLvARmri+7P9T5st5J8CwOBxmyBxSCB/ltJIBOfkvl3sZcvBLp1XI+366t7RlYdktTvCr8WbzsU2GdLcmHU0Yf4SySziJFaar58aW1+7lbYMsfoq4v5CuWWNjPVphIu2zncrDHTM6T4HBb2ki/aBg04ZR6FFHKehwNvyNJBfBy6rERtQ== - PGPASSWORD: AgC6F1Vg9nr6E7X1w/Tlvnlx8YKOcpVQicdPQhbOhojYyKF9YUMF+OhMcobu5MzaRqDbu+TGIn/cQGwbs90Wk+lGbQ5MRudEVyZMVVcZz1PijmAkbh4JkmLYBvMqAk6J0foHmcZG/3bzojzbOAQZy8Xc5kIFTQlcLCf5i7ELaUXubnJXngtnTxPxv23otVRTSYd2oAuO7EDbPJxyMlwCtMeUbnrbiBcpGCfCcbLiyWM7uikmsy6645DzEjQJ0D8q8bh2M+Ooz4a43G7VSxXDygoKr0MoRhrTTmpOXK7UJwt2e6ZRZj6sWmbNVFgBwQopn4csIzM+qPtF6c3WuEd2ffDDMgubA8ma6UCRZCYyrg7wEFxx1yd+HXf7VNg6kItmWGqrzfy66gPQlNqen0pNFLlVMWe1jLi0Un0nayRTRCI+AcGctZjY1s9QTkxOXXYUsBNUbYf/zKgr7kiJc5ZIR26UuiMj/yuXWBmHDgzhuNQQWWiHpsoUCj3Y6ZUN9wt3cNi2rXAWS3YGhidd6pyjaJx25weNqxbAICksyGI5nnZ+JUgOvpqFioEv/1cL/m+NTlp33nUWk3SvhMLJPu2if8rIo059gRWtU+QNtu0u2vLOdg3mEWrbzuuDCG7tVoO6YJBq3p2molf1+x7P7qNf0uIG4mnfFXJEUlHELqwswEY7ZFC83AfAtFvG2IIeaoWIdfhd4SZyxSaxZ+np15FUIRwnS6jI/jseNScxj0W22E2Y7pWz6UMApBe0 - PGSSLMODE: AgCuL/IR2M2KOkLGSjLtu1mXk7K6z4Vl+fsnko+9n/7o61fBZrtJSiXiL2APg0jCL9SfALrTNQUWiqgMtpCc76hoKKD5AgWwMydYaR+pw5CFql3qKJQJ0xGJ4X34C31suJYkWQq2nof53JYssGMDq8TyvG6+vkXAPkdl2/98taTvbyz/vNKU5gRPdizyfSV9Xonntw3KyaQ3yqj+/dD8LEUm4w/TCVhYb2jVrPIinoJiIrxtIs99d/dJIHB+nDSXkF3paPNJ2OSEvMTfLXUYM/ZNHAq+kPh1vyDKMrtfxxM1Rq0SgbuPXNfZOuLtdch2VUewZGqYqpBUtKoSNOUFwLs2qwdK62tvFyGnJP2dWmekO2KGyKe9mHvyMGIHW/W1hxTiYOK5xW0qvobgEWCmgAloj3k3xDqQ0eD7qc2OlUQtvqBFzQETjwaV59wNJsqOUHQI9gQBsfeCE3o7UbghpPSAQvCFwMOUQxuWOdm8gc6d3F0dTsIIiJ/xydnqMxdfMyogno4g9Q8VEUkUux9Ui4vAp5Z9psucYYMNc8sgDxA09BVtZgtKpm8RFf3QO0tcSaHjz5+cb5iuLxQ2EnU4HLJ1gZ+MpFOvcxUV4apSKsX2Y7VJZcbePB+FQiZT6u4Dsx1HyuYnA2nYku93XkDdlXrxsCL7ThkDgtlfNz1JFm1LX1g5i+nlu+/HfkbtdtKMAI7yqhrZsbcO - PGUSER: AgBtaw5O4rJRlik4q2qU+OfvMBgQH6X7MfDS8OdqhoZSwT0diM4o0bW8vmwhhYYsd7BBOUFnDDSFiiqNn7/TgwP+KJEjZEel8Aea+zn3C5v7bJ0oTiJozQzjcURXnhPjQfR9O/LRoBqHvisxMNYf2fxbxR/oKrhvLUd6YihFwdOlqPql4o86fh/BIjA9XRXLX8YwG3eQq4G2396HcaI4Ufm1s0IuGUFsZYWUY56CKFH4UQDsnI+bH+WvBRDkhifQXvWFTz2iyb2cwi6oUmnzGWNG93vxAv88auLpj4/5gkcjCLHUNgzKfk+A8cYszU9wZLo4Lmdz9sHks20slxTmQwf/S8TCfFpaoDO4MJKFnG+h8KnPIf0PazHVguJp3frYuXc0rvk4pyBlekUIkPKWTzh3p81iQCYbhHXTKaSdX7ksBC/gVvu/0Z9s5KjSSnqWkkLpTtIdygiTt99+FGnjmYHBRcDOm1mhH0s6wscv9pMprQzZQvLx1+JMT7ibYwdE+xG5bTrDoOiYV675tIqVGorniU/Lj/BjlcB0ByLCvEjLfWZm6bKs0EtPfJXC7m4ISUW4XeY86qJyR/FiIcx0ymbiK9UIGqEG64Nw+6qml6qDIHag2vJZdqPiUN32j7m246255Y76ZqdUl5gWVrXcrRudgbS09yDQ83LsZGL6d4tN9aYXfGY93zyHfS3lh3Z5bY+/ENKPstLiFH3mIsfiDTl3ATLvi+CoKnkz4IAOfkGK89Kz2HokXYe5ug== - template: - metadata: - annotations: - sealedsecrets.bitnami.com/cluster-wide: "true" - creationTimestamp: null - name: azure-pg-admin-user - type: Opaque