Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update components #5

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deployment_examples/kubedns-addon.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ spec:
spec:
containers:
- name: kubedns
image: gcr.io/google_containers/kubedns-amd64:1.8
image: gcr.io/google_containers/kubedns-amd64:1.14.10
resources:
limits:
memory: 170Mi
Expand Down
12 changes: 6 additions & 6 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,28 @@
this ran with/on, also provisions:

```
vagrant --version = Vagrant 1.9.1
vagrant --version = Vagrant 2.0.4

vagrant plugin list:
vagrant-hostmanager (1.8.5)
vagrant-hostsupdater (1.0.2)
vagrant-share (1.1.6, system)

etcd --version:
etcd Version: 3.1.8
etcd Version: 3.3.8
Git SHA: d267ca9
Go Version: go1.7.5
Go OS/Arch: linux/amd64

etcdctl --version:
etcdctl version: 3.1.8̨
etcdctl version: 3.3.8̨
API version: 2

docker --version = Docker version 1.12.6, build 78d1802
docker --version = Docker version 18.03.1-ce

kubernetes v1.7.0
kubernetes v1.10.4

/usr/local/flanneld --version = v0.8.0-rc1-8-g4bc6cb2
/usr/local/flanneld --version = v0.10.0
```

## to start
Expand Down
6 changes: 3 additions & 3 deletions salt/states/docker/init.sls
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
docker-install:
archive.extracted:
- name: /opt/
- source: https://get.docker.com/builds/Linux/x86_64/docker-1.12.6.tgz
- source: https://download.docker.com/linux/static/stable/x86_64/docker-18.03.1-ce.tgz
- skip_verify: true
- options: xzf
- archive_format: tar
- if_missing: /opt/docker-1.12.6.tgz
- if_missing: /opt/docker-18.03.1-ce.tgz
cmd.run:
- name: cp /opt/docker/docker* /usr/bin/

Expand All @@ -27,7 +27,7 @@ docker-systemd:

[Service]
EnvironmentFile=/run/flannel/subnet.env
ExecStart=/usr/bin/docker daemon \
ExecStart=/usr/bin/dockerd \
--iptables=true \
--ip-masq=true \
--host=unix:///var/run/docker.sock \
Expand Down
8 changes: 4 additions & 4 deletions salt/states/etcd/init.sls
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
etcd-server:
archive.extracted:
- name: /opt/
- source: https://github.com/coreos/etcd/releases/download/v3.1.8/etcd-v3.1.8-linux-amd64.tar.gz
- source: https://github.com/coreos/etcd/releases/download/v3.3.8/etcd-v3.3.8-linux-amd64.tar.gz
- skip_verify: true
- options: xzf
- archive_format: tar
- if_missing: /opt/etcd-v3.1.8-linux-amd64
- if_missing: /opt/etcd-v3.3.8-linux-amd64
file.copy:
- name: /usr/bin/etcd
- source: /opt/etcd-v3.1.8-linux-amd64/etcd
- source: /opt/etcd-v3.3.8-linux-amd64/etcd
- force: true

etcd-ctl:
file.copy:
- name: /usr/bin/etcdctl
- source: /opt/etcd-v3.1.8-linux-amd64/etcdctl
- source: /opt/etcd-v3.3.8-linux-amd64/etcdctl
# - force: true

etcd-systemd-file:
Expand Down
Binary file modified salt/states/flanneld/files/flanneld-amd64
Binary file not shown.
8 changes: 4 additions & 4 deletions salt/states/k8z/master.sls
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
kube-worker-bins:
cmd.run:
- name: |
wget --quiet https://storage.googleapis.com/kubernetes-release/release/v1.7.0/bin/linux/amd64/kube-apiserver -P /usr/bin/
wget --quiet https://storage.googleapis.com/kubernetes-release/release/v1.7.0/bin/linux/amd64/kube-controller-manager -P /usr/bin/
wget --quiet https://storage.googleapis.com/kubernetes-release/release/v1.7.0/bin/linux/amd64/kube-scheduler -P /usr/bin/
wget --quiet https://storage.googleapis.com/kubernetes-release/release/v1.7.0/bin/linux/amd64/kubectl -P /usr/bin/
wget --quiet https://storage.googleapis.com/kubernetes-release/release/v1.10.4/bin/linux/amd64/kube-apiserver -P /usr/bin/
wget --quiet https://storage.googleapis.com/kubernetes-release/release/v1.10.4/bin/linux/amd64/kube-controller-manager -P /usr/bin/
wget --quiet https://storage.googleapis.com/kubernetes-release/release/v1.10.4/bin/linux/amd64/kube-scheduler -P /usr/bin/
wget --quiet https://storage.googleapis.com/kubernetes-release/release/v1.10.4/bin/linux/amd64/kubectl -P /usr/bin/
chmod +x /usr/bin/kube*

kube-api-systemd:
Expand Down
7 changes: 3 additions & 4 deletions salt/states/k8z/worker.sls
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
kube-worker-bins:
cmd.run:
- name: |
wget --quiet https://storage.googleapis.com/kubernetes-release/release/v1.6.1/bin/linux/amd64/kubectl -P /usr/bin/
wget --quiet https://storage.googleapis.com/kubernetes-release/release/v1.6.1/bin/linux/amd64/kube-proxy -P /usr/bin/
wget --quiet https://storage.googleapis.com/kubernetes-release/release/v1.6.1/bin/linux/amd64/kubelet -P /usr/bin/
wget --quiet https://storage.googleapis.com/kubernetes-release/release/v1.10.4/bin/linux/amd64/kubectl -P /usr/bin/
wget --quiet https://storage.googleapis.com/kubernetes-release/release/v1.10.4/bin/linux/amd64/kube-proxy -P /usr/bin/
wget --quiet https://storage.googleapis.com/kubernetes-release/release/v1.10.4/bin/linux/amd64/kubelet -P /usr/bin/
chmod +x /usr/bin/kube*

# systemd files
Expand Down Expand Up @@ -49,7 +49,6 @@ Kubelet-systemd:

[Service]
ExecStart=/usr/bin/kubelet \
--api-servers=http://k8z-master.vagrant:8080 \
--allow-privileged=true \
--cluster-domain=cluster.local \
--cluster-dns=10.20.53.53 \
Expand Down