Merge pull request #254 from truenas/NAS-113459

NAS-113459 / 22.02-RC.2 / Fix: Deployments w/ `hostNetwork=true` + `RollingUpdate`
2026-04-13 17:29:46 +08:00 · 2021-12-06 19:00:39 +05:00
parent cf9978a9de 059ff6d66e
commit 23c694d55f
38 changed files with 6 additions and 2 deletions
--- a/charts/ix-chart/2111.0.0/charts/common-2105.0.0.tgz
+++ b/charts/ix-chart/2111.0.0/charts/common-2105.0.0.tgz
--- a/charts/ix-chart/2111.0.1/.helmignore
+++ b/charts/ix-chart/2111.0.1/.helmignore
--- a/charts/ix-chart/2111.0.1/Chart.lock
+++ b/charts/ix-chart/2111.0.1/Chart.lock
--- a/charts/ix-chart/2111.0.1/Chart.yaml
+++ b/charts/ix-chart/2111.0.1/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2111.0.0
+version: 2111.0.1

 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
--- a/charts/ix-chart/2111.0.1/README.md
+++ b/charts/ix-chart/2111.0.1/README.md
--- a/charts/ix-chart/2111.0.1/app-readme.md
+++ b/charts/ix-chart/2111.0.1/app-readme.md
--- a/charts/ix-chart/2111.0.1/charts/common-2105.0.0.tgz
+++ b/charts/ix-chart/2111.0.1/charts/common-2105.0.0.tgz
--- a/charts/ix-chart/2111.0.1/questions.yaml
+++ b/charts/ix-chart/2111.0.1/questions.yaml
--- a/charts/ix-chart/2111.0.1/templates/NOTES.txt
+++ b/charts/ix-chart/2111.0.1/templates/NOTES.txt
--- a/charts/ix-chart/2111.0.1/templates/_containers.tpl
+++ b/charts/ix-chart/2111.0.1/templates/_containers.tpl
--- a/charts/ix-chart/2111.0.1/templates/_helpers.tpl
+++ b/charts/ix-chart/2111.0.1/templates/_helpers.tpl
--- a/charts/ix-chart/2111.0.1/templates/_networking.tpl
+++ b/charts/ix-chart/2111.0.1/templates/_networking.tpl
--- a/charts/ix-chart/2111.0.1/templates/_volumes.tpl
+++ b/charts/ix-chart/2111.0.1/templates/_volumes.tpl
--- a/charts/ix-chart/2111.0.1/templates/_workload.tpl
+++ b/charts/ix-chart/2111.0.1/templates/_workload.tpl
@@ -102,6 +102,8 @@ Deployment Spec
 strategy:
  {{- if and (eq .Values.updateStrategy "RollingUpdate") .Values.hostPortsList }}
  {{- fail "RollingUpdate is not allowed when host ports are specified" }}
+  {{- else if and (eq .Values.updateStrategy "RollingUpdate") .Values.hostNetwork }}
+  {{- fail "RollingUpdate is not allowed when host network is enabled" }}
  {{- end }}
  type: {{ .Values.updateStrategy }}
 selector:
--- a/charts/ix-chart/2111.0.1/templates/external-interfaces.yaml
+++ b/charts/ix-chart/2111.0.1/templates/external-interfaces.yaml
--- a/charts/ix-chart/2111.0.1/templates/service.yaml
+++ b/charts/ix-chart/2111.0.1/templates/service.yaml
--- a/charts/ix-chart/2111.0.1/templates/tests/deployment-check.yaml
+++ b/charts/ix-chart/2111.0.1/templates/tests/deployment-check.yaml
--- a/charts/ix-chart/2111.0.1/templates/workload.yaml
+++ b/charts/ix-chart/2111.0.1/templates/workload.yaml
--- a/charts/ix-chart/2111.0.1/test_values.yaml
+++ b/charts/ix-chart/2111.0.1/test_values.yaml
--- a/test/ix-chart/2111.0.0/charts/common-2105.0.0.tgz
+++ b/test/ix-chart/2111.0.0/charts/common-2105.0.0.tgz
--- a/test/ix-chart/2111.0.1/.helmignore
+++ b/test/ix-chart/2111.0.1/.helmignore
--- a/test/ix-chart/2111.0.1/Chart.lock
+++ b/test/ix-chart/2111.0.1/Chart.lock
--- a/test/ix-chart/2111.0.1/Chart.yaml
+++ b/test/ix-chart/2111.0.1/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2111.0.0
+version: 2111.0.1

 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
--- a/test/ix-chart/2111.0.1/README.md
+++ b/test/ix-chart/2111.0.1/README.md
--- a/test/ix-chart/2111.0.1/app-readme.md
+++ b/test/ix-chart/2111.0.1/app-readme.md
--- a/test/ix-chart/2111.0.1/charts/common-2105.0.0.tgz
+++ b/test/ix-chart/2111.0.1/charts/common-2105.0.0.tgz
--- a/test/ix-chart/2111.0.1/questions.yaml
+++ b/test/ix-chart/2111.0.1/questions.yaml
--- a/test/ix-chart/2111.0.1/templates/NOTES.txt
+++ b/test/ix-chart/2111.0.1/templates/NOTES.txt
--- a/test/ix-chart/2111.0.1/templates/_containers.tpl
+++ b/test/ix-chart/2111.0.1/templates/_containers.tpl
--- a/test/ix-chart/2111.0.1/templates/_helpers.tpl
+++ b/test/ix-chart/2111.0.1/templates/_helpers.tpl
--- a/test/ix-chart/2111.0.1/templates/_networking.tpl
+++ b/test/ix-chart/2111.0.1/templates/_networking.tpl
--- a/test/ix-chart/2111.0.1/templates/_volumes.tpl
+++ b/test/ix-chart/2111.0.1/templates/_volumes.tpl
--- a/test/ix-chart/2111.0.1/templates/_workload.tpl
+++ b/test/ix-chart/2111.0.1/templates/_workload.tpl
@@ -102,6 +102,8 @@ Deployment Spec
 strategy:
  {{- if and (eq .Values.updateStrategy "RollingUpdate") .Values.hostPortsList }}
  {{- fail "RollingUpdate is not allowed when host ports are specified" }}
+  {{- else if and (eq .Values.updateStrategy "RollingUpdate") .Values.hostNetwork }}
+  {{- fail "RollingUpdate is not allowed when host network is enabled" }}
  {{- end }}
  type: {{ .Values.updateStrategy }}
 selector:
--- a/test/ix-chart/2111.0.1/templates/external-interfaces.yaml
+++ b/test/ix-chart/2111.0.1/templates/external-interfaces.yaml
--- a/test/ix-chart/2111.0.1/templates/service.yaml
+++ b/test/ix-chart/2111.0.1/templates/service.yaml
--- a/test/ix-chart/2111.0.1/templates/tests/deployment-check.yaml
+++ b/test/ix-chart/2111.0.1/templates/tests/deployment-check.yaml
--- a/test/ix-chart/2111.0.1/templates/workload.yaml
+++ b/test/ix-chart/2111.0.1/templates/workload.yaml
--- a/test/ix-chart/2111.0.1/test_values.yaml
+++ b/test/ix-chart/2111.0.1/test_values.yaml