Merge pull request #1895 from processing/chore/sandbox

Update kubernetes config for preview subdomain

Author: catarak

kubernetes_app.yml

@@ -8,20 +8,18 @@ spec:
   backend:
     serviceName: web-editor-node
     servicePort: 8000
-## TODO uncomment from prod
-## adding this in just to make a new commit
-# ---
-# apiVersion: extensions/v1beta1
-# kind: Ingress
-# metadata:
-#   name: preview-editor-ingress
-#   annotations:
-#     # need to make another global static ip
-#     kubernetes.io/ingress.global-static-ip-name: "preview-editor-ip"
-# spec:
-#   backend:
-#     serviceName: web-editor-node
-#     servicePort: 8002
+---
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: preview-editor-ingress
+  annotations:
+    # need to make another global static ip
+    kubernetes.io/ingress.global-static-ip-name: "preview-editor-ip"
+spec:
+  backend:
+    serviceName: web-editor-node
+    servicePort: 8002
 ---
 apiVersion: v1
 kind: Service
@@ -36,10 +34,11 @@ spec:
   type: NodePort
   ports:
   - port: 8000
+    name: editor-port
     targetPort: 8000
-  ## TODO uncommment for prod
-  # - port: 8002
-  #   targetPort: 8002
+  - port: 8002
+    name: preview-port
+    targetPort: 8002
   selector:
     app: web-editor
 ---
@@ -146,7 +145,7 @@ metadata:
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
-  name: staging-editor-ingress-with-auth
+  name: staging-editor-ingress
   namespace: staging
   annotations:
     kubernetes.io/ingress.global-static-ip-name: "web-editor-staging-ip"
@@ -158,7 +157,7 @@ spec:
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
-  name: staging-editor-ingress-with-auth
+  name: staging-preview-ingress
   namespace: staging
   annotations:
     kubernetes.io/ingress.global-static-ip-name: "preview-staging-ip"
@@ -181,8 +180,10 @@ spec:
   type: NodePort
   ports:
   - port: 8001
+    name: editor-port
     targetPort: 8000
   - port: 8003
+    name: preview-port
     targetPort: 8002
   selector:
     app: web-editor