Skip to content

Commit d867766

Browse files
author
cookcodeblog
committed
Add kubernetes v1.13.0 images
1 parent 2b1505e commit d867766

File tree

4 files changed

+22
-17
lines changed

4 files changed

+22
-17
lines changed

kubeadm_v1.13.0/03_install_kubernetes.sh

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,7 @@ yum install -y kubectl-1.13.0
1212
systemctl enable kubelet && systemctl start kubelet
1313

1414
# Configure cgroup matched with Docker
15+
# TODO still need configure cgroup ?
1516
./configure_cgroup.sh
1617
systemctl daemon-reload
1718
systemctl restart kubelet
18-
19-
20-
# Don't set pause-amd64 image for kubelet service
21-
# Use Kubernetes default pause image
22-
23-

kubeadm_v1.13.0/04_pull_kubernetes_images_from_aliyun.sh

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,21 @@ set -e
55
# Check version in https://kubernetes.io/docs/reference/setup-tools/kubeadm/kubeadm-init/
66
# Search "Running kubeadm without an internet connection"
77
# For running kubeadm without an internet connection you have to pre-pull the required master images for the version of choice:
8-
KUBE_VERSION=v1.11.0
8+
KUBE_VERSION=v1.13.0
99
KUBE_PAUSE_VERSION=3.1
10-
ETCD_VERSION=3.2.18
11-
CORE_DNS_VERSION=1.1.3
10+
ETCD_VERSION=3.2.24
11+
CORE_DNS_VERSION=1.2.6
1212

1313
GCR_URL=k8s.gcr.io
1414
ALIYUN_URL=registry.cn-shenzhen.aliyuncs.com/cookcodeblog
1515

16-
# When test v1.11.0, I found Kubernetes depends on both pause-amd64:3.1 and pause:3.1
17-
18-
images=(kube-proxy-amd64:${KUBE_VERSION}
19-
kube-scheduler-amd64:${KUBE_VERSION}
20-
kube-controller-manager-amd64:${KUBE_VERSION}
21-
kube-apiserver-amd64:${KUBE_VERSION}
22-
pause-amd64:${KUBE_PAUSE_VERSION}
16+
# In Kubernetes 1.12 and later, the k8s.gcr.io/kube-*, k8s.gcr.io/etcd and k8s.gcr.io/pause images don’t require an -${ARCH} suffix
17+
images=(kube-proxy:${KUBE_VERSION}
18+
kube-scheduler:${KUBE_VERSION}
19+
kube-controller-manager:${KUBE_VERSION}
20+
kube-apiserver:${KUBE_VERSION}
2321
pause:${KUBE_PAUSE_VERSION}
24-
etcd-amd64:${ETCD_VERSION}
22+
etcd:${ETCD_VERSION}
2523
coredns:${CORE_DNS_VERSION})
2624

2725

kubeadm_v1.13.0/README.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,10 @@ kubeadm config images list
1717
kubeadm config images pull
1818
```
1919

20+
* k8s.gcr.io/kube-apiserver:v1.13.0
21+
* k8s.gcr.io/kube-controller-manager:v1.13.0
22+
* k8s.gcr.io/kube-scheduler:v1.13.0
23+
* k8s.gcr.io/kube-proxy:v1.13.0
24+
* k8s.gcr.io/pause:3.1
25+
* k8s.gcr.io/etcd:3.2.24
26+
* k8s.gcr.io/coredns:1.2.6

kubeadm_v1.13.0/configure_cgroup.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/bash
2+
3+
set -e
4+
5+
sed -i "s/cgroup-driver=systemd/cgroup-driver=cgroupfs/g" /etc/systemd/system/kubelet.service.d/10-kubeadm.conf

0 commit comments

Comments
 (0)