Unverified Commit 5aeabc58 authored by Julien Bouquillon's avatar Julien Bouquillon 🐫 Committed by GitHub
Browse files

fix(ci): upgrade kube 1.2 (#85)

parent 392d9e70
Pipeline #132593 passed with stages
in 1 minute and 22 seconds
......@@ -6,6 +6,8 @@ apiVersion: v1
kind: Namespace
metadata:
annotations:
socialgouv/creator: autodevops
janitor/ttl: 15d
field.cattle.io/creatorId: gitlab
field.cattle.io/projectId: c-bd7z2:p-7ms8p
git/branch: master
......@@ -17,6 +19,7 @@ metadata:
labels:
azure-pg-admin-user: recherche-entreprises
application: master-dev42-recherche-entreprises
component: master-dev42-recherche-entreprises
owner: recherche-entreprises
team: recherche-entreprises
cert: wildcard
......@@ -34,6 +37,7 @@ metadata:
labels:
app: recherche-entreprises-api
application: master-dev42-recherche-entreprises
component: master-dev42-recherche-entreprises
owner: recherche-entreprises
team: recherche-entreprises
cert: wildcard
......@@ -55,6 +59,7 @@ spec:
labels:
app: recherche-entreprises-api
application: master-dev42-recherche-entreprises
component: master-dev42-recherche-entreprises
owner: recherche-entreprises
team: recherche-entreprises
cert: wildcard
......@@ -113,6 +118,7 @@ metadata:
app.gitlab.com/env.name: master-dev42
labels:
application: master-dev42-recherche-entreprises
component: master-dev42-recherche-entreprises
owner: recherche-entreprises
team: recherche-entreprises
cert: wildcard
......@@ -135,6 +141,7 @@ spec:
name: elastic-recherche-entreprises-read
labels:
application: master-dev42-recherche-entreprises
component: master-dev42-recherche-entreprises
owner: recherche-entreprises
team: recherche-entreprises
cert: wildcard
......@@ -146,6 +153,7 @@ metadata:
labels:
app: recherche-entreprises-api
application: master-dev42-recherche-entreprises
component: master-dev42-recherche-entreprises
owner: recherche-entreprises
team: recherche-entreprises
cert: wildcard
......@@ -166,7 +174,7 @@ spec:
app: recherche-entreprises-api
type: ClusterIP
---
apiVersion: extensions/v1beta1
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
annotations:
......@@ -179,6 +187,7 @@ metadata:
labels:
app: recherche-entreprises-api
application: master-dev42-recherche-entreprises
component: master-dev42-recherche-entreprises
owner: recherche-entreprises
team: recherche-entreprises
cert: wildcard
......@@ -190,9 +199,12 @@ spec:
http:
paths:
- backend:
serviceName: recherche-entreprises-api
servicePort: 80
service:
name: recherche-entreprises-api
port:
name: http
path: /
pathType: Prefix
tls:
- hosts:
- api-master-dev42-recherche-entreprises.dev42.fabrique.social.gouv.fr
......
......@@ -13,6 +13,7 @@ metadata:
app.gitlab.com/env.name: master-dev42
labels:
application: master-dev42-recherche-entreprises
component: master-dev42-recherche-entreprises
owner: recherche-entreprises
team: recherche-entreprises
cert: wildcard
......@@ -33,6 +34,7 @@ spec:
name: elastic-recherche-entreprises-write
labels:
application: master-dev42-recherche-entreprises
component: master-dev42-recherche-entreprises
owner: recherche-entreprises
team: recherche-entreprises
cert: wildcard
......@@ -282,6 +284,7 @@ metadata:
app.gitlab.com/env.name: master-dev42
labels:
application: master-dev42-recherche-entreprises
component: master-dev42-recherche-entreprises
owner: recherche-entreprises
team: recherche-entreprises
cert: wildcard
......@@ -297,6 +300,7 @@ metadata:
app.gitlab.com/env.name: master-dev42
labels:
application: master-dev42-recherche-entreprises
component: master-dev42-recherche-entreprises
owner: recherche-entreprises
team: recherche-entreprises
cert: wildcard
......@@ -372,6 +376,7 @@ spec:
app.gitlab.com/env.name: master-dev42
labels:
application: master-dev42-recherche-entreprises
component: master-dev42-recherche-entreprises
owner: recherche-entreprises
team: recherche-entreprises
cert: wildcard
......
......@@ -12,6 +12,7 @@ metadata:
app.gitlab.com/env.name: preprod-dev42
labels:
application: v1-2-3-recherche-entreprises
component: v1-2-3-recherche-entreprises
owner: recherche-entreprises
team: recherche-entreprises
cert: wildcard
......@@ -31,6 +32,7 @@ spec:
name: elastic-recherche-entreprises-write
labels:
application: v1-2-3-recherche-entreprises
component: v1-2-3-recherche-entreprises
owner: recherche-entreprises
team: recherche-entreprises
cert: wildcard
......@@ -280,6 +282,7 @@ metadata:
app.gitlab.com/env.name: preprod-dev42
labels:
application: v1-2-3-recherche-entreprises
component: v1-2-3-recherche-entreprises
owner: recherche-entreprises
team: recherche-entreprises
cert: wildcard
......@@ -295,6 +298,7 @@ metadata:
app.gitlab.com/env.name: preprod-dev42
labels:
application: v1-2-3-recherche-entreprises
component: v1-2-3-recherche-entreprises
owner: recherche-entreprises
team: recherche-entreprises
cert: wildcard
......@@ -370,6 +374,7 @@ spec:
app.gitlab.com/env.name: preprod-dev42
labels:
application: v1-2-3-recherche-entreprises
component: v1-2-3-recherche-entreprises
owner: recherche-entreprises
team: recherche-entreprises
cert: wildcard
......
......@@ -12,6 +12,7 @@ metadata:
app.gitlab.com/env.name: preprod-dev42
labels:
application: v1-2-3-recherche-entreprises
component: v1-2-3-recherche-entreprises
owner: recherche-entreprises
team: recherche-entreprises
cert: wildcard
......@@ -31,6 +32,7 @@ spec:
name: elastic-recherche-entreprises-write
labels:
application: v1-2-3-recherche-entreprises
component: v1-2-3-recherche-entreprises
owner: recherche-entreprises
team: recherche-entreprises
cert: wildcard
......@@ -280,6 +282,7 @@ metadata:
app.gitlab.com/env.name: preprod-dev42
labels:
application: v1-2-3-recherche-entreprises
component: v1-2-3-recherche-entreprises
owner: recherche-entreprises
team: recherche-entreprises
cert: wildcard
......@@ -295,6 +298,7 @@ metadata:
app.gitlab.com/env.name: preprod-dev42
labels:
application: v1-2-3-recherche-entreprises
component: v1-2-3-recherche-entreprises
owner: recherche-entreprises
team: recherche-entreprises
cert: wildcard
......@@ -372,6 +376,7 @@ spec:
app.gitlab.com/env.name: preprod-dev42
labels:
application: v1-2-3-recherche-entreprises
component: v1-2-3-recherche-entreprises
owner: recherche-entreprises
team: recherche-entreprises
cert: wildcard
......
......@@ -6,6 +6,7 @@ apiVersion: v1
kind: Namespace
metadata:
annotations:
socialgouv/creator: autodevops
field.cattle.io/creatorId: gitlab
field.cattle.io/projectId: c-bd7z2:p-7ms8p
git/branch: v1.2.3
......@@ -17,6 +18,7 @@ metadata:
labels:
azure-pg-admin-user: recherche-entreprises
application: v1-2-3-recherche-entreprises
component: v1-2-3-recherche-entreprises
owner: recherche-entreprises
team: recherche-entreprises
cert: wildcard
......@@ -34,6 +36,7 @@ metadata:
labels:
app: recherche-entreprises-api
application: v1-2-3-recherche-entreprises
component: v1-2-3-recherche-entreprises
owner: recherche-entreprises
team: recherche-entreprises
cert: wildcard
......@@ -55,6 +58,7 @@ spec:
labels:
app: recherche-entreprises-api
application: v1-2-3-recherche-entreprises
component: v1-2-3-recherche-entreprises
owner: recherche-entreprises
team: recherche-entreprises
cert: wildcard
......@@ -112,6 +116,7 @@ metadata:
app.gitlab.com/env.name: preprod-dev42
labels:
application: v1-2-3-recherche-entreprises
component: v1-2-3-recherche-entreprises
owner: recherche-entreprises
team: recherche-entreprises
cert: wildcard
......@@ -134,6 +139,7 @@ spec:
name: elastic-recherche-entreprises-read
labels:
application: v1-2-3-recherche-entreprises
component: v1-2-3-recherche-entreprises
owner: recherche-entreprises
team: recherche-entreprises
cert: wildcard
......@@ -145,6 +151,7 @@ metadata:
labels:
app: recherche-entreprises-api
application: v1-2-3-recherche-entreprises
component: v1-2-3-recherche-entreprises
owner: recherche-entreprises
team: recherche-entreprises
cert: wildcard
......@@ -165,7 +172,7 @@ spec:
app: recherche-entreprises-api
type: ClusterIP
---
apiVersion: extensions/v1beta1
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
annotations:
......@@ -178,6 +185,7 @@ metadata:
labels:
app: recherche-entreprises-api
application: v1-2-3-recherche-entreprises
component: v1-2-3-recherche-entreprises
owner: recherche-entreprises
team: recherche-entreprises
cert: wildcard
......@@ -189,9 +197,12 @@ spec:
http:
paths:
- backend:
serviceName: recherche-entreprises-api
servicePort: 80
service:
name: recherche-entreprises-api
port:
name: http
path: /
pathType: Prefix
tls:
- hosts:
- api-preprod-recherche-entreprises.dev42.fabrique.social.gouv.fr
......
......@@ -14,6 +14,7 @@ metadata:
labels:
app: recherche-entreprises-api
application: recherche-entreprises
component: recherche-entreprises
owner: recherche-entreprises
team: recherche-entreprises
name: recherche-entreprises-api
......@@ -34,6 +35,7 @@ spec:
labels:
app: recherche-entreprises-api
application: recherche-entreprises
component: recherche-entreprises
owner: recherche-entreprises
team: recherche-entreprises
spec:
......@@ -89,6 +91,7 @@ metadata:
app.gitlab.com/env.name: prod
labels:
application: recherche-entreprises
component: recherche-entreprises
owner: recherche-entreprises
team: recherche-entreprises
namespace: recherche-entreprises
......@@ -109,6 +112,7 @@ spec:
app.gitlab.com/env.name: prod
labels:
application: recherche-entreprises
component: recherche-entreprises
owner: recherche-entreprises
team: recherche-entreprises
type: Opaque
......@@ -119,6 +123,7 @@ metadata:
labels:
app: recherche-entreprises-api
application: recherche-entreprises
component: recherche-entreprises
owner: recherche-entreprises
team: recherche-entreprises
name: recherche-entreprises-api
......@@ -138,12 +143,12 @@ spec:
app: recherche-entreprises-api
type: ClusterIP
---
apiVersion: extensions/v1beta1
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
annotations:
kubernetes.io/ingress.class: nginx
certmanager.k8s.io/cluster-issuer: letsencrypt-prod
cert-manager.io/cluster-issuer: letsencrypt-prod
kubernetes.io/tls-acme: 'true'
kapp.k14s.io/disable-default-ownership-label-rules: ''
kapp.k14s.io/disable-default-label-scoping-rules: ''
......@@ -153,6 +158,7 @@ metadata:
labels:
app: recherche-entreprises-api
application: recherche-entreprises
component: recherche-entreprises
owner: recherche-entreprises
team: recherche-entreprises
name: recherche-entreprises-api
......@@ -163,9 +169,12 @@ spec:
http:
paths:
- backend:
serviceName: recherche-entreprises-api
servicePort: 80
service:
name: recherche-entreprises-api
port:
name: http
path: /
pathType: Prefix
tls:
- hosts:
- api-recherche-entreprises.fabrique.social.gouv.fr
......@@ -177,9 +186,6 @@ metadata:
name: default
namespace: recherche-entreprises
spec:
podSelector: {}
policyTypes:
- Ingress
ingress:
- from:
- namespaceSelector:
......@@ -193,5 +199,8 @@ spec:
- namespaceSelector:
matchLabels:
network-policy/source: monitoring
podSelector: {}
policyTypes:
- Ingress
"
`;
......@@ -207,21 +207,21 @@ const job = new Job({
const envParams = gitlab(process.env);
updateMetadata(configMap, {
annotations: envParams.annotations ?? {},
labels: envParams.labels ?? {},
namespace: envParams.namespace,
annotations: envParams.metadata.annotations ?? {},
labels: envParams.metadata.labels ?? {},
namespace: envParams.metadata.namespace,
});
updateMetadata(job, {
annotations: envParams.annotations ?? {},
labels: envParams.labels ?? {},
namespace: envParams.namespace,
annotations: envParams.metadata.annotations ?? {},
labels: envParams.metadata.labels ?? {},
namespace: envParams.metadata.namespace,
});
updateMetadata(sealedSecret, {
annotations: envParams.annotations ?? {},
labels: envParams.labels ?? {},
namespace: envParams.namespace,
annotations: envParams.metadata.annotations ?? {},
labels: envParams.metadata.labels ?? {},
namespace: envParams.metadata.namespace,
});
addInitContainer(job, initContainer);
......
......@@ -8,11 +8,11 @@
},
"dependencies": {
"@kosko/env": "^2.0.1",
"@kubernetes-models/sealed-secrets": "^1.6.3",
"@socialgouv/kosko-charts": "^6.1.8",
"@kubernetes-models/sealed-secrets": "^2.0.2",
"@socialgouv/kosko-charts": "^9.5.5",
"@types/node": "^15.12.2",
"kosko": "^1.1.5",
"kubernetes-models": "^1.7.1",
"kubernetes-models": "^2.0.2",
"ts-node": "^10.0.0",
"typescript": "^4.3.2"
},
......
......@@ -597,33 +597,33 @@
node-fetch "^2.6.1"
tslib "^2.1.0"
"@kubernetes-models/base@^1.5.5":
version "1.5.5"
resolved "https://registry.yarnpkg.com/@kubernetes-models/base/-/base-1.5.5.tgz#6bff274f32e081d15f084853be1322380d2a41b2"
integrity sha512-0XoupDEOE+qOy3BpAprcqGuI8CmRW1KwVDfXPsfUkU1uxo6fwv5VeNVzTJ0MHESLUNybgQdbdnm+iysbyFBuug==
"@kubernetes-models/base@2.0.1":
version "2.0.1"
resolved "https://registry.yarnpkg.com/@kubernetes-models/base/-/base-2.0.1.tgz#162a0d4e68d97e70a1b8cc3df4ac64697d97ed9f"
integrity sha512-vaQgb8n4a/yrsVbuxc1M0X3revKkn9apJcgcjtn13mgmaA/P2SNtWrOOeRjE+U8LpYjGREDf24VLL5fl55AGRw==
dependencies:
"@kubernetes-models/validate" "^1.6.0"
"@kubernetes-models/validate" "2.0.1"
is-plain-object "^5.0.0"
tslib "^2.2.0"
tslib "^2.3.0"
"@kubernetes-models/sealed-secrets@^1.6.3":
version "1.6.3"
resolved "https://registry.yarnpkg.com/@kubernetes-models/sealed-secrets/-/sealed-secrets-1.6.3.tgz#21aea46a2a8e91ccc3b3eb6310df7bd086fbdf80"
integrity sha512-n/QT4Yxtfooo+xthZaO4ewIRP+UXbdh6h+CI6gGmYVsjR0pGSai9eI9D+KDYrexlVOM0FqoZgIm1+DAVsrv5VA==
"@kubernetes-models/sealed-secrets@^2.0.2":
version "2.0.2"
resolved "https://registry.yarnpkg.com/@kubernetes-models/sealed-secrets/-/sealed-secrets-2.0.2.tgz#76fda974c52abc6cf3414b32ab4243819889c005"
integrity sha512-Nsxc7Hj7hUydp6NYbmpDlr3nhBLCQtrisZ05QF3g8gL9ctKrRh7Djz0QaJlcN+rueDfR0fBdfqM8Nz/EE7RezA==
dependencies:
"@kubernetes-models/base" "^1.5.5"
"@kubernetes-models/validate" "^1.6.0"
kubernetes-models "^1.7.1"
tslib "^2.2.0"
"@kubernetes-models/base" "2.0.1"
"@kubernetes-models/validate" "2.0.1"
kubernetes-models "2.0.2"
tslib "^2.3.0"
"@kubernetes-models/validate@^1.6.0":
version "1.6.0"
resolved "https://registry.yarnpkg.com/@kubernetes-models/validate/-/validate-1.6.0.tgz#d8189ff268bd73a13d717d83fde1ff0ef64207f0"
integrity sha512-OIZ7X42s9UDr9scSuqzlHMAfHq7g2ZQ5XeivJN9Ozy5L7QkaT13Um4bbLrbGFeUJlhQMWfUbBxXbEBIB4ggQ6A==
"@kubernetes-models/validate@2.0.1":
version "2.0.1"
resolved "https://registry.yarnpkg.com/@kubernetes-models/validate/-/validate-2.0.1.tgz#fe421a08733ff7018f882c1e58a3b7a337964379"
integrity sha512-jAXVwj1MJ3T2kEF3l0TYWDvzjVm4z9C7hWxgHKPoNu6zW5/BPxeYhxbCKtXrYRY4WaGWqVUF/6ogwK/vfuisVA==
dependencies:
ajv "^8.5.0"
ajv "^8.6.2"
ajv-formats "^2.1.0"
tslib "^2.2.0"
tslib "^2.3.0"
"@nodelib/fs.scandir@2.1.5":
version "2.1.5"
......@@ -665,13 +665,16 @@
dependencies:
"@sinonjs/commons" "^1.7.0"
"@socialgouv/kosko-charts@^6.1.8":
version "6.1.8"
resolved "https://registry.yarnpkg.com/@socialgouv/kosko-charts/-/kosko-charts-6.1.8.tgz#204d7b255d12df9f453a91f9f9926d0f7e4ef010"
integrity sha512-Jjs5T1lJzf4n6MBRqJX5oRW8yLyRhrHAZZ9tTnQExP37D50yoGykKB7EtZGk3pw1WgeiWUMswtHyOVGjsu/wzQ==
"@socialgouv/kosko-charts@^9.5.5":
version "9.5.5"
resolved "https://registry.yarnpkg.com/@socialgouv/kosko-charts/-/kosko-charts-9.5.5.tgz#de0ed3ba763fb132465736569d181fd9c9eb5710"
integrity sha512-0YJ+Y+othrQBFzdRhc104L2+uOAEcvKpgXwv6q/HplVDNWYxFj3JZqOvgbCb5YLNNccvUpj+LLB+a0XGWzQNpg==
dependencies:
"@kubernetes-models/sealed-secrets" "^2.0.2"
"@sindresorhus/is" "^4.0.1"
fs-extra "^10.0.0"
kubernetes-models "^2.0.2"
slugify "^1.6.0"
"@tootallnate/once@1":
version "1.1.2"
......@@ -841,7 +844,7 @@ ajv-formats@^2.1.0:
dependencies:
ajv "^8.0.0"
ajv@^8.0.0, ajv@^8.5.0:
ajv@^8.0.0:
version "8.6.0"
resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.6.0.tgz#60cc45d9c46a477d80d92c48076d972c342e5720"
integrity sha512-cnUG4NSBiM4YFBxgZIj/In3/6KX+rQ2l2YPRVcvAMQGWEPKuXoPIhxzwqh31jA3IPbI4qEOp/5ILI4ynioXsGQ==
......@@ -851,6 +854,16 @@ ajv@^8.0.0, ajv@^8.5.0:
require-from-string "^2.0.2"
uri-js "^4.2.2"
ajv@^8.6.2:
version "8.6.2"
resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.6.2.tgz#2fb45e0e5fcbc0813326c1c3da535d1881bb0571"
integrity sha512-9807RlWAgT564wT+DjeyU5OFMPjmzxVobvDFmNAhY+5zD6A2ly3jDp6sgnfyDtlIQ+7H97oc/DGCzzfu9rjw9w==
dependencies:
fast-deep-equal "^3.1.1"
json-schema-traverse "^1.0.0"
require-from-string "^2.0.2"
uri-js "^4.2.2"
ansi-escapes@^4.2.1:
version "4.3.2"
resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
......@@ -2308,14 +2321,14 @@ kosko@^1.1.5:
"@kosko/cli" "1.2.5"
import-local "^3.0.2"
kubernetes-models@^1.7.1:
version "1.7.1"
resolved "https://registry.yarnpkg.com/kubernetes-models/-/kubernetes-models-1.7.1.tgz#e699a3b9454e219ff08d30fc2edaa81c9d3fd127"
integrity sha512-x9lI7ravBEDDhKp71H2MSznSWoQFlzWNCQ3WAtYhRROUTCXOQjS6qpqtLnXWtV8mGoHsJR/JNlNPJ0eyliv5VQ==
kubernetes-models@2.0.2, kubernetes-models@^2.0.2:
version "2.0.2"
resolved "https://registry.yarnpkg.com/kubernetes-models/-/kubernetes-models-2.0.2.tgz#d294d31f00a688a1fd205ee59ff680dbf06efa7b"
integrity sha512-4tonAim5mF6UFw07wnuEmQSDQ9AaNv54cwsTN32sEVBjrHtItC6RvOUJk36xn3IiFAPLIzwXHpRsjNpnLmbIKw==
dependencies:
"@kubernetes-models/base" "^1.5.5"
"@kubernetes-models/validate" "^1.6.0"
tslib "^2.2.0"
"@kubernetes-models/base" "2.0.1"
"@kubernetes-models/validate" "2.0.1"
tslib "^2.3.0"
leven@^3.1.0:
version "3.1.0"
......@@ -2801,6 +2814,11 @@ slash@^3.0.0:
resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
slugify@^1.6.0:
version "1.6.0"
resolved "https://registry.yarnpkg.com/slugify/-/slugify-1.6.0.tgz#6bdf8ed01dabfdc46425b67e3320b698832ff893"
integrity sha512-FkMq+MQc5hzYgM86nLuHI98Acwi3p4wX+a5BO9Hhw4JdK4L7WueIiZ4tXEobImPqBz2sVcV0+Mu3GRB30IGang==
source-map-support@^0.5.17, source-map-support@^0.5.6:
version "0.5.19"
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
......@@ -2992,11 +3010,16 @@ ts-node@^10.0.0:
source-map-support "^0.5.17"
yn "3.1.1"
tslib@^2.1.0, tslib@^2.2.0:
tslib@^2.1.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e"
integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==
tslib@^2.3.0:
version "2.3.1"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
type-check@~0.3.2:
version "0.3.2"
resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment