Merge pull request #275 from wilhelmguo/feature/secret_add_user_defin…

…e_type Secret template support set type
Qihoo360 · Feb 15, 2019 · bf18ea3 · bf18ea3
2 parents 3dda084 + 8b785a4
commit bf18ea3
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 2 deletions.
diff --git a/...frontend/src/app/portal/secret/create-edit-secrettpl/create-edit-secrettpl.component.html b/...frontend/src/app/portal/secret/create-edit-secrettpl/create-edit-secrettpl.component.html
@@ -6,7 +6,8 @@ <h3 class="header-title">{{'SECRET.CREATE_TMP' | translate}}</h3>
     <section class="form-block wrap">
       <div *ngIf="clusters" formArrayName="clusters" class="form-group form-group-padding">
         <label class="clr-col-md-3 form-group-label-override required">{{'TITLE.CLUSTER' | translate}}</label>
-        <span class="warning-text" *ngIf="!clusters || clusters && clusters.length === 0">{{'SECRET.CREATE_EDIT.CLUSTER_MESSAGE' | translate}}</span>
+        <span class="warning-text"
+              *ngIf="!clusters || clusters && clusters.length === 0">{{'SECRET.CREATE_EDIT.CLUSTER_MESSAGE' | translate}}</span>
         <div *ngFor="let cluster of clusters;let i=index"
              style="padding-right: 15px" class="checkbox-inline"
              [formGroupName]="i">
@@ -24,6 +25,42 @@ <h3 class="header-title">{{'SECRET.CREATE_TMP' | translate}}</h3>
                   required>
         </textarea>
       </div>
+      <div class="form-group form-group-padding">
+        <label class="clr-col-md-3 form-group-label-override required">
+          {{'TEMPLATE.TYPE' | translate}}
+          <a style="" role="tooltip" aria-haspopup="true" class="tooltip tooltip-lg">
+            <clr-icon shape="info-circle" size="24"></clr-icon>
+            <span class="tooltip-content">
+              类型说明：
+              Opaque: 用户自定义数据
+              <br>
+              kubernetes.io/dockerconfigjson: ~/.docker/config.json格式
+              <br>
+              kubernetes.io/dockercfg: ~/.dockercfg 格式
+              <br>
+              kubernetes.io/service-account-token: 定义 service-account
+              <br>
+              kubernetes.io/basic-auth: 定义 basic authentication
+              <br>
+              kubernetes.io/ssh-auth: 定义 SSH authetication 认证
+              <br>
+              kubernetes.io/tls: SecretTypeTLS包含有关TLS客户端或服务器机密的信息。 它主要用于Ingress资源的TLS终止，但也可以用于其他类型。
+              <br>
+            </span>
+          </a>
+        </label>
+        <div class="select">
+          <select formControlName="type" required>
+            <option value="Opaque" selected>Opaque</option>
+            <option value="kubernetes.io/dockerconfigjson">kubernetes.io/dockerconfigjson</option>
+            <option value="kubernetes.io/dockercfg">kubernetes.io/dockercfg</option>
+            <option value="kubernetes.io/service-account-token">kubernetes.io/service-account-token</option>
+            <option value="kubernetes.io/basic-auth">kubernetes.io/basic-auth</option>
+            <option value="kubernetes.io/ssh-auth">kubernetes.io/ssh-auth</option>
+            <option value="kubernetes.io/tls">kubernetes.io/tls</option>
+          </select>
+        </div>
+      </div>
       <div formArrayName="datas">
         <div *ngFor="let data of datas.controls; let i = index"
              [formGroupName]="i">

diff --git a/src/frontend/src/app/portal/secret/create-edit-secrettpl/create-edit-secrettpl.component.ts b/src/frontend/src/app/portal/secret/create-edit-secrettpl/create-edit-secrettpl.component.ts
@@ -120,6 +120,7 @@ export class CreateEditSecretTplComponent implements OnInit, AfterViewInit, OnDe
       disabled = true;
     }
     this.currentForm = this.fb.group({
+      type: 'Opaque',
       description: this.secretTpl.description,
       datas: this.fb.array([
         this.fb.group({
@@ -267,7 +268,7 @@ export class CreateEditSecretTplComponent implements OnInit, AfterViewInit, OnDe
     }
     kubeSecret.kind = 'Secret';
     kubeSecret.apiVersion = 'v1';
-    kubeSecret.type = 'Opaque';
+    kubeSecret.type = formValue.type;
     kubeSecret.metadata.name = this.secret.name;
     kubeSecret.metadata.labels = this.buildLabels(kubeSecret.metadata.labels);
     if (formValue.datas && formValue.datas.length > 0) {
@@ -294,6 +295,7 @@ export class CreateEditSecretTplComponent implements OnInit, AfterViewInit, OnDe
           dataValue: Base64.decode(kubeSecret.data[key]),
         }));
       });
+      this.currentForm.setControl('type', this.fb.control(this.kubeSecret.type));
       this.currentForm.setControl('datas', this.fb.array(datas));
     }
   }