diff --git a/.github/workflows/linter-analysis.yaml b/.github/workflows/linter-analysis.yaml index 742e3f4b..eef5e2b6 100644 --- a/.github/workflows/linter-analysis.yaml +++ b/.github/workflows/linter-analysis.yaml @@ -10,10 +10,10 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Run Hadolint Action - uses: jbergstroem/hadolint-gh-action@v1.11.0 + uses: jbergstroem/hadolint-gh-action@v1.12.2 with: dockerfile: ./Dockerfile config_file: linting-configs/.hadolint.yaml @@ -25,7 +25,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 # .shellcheckrc is read from the current dir - name: Copy Config to Parent Level Directory @@ -42,7 +42,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 # The latest ansible/ansible-lint-action removed the # ability to specify configs from other dirs diff --git a/Dockerfile b/Dockerfile index 21cdb76d..dec298e5 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.30.10 +ARG kubectl_version=1.31.7 WORKDIR /build diff --git a/docs/user/Dependencies.md b/docs/user/Dependencies.md index 0dde394e..bcec2e96 100644 --- a/docs/user/Dependencies.md +++ b/docs/user/Dependencies.md @@ -13,14 +13,14 @@ The following list details our dependencies and versions (~ indicates multiple p | ~ | docker | >=25.0.3 | | ~ | git | any | | ~ | rsync | any | -| ~ | kubectl | 1.29 - 1.31 | +| ~ | kubectl | 1.30 - 1.32 | | ~ | Helm | 3.16.2 | | pip3 | ansible | 10.5.0 | | pip3 | openshift | 0.13.2 | -| pip3 | kubernetes | 29.0.0 | +| pip3 | kubernetes | 32.0.1 | | pip3 | dnspython | 2.7.0 | | pip3 | docker | 7.1.0 | -| pip3 | urllib3 | 2.2.3 | +| pip3 | urllib3 | 2.3.0 | | ansible-galaxy | community.docker | 3.13.0 | | ansible-galaxy | ansible.utils | 5.1.2 | | ansible-galaxy | kubernetes.core | 5.0.0 | @@ -49,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.30.6 \ + --build-arg kubectl_version=1.31.7 \ -t viya4-deployment . ``` diff --git a/requirements.txt b/requirements.txt index 0a681ba9..c4a04b64 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,8 @@ -ansible==10.5.0 # 9.6.0 # 9.2.0 # 9.1.0 # 8.6.0 # 2.10.7 +ansible~=10.5.0 # 9.6.0 # 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 # 27.2.0 # 26.1.0 # 12.0.1 +kubernetes~=32.0.1 # 27.2.0 # 26.1.0 # 12.0.1 dnspython==2.7.0 # 2.6.1 # 2.3.0 # 2.1.0 docker==7.1.0 # 7.0.0 # 5.0.3 -urllib3==2.2.3 # 1.26.18 +urllib3~=2.3.0 # 1.26.18 wheel>=0.44.0 # 0.38.1 setuptools>=75.1.0 # 65.5.1 diff --git a/roles/baseline/defaults/main.yml b/roles/baseline/defaults/main.yml index 739290fe..f40abca7 100644 --- a/roles/baseline/defaults/main.yml +++ b/roles/baseline/defaults/main.yml @@ -25,8 +25,8 @@ CERT_MANAGER_CONFIG: METRICS_SERVER_ENABLED: true METRICS_SERVER_NAME: metrics-server METRICS_SERVER_CHART_NAME: metrics-server -METRICS_SERVER_CHART_URL: https://charts.bitnami.com/bitnami/ -METRICS_SERVER_CHART_VERSION: 6.6.5 +METRICS_SERVER_CHART_URL: https://kubernetes-sigs.github.io/metrics-server/ +METRICS_SERVER_CHART_VERSION: 3.12.2 METRICS_SERVER_CONFIG: apiService: create: true @@ -178,7 +178,7 @@ CLUSTER_AUTOSCALER_NAME: cluster-autoscaler CLUSTER_AUTOSCALER_NAMESPACE: kube-system CLUSTER_AUTOSCALER_CHART_NAME: cluster-autoscaler CLUSTER_AUTOSCALER_CHART_URL: https://kubernetes.github.io/autoscaler -CLUSTER_AUTOSCALER_CHART_VERSION: 9.36.0 +CLUSTER_AUTOSCALER_CHART_VERSION: 9.46.6 CLUSTER_AUTOSCALER_ACCOUNT: null CLUSTER_AUTOSCALER_LOCATION: us-east-1 CLUSTER_AUTOSCALER_CONFIG: