Skip to content

Commit

Permalink
minor fix in .gitignore
Browse files Browse the repository at this point in the history
  • Loading branch information
gjmzj committed Aug 12, 2018
1 parent d1cdcaf commit b246265
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 21 deletions.
5 changes: 0 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,12 @@ down/*
bin/*
!bin/readme.md

# kube-dns controller
manifests/kubedns/kubedns.yaml
manifests/coredns/coredns.yaml

# ansible hosts
hosts

# k8s storage manifests
manifests/storage/*
!manifests/storage/test.yaml
!manifests/storage/alicloud-nas/alicloud-disk.yaml

# k8s backup directory
roles/cluster-backup/files/*
Expand Down
12 changes: 8 additions & 4 deletions 22.upgrade.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
- kube-master
- kube-node
- deploy
- etcd
- lb
roles:
- prepare

Expand All @@ -19,17 +17,23 @@
# docker更新,为保证不中断业务,不自动重启docker服务
- hosts:
- kube-master
- new-master
- kube-node
- new-node
roles:
- docker

# 更新master节点
- hosts: kube-master
- hosts:
- kube-master
- new-master
roles:
- kube-master
- kube-node

# 更新node节点
- hosts: kube-node
- hosts:
- kube-node
- new-node
roles:
- { role: kube-node, when: "DEPLOY_MODE != 'allinone'" }
6 changes: 0 additions & 6 deletions manifests/coredns/readme.md

This file was deleted.

6 changes: 0 additions & 6 deletions manifests/kubedns/readme.md

This file was deleted.

0 comments on commit b246265

Please sign in to comment.