Opts package #1217

aerosouund · 2024-07-11T18:42:57Z

What this PR does / why we need it:

Replace all bash script calls in the run command with the golang native opts package

Part of: #1110

Special Notes
This branch is based off library-based-ssh. PR: #1209
it introduces the same commits but after library based ssh gets merged it will only introduce commits of the opts package

Checklist

Design: A design document was considered and is present (link) or not required
PR: The PR description is expressive enough and will help future contributors
Code: Write code that humans can understand and Keep it simple
Refactor: You have left the code cleaner than you found it (Boy Scout Rule)
Upgrade: Impact of this change on upgrade flows was considered and addressed if required
Testing: New code requires new unit tests. New features and bug fixes require at least on e2e test
Documentation: A user-guide update was considered and is present (link) or not required. You want a user-guide update if it's a user facing feature / API change.
Community: Announcement to kubevirt-dev was considered

Release note:

Move bash scripts to the gocli

kubevirt-bot · 2024-07-11T18:43:07Z

Hi @aerosouund. Thanks for your PR.

PRs from untrusted users cannot be marked as trusted with /ok-to-test in this repo meaning untrusted PR authors can never trigger tests themselves. Collaborators can still trigger tests on the PR using /test all.

I understand the commands that are listed here.

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-sigs/prow repository.

aerosouund · 2024-07-11T18:51:33Z

cc: @dhiller @brianmcarey @xpivarc @acardace

dhiller · 2024-07-24T13:37:09Z

/uncc @rmohr
/cc @brianmcarey

brianmcarey · 2024-07-25T11:39:17Z

/test ?

kubevirt-bot · 2024-07-25T11:39:31Z

@brianmcarey: The following commands are available to trigger required jobs:

/test check-provision-alpine-with-test-tooling
/test check-provision-centos-base
/test check-provision-k8s-1.28
/test check-provision-k8s-1.29
/test check-provision-k8s-1.30
/test check-provision-k8s-1.31
/test check-provision-manager
/test check-up-kind-ovn
/test check-up-kind-sriov

The following commands are available to trigger optional jobs:

/test check-gocli
/test check-up-kind-1.27-vgpu
/test check-up-kind-1.30-vgpu

Use /test all to run the following jobs that were automatically triggered:

check-provision-alpine-with-test-tooling
check-provision-k8s-1.28
check-provision-k8s-1.29
check-provision-k8s-1.30
check-provision-k8s-1.31
check-provision-manager
check-up-kind-1.27-vgpu
check-up-kind-1.30-vgpu
check-up-kind-sriov

In response to this:

/test ?

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-sigs/prow repository.

brianmcarey · 2024-07-25T11:40:11Z

/test check-gocli
/test check-provision-centos-base
/test check-provision-k8s-1.30

dhiller

Hey @aerosouund, this is only part of the review I promised - I'll take another look tomorrow. However, hope you find the feedback helpful already.

cluster-provision/gocli/pkg/k8s/k8s.go

cluster-provision/gocli/pkg/libssh/ssh.go

cluster-provision/gocli/opts/aaq/aaq.go

dhiller

2nd review - I mostly found nits, as before. 👍

cluster-provision/gocli/opts/bind-vfio/bind-vfio_test.go

cluster-provision/gocli/opts/cdi/cdi.go

cluster-provision/gocli/opts/cdi/cdi_test.go

cluster-provision/gocli/opts/cnao/cnao.go

cluster-provision/gocli/opts/cnao/cnao_test.go

cluster-provision/gocli/opts/ksm/ksm_test.go

cluster-provision/gocli/opts/multus/multus.go

cluster-provision/gocli/opts/multus/multus_test.go

dhiller · 2024-07-26T10:44:54Z

cluster-provision/gocli/opts/node01/node01.go

+		return err
+	}
+	cmds := []string{
+		`[ -f /home/vagrant/single_stack ] && export kubeadm_conf="/etc/kubernetes/kubeadm_ipv6.conf" && export cni_manifest="/provision/cni_ipv6.yaml" || { export kubeadm_conf="/etc/kubernetes/kubeadm.conf"; export cni_manifest="/provision/cni.yaml"; }`,


maybe best to have kept the shell script via embed and used it as a template, and then send it to execute via ssh as a whole for now?

Thats fine, but i am trying as much as i can to not create any new bash scripts as this is what we wanted to depart from originally. it might be reasonable if its a long command like that

what do you think ?

cluster-provision/gocli/opts/prometheus/prometheus.go

aerosouund · 2024-07-27T09:27:25Z

@dhiller
all points addressed :)
please take a look again and let me know

p.s: i swapped the implementation of copy remote file to an implementation based on github.com/bramvdbogaerde/go-scp. The whole reason we needed to do what we did originally is because you couldn't scp as root the files that require that level of permission. but since the introduction of the root key opt this is no longer the case

xpivarc

Leaving partial review

cluster-provision/gocli/utils/main.go

cluster-provision/gocli/pkg/k8s/k8s.go

cluster-provision/gocli/pkg/libssh/ssh.go

[88a4f6b fix: Wait until istio cni files appear before copying them](kubevirt/kubevirtci#1262) [4cc1018 Run ./hack/bump-cdi.sh](kubevirt/kubevirtci#1249) [6149a01 Include manifests that are part of gocli when checking for prepull images](kubevirt/kubevirtci#1265) [1b17b20 fix: Remove extra slash in file path and remove unneeded sed](kubevirt/kubevirtci#1258) [b35649a Automatic bump of CentOS Stream to latest](kubevirt/kubevirtci#1257) [374b5e9 bug: Move namespace and CRD files to names with higher alphabetical order to be created first](kubevirt/kubevirtci#1255) [79bfd07 Run bazel run //robots/cmd/kubevirtci-bumper:kubevirtci-bumper -- -ensure-only-latest-three --k8s-provider-dir /home/prow/go/src/github.com/kubevirt/project-infra/../kubevirtci/cluster-provision/k8s --cluster-up-dir /home/prow/go/src/github.com/kubevirt/project-infra/../kubevirtci/cluster-up/cluster](kubevirt/kubevirtci#1256) [ba145b2 bug: Fix KSM flag passing to the gocli](kubevirt/kubevirtci#1254) [8501d22 Opts package](kubevirt/kubevirtci#1217) [4f37d07 Automatic bump of CentOS Stream to latest](kubevirt/kubevirtci#1250) ```release-note NONE ``` Signed-off-by: kubevirt-bot <[email protected]>

[4ad94f0 Label rook storage class](kubevirt/kubevirtci#1267) [88a4f6b fix: Wait until istio cni files appear before copying them](kubevirt/kubevirtci#1262) [4cc1018 Run ./hack/bump-cdi.sh](kubevirt/kubevirtci#1249) [6149a01 Include manifests that are part of gocli when checking for prepull images](kubevirt/kubevirtci#1265) [1b17b20 fix: Remove extra slash in file path and remove unneeded sed](kubevirt/kubevirtci#1258) [b35649a Automatic bump of CentOS Stream to latest](kubevirt/kubevirtci#1257) [374b5e9 bug: Move namespace and CRD files to names with higher alphabetical order to be created first](kubevirt/kubevirtci#1255) [79bfd07 Run bazel run //robots/cmd/kubevirtci-bumper:kubevirtci-bumper -- -ensure-only-latest-three --k8s-provider-dir /home/prow/go/src/github.com/kubevirt/project-infra/../kubevirtci/cluster-provision/k8s --cluster-up-dir /home/prow/go/src/github.com/kubevirt/project-infra/../kubevirtci/cluster-up/cluster](kubevirt/kubevirtci#1256) [ba145b2 bug: Fix KSM flag passing to the gocli](kubevirt/kubevirtci#1254) [8501d22 Opts package](kubevirt/kubevirtci#1217) [4f37d07 Automatic bump of CentOS Stream to latest](kubevirt/kubevirtci#1250) ```release-note NONE ``` Signed-off-by: kubevirt-bot <[email protected]>

[939e610 fix the busybox netcat not found issue in fedora-test-tooling for s390x.](kubevirt/kubevirtci#1268) [4ad94f0 Label rook storage class](kubevirt/kubevirtci#1267) [88a4f6b fix: Wait until istio cni files appear before copying them](kubevirt/kubevirtci#1262) [4cc1018 Run ./hack/bump-cdi.sh](kubevirt/kubevirtci#1249) [6149a01 Include manifests that are part of gocli when checking for prepull images](kubevirt/kubevirtci#1265) [1b17b20 fix: Remove extra slash in file path and remove unneeded sed](kubevirt/kubevirtci#1258) [b35649a Automatic bump of CentOS Stream to latest](kubevirt/kubevirtci#1257) [374b5e9 bug: Move namespace and CRD files to names with higher alphabetical order to be created first](kubevirt/kubevirtci#1255) [79bfd07 Run bazel run //robots/cmd/kubevirtci-bumper:kubevirtci-bumper -- -ensure-only-latest-three --k8s-provider-dir /home/prow/go/src/github.com/kubevirt/project-infra/../kubevirtci/cluster-provision/k8s --cluster-up-dir /home/prow/go/src/github.com/kubevirt/project-infra/../kubevirtci/cluster-up/cluster](kubevirt/kubevirtci#1256) [ba145b2 bug: Fix KSM flag passing to the gocli](kubevirt/kubevirtci#1254) [8501d22 Opts package](kubevirt/kubevirtci#1217) [4f37d07 Automatic bump of CentOS Stream to latest](kubevirt/kubevirtci#1250) ```release-note NONE ``` Signed-off-by: kubevirt-bot <[email protected]>

[fc9be0a Fix prometheus port](kubevirt/kubevirtci#1272) [eff1926 Allow opting out of frequent etcd flushes to storage](kubevirt/kubevirtci#1266) [939e610 fix the busybox netcat not found issue in fedora-test-tooling for s390x.](kubevirt/kubevirtci#1268) [4ad94f0 Label rook storage class](kubevirt/kubevirtci#1267) [88a4f6b fix: Wait until istio cni files appear before copying them](kubevirt/kubevirtci#1262) [4cc1018 Run ./hack/bump-cdi.sh](kubevirt/kubevirtci#1249) [6149a01 Include manifests that are part of gocli when checking for prepull images](kubevirt/kubevirtci#1265) [1b17b20 fix: Remove extra slash in file path and remove unneeded sed](kubevirt/kubevirtci#1258) [b35649a Automatic bump of CentOS Stream to latest](kubevirt/kubevirtci#1257) [374b5e9 bug: Move namespace and CRD files to names with higher alphabetical order to be created first](kubevirt/kubevirtci#1255) [79bfd07 Run bazel run //robots/cmd/kubevirtci-bumper:kubevirtci-bumper -- -ensure-only-latest-three --k8s-provider-dir /home/prow/go/src/github.com/kubevirt/project-infra/../kubevirtci/cluster-provision/k8s --cluster-up-dir /home/prow/go/src/github.com/kubevirt/project-infra/../kubevirtci/cluster-up/cluster](kubevirt/kubevirtci#1256) [ba145b2 bug: Fix KSM flag passing to the gocli](kubevirt/kubevirtci#1254) [8501d22 Opts package](kubevirt/kubevirtci#1217) [4f37d07 Automatic bump of CentOS Stream to latest](kubevirt/kubevirtci#1250) ```release-note NONE ``` Signed-off-by: kubevirt-bot <[email protected]>

oshoval · 2024-09-25T11:55:03Z

Seems KUBVIRT_WITH_CNAO_SKIP_CONFIG is missing ?
Can you please suggest if it was dropped or replaced (i didnt find replacement by might missed)
We do need it from time to time and might need it soon again

It allows deploying CNAO without CR, and then to provide custom CR manually

aerosouund · 2024-09-25T13:50:16Z

@oshoval
No i think i missed it, i will add a fix for this pretty soon

oshoval · 2024-09-25T14:55:29Z

Thanks
we do use this flag on https://github.com/kubevirt/macvtap-cni
and might need to bump kubevirtci there soon

/cc @EdDev fyi

kubevirt-bot · 2024-09-25T14:55:33Z

@oshoval: GitHub didn't allow me to request PR reviews from the following users: fyi.

Note that only kubevirt members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to this:

Thanks
we do use this flag on https://github.com/kubevirt/macvtap-cni
and might need to bump kubevirtci there soon

/cc @EdDev fyi

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-sigs/prow repository.

oshoval · 2024-09-25T15:02:53Z

Thanks we do use this flag on https://github.com/kubevirt/macvtap-cni and might need to bump kubevirtci there soon

/cc @EdDev fyi

Any chance this can be prioritized please ?
@xpivarc @brianmcarey @dhiller
It might block some major efforts soonish
Thanks

aerosouund · 2024-09-25T16:10:14Z

Yeah no worries
I can sort this out in the next two days

…plied There was previously a wait for the cri-o service to be ready[1] after applying the docker proxy settings but this was not included with the introduction of the opts package[2]. This can lead to kubeadm failing its preflight checks as cri-o is not ready[3] [1] https://github.com/kubevirt/kubevirtci/blob/03aa94e9da974b0e37dc8f180a4f700d47020c08/cluster-provision/k8s/1.31/nodes.sh#L43 [2] kubevirt#1217 [3] https://prow.ci.kubevirt.io/view/gs/kubevirt-prow/pr-logs/pull/kubevirt_kubevirt/13020/pull-kubevirt-e2e-k8s-1.31-sig-network/1843292337933914112#1:build-log.txt%3A343 Signed-off-by: Brian Carey <[email protected]>

…plied (#1303) * gocli: Add wait for cri-o service to be ready after proxy settings applied There was previously a wait for the cri-o service to be ready[1] after applying the docker proxy settings but this was not included with the introduction of the opts package[2]. This can lead to kubeadm failing its preflight checks as cri-o is not ready[3] [1] https://github.com/kubevirt/kubevirtci/blob/03aa94e9da974b0e37dc8f180a4f700d47020c08/cluster-provision/k8s/1.31/nodes.sh#L43 [2] #1217 [3] https://prow.ci.kubevirt.io/view/gs/kubevirt-prow/pr-logs/pull/kubevirt_kubevirt/13020/pull-kubevirt-e2e-k8s-1.31-sig-network/1843292337933914112#1:build-log.txt%3A343 Signed-off-by: Brian Carey <[email protected]> * gocli: Add wait for crio service to node opts Signed-off-by: Brian Carey <[email protected]> --------- Signed-off-by: Brian Carey <[email protected]>

These scripts are no longer required since the logic has been moved into gocli[1] Remove them to avoid causing confusion for people. [1] kubevirt#1217 Signed-off-by: Brian Carey <[email protected]>

These scripts are no longer required since the logic has been moved into gocli[1] Remove them to avoid causing confusion for people. [1] #1217 Signed-off-by: Brian Carey <[email protected]>

aerosouund · 2024-10-30T08:52:14Z

@brianmcarey @dhiller @xpivarc
I have a question regarding the CNI & Kubeadm manifests for different kubernetes VM providers (cni.diff, cni_ipv6.diff, kubeadm.conf, kubeadm_ipv6.conf).
Do we want to retain flexibility for each VM provider to deploy its preferred version of these ? or do we unify them across all providers ?

oshoval · 2024-10-30T09:02:52Z

imo we should retain, because if there will be problems in just one provider and we combine, we will be in problem
it is also against the untangling effort that was done in the past

maybe if you combine but leave an option to inject custom it will be best
reminds a bit this idea #1301

kubevirt-bot added the dco-signoff: yes Indicates the PR's author has DCO signed all their commits. label Jul 11, 2024

kubevirt-bot requested review from dhiller and rmohr July 11, 2024 18:43

kubevirt-bot added the size/XXL label Jul 11, 2024

aerosouund changed the title ~~Opts~~ Opts package Jul 11, 2024

aerosouund force-pushed the opts branch from a1e9a85 to 85ee3f7 Compare July 11, 2024 20:26

kubevirt-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 16, 2024

aerosouund force-pushed the opts branch from 85ee3f7 to 3ff1faa Compare July 17, 2024 10:25

kubevirt-bot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Jul 17, 2024

aerosouund force-pushed the opts branch from 3ff1faa to 6c58d26 Compare July 20, 2024 12:28

kubevirt-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 20, 2024

aerosouund mentioned this pull request Jul 23, 2024

KV provider #1230

Open

8 tasks

kubevirt-bot requested review from brianmcarey and removed request for rmohr July 24, 2024 13:37

dhiller reviewed Jul 25, 2024

View reviewed changes

dhiller reviewed Jul 26, 2024

View reviewed changes

aerosouund force-pushed the opts branch 2 times, most recently from 17df181 to 90af79c Compare July 27, 2024 09:24

aerosouund force-pushed the opts branch 3 times, most recently from 61f531c to d9cbaae Compare July 28, 2024 13:38

xpivarc reviewed Jul 31, 2024

View reviewed changes

kubevirt-bot requested a review from EdDev September 25, 2024 14:55

oshoval mentioned this pull request Sep 25, 2024

bump multus to v4.1.1 kubevirt/cluster-network-addons-operator#1907

Closed

brianmcarey mentioned this pull request Oct 16, 2024

gocli: Add wait for cri-o service to be ready after proxy settings applied #1303

Merged

8 tasks

brianmcarey mentioned this pull request Oct 22, 2024

cleanup: Remove scripts that are no longer needed #1304

Merged

8 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Opts package #1217

Opts package #1217

aerosouund commented Jul 11, 2024 •

edited

Loading

kubevirt-bot commented Jul 11, 2024

aerosouund commented Jul 11, 2024

dhiller commented Jul 24, 2024

brianmcarey commented Jul 25, 2024

kubevirt-bot commented Jul 25, 2024

brianmcarey commented Jul 25, 2024

dhiller left a comment

dhiller left a comment

dhiller Jul 26, 2024

aerosouund Jul 26, 2024

aerosouund commented Jul 27, 2024

xpivarc left a comment

oshoval commented Sep 25, 2024 •

edited

Loading

aerosouund commented Sep 25, 2024

oshoval commented Sep 25, 2024

kubevirt-bot commented Sep 25, 2024

oshoval commented Sep 25, 2024

aerosouund commented Sep 25, 2024

aerosouund commented Oct 30, 2024

oshoval commented Oct 30, 2024

Opts package #1217

Opts package #1217

Conversation

aerosouund commented Jul 11, 2024 • edited Loading

kubevirt-bot commented Jul 11, 2024

aerosouund commented Jul 11, 2024

dhiller commented Jul 24, 2024

brianmcarey commented Jul 25, 2024

kubevirt-bot commented Jul 25, 2024

brianmcarey commented Jul 25, 2024

dhiller left a comment

Choose a reason for hiding this comment

dhiller left a comment

Choose a reason for hiding this comment

dhiller Jul 26, 2024

Choose a reason for hiding this comment

aerosouund Jul 26, 2024

Choose a reason for hiding this comment

aerosouund commented Jul 27, 2024

xpivarc left a comment

Choose a reason for hiding this comment

oshoval commented Sep 25, 2024 • edited Loading

aerosouund commented Sep 25, 2024

oshoval commented Sep 25, 2024

kubevirt-bot commented Sep 25, 2024

oshoval commented Sep 25, 2024

aerosouund commented Sep 25, 2024

aerosouund commented Oct 30, 2024

oshoval commented Oct 30, 2024

aerosouund commented Jul 11, 2024 •

edited

Loading

oshoval commented Sep 25, 2024 •

edited

Loading