From 327ead25a89c3c46e4085f0ea672239702f14d5d Mon Sep 17 00:00:00 2001 From: Martin Lowe Date: Mon, 28 Feb 2022 15:53:53 -0500 Subject: [PATCH 1/2] Update to k8s staging to attempt to map internal 8090 to external ports --- src/main/k8s/staging.yml | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/src/main/k8s/staging.yml b/src/main/k8s/staging.yml index 5f8ba267..5b8106fe 100644 --- a/src/main/k8s/staging.yml +++ b/src/main/k8s/staging.yml @@ -33,9 +33,7 @@ spec: image: eclipsefdn/eclipsefdn-membership-portal:latest imagePullPolicy: Always ports: - - targetPort: 8092 - protocol: TCP - port: 8090 + - containerPort: 8092 resources: limits: cpu: '1' @@ -56,9 +54,7 @@ spec: image: eclipsefdn/eclipsefdn-membership-application:latest imagePullPolicy: Always ports: - - targetPort: 8093 - protocol: TCP - port: 8090 + - containerPort: 8093 resources: limits: cpu: '1' @@ -89,12 +85,12 @@ spec: - mountPath: "/usr/share/nginx/imagestore" name: eclipsefdn-react-membership-staging-uploads-volume volumes: - - name: application-secret-properties - secret: - secretName: eclipsefdn-membership-application-staging - - name: portal-secret-properties - secret: - secretName: eclipsefdn-membership-portal-staging + - name: application-secret-properties + secret: + secretName: eclipsefdn-membership-application-staging + - name: portal-secret-properties + secret: + secretName: eclipsefdn-membership-portal-staging - name: eclipsefdn-react-membership-staging-uploads-volume persistentVolumeClaim: claimName: eclipsefdn-react-membership-staging-uploads -- GitLab From 3c231554993b9b9bd0480dc92965f3d582ada2fc Mon Sep 17 00:00:00 2001 From: Martin Lowe Date: Tue, 1 Mar 2022 10:33:01 -0500 Subject: [PATCH 2/2] Update k8s configuration for services, update nginx routing for split --- config/nginx/default.conf | 23 ++++------------------- src/main/k8s/production.yml | 29 ++++++++++++++++++++--------- src/main/k8s/staging.yml | 13 +++++++++---- 3 files changed, 33 insertions(+), 32 deletions(-) diff --git a/config/nginx/default.conf b/config/nginx/default.conf index 45d196c7..906b07c8 100644 --- a/config/nginx/default.conf +++ b/config/nginx/default.conf @@ -12,24 +12,9 @@ server { proxy_buffers 4 256k; proxy_busy_buffers_size 256k; - location /application_api/ { - # don't cache it - proxy_no_cache 1; - - # even if cached, don't try to use it - proxy_cache_bypass 1; - - proxy_pass http://localhost:8093/application_api/; # note the trailing slash here, it matters! - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - - # kill cache - add_header Last-Modified $date_gmt; - add_header Cache-Control 'no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0'; - if_modified_since off; - expires off; - etag off; + location /application_api { + include conf.d/api-proxy.conf; + proxy_pass http://localhost:8093/application_api; # note the trailing slash here, it matters! } location /api { @@ -44,7 +29,7 @@ server { rewrite ^\/api\/organizations(/\d+)?$ /api/organizations$1 break; include conf.d/api-proxy.conf; - proxy_pass http://localhost:8090; + proxy_pass http://localhost:8092; } } diff --git a/src/main/k8s/production.yml b/src/main/k8s/production.yml index 4e3b57cb..f8e41c74 100644 --- a/src/main/k8s/production.yml +++ b/src/main/k8s/production.yml @@ -33,9 +33,7 @@ spec: image: eclipsefdn/eclipsefdn-membership-portal:latest imagePullPolicy: Always ports: - - targetPort: 8092 - protocol: TCP - port: 8090 + - containerPort: 8092 resources: limits: cpu: '1' @@ -56,9 +54,7 @@ spec: image: eclipsefdn/eclipsefdn-membership-application:latest imagePullPolicy: Always ports: - - targetPort: 8093 - protocol: TCP - port: 8090 + - containerPort: 8093 resources: limits: cpu: '1' @@ -104,17 +100,32 @@ spec: apiVersion: "v1" kind: "Service" metadata: - name: eclipsefdn-react-membership + name: eclipsefdn-membership-portal-staging namespace: foundation-internal-webdev-apps spec: ports: - name: "http" port: 80 protocol: "TCP" - targetPort: 8080 + targetPort: 8092 selector: app: eclipsefdn-react-membership - environment: production + environment: staging +--- +apiVersion: "v1" +kind: "Service" +metadata: + name: eclipsefdn-membership-application-staging + namespace: foundation-internal-webdev-apps +spec: + ports: + - name: "http" + port: 80 + protocol: "TCP" + targetPort: 8093 + selector: + app: eclipsefdn-react-membership + environment: staging --- apiVersion: "route.openshift.io/v1" kind: "Route" diff --git a/src/main/k8s/staging.yml b/src/main/k8s/staging.yml index 5b8106fe..507a4f1d 100644 --- a/src/main/k8s/staging.yml +++ b/src/main/k8s/staging.yml @@ -58,10 +58,10 @@ spec: resources: limits: cpu: '1' - memory: 384Mi + memory: 256Mi requests: cpu: 200m - memory: 384Mi + memory: 256Mi env: - name: CONFIG_SECRET_PATH value: "/run/secrets/eclipsefdn-membership-application/secret.properties" @@ -98,14 +98,19 @@ spec: apiVersion: "v1" kind: "Service" metadata: - name: eclipsefdn-react-membership-staging + name: eclipsefdn-membership-staging namespace: foundation-internal-webdev-apps spec: ports: - name: "http" port: 80 protocol: "TCP" - targetPort: 8080 + targetPort: 8092 + ports: + - name: "http" + port: 80 + protocol: "TCP" + targetPort: 8093 selector: app: eclipsefdn-react-membership environment: staging -- GitLab