Skip to content

Commit

Permalink
fix: use official docker ubuntu package
Browse files Browse the repository at this point in the history
there was a bug instroduced in dockdr 20.10, which is solved in 20.10.4
the official apt repo docker.io has currently 20.10.2 running, where the
bug makes kubeadm preflight error out.
  • Loading branch information
paschdan committed May 6, 2021
1 parent f206799 commit b5014c2
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
5 changes: 4 additions & 1 deletion terraform/modules/AWS/Kubernetes/master-cloud-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,11 @@ write_files:
runcmd:
- 'curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add -'
- 'echo "deb https://apt.kubernetes.io/ kubernetes-xenial main" > /etc/apt/sources.list.d/kubernetes.list'
- 'curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -'
- 'add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu bionic stable"'
- 'mkdir /run/download'
- 'apt update'
- 'apt install -y kubelet kubeadm kubectl docker.io awscli'
- 'apt install -y kubelet kubeadm kubectl docker-ce awscli'
- 'wget https://github.com/kubernetes-incubator/cri-tools/releases/download/v1.11.1/crictl-v1.11.1-linux-amd64.tar.gz -O /run/download/crictl.tgz'
- 'tar -C /usr/bin -xzf /run/download/crictl.tgz'
- 'chmod 754 /usr/bin/crictl'
Expand All @@ -61,6 +63,7 @@ runcmd:
- 'systemctl restart kubelet'
- 'wget https://docs.projectcalico.org/v3.3/getting-started/kubernetes/installation/hosted/rbac-kdd.yaml -O /run/download/rbac-kdd.yaml'
- 'wget https://docs.projectcalico.org/v3.9/manifests/calico.yaml -O /run/download/calico.yaml'
- 'kubeadm config images pull'
- 'kubeadm init --pod-network-cidr=192.168.0.0/16'
- 'mkdir /root/.kube'
- 'cp /etc/kubernetes/admin.conf /root/.kube/config'
Expand Down
4 changes: 3 additions & 1 deletion terraform/modules/AWS/Kubernetes/node-cloud-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,11 @@ write_files:
runcmd:
- "curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add -"
- 'echo "deb https://apt.kubernetes.io/ kubernetes-xenial main" > /etc/apt/sources.list.d/kubernetes.list'
- 'curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -'
- 'add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu bionic stable"'
- "mkdir /run/download"
- "apt update"
- "apt install -y kubelet kubeadm kubectl docker.io awscli"
- 'apt install -y kubelet kubeadm kubectl docker-ce awscli'
- "wget https://github.com/kubernetes-incubator/cri-tools/releases/download/v1.11.1/crictl-v1.11.1-linux-amd64.tar.gz -O /run/download/crictl.tgz"
- "tar -C /usr/bin -xzf /run/download/crictl.tgz"
- "rm -rf /run/download"
Expand Down

0 comments on commit b5014c2

Please sign in to comment.