From 0e5927daad619a4999e2c782805f18a252329417 Mon Sep 17 00:00:00 2001 From: Ritika Patil Date: Thu, 28 Mar 2024 13:16:32 -0500 Subject: [PATCH] feat: (IAC-1344) Updated ingress-nginx default to v1.9.6 feat: (IAC-1363) Updated cluster-autoscaler default to 9.36.0 and updated kubectl default to add support for K8s 1.29 --- Dockerfile | 2 +- docs/CONFIG-VARS.md | 4 ++-- docs/user/Dependencies.md | 2 +- roles/baseline/defaults/main.yml | 13 +++---------- roles/baseline/tasks/cluster-autoscaler.yaml | 3 +-- 5 files changed, 8 insertions(+), 16 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6baa5df0..27903575 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.11 +ARG kubectl_version=1.28.7 WORKDIR /build diff --git a/docs/CONFIG-VARS.md b/docs/CONFIG-VARS.md index 4cf9d909..cb53152b 100644 --- a/docs/CONFIG-VARS.md +++ b/docs/CONFIG-VARS.md @@ -386,7 +386,7 @@ Cluster-autoscaler is currently only used for AWS EKS clusters. GCP GKE and Azur | CLUSTER_AUTOSCALER_ENABLED | Whether to deploy cluster-autoscaler | bool | true | false | | baseline | | CLUSTER_AUTOSCALER_CHART_URL | Cluster-autoscaler Helm chart URL | string | See [this document](https://github.com/kubernetes/autoscaler/tree/master/charts) for more information. | false | | baseline | | CLUSTER_AUTOSCALER_CHART_NAME| Cluster-autoscaler Helm chart name | string | cluster-autoscaler | false | | baseline | -| CLUSTER_AUTOSCALER_CHART_VERSION | Cluster-autoscaler Helm chart version | string | "" | false | If left as "" (empty string), version 9.9.2 is used for Kubernetes clusters whose version is <= 1.24
and version 9.34.1 is used for Kubernetes clusters whose version is >= 1.25
See [Artifact Hub](https://artifacthub.io/packages/helm/cluster-autoscaler/cluster-autoscaler) to determine application version| baseline | +| CLUSTER_AUTOSCALER_CHART_VERSION | Cluster-autoscaler Helm chart version | string | "" | false | If left as "" (empty string), version 9.36.0 is used.
See [Artifact Hub](https://artifacthub.io/packages/helm/cluster-autoscaler/cluster-autoscaler) to determine application version| baseline | | CLUSTER_AUTOSCALER_CONFIG | Cluster-autoscaler Helm values | string | See [this file](../roles/baseline/defaults/main.yml) for more information. | false | | baseline | | CLUSTER_AUTOSCALER_ACCOUNT | Cluster autoscaler AWS role ARN | string | | false | Required to enable cluster-autoscaler on AWS | baseline | | CLUSTER_AUTOSCALER_LOCATION |AWS region where Kubernetes cluster is running | string | us-east-1 | false | | baseline | @@ -416,7 +416,7 @@ The EBS CSI driver is currently only used for kubernetes v1.23 or later AWS EKS | INGRESS_NGINX_NAMESPACE | NGINX Ingress Helm installation namespace | string | ingress-nginx | false | | baseline | | INGRESS_NGINX_CHART_URL | NGINX Ingress Helm chart URL | string | See [this document](https://kubernetes.github.io/ingress-nginx) for more information. | false | | baseline | | INGRESS_NGINX_CHART_NAME | NGINX Ingress Helm chart name | string | ingress-nginx | false | | baseline | -| INGRESS_NGINX_CHART_VERSION | NGINX Ingress Helm chart version | string | "" | false | If left as "" (empty string), version `4.9.0` is used for Kubernetes clusters whose version is >= 1.25.X, and for Kubernetes clusters whose version is <= 1.24.X please set this variable to avoid errors. See [Supported Versions table](https://github.com/kubernetes/ingress-nginx/?tab=readme-ov-file#supported-versions-table) for the supported versions list. | baseline | +| INGRESS_NGINX_CHART_VERSION | NGINX Ingress Helm chart version | string | "" | false | If left as "" (empty string), version `4.9.1` is used for Kubernetes clusters whose version is >= 1.25.X, and for Kubernetes clusters whose version is <= 1.24.X please set this variable to avoid errors. See [Supported Versions table](https://github.com/kubernetes/ingress-nginx/?tab=readme-ov-file#supported-versions-table) for the supported versions list. | baseline | | INGRESS_NGINX_CONFIG | NGINX Ingress Helm values | string | See [this file](../roles/baseline/defaults/main.yml) for more information. Altering this value will affect the cluster. | false | | baseline | ### Metrics Server diff --git a/docs/user/Dependencies.md b/docs/user/Dependencies.md index 81b9d3f3..7a9ab79e 100644 --- a/docs/user/Dependencies.md +++ b/docs/user/Dependencies.md @@ -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.27.11 \ + --build-arg kubectl_version=1.28.7 \ -t viya4-deployment . ``` diff --git a/roles/baseline/defaults/main.yml b/roles/baseline/defaults/main.yml index edb8112c..4b0ae78d 100644 --- a/roles/baseline/defaults/main.yml +++ b/roles/baseline/defaults/main.yml @@ -35,7 +35,7 @@ ingressVersions: k8sMinorVersion: value: 25 api: - chartVersion: 4.9.0 + chartVersion: 4.9.1 ## Ingress-nginx - Ingress ## @@ -178,15 +178,8 @@ CLUSTER_AUTOSCALER_CONFIG: eks.amazonaws.com/role-arn: "{{ CLUSTER_AUTOSCALER_ACCOUNT }}" autoscalerVersions: - # Supports PodDisruptionBudget policy/v1beta1 default for K8s <=1.24 - PDBv1beta1Support: - api: - chartVersion: 9.9.2 - appVersion: 1.20.0 - # Supports PodDisruptionBudget policy/v1beta1 default for K8s >=1.25 - PDBv1Support: - api: - chartVersion: 9.34.1 + api: + chartVersion: 9.36.0 ## EBS CSI Driver EBS_CSI_DRIVER_ENABLED: true diff --git a/roles/baseline/tasks/cluster-autoscaler.yaml b/roles/baseline/tasks/cluster-autoscaler.yaml index 9f86905c..5f05bf74 100644 --- a/roles/baseline/tasks/cluster-autoscaler.yaml +++ b/roles/baseline/tasks/cluster-autoscaler.yaml @@ -12,8 +12,7 @@ block: - name: Set the default CLUSTER_AUTOSCALER_CHART_VERSION based on K8s server minor version set_fact: - CLUSTER_AUTOSCALER_CHART_VERSION: "{{ autoscalerVersions.PDBv1Support.api.chartVersion if K8S_VERSION | float >= 1.25 else autoscalerVersions.PDBv1beta1Support.api.chartVersion - }}" + CLUSTER_AUTOSCALER_CHART_VERSION: "{{ autoscalerVersions.api.chartVersion }}" - name: Deploy cluster-autoscaler kubernetes.core.helm: