Skip to content
This repository has been archived by the owner on Mar 11, 2022. It is now read-only.

Provide a basic variable hierarchy feature #156

Merged
merged 1 commit into from
Nov 19, 2019
Merged

Conversation

Smiley73
Copy link
Contributor

@Smiley73 Smiley73 commented Nov 14, 2019

Description
This adds a feature to have a variable hierarchy within the same parameterSource repo. Simply providing a hiera.lst file will enable this feature. It's based on the already existing yq merge and simply adds processing of multiple directories.

Additional Changes

  • Updates yq to 2.4.1
  • Move configuration files for e2e test into folder test/e2e/configs
  • Correct ocp e2e test to allow EUNOMIA_REF and EUNOMIA_URI to work
  • Clean up helm test case and use the hello-world example as the base
  • Add cluster-admin role to helm example, to support creation of namespace

Fixes #5

Type of change

  • New feature (non-breaking change which adds functionality)
  • This change requires a documentation update

@Smiley73 Smiley73 force-pushed the basic_hiera branch 6 times, most recently from 9130ba7 to 825da6b Compare November 14, 2019 22:00
@akavel
Copy link

akavel commented Nov 15, 2019

@vinny-sabatini what are your thoughts on this, esp. with regards to #147? Do I understand correctly that this could replace part of #147 as a somewhat more general approach?

Copy link

@akavel akavel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The idea seems very cool! The implementation approach seems fine to me too; just numerous minor suggestions... :]

examples/hello-world-hiera/hierademo/hiera.lst Outdated Show resolved Hide resolved
template-processors/base/bin/processParameters.sh Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
template-processors/base/bin/processParameters.sh Outdated Show resolved Hide resolved
template-processors/base/bin/processParameters.sh Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
README.md Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
template-processors/base/bin/processParameters.sh Outdated Show resolved Hide resolved
Copy link
Contributor Author

@Smiley73 Smiley73 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vinny-sabatini what are your thoughts on this, esp. with regards to #147? Do I understand correctly that this could replace part of #147 as a somewhat more general approach?

Yes that's the intention. The openshift-provision is something specific we use at Kohl's, but a lot of user might not want to go down that path.

@Smiley73 Smiley73 force-pushed the basic_hiera branch 9 times, most recently from d387b2a to 442af14 Compare November 15, 2019 23:28
examples/hello-world-hierarchy/cr/hello-world-cr.yaml Outdated Show resolved Hide resolved
template-processors/base/bin/processParameters.sh Outdated Show resolved Hide resolved
template-processors/base/bin/processParameters.sh Outdated Show resolved Hide resolved
template-processors/base/bin/processParameters.sh Outdated Show resolved Hide resolved
template-processors/base/bin/processParameters.sh Outdated Show resolved Hide resolved
template-processors/base/bin/processParameters.sh Outdated Show resolved Hide resolved
template-processors/base/bin/processParameters.sh Outdated Show resolved Hide resolved
template-processors/jinja/bin/processTemplates.sh Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
@Smiley73 Smiley73 force-pushed the basic_hiera branch 11 times, most recently from d6d1142 to 23f74ad Compare November 18, 2019 17:56
@Smiley73 Smiley73 force-pushed the basic_hiera branch 13 times, most recently from 7c1b36e to f38d4c4 Compare November 18, 2019 23:25
akavel pushed a commit to akavel/eunomia that referenced this pull request Nov 19, 2019
@seanmalloy seanmalloy added this to the v0.0.4 milestone Nov 19, 2019
This adds a feature to have a variable hierarchy within the same parameterSource
repo. Simply providing a hierarchy.lst file will enable this feature. It's based
on the already existing yq merge and simply adds processing of multiple directories.

Additional Changes

* Updates yq to 2.4.1
* Move configuration files for e2e test into folder test/e2e/configs
* Correct ocp e2e test to allow EUNOMIA_REF and EUNOMIA_URI to work
* Clean up helm test case and use the hello-world example as the base
* Add cluster-admin role to helm example, to support creation of namespace
@seanmalloy
Copy link
Contributor

Looks good. I cleaned up the commit history a bit.

@seanmalloy seanmalloy merged commit f7eb899 into master Nov 19, 2019
@seanmalloy seanmalloy deleted the basic_hiera branch November 19, 2019 22:49
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Development

Successfully merging this pull request may close these issues.

Add Variable Hierarchy to GitOpsConfig CR
3 participants