diff --git a/KubernetesDashboard/ingress.yaml b/KubernetesDashboard/ingress.yaml index 59bdc3b..91711ad 100644 --- a/KubernetesDashboard/ingress.yaml +++ b/KubernetesDashboard/ingress.yaml @@ -5,31 +5,31 @@ kubernetes.io/ingress.class: "nginx" nginx.org/mergeale-ingress-type: "minion" nginx.ingress.kubernetes.io/rewrite-target: "/$2" - nginx.ingress.kubernetes.io/auth-url: "https://$host/oauth2/auth" - nginx.ingress.kubernetes.io/auth-signin: "https://$host/oauth2/start?rd=$escaped_request_uri" - nginx.ingress.kubernetes.io/configuration-snippet: | - auth_request_set $token $upstream_http_authorization; - proxy_set_header Authorization $token; - name: kubernetes-dashboard-ingress + name: kubernetes-dashboard namespace: kubernetes-dashboard labels: app: kubernetes-dashboard spec: + ingressClassName: nginx + tls: + - hosts: + - kubernetes.dashboard.jerxie.com + secretName: kubernetes-dashboard-certs rules: - - host: kubernetes.jerxie.com - http: - paths: - - backend: - service: - name: kubernetes-dashboard-web - port: - name: web - path: /dashboard(/|$)(.*) - pathType: Exact - - path: /dashboard/api(/|$)(.*) - pathType: Exact - backend: - service: - name: kubernetes-dashboard-api - port: - name: api + - host: kubernetes.dashboard.jerxie.com + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: kubernetes-dashboard-web + port: + name: web + - path: /api + pathType: Prefix + backend: + service: + name: kubernetes-dashboard-api + port: + name: api diff --git a/KubernetesDashboard/ingress.yaml b/KubernetesDashboard/ingress.yaml index 59bdc3b..91711ad 100644 --- a/KubernetesDashboard/ingress.yaml +++ b/KubernetesDashboard/ingress.yaml @@ -5,31 +5,31 @@ kubernetes.io/ingress.class: "nginx" nginx.org/mergeale-ingress-type: "minion" nginx.ingress.kubernetes.io/rewrite-target: "/$2" - nginx.ingress.kubernetes.io/auth-url: "https://$host/oauth2/auth" - nginx.ingress.kubernetes.io/auth-signin: "https://$host/oauth2/start?rd=$escaped_request_uri" - nginx.ingress.kubernetes.io/configuration-snippet: | - auth_request_set $token $upstream_http_authorization; - proxy_set_header Authorization $token; - name: kubernetes-dashboard-ingress + name: kubernetes-dashboard namespace: kubernetes-dashboard labels: app: kubernetes-dashboard spec: + ingressClassName: nginx + tls: + - hosts: + - kubernetes.dashboard.jerxie.com + secretName: kubernetes-dashboard-certs rules: - - host: kubernetes.jerxie.com - http: - paths: - - backend: - service: - name: kubernetes-dashboard-web - port: - name: web - path: /dashboard(/|$)(.*) - pathType: Exact - - path: /dashboard/api(/|$)(.*) - pathType: Exact - backend: - service: - name: kubernetes-dashboard-api - port: - name: api + - host: kubernetes.dashboard.jerxie.com + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: kubernetes-dashboard-web + port: + name: web + - path: /api + pathType: Prefix + backend: + service: + name: kubernetes-dashboard-api + port: + name: api diff --git a/KubernetesDashboard/kustomization.yaml b/KubernetesDashboard/kustomization.yaml index d5eda16..936d663 100644 --- a/KubernetesDashboard/kustomization.yaml +++ b/KubernetesDashboard/kustomization.yaml @@ -1,7 +1,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- ingress.yaml - https://raw.githubusercontent.com/kubernetes/dashboard/v3.0.0-alpha0/charts/kubernetes-dashboard.yaml - clusterrolebinding.yaml @@ -27,3 +26,12 @@ target: kind: Service name: kubernetes-dashboard +- patch: |- + - op: replace + path: /spec/rules/0/host + value: kubernetes.dashboard.jerxie.com + - op: remove + path: /spec/tls + target: + kind: Ingress + name: kubernetes-dashboard \ No newline at end of file