From 83ee36dbd94725e2c72075b604d3f265042f0be5 Mon Sep 17 00:00:00 2001 From: David Houck Date: Wed, 30 Aug 2023 13:08:02 -0400 Subject: [PATCH] feat: (IAC-1147) DAC - Support K8s 1.27 in 2023.09 (#484) --- Dockerfile | 2 +- docs/user/Dependencies.md | 4 ++-- roles/baseline/defaults/main.yml | 2 -- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index fc107a5d..f11cd3c9 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.25.9 +ARG kubectl_version=1.26.8 WORKDIR /build diff --git a/docs/user/Dependencies.md b/docs/user/Dependencies.md index 9c2910bf..7fa44d12 100644 --- a/docs/user/Dependencies.md +++ b/docs/user/Dependencies.md @@ -13,7 +13,7 @@ The following list details our dependencies and versions (~ indicates multiple p | ~ | docker | >=20.10.10 | | ~ | git | any | | ~ | rsync | any | -| ~ | kubectl | 1.24 - 1.26 | +| ~ | kubectl | 1.25 - 1.27 | | ~ | Helm | 3 | | pip3 | ansible | 8.0.0 | | pip3 | openshift | 0.13.1 | @@ -48,7 +48,7 @@ As described in the [Docker Installation](./DockerUsage.md) section add addition ```bash # Override kubectl version docker build \ - --build-arg kubectl_version=1.25.9 \ + --build-arg kubectl_version=1.26.8 \ -t viya4-deployment . ``` diff --git a/roles/baseline/defaults/main.yml b/roles/baseline/defaults/main.yml index 003c0ab1..94ada303 100644 --- a/roles/baseline/defaults/main.yml +++ b/roles/baseline/defaults/main.yml @@ -35,12 +35,10 @@ ingressVersions: value: 23 api: chartVersion: 4.3.0 - appVersion: 1.4.0 k8sMinorVersionFloor: value: 24 api: chartVersion: 4.7.1 - appVersion: 1.8.1 ## Ingress-nginx - Ingress ##