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.

Sign up for GitHub

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

Fix kubectl installation #799

Merged
merged 10 commits into from
May 6, 2020
Merged

Fix kubectl installation #799

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5f3c610
Fix kubectl installation
vsafonkin Apr 28, 2020
694703a
Fix kubectl installation
vsafonkin Apr 28, 2020
5ba96c8
Add --client flag
vsafonkin Apr 29, 2020
faf73c0
Fix for ubuntu 16.04
vsafonkin Apr 29, 2020
381ab25
Move kubectl apt packages installation to basic.sh
vsafonkin Apr 29, 2020
2207f28
Combined separated scripts for kubectl installation to one
vsafonkin Apr 29, 2020
2c79a49
Minor fix
vsafonkin Apr 29, 2020
aaa283c
Remove apt-transport-https package from basic.sh
vsafonkin Apr 29, 2020
a7f0ee9
Delete helm init
vsafonkin May 5, 2020
0000886
Merge branch 'master' into v-vlsafo/fix-kubectl-installation
vsafonkin May 5, 2020
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
8 changes: 6 additions & 2 deletions images/linux/scripts/installers/1604/basic.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ apt-fast install -y --no-install-recommends \
zip \
zstd

# Electron / VSCode / GitHub Desktop prereqs
# Electron / VSCode / GitHub Desktop / kubectl prereqs
apt-fast install -y --no-install-recommends \
libxkbfile-dev \
pkg-config \
Expand All @@ -57,7 +57,9 @@ apt-fast install -y --no-install-recommends \
rpm \
xz-utils \
xorriso \
zsync
zsync \
apt-transport-https \
vsafonkin marked this conversation as resolved.
Show resolved Hide resolved
gnupg2

# Run tests to determine that the software installed as expected
echo "Testing to make sure that script performed as expected, and basic scenarios work"
Expand Down Expand Up @@ -99,3 +101,5 @@ DocumentInstalledItemIndent "upx"
DocumentInstalledItemIndent "wget"
DocumentInstalledItemIndent "zip"
DocumentInstalledItemIndent "zstd"
DocumentInstalledItemIndent "apt-transport-https"
DocumentInstalledItemIndent "gnupg2"
40 changes: 0 additions & 40 deletions images/linux/scripts/installers/1604/kubernetes-tools.sh
View file
Open in desktop

This file was deleted.

8 changes: 8 additions & 0 deletions images/linux/scripts/installers/1804/basic.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,12 @@ apt-get install -y --no-install-recommends curl
echo "Install parallel"
apt-get install -y --no-install-recommends parallel

echo "Install apt-transport-https"
apt-get install -y --no-install-recommends apt-transport-https
vsafonkin marked this conversation as resolved.
Show resolved Hide resolved

echo "Install gnupg2"
apt-get install -y --no-install-recommends gnupg2

# Run tests to determine that the software installed as expected
echo "Testing to make sure that script performed as expected, and basic scenarios work"
for cmd in curl file ftp jq netcat ssh parallel rsync shellcheck sudo telnet time unzip wget zip; do
Expand Down Expand Up @@ -168,3 +174,5 @@ DocumentInstalledItemIndent "upx"
DocumentInstalledItemIndent "wget"
DocumentInstalledItemIndent "zip"
DocumentInstalledItemIndent "zstd"
DocumentInstalledItemIndent "apt-transport-https"
DocumentInstalledItemIndent "gnupg2"
7 changes: 3 additions & 4 deletions ...ripts/installers/1804/kubernetes-tools.sh → ...ux/scripts/installers/kubernetes-tools.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,11 @@ source $HELPER_SCRIPTS/document.sh
source $HELPER_SCRIPTS/apt.sh

## Install kubectl
apt-get install -y apt-transport-https
curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add -
touch /etc/apt/sources.list.d/kubernetes.list

# Based on https://kubernetes.io/docs/tasks/tools/install-kubectl/, package is still called xenial
echo "deb http://apt.kubernetes.io/ kubernetes-xenial main" | tee -a /etc/apt/sources.list.d/kubernetes.list
# Based on https://kubernetes.io/docs/tasks/tools/install-kubectl/, package is xenial for both OS versions.
echo "deb https://apt.kubernetes.io/ kubernetes-xenial main" | tee -a /etc/apt/sources.list.d/kubernetes.list
apt-get update
apt-get install -y kubectl

Expand All @@ -38,5 +37,5 @@ helm init --client-only

# Document what was added to the image
echo "Lastly, documenting what we added to the metadata file"
DocumentInstalledItem "kubectl ($(kubectl version --short |& head -n 1))"
DocumentInstalledItem "kubectl ($(kubectl version --client --short |& head -n 1))"
DocumentInstalledItem "helm ($(helm version --short |& head -n 1))"
2 changes: 1 addition & 1 deletion images/linux/ubuntu1604.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@
"{{template_dir}}/scripts/installers/image-magick.sh",
"{{template_dir}}/scripts/installers/java-tools.sh",
"{{template_dir}}/scripts/installers/kind.sh",
"{{template_dir}}/scripts/installers/1604/kubernetes-tools.sh",
"{{template_dir}}/scripts/installers/kubernetes-tools.sh",
"{{template_dir}}/scripts/installers/leiningen.sh",
"{{template_dir}}/scripts/installers/1604/mercurial.sh",
"{{template_dir}}/scripts/installers/miniconda.sh",
Expand Down
2 changes: 1 addition & 1 deletion images/linux/ubuntu1804.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@
"{{template_dir}}/scripts/installers/image-magick.sh",
"{{template_dir}}/scripts/installers/java-tools.sh",
"{{template_dir}}/scripts/installers/kind.sh",
"{{template_dir}}/scripts/installers/1804/kubernetes-tools.sh",
"{{template_dir}}/scripts/installers/kubernetes-tools.sh",
"{{template_dir}}/scripts/installers/leiningen.sh",
"{{template_dir}}/scripts/installers/1804/mercurial.sh",
"{{template_dir}}/scripts/installers/miniconda.sh",
Expand Down