airship/airshipctl
Code Issues Proposed changes

uplift kustomize to align with recent changes.

Browse Source 
* tools/install_kustomize.sh script is used from treasuremap
* So updated the script to use the same version across airshipctl and treasuremap
* Removed the unused script 10_install_essentials.sh from airshipctl

Change-Id: I3fe2d185c0df3a0d7632ea6d34729487219770d1
This commit is contained in:
Sirajudeen 2021-08-05 19:11:54 +00:00
parent 36d7153a66
commit 6a7f17bd6b
2 changed files with 1 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
tools/deployment/10_install_essentials.sh
View File

@ -1,35 +0,0 @@
#!/usr/bin/env bash
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# foo bar
set -xe
install_pkg(){
for i in "$@"; do
dpkg -l $i 2> /dev/null | grep ^ii > /dev/null || sudo DEBIAN_FRONTEND=noninteractive -E apt -y install $i
done
}
if [ ! -f /var/lib/apt/periodic/update-success-stamp ] || \
sudo find /var/lib/apt/periodic/update-success-stamp -mtime +1 | grep update-success-stamp; then
sudo -E apt -y update
fi
install_pkg curl docker.io make ca-certificates
./tools/deployment/provider_common/02_install_jq.sh
./tools/deployment/provider_common/03_install_pip.sh
./tools/deployment/provider_common/04_install_yq.sh
./tools/deployment/01_install_kubectl.sh
./tools/install_kustomize.sh

2
tools/install_kustomize.sh
View File

@ -15,7 +15,7 @@
set -xe set -xe
echo "Installing kustomize" echo "Installing kustomize"
kustomize_version=v3.8.5 kustomize_version=v4.2.0
kustomize_download_url="https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize/${kustomize_version}/kustomize_${kustomize_version}_linux_amd64.tar.gz" kustomize_download_url="https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize/${kustomize_version}/kustomize_${kustomize_version}_linux_amd64.tar.gz"
curl -sSL "$kustomize_download_url" | tar -C /tmp -xzf - curl -sSL "$kustomize_download_url" | tar -C /tmp -xzf -
sudo install /tmp/kustomize /usr/local/bin sudo install /tmp/kustomize /usr/local/bin