Skip to content

fix: use reasonable defaults for the per node configuration in the values.yaml file#229

Merged
nathanklick merged 34 commits intomainfrom
206-use-reasonable-defaults
Aug 3, 2023
Merged

fix: use reasonable defaults for the per node configuration in the values.yaml file#229
nathanklick merged 34 commits intomainfrom
206-use-reasonable-defaults

Conversation

@leninmehedy
Copy link
Copy Markdown
Member

@leninmehedy leninmehedy commented Aug 2, 2023 •
edited by jeromy-cannon
Loading

Description

This pull request changes the following:

  • Use reasonable defaults for the per node configuration in the values.yaml file
  • Add "defaults" section in values.yaml to allow overriding global defaults for all nodes
  • Relocate and rename _helpers.tpl file
  • Add _ to sidecar template files
  • Merge nodes.yaml into values.yaml and allow a chart user to specify a node name only
  • Remove redundant configmap for backup-uploader
  • Add "required" check in templates for better error handling
  • Improve reusability using more templating
  • Add 3 nodes instead of 1 in the values.yaml file (so that network looks reasonable)

Limitations of current approach

  • If someone would like to override a sidecar config property (e.g. image tag) for a node, they need to add full config for that sidecar in hedera.nodes section for that node in the values.yaml file.

Related Issues

@leninmehedy
fix: standardize helper file location and name
cf9ab8b 
Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com>
@leninmehedy
fix: use defaults for node configuration and use templating to reduce…
594aec2 
… repeatation

Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com>
@leninmehedy leninmehedy linked an issue Aug 2, 2023 that may be closed by this pull request
Charts[Network Node]: Use reasonable defaults for the per node configuration in the values.yaml file #206
Closed
@leninmehedy leninmehedy requested a review from nathanklick August 2, 2023 06:05
@leninmehedy
ci: remove reference to nodes.yaml file in pipeline
8136176 
Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com>
nathanklick
nathanklick reviewed Aug 2, 2023
View reviewed changes
Comment thread charts/hedera-network/templates/sidecars/_backup-uploader.tpl Outdated
@github-actions
Copy link
Copy Markdown

github-actions Bot commented Aug 2, 2023 •
edited
Loading

Unit Test Results

13 files  ±0  13 suites  ±0   31s ⏱️ ±0s
57 tests ±0  54 ✔️ ±0  3 💤 ±0  0 ❌ ±0 
58 runs  ±0  55 ✔️ ±0  3 💤 ±0  0 ❌ ±0 

Results for commit 14ad608. ± Comparison against base commit de9aceb.

♻️ This comment has been updated with latest results.

leninmehedy and others added 2 commits August 2, 2023 15:46
@leninmehedy @nathanklick
Update charts/hedera-network/templates/sidecars/_backup-uploader.tpl
ee09030 
Co-authored-by: Nathan Klick <nathan@swirldslabs.com>
Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com>
@leninmehedy
style: add missing new line
b2f5a64 
Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com>
@codecov
Copy link
Copy Markdown

codecov Bot commented Aug 2, 2023 •
edited
Loading

Codecov Report

Merging #229 (14ad608) into main (de9aceb) will not change coverage.
The diff coverage is n/a.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff            @@
##               main     #229   +/-   ##
=========================================
  Coverage     54.68%   54.68%           
  Complexity      219      219           
=========================================
  Files            47       47           
  Lines          1046     1046           
  Branches        129      129           
=========================================
  Hits            572      572           
  Misses          424      424           
  Partials         50       50

Impacted file tree graph

@leninmehedy leninmehedy requested a review from nathanklick August 2, 2023 06:29
@leninmehedy
fix: allow sidecar configs to overridden individually
be695fa 
Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com>
jeromy-cannon
jeromy-cannon reviewed Aug 2, 2023
View reviewed changes
Comment thread charts/hedera-network/values.yaml Outdated
jeromy-cannon
jeromy-cannon reviewed Aug 2, 2023
View reviewed changes
Comment thread charts/hedera-network/values.yaml Outdated
nathanklick
nathanklick reviewed Aug 2, 2023
View reviewed changes
Comment thread charts/hedera-network/values.yaml Outdated
@nathanklick
Merge branch 'main' into 206-use-reasonable-defaults
d00089e 
Signed-off-by: Nathan Klick <nathan@swirldslabs.com>

# Conflicts:
#	charts/hedera-network/nodes.yaml
#	dev/Makefile
@nathanklick
chore: cleanup commented values
a4a2bef 
Signed-off-by: Nathan Klick <nathan@swirldslabs.com>
@nathanklick
fix: resolve issues with the default chart values not aligning to the…
814f6a5 
… default test executor in use

