From 30e1af4efa4ab52f12320a11cb4d839440c1557bcd71cc456522763862db0c22 Mon Sep 17 00:00:00 2001 From: James Fehlig Date: Tue, 15 Jun 2021 13:54:05 +0000 Subject: [PATCH] Accepting request 900015 from home:vulyanov:branches:Virtualization - Use registry.suse.com as the default fallback for sle - Rename macro registry_path to kubevirt_registry_path - Switch to golang 1.16 - Drop 0001-Don-t-build-virtctl-for-darwin-and-windows.patch - Drop --skipj2 arg for build-manifests.sh - Update to version 0.42.1 Release notes https://github.com/kubevirt/kubevirt/releases/tag/v0.42.1 OBS-URL: https://build.opensuse.org/request/show/900015 OBS-URL: https://build.opensuse.org/package/show/Virtualization/kubevirt?expand=0&rev=59 --- ...build-virtctl-for-darwin-and-windows.patch | 44 ------------------- _service | 2 +- kubevirt-0.41.0.tar.gz | 3 -- kubevirt-0.42.1.tar.gz | 3 ++ kubevirt.changes | 11 +++++ kubevirt.spec | 43 ++++++++---------- 6 files changed, 34 insertions(+), 72 deletions(-) delete mode 100644 0001-Don-t-build-virtctl-for-darwin-and-windows.patch delete mode 100644 kubevirt-0.41.0.tar.gz create mode 100644 kubevirt-0.42.1.tar.gz diff --git a/0001-Don-t-build-virtctl-for-darwin-and-windows.patch b/0001-Don-t-build-virtctl-for-darwin-and-windows.patch deleted file mode 100644 index 9b7e335..0000000 --- a/0001-Don-t-build-virtctl-for-darwin-and-windows.patch +++ /dev/null @@ -1,44 +0,0 @@ -From f8882298f6a38a61add3af08136e86830cc97796 Mon Sep 17 00:00:00 2001 -From: Vasiliy Ulyanov -Date: Thu, 20 May 2021 10:42:24 +0200 -Subject: [PATCH 1/2] Don't build virtctl for darwin and windows - -Noticed the following build failure when specifying '-buildmode=pie' -in GOFLAGS - -/usr/lib64/go/1.13/pkg/tool/linux_amd64/link: running gcc failed: exit status 1 -/usr/lib64/gcc/x86_64-suse-linux/10/../../../../x86_64-suse-linux/bin/ld: cannot -find 1144: No such file or directory - -The failure was encountered when building virtctl for darwin and windows. -Remove the builds for these OSes. - -Signed-off-by: Vasiliy Ulyanov -Signed-off-by: Jim Fehlig ---- - hack/build-go.sh | 9 --------- - 1 file changed, 9 deletions(-) - -diff --git a/hack/build-go.sh b/hack/build-go.sh -index 9e0f3fe22..d46310f36 100755 ---- a/hack/build-go.sh -+++ b/hack/build-go.sh -@@ -125,15 +125,6 @@ for arg in $args; do - - kubevirt::version::get_version_vars - echo "$KUBEVIRT_GIT_VERSION" >${CMD_OUT_DIR}/${BIN_NAME}/.version -- -- # build virtctl also for darwin and windows on amd64 -- if [ "${BIN_NAME}" = "virtctl" -a "${ARCH}" = "amd64" ]; then -- GOOS=darwin GOARCH=amd64 go_build -i -o ${CMD_OUT_DIR}/${BIN_NAME}/${ARCH_BASENAME}-darwin-amd64 -ldflags "$(kubevirt::version::ldflags)" $(pkg_dir darwin amd64) -- GOOS=windows GOARCH=amd64 go_build -i -o ${CMD_OUT_DIR}/${BIN_NAME}/${ARCH_BASENAME}-windows-amd64.exe -ldflags "$(kubevirt::version::ldflags)" $(pkg_dir windows amd64) -- # Create symlinks to the latest binary of each architecture -- (cd ${CMD_OUT_DIR}/${BIN_NAME} && ln -sf ${ARCH_BASENAME}-darwin-amd64 ${BIN_NAME}-darwin) -- (cd ${CMD_OUT_DIR}/${BIN_NAME} && ln -sf ${ARCH_BASENAME}-windows-amd64.exe ${BIN_NAME}-windows.exe) -- fi - ) - else - ( --- -2.31.1 - diff --git a/_service b/_service index d711e9d..24e42e7 100644 --- a/_service +++ b/_service @@ -1,7 +1,7 @@ kubevirt - v0.41.0 + v0.42.1 git disable https://github.com/kubevirt/kubevirt diff --git a/kubevirt-0.41.0.tar.gz b/kubevirt-0.41.0.tar.gz deleted file mode 100644 index 1d3bf35..0000000 --- a/kubevirt-0.41.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:310312295755f9952486eda027e73a4b53ed7dce0e117df02e6c68288c406b6a -size 12858383 diff --git a/kubevirt-0.42.1.tar.gz b/kubevirt-0.42.1.tar.gz new file mode 100644 index 0000000..ace8b1f --- /dev/null +++ b/kubevirt-0.42.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8f56612fc6500832b9f56c17919ccad8500da12f84305cdddae357823b42cd7e +size 13071004 diff --git a/kubevirt.changes b/kubevirt.changes index f76def7..79188ee 100644 --- a/kubevirt.changes +++ b/kubevirt.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Jun 9 07:49:45 UTC 2021 - Vasily Ulyanov + +- Use registry.suse.com as the default fallback for sle +- Rename macro registry_path to kubevirt_registry_path +- Switch to golang 1.16 +- Drop 0001-Don-t-build-virtctl-for-darwin-and-windows.patch +- Drop --skipj2 arg for build-manifests.sh +- Update to version 0.42.1 + Release notes https://github.com/kubevirt/kubevirt/releases/tag/v0.42.1 + ------------------------------------------------------------------- Fri Jun 4 11:19:34 UTC 2021 - Fabian Vogt diff --git a/kubevirt.spec b/kubevirt.spec index 64976c9..3d4d1ac 100644 --- a/kubevirt.spec +++ b/kubevirt.spec @@ -17,7 +17,7 @@ Name: kubevirt -Version: 0.41.0 +Version: 0.42.1 Release: 0 Summary: Container native virtualization License: Apache-2.0 @@ -28,14 +28,13 @@ Source1: kubevirt-psp-caasp.yaml Source2: kubevirt_containers_meta Source3: kubevirt_containers_meta.service Source100: %{name}-rpmlintrc -Patch0: 0001-Don-t-build-virtctl-for-darwin-and-windows.patch -Patch1: 0002-Don-t-use-Bazel-in-build-manifests.sh.patch +Patch0: 0002-Don-t-use-Bazel-in-build-manifests.sh.patch BuildRequires: glibc-devel-static BuildRequires: golang-packaging BuildRequires: pkgconfig BuildRequires: rsync BuildRequires: sed -BuildRequires: golang(API) = 1.13 +BuildRequires: golang(API) = 1.16 BuildRequires: pkgconfig(libvirt) ExclusiveArch: x86_64 @@ -121,36 +120,32 @@ the Kubevirt container images. # Hackery to determine which registry path to use in kubevirt-operator.yaml # when building the manifests # -# The 'registry_path' macro can be used to define an explicit path in the -# project config, e.g. +# The 'kubevirt_registry_path' macro can be used to define an explicit path in +# the project config, e.g. # # Macros: -# %registry_path registry.opensuse.org/Virtualization/container +# %kubevirt_registry_path registry.opensuse.org/Virtualization/container # :Macros # -# 'registry_path' can also be defined when building locally, e.g. +# 'kubevirt_registry_path' can also be defined when building locally, e.g. # -# osc build --define='registry_path registry.opensuse.org/foo/bar/baz' ... +# osc build --define='kubevirt_registry_path registry.opensuse.org/foo/bar/baz' ... # -# If 'registry_path' is not specified, the standard publish location for SLE and -# openSUSE-based containers is used. +# If 'kubevirt_registry_path' is not specified, the standard publish location +# for SLE and openSUSE-based containers is used. # -# TODO: -# 1. Determine "standard publish location" for SLE and openSUSE variants -# 2. Support Leap when 1 is done -# -%if "%{?registry_path}" == "" +%if "%{?kubevirt_registry_path}" == "" distro='%{?sle_version}:%{is_opensuse}' case "${distro}" in - 150200:0) - reg_path='registry.suse.de/suse/containers/sle-server/15/containers/suse/sles/15.2' ;; - 150300:0) - reg_path='registry.suse.de/suse/containers/sle-server/15/containers/suse/sles/15.3' ;; - *) - reg_path='registry.opensuse.org/kubevirt' ;; +150200:0) + reg_path='registry.suse.com/suse/sles/15.2' ;; +150300:0) + reg_path='registry.suse.com/suse/sles/15.3' ;; +*) + reg_path='registry.opensuse.org/kubevirt' ;; esac %else -reg_path='%{registry_path}' +reg_path='%{kubevirt_registry_path}' %endif mkdir -p go/src/kubevirt.io go/pkg @@ -176,7 +171,7 @@ build_tests="true" \ cmd/virt-operator \ %{nil} -env DOCKER_PREFIX=$reg_path DOCKER_TAG=%{version}-%{release} ./hack/build-manifests.sh --skipj2 +env DOCKER_PREFIX=$reg_path DOCKER_TAG=%{version}-%{release} ./hack/build-manifests.sh %install mkdir -p %{buildroot}%{_bindir}