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.

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

install az & aws clis in the kubekins e2e image #33225

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions images/kubekins-e2e-v2/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,13 @@ RUN wget -O google-cloud-sdk.tar.gz -q $GCLOUD_SDK_URL && \
gcloud components install alpha beta && \
gcloud info | tee /workspace/gcloud-info.txt

# Install aws cli
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm concerned about making this image even more risky to update.

Where are we using the CLI instead of some tool that links the SDK?

Copy link
Member

@BenTheElder BenTheElder Aug 5, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(if we could remove gcloud we should, but that requires eliminating kube-up realistically, which is not happening anytime soon)

Copy link
Member Author

@upodroid upodroid Aug 5, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

az cli is installed via apt and isn't an issue. You should be able to tweak it further on job execution if necessary. So many capz/sig-windows jobs install the cli on every run :( hundreds of times a day

The aws cli is also like that as well, the zip gets dropped in /usr/local/bin along with the self contained python libraries.

They can be updated without affecting the rest of the image tooling.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So many capz/sig-windows jobs install the cli on every run :( hundreds of times a day

The aws cli is also like that as well, the zip gets dropped in /usr/local/bin along with the self contained python libraries.

Yes, but on the other hand this means the version installed is controlled by the test code.
We have lots of things we live-install and increasingly only depend on the image for bootstrapping (e.g. go 1.21+ toolchain)

RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-$(uname -m).zip" -o "/tmp/awscliv2.zip" && \
cd /tmp && unzip awscliv2.zip && \
/tmp/aws/install

# Install az cli
RUN curl -sL https://aka.ms/InstallAzureCLIDeb | bash

#
# BEGIN: DOCKER IN DOCKER SETUP
Expand Down
4 changes: 3 additions & 1 deletion images/kubekins-e2e-v2/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@

This is a modernised and lean image of the kubekins-e2e image optimised for the core tools required in an e2e image.

This image is available at `us-central1-docker.pkg.dev/k8s-staging-test-infra/images/kubekins-e2e:v20240705-131cd74733-master`

Features:
- multi-arch, supports both amd64 and arm64
- kubetest2
- kind
- aws-cli v1
- aws-cli v2
- gcloud
- DinD
- runner.sh wrapper
2 changes: 1 addition & 1 deletion images/kubekins-e2e/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Deprecated

This image is deprecated in favour of kubekins-e2e-v2 image. Please use that image if you don't need the legacy CI kruft such as:
This image is deprecated in favour of [kubekins-e2e-v2](../kubekins-e2e-v2/README.md) image. Please use that image if you don't need the legacy CI kruft such as:
- bootstrap
- kubetest1
- scenarios/*
Expand Down