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

chore(): updated base image to bookworm , updated kubectl #71

Merged
merged 4 commits into from
Aug 21, 2024

Conversation

vitalii-codefresh
Copy link
Contributor

What

Why

Notes

Labels

Assign the following labels to the PR:

security - to trigger image scanning in CI build

PR Comments

Add the following comments to the PR:

/e2e - to trigger E2E build

@vitalii-codefresh
Copy link
Contributor Author

/e2e

Copy link
Member

Choose a reason for hiding this comment

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

please ping devops on this

@@ -59,7 +59,8 @@ else
if (( "$SERVER_VERSION" == "20" )); then cp -f /usr/local/bin/kubectl1.20 /usr/local/bin/kubectl; fi 2>/dev/null
if (( "$SERVER_VERSION" == "21" )); then cp -f /usr/local/bin/kubectl1.21 /usr/local/bin/kubectl; fi 2>/dev/null
if (( "$SERVER_VERSION" == "22" )); then cp -f /usr/local/bin/kubectl1.22 /usr/local/bin/kubectl; fi 2>/dev/null
if (( "$SERVER_VERSION" >= "23" )); then cp -f /usr/local/bin/kubectl1.23 /usr/local/bin/kubectl; fi 2>/dev/null
if (( "$SERVER_VERSION" == "23" )); then cp -f /usr/local/bin/kubectl1.23 /usr/local/bin/kubectl; fi 2>/dev/null
if (( "$SERVER_VERSION" >= "24" )); then cp -f /usr/local/bin/kubectl1.30 /usr/local/bin/kubectl; fi 2>/dev/null
Copy link
Member

Choose a reason for hiding this comment

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

this needs to be 30

Suggested change
if (( "$SERVER_VERSION" >= "24" )); then cp -f /usr/local/bin/kubectl1.30 /usr/local/bin/kubectl; fi 2>/dev/null
if (( "$SERVER_VERSION" >= "30" )); then cp -f /usr/local/bin/kubectl1.30 /usr/local/bin/kubectl; fi 2>/dev/null

Dockerfile Outdated

#copy all versions of kubectl to switch between them later.
COPY --chown=cfu --chmod=775 --from=builder /tmp/kubectl-versions/* /usr/local/bin/
COPY --chown=cfu --chmod=775 --from=builder /tmp/kubectl-versions/kubectl1.10 /usr/local/bin/kubectl
COPY --chown=cfu --chmod=775 --from=builder /tmp/kubectl-versions/kubectl1.30 /usr/local/bin/kubectl
Copy link
Member

Choose a reason for hiding this comment

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

please remove this

Dockerfile Outdated
Comment on lines 17 to 20
curl -o kubectl1.13 -L https://storage.googleapis.com/kubernetes-release/release/v1.13.0/bin/linux/${ARCH}/kubectl && \
curl -o kubectl1.12 -L https://storage.googleapis.com/kubernetes-release/release/v1.12.0/bin/linux/${ARCH}/kubectl && \
curl -o kubectl1.11 -L https://storage.googleapis.com/kubernetes-release/release/v1.11.0/bin/linux/${ARCH}/kubectl && \
curl -o kubectl1.10 -L https://storage.googleapis.com/kubernetes-release/release/v1.10.0/bin/linux/${ARCH}/kubectl && \
Copy link
Member

Choose a reason for hiding this comment

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

please not remove them

@vitalii-codefresh
Copy link
Contributor Author

/e2e

Comment on lines +53 to +59
if (( "$SERVER_VERSION" <= "7" )); then cp -f /usr/local/bin/kubectl1.7 /usr/local/bin/kubectl; fi 2>/dev/null
if (( "$SERVER_VERSION" <= "8" )); then cp -f /usr/local/bin/kubectl1.8 /usr/local/bin/kubectl; fi 2>/dev/null
if (( "$SERVER_VERSION" <= "9" )); then cp -f /usr/local/bin/kubectl1.9 /usr/local/bin/kubectl; fi 2>/dev/null
if (( "$SERVER_VERSION" <= "10" )); then cp -f /usr/local/bin/kubectl1.10 /usr/local/bin/kubectl; fi 2>/dev/null
if (( "$SERVER_VERSION" <= "11" )); then cp -f /usr/local/bin/kubectl1.11 /usr/local/bin/kubectl; fi 2>/dev/null
if (( "$SERVER_VERSION" <= "12" )); then cp -f /usr/local/bin/kubectl1.12 /usr/local/bin/kubectl; fi 2>/dev/null
if (( "$SERVER_VERSION" <= "13" )); then cp -f /usr/local/bin/kubectl1.13 /usr/local/bin/kubectl; fi 2>/dev/null
Copy link
Member

Choose a reason for hiding this comment

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

we can skip adding the old versions

Dockerfile Outdated
Comment on lines 28 to 30
curl -o kubectl1.9 -L https://storage.googleapis.com/kubernetes-release/release/v1.9.0/bin/linux/${ARCH}/kubectl && \
curl -o kubectl1.8 -L https://storage.googleapis.com/kubernetes-release/release/v1.8.0/bin/linux/${ARCH}/kubectl && \
curl -o kubectl1.7 -L https://storage.googleapis.com/kubernetes-release/release/v1.7.0/bin/linux/${ARCH}/kubectl && \
Copy link
Member

Choose a reason for hiding this comment

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

we can skip adding old versions

@vitalii-codefresh
Copy link
Contributor Author

/e2e

15 similar comments
@vitalii-codefresh
Copy link
Contributor Author

/e2e

@vitalii-codefresh
Copy link
Contributor Author

/e2e

@vitalii-codefresh
Copy link
Contributor Author

/e2e

@vitalii-codefresh
Copy link
Contributor Author

/e2e

@vitalii-codefresh
Copy link
Contributor Author

/e2e

@vitalii-codefresh
Copy link
Contributor Author

/e2e

@vitalii-codefresh
Copy link
Contributor Author

/e2e

@vitalii-codefresh
Copy link
Contributor Author

/e2e

@vitalii-codefresh
Copy link
Contributor Author

/e2e

@vitalii-codefresh
Copy link
Contributor Author

/e2e

@vitalii-codefresh
Copy link
Contributor Author

/e2e

@vitalii-codefresh
Copy link
Contributor Author

/e2e

@vitalii-codefresh
Copy link
Contributor Author

/e2e

@vitalii-codefresh
Copy link
Contributor Author

/e2e

@vitalii-codefresh
Copy link
Contributor Author

/e2e

@vitalii-codefresh
Copy link
Contributor Author

/e2e

@vitalii-codefresh vitalii-codefresh merged commit 97f2400 into master Aug 21, 2024
3 checks passed
@vitalii-codefresh vitalii-codefresh deleted the CR-24804-security branch August 21, 2024 12:15
@vitalii-codefresh vitalii-codefresh restored the CR-24804-security branch October 3, 2024 10:20
@vitalii-codefresh vitalii-codefresh deleted the CR-24804-security branch October 3, 2024 10:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants