Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: (PSKD-1006) Use ingress-nginx v1.12 for K8s 1.31 support #587

Merged
merged 2 commits into from
Jan 7, 2025

Conversation

dhoucgitter
Copy link
Member

@dhoucgitter dhoucgitter commented Jan 3, 2025

Changes

  • Update the default version of the ingress-nginx Helm chart to use v4.12.0 for K8s >= v1.28 in order to support K8s 1.31
  • Update the default for INGRESS_NGINX_CHART_VERSION in CONFIG-VARS.md file to be 4.12.0

Tests

Scenario Provider K8s version ingress-nginx chart version Cadence relevant ingress-nginx config map values Notes
1 Azure 1.30.6 (default) 4.12.0 stable:2024.12 annotations-risk-level: Critical Single expected configMap value set for ingress-nginx v1.12.0 at stable:2024.12 cadence
2 Azure 1.30.6 (configured) 4.11.4 stable:2024.12 none No additional ingress-nginx configMap values set for ingress-nginx v1.11.4 at stable:2024.12, matches results for PSKD-1087
3 Azure 1.30.6 (default) 4.12.0 stable:2024.11 strict-validate-path-type: 'false'; annotations-risk-level: Critical Both expected configMap values set for ingress-nginx v1.12.0 at stable:2024.11, matches results for PSKD-1087
4 AWS 1.30.7 (default) 4.12.0 stable:2024.12 annotations-risk-level: Critical Single expected configMap value set for ingress-nginx v1.12.0 at stable:2024.12, matches results for PSKD-1087; Successful Viya4 deployment and viya_admin login to fqdn deploy.aws1.devops.unx.sas.com

@dhoucgitter dhoucgitter self-assigned this Jan 3, 2025
@@ -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.12.0` is used for Kubernetes clusters whose version is >= 1.26.X, for Kubernetes clusters whose version is <= 1.25.X you must 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 |

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe the k8s cluster version warning needs to be adjusted. ingress-nginx 1.12.0 is documented to support k8s 1.28 to 1.32.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @ephesused, I also needed to update the k8sMinorVersion value for the new ingress-nginx version so that v1.12.0 will only be installed by default for k8s 1.28 and newer clusters. The output message and behavior should indicate that for K8s clusters <= v1.27, the INGRESS_NGINX_CHART_VERSION var must be explicitly set.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ephesused , ready for re-review when you get a chance.

@dhoucgitter dhoucgitter requested a review from saschjmil January 7, 2025 16:20
@dhoucgitter dhoucgitter added the enhancement New feature or request label Jan 7, 2025
@dhoucgitter dhoucgitter marked this pull request as ready for review January 7, 2025 16:21
@dhoucgitter dhoucgitter requested a review from ephesused January 7, 2025 19:44
@dhoucgitter dhoucgitter merged commit 1b9d0b8 into staging Jan 7, 2025
4 checks passed
@dhoucgitter dhoucgitter deleted the PSKD-1006 branch January 7, 2025 20:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants