Skip to content
Snippets Groups Projects
Commit f099651d authored by Mitchell Nielsen's avatar Mitchell Nielsen
Browse files

Remove NGINX's `isControllerTagValid` helper

Removes NGINX's `isControllerValid` helper, as the check had not been
updated since its implementation in 2020. Additionally, as part of
#3383, we'll need
to refer to a tag that includes `ubi`, which would break the
`semverCompare` function.

Changelog: removed
parent 4db610e3
No related branches found
No related tags found
1 merge request!2668Remove NGINX's `isControllerTagValid` helper
......@@ -121,15 +121,6 @@ Return the appropriate apiGroup for PodSecurityPolicy.
{{- end -}}
{{- end -}}
{{/*
Check the ingress controller version tag is at most three versions behind the last release
*/}}
{{- define "isControllerTagValid" -}}
{{- if not (semverCompare ">=0.27.0-0" .Values.controller.image.tag) -}}
{{- fail "Controller container image tag should be 0.27.0 or higher" -}}
{{- end -}}
{{- end -}}
{{/*
IngressClass parameters.
*/}}
......
{{- if or (eq .Values.controller.kind "DaemonSet") (eq .Values.controller.kind "Both") -}}
{{- include "isControllerTagValid" . -}}
apiVersion: apps/v1
kind: DaemonSet
metadata:
......
{{- if or (eq .Values.controller.kind "Deployment") (eq .Values.controller.kind "Both") -}}
{{- include "isControllerTagValid" . -}}
apiVersion: apps/v1
kind: Deployment
metadata:
......
......@@ -26,3 +26,7 @@ The following adjustments were made to the NGINX fork:
- Add `podlabels` and `global.pod.labels` to `.spec.template.metadata.labels`
- Disable NGINX's default nodeSelectors.
- Added support for PDB `maxUnavailable`.
- Remove NGINX's `isControllerTagValid` helper in `charts/nginx-ingress/templates/_helpers.tpl`
- The check had not been updated since it was [implemented](https://github.com/kubernetes/ingress-nginx/pull/5252) in 2020.
- As part of [#3383](https://gitlab.com/gitlab-org/charts/gitlab/-/issues/3383), we need to refer to a tag that will contain `ubi`,
meaning that the `semverCompare` would not work as expected anyway.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment