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

Re-enable k8s dashboard and add konnectivity images to mirror-images #11148

Merged
merged 3 commits into from Oct 6, 2022
Merged

Re-enable k8s dashboard and add konnectivity images to mirror-images #11148

merged 3 commits into from Oct 6, 2022

Conversation

embik
Copy link
Member

@embik embik commented Oct 6, 2022 •
edited

What this PR does / why we need it:
This adds konnectivity images to the images mirrored by kubermatic-installer mirror-images, if konnectivity as a feature is enabled on the passed KubermaticConfiguration.

In addition, it fixes a regression introduced by #10169 (98562df) that flipped the Kubernetes dashboard from enabled to disabled.

Which issue(s) this PR fixes:

Fixes #

What type of PR is this?
/kind bug
/kind regression

Special notes for your reviewer:

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

`kubermatic-installer mirror-images` correctly picks up konnectivity and Kubernetes dashboard images

Documentation:

NONE

@embik
Re-enable k8s dashboard and add konnectivity images to `mirror-images…
b327998 
…` installer subcommand

Signed-off-by: Marvin Beckers <marvin@kubermatic.com>
@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. docs/none Denotes a PR that doesn't need documentation (changes). dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. kind/regression Categorizes issue or PR as related to a regression from a prior release. sig/cluster-management Denotes a PR or issue as being assigned to SIG Cluster Management. labels Oct 6, 2022
@embik
Copy link
Member Author

embik commented Oct 6, 2022

/cherry-pick release/v2.21

@kubermatic-bot
Copy link
Contributor

@embik: once the present PR merges, I will cherry-pick it on top of release/v2.21 in a new PR and assign it to you.

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.

@kubermatic-bot kubermatic-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Oct 6, 2022
@embik embik requested a review from xrstf October 6, 2022 07:29
@embik
Update test for new function signature
1550d80 
Signed-off-by: Marvin Beckers <marvin@kubermatic.com>
@embik
Remove trailing whitespace
8843eb1 
Signed-off-by: Marvin Beckers <marvin@kubermatic.com>
xrstf
xrstf approved these changes Oct 6, 2022
View reviewed changes
Copy link
Contributor

@xrstf xrstf 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: 87b2c5e3ce2c08fb123feb6794c3c7dff88e9c0a

@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

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

@embik
Copy link
Member Author

embik commented Oct 6, 2022

/retest

@kubermatic-bot kubermatic-bot merged commit ed968bd into kubermatic:master Oct 6, 2022
@kubermatic-bot
Copy link
Contributor

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

Applying: Re-enable k8s dashboard and add konnectivity images to `mirror-images` installer subcommand
Using index info to reconstruct a base tree...
M	cmd/kubermatic-installer/cmd_mirror_images.go
M	pkg/install/images/images.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/install/images/images.go
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 Re-enable k8s dashboard and add konnectivity images to `mirror-images` installer subcommand
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 embik deleted the add-dashboard-konnectivity-images branch October 6, 2022 10:00
embik added a commit to embik/kubermatic that referenced this pull request Oct 6, 2022
@embik
Re-enable k8s dashboard and add konnectivity images to mirror-images (
6181104 
kubermatic#11148)

* Re-enable k8s dashboard and add konnectivity images to `mirror-images` installer subcommand

Signed-off-by: Marvin Beckers <marvin@kubermatic.com>

* Update test for new function signature

Signed-off-by: Marvin Beckers <marvin@kubermatic.com>

* Remove trailing whitespace

Signed-off-by: Marvin Beckers <marvin@kubermatic.com>

Signed-off-by: Marvin Beckers <marvin@kubermatic.com>
@embik embik mentioned this pull request Oct 6, 2022
Merged
kubermatic-bot pushed a commit that referenced this pull request Oct 8, 2022
@embik
Re-enable k8s dashboard and add konnectivity images to mirror-images (
1025c76 
#11148) (#11150)

* Re-enable k8s dashboard and add konnectivity images to `mirror-images` installer subcommand

Signed-off-by: Marvin Beckers <marvin@kubermatic.com>

* Update test for new function signature

Signed-off-by: Marvin Beckers <marvin@kubermatic.com>

* Remove trailing whitespace

Signed-off-by: Marvin Beckers <marvin@kubermatic.com>

Signed-off-by: Marvin Beckers <marvin@kubermatic.com>

Signed-off-by: Marvin Beckers <marvin@kubermatic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xrstf xrstf xrstf approved these changes

Assignees

@xrstf xrstf

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. kind/regression Categorizes issue or PR as related to a regression from a prior release. 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/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@embik @kubermatic-bot @xrstf