summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCraig Anderson <craig.anderson@att.com>2018-08-30 18:33:48 +0000
committerCraig Anderson <craig.anderson@att.com>2018-08-30 18:34:57 +0000
commit7755b665b1632c314f24007d2e2f1b39e68e2137 (patch)
tree1113dc1770d3c89164c86fd0577a33750855be28
parent0ac90c40a0741a929204d139dfa0415562b7044e (diff)
Allow enabling/disabling of each daemonset
Notes
Notes (review): Code-Review+2: Alan Meadows <alan.meadows@gmail.com> Code-Review+2: Felipe Monteiro <felipe.monteiro@att.com> Code-Review+1: Chris Wedgwood <cw@f00f.org> Workflow+1: Felipe Monteiro <felipe.monteiro@att.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Fri, 31 Aug 2018 19:38:17 +0000 Reviewed-on: https://review.openstack.org/598301 Project: openstack/airship-divingbell Branch: refs/heads/master
-rw-r--r--divingbell/templates/daemonset-ethtool.yaml2
-rw-r--r--divingbell/templates/daemonset-mounts.yaml2
-rw-r--r--divingbell/templates/daemonset-sysctl.yaml2
-rw-r--r--divingbell/templates/daemonset-uamlite.yaml2
-rw-r--r--divingbell/values.yaml6
5 files changed, 14 insertions, 0 deletions
diff --git a/divingbell/templates/daemonset-ethtool.yaml b/divingbell/templates/daemonset-ethtool.yaml
index 06404bf..0f2e3d3 100644
--- a/divingbell/templates/daemonset-ethtool.yaml
+++ b/divingbell/templates/daemonset-ethtool.yaml
@@ -60,8 +60,10 @@ spec:
60 defaultMode: 0555 60 defaultMode: 0555
61 {{- end }} 61 {{- end }}
62{{- end }} 62{{- end }}
63{{- if .Values.manifests.daemonset_ethtool }}
63{{- $daemonset := "ethtool" }} 64{{- $daemonset := "ethtool" }}
64{{- $configMapName := "divingbell-ethtool" }} 65{{- $configMapName := "divingbell-ethtool" }}
65{{- $daemonset_yaml := list $daemonset $configMapName . | include "divingbell.daemonset.ethtool" | toString | fromYaml }} 66{{- $daemonset_yaml := list $daemonset $configMapName . | include "divingbell.daemonset.ethtool" | toString | fromYaml }}
66{{- $configmap_include := "divingbell.configmap.ethtool" }} 67{{- $configmap_include := "divingbell.configmap.ethtool" }}
67{{- list $daemonset $daemonset_yaml $configmap_include $configMapName . | include "helm-toolkit.utils.daemonset_overrides" }} 68{{- list $daemonset $daemonset_yaml $configmap_include $configMapName . | include "helm-toolkit.utils.daemonset_overrides" }}
69{{- end }}
diff --git a/divingbell/templates/daemonset-mounts.yaml b/divingbell/templates/daemonset-mounts.yaml
index 0d4d106..e1665cc 100644
--- a/divingbell/templates/daemonset-mounts.yaml
+++ b/divingbell/templates/daemonset-mounts.yaml
@@ -60,8 +60,10 @@ spec:
60 defaultMode: 0555 60 defaultMode: 0555
61 {{- end }} 61 {{- end }}
62{{- end }} 62{{- end }}
63{{- if .Values.manifests.daemonset_mounts }}
63{{- $daemonset := "mounts" }} 64{{- $daemonset := "mounts" }}
64{{- $configMapName := "divingbell-mounts" }} 65{{- $configMapName := "divingbell-mounts" }}
65{{- $daemonset_yaml := list $daemonset $configMapName . | include "divingbell.daemonset.mounts" | toString | fromYaml }} 66{{- $daemonset_yaml := list $daemonset $configMapName . | include "divingbell.daemonset.mounts" | toString | fromYaml }}
66{{- $configmap_include := "divingbell.configmap.mounts" }} 67{{- $configmap_include := "divingbell.configmap.mounts" }}
67{{- list $daemonset $daemonset_yaml $configmap_include $configMapName . | include "helm-toolkit.utils.daemonset_overrides" }} 68{{- list $daemonset $daemonset_yaml $configmap_include $configMapName . | include "helm-toolkit.utils.daemonset_overrides" }}
69{{- end }}
diff --git a/divingbell/templates/daemonset-sysctl.yaml b/divingbell/templates/daemonset-sysctl.yaml
index 4fca19a..a4e9d49 100644
--- a/divingbell/templates/daemonset-sysctl.yaml
+++ b/divingbell/templates/daemonset-sysctl.yaml
@@ -60,8 +60,10 @@ spec:
60 defaultMode: 0555 60 defaultMode: 0555
61 {{- end }} 61 {{- end }}
62{{- end }} 62{{- end }}
63{{- if .Values.manifests.daemonset_sysctl }}
63{{- $daemonset := "sysctl" }} 64{{- $daemonset := "sysctl" }}
64{{- $configMapName := "divingbell-sysctl" }} 65{{- $configMapName := "divingbell-sysctl" }}
65{{- $daemonset_yaml := list $daemonset $configMapName . | include "divingbell.daemonset.sysctl" | toString | fromYaml }} 66{{- $daemonset_yaml := list $daemonset $configMapName . | include "divingbell.daemonset.sysctl" | toString | fromYaml }}
66{{- $configmap_include := "divingbell.configmap.sysctl" }} 67{{- $configmap_include := "divingbell.configmap.sysctl" }}
67{{- list $daemonset $daemonset_yaml $configmap_include $configMapName . | include "helm-toolkit.utils.daemonset_overrides" }} 68{{- list $daemonset $daemonset_yaml $configmap_include $configMapName . | include "helm-toolkit.utils.daemonset_overrides" }}
69{{- end }}
diff --git a/divingbell/templates/daemonset-uamlite.yaml b/divingbell/templates/daemonset-uamlite.yaml
index 85ef8bd..3b6953e 100644
--- a/divingbell/templates/daemonset-uamlite.yaml
+++ b/divingbell/templates/daemonset-uamlite.yaml
@@ -60,8 +60,10 @@ spec:
60 defaultMode: 0555 60 defaultMode: 0555
61 {{- end }} 61 {{- end }}
62{{- end }} 62{{- end }}
63{{- if .Values.manifests.daemonset_uamlite }}
63{{- $daemonset := "uamlite" }} 64{{- $daemonset := "uamlite" }}
64{{- $configMapName := "divingbell-uamlite" }} 65{{- $configMapName := "divingbell-uamlite" }}
65{{- $daemonset_yaml := list $daemonset $configMapName . | include "divingbell.daemonset.uamlite" | toString | fromYaml }} 66{{- $daemonset_yaml := list $daemonset $configMapName . | include "divingbell.daemonset.uamlite" | toString | fromYaml }}
66{{- $configmap_include := "divingbell.configmap.uamlite" }} 67{{- $configmap_include := "divingbell.configmap.uamlite" }}
67{{- list $daemonset $daemonset_yaml $configmap_include $configMapName . | include "helm-toolkit.utils.daemonset_overrides" }} 68{{- list $daemonset $daemonset_yaml $configmap_include $configMapName . | include "helm-toolkit.utils.daemonset_overrides" }}
69{{- end }}
diff --git a/divingbell/values.yaml b/divingbell/values.yaml
index 2ee97ba..f29e8e4 100644
--- a/divingbell/values.yaml
+++ b/divingbell/values.yaml
@@ -76,3 +76,9 @@ pod:
76 requests: 76 requests:
77 memory: "128Mi" 77 memory: "128Mi"
78 cpu: "100m" 78 cpu: "100m"
79
80manifests:
81 daemonset_ethtool: true
82 daemonset_mounts: true
83 daemonset_uamlite: true
84 daemonset_sysctl: true