Forráskód Böngészése

Adding local kubernetes deployment

bodicsek 3 éve
szülő
commit
e27b5776c7

+ 19 - 0
deployment/deployment.yaml

@@ -0,0 +1,19 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: occ-fw-ui-deployment
+spec:
+  selector:
+    matchLabels:
+      app: occ-fw-ui
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        app: occ-fw-ui
+    spec:
+      containers:
+        - name: occ-fw-ui
+          image: occ-fw-ui:1.0.2
+          ports:
+          - containerPort: 8000

+ 30 - 0
deployment/ingress.yaml

@@ -0,0 +1,30 @@
+---
+# Middleware
+# Strip prefix /overview
+apiVersion: traefik.containo.us/v1alpha1
+kind: Middleware
+metadata:
+  name: occ-fw-ui-path-strip-mw
+spec:
+  stripPrefix:
+    forceSlash: false
+    prefixes:
+      - /occ/ui
+---
+# IngressRoute
+apiVersion: traefik.containo.us/v1alpha1
+kind: IngressRoute
+metadata:
+  name: occ-ui-ingress-route
+spec:
+  entryPoints:
+    - websecure
+  routes:
+    - kind: Rule
+      match: PathPrefix(`/occ/ui/`)
+      middlewares:
+        - name: occ-fw-ui-path-strip-mw
+      services:
+        - kind: Service
+          name: occ-fw-ui-service
+          port: 80

+ 11 - 0
deployment/service.yaml

@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: occ-fw-ui-service
+spec:
+  selector:
+    app: occ-fw-ui
+  ports:
+    - protocol: TCP
+      port: 80
+      targetPort: 8000

+ 2 - 1
ojet.config.js

@@ -9,7 +9,8 @@ const merge = require("webpack-merge").merge;
 
 const developmentConfig = {
   devServer: {
-    https: true
+    https: false,
+    port: 8000
   }
 };
 

+ 3 - 2
package.json

@@ -1,13 +1,14 @@
 {
   "name": "occ-fw-ui",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "An Oracle JavaScript Extension Toolkit(JET) web app",
   "scripts": {
     "start": "ojet serve",
     "start:container": "npm run build:container && docker run --rm -d -p 8000:8000 $npm_package_name:$npm_package_version",
     "build": "ojet build",
     "build:container": "docker build -t $npm_package_name:$npm_package_version .",
-    "release": "ojet build --release"
+    "release": "ojet build --release",
+    "deploy": "npm run build:container && kubectl apply -f deployment"
   },
   "dependencies": {
     "@oracle/oraclejet": "~13.0.0",

+ 1 - 1
src/hooks/useLogin.tsx

@@ -21,7 +21,7 @@ const parseJwt = token => {
     window.location.href = `${idcsStripe}/oauth2/v1/authorize` +
       `?client_id=${clientId}` +
       "&response_type=code" +
-      "&redirect_uri=https%3A%2F%2Flocalhost%3A8000" +
+      `&redirect_uri=${encodeURIComponent(window.location.href)}` +
       "&scope=openid" +
       `&nonce=${nonce}` +
       `&state=${state}`;