summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCraig Anderson <craig.anderson@att.com>2018-11-15 19:04:29 +0000
committerCraig Anderson <craig.anderson@att.com>2018-11-15 19:08:49 +0000
commitf3a9306404854259287d22e0f1ae09b9e5eedf54 (patch)
tree41a6a2ba085e8d50909813a21a0f6af5279ca783
parent04745a1f88647686076446113e8f946c5e740f4c (diff)
Resolve illegal base64 data errors
For some versions of Tiller, the newline in Secrets were causing Tiller to error with illegal base64 data error messages. Change-Id: Ibd005c9b81e620590b0025bd32da4d589eba91ae
Notes
Notes (review): Code-Review+2: Bryan Strassner <bryan.strassner@gmail.com> Code-Review+1: Dustin Specker <dustin.specker@att.com> Code-Review+1: Vladyslav Drok <vdrok@mirantis.com> Code-Review+2: Sean Eagan <sean.eagan@att.com> Workflow+1: Sean Eagan <sean.eagan@att.com> Code-Review+2: Kaspars Skels <kaspars.skels@gmail.com> Workflow+1: Kaspars Skels <kaspars.skels@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Thu, 15 Nov 2018 22:35:22 +0000 Reviewed-on: https://review.openstack.org/618274 Project: openstack/airship-divingbell Branch: refs/heads/master
-rw-r--r--divingbell/templates/secret-apt.yaml3
-rw-r--r--divingbell/templates/secret-ethtool.yaml3
-rw-r--r--divingbell/templates/secret-limits.yaml3
-rw-r--r--divingbell/templates/secret-mounts.yaml3
-rw-r--r--divingbell/templates/secret-sysctl.yaml3
-rw-r--r--divingbell/templates/secret-uamlite.yaml3
6 files changed, 6 insertions, 12 deletions
diff --git a/divingbell/templates/secret-apt.yaml b/divingbell/templates/secret-apt.yaml
index 14f0a6d..7c5d226 100644
--- a/divingbell/templates/secret-apt.yaml
+++ b/divingbell/templates/secret-apt.yaml
@@ -24,7 +24,6 @@ kind: Secret
24metadata: 24metadata:
25 name: {{ $secretName }} 25 name: {{ $secretName }}
26data: 26data:
27 apt: |+ 27 apt: {{ tuple "bin/_apt.sh.tpl" . | include "helm-toolkit.utils.template" | b64enc }}
28{{ tuple "bin/_apt.sh.tpl" . | include "helm-toolkit.utils.template" | b64enc | indent 4 }}
29{{- end }} 28{{- end }}
30{{- end }} 29{{- end }}
diff --git a/divingbell/templates/secret-ethtool.yaml b/divingbell/templates/secret-ethtool.yaml
index 63d7d2d..83926d5 100644
--- a/divingbell/templates/secret-ethtool.yaml
+++ b/divingbell/templates/secret-ethtool.yaml
@@ -24,7 +24,6 @@ kind: Secret
24metadata: 24metadata:
25 name: {{ $secretName }} 25 name: {{ $secretName }}
26data: 26data:
27 ethtool: |+ 27 ethtool: {{ tuple "bin/_ethtool.sh.tpl" . | include "helm-toolkit.utils.template" | b64enc }}
28{{ tuple "bin/_ethtool.sh.tpl" . | include "helm-toolkit.utils.template" | b64enc | indent 4 }}
29{{- end }} 28{{- end }}
30{{- end }} 29{{- end }}
diff --git a/divingbell/templates/secret-limits.yaml b/divingbell/templates/secret-limits.yaml
index 7d98e89..7488d79 100644
--- a/divingbell/templates/secret-limits.yaml
+++ b/divingbell/templates/secret-limits.yaml
@@ -24,7 +24,6 @@ kind: Secret
24metadata: 24metadata:
25 name: {{ $secretName }} 25 name: {{ $secretName }}
26data: 26data:
27 limits: |+ 27 limits: {{ tuple "bin/_limits.sh.tpl" . | include "helm-toolkit.utils.template" | b64enc }}
28{{ tuple "bin/_limits.sh.tpl" . | include "helm-toolkit.utils.template" | b64enc | indent 4 }}
29{{- end }} 28{{- end }}
30{{- end }} 29{{- end }}
diff --git a/divingbell/templates/secret-mounts.yaml b/divingbell/templates/secret-mounts.yaml
index fbcad72..ebc0b6b 100644
--- a/divingbell/templates/secret-mounts.yaml
+++ b/divingbell/templates/secret-mounts.yaml
@@ -24,7 +24,6 @@ kind: Secret
24metadata: 24metadata:
25 name: {{ $secretName }} 25 name: {{ $secretName }}
26data: 26data:
27 mounts: |+ 27 mounts: {{ tuple "bin/_mounts.sh.tpl" . | include "helm-toolkit.utils.template" | b64enc }}
28{{ tuple "bin/_mounts.sh.tpl" . | include "helm-toolkit.utils.template" | b64enc | indent 4 }}
29{{- end }} 28{{- end }}
30{{- end }} 29{{- end }}
diff --git a/divingbell/templates/secret-sysctl.yaml b/divingbell/templates/secret-sysctl.yaml
index f504739..3bbdfc5 100644
--- a/divingbell/templates/secret-sysctl.yaml
+++ b/divingbell/templates/secret-sysctl.yaml
@@ -24,7 +24,6 @@ kind: Secret
24metadata: 24metadata:
25 name: {{ $secretName }} 25 name: {{ $secretName }}
26data: 26data:
27 sysctl: |+ 27 sysctl: {{ tuple "bin/_sysctl.sh.tpl" . | include "helm-toolkit.utils.template" | b64enc }}
28{{ tuple "bin/_sysctl.sh.tpl" . | include "helm-toolkit.utils.template" | b64enc | indent 4 }}
29{{- end }} 28{{- end }}
30{{- end }} 29{{- end }}
diff --git a/divingbell/templates/secret-uamlite.yaml b/divingbell/templates/secret-uamlite.yaml
index 46c19a1..244437f 100644
--- a/divingbell/templates/secret-uamlite.yaml
+++ b/divingbell/templates/secret-uamlite.yaml
@@ -24,7 +24,6 @@ kind: Secret
24metadata: 24metadata:
25 name: {{ $secretName }} 25 name: {{ $secretName }}
26data: 26data:
27 uamlite: |+ 27 uamlite: {{ tuple "bin/_uamlite.sh.tpl" . | include "helm-toolkit.utils.template" | b64enc }}
28{{ tuple "bin/_uamlite.sh.tpl" . | include "helm-toolkit.utils.template" | b64enc | indent 4 }}
29{{- end }} 28{{- end }}
30{{- end }} 29{{- end }}