diff --git a/_service b/_service index 8fd2e4f..66def65 100644 --- a/_service +++ b/_service @@ -1,7 +1,7 @@ containerized-data-importer - v1.34.0 + v1.35.0 git disable https://github.com/kubevirt/containerized-data-importer diff --git a/containerized-data-importer-1.34.0.tar.gz b/containerized-data-importer-1.34.0.tar.gz deleted file mode 100644 index e184a9b..0000000 --- a/containerized-data-importer-1.34.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:21ac75024264159e1b77087202b74908d4ec177b4ddcf57292fa817143a52e80 -size 198140237 diff --git a/containerized-data-importer-1.35.0.tar.gz b/containerized-data-importer-1.35.0.tar.gz new file mode 100644 index 0000000..5e41e16 --- /dev/null +++ b/containerized-data-importer-1.35.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3516a4d4a9dbefe2c88c550287df136131e9d3301c525fa7c870e09c29fd36b6 +size 198383391 diff --git a/containerized-data-importer.changes b/containerized-data-importer.changes index 2991e7d..6607465 100644 --- a/containerized-data-importer.changes +++ b/containerized-data-importer.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Jun 14 06:05:08 UTC 2021 - Vasily Ulyanov + +- Use registry.suse.com as the default fallback for sle +- Rename macro registry_path to kubevirt_registry_path +- Update to version 1.35.0 + Release notes https://github.com/kubevirt/containerized-data-importer/releases/tag/v1.35.0 + ------------------------------------------------------------------- Fri Jun 4 13:04:46 UTC 2021 - Fabian Vogt diff --git a/containerized-data-importer.spec b/containerized-data-importer.spec index 9e12c66..83628ba 100644 --- a/containerized-data-importer.spec +++ b/containerized-data-importer.spec @@ -17,7 +17,7 @@ Name: containerized-data-importer -Version: 1.34.0 +Version: 1.35.0 Release: 0 Summary: Container native virtualization License: Apache-2.0 @@ -119,36 +119,32 @@ tar --strip-components=1 -xf %{S:0} # Hackery to determine which registry path to use in cdi-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 export GOPATH=%{_builddir}/go