Merge pull request #5 from SocialGouv/ingress

fix: ingress with multiples rules
SocialGouv · Feb 7, 2021 · 82dd83f · 82dd83f
2 parents de26e27 + c347680
commit 82dd83f
Show file tree

Hide file tree

Showing 11 changed files with 2,229 additions and 620 deletions.
diff --git a/.storybook/main.js → .storybook/main.ts b/.storybook/main.js → .storybook/main.ts
diff --git a/.storybook/preview.js → .storybook/preview.ts b/.storybook/preview.js → .storybook/preview.ts
diff --git a/fixtures/ingress-hosts.json b/fixtures/ingress-hosts.json
@@ -34,6 +34,39 @@
         }
       }
     },
+    {
+      "apiVersion": "v1",
+      "kind": "Service",
+      "metadata": {
+        "annotations": {
+          "app.gitlab.com/app": "org-sample-next-app",
+          "app.gitlab.com/env": "preprod-dev2",
+          "app.gitlab.com/env.name": "preprod-dev2"
+        },
+        "labels": {
+          "app": "app-admin",
+          "application": "v2-1-5-sample-next-app",
+          "cert": "wildcard",
+          "owner": "sample-next-app",
+          "team": "sample-next-app"
+        },
+        "name": "app-admin",
+        "namespace": "sample-next-app-85-preprod-dev2"
+      },
+      "spec": {
+        "clusterIP": "1.2.3.4",
+        "ports": [
+          {
+            "name": "http",
+            "port": 80,
+            "targetPort": 3030
+          }
+        ],
+        "selector": {
+          "app": "app-admin"
+        }
+      }
+    },
 
     {
       "apiVersion": "extensions/v1beta1",
@@ -58,7 +91,7 @@
       "spec": {
         "rules": [
           {
-            "host": "preprod-sample-next-app.dev2.org.com",
+            "host": "preprod.com",
             "http": {
               "paths": [
                 {
@@ -72,7 +105,7 @@
             }
           },
           {
-            "host": "preprod2-sample-next-app.dev2.org.com",
+            "host": "preprod2.com",
             "http": {
               "paths": [
                 {
@@ -81,6 +114,13 @@
                     "servicePort": 80
                   },
                   "path": "/"
+                },
+                {
+                  "backend": {
+                    "serviceName": "app-admin",
+                    "servicePort": 80
+                  },
+                  "path": "/admin"
                 }
               ]
             }
@@ -89,8 +129,8 @@
         "tls": [
           {
             "hosts": [
-              "preprod-sample-next-app.dev2.org.com",
-              "preprod2-sample-next-app.dev2.org.com"
+              "preprod.com",
+              "preprod2.com"
             ],
             "secretName": "wildcard-crt"
           }

diff --git a/package.json b/package.json
@@ -19,20 +19,23 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "@babel/core": "^7.11.6",
+    "@juggle/resize-observer": "^3.2.0",
     "@socialgouv/eslint-config-react": "^1.46.0",
     "@storybook/addon-actions": "^6.0.22",
     "@storybook/addon-essentials": "^6.0.22",
     "@storybook/addon-links": "^6.0.22",
+    "@storybook/addon-storyshots": "^6.1.17",
     "@storybook/addon-storysource": "^6.1.14",
     "@storybook/react": "^6.0.22",
-    "@testing-library/react": "^10.0.4",
+    "@testing-library/react": "^11.2.5",
     "@types/jest": "^25.2.1",
     "@types/react": "^16.9.27",
     "@typescript-eslint/eslint-plugin": "^4.14.0",
     "@typescript-eslint/parser": "^4.14.0",
     "babel-loader": "^8.1.0",
     "eslint": "^7.18.0",
-    "jest": "^25.5.3",
+    "jest": "^26.6.3",
+    "jest-extended": "^0.11.5",
     "kubernetes-models": "^1.0.3",
     "prettier": "^2.2.1",
     "react": "^16.13.1",
@@ -58,7 +61,11 @@
     "moduleFileExtensions": [
       "ts",
       "tsx",
-      "js"
+      "js",
+      "json"
+    ],
+    "setupFilesAfterEnv": [
+      "<rootDir>/src/setupTest.ts"
     ]
   },
   "dependencies": {