From 33cebb8ee0393f7c6aba4aef83e6241ef7b224e5 Mon Sep 17 00:00:00 2001 From: EJ Etherington Date: Wed, 2 Jan 2019 10:17:41 -0800 Subject: [PATCH 1/2] fixing issue with set-string --- CHANGELOG.md | 6 ++++++ reckoner/chart.py | 2 +- reckoner/meta.py | 2 +- tests/test_course.yml | 3 +-- tests/test_reckoner.py | 15 ++++++++++++++- 5 files changed, 23 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b976f7e5..da872179 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [0.9.1] + +### Fixed +- bug where string values were being set as `set-string` + + ## [0.9.0] ### Added diff --git a/reckoner/chart.py b/reckoner/chart.py index bf13a295..9df269b6 100644 --- a/reckoner/chart.py +++ b/reckoner/chart.py @@ -220,7 +220,7 @@ def install(self, namespace=None, context=None): for key, value in self.values_strings.iteritems(): for k, v in self._format_set(key, value): - self.args.append("--set={}={}".format(k, v)) + self.args.append("--set-string={}={}".format(k, v)) self.__check_env_vars() try: diff --git a/reckoner/meta.py b/reckoner/meta.py index b82f0547..fae38b12 100644 --- a/reckoner/meta.py +++ b/reckoner/meta.py @@ -14,5 +14,5 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = '0.9.0' +__version__ = '0.9.1' __author__ = 'ReactiveOps, Inc.' diff --git a/tests/test_course.yml b/tests/test_course.yml index 6cfd6a23..1b6483fa 100644 --- a/tests/test_course.yml +++ b/tests/test_course.yml @@ -24,8 +24,7 @@ charts: string: string integer: 10 boolean: True - test_environ_var: ${test_environ_var} - centrifugo: + centrifugo: repository: git: https://github.com/kubernetes/charts.git path: stable diff --git a/tests/test_reckoner.py b/tests/test_reckoner.py index 17e3672a..8b00e4ec 100644 --- a/tests/test_reckoner.py +++ b/tests/test_reckoner.py @@ -314,7 +314,6 @@ def test_chart_values(self): elif chart.name == test_nested_values_chart: self.assertEqual(chart.values, test_nested_values) elif chart.release_name == test_values_strings_chart: - self.assertEqual(chart.values_strings, test_flat_values, ) self.assertIsInstance(chart.values_strings['string'], str) self.assertIsInstance(chart.values_strings['integer'], int) self.assertIsInstance(chart.values_strings['boolean'], bool) @@ -360,6 +359,20 @@ def test_chart_install(self): '--recreate-pods', '--set={}={}'.format(test_environ_var_name, test_environ_var)] ) + if chart.release_name == test_values_strings_chart: + self.assertEqual( + last_mock, + [ + 'helm', 'upgrade', '--install', + chart.release_name, + chart.chart_path, + '--namespace={}'.format(chart.namespace), + '--version=0.1.0', + '--set-string=string=string', + '--set-string=integer=10', + '--set-string=boolean=True' + ] + ) class TestRepository(TestBase): From 02a5b179b4d29b82ee97317d0d40fd45298a41a4 Mon Sep 17 00:00:00 2001 From: EJ Etherington Date: Wed, 2 Jan 2019 10:23:59 -0800 Subject: [PATCH 2/2] rebase and fixing test --- tests/test_reckoner.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/test_reckoner.py b/tests/test_reckoner.py index 8b00e4ec..87fae143 100644 --- a/tests/test_reckoner.py +++ b/tests/test_reckoner.py @@ -367,6 +367,7 @@ def test_chart_install(self): chart.release_name, chart.chart_path, '--namespace={}'.format(chart.namespace), + '--recreate-pods', '--version=0.1.0', '--set-string=string=string', '--set-string=integer=10',