Merge branch 'master' of github.com:Qihoo360/wayne

Qihoo360 · Jan 14, 2020 · 9085136 · 9085136
2 parents f3117a6 + 33d6e0a
commit 9085136
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 17 deletions.
diff --git a/hack/build/backend/Dockerfile b/hack/build/backend/Dockerfile
@@ -12,7 +12,6 @@ COPY go.sum /go/src/github.com/Qihoo360/wayne
 COPY src/backend /go/src/github.com/Qihoo360/wayne/src/backend
 
 RUN export GO111MODULE=on && \
-    export GOPROXY=https://goproxy.io && \
     cd /go/src/github.com/Qihoo360/wayne/src/backend && \
     bee generate docs && \
     bee pack -o /_build

diff --git a/src/backend/controllers/ingress/ingress_tpl.go b/src/backend/controllers/ingress/ingress_tpl.go
@@ -3,7 +3,7 @@ package ingress
 import (
 	"encoding/json"
 	"fmt"
-
+	
 	kapiv1beta1 "k8s.io/api/extensions/v1beta1"
 
 	"github.com/Qihoo360/wayne/src/backend/controllers/base"

diff --git a/src/backend/resources/ingress/ingress.go b/src/backend/resources/ingress/ingress.go
@@ -5,6 +5,8 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	metaV1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
+
+	"github.com/Qihoo360/wayne/src/backend/util/logs"
 )
 
 func CreateOrUpdateIngress(c *kubernetes.Clientset, ingress *v1beta1.Ingress) (*Ingress, error) {
@@ -19,7 +21,14 @@ func CreateOrUpdateIngress(c *kubernetes.Clientset, ingress *v1beta1.Ingress) (*
 		}
 		return nil, err
 	}
-	ingress.Spec.DeepCopyInto(&old.Spec)
+
+	// ingress.Spec.DeepCopyInto(&old.Spec)
+	// also need update Labels、Annotations、Spec
+	old.Labels = ingress.Labels
+	old.Annotations = ingress.Annotations
+	old.Spec = ingress.Spec
+	logs.Info("new ingress", old)
+
 	kubeIngress, err := c.ExtensionsV1beta1().Ingresses(ingress.Namespace).Update(old)
 	if err != nil {
 		return nil, err

diff --git a/...ntend/src/app/portal/ingress/create-edit-ingresstpl/create-edit-ingresstpl.component.html b/...ntend/src/app/portal/ingress/create-edit-ingresstpl/create-edit-ingresstpl.component.html
@@ -24,8 +24,8 @@ <h3 class="header-title">创建 Ingress 模版</h3>
             <clr-icon shape="trash"></clr-icon>删除</button>
         </label>
         <clr-input-container>
-          <label class="required">域名</label>
-          <input type="text" clrInput required [ngModelOptions]="{standalone: true}" [(ngModel)]="kubeResource.spec.rules[i].host">
+          <label>域名</label>
+          <input type="text" clrInput [ngModelOptions]="{standalone: true}" [(ngModel)]="kubeResource.spec.rules[i].host">
         </clr-input-container>
         <ng-container *ngFor="let path of kubeResource.spec.rules[i].http.paths; let j = index">
           <div class="clr-form-control clr-row">

diff --git a/...rontend/src/app/portal/ingress/create-edit-ingresstpl/create-edit-ingresstpl.component.ts b/...rontend/src/app/portal/ingress/create-edit-ingresstpl/create-edit-ingresstpl.component.ts
@@ -111,9 +111,6 @@ export class CreateEditIngressTplComponent extends CreateEditResourceTemplate im
       return false;
     }
     for (const rule of this.kubeResource.spec.rules) {
-      if (rule.host.length === 0) {
-        return false;
-      }
       if (rule.http.paths.length === 0) {
         return false;
       }

diff --git a/src/frontend/src/app/shared/base/resource/create-edit-resource-template.ts b/src/frontend/src/app/shared/base/resource/create-edit-resource-template.ts
@@ -73,10 +73,17 @@ export class CreateEditResourceTemplate {
     this.aceEditorService.announceMessage(AceEditorMsg.Instance(resourceObj, true));
   }
 
-  // 处理资源（挂载系统 label 等）
+  // 处理资源（挂载系统 label 等）删除 host
   generateResource(kubeResource: any): any {
     kubeResource.metadata.name = this.resource.name;
     kubeResource.metadata.labels = this.generateLabels(this.kubeResource.metadata.labels);
+    const { rules } = kubeResource.spec;
+    rules.forEach(rule => {
+      if (rule.host !== undefined && rule.host.trim() === '') {
+        delete rule.host;
+      }
+    });
+    console.log('kubeResource', kubeResource);
     return kubeResource;
   }
 

diff --git a/src/frontend/src/app/shared/default-models/ingress.const.ts b/src/frontend/src/app/shared/default-models/ingress.const.ts
@@ -5,14 +5,7 @@ export const defaultIngress = `{
     "name": ""
   },
   "spec": {
-    "tls": [
-         {
-             "hosts": [
-                 ""
-                     ],
-             "secretName": ""
-         }
-    ],
+    "tls": [],
     "rules": [
       {
         "host": "",