From 9118ec9e1d46a06a059fc9359ee814365062239a Mon Sep 17 00:00:00 2001 From: Ritika Patil Date: Mon, 26 Feb 2024 12:14:11 -0600 Subject: [PATCH 1/4] feat: (IAC-1236) tool version update --- Dockerfile | 6 +++--- docs/user/Dependencies.md | 24 ++++++++++++------------ requirements.txt | 12 ++++++------ requirements.yaml | 6 +++--- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Dockerfile b/Dockerfile index a90f9225..e25f72d4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,9 +17,9 @@ RUN curl -sLO https://storage.googleapis.com/kubernetes-release/release/v$kubect # Installation FROM baseline -ARG helm_version=3.14.0 -ARG aws_cli_version=2.13.33 -ARG gcp_cli_version=460.0.0-0 +ARG helm_version=3.14.1 +ARG aws_cli_version=2.15.22 +ARG gcp_cli_version=464.0.0 # Add extra packages RUN apt-get update && apt-get install --no-install-recommends -y gzip wget git jq ssh sshpass skopeo rsync \ diff --git a/docs/user/Dependencies.md b/docs/user/Dependencies.md index 34915786..7058599d 100644 --- a/docs/user/Dependencies.md +++ b/docs/user/Dependencies.md @@ -6,28 +6,28 @@ The following list details our dependencies and versions (~ indicates multiple p | SOURCE | NAME | VERSION | |----------------|------------------|-------------| -| ~ | python | >=3.10 | +| ~ | python | >=3.10 | | ~ | pip | 3.x | | ~ | unzip | any | | ~ | tar | any | -| ~ | docker | >=20.10.10 | +| ~ | docker | >=25.0.3 | | ~ | git | any | | ~ | rsync | any | | ~ | kubectl | 1.26 - 1.28 | -| ~ | Helm | 3.14.0 | -| pip3 | ansible | 9.1.0 | -| pip3 | openshift | 0.13.1 | -| pip3 | kubernetes | 26.1.0 | -| pip3 | dnspython | 2.3.0 | -| pip3 | docker | 5.0.3 | -| ansible-galaxy | community.docker | 2.7.8 | -| ansible-galaxy | ansible.utils | 2.3.0 | -| ansible-galaxy | kubernetes.core | 2.3.2 | +| ~ | Helm | 3.14.1 | +| pip3 | ansible | 9.2.0 | +| pip3 | openshift | 0.13.2 | +| pip3 | kubernetes | 29.0.0 | +| pip3 | dnspython | 2.6.1 | +| pip3 | docker | 7.0.0 | +| ansible-galaxy | community.docker | 3.7.0 | +| ansible-galaxy | ansible.utils | 3.1.0 | +| ansible-galaxy | kubernetes.core | 3.0.0 | If you are using a provider based kubeconfig file created by viya4-iac-gcp:4.5.0 or newer, install these dependencies: | SOURCE | NAME | VERSION | |----------------|-------------------------|-------------| -| ~ | gcloud | 460.0.0 | +| ~ | gcloud | 464.0.0 | | ~ | gcloud-gke-auth-plugin | >= 0.5.2 | Required project dependencies are generally pinned to known working or stable versions to ensure users have a smooth initial experience. In some cases it may be required to change the default version of a dependency. In such cases users are welcome to experiment with alternate versions, however compatibility may not be guaranteed. diff --git a/requirements.txt b/requirements.txt index 6b618343..0ec7dd70 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ -ansible==9.1.0 # 8.6.0 # 2.10.7 -openshift==0.13.1 # 0.12.0 -kubernetes==26.1.0 # 12.0.1 -dnspython==2.3.0 # 2.1.0 -docker==5.0.3 -urllib3==1.26.18 +ansible==9.2.0 #9.1.0 # 8.6.0 # 2.10.7 +openshift==0.13.2 #0.13.1 # 0.12.0 +kubernetes==29.0.0 #26.1.0 # 12.0.1 +dnspython==2.6.1 #2.3.0 # 2.1.0 +docker==7.0.0 #5.0.3 +urllib3==2.2.1 #1.26.18 diff --git a/requirements.yaml b/requirements.yaml index 66defdbe..6a5d9d01 100644 --- a/requirements.yaml +++ b/requirements.yaml @@ -1,8 +1,8 @@ --- collections: - name: ansible.utils - version: 2.3.0 + version: 3.1.0 #2.3.0 - name: community.docker - version: 2.7.8 + version: 3.7.0 #2.7.8 - name: kubernetes.core - version: 2.3.2 + version: 3.0.0 #2.3.2 From 8e4b8140f046f8808726177e9b6ad299334af735 Mon Sep 17 00:00:00 2001 From: Ritika Patil Date: Tue, 27 Feb 2024 12:43:43 -0600 Subject: [PATCH 2/4] feat: (IAC-1236) Fixed ansible-lint error --- requirements.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.yaml b/requirements.yaml index 6a5d9d01..78ed142f 100644 --- a/requirements.yaml +++ b/requirements.yaml @@ -1,8 +1,8 @@ --- collections: - name: ansible.utils - version: 3.1.0 #2.3.0 + version: 3.1.0 # 2.3.0 - name: community.docker - version: 3.7.0 #2.7.8 + version: 3.7.0 # 2.7.8 - name: kubernetes.core - version: 3.0.0 #2.3.2 + version: 3.0.0 # 2.3.2 From b1ee9df47b73b66e844066575bf35e1c0b08a118 Mon Sep 17 00:00:00 2001 From: Ritika Patil Date: Mon, 4 Mar 2024 12:47:54 -0600 Subject: [PATCH 3/4] feat: (IAC-1236) Updated helm version --- Dockerfile | 2 +- requirements.txt | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index e25f72d4..6853968f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ RUN curl -sLO https://storage.googleapis.com/kubernetes-release/release/v$kubect # Installation FROM baseline -ARG helm_version=3.14.1 +ARG helm_version=3.14.2 ARG aws_cli_version=2.15.22 ARG gcp_cli_version=464.0.0 diff --git a/requirements.txt b/requirements.txt index 0ec7dd70..30f424e3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ -ansible==9.2.0 #9.1.0 # 8.6.0 # 2.10.7 -openshift==0.13.2 #0.13.1 # 0.12.0 -kubernetes==29.0.0 #26.1.0 # 12.0.1 -dnspython==2.6.1 #2.3.0 # 2.1.0 -docker==7.0.0 #5.0.3 -urllib3==2.2.1 #1.26.18 +ansible==9.2.0 # 9.1.0 # 8.6.0 # 2.10.7 +openshift==0.13.2 # 0.13.1 # 0.12.0 +kubernetes==27.2.0 # 26.1.0 # 12.0.1 +dnspython==2.6.1 # 2.3.0 # 2.1.0 +docker==7.0.0 # 5.0.3 +urllib3==2.2.1 # 1.26.18 From ac018e3d462b2302eb42659d6af5db9b5286518b Mon Sep 17 00:00:00 2001 From: Ritika Patil Date: Mon, 4 Mar 2024 14:05:02 -0600 Subject: [PATCH 4/4] feat: (IAC-1236) Additional updates --- Dockerfile | 2 +- docs/user/Dependencies.md | 11 ++++++----- requirements.txt | 2 +- requirements.yaml | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6853968f..e0836ca6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ RUN apt-get update && apt-get upgrade -y \ && update-alternatives --install /usr/bin/pip pip /usr/bin/pip3 1 FROM baseline as tool_builder -ARG kubectl_version=1.27.9 +ARG kubectl_version=1.27.11 WORKDIR /build diff --git a/docs/user/Dependencies.md b/docs/user/Dependencies.md index 7058599d..cfbf85a1 100644 --- a/docs/user/Dependencies.md +++ b/docs/user/Dependencies.md @@ -14,15 +14,16 @@ The following list details our dependencies and versions (~ indicates multiple p | ~ | git | any | | ~ | rsync | any | | ~ | kubectl | 1.26 - 1.28 | -| ~ | Helm | 3.14.1 | +| ~ | Helm | 3.14.2 | | pip3 | ansible | 9.2.0 | | pip3 | openshift | 0.13.2 | -| pip3 | kubernetes | 29.0.0 | +| pip3 | kubernetes | 27.2.0 | | pip3 | dnspython | 2.6.1 | | pip3 | docker | 7.0.0 | -| ansible-galaxy | community.docker | 3.7.0 | +| pip3 | urllib3 | 1.26.18 | +| ansible-galaxy | community.docker | 3.8.0 | | ansible-galaxy | ansible.utils | 3.1.0 | -| ansible-galaxy | kubernetes.core | 3.0.0 | +| ansible-galaxy | kubernetes.core | 3.0.1 | If you are using a provider based kubeconfig file created by viya4-iac-gcp:4.5.0 or newer, install these dependencies: | SOURCE | NAME | VERSION | @@ -48,7 +49,7 @@ As described in the [Docker Installation](./DockerUsage.md) section add addition ```bash # Override kubectl version docker build \ - --build-arg kubectl_version=1.27.9 \ + --build-arg kubectl_version=1.27.11 \ -t viya4-deployment . ``` diff --git a/requirements.txt b/requirements.txt index 30f424e3..5b239b05 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,4 +3,4 @@ openshift==0.13.2 # 0.13.1 # 0.12.0 kubernetes==27.2.0 # 26.1.0 # 12.0.1 dnspython==2.6.1 # 2.3.0 # 2.1.0 docker==7.0.0 # 5.0.3 -urllib3==2.2.1 # 1.26.18 +urllib3==1.26.18 diff --git a/requirements.yaml b/requirements.yaml index 78ed142f..c6a707bc 100644 --- a/requirements.yaml +++ b/requirements.yaml @@ -3,6 +3,6 @@ collections: - name: ansible.utils version: 3.1.0 # 2.3.0 - name: community.docker - version: 3.7.0 # 2.7.8 + version: 3.8.0 # 2.7.8 - name: kubernetes.core version: 3.0.0 # 2.3.2