Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Generate CE/EE example YAMLs separately #11129

Merged
merged 2 commits into from Oct 5, 2022
Merged

Generate CE/EE example YAMLs separately #11129

merged 2 commits into from Oct 5, 2022

Conversation

xrstf
Copy link
Contributor

@xrstf xrstf commented Oct 4, 2022

What this PR does / why we need it:
There were 2 choices for solving this:

  1. Generate the example YAML per KKP edition (either permanently and commit them, or on-demand during CI).
  2. Add genyaml code to the installer to generate the example YAML on-demand.

I disregarded option 2 because it would add a seemingly unnecessary dependency.

For option 1 I chose to commit the generated files as @xmudrii mentioned that generating them on-the-fly will make the git working copy unclean and could lead to issues with the embedded Git version information.

So this PR extends the script to generate the YAML and adjusts the Go code to embed it based on the given KKP edition.

Which issue(s) this PR fixes:

Fixes #11062

What type of PR is this?
/kind bug

Does this PR introduce a user-facing change? Then add your Release Note here:

Fix `kubermatic-installer print` always printing the CE version of the example YAMLs

Documentation:

NONE

@kubermatic-bot kubermatic-bot added docs/none Denotes a PR that doesn't need documentation (changes). release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/bug Categorizes issue or PR as related to a bug. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. sig/cluster-management Denotes a PR or issue as being assigned to SIG Cluster Management. labels Oct 4, 2022
@xrstf xrstf requested a review from xmudrii October 4, 2022 19:56
xmudrii
xmudrii approved these changes Oct 5, 2022
View reviewed changes
Copy link
Member

@xmudrii xmudrii left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Oct 5, 2022
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: aff98a9701f7b5f86290b9853b231219607e8305

@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: xmudrii, xrstf

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@xmudrii
Copy link
Member

xmudrii commented Oct 5, 2022

/retest

@kubermatic-triage-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs

Review the full test history

Silence the bot with an /lgtm cancel or /hold comment for consistent failures.

1 similar comment
@kubermatic-triage-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs

Review the full test history

Silence the bot with an /lgtm cancel or /hold comment for consistent failures.

@kubermatic-bot kubermatic-bot merged commit 7fcd0c8 into kubermatic:master Oct 5, 2022
@xrstf xrstf deleted the example-yaml-per-edition branch October 6, 2022 22:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xmudrii xmudrii xmudrii approved these changes

Assignees

@xmudrii xmudrii

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. docs/none Denotes a PR that doesn't need documentation (changes). kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/cluster-management Denotes a PR or issue as being assigned to SIG Cluster Management. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

kubermatic-installer print command prints wrong images for the EE edition
4 participants
@xrstf @kubermatic-bot @xmudrii @kubermatic-triage-bot