diff --git a/docker/k8s-glue/glue-build-aws/Dockerfile b/docker/k8s-glue/glue-build-aws/Dockerfile index f423a48..1d9f71c 100644 --- a/docker/k8s-glue/glue-build-aws/Dockerfile +++ b/docker/k8s-glue/glue-build-aws/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:18.04 +FROM ubuntu:22.04 USER root WORKDIR /root diff --git a/docker/k8s-glue/glue-build-aws/setup_aws.sh b/docker/k8s-glue/glue-build-aws/setup_aws.sh index dd54281..a26807f 100644 --- a/docker/k8s-glue/glue-build-aws/setup_aws.sh +++ b/docker/k8s-glue/glue-build-aws/setup_aws.sh @@ -4,7 +4,8 @@ curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip unzip awscliv2.zip ./aws/install -curl -o kubectl https://amazon-eks.s3-us-west-2.amazonaws.com/1.21.2/2021-07-05/bin/linux/amd64/kubectl +curl -o kubectl https://s3.us-west-2.amazonaws.com/amazon-eks/1.29.3/2024-04-19/bin/linux/amd64/kubectl +#curl -o kubectl https://amazon-eks.s3-us-west-2.amazonaws.com/1.21.2/2021-07-05/bin/linux/amd64/kubectl #curl -o kubectl https://amazon-eks.s3.us-west-2.amazonaws.com/1.19.6/2021-01-05/bin/linux/amd64/kubectl chmod +x ./kubectl && mkdir -p $HOME/bin && cp ./kubectl $HOME/bin/kubectl && export PATH=$PATH:$HOME/bin diff --git a/docker/k8s-glue/glue-build-gcp/Dockerfile b/docker/k8s-glue/glue-build-gcp/Dockerfile index 7f2914a..7171525 100644 --- a/docker/k8s-glue/glue-build-gcp/Dockerfile +++ b/docker/k8s-glue/glue-build-gcp/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:18.04 +FROM ubuntu:22.04 USER root WORKDIR /root diff --git a/docker/k8s-glue/glue-build-gcp/setup_gcp.sh b/docker/k8s-glue/glue-build-gcp/setup_gcp.sh index 5d245be..8bc33a5 100644 --- a/docker/k8s-glue/glue-build-gcp/setup_gcp.sh +++ b/docker/k8s-glue/glue-build-gcp/setup_gcp.sh @@ -1,6 +1,6 @@ #!/bin/bash -curl -LO https://dl.k8s.io/release/v1.21.0/bin/linux/amd64/kubectl +curl -LO https://dl.k8s.io/release/v1.29.3/bin/linux/amd64/kubectl install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl diff --git a/docker/k8s-glue/glue-build/Dockerfile.alpine b/docker/k8s-glue/glue-build/Dockerfile.alpine index a092608..81679d3 100644 --- a/docker/k8s-glue/glue-build/Dockerfile.alpine +++ b/docker/k8s-glue/glue-build/Dockerfile.alpine @@ -20,7 +20,7 @@ FROM python:${TAG} as target WORKDIR /app -ARG KUBECTL_VERSION=1.24.0 +ARG KUBECTL_VERSION=1.29.3 # Not sure about these ENV vars # ENV LC_ALL=en_US.UTF-8 diff --git a/docker/k8s-glue/glue-build/Dockerfile.bullseye b/docker/k8s-glue/glue-build/Dockerfile.bullseye index 4443419..f84717b 100644 --- a/docker/k8s-glue/glue-build/Dockerfile.bullseye +++ b/docker/k8s-glue/glue-build/Dockerfile.bullseye @@ -2,7 +2,7 @@ ARG TAG=3.7.17-slim-bullseye FROM python:${TAG} as target -ARG KUBECTL_VERSION=1.22.4 +ARG KUBECTL_VERSION=1.29.3 WORKDIR /app diff --git a/docker/k8s-glue/task-pod-build/Dockerfile b/docker/k8s-glue/task-pod-build/Dockerfile index 72c48e3..10948bc 100644 --- a/docker/k8s-glue/task-pod-build/Dockerfile +++ b/docker/k8s-glue/task-pod-build/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:18.04 +FROM ubuntu:22.04 USER root WORKDIR /root