Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion src/app_charts/base/cloud/domain-redirect.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,23 @@ spec:
name: dummy
port:
number: 80
{{ end }}
---
apiVersion: gateway.networking.k8s.io/v1
kind: HTTPRoute
metadata:
name: domain-redirect
spec:
hostnames:
- "www.endpoints.{{ .Values.project }}.cloud.goog"
parentRefs:
- name: crc-gateway
namespace: default
sectionName: https
rules:
- filters:
- type: RequestRedirect
requestRedirect:
scheme: https
hostname: {{ .Values.domain }}
statusCode: 301
{{- end }}
46 changes: 44 additions & 2 deletions src/app_charts/base/cloud/kubernetes-api.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{ if eq .Values.onprem_federation "true" }}
{{- if eq .Values.onprem_federation "true" }}
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
Expand All @@ -23,4 +23,46 @@ spec:
name: kubernetes
port:
number: 443
{{ end }}
---
{{- range list "" "-auth" }}
{{- $sectionName := "https" }}{{ if eq . "-auth" }}{{ $sectionName = "http" }}{{ end }}
apiVersion: gateway.networking.k8s.io/v1
kind: HTTPRoute
metadata:
name: kubernetes-api{{ . }}
spec:
hostnames:
- {{ $.Values.domain }}
parentRefs:
- name: crc{{ . }}-gateway
namespace: default
sectionName: {{ $sectionName }}
rules:
- matches:
- path:
type: PathPrefix
value: /apis/core.kubernetes
{{- if eq . "-auth" }}
filters:
- type: URLRewrite
urlRewrite:
path:
type: ReplaceFullPath
replaceFullPath: /auth
backendRefs:
- name: cr-syncer-auth-webhook
port: 80
{{- else }}
filters:
- type: URLRewrite
urlRewrite:
path:
type: ReplacePrefixMatch
replacePrefixMatch: /
backendRefs:
- name: kubernetes
port: 443
{{- end }}
---
{{- end }}
{{- end }}
Comment thread
ensonic marked this conversation as resolved.
46 changes: 46 additions & 0 deletions src/app_charts/base/cloud/oauth2-proxy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -99,4 +99,50 @@ spec:
name: oauth2-proxy
port:
name: http
---
apiVersion: gateway.networking.k8s.io/v1
kind: HTTPRoute
metadata:
name: oauth2-proxy
spec:
hostnames:
- {{ .Values.domain }}
parentRefs:
- name: crc-gateway
namespace: default
sectionName: https
rules:
- matches:
- path:
type: PathPrefix
value: /web-apis
filters:
- type: URLRewrite
urlRewrite:
path:
type: ReplacePrefixMatch
replacePrefixMatch: /apis
backendRefs:
- name: oauth2-proxy
port: 80
---
apiVersion: gateway.networking.k8s.io/v1
kind: HTTPRoute
metadata:
name: oauth2-proxy-interactive
spec:
hostnames:
- {{ .Values.domain }}
parentRefs:
- name: crc-gateway
namespace: default
sectionName: https
rules:
- matches:
- path:
type: PathPrefix
value: /oauth2
backendRefs:
- name: oauth2-proxy
port: 80
{{ end }}
81 changes: 81 additions & 0 deletions src/app_charts/k8s-relay/cloud/http-route.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
{{- range list "" "-auth" }}
{{- $sectionName := "https" }}{{ if eq . "-auth" }}{{ $sectionName = "http" }}{{ end }}
apiVersion: gateway.networking.k8s.io/v1
kind: HTTPRoute
metadata:
name: kubernetes-relay-client{{ . }}
spec:
hostnames:
- {{ $.Values.domain }}
parentRefs:
- name: crc{{ . }}-gateway
namespace: default
sectionName: {{ $sectionName }}
rules:
- matches:
- path:
type: PathPrefix
value: /apis/core.kubernetes-relay/client
{{- if eq . "-auth" }}
filters:
- type: URLRewrite
urlRewrite:
path:
type: ReplaceFullPath
replaceFullPath: /apis/core.token-vendor/v1/token.verify
backendRefs:
- name: token-vendor
namespace: app-token-vendor
port: 80
{{- else }}
filters:
- type: URLRewrite
urlRewrite:
path:
type: ReplacePrefixMatch
replacePrefixMatch: /client
backendRefs:
- name: kubernetes-relay-server
port: 80
{{- end }}
---
apiVersion: gateway.networking.k8s.io/v1
kind: HTTPRoute
metadata:
name: kubernetes-relay-server{{ . }}
spec:
hostnames:
- {{ $.Values.domain }}
parentRefs:
- name: crc{{ . }}-gateway
namespace: default
sectionName: {{ $sectionName }}
rules:
- matches:
- path:
type: PathPrefix
value: /apis/core.kubernetes-relay/server
{{- if eq . "-auth" }}
filters:
- type: URLRewrite
urlRewrite:
path:
type: ReplaceFullPath
replaceFullPath: /apis/core.token-vendor/v1/token.verify?robots=true
backendRefs:
- name: token-vendor
namespace: app-token-vendor
port: 80
{{- else }}
filters:
- type: URLRewrite
urlRewrite:
path:
type: ReplacePrefixMatch
replacePrefixMatch: /server
backendRefs:
- name: kubernetes-relay-server
port: 80
{{- end }}
---
{{- end }}
43 changes: 43 additions & 0 deletions src/app_charts/prometheus/cloud/grafana-http-route.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
{{- range list "" "-auth" }}
{{- $sectionName := "https" }}{{ if eq . "-auth" }}{{ $sectionName = "http" }}{{ end }}
apiVersion: gateway.networking.k8s.io/v1
kind: HTTPRoute
metadata:
name: grafana{{ . }}
labels:
app.kubernetes.io/name: {{ $.Chart.Name }}
spec:
hostnames:
- {{ $.Values.domain }}
parentRefs:
- name: crc{{ . }}-gateway
namespace: default
sectionName: {{ $sectionName }}
rules:
- matches:
- path:
type: PathPrefix
value: /grafana
{{- if eq . "-auth" }}
filters:
- type: URLRewrite
urlRewrite:
path:
type: ReplaceFullPath
replaceFullPath: {{ tpl $.Values.gf_ingress_auth_url $ }}
backendRefs:
- name: oauth2-proxy
port: 80
{{- else }}
filters:
- type: URLRewrite
urlRewrite:
path:
type: ReplacePrefixMatch
replacePrefixMatch: /
backendRefs:
- name: prom-grafana
port: 80
{{- end }}
---
{{- end }}
43 changes: 43 additions & 0 deletions src/app_charts/prometheus/cloud/prometheus-http-route.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
{{- range list "" "-auth" }}
{{- $sectionName := "https" }}{{ if eq . "-auth" }}{{ $sectionName = "http" }}{{ end }}
apiVersion: gateway.networking.k8s.io/v1
kind: HTTPRoute
metadata:
name: prometheus{{ . }}
labels:
app.kubernetes.io/name: {{ $.Chart.Name }}
spec:
hostnames:
- {{ $.Values.domain }}
parentRefs:
- name: crc{{ . }}-gateway
namespace: default
sectionName: {{ $sectionName }}
rules:
- matches:
- path:
type: PathPrefix
value: /prometheus
{{- if eq . "-auth" }}
filters:
- type: URLRewrite
urlRewrite:
path:
type: ReplaceFullPath
replaceFullPath: {{ tpl $.Values.prom_ingress_auth_url $ }}
backendRefs:
- name: oauth2-proxy
port: 80
{{- else }}
filters:
- type: URLRewrite
urlRewrite:
path:
type: ReplacePrefixMatch
replacePrefixMatch: /
backendRefs:
- name: kube-prometheus
port: 9090
{{- end }}
---
{{- end }}
44 changes: 44 additions & 0 deletions src/app_charts/prometheus/cloud/prometheus-relay.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -102,3 +102,47 @@ spec:
selector:
matchLabels:
app: prometheus-relay-server
---
{{- range list "" "-auth" }}
{{- $sectionName := "https" }}{{ if eq . "-auth" }}{{ $sectionName = "http" }}{{ end }}
apiVersion: gateway.networking.k8s.io/v1
kind: HTTPRoute
metadata:
name: prometheus-relay-server{{ . }}
labels:
app.kubernetes.io/name: {{ $.Chart.Name }}
spec:
hostnames:
- {{ $.Values.domain }}
parentRefs:
- name: crc{{ . }}-gateway
namespace: default
sectionName: {{ $sectionName }}
rules:
- matches:
- path:
type: PathPrefix
value: /apis/core.prometheus-relay/server
{{- if eq . "-auth" }}
filters:
- type: URLRewrite
urlRewrite:
path:
type: ReplaceFullPath
replaceFullPath: /apis/core.token-vendor/v1/token.verify?robots=true
backendRefs:
- name: token-vendor
port: 80
{{- else }}
filters:
- type: URLRewrite
urlRewrite:
path:
type: ReplacePrefixMatch
replacePrefixMatch: /server
backendRefs:
- name: prometheus-relay-server
port: 80
{{- end }}
---
{{- end }}
2 changes: 1 addition & 1 deletion src/app_charts/token-vendor/cloud/http-route.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{- range list "" "-auth" }}
{{- $sectionName := "https" }}{{ if eq . "-auth" }}{{ $sectionName = "http" }}{{ end -}}
{{- $sectionName := "https" }}{{ if eq . "-auth" }}{{ $sectionName = "http" }}{{ end }}
apiVersion: gateway.networking.k8s.io/v1
kind: HTTPRoute
metadata:
Expand Down
21 changes: 21 additions & 0 deletions src/bootstrap/cloud/terraform/.terraform.lock.hcl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading