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

installer: local command reference KubeVirt images from quay #12534

Conversation

wozniakjan
Copy link
Contributor

@wozniakjan wozniakjan commented Aug 2, 2023

What this PR does / why we need it:
Currently, the kubermatic-installer local kind pulls the VM images from HTTP source. This will switch the preconfigured default to pull from OCI registry https://quay.io/organization/kubermatic-virt-disks

Which issue(s) this PR fixes:

Fixes #12341

What type of PR is this?
/kind cleanup

Special notes for your reviewer:

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

installer: use OCI VM images as preconfigured default for local kubevirt setup

Documentation:

NONE

@kubermatic-bot kubermatic-bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. release-note Denotes a PR that will be considered when it comes time to generate release notes. docs/none Denotes a PR that doesn't need documentation (changes). kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. sig/cluster-management Denotes a PR or issue as being assigned to SIG Cluster Management. labels Aug 2, 2023
@wozniakjan wozniakjan self-assigned this Aug 2, 2023
@kubermatic-bot
Copy link
Contributor

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@kubermatic-bot kubermatic-bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Aug 2, 2023
@wozniakjan
Copy link
Contributor Author

/test all

Signed-off-by: Jan Wozniak <wozniak.jan@gmail.com>
@wozniakjan wozniakjan force-pushed the installer_local_command_quay_kubevirt_images branch from 702f250 to d5218b1 Compare August 21, 2023 15:58
@kubermatic-bot kubermatic-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Aug 21, 2023
"github.com/google/uuid"
"github.com/jackpal/gateway"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"gopkg.in/yaml.v3"
"gopkg.in/yaml.v2"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

the local command at the moment depends on yaml.v2 API, bumping to v3 causes

value cannot be set because dex is not a map[any]any: map[string]interface {} ...

cmd/kubermatic-installer/cmd_local.go Outdated Show resolved Hide resolved
@wozniakjan wozniakjan marked this pull request as ready for review August 21, 2023 16:03
@kubermatic-bot kubermatic-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 21, 2023
@wozniakjan wozniakjan requested a review from xrstf August 21, 2023 16:04
go.mod Outdated Show resolved Hide resolved
@wozniakjan wozniakjan force-pushed the installer_local_command_quay_kubevirt_images branch from d5218b1 to 1be93c0 Compare August 21, 2023 16:17
@kubermatic-bot kubermatic-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Aug 21, 2023
@wozniakjan wozniakjan changed the title installer: local command reference KubeVirt images from quay [WIP] installer: local command reference KubeVirt images from quay Aug 21, 2023
@kubermatic-bot kubermatic-bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 21, 2023
@wozniakjan wozniakjan force-pushed the installer_local_command_quay_kubevirt_images branch from 1be93c0 to f0cddc0 Compare August 21, 2023 16:23
@wozniakjan wozniakjan changed the title [WIP] installer: local command reference KubeVirt images from quay installer: local command reference KubeVirt images from quay Aug 21, 2023
@kubermatic-bot kubermatic-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 21, 2023
@wozniakjan
Copy link
Contributor Author

/test pre-kubermatic-trivy-scan

@wozniakjan wozniakjan requested a review from xrstf August 22, 2023 07:04
@wozniakjan
Copy link
Contributor Author

thanks @xrstf, really good points!
I believe I managed to address all, does this lgty? :)

@xrstf
Copy link
Contributor

xrstf commented Aug 22, 2023

/approve
/lgtm

@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Aug 22, 2023
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: e008e9b24762caa2bb21eb668d4ddda82d578331

@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: wozniakjan, 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 added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 22, 2023
@kubermatic-bot kubermatic-bot merged commit 11fba43 into kubermatic:main Aug 22, 2023
17 checks passed
@kubermatic-bot kubermatic-bot added this to the KKP 2.24 milestone Aug 22, 2023
@wozniakjan
Copy link
Contributor Author

/cherry-pick release/v2.23

@kubermatic-bot
Copy link
Contributor

@wozniakjan: #12534 failed to apply on top of branch "release/v2.23":

Applying: installer: local command reference KubeVirt images from quay
Applying: installer: downgrade local command yaml.v2 and supress false logger warning
Using index info to reconstruct a base tree...
M	cmd/kubermatic-installer/cmd_local.go
M	go.mod
Falling back to patching base and 3-way merge...
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging cmd/kubermatic-installer/cmd_local.go
CONFLICT (content): Merge conflict in cmd/kubermatic-installer/cmd_local.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 installer: downgrade local command yaml.v2 and supress false logger warning
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.23

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.

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/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. kubermatic-installer 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/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Cache KubeVirt VM images for installer local command
3 participants