From cb0223881f847e3ac115f731e8aba7fe099f58a5 Mon Sep 17 00:00:00 2001 From: vitaliichyrka Date: Fri, 16 Aug 2024 21:21:33 +0300 Subject: [PATCH 1/6] remains only version of kubectl --- Dockerfile | 26 +++++++------------------- Dockerfile.aarch64 | 28 ---------------------------- service.yaml | 2 +- 3 files changed, 8 insertions(+), 48 deletions(-) delete mode 100644 Dockerfile.aarch64 diff --git a/Dockerfile b/Dockerfile index 362ef5d..3eb572e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,29 +1,17 @@ -FROM alpine:3.6 AS builder +FROM alpine:3.20 AS builder RUN apk update && apk add curl RUN export ARCH=$([[ "$(uname -m)" == "aarch64" ]] && echo "arm64" || echo "amd64") && \ mkdir -p /tmp/kubectl-versions && cd /tmp/kubectl-versions && \ - curl -o kubectl1.23 -L https://storage.googleapis.com/kubernetes-release/release/v1.23.0/bin/linux/${ARCH}/kubectl && \ - curl -o kubectl1.22 -L https://storage.googleapis.com/kubernetes-release/release/v1.22.0/bin/linux/${ARCH}/kubectl && \ - curl -o kubectl1.21 -L https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/${ARCH}/kubectl && \ - curl -o kubectl1.20 -L https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/${ARCH}/kubectl && \ - curl -o kubectl1.19 -L https://storage.googleapis.com/kubernetes-release/release/v1.19.0/bin/linux/${ARCH}/kubectl && \ - curl -o kubectl1.18 -L https://storage.googleapis.com/kubernetes-release/release/v1.18.0/bin/linux/${ARCH}/kubectl && \ - curl -o kubectl1.17 -L https://storage.googleapis.com/kubernetes-release/release/v1.17.0/bin/linux/${ARCH}/kubectl && \ - curl -o kubectl1.16 -L https://storage.googleapis.com/kubernetes-release/release/v1.16.0/bin/linux/${ARCH}/kubectl && \ - curl -o kubectl1.15 -L https://storage.googleapis.com/kubernetes-release/release/v1.15.0/bin/linux/${ARCH}/kubectl && \ - curl -o kubectl1.14 -L https://storage.googleapis.com/kubernetes-release/release/v1.14.0/bin/linux/${ARCH}/kubectl && \ - 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 && \ - curl -o kubectl1.6 -L https://storage.googleapis.com/kubernetes-release/release/v1.6.0/bin/linux/${ARCH}/kubectl - + curl -o kubectl1.30 -L https://storage.googleapis.com/kubernetes-release/release/v1.30.0/bin/linux/${ARCH}/kubectl FROM debian:bullseye-slim -RUN apt-get update -y && apt-get install busybox -y && ln -s /bin/busybox /usr/bin/[[ +RUN apt-get update -y && \ + apt-get upgrade && \ + apt-get install busybox -y && \ + ln -s /bin/busybox /usr/bin/[[ RUN adduser --gecos "" --disabled-password --home /home/cfu --shell /bin/bash cfu @@ -31,7 +19,7 @@ RUN adduser --gecos "" --disabled-password --home /home/cfu --shell /bin/bash cf #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 WORKDIR / ADD --chown=cfu --chmod=775 cf-deploy-kubernetes.sh /cf-deploy-kubernetes diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 deleted file mode 100644 index 4712ced..0000000 --- a/Dockerfile.aarch64 +++ /dev/null @@ -1,28 +0,0 @@ -FROM multiarch/alpine:aarch64-v3.6 AS builder - -RUN apk update && apk add curl - -RUN curl -o kubectl1.9 -L https://storage.googleapis.com/kubernetes-release/release/v1.9.0/bin/linux/arm64/kubectl -RUN curl -o kubectl1.6 -L https://storage.googleapis.com/kubernetes-release/release/v1.6.0/bin/linux/arm64/kubectl - - -FROM multiarch/alpine:aarch64-v3.6 - -RUN apk add --update bash - -#copy both versions of kubectl to switch between them later. -COPY --from=builder kubectl1.9 /usr/local/bin/kubectl -COPY --from=builder kubectl1.6 /usr/local/bin/ - -RUN chmod +x /usr/local/bin/kubectl /usr/local/bin/kubectl1.6 - -WORKDIR / - -ADD cf-deploy-kubernetes.sh /cf-deploy-kubernetes -ADD template.sh /template.sh - -RUN \ - chmod +x /cf-deploy-kubernetes && \ - chmod +x /template.sh - -CMD ["bash"] diff --git a/service.yaml b/service.yaml index 2302fd9..2d137bc 100644 --- a/service.yaml +++ b/service.yaml @@ -1 +1 @@ -version: 16.2.6 +version: 16.2.7 From d92a2135c7758e474fad3e581412cb9e14e3d95e Mon Sep 17 00:00:00 2001 From: vitaliichyrka Date: Fri, 10 Jan 2025 12:50:03 +0200 Subject: [PATCH 2/6] updated kubectl version --- Dockerfile | 6 +++--- cf-deploy-kubernetes.sh | 13 ++----------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3eb572e..088697a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,10 @@ -FROM alpine:3.20 AS builder +FROM alpine:3.21 AS builder RUN apk update && apk add curl RUN export ARCH=$([[ "$(uname -m)" == "aarch64" ]] && echo "arm64" || echo "amd64") && \ mkdir -p /tmp/kubectl-versions && cd /tmp/kubectl-versions && \ - curl -o kubectl1.30 -L https://storage.googleapis.com/kubernetes-release/release/v1.30.0/bin/linux/${ARCH}/kubectl + curl -o kubectl1.32 -L https://storage.googleapis.com/kubernetes-release/release/v1.32.0/bin/linux/${ARCH}/kubectl FROM debian:bullseye-slim @@ -19,7 +19,7 @@ RUN adduser --gecos "" --disabled-password --home /home/cfu --shell /bin/bash cf #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.30 /usr/local/bin/kubectl +COPY --chown=cfu --chmod=775 --from=builder /tmp/kubectl-versions/kubectl1.32 /usr/local/bin/kubectl WORKDIR / ADD --chown=cfu --chmod=775 cf-deploy-kubernetes.sh /cf-deploy-kubernetes diff --git a/cf-deploy-kubernetes.sh b/cf-deploy-kubernetes.sh index 2e12bef..2149b29 100755 --- a/cf-deploy-kubernetes.sh +++ b/cf-deploy-kubernetes.sh @@ -49,17 +49,8 @@ else #check the cluster version and decide which version of kubectl to use: SERVER_VERSION=$(kubectl version --short=true --context "${KUBECONTEXT}" | grep -i server | cut -d ':' -f2 | cut -d '.' -f2 | sed 's/[^0-9]*//g') echo "Server minor version: $SERVER_VERSION" - if (( "$SERVER_VERSION" <= "6" )); then cp -f /usr/local/bin/kubectl1.6 /usr/local/bin/kubectl; fi 2>/dev/null - if (( "$SERVER_VERSION" == "14" )); then cp -f /usr/local/bin/kubectl1.14 /usr/local/bin/kubectl; fi 2>/dev/null - if (( "$SERVER_VERSION" == "15" )); then cp -f /usr/local/bin/kubectl1.15 /usr/local/bin/kubectl; fi 2>/dev/null - if (( "$SERVER_VERSION" == "16" )); then cp -f /usr/local/bin/kubectl1.16 /usr/local/bin/kubectl; fi 2>/dev/null - if (( "$SERVER_VERSION" == "17" )); then cp -f /usr/local/bin/kubectl1.17 /usr/local/bin/kubectl; fi 2>/dev/null - if (( "$SERVER_VERSION" == "18" )); then cp -f /usr/local/bin/kubectl1.18 /usr/local/bin/kubectl; fi 2>/dev/null - if (( "$SERVER_VERSION" == "19" )); then cp -f /usr/local/bin/kubectl1.19 /usr/local/bin/kubectl; fi 2>/dev/null - 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" >= "30" )); then cp -f /usr/local/bin/kubectl1.32 /usr/local/bin/kubectl; fi 2>/dev/null [ ! -f "${deployment_file}" ] && echo "Couldn't find $deployment_file file at $(pwd)" && exit 1; fi From 4161faffe2a42028b257f538a199cddbd591ef03 Mon Sep 17 00:00:00 2001 From: vitaliichyrka Date: Fri, 10 Jan 2025 12:56:50 +0200 Subject: [PATCH 3/6] updated version --- service.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service.yaml b/service.yaml index 2d137bc..c6af1a8 100644 --- a/service.yaml +++ b/service.yaml @@ -1 +1 @@ -version: 16.2.7 +version: 16.2.8 From a10372224ca91b26ac8765f7b3f373fb74a7841e Mon Sep 17 00:00:00 2001 From: vitaliichyrka Date: Fri, 10 Jan 2025 12:59:04 +0200 Subject: [PATCH 4/6] updated debian --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 90c4341..eed83e5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ RUN export ARCH=$([[ "$(uname -m)" == "aarch64" ]] && echo "arm64" || echo "amd6 curl -o kubectl1.32 -L https://storage.googleapis.com/kubernetes-release/release/v1.32.0/bin/linux/${ARCH}/kubectl -FROM debian:bookworm-20240812-slim +FROM debian:trixie-slim RUN apt-get update -y && \ From 2cac05475a34baf076bfd0d0655cb17c0db5cee0 Mon Sep 17 00:00:00 2001 From: vitaliichyrka Date: Fri, 10 Jan 2025 13:03:24 +0200 Subject: [PATCH 5/6] corrected Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index eed83e5..47aab33 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ FROM debian:trixie-slim RUN apt-get update -y && \ - apt-get upgrade && \ + apt-get upgrade -y && \ apt-get install busybox -y && \ ln -s /bin/busybox /usr/bin/[[ From a5e27a8ebf1fb090e154b0bb12bc5630aaceed5b Mon Sep 17 00:00:00 2001 From: vitaliichyrka Date: Fri, 10 Jan 2025 13:13:19 +0200 Subject: [PATCH 6/6] corrected Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 47aab33..ae4b78d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ FROM debian:trixie-slim RUN apt-get update -y && \ apt-get upgrade -y && \ - apt-get install busybox -y && \ + apt-get install adduser busybox -y && \ ln -s /bin/busybox /usr/bin/[[