diff --git a/apps/kustomize/web/base/gateway/backendtlspolicy.yaml b/apps/kustomize/web/base/gateway/backendtlspolicy.yaml deleted file mode 100644 index 434e311..0000000 --- a/apps/kustomize/web/base/gateway/backendtlspolicy.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: gateway.networking.k8s.io/v1 -kind: BackendTLSPolicy -metadata: - name: web-gw -spec: - targetRefs: - - kind: Service - name: web - group: "" - validation: - caCertificateRefs: - - kind: ConfigMap - name: brds-bundle - group: "" diff --git a/apps/kustomize/web/base/gateway/routes/https-v4.yaml b/apps/kustomize/web/base/gateway/routes/https-v4.yaml index 5eea61d..fc0610c 100644 --- a/apps/kustomize/web/base/gateway/routes/https-v4.yaml +++ b/apps/kustomize/web/base/gateway/routes/https-v4.yaml @@ -8,7 +8,7 @@ spec: - group: "" kind: Service name: web - port: 443 + port: 80 matches: - path: type: PathPrefix diff --git a/apps/kustomize/web/base/gateway/routes/https.yaml b/apps/kustomize/web/base/gateway/routes/https.yaml index a3bb712..4db086b 100644 --- a/apps/kustomize/web/base/gateway/routes/https.yaml +++ b/apps/kustomize/web/base/gateway/routes/https.yaml @@ -13,7 +13,7 @@ spec: - group: "" kind: Service name: web - port: 443 + port: 80 matches: - path: type: PathPrefix diff --git a/apps/kustomize/web/base/kustomization.yaml b/apps/kustomize/web/base/kustomization.yaml index 7e73210..f345776 100644 --- a/apps/kustomize/web/base/kustomization.yaml +++ b/apps/kustomize/web/base/kustomization.yaml @@ -6,7 +6,6 @@ resources: - gateway/routes/http-v4.yaml - gateway/routes/https.yaml - gateway/routes/https-v4.yaml - - gateway/backendtlspolicy.yaml - gateway/gateway.yaml - gateway/issuer.yaml - gateway/referencegrant.yaml diff --git a/apps/kustomize/web/base/web/deployment.yaml b/apps/kustomize/web/base/web/deployment.yaml index 7c4cd66..13798df 100644 --- a/apps/kustomize/web/base/web/deployment.yaml +++ b/apps/kustomize/web/base/web/deployment.yaml @@ -23,6 +23,9 @@ spec: limits: memory: 512Mi ports: + - containerPort: 80 + protocol: TCP + name: http - containerPort: 443 protocol: TCP name: https diff --git a/apps/kustomize/web/base/web/service.yaml b/apps/kustomize/web/base/web/service.yaml index c5003c8..d93e172 100644 --- a/apps/kustomize/web/base/web/service.yaml +++ b/apps/kustomize/web/base/web/service.yaml @@ -4,6 +4,10 @@ metadata: name: web spec: ports: + - name: http + port: 80 + protocol: TCP + targetPort: 80 - name: https port: 443 protocol: TCP diff --git a/apps/kustomize/web/envs/stage/gateway/backendtlspolicy.yaml b/apps/kustomize/web/envs/stage/gateway/backendtlspolicy.yaml deleted file mode 100644 index b999fa9..0000000 --- a/apps/kustomize/web/envs/stage/gateway/backendtlspolicy.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: gateway.networking.k8s.io/v1 -kind: BackendTLSPolicy -metadata: - name: web-gw -spec: - validation: - hostname: stage.d-b.ca - subjectAltNames: - - type: Hostname - hostname: stage.d-b.ca diff --git a/apps/kustomize/web/envs/stage/kustomization.yaml b/apps/kustomize/web/envs/stage/kustomization.yaml index 1866503..6379ce5 100644 --- a/apps/kustomize/web/envs/stage/kustomization.yaml +++ b/apps/kustomize/web/envs/stage/kustomization.yaml @@ -3,14 +3,12 @@ kind: Kustomization resources: - ../../base - - namespace.yaml patches: - path: gateway/routes/http.yaml - path: gateway/routes/http-v4.yaml - path: gateway/routes/https.yaml - path: gateway/routes/https-v4.yaml - - path: gateway/backendtlspolicy.yaml - path: gateway/gateway.yaml - path: gateway/issuer.yaml - path: web/web-backend-tls.yaml diff --git a/apps/kustomize/web/envs/stage/namespace.yaml b/apps/kustomize/web/envs/stage/namespace.yaml deleted file mode 100644 index 697b6d4..0000000 --- a/apps/kustomize/web/envs/stage/namespace.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: dbca-web-stage - labels: - brds.ca/localca: enabled