From f75309f7f38b85d0158a21375297dc4cdd5c33c6 Mon Sep 17 00:00:00 2001 From: jeff Date: Wed, 20 Jun 2018 17:31:22 +0800 Subject: [PATCH] fix ingress controller yaml error --- ...-static-ip-svc.yaml => ingress-controller-svc.yaml} | 7 +++++-- .../{9-with-rbac.yaml => ingress-controller.yaml} | 10 +++++++--- 2 files changed, 12 insertions(+), 5 deletions(-) rename install/ingress-controller/{9.1-static-ip-svc.yaml => ingress-controller-svc.yaml} (75%) rename install/ingress-controller/{9-with-rbac.yaml => ingress-controller.yaml} (91%) diff --git a/install/ingress-controller/9.1-static-ip-svc.yaml b/install/ingress-controller/ingress-controller-svc.yaml similarity index 75% rename from install/ingress-controller/9.1-static-ip-svc.yaml rename to install/ingress-controller/ingress-controller-svc.yaml index 88c42808c..d7b9e8028 100644 --- a/install/ingress-controller/9.1-static-ip-svc.yaml +++ b/install/ingress-controller/ingress-controller-svc.yaml @@ -5,10 +5,13 @@ metadata: namespace: kubesphere-router-system labels: app: kubesphere - component: kubesphere-router + component: ks-router + tier: backend spec: selector: - app: + app: kubesphere + component: ks-router + tier: backend type: LoadBalancer ports: - name: http diff --git a/install/ingress-controller/9-with-rbac.yaml b/install/ingress-controller/ingress-controller.yaml similarity index 91% rename from install/ingress-controller/9-with-rbac.yaml rename to install/ingress-controller/ingress-controller.yaml index 0d6941310..2effe4cfb 100644 --- a/install/ingress-controller/9-with-rbac.yaml +++ b/install/ingress-controller/ingress-controller.yaml @@ -1,17 +1,21 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: kubesphere-router + name: ks-router namespace: kubesphere-router-system spec: replicas: 1 selector: matchLabels: - app: kubesphere-router + app: kubesphere + component: ks-router + tier: backend template: metadata: labels: - app: kubesphere-router + app: kubesphere + component: ks-router + tier: backend annotations: prometheus.io/port: '10254' prometheus.io/scrape: 'true'