externalTrafficPolicy needs to be Cluster on AWS (#2404)

* externalTrafficPolicy needs to be Cluster on AWS

* separate out mocksaml and jackson deployments

kustomize/overlays/demo/kustomization.yaml

@@ -5,8 +5,6 @@ bases:
 
 resources:
   - ./secrets.yaml
-  - ./mocksaml-secrets.yaml
-  - ./mocksaml-deployment.yaml
 
 patches:
   - ./jackson-deployment.yaml
@@ -15,5 +13,3 @@ patches:
 images:
   - name: boxyhq/jackson
     newTag: 1.20.5
-  - name: boxyhq/mock-saml
-    newTag: 1.3.4

kustomize/overlays/demo/mocksaml/kustomization.yaml

@@ -0,0 +1,8 @@
+---
+resources:
+  - ./mocksaml-secrets.yaml
+  - ./mocksaml-deployment.yaml
+
+images:
+  - name: boxyhq/mock-saml
+    newTag: 1.3.6

kustomize/overlays/demo/services/jackson-service.yaml

@@ -13,7 +13,7 @@ metadata:
     service.beta.kubernetes.io/aws-load-balancer-ssl-ports: '443'
     service.beta.kubernetes.io/aws-load-balancer-ssl-negotiation-policy: ELBSecurityPolicy-TLS13-1-2-2021-06
 spec:
-  externalTrafficPolicy: Local
+  externalTrafficPolicy: Cluster
   type: LoadBalancer
   ports:
     - name: https

kustomize/overlays/demo/services/kustomization.yaml

@@ -2,4 +2,3 @@
 bases:
   - ../../../base/services/internal
   - ./jackson-service.yaml
-  - ./mocksaml-service.yaml

kustomize/overlays/demo/services/mocksaml/kustomization.yaml

@@ -0,0 +1,3 @@
+---
+bases:
+  - ./mocksaml-service.yaml

kustomize/overlays/demo/services/mocksaml/mocksaml-service.yaml

@@ -13,7 +13,7 @@ metadata:
     service.beta.kubernetes.io/aws-load-balancer-ssl-ports: '443'
     service.beta.kubernetes.io/aws-load-balancer-ssl-negotiation-policy: ELBSecurityPolicy-TLS13-1-2-2021-06
 spec:
-  externalTrafficPolicy: Local
+  externalTrafficPolicy: Cluster
   type: LoadBalancer
   ports:
     - name: https

kustomize/overlays/prod-eu/kustomization.yaml

@@ -5,8 +5,6 @@ bases:
 
 resources:
   - ./secrets.yaml
-  - ./mocksaml-secrets.yaml
-  - ./mocksaml-deployment.yaml
 
 patches:
   - ./jackson-deployment.yaml
@@ -15,5 +13,3 @@ patches:
 images:
   - name: boxyhq/jackson
     newTag: 1.20.5
-  - name: boxyhq/mock-saml
-    newTag: 1.3.4

kustomize/overlays/prod-eu/mocksaml/kustomization.yaml

@@ -0,0 +1,8 @@
+---
+resources:
+  - ./mocksaml-secrets.yaml
+  - ./mocksaml-deployment.yaml
+
+images:
+  - name: boxyhq/mock-saml
+    newTag: 1.3.6

kustomize/overlays/prod-eu/services/jackson-service.yaml

@@ -13,7 +13,7 @@ metadata:
     service.beta.kubernetes.io/aws-load-balancer-ssl-ports: '443'
     service.beta.kubernetes.io/aws-load-balancer-ssl-negotiation-policy: ELBSecurityPolicy-TLS13-1-2-2021-06
 spec:
-  externalTrafficPolicy: Local
+  externalTrafficPolicy: Cluster
   type: LoadBalancer
   ports:
     - name: https

kustomize/overlays/prod-eu/services/kustomization.yaml

@@ -2,4 +2,3 @@
 bases:
   - ../../../base/services/internal
   - ./jackson-service.yaml
-  - ./mocksaml-service.yaml

kustomize/overlays/prod-eu/services/mocksaml/kustomization.yaml

@@ -0,0 +1,3 @@
+---
+bases:
+  - ./mocksaml-service.yaml

kustomize/overlays/prod-eu/services/mocksaml/mocksaml-service.yaml

@@ -13,7 +13,7 @@ metadata:
     service.beta.kubernetes.io/aws-load-balancer-ssl-ports: '443'
     service.beta.kubernetes.io/aws-load-balancer-ssl-negotiation-policy: ELBSecurityPolicy-TLS13-1-2-2021-06
 spec:
-  externalTrafficPolicy: Local
+  externalTrafficPolicy: Cluster
   type: LoadBalancer
   ports:
     - name: https

package.json

@@ -33,8 +33,12 @@
     "dynamodb:skaffold": "skaffold dev -f skaffold-dynamodb.yaml --status-check=false --force=true",
     "demo:skaffold": "echo 'This is only meant for BoxyHQ internal use. Please use {dbname}:skaffold instead' && skaffold run -f skaffold-demo.yaml --status-check=false",
     "demo-services:skaffold": "echo 'This is only meant for BoxyHQ internal use. Please use {dbname}:skaffold instead' && skaffold run -f skaffold-demo-services.yaml --status-check=false",
+    "demo-mocksaml:skaffold": "echo 'This is only meant for BoxyHQ internal use. Please use {dbname}:skaffold instead' && skaffold run -f skaffold-demo-mocksaml.yaml --status-check=false",
+    "demo-mocksaml-services:skaffold": "echo 'This is only meant for BoxyHQ internal use. Please use {dbname}:skaffold instead' && skaffold run -f skaffold-demo-mocksaml-services.yaml --status-check=false",
     "prod-eu:skaffold": "echo 'This is only meant for BoxyHQ internal use. Please use {dbname}:skaffold instead' && skaffold run -f skaffold-prod-eu.yaml --status-check=false",
     "prod-eu-services:skaffold": "echo 'This is only meant for BoxyHQ internal use. Please use {dbname}:skaffold instead' && skaffold run -f skaffold-prod-eu-services.yaml --status-check=false",
+    "prod-eu-mocksaml:skaffold": "echo 'This is only meant for BoxyHQ internal use. Please use {dbname}:skaffold instead' && skaffold run -f skaffold-prod-eu-mocksaml.yaml --status-check=false",
+    "prod-eu-mocksaml-services:skaffold": "echo 'This is only meant for BoxyHQ internal use. Please use {dbname}:skaffold instead' && skaffold run -f skaffold-prod-eu-mocksaml-services.yaml --status-check=false",
     "start": "cross-env PORT=5225 NODE_OPTIONS=--dns-result-order=ipv4first node .next/standalone/server.js",
     "swagger-jsdoc": "swagger-jsdoc -d swagger/swaggerDefinition.js npm/src/**/*.ts npm/src/**/**/*.ts -o swagger/swagger.json",
     "redis": "cross-env JACKSON_API_KEYS=secret DB_ENGINE=redis DB_TYPE=redis DB_URL=redis://localhost:6379/redis npm run dev",

skaffold-demo-mocksaml-services.yaml

@@ -0,0 +1,6 @@
+apiVersion: skaffold/v4beta7
+kind: Config
+manifests:
+  kustomize:
+    paths:
+      - ./kustomize/overlays/demo/services/mocksaml

skaffold-demo-mocksaml.yaml

@@ -0,0 +1,6 @@
+apiVersion: skaffold/v4beta7
+kind: Config
+manifests:
+  kustomize:
+    paths:
+      - ./kustomize/overlays/demo/mocksaml

skaffold-prod-eu-mocksaml-services.yaml

@@ -0,0 +1,6 @@
+apiVersion: skaffold/v4beta7
+kind: Config
+manifests:
+  kustomize:
+    paths:
+      - ./kustomize/overlays/prod-eu/services/mocksaml

skaffold-prod-eu-mocksaml.yaml

@@ -0,0 +1,6 @@
+apiVersion: skaffold/v4beta7
+kind: Config
+manifests:
+  kustomize:
+    paths:
+      - ./kustomize/overlays/prod-eu/mocksaml