From 4af64647272a03fd67afdc2c95ad691080d373e2 Mon Sep 17 00:00:00 2001 From: chjmil Date: Thu, 10 Oct 2024 18:15:30 -0400 Subject: [PATCH 1/8] feat: (PSKD-350) Update tool versions --- Dockerfile | 6 +++--- docs/user/Dependencies.md | 43 ++++++++++++++++++++------------------- requirements.txt | 12 +++++------ requirements.yaml | 6 +++--- 4 files changed, 34 insertions(+), 33 deletions(-) diff --git a/Dockerfile b/Dockerfile index df479209..86a6f410 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.15.2 -ARG aws_cli_version=2.16.5 -ARG gcp_cli_version=479.0.0-0 +ARG helm_version=3.16.2 +ARG aws_cli_version=2.17.58 +ARG gcp_cli_version=496.0.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 0ca950b8..e1f1d69b 100644 --- a/docs/user/Dependencies.md +++ b/docs/user/Dependencies.md @@ -4,31 +4,32 @@ If your environment requires validated support for a specific version or range o The following list details our dependencies and versions (~ indicates multiple possible sources): -| SOURCE | NAME | VERSION | -|----------------|------------------|-------------| -| ~ | python | >=3.10 | -| ~ | pip | 3.x | -| ~ | unzip | any | -| ~ | tar | any | -| ~ | docker | >=25.0.3 | -| ~ | git | any | -| ~ | rsync | any | -| ~ | kubectl | 1.28 - 1.30 | -| ~ | 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.1.0 | -| pip3 | urllib3 | 1.26.18 | -| ansible-galaxy | community.docker | 3.10.3 | -| ansible-galaxy | ansible.utils | 3.1.0 | -| ansible-galaxy | kubernetes.core | 3.0.0 | +| SOURCE | NAME | VERSION | +|----------------|------------------|--------------| +| ~ | python | >=3.10 | +| ~ | pip | 3.x | +| ~ | unzip | any | +| ~ | tar | any | +| ~ | docker | >=25.0.3 | +| ~ | git | any | +| ~ | rsync | any | +| ~ | kubectl | 1.28 - 1.30 | +| ~ | Helm | 3.16.2 | +| pip3 | ansible | 10.5.0 | +| pip3 | openshift | 0.13.2 | +| pip3 | kubernetes | 29.0.0 | +| pip3 | dnspython | 2.7.0 | +| pip3 | docker | 7.1.0 | +| pip3 | urllib3 | 2.2.3 | +| ansible-galaxy | community.docker | 3.13.0 | +| ansible-galaxy | ansible.utils | 5.1.2 | +| ansible-galaxy | kubernetes.core | 5.0.0 | If you are using a provider based kubeconfig file created by viya4-iac-gcp:4.5.0 or newer, install these dependencies: +<< MIGHT NEED TO UPDATE GCP VERSION ^^ >> | SOURCE | NAME | VERSION | |----------------|-------------------------|-------------| -| ~ | gcloud | 472.0.0 | +| ~ | gcloud | 496.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 c84a323f..0a681ba9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,8 @@ -ansible==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==27.2.0 # 26.1.0 # 12.0.1 -dnspython==2.6.1 # 2.3.0 # 2.1.0 +kubernetes==29.0.0 # 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==1.26.18 -wheel>=0.38.1 -setuptools>=65.5.1 +urllib3==2.2.3 # 1.26.18 +wheel>=0.44.0 # 0.38.1 +setuptools>=75.1.0 # 65.5.1 diff --git a/requirements.yaml b/requirements.yaml index fa944b26..f2c893ea 100644 --- a/requirements.yaml +++ b/requirements.yaml @@ -1,8 +1,8 @@ --- collections: - name: ansible.utils - version: 4.1.0 # 3.1.0 # 2.3.0 + version: 5.1.2 # 4.1.0 # 3.1.0 # 2.3.0 - name: community.docker - version: 3.10.3 # 3.8.0 # 2.7.8 + version: 3.13.0 # 3.10.3 # 3.8.0 # 2.7.8 - name: kubernetes.core - version: 3.0.0 # 2.3.2 + version: 5.0.0 # 3.0.0 # 2.3.2 From 449fe5db840fe46228f1a73aa1000d193166b3c3 Mon Sep 17 00:00:00 2001 From: chjmil Date: Mon, 14 Oct 2024 17:49:14 -0400 Subject: [PATCH 2/8] feat: helm chart version bumps --- roles/baseline/defaults/main.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/roles/baseline/defaults/main.yml b/roles/baseline/defaults/main.yml index 02f5d6ac..2604d54b 100644 --- a/roles/baseline/defaults/main.yml +++ b/roles/baseline/defaults/main.yml @@ -14,7 +14,7 @@ CERT_MANAGER_NAME: cert-manager CERT_MANAGER_NAMESPACE: cert-manager CERT_MANAGER_CHART_NAME: cert-manager CERT_MANAGER_CHART_URL: https://charts.jetstack.io/ -CERT_MANAGER_CHART_VERSION: 1.14.4 +CERT_MANAGER_CHART_VERSION: 1.16.1 CERT_MANAGER_CONFIG: installCRDs: "true" extraArgs: @@ -25,7 +25,7 @@ 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_VERSION: 7.2.15 METRICS_SERVER_CONFIG: apiService: create: true @@ -33,9 +33,9 @@ METRICS_SERVER_CONFIG: ## Ingress-nginx - Defaults ingressVersions: k8sMinorVersion: - value: 26 + value: 28 api: - chartVersion: 4.11.1 + chartVersion: 4.11.3 ## Ingress-nginx - Ingress ## @@ -152,7 +152,7 @@ CONTOUR_NAME: contour CONTOUR_NAMESPACE: contour CONTOUR_CHART_NAME: contour CONTOUR_CHART_URL: https://charts.bitnami.com/bitnami -CONTOUR_CHART_VERSION: 4.3.8 +CONTOUR_CHART_VERSION: 19.2.0 CONTOUR_CONFIG: envoy: service: @@ -164,7 +164,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.43.0 CLUSTER_AUTOSCALER_ACCOUNT: null CLUSTER_AUTOSCALER_LOCATION: us-east-1 CLUSTER_AUTOSCALER_CONFIG: @@ -183,7 +183,7 @@ EBS_CSI_DRIVER_NAME: aws-ebs-csi-driver EBS_CSI_DRIVER_NAMESPACE: kube-system EBS_CSI_DRIVER_CHART_NAME: aws-ebs-csi-driver EBS_CSI_DRIVER_CHART_URL: https://kubernetes-sigs.github.io/aws-ebs-csi-driver -EBS_CSI_DRIVER_CHART_VERSION: 2.11.1 +EBS_CSI_DRIVER_CHART_VERSION: 2.35.1 EBS_CSI_DRIVER_ACCOUNT: null EBS_CSI_DRIVER_LOCATION: us-east-1 EBS_CSI_DRIVER_CONFIG: From ad95f015a114125a32b6dd4ac4b4365efe72af37 Mon Sep 17 00:00:00 2001 From: chjmil Date: Mon, 14 Oct 2024 17:59:02 -0400 Subject: [PATCH 3/8] docs: Update chart versions --- docs/CONFIG-VARS.md | 10 +++++----- roles/baseline/defaults/main.yml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/CONFIG-VARS.md b/docs/CONFIG-VARS.md index fcf5452f..d4d5d4f9 100644 --- a/docs/CONFIG-VARS.md +++ b/docs/CONFIG-VARS.md @@ -374,7 +374,7 @@ Notes: | CERT_MANAGER_NAMESPACE | cert-manager Helm installation namespace | string | cert-manager | false | | baseline | | CERT_MANAGER_CHART_URL | cert-manager Helm chart URL | string | https://charts.jetstack.io/ | false | | baseline | | CERT_MANAGER_CHART_NAME| cert-manager Helm chart name | string | cert-manager| false | | baseline | -| CERT_MANAGER_CHART_VERSION | cert-manager Helm chart version | string | 1.14.4 | false | | baseline | +| CERT_MANAGER_CHART_VERSION | cert-manager Helm chart version | string | 1.16.1 | false | | baseline | | CERT_MANAGER_CONFIG | cert-manager Helm values | string | See [this file](../roles/baseline/defaults/main.yml) for more information. | false | | baseline | Notes: @@ -389,7 +389,7 @@ Cluster-autoscaler is currently only used for AWS EKS clusters. Google GKE and A | 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 | 9.36.0 | false | Version `9.36.0` is used for Kubernetes clusters whose version is >= 1.25. For Kubernetes clusters whose version is <= 1.24 please set this variable to avoid errors. 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 | 9.43.0 | false | Version `9.43.0` is used for Kubernetes clusters whose version is >= 1.25. For Kubernetes clusters whose version is <= 1.24 please set this variable to avoid errors. 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 | @@ -407,7 +407,7 @@ The EBS CSI driver is currently only used for kubernetes v1.23 or later AWS EKS | :--- | ---: | ---: | ---: | ---: | ---: | ---: | | EBS_CSI_DRIVER_CHART_URL | aws ebs csi driver helm chart url | string | https://kubernetes-sigs.github.io/aws-ebs-csi-driver | false | | baseline | | EBS_CSI_DRIVER_CHART_NAME| aws ebs csi driver helm chart name | string | aws-ebs-csi-driver | false | | baseline | -| EBS_CSI_DRIVER_CHART_VERSION | aws ebs csi driver helm chart version | string | 2.11.1 | false | | baseline | +| EBS_CSI_DRIVER_CHART_VERSION | aws ebs csi driver helm chart version | string | 2.35.1 | false | | baseline | | EBS_CSI_DRIVER_CONFIG | aws ebs csi driver helm values | string | see [here](../roles/baseline/defaults/main.yml) | false | | baseline | | EBS_CSI_DRIVER_ACCOUNT | cluster autoscaler aws role arn | string | | false | Required to enable the aws ebs csi driver on AWS | baseline | | EBS_CSI_DRIVER_LOCATION | aws region where kubernetes cluster resides | string | us-east-1 | false | | baseline | @@ -419,7 +419,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.11.1` is used for Kubernetes clusters whose version is >= 1.26.X, and for Kubernetes clusters whose version is <= 1.25.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.11.3` is used for Kubernetes clusters whose version is >= 1.26.X, and for Kubernetes clusters whose version is <= 1.25.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 @@ -431,7 +431,7 @@ Kubernetes Metrics Server installation is currently only applicable for AWS EKS | METRICS_SERVER_ENABLED | Whether to deploy Metrics Server | bool | true | false | | baseline | | METRICS_SERVER_CHART_URL | Metrics Server Helm chart url | string | Go [here](https://charts.bitnami.com/bitnami/) for more information. | false | If an existing Metrics Server is installed, these options are ignored. | baseline | | METRICS_SERVER_CHART_NAME | Metrics Server Helm chart name | string | metrics-server | false | If an existing Metrics Server is installed, these options are ignored. | baseline | -| METRICS_SERVER_CHART_VERSION | Metrics Server Helm chart version | string | 6.6.5 | false | If an existing Metrics Server is installed, these options are ignored. See [Artifact Hub](https://artifacthub.io/packages/helm/bitnami/metrics-server) to determine application version.| baseline | +| METRICS_SERVER_CHART_VERSION | Metrics Server Helm chart version | string | 7.2.15 | false | If an existing Metrics Server is installed, these options are ignored. See [Artifact Hub](https://artifacthub.io/packages/helm/bitnami/metrics-server) to determine application version.| baseline | | METRICS_SERVER_CONFIG | Metrics Server Helm values | string | See [this file](../roles/baseline/defaults/main.yml) for more information. | false | If an existing Metrics Server is installed, these options are ignored. | baseline | ### NFS Client diff --git a/roles/baseline/defaults/main.yml b/roles/baseline/defaults/main.yml index 2604d54b..bc4281b1 100644 --- a/roles/baseline/defaults/main.yml +++ b/roles/baseline/defaults/main.yml @@ -33,7 +33,7 @@ METRICS_SERVER_CONFIG: ## Ingress-nginx - Defaults ingressVersions: k8sMinorVersion: - value: 28 + value: 26 api: chartVersion: 4.11.3 From a0b1ece3bc24ef83a126846f8a3f9dacdacc52f3 Mon Sep 17 00:00:00 2001 From: chjmil Date: Tue, 15 Oct 2024 17:15:40 -0400 Subject: [PATCH 4/8] fix: Back out helm chart bumps --- docs/CONFIG-VARS.md | 12 ++++++------ roles/baseline/defaults/main.yml | 14 +++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/CONFIG-VARS.md b/docs/CONFIG-VARS.md index d4d5d4f9..9ec68230 100644 --- a/docs/CONFIG-VARS.md +++ b/docs/CONFIG-VARS.md @@ -374,7 +374,7 @@ Notes: | CERT_MANAGER_NAMESPACE | cert-manager Helm installation namespace | string | cert-manager | false | | baseline | | CERT_MANAGER_CHART_URL | cert-manager Helm chart URL | string | https://charts.jetstack.io/ | false | | baseline | | CERT_MANAGER_CHART_NAME| cert-manager Helm chart name | string | cert-manager| false | | baseline | -| CERT_MANAGER_CHART_VERSION | cert-manager Helm chart version | string | 1.16.1 | false | | baseline | +| CERT_MANAGER_CHART_VERSION | cert-manager Helm chart version | string | 1.14.4 | false | | baseline | | CERT_MANAGER_CONFIG | cert-manager Helm values | string | See [this file](../roles/baseline/defaults/main.yml) for more information. | false | | baseline | Notes: @@ -389,7 +389,7 @@ Cluster-autoscaler is currently only used for AWS EKS clusters. Google GKE and A | 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 | 9.43.0 | false | Version `9.43.0` is used for Kubernetes clusters whose version is >= 1.25. For Kubernetes clusters whose version is <= 1.24 please set this variable to avoid errors. 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 | 9.36.0 | false | Version `9.36.0` is used for Kubernetes clusters whose version is >= 1.25. For Kubernetes clusters whose version is <= 1.24 please set this variable to avoid errors. 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 | @@ -407,7 +407,7 @@ The EBS CSI driver is currently only used for kubernetes v1.23 or later AWS EKS | :--- | ---: | ---: | ---: | ---: | ---: | ---: | | EBS_CSI_DRIVER_CHART_URL | aws ebs csi driver helm chart url | string | https://kubernetes-sigs.github.io/aws-ebs-csi-driver | false | | baseline | | EBS_CSI_DRIVER_CHART_NAME| aws ebs csi driver helm chart name | string | aws-ebs-csi-driver | false | | baseline | -| EBS_CSI_DRIVER_CHART_VERSION | aws ebs csi driver helm chart version | string | 2.35.1 | false | | baseline | +| EBS_CSI_DRIVER_CHART_VERSION | aws ebs csi driver helm chart version | string | 2.11.1 | false | | baseline | | EBS_CSI_DRIVER_CONFIG | aws ebs csi driver helm values | string | see [here](../roles/baseline/defaults/main.yml) | false | | baseline | | EBS_CSI_DRIVER_ACCOUNT | cluster autoscaler aws role arn | string | | false | Required to enable the aws ebs csi driver on AWS | baseline | | EBS_CSI_DRIVER_LOCATION | aws region where kubernetes cluster resides | string | us-east-1 | false | | baseline | @@ -419,7 +419,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.11.3` is used for Kubernetes clusters whose version is >= 1.26.X, and for Kubernetes clusters whose version is <= 1.25.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.11.1` is used for Kubernetes clusters whose version is >= 1.26.X, and for Kubernetes clusters whose version is <= 1.25.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 @@ -431,7 +431,7 @@ Kubernetes Metrics Server installation is currently only applicable for AWS EKS | METRICS_SERVER_ENABLED | Whether to deploy Metrics Server | bool | true | false | | baseline | | METRICS_SERVER_CHART_URL | Metrics Server Helm chart url | string | Go [here](https://charts.bitnami.com/bitnami/) for more information. | false | If an existing Metrics Server is installed, these options are ignored. | baseline | | METRICS_SERVER_CHART_NAME | Metrics Server Helm chart name | string | metrics-server | false | If an existing Metrics Server is installed, these options are ignored. | baseline | -| METRICS_SERVER_CHART_VERSION | Metrics Server Helm chart version | string | 7.2.15 | false | If an existing Metrics Server is installed, these options are ignored. See [Artifact Hub](https://artifacthub.io/packages/helm/bitnami/metrics-server) to determine application version.| baseline | +| METRICS_SERVER_CHART_VERSION | Metrics Server Helm chart version | string | 6.6.5 | false | If an existing Metrics Server is installed, these options are ignored. See [Artifact Hub](https://artifacthub.io/packages/helm/bitnami/metrics-server) to determine application version.| baseline | | METRICS_SERVER_CONFIG | Metrics Server Helm values | string | See [this file](../roles/baseline/defaults/main.yml) for more information. | false | If an existing Metrics Server is installed, these options are ignored. | baseline | ### NFS Client @@ -456,4 +456,4 @@ The Postgres NFS client is currently supported by the nfs-subdir-external-provis | PG_NFS_CLIENT_CHART_URL | nfs-subdir-external-provisioner Helm chart URL | string | Go [here](https://kubernetes-sigs.github.io/nfs-subdir-external-provisioner/) for more information. | false | | baseline | | PG_NFS_CLIENT_CHART_NAME | nfs-subdir-external-provisioner Helm chart name | string | nfs-subdir-external-provisioner | false | | baseline | | PG_NFS_CLIENT_CHART_VERSION | nfs-subdir-external-provisioner Helm chart version | string | 4.0.18| false | | baseline | -| PG_NFS_CLIENT_CONFIG | nfs-subdir-external-provisioner Helm values | string | See [this file](../roles/baseline/defaults/main.yml) for more information. | false | | baseline | +| PG_NFS_CLIENT_CONFIG | nfs-subdir-external-provisioner Helm values | string | See [this file](../roles/baseline/defaults/main.yml) for more information. | false | | baseline | \ No newline at end of file diff --git a/roles/baseline/defaults/main.yml b/roles/baseline/defaults/main.yml index bc4281b1..91c41fa0 100644 --- a/roles/baseline/defaults/main.yml +++ b/roles/baseline/defaults/main.yml @@ -14,7 +14,7 @@ CERT_MANAGER_NAME: cert-manager CERT_MANAGER_NAMESPACE: cert-manager CERT_MANAGER_CHART_NAME: cert-manager CERT_MANAGER_CHART_URL: https://charts.jetstack.io/ -CERT_MANAGER_CHART_VERSION: 1.16.1 +CERT_MANAGER_CHART_VERSION: 1.14.4 CERT_MANAGER_CONFIG: installCRDs: "true" extraArgs: @@ -25,7 +25,7 @@ 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: 7.2.15 +METRICS_SERVER_CHART_VERSION: 6.6.5 METRICS_SERVER_CONFIG: apiService: create: true @@ -35,7 +35,7 @@ ingressVersions: k8sMinorVersion: value: 26 api: - chartVersion: 4.11.3 + chartVersion: 4.11.1 ## Ingress-nginx - Ingress ## @@ -152,7 +152,7 @@ CONTOUR_NAME: contour CONTOUR_NAMESPACE: contour CONTOUR_CHART_NAME: contour CONTOUR_CHART_URL: https://charts.bitnami.com/bitnami -CONTOUR_CHART_VERSION: 19.2.0 +CONTOUR_CHART_VERSION: 4.3.8 CONTOUR_CONFIG: envoy: service: @@ -164,7 +164,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.43.0 +CLUSTER_AUTOSCALER_CHART_VERSION: 9.36.0 CLUSTER_AUTOSCALER_ACCOUNT: null CLUSTER_AUTOSCALER_LOCATION: us-east-1 CLUSTER_AUTOSCALER_CONFIG: @@ -183,7 +183,7 @@ EBS_CSI_DRIVER_NAME: aws-ebs-csi-driver EBS_CSI_DRIVER_NAMESPACE: kube-system EBS_CSI_DRIVER_CHART_NAME: aws-ebs-csi-driver EBS_CSI_DRIVER_CHART_URL: https://kubernetes-sigs.github.io/aws-ebs-csi-driver -EBS_CSI_DRIVER_CHART_VERSION: 2.35.1 +EBS_CSI_DRIVER_CHART_VERSION: 2.11.1 EBS_CSI_DRIVER_ACCOUNT: null EBS_CSI_DRIVER_LOCATION: us-east-1 EBS_CSI_DRIVER_CONFIG: @@ -215,4 +215,4 @@ private_ingress: networking.gke.io/load-balancer-type: Internal ## NIST Features -V4_CFG_NIST_FEATURES_ENABLED: false +V4_CFG_NIST_FEATURES_ENABLED: false \ No newline at end of file From 1f361d8e2e538c1a0ecfee9094301a0ba7a256b8 Mon Sep 17 00:00:00 2001 From: chjmil Date: Tue, 15 Oct 2024 18:03:12 -0400 Subject: [PATCH 5/8] chore: linting --- roles/baseline/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/baseline/defaults/main.yml b/roles/baseline/defaults/main.yml index 91c41fa0..02f5d6ac 100644 --- a/roles/baseline/defaults/main.yml +++ b/roles/baseline/defaults/main.yml @@ -215,4 +215,4 @@ private_ingress: networking.gke.io/load-balancer-type: Internal ## NIST Features -V4_CFG_NIST_FEATURES_ENABLED: false \ No newline at end of file +V4_CFG_NIST_FEATURES_ENABLED: false From ed5063304a3144af7d46bf253c2c7ed03760160e Mon Sep 17 00:00:00 2001 From: chjmil Date: Wed, 16 Oct 2024 15:49:22 -0400 Subject: [PATCH 6/8] feat: bump kubectl version --- Dockerfile | 2 +- docs/user/Dependencies.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 86a6f410..6834126b 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.29.7 +ARG kubectl_version=1.29.8 WORKDIR /build diff --git a/docs/user/Dependencies.md b/docs/user/Dependencies.md index e1f1d69b..167f7169 100644 --- a/docs/user/Dependencies.md +++ b/docs/user/Dependencies.md @@ -50,7 +50,7 @@ As described in the [Docker Installation](./DockerUsage.md) section add addition ```bash # Override kubectl version docker build \ - --build-arg kubectl_version=1.29.7 \ + --build-arg kubectl_version=1.29.8 \ -t viya4-deployment . ``` From a2dc58cd349d003c13e1b3bf398772c95b87d33b Mon Sep 17 00:00:00 2001 From: chjmil Date: Fri, 25 Oct 2024 17:12:32 -0400 Subject: [PATCH 7/8] chore: capitalize as in Dockerfile --- Dockerfile | 4 ++-- docs/user/Dependencies.md | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6834126b..c393355c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:experimental -FROM ubuntu:22.04 as baseline +FROM ubuntu:22.04 AS baseline RUN apt-get update && apt-get upgrade -y \ && apt-get install --no-install-recommends -y python3 python3-dev python3-pip curl unzip apt-transport-https ca-certificates gnupg \ @@ -8,7 +8,7 @@ RUN apt-get update && apt-get upgrade -y \ && update-alternatives --install /usr/bin/python python /usr/bin/python3 1 \ && update-alternatives --install /usr/bin/pip pip /usr/bin/pip3 1 -FROM baseline as tool_builder +FROM baseline AS tool_builder ARG kubectl_version=1.29.8 WORKDIR /build diff --git a/docs/user/Dependencies.md b/docs/user/Dependencies.md index 167f7169..950fd686 100644 --- a/docs/user/Dependencies.md +++ b/docs/user/Dependencies.md @@ -26,7 +26,6 @@ The following list details our dependencies and versions (~ indicates multiple p | ansible-galaxy | kubernetes.core | 5.0.0 | If you are using a provider based kubeconfig file created by viya4-iac-gcp:4.5.0 or newer, install these dependencies: -<< MIGHT NEED TO UPDATE GCP VERSION ^^ >> | SOURCE | NAME | VERSION | |----------------|-------------------------|-------------| | ~ | gcloud | 496.0.0 | From 8197f7ab7babbd5a1194bcb39fc89f5c1c05acae Mon Sep 17 00:00:00 2001 From: chjmil Date: Wed, 30 Oct 2024 17:44:53 -0400 Subject: [PATCH 8/8] DCO Remediation Commit for chjmil I, chjmil , hereby add my Signed-off-by to this commit: 4af64647272a03fd67afdc2c95ad691080d373e2 I, chjmil , hereby add my Signed-off-by to this commit: 449fe5db840fe46228f1a73aa1000d193166b3c3 I, chjmil , hereby add my Signed-off-by to this commit: ad95f015a114125a32b6dd4ac4b4365efe72af37 I, chjmil , hereby add my Signed-off-by to this commit: a0b1ece3bc24ef83a126846f8a3f9dacdacc52f3 I, chjmil , hereby add my Signed-off-by to this commit: 1f361d8e2e538c1a0ecfee9094301a0ba7a256b8 I, chjmil , hereby add my Signed-off-by to this commit: ed5063304a3144af7d46bf253c2c7ed03760160e I, chjmil , hereby add my Signed-off-by to this commit: a2dc58cd349d003c13e1b3bf398772c95b87d33b Signed-off-by: chjmil --- docs/CONFIG-VARS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/CONFIG-VARS.md b/docs/CONFIG-VARS.md index 9ec68230..fcf5452f 100644 --- a/docs/CONFIG-VARS.md +++ b/docs/CONFIG-VARS.md @@ -456,4 +456,4 @@ The Postgres NFS client is currently supported by the nfs-subdir-external-provis | PG_NFS_CLIENT_CHART_URL | nfs-subdir-external-provisioner Helm chart URL | string | Go [here](https://kubernetes-sigs.github.io/nfs-subdir-external-provisioner/) for more information. | false | | baseline | | PG_NFS_CLIENT_CHART_NAME | nfs-subdir-external-provisioner Helm chart name | string | nfs-subdir-external-provisioner | false | | baseline | | PG_NFS_CLIENT_CHART_VERSION | nfs-subdir-external-provisioner Helm chart version | string | 4.0.18| false | | baseline | -| PG_NFS_CLIENT_CONFIG | nfs-subdir-external-provisioner Helm values | string | See [this file](../roles/baseline/defaults/main.yml) for more information. | false | | baseline | \ No newline at end of file +| PG_NFS_CLIENT_CONFIG | nfs-subdir-external-provisioner Helm values | string | See [this file](../roles/baseline/defaults/main.yml) for more information. | false | | baseline |