Skip to content
This repository has been archived by the owner on Jan 28, 2023. It is now read-only.

Commit

Permalink
Remove kubernetes-cni package from AMI
Browse files Browse the repository at this point in the history
This is now being bundled in the `kubelet` package, see:
kubernetes/release#1309.
  • Loading branch information
rjosephwright committed Jun 21, 2020
1 parent c14f656 commit 7656d68
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
5 changes: 1 addition & 4 deletions stack/ami/debian/build.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
"var-log-vol": "xvdf",
"docker-version": "5:18.09.9~3-0~debian-buster",
"k8s-version": "",
"cni-version": "0.7.5",
"share-accounts": "all",
"base-ami-pattern": "debian-stretch-hvm-x86_64-gp2-*",
"base-ami-owner": "379101102735",
Expand Down Expand Up @@ -90,8 +89,7 @@
"os:version": "debian-{{ user `debian-release` }}",
"docker:version": "{{ user `docker-version` }}",
"k8s:version": "{{ user `k8s-version` }}",
"keights:version": "{{ user `keights-version` }}",
"cni:version": "{{ user `cni-version` }}"
"keights:version": "{{ user `keights-version` }}"
},

"run_tags": {
Expand Down Expand Up @@ -121,7 +119,6 @@
"-e", "docker_version={{ user `docker-version` }}",
"-e", "k8s_version={{ user `k8s-version` }}",
"-e", "keights_version={{ user `keights-version` }}",
"-e", "cni_version={{ user `cni-version` }}",
"-e", "debian_release={{ user `debian-release` }}"
]
}
Expand Down
1 change: 0 additions & 1 deletion stack/ami/debian/playbook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,6 @@
openssh-server \
docker-ce={{ docker_version }} \
docker-ce-cli={{ docker_version }} \
kubernetes-cni={{ cni_version }}-00 \
kubectl={{ k8s_version_no_v }}-00 \
kubeadm={{ k8s_version_no_v }}-00 \
kubelet={{ k8s_version_no_v }}-00 && \
Expand Down

0 comments on commit 7656d68

Please sign in to comment.