Signed-off-by: Nathan Klick <nathan@swirldslabs.com>
nathanklick and others added 10 commits August 2, 2023 14:09
@nathanklick
fix: ensure correct use of the appVersion as the default root image v…
52f8b6c 
…ersion and set appVersion correctly

Signed-off-by: Nathan Klick <nathan@swirldslabs.com>
@leninmehedy
fix: silent bash debug mode
c8f141f 
Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com>
@leninmehedy
fix: return error if docker containers are not running after node start
440dded 
Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com>
@leninmehedy
fix: remove the need for bc to compute script execution time
85915e3 
Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com>
@leninmehedy
fix: improve logging about script execution time
4fde9ee 
Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com>
@leninmehedy
fix: debug logging
47c3048 
Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com>
@leninmehedy
fix: wait for containers to be up in a loop rather than a fixed 15s
9c36e38 
Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com>
@leninmehedy
fix: add more debug log in helper script
ed7ebed 
Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com>
@leninmehedy
fix: fix loop counter
6e41f90 
Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com>
@leninmehedy
fix: add error check
09f0ee0 
Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com>
@leninmehedy leninmehedy marked this pull request as draft August 3, 2023 06:17
@leninmehedy leninmehedy marked this pull request as ready for review August 3, 2023 12:11
@leninmehedy leninmehedy marked this pull request as draft August 3, 2023 12:12
@leninmehedy
ci: disable direct-access for debugging
6e2f343 
Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com>
@leninmehedy
ci: attempt to debug
4714136 
Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com>
@leninmehedy
ci: split helm chart test into two independent steps for easier debug…
a904e8d 
…ging and maintenance

Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com>
@leninmehedy
ci: fix yaml
1e5dbc3 
Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com>
@leninmehedy
ci: add more logging in helm chart test
2a861dc 
Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com>
@leninmehedy
ci: fix chart test function sequence
87a51e8 
Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com>
@leninmehedy
ci: attempt to fix nmt-install test
ac7194a 
Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com>
@leninmehedy
fix: correct debug msg
e646ac6 
Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com>
leninmehedy and others added 2 commits August 4, 2023 00:39
@leninmehedy
ci: add more debug logs
4645fd4 
Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com>
@jeromy-cannon
Merge branch 'main' into 206-use-reasonable-defaults
4851e3e
@jeromy-cannon jeromy-cannon marked this pull request as ready for review August 3, 2023 18:11
@jeromy-cannon jeromy-cannon marked this pull request as draft August 3, 2023 18:11
@nathanklick nathanklick mentioned this pull request Aug 3, 2023
Merged
@nathanklick
Merge branch 'main' into 206-use-reasonable-defaults
d0cc167 
Signed-off-by: Nathan Klick <nathan@swirldslabs.com>

# Conflicts:
#	charts/hedera-network/Chart.yaml
@nathanklick
chore: tweak CI pipeline changes
762f4bc 
Signed-off-by: Nathan Klick <nathan@swirldslabs.com>
@nathanklick
chore: add additional safety checks
c1c8e33 
Signed-off-by: Nathan Klick <nathan@swirldslabs.com>
@nathanklick
chore: reduce memory limits on nmt preflight
14ad608 
Signed-off-by: Nathan Klick <nathan@swirldslabs.com>
@sonarqubecloud
Copy link
Copy Markdown

sonarqubecloud Bot commented Aug 3, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@leninmehedy leninmehedy marked this pull request as ready for review August 3, 2023 23:44
@nathanklick nathanklick merged commit 92032f9 into main Aug 3, 2023
@nathanklick nathanklick deleted the 206-use-reasonable-defaults branch August 3, 2023 23:49
swirlds-automation added a commit that referenced this pull request Aug 4, 2023
@swirlds-automation
chore(release): 0.5.0 [skip ci]
c54e376 
## [0.5.0](v0.4.0...v0.5.0) (2023-08-04)

### Features

* add CI pipeline tests for network node helm installation ([#228](#228)) ([3e665f3](3e665f3))
* add service locator API initial draft ([#230](#230)) ([1e81f65](1e81f65))
* for the hedera-network Helm chart set the minimum Kubernetes server version ([#231](#231)) ([de9aceb](de9aceb))

### Bug Fixes

*  use reasonable defaults for the per node configuration in the values.yaml file ([#229](#229)) ([92032f9](92032f9))
* resolves the issues caused by the environment variable not being passed to the service scripts ([#235](#235)) ([022b03d](022b03d))
@swirlds-automation
Copy link
Copy Markdown
Contributor

swirlds-automation commented Aug 4, 2023

🎉 This PR is included in version 0.5.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@swirlds-automation
Copy link
Copy Markdown
Contributor

swirlds-automation commented Aug 8, 2023

🎉 This PR is included in version 0.5.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment