From 03de088274754336011f01e013c01b316d072134 Mon Sep 17 00:00:00 2001
From: lvyongxin <lvyongxin@bd-apaas.com>
Date: Fri, 21 Aug 2020 17:53:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9ingress.yaml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/ingress/ingress.yaml | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/templates/ingress/ingress.yaml b/templates/ingress/ingress.yaml
index f33cb4e..5deb437 100644
--- a/templates/ingress/ingress.yaml
+++ b/templates/ingress/ingress.yaml
@@ -115,7 +115,7 @@ spec:
   - websecure
   routes:
   - kind: Rule
-    match: Host(`{{ "$ingress.hosts.core" }}`) && PathPrefix(`/`)
+    match: Host(`{{ .Values.expose.ingress.hosts.core }}`) && PathPrefix(`/`)
     middlewares: []
     priority: 0
     services:
@@ -124,7 +124,7 @@ spec:
       namespace: devops
       port: 80
   - kind: Rule
-    match: Host(`{{ "$ingress.hosts.core" }}`) && PathPrefix(`/api/`)
+    match: Host(`{{ .Values.expose.ingress.hosts.core }}`) && PathPrefix(`/api/`)
     middlewares: []
     priority: 0
     services:
@@ -133,7 +133,7 @@ spec:
       namespace: devops
       port: 80
   - kind: Rule
-    match: Host(`{{ "$ingress.hosts.core" }}`) && PathPrefix(`/service/`)
+    match: Host(`{{ .Values.expose.ingress.hosts.core }}`) && PathPrefix(`/service/`)
     middlewares: []
     priority: 0
     services:
@@ -142,7 +142,7 @@ spec:
       namespace: devops
       port: 80
   - kind: Rule
-    match: Host(`{{ "$ingress.hosts.core" }}`) && PathPrefix(`/v2/`)
+    match: Host(`{{ .Values.expose.ingress.hosts.core }}`) && PathPrefix(`/v2/`)
     middlewares: []
     priority: 0
     services:
@@ -151,7 +151,7 @@ spec:
       namespace: devops
       port: 80
   - kind: Rule
-    match: Host(`{{ "$ingress.hosts.core" }}`) && PathPrefix(`/chartrepo/`)
+    match: Host(`{{ .Values.expose.ingress.hosts.core }}`) && PathPrefix(`/chartrepo/`)
     middlewares: []
     priority: 0
     services:
@@ -160,7 +160,7 @@ spec:
       namespace: devops
       port: 80
   - kind: Rule
-    match: Host(`{{ "$ingress.hosts.core" }}`) && PathPrefix(`/c/`)
+    match: Host(`{{ .Values.expose.ingress.hosts.core }}`) && PathPrefix(`/c/`)
     middlewares: []
     priority: 0
     services:
@@ -169,7 +169,7 @@ spec:
       namespace: devops
       port: 80
   - kind: Rule
-    match: Host(`{{ "$ingress.hosts.core" }}`) && PathPrefix(`/`)
+    match: Host(`{{ .Values.expose.ingress.hosts.notary }}`) && PathPrefix(`/`)
     middlewares: []
     priority: 0
     services:
@@ -186,4 +186,12 @@ metadata:
   name: harbor
   namespace: {{ .Release.Namespace }}
 spec:
-  host: {{ "$ingress.hosts.core" }}
\ No newline at end of file
+  host: {{ .Values.expose.ingress.hosts.core }}
+---
+apiVersion: bcc.bd-apaas.com/v1alpha1
+kind: IngressHost
+metadata:
+  name: harbor
+  namespace: {{ .Release.Namespace }}
+spec:
+  host: {{ .Values.expose.ingress.hosts.notary }}
\ No newline at end of file
-- 
2.26.0