diff --git a/Dockerfile b/Dockerfile index 6a0f697..19ecff2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,14 +31,15 @@ RUN apt-get update \ unzip \ && rm -rf /var/lib/apt/lists/* -# Install Google Cloud SDK and Gcloud Auth Plugin -RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] http://packages.cloud.google.com/apt cloud-sdk main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list \ - && curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - - -RUN apt-get update \ - && apt-get install -y google-cloud-sdk google-cloud-sdk-gke-gcloud-auth-plugin \ - && rm -rf /var/lib/apt/lists/* - +# Install Google cli so kubectl works w/ gke clusters +RUN curl https://dl.google.com/dl/cloudsdk/release/google-cloud-sdk.tar.gz > /tmp/google-cloud-sdk.tar.gz +RUN mkdir -p /usr/local/gcloud \ + && tar -C /usr/local/gcloud -xvf /tmp/google-cloud-sdk.tar.gz \ + && /usr/local/gcloud/google-cloud-sdk/install.sh +ENV PATH $PATH:/usr/local/gcloud/google-cloud-sdk/bin +RUN gcloud components install gke-gcloud-auth-plugin +RUN gcloud components remove gcloud-crc32c +RUN rm /tmp/google-cloud-sdk.tar.gz # Install AWS CLI RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" \ && unzip awscliv2.zip \ diff --git a/poetry.lock b/poetry.lock index debba12..7a732ec 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.8.3 and should not be changed by hand. [[package]] name = "cachetools" @@ -858,13 +858,13 @@ files = [ [[package]] name = "urllib3" -version = "1.26.18" +version = "1.26.19" description = "HTTP library with thread-safe connection pooling, file post, and more." optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" +python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,>=2.7" files = [ - {file = "urllib3-1.26.18-py2.py3-none-any.whl", hash = "sha256:34b97092d7e0a3a8cf7cd10e386f401b3737364026c45e622aa02903dffe0f07"}, - {file = "urllib3-1.26.18.tar.gz", hash = "sha256:f8ecc1bba5667413457c529ab955bf8c67b45db799d159066261719e328580a0"}, + {file = "urllib3-1.26.19-py2.py3-none-any.whl", hash = "sha256:37a0344459b199fce0e80b0d3569837ec6b6937435c5244e7fd73fa6006830f3"}, + {file = "urllib3-1.26.19.tar.gz", hash = "sha256:3e3d753a8618b86d7de333b4223005f68720bcd6a7d2bcb9fbd2229ec7c1e429"}, ] [package.extras] @@ -891,4 +891,4 @@ test = ["websockets"] [metadata] lock-version = "2.0" python-versions = "^3.8, <3.13" -content-hash = "dbdaad2d9ba6876eea2180ee0604346c56259e0639692c24341c3665e4a02fd6" +content-hash = "f1a29076263030ddc4912063b171d94582cff18b1d8393f19d22edeb3d5e28cb" diff --git a/pyproject.toml b/pyproject.toml index 5953461..7cd5f45 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -24,6 +24,7 @@ types-toml = "^0.10.2" toml = "^0.10.2" hikaru-model-28 = "^1.1.0" kubernetes = "^29" +urllib3 = "^1.26.19" [build-system]