fix bugs

bigcatking · Nov 20, 2019 · 4c5fa50 · 4c5fa50
1 parent 8857589
commit 4c5fa50
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 21 deletions.
diff --git a/api/resource/kubeasz/roles/nameserver/defaults/main.yml b/api/resource/kubeasz/roles/nameserver/defaults/main.yml
@@ -1 +1,2 @@
 dns_repository_hostname: "registry.kubeops.io"
+dns_registry_hostname: "registry.{{APP_DOMAIN}}"
diff --git a/api/resource/kubeasz/roles/nameserver/tasks/main.yml b/api/resource/kubeasz/roles/nameserver/tasks/main.yml
@@ -8,7 +8,7 @@
   lineinfile:
     path: "/etc/hosts"
     regexp: "{{ groups['worker'][0] }}"
-    line: "{{ hostvars[groups['worker'][0]]['ansible_ssh_host']  }} {{groups['worker'][0]}}"
+    line: "{{ hostvars[groups['worker'][0]]['ansible_ssh_host']  }} {{dns_registry_hostname}}"
 
 - name: 插入 registry 记录
   lineinfile:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -35,8 +35,6 @@ services:
     restart: always
     privileged: true
     tty: true
-    dns:
-      - "127.0.0.1"
     volumes:
       - ./data:/data
       - /var/run/docker.sock:/var/run/docker.sock
@@ -92,15 +90,6 @@ services:
       retries: 10
     environment:
       TZ: Asia/Shanghai
-  dns:
-    image: coredns/coredns:1.6.0
-    container_name: kubeops_dns
-    volumes:
-      - /opt/kubeoperator/data/dns:/root
-    ports:
-      - 53:53/tcp
-      - 53:53/udp
-    command: ['--conf','/root/dns.conf']
   webkubectl:
     image: webkubectl/webkubectl:v1.4
     container_name: kubeops_webkubectl

diff --git a/ui/src/app/cluster/cluster-create/cluster-create.component.html b/ui/src/app/cluster/cluster-create/cluster-create.component.html
@@ -293,15 +293,6 @@ <h5>{{node.name}} &nbsp;&nbsp;<i class="fa fa-close" *ngIf="node.delete"
       </div>
     </div>
   </clr-wizard-page>
-
-
-  <clr-wizard-page [clrWizardPageNextDisabled]="" *ngIf="cluster.deploy_type === Manual">
-    <ng-template clrPageTitle>集群参数</ng-template>
-
-
-  </clr-wizard-page>
-
-
   <clr-wizard-page>
     <form clrForm class="clr-form clr-form-compact">
       <ng-template clrPageTitle>其他设置</ng-template>
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		dns_repository_hostname: "registry.kubeops.io"
		dns_registry_hostname: "registry.{{APP_DOMAIN}}"