Merge pull request #118 from SocialGouv/kosko4

fix: ci deps upgrade
SocialGouv · Dec 18, 2020 · 767d375 · 767d375
2 parents 44b1663 + 63bd838
commit 767d375
Show file tree

Hide file tree

Showing 13 changed files with 3,867 additions and 198 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
 include:
   - project: SocialGouv/gitlab-ci-yml
     file: /autodevops.yml
-    ref: v17.23.0
+    ref: v20.1.2
 
 variables:
   AUTO_DEVOPS_RELEASE_AUTO: "🔖"

diff --git a/.k8s/__tests__/__snapshots__/kosko generate --env dev.ts.snap b/.k8s/__tests__/__snapshots__/kosko generate --env dev.ts.snap
@@ -0,0 +1,152 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`kosko generate --dev 1`] = `
+"---
+metadata:
+  annotations:
+    field.cattle.io/creatorId: gitlab
+    field.cattle.io/projectId: ''
+    git/branch: master
+    git/remote: >-
+      https://gitlab-ci-token:[MASKED]@gitlab.factory.social.gouv.fr/SocialGouv/archifiltre-site.git
+    app.gitlab.com/app: socialgouv-archifiltre-site
+    app.gitlab.com/env: master-dev2
+    app.gitlab.com/env.name: master-dev2
+  labels:
+    azure-pg-admin-user: archifiltre-site
+    application: master-dev2-archifiltre-site
+    owner: archifiltre-site
+    team: archifiltre-site
+    cert: wildcard
+  name: archifiltre-site-85-master-dev2
+apiVersion: v1
+kind: Namespace
+---
+metadata:
+  annotations:
+    app.gitlab.com/app: socialgouv-archifiltre-site
+    app.gitlab.com/env: master-dev2
+    app.gitlab.com/env.name: master-dev2
+  labels:
+    app: app
+    application: master-dev2-archifiltre-site
+    owner: archifiltre-site
+    team: archifiltre-site
+    cert: wildcard
+    component: nginx
+  name: app
+  namespace: archifiltre-site-85-master-dev2
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: app
+  template:
+    metadata:
+      annotations:
+        app.gitlab.com/app: socialgouv-archifiltre-site
+        app.gitlab.com/env: master-dev2
+        app.gitlab.com/env.name: master-dev2
+      labels:
+        app: app
+        application: master-dev2-archifiltre-site
+        owner: archifiltre-site
+        team: archifiltre-site
+        cert: wildcard
+        component: nginx
+    spec:
+      containers:
+        - image: >-
+            registry.gitlab.factory.social.gouv.fr/socialgouv/archifiltre-site/app:0123456789abcdefghijklmnopqrstuvwxyz0123
+          livenessProbe:
+            failureThreshold: 6
+            httpGet:
+              path: /index.html
+              port: http
+            initialDelaySeconds: 30
+            periodSeconds: 5
+            timeoutSeconds: 5
+          name: app
+          ports:
+            - containerPort: 80
+              name: http
+          readinessProbe:
+            failureThreshold: 15
+            httpGet:
+              path: /index.html
+              port: http
+            initialDelaySeconds: 0
+            periodSeconds: 5
+            successThreshold: 1
+            timeoutSeconds: 1
+          resources:
+            limits:
+              cpu: 500m
+              memory: 128Mi
+            requests:
+              cpu: 5m
+              memory: 32Mi
+          startupProbe:
+            failureThreshold: 12
+            httpGet:
+              path: /index.html
+              port: http
+            periodSeconds: 5
+apiVersion: apps/v1
+kind: Deployment
+---
+metadata:
+  labels:
+    app: app
+    application: master-dev2-archifiltre-site
+    owner: archifiltre-site
+    team: archifiltre-site
+    cert: wildcard
+  name: app
+  annotations:
+    app.gitlab.com/app: socialgouv-archifiltre-site
+    app.gitlab.com/env: master-dev2
+    app.gitlab.com/env.name: master-dev2
+  namespace: archifiltre-site-85-master-dev2
+spec:
+  ports:
+    - name: http
+      port: 80
+      targetPort: 80
+  selector:
+    app: app
+  type: ClusterIP
+apiVersion: v1
+kind: Service
+---
+metadata:
+  annotations:
+    kubernetes.io/ingress.class: nginx
+    app.gitlab.com/app: socialgouv-archifiltre-site
+    app.gitlab.com/env: master-dev2
+    app.gitlab.com/env.name: master-dev2
+  labels:
+    app: app
+    application: master-dev2-archifiltre-site
+    owner: archifiltre-site
+    team: archifiltre-site
+    cert: wildcard
+  name: app
+  namespace: archifiltre-site-85-master-dev2
+spec:
+  rules:
+    - host: master-dev2-archifiltre-site.dev2.fabrique.social.gouv.fr
+      http:
+        paths:
+          - backend:
+              serviceName: app
+              servicePort: 80
+            path: /
+  tls:
+    - hosts:
+        - master-dev2-archifiltre-site.dev2.fabrique.social.gouv.fr
+      secretName: wildcard-crt
+apiVersion: extensions/v1beta1
+kind: Ingress
+"
+`;
diff --git a/.k8s/__tests__/__snapshots__/kosko generate --env preprod.ts.snap b/.k8s/__tests__/__snapshots__/kosko generate --env preprod.ts.snap
@@ -0,0 +1,152 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`kosko generate --preprod 1`] = `
+"---
+metadata:
+  annotations:
+    field.cattle.io/creatorId: gitlab
+    field.cattle.io/projectId: ''
+    git/branch: v1.2.3
+    git/remote: >-
+      https://gitlab-ci-token:[MASKED]@gitlab.factory.social.gouv.fr/SocialGouv/archifiltre-site.git
+    app.gitlab.com/app: socialgouv-archifiltre-site
+    app.gitlab.com/env: preprod-dev2
+    app.gitlab.com/env.name: preprod-dev2
+  labels:
+    azure-pg-admin-user: archifiltre-site
+    application: v1-2-3-archifiltre-site
+    owner: archifiltre-site
+    team: archifiltre-site
+    cert: wildcard
+  name: archifiltre-site-85-preprod-dev2
+apiVersion: v1
+kind: Namespace
+---
+metadata:
+  annotations:
+    app.gitlab.com/app: socialgouv-archifiltre-site
+    app.gitlab.com/env: preprod-dev2
+    app.gitlab.com/env.name: preprod-dev2
+  labels:
+    app: app
+    application: v1-2-3-archifiltre-site
+    owner: archifiltre-site
+    team: archifiltre-site
+    cert: wildcard
+    component: nginx
+  name: app
+  namespace: archifiltre-site-85-preprod-dev2
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: app
+  template:
+    metadata:
+      annotations:
+        app.gitlab.com/app: socialgouv-archifiltre-site
+        app.gitlab.com/env: preprod-dev2
+        app.gitlab.com/env.name: preprod-dev2
+      labels:
+        app: app
+        application: v1-2-3-archifiltre-site
+        owner: archifiltre-site
+        team: archifiltre-site
+        cert: wildcard
+        component: nginx
+    spec:
+      containers:
+        - image: >-
+            registry.gitlab.factory.social.gouv.fr/socialgouv/archifiltre-site/app:1.2.3
+          livenessProbe:
+            failureThreshold: 6
+            httpGet:
+              path: /index.html
+              port: http
+            initialDelaySeconds: 30
+            periodSeconds: 5
+            timeoutSeconds: 5
+          name: app
+          ports:
+            - containerPort: 80
+              name: http
+          readinessProbe:
+            failureThreshold: 15
+            httpGet:
+              path: /index.html
+              port: http
+            initialDelaySeconds: 0
+            periodSeconds: 5
+            successThreshold: 1
+            timeoutSeconds: 1
+          resources:
+            limits:
+              cpu: 500m
+              memory: 128Mi
+            requests:
+              cpu: 5m
+              memory: 32Mi
+          startupProbe:
+            failureThreshold: 12
+            httpGet:
+              path: /index.html
+              port: http
+            periodSeconds: 5
+apiVersion: apps/v1
+kind: Deployment
+---
+metadata:
+  labels:
+    app: app
+    application: v1-2-3-archifiltre-site
+    owner: archifiltre-site
+    team: archifiltre-site
+    cert: wildcard
+  name: app
+  annotations:
+    app.gitlab.com/app: socialgouv-archifiltre-site
+    app.gitlab.com/env: preprod-dev2
+    app.gitlab.com/env.name: preprod-dev2
+  namespace: archifiltre-site-85-preprod-dev2
+spec:
+  ports:
+    - name: http
+      port: 80
+      targetPort: 80
+  selector:
+    app: app
+  type: ClusterIP
+apiVersion: v1
+kind: Service
+---
+metadata:
+  annotations:
+    kubernetes.io/ingress.class: nginx
+    app.gitlab.com/app: socialgouv-archifiltre-site
+    app.gitlab.com/env: preprod-dev2
+    app.gitlab.com/env.name: preprod-dev2
+  labels:
+    app: app
+    application: v1-2-3-archifiltre-site
+    owner: archifiltre-site
+    team: archifiltre-site
+    cert: wildcard
+  name: app
+  namespace: archifiltre-site-85-preprod-dev2
+spec:
+  rules:
+    - host: preprod-archifiltre-site.dev2.fabrique.social.gouv.fr
+      http:
+        paths:
+          - backend:
+              serviceName: app
+              servicePort: 80
+            path: /
+  tls:
+    - hosts:
+        - preprod-archifiltre-site.dev2.fabrique.social.gouv.fr
+      secretName: wildcard-crt
+apiVersion: extensions/v1beta1
+kind: Ingress
+"
+`;