From f5e553d851d4d76dfde3abc8a03aaab0b59d0811 Mon Sep 17 00:00:00 2001 From: Douglas DUTEIL Date: Mon, 14 Jun 2021 16:15:52 +0200 Subject: [PATCH] fix(build): update @socialgouv/kosko-charts (minor) --- .../kosko generate --env prod.ts.snap | 60 +++++++++---------- .k8s/package.json | 2 +- .k8s/yarn.lock | 18 ++++-- 3 files changed, 45 insertions(+), 35 deletions(-) diff --git a/.k8s/__tests__/__snapshots__/kosko generate --env prod.ts.snap b/.k8s/__tests__/__snapshots__/kosko generate --env prod.ts.snap index 0e076bbf..1b5b531f 100644 --- a/.k8s/__tests__/__snapshots__/kosko generate --env prod.ts.snap +++ b/.k8s/__tests__/__snapshots__/kosko generate --env prod.ts.snap @@ -9,8 +9,8 @@ metadata: kapp.k14s.io/disable-default-ownership-label-rules: '' kapp.k14s.io/disable-default-label-scoping-rules: '' app.gitlab.com/app: socialgouv-sample-next-app - app.gitlab.com/env: prod2 - app.gitlab.com/env.name: prod2 + app.gitlab.com/env: prod + app.gitlab.com/env.name: prod labels: app: app application: sample-next-app @@ -29,8 +29,8 @@ spec: kapp.k14s.io/disable-default-ownership-label-rules: '' kapp.k14s.io/disable-default-label-scoping-rules: '' app.gitlab.com/app: socialgouv-sample-next-app - app.gitlab.com/env: prod2 - app.gitlab.com/env.name: prod2 + app.gitlab.com/env: prod + app.gitlab.com/env.name: prod labels: app: app application: sample-next-app @@ -89,8 +89,8 @@ metadata: kapp.k14s.io/disable-default-ownership-label-rules: '' kapp.k14s.io/disable-default-label-scoping-rules: '' app.gitlab.com/app: socialgouv-sample-next-app - app.gitlab.com/env: prod2 - app.gitlab.com/env.name: prod2 + app.gitlab.com/env: prod + app.gitlab.com/env.name: prod labels: application: sample-next-app owner: sample-next-app @@ -111,8 +111,8 @@ spec: kapp.k14s.io/disable-default-ownership-label-rules: '' kapp.k14s.io/disable-default-label-scoping-rules: '' app.gitlab.com/app: socialgouv-sample-next-app - app.gitlab.com/env: prod2 - app.gitlab.com/env.name: prod2 + app.gitlab.com/env: prod + app.gitlab.com/env.name: prod labels: application: sample-next-app owner: sample-next-app @@ -127,8 +127,8 @@ metadata: kapp.k14s.io/disable-default-ownership-label-rules: '' kapp.k14s.io/disable-default-label-scoping-rules: '' app.gitlab.com/app: socialgouv-sample-next-app - app.gitlab.com/env: prod2 - app.gitlab.com/env.name: prod2 + app.gitlab.com/env: prod + app.gitlab.com/env.name: prod labels: application: sample-next-app owner: sample-next-app @@ -154,8 +154,8 @@ metadata: kapp.k14s.io/disable-default-ownership-label-rules: '' kapp.k14s.io/disable-default-label-scoping-rules: '' app.gitlab.com/app: socialgouv-sample-next-app - app.gitlab.com/env: prod2 - app.gitlab.com/env.name: prod2 + app.gitlab.com/env: prod + app.gitlab.com/env.name: prod namespace: sample-next-app spec: ports: @@ -176,8 +176,8 @@ metadata: kapp.k14s.io/disable-default-ownership-label-rules: '' kapp.k14s.io/disable-default-label-scoping-rules: '' app.gitlab.com/app: socialgouv-sample-next-app - app.gitlab.com/env: prod2 - app.gitlab.com/env.name: prod2 + app.gitlab.com/env: prod + app.gitlab.com/env.name: prod labels: app: app application: sample-next-app @@ -206,8 +206,8 @@ metadata: kapp.k14s.io/disable-default-ownership-label-rules: '' kapp.k14s.io/disable-default-label-scoping-rules: '' app.gitlab.com/app: socialgouv-sample-next-app - app.gitlab.com/env: prod2 - app.gitlab.com/env.name: prod2 + app.gitlab.com/env: prod + app.gitlab.com/env.name: prod labels: app: hasura application: sample-next-app @@ -226,8 +226,8 @@ spec: kapp.k14s.io/disable-default-ownership-label-rules: '' kapp.k14s.io/disable-default-label-scoping-rules: '' app.gitlab.com/app: socialgouv-sample-next-app - app.gitlab.com/env: prod2 - app.gitlab.com/env.name: prod2 + app.gitlab.com/env: prod + app.gitlab.com/env.name: prod labels: app: hasura application: sample-next-app @@ -304,8 +304,8 @@ metadata: kapp.k14s.io/disable-default-ownership-label-rules: '' kapp.k14s.io/disable-default-label-scoping-rules: '' app.gitlab.com/app: socialgouv-sample-next-app - app.gitlab.com/env: prod2 - app.gitlab.com/env.name: prod2 + app.gitlab.com/env: prod + app.gitlab.com/env.name: prod labels: application: sample-next-app owner: sample-next-app @@ -327,8 +327,8 @@ spec: kapp.k14s.io/disable-default-ownership-label-rules: '' kapp.k14s.io/disable-default-label-scoping-rules: '' app.gitlab.com/app: socialgouv-sample-next-app - app.gitlab.com/env: prod2 - app.gitlab.com/env.name: prod2 + app.gitlab.com/env: prod + app.gitlab.com/env.name: prod labels: application: sample-next-app owner: sample-next-app @@ -343,8 +343,8 @@ metadata: kapp.k14s.io/disable-default-ownership-label-rules: '' kapp.k14s.io/disable-default-label-scoping-rules: '' app.gitlab.com/app: socialgouv-sample-next-app - app.gitlab.com/env: prod2 - app.gitlab.com/env.name: prod2 + app.gitlab.com/env: prod + app.gitlab.com/env.name: prod labels: application: sample-next-app owner: sample-next-app @@ -371,8 +371,8 @@ metadata: kapp.k14s.io/disable-default-ownership-label-rules: '' kapp.k14s.io/disable-default-label-scoping-rules: '' app.gitlab.com/app: socialgouv-sample-next-app - app.gitlab.com/env: prod2 - app.gitlab.com/env.name: prod2 + app.gitlab.com/env: prod + app.gitlab.com/env.name: prod namespace: sample-next-app spec: ports: @@ -390,8 +390,8 @@ metadata: name: azure-pg-user annotations: app.gitlab.com/app: socialgouv-sample-next-app - app.gitlab.com/env: prod2 - app.gitlab.com/env.name: prod2 + app.gitlab.com/env: prod + app.gitlab.com/env.name: prod labels: application: sample-next-app owner: sample-next-app @@ -419,8 +419,8 @@ spec: name: azure-pg-user annotations: app.gitlab.com/app: socialgouv-sample-next-app - app.gitlab.com/env: prod2 - app.gitlab.com/env.name: prod2 + app.gitlab.com/env: prod + app.gitlab.com/env.name: prod labels: application: sample-next-app owner: sample-next-app diff --git a/.k8s/package.json b/.k8s/package.json index a3f9f375..d40f1bb5 100644 --- a/.k8s/package.json +++ b/.k8s/package.json @@ -9,7 +9,7 @@ "dependencies": { "@kosko/env": "^2.0.1", "@kubernetes-models/sealed-secrets": "^1.6.3", - "@socialgouv/kosko-charts": "^6.0.2", + "@socialgouv/kosko-charts": "^6.1.0", "@types/node": "^15.12.2", "kosko": "^1.1.5", "kubernetes-models": "^1.7.1", diff --git a/.k8s/yarn.lock b/.k8s/yarn.lock index f16bf624..1cab4a88 100644 --- a/.k8s/yarn.lock +++ b/.k8s/yarn.lock @@ -657,12 +657,13 @@ dependencies: "@sinonjs/commons" "^1.7.0" -"@socialgouv/kosko-charts@^6.0.2": - version "6.0.2" - resolved "https://registry.yarnpkg.com/@socialgouv/kosko-charts/-/kosko-charts-6.0.2.tgz#bc64d93b3ce57bdb90d456fb7d5fefebd42789d9" - integrity sha512-JH3tfmjqqBu8gbLx33ynWbBBEAq/j6NjV2l6oxmezkrPOTpeU4ltxsLYnF9/UsMxqWY91t+RdUG3QVk/KEjsTA== +"@socialgouv/kosko-charts@^6.1.0": + version "6.1.0" + resolved "https://registry.yarnpkg.com/@socialgouv/kosko-charts/-/kosko-charts-6.1.0.tgz#a51e4cae9e8f9fb641d120607342150f87cc5792" + integrity sha512-+3Q0SRD2nhteEjuD+VmxwJ3FA2UpjRb117BOtWh8YUcJzvDsxiMsC99dcnXGn//A9Roa7vaMxAMvzOFG+CzrKw== dependencies: "@sindresorhus/is" "^4.0.0" + fs-extra "^10.0.0" "@tootallnate/once@1": version "1.1.2" @@ -1477,6 +1478,15 @@ form-data@^3.0.0: combined-stream "^1.0.8" mime-types "^2.1.12" +fs-extra@^10.0.0: + version "10.0.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.0.tgz#9ff61b655dde53fb34a82df84bb214ce802e17c1" + integrity sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ== + dependencies: + graceful-fs "^4.2.0" + jsonfile "^6.0.1" + universalify "^2.0.0" + fs-extra@^9.1.0: version "9.1.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"