diff --git a/apps/dev/gateways.yaml b/apps/dev/gateways.yaml new file mode 100644 index 000000000..291293ed1 --- /dev/null +++ b/apps/dev/gateways.yaml @@ -0,0 +1,17 @@ +apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 +kind: Kustomization +metadata: + name: gateways + namespace: apps +spec: + interval: 5m0s + sourceRef: + kind: GitRepository + name: flux-system + namespace: flux-system + path: ./apps/dev/gateways + prune: true + wait: true + postBuild: + substitute: + INGRESS_STATIC_IP_NAME: prow-dev-tidb-net-ip diff --git a/apps/dev/ingress/gke-gateway.yaml b/apps/dev/gateways/gke-gateway.yaml similarity index 80% rename from apps/dev/ingress/gke-gateway.yaml rename to apps/dev/gateways/gke-gateway.yaml index f67501fe9..9e54561b3 100644 --- a/apps/dev/ingress/gke-gateway.yaml +++ b/apps/dev/gateways/gke-gateway.yaml @@ -7,12 +7,12 @@ spec: listeners: - name: https protocol: HTTPS - port: 80 + port: 443 tls: mode: Terminate certificateRefs: - name: prow-tls - namesppace: apps + namespace: apps addresses: - type: NamedAddress - value: ${INGRESS_STATIC_IP_NAME} \ No newline at end of file + value: ${INGRESS_STATIC_IP_NAME} diff --git a/apps/dev/ingress/kustomization.yaml b/apps/dev/gateways/kustomization.yaml similarity index 85% rename from apps/dev/ingress/kustomization.yaml rename to apps/dev/gateways/kustomization.yaml index 364b9bac8..628290a7f 100644 --- a/apps/dev/ingress/kustomization.yaml +++ b/apps/dev/gateways/kustomization.yaml @@ -1,4 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization +namespace: apps resources: - gke-gateway.yaml diff --git a/apps/dev/kustomization.yaml b/apps/dev/kustomization.yaml index b3183d8cc..4c9753d93 100644 --- a/apps/dev/kustomization.yaml +++ b/apps/dev/kustomization.yaml @@ -3,6 +3,7 @@ kind: Kustomization resources: - ../_base - namespace.yaml + - gateways.yaml - prow-crd.yaml - prow - - tekton \ No newline at end of file + - tekton diff --git a/apps/dev/prow/release/kustomization.yaml b/apps/dev/prow/release/kustomization.yaml index 5a852aace..cbbf5623c 100644 --- a/apps/dev/prow/release/kustomization.yaml +++ b/apps/dev/prow/release/kustomization.yaml @@ -3,4 +3,5 @@ kind: Kustomization resources: - release.yaml - frontend-config.yaml - - gce-ingress.yaml \ No newline at end of file + - wip-http-routes.yaml + # - gce-ingress.yaml diff --git a/apps/dev/prow/release/wip-http-routes.yaml b/apps/dev/prow/release/wip-http-routes.yaml index 0d2cf0ad7..5127438fc 100644 --- a/apps/dev/prow/release/wip-http-routes.yaml +++ b/apps/dev/prow/release/wip-http-routes.yaml @@ -13,22 +13,10 @@ spec: rules: - backendRefs: - name: prow-deck - port: 8080 + port: 80 - matches: - path: value: /hook backendRefs: - name: prow-hook - port: 8080 - - matches: - - path: - value: /tichi - backendRefs: - - name: prow-ti-community-owners - port: 8080 - - matches: - - path: - value: /ti-community-owners - backendRefs: - - name: prow-hook - port: 8080 + port: 80 diff --git a/apps/dev/tekton/ingress/kustomization.yaml b/apps/dev/tekton/ingress/kustomization.yaml index a26cdd164..4b0383c18 100644 --- a/apps/dev/tekton/ingress/kustomization.yaml +++ b/apps/dev/tekton/ingress/kustomization.yaml @@ -1,5 +1,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- ingress-dashboard.yaml -- ingress-event-listener.yaml + # - ingress-dashboard.yaml + # - ingress-event-listener.yaml + - wip-http-routes.yaml diff --git a/apps/dev/tekton/ingress/wip-http-routes.yaml b/apps/dev/tekton/ingress/wip-http-routes.yaml index 68336aedb..0227714b2 100644 --- a/apps/dev/tekton/ingress/wip-http-routes.yaml +++ b/apps/dev/tekton/ingress/wip-http-routes.yaml @@ -18,6 +18,7 @@ spec: value: "${path_for_hook}(/|$)(.*)" backendRefs: - name: el-trigger-groups-listener + namespace: ee-cd port: 8080 filters: - type: URLRewrite @@ -25,14 +26,14 @@ spec: path: type: ReplacePrefixMatch replacePrefixMatch: /$2 - - name: dashboard - matches: + - matches: - path: type: PathPrefix value: "${path_for_dashboard}(/|$)(.*)" backendRefs: - name: tekton-dashboard - port: 8080 + namespace: tekton-pipelines + port: 9097 filters: - type: URLRewrite urlRewrite: