From cabd9453cc3081049e662f5be0a93c6c8e903f21 Mon Sep 17 00:00:00 2001 From: Cassie Tarakajian Date: Wed, 7 Jul 2021 17:39:22 -0400 Subject: [PATCH 1/3] Update kubernetes config for staging service web-editor-node --- kubernetes_app.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/kubernetes_app.yml b/kubernetes_app.yml index 30d44f1732..acafae1c48 100644 --- a/kubernetes_app.yml +++ b/kubernetes_app.yml @@ -36,9 +36,12 @@ spec: type: NodePort ports: - port: 8000 + ## TODO uncomment for prod + # name: editor-port targetPort: 8000 ## TODO uncommment for prod # - port: 8002 + # name: preview-port # targetPort: 8002 selector: app: web-editor @@ -181,8 +184,10 @@ spec: type: NodePort ports: - port: 8001 + name: editor-port targetPort: 8000 - port: 8003 + name: preview-port targetPort: 8002 selector: app: web-editor From 756ce7cfb217c4d2d1555f9668049eb5754d7ae0 Mon Sep 17 00:00:00 2001 From: Cassie Tarakajian Date: Wed, 7 Jul 2021 18:24:12 -0400 Subject: [PATCH 2/3] Update kubernetes config, give staging ingresses different names --- kubernetes_app.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kubernetes_app.yml b/kubernetes_app.yml index acafae1c48..c7e82db99b 100644 --- a/kubernetes_app.yml +++ b/kubernetes_app.yml @@ -149,7 +149,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" @@ -161,7 +161,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" From 2835a11ff71d228bce5c667da4f5efac78ef2c90 Mon Sep 17 00:00:00 2001 From: Cassie Tarakajian Date: Fri, 9 Jul 2021 12:55:07 -0400 Subject: [PATCH 3/3] Add prod kubernetes config --- kubernetes_app.yml | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/kubernetes_app.yml b/kubernetes_app.yml index c7e82db99b..ad8ccd65a2 100644 --- a/kubernetes_app.yml +++ b/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,13 +34,11 @@ spec: type: NodePort ports: - port: 8000 - ## TODO uncomment for prod - # name: editor-port + name: editor-port targetPort: 8000 - ## TODO uncommment for prod - # - port: 8002 - # name: preview-port - # targetPort: 8002 + - port: 8002 + name: preview-port + targetPort: 8002 selector: app: web-editor ---