Skip to content

Commit

Permalink
feat: (IAC-1236) Dependency version update (#530)
Browse files Browse the repository at this point in the history
  • Loading branch information
riragh authored Mar 8, 2024
1 parent c2365a8 commit c21a417
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 25 deletions.
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ 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

RUN curl -sLO https://storage.googleapis.com/kubernetes-release/release/v$kubectl_version/bin/linux/amd64/kubectl && chmod 755 ./kubectl

# 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.2
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 \
Expand Down
27 changes: 14 additions & 13 deletions docs/user/Dependencies.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,29 @@ 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.2 |
| pip3 | ansible | 9.2.0 |
| pip3 | openshift | 0.13.2 |
| pip3 | kubernetes | 27.2.0 |
| pip3 | dnspython | 2.6.1 |
| pip3 | docker | 7.0.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.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 |
|----------------|-------------------------|-------------|
| ~ | 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.
Expand All @@ -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 .
```

Expand Down
10 changes: 5 additions & 5 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -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
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==1.26.18
6 changes: 3 additions & 3 deletions requirements.yaml
Original file line number Diff line number Diff line change
@@ -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.8.0 # 2.7.8
- name: kubernetes.core
version: 2.3.2
version: 3.0.0 # 2.3.2

0 comments on commit c21a417

Please sign in to comment.