Skip to content

Commit 95a431f

Browse files
committed
oauth for api + upgrade to 0.65.0
1 parent 2ef457d commit 95a431f

File tree

3 files changed

+1
-75
lines changed

3 files changed

+1
-75
lines changed

charts/hub/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ type: application
1616
# This is the chart version. This version number should be incremented each time you make changes
1717
# to the chart and its templates, including the app version.
1818
# Versions are expected to follow Semantic Versioning (https://semver.org/)
19-
version: 0.64.0
19+
version: 0.65.0
2020

2121
# This is the version number of the application being deployed. This version number should be
2222
# incremented each time you make changes to the application. Versions are not expected to

charts/hub/templates/kerberos-hub/hub-frontend-demo.yaml

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -23,24 +23,16 @@ metadata:
2323
name: hub-frontend-demo-ingress
2424
annotations:
2525
kubernetes.io/ingress.class: {{ .Values.ingress }}
26-
{{- if eq .Values.kerberoshub.oauth2Proxy.enabled true }}
27-
nginx.ingress.kubernetes.io/auth-url: "https://$host/oauth2/auth"
28-
nginx.ingress.kubernetes.io/auth-signin: "https://$host/oauth2/start?rd=$escaped_request_uri"
29-
{{- end }}
3026
{{- if eq .Values.ingress "nginx" }}
3127
kubernetes.io/tls-acme: "true"
3228
nginx.ingress.kubernetes.io/ssl-redirect: "true"
3329
cert-manager.io/cluster-issuer: "letsencrypt-prod"
3430
{{- end }}
3531
spec:
36-
3732
{{- with .Values.kerberoshub.frontend.demoTls }}
3833
tls:
3934
{{- toYaml . | nindent 8 }}
4035
{{- end }}
41-
42-
43-
4436
{{ if .Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
4537
rules:
4638
- host: "{{ .Values.kerberoshub.frontend.demoUrl }}"
@@ -64,36 +56,6 @@ spec:
6456
servicePort: 80
6557
{{ end }}
6658
---
67-
apiVersion: networking.k8s.io/v1
68-
kind: Ingress
69-
metadata:
70-
name: oauth2-proxy-frontend-demo
71-
namespace: kube-system
72-
annotations:
73-
kubernetes.io/ingress.class: {{ .Values.ingress }}
74-
{{- if eq .Values.ingress "nginx" }}
75-
cert-manager.io/cluster-issuer: letsencrypt-prod
76-
kubernetes.io/tls-acme: "true"
77-
nginx.ingress.kubernetes.io/ssl-redirect: "true"
78-
{{- end }}
79-
spec:
80-
ingressClassName: nginx
81-
rules:
82-
- host: "{{ .Values.kerberoshub.frontend.demoUrl }}"
83-
http:
84-
paths:
85-
- path: /oauth2
86-
pathType: Prefix
87-
backend:
88-
service:
89-
name: oauth2-proxy
90-
port:
91-
number: 4180
92-
tls:
93-
- hosts:
94-
- "{{ .Values.kerberoshub.frontend.demoUrl }}"
95-
secretName:
96-
---
9759
apiVersion: apps/v1
9860
kind: Deployment
9961
metadata:

charts/hub/templates/kerberos-hub/hub-frontend.yaml

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@ metadata:
2323
name: hub-frontend-ingress
2424
annotations:
2525
kubernetes.io/ingress.class: {{ .Values.ingress }}
26-
{{- if eq .Values.kerberoshub.oauth2Proxy.enabled true }}
27-
nginx.ingress.kubernetes.io/auth-url: "https://$host/oauth2/auth"
28-
nginx.ingress.kubernetes.io/auth-signin: "https://$host/oauth2/start?rd=$escaped_request_uri"
29-
{{- end }}
3026
{{- if eq .Values.ingress "nginx" }}
3127
kubernetes.io/tls-acme: "true"
3228
nginx.ingress.kubernetes.io/ssl-redirect: "true"
@@ -103,38 +99,6 @@ spec:
10399
servicePort: 80
104100
{{- end }}
105101
{{- end }}
106-
{{- if eq .Values.kerberoshub.oauth2Proxy.enabled true }}
107-
---
108-
apiVersion: networking.k8s.io/v1
109-
kind: Ingress
110-
metadata:
111-
name: oauth2-proxy-frontend
112-
namespace: kube-system
113-
annotations:
114-
kubernetes.io/ingress.class: {{ .Values.ingress }}
115-
{{- if eq .Values.ingress "nginx" }}
116-
cert-manager.io/cluster-issuer: letsencrypt-prod
117-
kubernetes.io/tls-acme: "true"
118-
nginx.ingress.kubernetes.io/ssl-redirect: "true"
119-
{{- end }}
120-
spec:
121-
ingressClassName: nginx
122-
rules:
123-
- host: "{{ .Values.kerberoshub.frontend.url }}"
124-
http:
125-
paths:
126-
- path: /oauth2
127-
pathType: Prefix
128-
backend:
129-
service:
130-
name: oauth2-proxy
131-
port:
132-
number: 4180
133-
tls:
134-
- hosts:
135-
- "{{ .Values.kerberoshub.frontend.url }}"
136-
secretName: oauth2-proxy-tls
137-
{{- end }}
138102
---
139103
apiVersion: apps/v1
140104
kind: Deployment

0 commit comments

Comments
 (0)