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.

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

fix --config not being validated in mirror-images command #11146

Merged
merged 1 commit into from Oct 6, 2022

Conversation

xrstf
Copy link
Contributor

@xrstf xrstf commented Oct 5, 2022

What this PR does / why we need it:
Since 2.21, the --config is optional for doing KKP upgrades, but it being nil can cause issues and I overlooked that the mirror-images command actually always needs a config. So this PR adds the missing validation for the CLI flag.

What type of PR is this?
/kind bug

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

Fix `--config` flag not being validated in `mirror-images` command in the KKP installer

Documentation:

NONE

@kubermatic-bot kubermatic-bot added 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. docs/none Denotes a PR that doesn't need documentation (changes). sig/cluster-management Denotes a PR or issue as being assigned to SIG Cluster Management. approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Oct 5, 2022
@embik
Copy link
Member

embik commented Oct 6, 2022

/retest

@embik embik self-requested a review October 6, 2022 06:47
Copy link
Member

@ahmedwaleedmalik ahmedwaleedmalik left a comment

Choose a reason for hiding this comment

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

/approve

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

LGTM label has been added.

Git tree hash: 09c81d166c7c94733d876ae8b8af224bf6f58d23

@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ahmedwaleedmalik, 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

@kubermatic-bot kubermatic-bot merged commit d72f900 into kubermatic:master Oct 6, 2022
@xrstf xrstf deleted the fix-mirror-images-config branch October 6, 2022 08:59
@embik
Copy link
Member

embik commented Oct 6, 2022

/cherry-pick release/v2.21

@kubermatic-bot
Copy link
Contributor

@embik: #11146 failed to apply on top of branch "release/v2.21":

Applying: fix --config not being validated in mirror-images command
Using index info to reconstruct a base tree...
M	cmd/kubermatic-installer/cmd_mirror_images.go
Falling back to patching base and 3-way merge...
Auto-merging cmd/kubermatic-installer/cmd_mirror_images.go
CONFLICT (content): Merge conflict in cmd/kubermatic-installer/cmd_mirror_images.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 fix --config not being validated in mirror-images command
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release/v2.21

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

embik pushed a commit to embik/kubermatic that referenced this pull request Oct 6, 2022
kubermatic-bot pushed a commit that referenced this pull request Oct 6, 2022
…11149)

Co-authored-by: Christoph Mewes <christoph@kubermatic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants