andata
/
rke2-charts
mirror of https://git.rancher.io/rke2-charts
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
rke2-charts/packages/rke2-ingress-nginx/generated-changes/patch/templates/controller-daemonset.yaml.p...

49 lines
3.1 KiB
Diff
Raw Normal View History

Migrate all packages Just needed to run: ```bash REPOSITORY=https://github.com/rancher/rke2-charts BRANCH=main-source ./scripts/regenerate-packages ``` Signed-off-by: Arvind Iyengar <arvind.iyengar@rancher.com>
2021-02-26 01:34:15 +00:00
--- charts-original/templates/controller-daemonset.yaml
+++ charts/templates/controller-daemonset.yaml
Strip 'nginx-' prefix from image tags when using semverCompare (#62) * Revert rke2-ingress-nginx to 1.36.3 * Add trimPrefix calls to rke2-ingress-nginx daemonset manifest * Add trimPrefix call to rke2-ingress-nginx deployment with defaultBackend disabled Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2021-04-05 22:47:34 +00:00
@@ -60,7 +60,7 @@
{{- end }}
Migrate all packages Just needed to run: ```bash REPOSITORY=https://github.com/rancher/rke2-charts BRANCH=main-source ./scripts/regenerate-packages ``` Signed-off-by: Arvind Iyengar <arvind.iyengar@rancher.com>
2021-02-26 01:34:15 +00:00
containers:
Strip 'nginx-' prefix from image tags when using semverCompare (#62) * Revert rke2-ingress-nginx to 1.36.3 * Add trimPrefix calls to rke2-ingress-nginx daemonset manifest * Add trimPrefix call to rke2-ingress-nginx deployment with defaultBackend disabled Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2021-04-05 22:47:34 +00:00
- name: {{ template "nginx-ingress.name" . }}-{{ .Values.controller.name }}
- image: "{{ .Values.controller.image.repository }}:{{ .Values.controller.image.tag }}"
+ image: {{ template "system_default_registry" . }}{{ .Values.controller.image.repository }}:{{ .Values.controller.image.tag }}
imagePullPolicy: "{{ .Values.controller.image.pullPolicy }}"
{{- if .Values.controller.lifecycle }}
lifecycle:
@@ -71,22 +71,22 @@
{{- if .Values.defaultBackend.enabled }}
- --default-backend-service={{ .Release.Namespace }}/{{ template "nginx-ingress.defaultBackend.fullname" . }}
{{- else }}
- {{- if (semverCompare "<0.21.0" .Values.controller.image.tag) }}
+ {{- if (semverCompare "<0.21.0" (trimPrefix "nginx-" .Values.controller.image.tag)) }}
- --default-backend-service={{ required ".Values.controller.defaultBackendService is required if .Values.defaultBackend.enabled=false and .Values.controller.image.tag < 0.21.0" .Values.controller.defaultBackendService }}
{{- else if .Values.controller.defaultBackendService }}
- --default-backend-service={{ .Values.controller.defaultBackendService }}
{{- end }}
Migrate all packages Just needed to run: ```bash REPOSITORY=https://github.com/rancher/rke2-charts BRANCH=main-source ./scripts/regenerate-packages ``` Signed-off-by: Arvind Iyengar <arvind.iyengar@rancher.com>
2021-02-26 01:34:15 +00:00
{{- end }}
Strip 'nginx-' prefix from image tags when using semverCompare (#62) * Revert rke2-ingress-nginx to 1.36.3 * Add trimPrefix calls to rke2-ingress-nginx daemonset manifest * Add trimPrefix call to rke2-ingress-nginx deployment with defaultBackend disabled Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2021-04-05 22:47:34 +00:00
- {{- if and (semverCompare ">=0.9.0-beta.1" .Values.controller.image.tag) .Values.controller.publishService.enabled }}
+ {{- if and (semverCompare ">=0.9.0-beta.1" (trimPrefix "nginx-" .Values.controller.image.tag)) .Values.controller.publishService.enabled }}
- --publish-service={{ template "nginx-ingress.controller.publishServicePath" . }}
{{- end }}
- {{- if (semverCompare ">=0.9.0-beta.1" .Values.controller.image.tag) }}
+ {{- if (semverCompare ">=0.9.0-beta.1" (trimPrefix "nginx-" .Values.controller.image.tag)) }}
- --election-id={{ .Values.controller.electionID }}
{{- end }}
- {{- if (semverCompare ">=0.9.0-beta.1" .Values.controller.image.tag) }}
+ {{- if (semverCompare ">=0.9.0-beta.1" (trimPrefix "nginx-" .Values.controller.image.tag)) }}
- --ingress-class={{ .Values.controller.ingressClass }}
{{- end }}
- {{- if (semverCompare ">=0.9.0-beta.1" .Values.controller.image.tag) }}
+ {{- if (semverCompare ">=0.9.0-beta.1" (trimPrefix "nginx-" .Values.controller.image.tag)) }}
- --configmap={{ .Release.Namespace }}/{{ template "nginx-ingress.controller.fullname" . }}
{{- else }}
- --nginx-configmap={{ .Release.Namespace }}/{{ template "nginx-ingress.controller.fullname" . }}
@@ -118,7 +118,7 @@
- --{{ $key }}
{{- end }}
{{- end }}
- {{- if (semverCompare ">=0.16.0" .Values.controller.image.tag) }}
+ {{- if (semverCompare ">=0.16.0" (trimPrefix "nginx-" .Values.controller.image.tag)) }}
securityContext:
capabilities:
drop: