April 2018 - openSUSE Commits - openSUSE Mailing Lists

commit python3 for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '18

29 Apr '18

Hello community, here is the log from the commit of package python3 for openSUSE:Factory checked in at 2018-04-29 19:37:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3 (Old) and /work/SRC/openSUSE:Factory/.python3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python3" Sun Apr 29 19:37:00 2018 rev:88 rq:601557 version:3.6.5 Changes: -------- --- /work/SRC/openSUSE:Factory/python3/python3-base.changes 2018-04-05 15:30:05.959498924 +0200 +++ /work/SRC/openSUSE:Factory/.python3.new/python3-base.changes 2018-04-29 19:37:02.311094531 +0200 @@ -0,0 +1,22 @@ +------------------------------------------------------------------- +Fri Apr 20 16:17:29 UTC 2018 - tchvatal(a)suse.com + +- Do not mention the testsuite disabling in opts as it was moved to + main pkg so base is test-free + +------------------------------------------------------------------- +Tue Apr 17 08:36:08 UTC 2018 - tchvatal(a)suse.com + +- As we run in main python package do not generate the pre_checkin + from both now + +------------------------------------------------------------------- +Mon Apr 16 14:11:56 UTC 2018 - tchvatal(a)suse.com + +- Move the tests from base to generic package wrt bsc#1088573 + * We still fail the whole distro if python3 is not build + * The other archs than x86_64 took couple of hours to unblock + build of other software, this way we work around the issue +- Some tests are still run in -base for the LTO tweaking, but at + least it is not run twice + --- /work/SRC/openSUSE:Factory/python3/python3.changes 2018-04-05 15:30:06.399483021 +0200 +++ /work/SRC/openSUSE:Factory/.python3.new/python3.changes 2018-04-29 19:37:06.310947853 +0200 @@ -1,0 +2,14 @@ +Tue Apr 17 08:36:08 UTC 2018 - tchvatal(a)suse.com + +- As we run in main python package do not generate the pre_checkin + from both now + +------------------------------------------------------------------- +Mon Apr 16 14:11:56 UTC 2018 - tchvatal(a)suse.com + +- Move the tests from base to generic package wrt bsc#1088573 + * We still fail the whole distro if python3 is not build + * The other archs than x86_64 took couple of hours to unblock + build of other software, this way we work around the issue + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-base.spec ++++++ --- /var/tmp/diff_new_pack.CwTc69/_old 2018-04-29 19:37:08.602863806 +0200 +++ /var/tmp/diff_new_pack.CwTc69/_new 2018-04-29 19:37:08.606863659 +0200 @@ -30,9 +30,7 @@ %define python_version 3.6 %define python_version_abitag 36 %define python_version_soname 3_6 - %define sitedir %{_libdir}/python%{python_version} - # three possible ABI kinds: m - pymalloc, d - debug build; see PEP 3149 %define abi_kind m # python ABI version - used in some file names @@ -43,7 +41,6 @@ %define so_major 1 %define so_minor 0 %define so_version %{python_version_soname}%{abi_kind}%{so_major}_%{so_minor} - # rpm and python have different ideas about what is an arch-dependent name, so: %if %{__isa_name} == ppc %define archname %(echo %{_arch} | sed s/ppc/powerpc/) @@ -54,13 +51,11 @@ %if %{_arch} == arm %define armsuffix hf %endif - # pyexpat.cpython-35m-x86_64-linux-gnu # pyexpat.cpython-35m-powerpc64le-linux-gnu # pyexpat.cpython-35m-armv7-linux-gnueabihf %define dynlib() %{sitedir}/lib-dynload/%{1}.cpython-%{abi_tag}-%{archname}-%{_os}%{?_gnu}%{?armsuffix}.so ### COMMON-DEF-END ### - # that thing where "without" means "default=on" and vice versa %bcond_without testsuite %if 0%{?do_profiling} @@ -68,15 +63,13 @@ %else %bcond_with profileopt %endif - Name: python3-base Version: 3.6.5 Release: 0 Summary: Python 3 Interpreter and Stdlib Core License: Python-2.0 Group: Development/Languages/Python -Url: http://www.python.org/ - +URL: http://www.python.org/ ##### SOURCE FILES ##### Source0: http://www.python.org/ftp/python/%{version}/%{tarname}.tar.xz Source1: http://www.python.org/ftp/python/%{version}/%{tarname}.tar.xz.asc @@ -86,7 +79,6 @@ Source8: macros.python3 Source9: import_failed.py Source10: import_failed.map - # The following files are not used in the build. # They are listed here to work around missing functionality in rpmbuild, # which would otherwise exclude them from distributed src.rpm files. @@ -94,29 +86,23 @@ Source101: python3-rpmlintrc Source102: pre_checkin.sh Source103: skipped_tests.py - ##### REQURES, PROVIDES, OBSOLETES ##### Requires: python-rpm-macros Recommends: python3 = %{version} #Recommends: python3-ensurepip - # python 3.1 didn't have a separate python-base, so it is wrongly # not a conflict to have python3-3.1 and python3-base > 3.1 Obsoletes: python3 < 3.2 # no Provides, because python3 is obviously provided by package python3 - # python 3.4 provides asyncio Provides: python3-asyncio = %{version} Obsoletes: python3-asyncio < %{version} - # python 3.6 provides typing Provides: python3-typing = %{version} Obsoletes: python3-typing < %{version} - # python3-xml was merged into python3, now moved into -base Provides: python3-xml = %{version} Obsoletes: python3-xml < %{version} - ##### BUILDREQUIRES ##### # SECTION required for basic build BuildRequires: automake @@ -126,18 +112,18 @@ # The compression-related ones could be moved to python3 if necessary, with the exception of zlib. # _bz2 BuildRequires: libbz2-devel -# _ctypes -BuildRequires: libffi-devel # pyexpat, _elementtree BuildRequires: libexpat-devel +# _ctypes +BuildRequires: libffi-devel +# nis +BuildRequires: libnsl-devel # _lzma BuildRequires: lzma-devel # ssl BuildRequires: openssl-devel >= 1.0.2 # zlib BuildRequires: zlib-devel -# nis -BuildRequires: libnsl-devel # /SECTION # SECTION required for build and testsuite BuildRequires: fdupes @@ -147,7 +133,6 @@ BuildRequires: timezone BuildRequires: xz # /SECTION - ### COMMON-PATCH-BEGIN ### # implement "--record-rpm" option for distutils installations Patch01: Python-3.0b1-record-rpm.patch @@ -298,7 +283,7 @@ touch -r %{SOURCE0} Makefile.pre.in -autoreconf -fi +autoreconf -fvi %if 0%{?sles_version} sed -e 's/-fprofile-correction//' -i Makefile.pre.in @@ -312,7 +297,7 @@ --with-ensurepip=no \ --with-system-ffi \ --with-system-expat \ - --enable-lto \ + --with-lto \ --enable-loadable-sqlite-extensions # prevent make from trying to rebuild PYTHON_FOR_GEN stuff @@ -332,47 +317,8 @@ LD_LIBRARY_PATH=.:$LD_LIBRARY_PATH \ make %{?_smp_mflags} $target -%check -# exclude test_gdb -- it doesn't run in buildservice anyway, and fails on missing debuginfos -# when you install gdb into your test env -EXCLUDE="test_gdb" - -%ifarch %{arm} -# test_multiprocessing_forkserver is racy -EXCLUDE="$EXCLUDE test_multiprocessing_forkserver" -%endif -%ifarch ppc ppc64 ppc64le -# exclue test_faulthandler due to bnc#831629 -EXCLUDE="$EXCLUDE test_faulthandler" -%endif -# some tests break in QEMU -%if 0%{?qemu_user_space_build} > 0 -EXCLUDE="$EXCLUDE test_multiprocessing_fork test_multiprocessing_forkserver test_multiprocessing_main_handling test_multiprocessing_spawn test_threading test_threadedtempfile test_io test_posix test_ioctl test_mmap test_openpty test_pty test_time test_subprocess test_asyncore test_asyncio test_os test_faulthandler" -# qemu bug (siginterrupt handling) -EXCLUDE="$EXCLUDE test_signal" -%endif - -# This test (part of test_uuid) requires real network interfaces -# so that ifconfig output has "HWaddr <something>". Some kvm instances -# done have any such interface breaking the uuid module. -EXCLUDE="$EXCLUDE test_uuid" - -# Limit virtual memory to avoid spurious failures -if test $(ulimit -v) = unlimited || test $(ulimit -v) -gt 10000000; then - ulimit -v 10000000 || : -fi - -%if %{with testsuite} -make -j1 test TESTOPTS="-u none -x $EXCLUDE" -# use network, be verbose: -#make test TESTOPTS="-l -u network -v" -%endif - %install - -make \ - DESTDIR=%{buildroot} \ - install +%make_install # remove .a find %{buildroot} -name "*.a" -exec rm {} ";" @@ -521,7 +467,7 @@ # docs %dir %{_docdir}/%{name} %doc %{_docdir}/%{name}/README.rst -%doc %{_docdir}/%{name}/LICENSE +%license %{_docdir}/%{name}/LICENSE %doc %{_docdir}/%{name}/README.SUSE %{_mandir}/man1/python3.1* %{_mandir}/man1/python%{python_version}.1* ++++++ python3-doc.spec ++++++ --- /var/tmp/diff_new_pack.CwTc69/_old 2018-04-29 19:37:08.622863072 +0200 +++ /var/tmp/diff_new_pack.CwTc69/_new 2018-04-29 19:37:08.626862925 +0200 @@ -24,9 +24,7 @@ %define python_version 3.6 %define python_version_abitag 36 %define python_version_soname 3_6 - %define sitedir %{_libdir}/python%{python_version} - # three possible ABI kinds: m - pymalloc, d - debug build; see PEP 3149 %define abi_kind m # python ABI version - used in some file names @@ -37,7 +35,6 @@ %define so_major 1 %define so_minor 0 %define so_version %{python_version_soname}%{abi_kind}%{so_major}_%{so_minor} - # rpm and python have different ideas about what is an arch-dependent name, so: %if %{__isa_name} == ppc %define archname %(echo %{_arch} | sed s/ppc/powerpc/) @@ -48,7 +45,6 @@ %if %{_arch} == arm %define armsuffix hf %endif - # pyexpat.cpython-35m-x86_64-linux-gnu # pyexpat.cpython-35m-powerpc64le-linux-gnu # pyexpat.cpython-35m-armv7-linux-gnueabihf @@ -61,7 +57,7 @@ Summary: Additional Package Documentation for Python 3 License: Python-2.0 Group: Documentation/HTML -Url: http://www.python.org/ +URL: http://www.python.org/ Source0: http://www.python.org/ftp/python/%{tarversion}/%{tarname}.tar.xz BuildRequires: libqt5-qttools BuildRequires: python-Sphinx >= 1.2 ++++++ python3.spec ++++++ --- /var/tmp/diff_new_pack.CwTc69/_old 2018-04-29 19:37:08.650862046 +0200 +++ /var/tmp/diff_new_pack.CwTc69/_new 2018-04-29 19:37:08.654861899 +0200 @@ -29,9 +29,7 @@ %define python_version 3.6 %define python_version_abitag 36 %define python_version_soname 3_6 - %define sitedir %{_libdir}/python%{python_version} - # three possible ABI kinds: m - pymalloc, d - debug build; see PEP 3149 %define abi_kind m # python ABI version - used in some file names @@ -42,7 +40,6 @@ %define so_major 1 %define so_minor 0 %define so_version %{python_version_soname}%{abi_kind}%{so_major}_%{so_minor} - # rpm and python have different ideas about what is an arch-dependent name, so: %if %{__isa_name} == ppc %define archname %(echo %{_arch} | sed s/ppc/powerpc/) @@ -53,7 +50,6 @@ %if %{_arch} == arm %define armsuffix hf %endif - # pyexpat.cpython-35m-x86_64-linux-gnu # pyexpat.cpython-35m-powerpc64le-linux-gnu # pyexpat.cpython-35m-armv7-linux-gnueabihf @@ -66,7 +62,7 @@ Summary: Python 3 Interpreter License: Python-2.0 Group: Development/Languages/Python -Url: http://www.python.org/ +URL: http://www.python.org/ Source0: http://www.python.org/ftp/python/%{version}/%{tarname}.tar.xz Source1: http://www.python.org/ftp/python/%{version}/%{tarname}.tar.xz.asc BuildRequires: automake @@ -215,7 +211,7 @@ touch -r %{SOURCE0} Makefile.pre.in -autoreconf -fi +autoreconf -fvi %if 0%{?sles_version} sed -e 's/-fprofile-correction//' -i Makefile.pre.in @@ -229,7 +225,7 @@ --with-ensurepip=no \ --with-system-ffi \ --with-system-expat \ - --enable-lto \ + --with-lto \ --enable-loadable-sqlite-extensions # prevent make from trying to rebuild PYTHON_FOR_GEN stuff @@ -244,26 +240,43 @@ make %{?_smp_mflags} %check +# exclude test_gdb -- it doesn't run in buildservice anyway, and fails on missing debuginfos +# when you install gdb into your test env +EXCLUDE="test_gdb" +# we patch out the message to recommend zypper in and thus this would fail +EXCLUDE="$EXCLUDE test_pydoc" + +%ifarch %{arm} +# test_multiprocessing_forkserver is racy +EXCLUDE="$EXCLUDE test_multiprocessing_forkserver" +%endif +%ifarch ppc ppc64 ppc64le +# exclue test_faulthandler due to bnc#831629 +EXCLUDE="$EXCLUDE test_faulthandler" +%endif +# some tests break in QEMU +%if 0%{?qemu_user_space_build} > 0 +EXCLUDE="$EXCLUDE test_asyncio test_multiprocessing_fork test_multiprocessing_forkserver test_multiprocessing_main_handling test_multiprocessing_spawn test_threading test_threadedtempfile test_io test_posix test_ioctl test_mmap test_openpty test_pty test_time test_subprocess test_asyncore test_asyncio test_os test_faulthandler" +# qemu bug (siginterrupt handling) +EXCLUDE="$EXCLUDE test_signal" +%endif + +# This test (part of test_uuid) requires real network interfaces +# so that ifconfig output has "HWaddr <something>". Some kvm instances +# done have any such interface breaking the uuid module. +EXCLUDE="$EXCLUDE test_uuid" + # Limit virtual memory to avoid spurious failures if test $(ulimit -v) = unlimited || test $(ulimit -v) -gt 10000000; then ulimit -v 10000000 || : fi -# only test the parts skipped in python3-base -TESTS="test_curses test_dbm_gnu test_dbm_ndbm test_idle \ - test_readline test_sqlite test_tcl test_tix test_tk \ - test_ttk_textonly" -# redo tests with SSL parts -%if !0%{?qemu_user_space_build} -TESTS="$TESTS test_asyncio" -%endif - -make -j1 test TESTOPTS="-u curses $TESTS" +make -j1 test TESTOPTS="-u curses -x $EXCLUDE" +# use network, be verbose: +#make test TESTOPTS="-l -u network -v" %install -make \ - DESTDIR=%{buildroot} \ - install +%make_install # clean out stuff that is in python-base and subpackages ++++++ PACKAGING-NOTES ++++++ --- /var/tmp/diff_new_pack.CwTc69/_old 2018-04-29 19:37:08.694860432 +0200 +++ /var/tmp/diff_new_pack.CwTc69/_new 2018-04-29 19:37:08.698860285 +0200 @@ -11,10 +11,6 @@ For development, use "--without profileopt" option to disable PGO. This shortens the build time to ~5 minutes including test suite. -If you just need to rerun a build and don't need the full test suite, you can -also build "--without testsuite". This shaves off another three minutes. -(Note that you usually *want* the full test suite.) - I. python3 and python3-base naming confusion -------------------------------------------- ++++++ skipped_tests.py ++++++ --- /var/tmp/diff_new_pack.CwTc69/_old 2018-04-29 19:37:08.834855298 +0200 +++ /var/tmp/diff_new_pack.CwTc69/_new 2018-04-29 19:37:08.838855151 +0200 @@ -8,7 +8,6 @@ This will have a number of """ -BASE = "python3-base.spec" MAIN = "python3.spec" import glob @@ -46,22 +45,21 @@ qemu_exclusions |= tests return found_tests -excluded = find_tests_in_spec(BASE) -included = find_tests_in_spec(MAIN) +excluded = find_tests_in_spec(MAIN) #print("--- excluded tests:", " ".join(sorted(excluded))) #print("--- included tests:", " ".join(sorted(included))) -mentioned = excluded | included +mentioned = excluded nonexistent = mentioned - alltests -missing = excluded - included - qemu_exclusions +missing = excluded - qemu_exclusions print("--- the following tests are excluded for QEMU and not tested in python") print("--- (that probably means we don't need to worry about them)") -for test in sorted(qemu_exclusions - included): +for test in sorted(qemu_exclusions - excluded): print(test) -print("--- the following tests might be excluded from python-base but not tested in python:") +print("--- the following tests might be excluded in python:") for test in sorted(missing): print(test)

1 0

commit MozillaFirefox for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '18

29 Apr '18

Hello community, here is the log from the commit of package MozillaFirefox for openSUSE:Factory checked in at 2018-04-29 19:36:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/MozillaFirefox (Old) and /work/SRC/openSUSE:Factory/.MozillaFirefox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "MozillaFirefox" Sun Apr 29 19:36:27 2018 rev:269 rq:601060 version:59.0.2 Changes: -------- --- /work/SRC/openSUSE:Factory/MozillaFirefox/MozillaFirefox.changes 2018-03-30 11:59:54.026054116 +0200 +++ /work/SRC/openSUSE:Factory/.MozillaFirefox.new/MozillaFirefox.changes 2018-04-29 19:36:56.131321150 +0200 @@ -1,0 +2,12 @@ +Fri Apr 20 12:31:52 UTC 2018 - mliska(a)suse.cz + +- Add 0001-Bug-1435695-WebRTC-fails-to-build-with-GCC-8-r-dmino.patch + in order to fix boo#1090362. + +------------------------------------------------------------------- +Mon Apr 2 00:55:45 UTC 2018 - badshah400(a)gmail.com + +- Add back mozilla-enable-csd.patch: New rebased version from + Fedora for version 59.0.x. + +------------------------------------------------------------------- New: ---- 0001-Bug-1435695-WebRTC-fails-to-build-with-GCC-8-r-dmino.patch mozilla-enable-csd.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaFirefox.spec ++++++ --- /var/tmp/diff_new_pack.nREvcZ/_old 2018-04-29 19:37:00.563158630 +0200 +++ /var/tmp/diff_new_pack.nREvcZ/_new 2018-04-29 19:37:00.567158483 +0200 @@ -153,6 +153,8 @@ Patch9: mozilla-bmo1005535.patch Patch10: mozilla-i586-DecoderDoctorLogger.patch Patch11: mozilla-i586-domPrefs.patch +Patch12: mozilla-enable-csd.patch +Patch13: 0001-Bug-1435695-WebRTC-fails-to-build-with-GCC-8-r-dmino.patch # Firefox/browser Patch101: firefox-kde.patch Patch102: firefox-branded-icons.patch @@ -268,6 +270,8 @@ %patch10 -p1 %patch11 -p1 %endif +%patch12 -p1 +%patch13 -p1 # Firefox %patch101 -p1 %patch102 -p1 ++++++ 0001-Bug-1435695-WebRTC-fails-to-build-with-GCC-8-r-dmino.patch ++++++ >From 38a3ee1f792f586aef412ebc04980a93825612c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m(a)gmail.com> Date: Mon, 5 Feb 2018 09:46:44 -0500 Subject: [PATCH] Bug 1435695 - WebRTC fails to build with GCC 8; r=dminor --HG-- extra : rebase_source : d26e183b2082fa4f88ce3b837e2db5fc8acbff5b --- media/webrtc/trunk/webrtc/common_audio/vad/vad_core.c | 5 +++-- .../webrtc/modules/audio_coding/codecs/isac/fix/source/lattice.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/media/webrtc/trunk/webrtc/common_audio/vad/vad_core.c b/media/webrtc/trunk/webrtc/common_audio/vad/vad_core.c index 0340165eb505..d09314720ddd 100644 --- a/media/webrtc/trunk/webrtc/common_audio/vad/vad_core.c +++ b/media/webrtc/trunk/webrtc/common_audio/vad/vad_core.c @@ -115,8 +115,9 @@ static int32_t WeightedAverage(int16_t* data, int16_t offset, // undefined behavior, so not a good idea; this just makes UBSan ignore the // violation, so that our old code can continue to do what it's always been // doing.) -static inline int32_t OverflowingMulS16ByS32ToS32(int16_t a, int32_t b) - RTC_NO_SANITIZE("signed-integer-overflow") { +static inline int32_t RTC_NO_SANITIZE("signed-integer-overflow") +OverflowingMulS16ByS32ToS32(int16_t a, int32_t b) +{ return a * b; } diff --git a/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice.c b/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice.c index 2b92acb64a3d..c10014f6a108 100644 --- a/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice.c +++ b/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice.c @@ -209,8 +209,9 @@ void WebRtcIsacfix_NormLatticeFilterMa(size_t orderCoef, // Left shift of an int32_t that's allowed to overflow. (It's still undefined // behavior, so not a good idea; this just makes UBSan ignore the violation, so // that our old code can continue to do what it's always been doing.) -static inline int32_t OverflowingLShiftS32(int32_t x, int shift) - RTC_NO_SANITIZE("shift") { +static inline int32_t RTC_NO_SANITIZE("shift") +OverflowingLShiftS32(int32_t x, int shift) +{ return x << shift; } -- 2.16.3 ++++++ mozilla-enable-csd.patch ++++++ Index: mozilla/browser/base/moz.build =================================================================== --- mozilla.orig/browser/base/moz.build +++ mozilla/browser/base/moz.build @@ -60,7 +60,7 @@ DEFINES['APP_LICENSE_BLOCK'] = '%s/conte if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk3', 'cocoa'): DEFINES['CONTEXT_COPY_IMAGE_CONTENTS'] = 1 -if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'cocoa'): +if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'cocoa', 'gtk3'): DEFINES['CAN_DRAW_IN_TITLEBAR'] = 1 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk3'): Index: mozilla/toolkit/modules/moz.build =================================================================== --- mozilla.orig/toolkit/modules/moz.build +++ mozilla/toolkit/modules/moz.build @@ -265,7 +265,7 @@ EXTRA_JS_MODULES.sessionstore += [ 'sessionstore/Utils.jsm', ] -if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'cocoa'): +if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'cocoa', 'gtk3'): DEFINES['CAN_DRAW_IN_TITLEBAR'] = 1 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk3'): Index: mozilla/widget/gtk/nsWindow.cpp =================================================================== --- mozilla.orig/widget/gtk/nsWindow.cpp +++ mozilla/widget/gtk/nsWindow.cpp @@ -6857,9 +6857,62 @@ nsWindow::GetCSDSupportLevel() { if (sCSDSupportLevel != CSD_SUPPORT_UNKNOWN) { return sCSDSupportLevel; } - - // Disabled due to Bug 1440461 - sCSDSupportLevel = CSD_SUPPORT_NONE; + + const char* currentDesktop = getenv("XDG_CURRENT_DESKTOP"); + if (currentDesktop) { + if (strstr(currentDesktop, "GNOME") != nullptr) { + sCSDSupportLevel = CSD_SUPPORT_FULL; + } else if (strstr(currentDesktop, "XFCE") != nullptr) { + sCSDSupportLevel = CSD_SUPPORT_FLAT; + } else if (strstr(currentDesktop, "X-Cinnamon") != nullptr) { + sCSDSupportLevel = CSD_SUPPORT_FULL; + } else if (strstr(currentDesktop, "KDE") != nullptr) { + sCSDSupportLevel = CSD_SUPPORT_FLAT; + } else if (strstr(currentDesktop, "LXDE") != nullptr) { + sCSDSupportLevel = CSD_SUPPORT_FLAT; + } else if (strstr(currentDesktop, "openbox") != nullptr) { + sCSDSupportLevel = CSD_SUPPORT_FLAT; + } else if (strstr(currentDesktop, "i3") != nullptr) { + sCSDSupportLevel = CSD_SUPPORT_NONE; + } else if (strstr(currentDesktop, "MATE") != nullptr) { + sCSDSupportLevel = CSD_SUPPORT_FLAT; + } else if (strstr(currentDesktop, "Unity") != nullptr) { + sCSDSupportLevel = CSD_SUPPORT_FLAT; + } else if (strstr(currentDesktop, "Pantheon") != nullptr) { + sCSDSupportLevel = CSD_SUPPORT_FULL; + } else if (strstr(currentDesktop, "LXQt") != nullptr) { + sCSDSupportLevel = CSD_SUPPORT_FULL; + } else { +// Release or beta builds are not supposed to be broken +// so disable titlebar rendering on untested/unknown systems. +#if defined(RELEASE_OR_BETA) + sCSDSupportLevel = CSD_SUPPORT_NONE; +#else + sCSDSupportLevel = CSD_SUPPORT_FLAT; +#endif + } + } else { + sCSDSupportLevel = CSD_SUPPORT_NONE; + } + + // We don't support CSD_SUPPORT_FULL on Wayland + if (!GDK_IS_X11_DISPLAY(gdk_display_get_default()) && + sCSDSupportLevel == CSD_SUPPORT_FULL) { + sCSDSupportLevel = CSD_SUPPORT_FLAT; + } + + // Allow MOZ_GTK_TITLEBAR_DECORATION to override our heuristics + const char* decorationOverride = getenv("MOZ_GTK_TITLEBAR_DECORATION"); + if (decorationOverride) { + if (strcmp(decorationOverride, "none") == 0) { + sCSDSupportLevel = CSD_SUPPORT_NONE; + } else if (strcmp(decorationOverride, "client") == 0) { + sCSDSupportLevel = CSD_SUPPORT_FLAT; + } else if (strcmp(decorationOverride, "system") == 0) { + sCSDSupportLevel = CSD_SUPPORT_FULL; + } + } + return sCSDSupportLevel; }

1 0

commit openldap2 for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '18

29 Apr '18

Hello community, here is the log from the commit of package openldap2 for openSUSE:Factory checked in at 2018-04-29 19:36:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openldap2 (Old) and /work/SRC/openSUSE:Factory/.openldap2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openldap2" Sun Apr 29 19:36:20 2018 rev:133 rq:601027 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/openldap2/openldap2.changes 2018-04-07 20:54:24.588139463 +0200 +++ /work/SRC/openSUSE:Factory/.openldap2.new/openldap2.changes 2018-04-29 19:36:54.695373808 +0200 @@ -1,0 +2,10 @@ +Tue Apr 24 16:35:09 UTC 2018 - zsolt.kalmar(a)suse.com + +- bsc#1085064 Packaging issues have been discovered around the + openldap_update_modules_path.sh which has been corrected: + - the spec file was wrongly configured, therefore the script has + never been called + - the script should create the symlinks first, as slapcat is + useless on a system which is already affected. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openldap2.spec ++++++ --- /var/tmp/diff_new_pack.0gFsUK/_old 2018-04-29 19:36:55.499344326 +0200 +++ /var/tmp/diff_new_pack.0gFsUK/_new 2018-04-29 19:36:55.499344326 +0200 @@ -445,7 +445,7 @@ cp %{_libdir}/sasl2/slapd.conf /etc/sasl2/slapd.conf fi -if [ ${1:-0} -gt 1 ! -e /var/adm/openldap_modules_path_updated ] ; then +if [ ${1:-0} -gt 1 ] && [ ! -f /var/adm/openldap_modules_path_updated ] ; then /usr/sbin/openldap_update_modules_path.sh fi %{fillup_only -n openldap ldap} ++++++ openldap_update_modules_path.sh ++++++ --- /var/tmp/diff_new_pack.0gFsUK/_old 2018-04-29 19:36:55.655338605 +0200 +++ /var/tmp/diff_new_pack.0gFsUK/_new 2018-04-29 19:36:55.659338458 +0200 @@ -1,5 +1,4 @@ -#!/bin/bash -# This script has been created to update the OpenLDAP modules path in cn=config +s script has been created to update the OpenLDAP modules path in cn=config # For details of changing the configuration items' location read these: # https://www.openldap.org/lists/openldap-software/200812/msg00080.html # This script writes over the config entry of backend databases location, which files are necessary to run LDAP. The procedure has been created upon this description: @@ -7,29 +6,61 @@ # Author: Zsolt KALMAR (SUSE Linux GmbH) zkalmar(a)suse.com +# define variables conf_dir='/etc/openldap/slapd.d' +if [ ! -d ${conf_dir} ] || [ ! -f ${conf_dir}/cn=config.ldif ] +then + exit 0 +fi + + tmp_file='/tmp/ldap_conf_tmp.ldif' backup='/tmp/slapd.d' res=0 +# common functions +create_symlinks () { +if [ ! -f /usr/lib/openldap/back_bdb.so ]; then ln -s /usr/lib64/openldap/back_bdb.so /usr/lib/openldap/back_bdb.so; fi +if [ ! -f /usr/lib/openldap/back_hdb.so ]; then ln -s /usr/lib64/openldap/back_hdb.so /usr/lib/openldap/back_hdb.so; fi +if [ ! -f /usr/lib/openldap/back_mdb.so ]; then ln -s /usr/lib64/openldap/back_mdb.so /usr/lib/openldap/back_mdb.so; fi +if [ ! -f /usr/lib/openldap/syncprov.so ]; then ln -s /usr/lib64/openldap/syncprov.so /usr/lib/openldap/syncprov.so; fi +#logger -p user.info "Update openLDAP: symlinks have been created." +} + +cleanup () { +rm -f /usr/lib/openldap/back_bdb.so +rm -f /usr/lib/openldap/back_hdb.so +rm -f /usr/lib/openldap/back_mdb.so +rm -f /usr/lib/openldap/syncprov.so rm -f ${tmp_file} +#logger -p user.info "Update openLDAP: symlinks have been removed." +} -# Check if the configuration is containing the inappropriate entry +rm -f ${tmp_file} -/usr/sbin/slapcat -n0 -F ${conf_dir} -l ${tmp_file} -o ldif-wrap=no -res=$? +# Check if the configuration is containing the inappropriate entry +create_symlinks +res=0 +if [ -f /usr/sbin/slapcat ] +then + /usr/sbin/slapcat -n0 -F ${conf_dir} -l ${tmp_file} -o ldif-wrap=no + res=$? +fi if [ $res -ne 0 ] then - logger -p user.error "Creating ${tmp_file} has failed." + #logger -p user.error "LDAP Update script: Creating ${tmp_file} has failed during the search of faulty openLDAP entry." exit 1 +#else + #logger -p user.info "LDAP Update script: ${tmp_file} has been created." fi entry_cnt=`cat ${tmp_file} | grep ^[^#\;] | grep olcModulePath | wc -l` if [ $entry_cnt -eq 0 ] then - logger -p user.info "The current LDAP configuration does not contain the wrong item. Stop applying this script. Bye." + #logger -p user.info "LDAP Update script: The current LDAP configuration does not contain the wrong item. Stop applying this script. Bye." + cleanup exit 0 fi @@ -37,20 +68,23 @@ # Make sure the LDAP is not running: /usr/bin/systemctl stop slapd.service +#logger -p user.info "LDAP Update script: openLDAP has been stopped." # Creating symlinks for the modules required for the slapcat and slapadd -ln -s /usr/lib64/openldap/back_bdb.so /usr/lib/openldap/back_bdb.so -ln -s /usr/lib64/openldap/back_hdb.so /usr/lib/openldap/back_hdb.so -ln -s /usr/lib64/openldap/back_mdb.so /usr/lib/openldap/back_mdb.so -ln -s /usr/lib64/openldap/syncprov.so /usr/lib/openldap/syncprov.so +create_symlinks # Export the config to a text -/usr/sbin/slapcat -n0 -F ${conf_dir} -l ${tmp_file} -o ldif-wrap=no -res=$? +res=0 +if [ -f /usr/sbin/slapcat ] +then + /usr/sbin/slapcat -n0 -F ${conf_dir} -l ${tmp_file} -o ldif-wrap=no + res=$? +fi if [ $res -ne 0 ] then - logger -p user.error "Creating ${tmp_file} has failed." + #logger -p user.error "LDAP Update script: Creating ${tmp_file} has failed." + cleanup exit 1 fi @@ -61,8 +95,10 @@ if [ $res -ne 0 ] then - logger -p user.error "LDAP Update script: Backing up ${conf_dir} has failed." + #logger -p user.error "LDAP Update script: Backing up ${conf_dir} has failed." exit 1 +#else + #logger -p user.info "LDAP Update script: Back up has been created of openLDAP configuration." fi # Remove the configuration item "olcModulePath" @@ -71,8 +107,10 @@ if [ $res -ne 0 ] then - logger -p user.error "LDAP Update script: Removing of entry in ${tmp_file} has failed." + #logger -p user.error "LDAP Update script: Removing of entry in ${tmp_file} has failed." exit 1 +#else + #logger -p user.info "LDAP Update script: olcModulesPath entry has been removed." fi # Remove the current configuration @@ -85,14 +123,11 @@ # Catch result code of slapadd if [ $res -ne 0 ] then - logger -p user.error "LDAP Update script: Implementing new configuration has failed." + #logger -p user.error "LDAP Update script: Implementing new configuration has failed." exit 1 else -# Remove temporary symlinks - rm -rf /usr/lib/openldap/back_bdb.so - rm -rf /usr/lib/openldap/back_hdb.so - rm -rf /usr/lib/openldap/back_mdb.so - rm -rf /usr/lib/openldap/syncprov.so + #logger -p user.info "LDAP Update script: Implementing new configuration has been succeeded." + cleanup fi # Start the SLAPD with the new configuration @@ -101,9 +136,10 @@ if [ $res -ne 0 ] then - logger -p user.error "LDAP Update script: Starting updated LDAP server has been failed." + #logger -p user.error "LDAP Update script: Starting updated LDAP server has been failed." exit 1 else + #logger -p user.info "LDAP Update script: Updated LDAP server has been successfully started." # Remove backups rm -rf ${backup} rm -rf ${tmp_file}

1 0

commit gcc8 for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '18

29 Apr '18

Hello community, here is the log from the commit of package gcc8 for openSUSE:Factory checked in at 2018-04-29 19:35:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gcc8 (Old) and /work/SRC/openSUSE:Factory/.gcc8.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gcc8" Sun Apr 29 19:35:57 2018 rev:4 rq:601020 version:8.0.1+r259636 Changes: -------- --- /work/SRC/openSUSE:Factory/gcc8/cross-aarch64-gcc8.changes 2018-04-22 14:43:01.069633598 +0200 +++ /work/SRC/openSUSE:Factory/.gcc8.new/cross-aarch64-gcc8.changes 2018-04-29 19:36:10.277002685 +0200 @@ -1,0 +2,7 @@ +Wed Apr 25 08:24:58 UTC 2018 - rguenther(a)suse.com + +- Update to gcc-8-branch head (r259636). + * GCC 8.1 first release candidate. + * package x86_64 movdirintrin.h + +------------------------------------------------------------------- cross-arm-gcc8.changes: same change cross-arm-none-gcc8-bootstrap.changes: same change cross-arm-none-gcc8.changes: same change cross-avr-gcc8-bootstrap.changes: same change cross-avr-gcc8.changes: same change cross-epiphany-gcc8-bootstrap.changes: same change cross-epiphany-gcc8.changes: same change cross-hppa-gcc8.changes: same change cross-i386-gcc8.changes: same change cross-m68k-gcc8.changes: same change cross-mips-gcc8.changes: same change cross-nvptx-gcc8.changes: same change cross-ppc64-gcc8.changes: same change cross-ppc64le-gcc8.changes: same change cross-riscv64-gcc8.changes: same change cross-rx-gcc8-bootstrap.changes: same change cross-rx-gcc8.changes: same change cross-s390x-gcc8.changes: same change cross-sparc-gcc8.changes: same change cross-sparc64-gcc8.changes: same change cross-x86_64-gcc8.changes: same change gcc8-testresults.changes: same change gcc8.changes: same change Old: ---- gcc-8.0.1+r259467.tar.xz New: ---- gcc-8.0.1+r259636.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cross-aarch64-gcc8.spec ++++++ --- /var/tmp/diff_new_pack.fPlFMD/_old 2018-04-29 19:36:53.351423092 +0200 +++ /var/tmp/diff_new_pack.fPlFMD/_new 2018-04-29 19:36:53.355422945 +0200 @@ -170,7 +170,7 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 8.0.1+r259467 +Version: 8.0.1+r259636 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) cross-arm-gcc8.spec: same change cross-arm-none-gcc8-bootstrap.spec: same change cross-arm-none-gcc8.spec: same change cross-avr-gcc8-bootstrap.spec: same change cross-avr-gcc8.spec: same change cross-epiphany-gcc8-bootstrap.spec: same change cross-epiphany-gcc8.spec: same change cross-hppa-gcc8.spec: same change cross-i386-gcc8.spec: same change cross-m68k-gcc8.spec: same change cross-mips-gcc8.spec: same change cross-nvptx-gcc8.spec: same change cross-ppc64-gcc8.spec: same change cross-ppc64le-gcc8.spec: same change cross-riscv64-gcc8.spec: same change cross-rx-gcc8-bootstrap.spec: same change cross-rx-gcc8.spec: same change cross-s390x-gcc8.spec: same change cross-sparc-gcc8.spec: same change cross-sparc64-gcc8.spec: same change cross-x86_64-gcc8.spec: same change gcc8-testresults.spec: same change ++++++ gcc8.spec ++++++ --- /var/tmp/diff_new_pack.fPlFMD/_old 2018-04-29 19:36:54.099395663 +0200 +++ /var/tmp/diff_new_pack.fPlFMD/_new 2018-04-29 19:36:54.103395516 +0200 @@ -232,7 +232,7 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 8.0.1+r259467 +Version: 8.0.1+r259636 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) @@ -2502,6 +2502,7 @@ %{libsubdir}/include/gfniintrin.h %{libsubdir}/include/pconfigintrin.h %{libsubdir}/include/wbnoinvdintrin.h +%{libsubdir}/include/movdirintrin.h %endif %ifarch m68k %{libsubdir}/include/math-68881.h ++++++ gcc-8.0.1+r259467.tar.xz -> gcc-8.0.1+r259636.tar.xz ++++++ /work/SRC/openSUSE:Factory/gcc8/gcc-8.0.1+r259467.tar.xz /work/SRC/openSUSE:Factory/.gcc8.new/gcc-8.0.1+r259636.tar.xz differ: char 27, line 1 ++++++ gcc.spec.in ++++++ --- /var/tmp/diff_new_pack.fPlFMD/_old 2018-04-29 19:36:54.299388329 +0200 +++ /var/tmp/diff_new_pack.fPlFMD/_new 2018-04-29 19:36:54.299388329 +0200 @@ -236,7 +236,7 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 URL: http://gcc.gnu.org/ -Version: 8.0.1+r259467 +Version: 8.0.1+r259636 Release: 1 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) @@ -1848,6 +1848,7 @@ %{libsubdir}/include/gfniintrin.h %{libsubdir}/include/pconfigintrin.h %{libsubdir}/include/wbnoinvdintrin.h +%{libsubdir}/include/movdirintrin.h %endif %ifarch m68k %{libsubdir}/include/math-68881.h

1 0

commit 000product for openSUSE:Factory
by root＠hilbert.suse.de 28 Apr '18

28 Apr '18

Hello community, here is the log from the commit of package 000product for openSUSE:Factory checked in at 2018-04-28 06:32:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/000product (Old) and /work/SRC/openSUSE:Factory/.000product.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "000product" Sat Apr 28 06:32:21 2018 rev:137 rq: version:unknown Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ _service:product_converter:openSUSE-Addon-NonOss-ftp-ftp-i586_x86_64.kiwi: same change _service:product_converter:openSUSE-Addon-NonOss-release.spec: same change _service:product_converter:openSUSE-Tumbleweed-Kubic-dvd5-dvd-x86_64.kiwi: same change _service:product_converter:openSUSE-Tumbleweed-Kubic-release.spec: same change _service:product_converter:openSUSE-cd-mini-i586.kiwi: same change _service:product_converter:openSUSE-cd-mini-x86_64.kiwi: same change _service:product_converter:openSUSE-dvd5-dvd-i586.kiwi: same change _service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi: same change _service:product_converter:openSUSE-ftp-ftp-i586_x86_64.kiwi: same change ++++++ _service:product_converter:openSUSE-release.spec ++++++ --- /var/tmp/diff_new_pack.lBptdW/_old 2018-04-28 06:32:29.483651715 +0200 +++ /var/tmp/diff_new_pack.lBptdW/_new 2018-04-28 06:32:29.503650982 +0200 @@ -11453,6 +11453,7 @@ Provides: weakremover(libcamgm-devel-32bit) Provides: weakremover(libcamgm100) Provides: weakremover(libcamgm100-32bit) +Provides: weakremover(libcantorlibs17) Provides: weakremover(libcfitsio5) Provides: weakremover(libcgroup-devel) Provides: weakremover(libcgroup-tools) @@ -25179,6 +25180,7 @@ <obsoletepackage>libcamgm-devel-32bit</obsoletepackage> <obsoletepackage>libcamgm100</obsoletepackage> <obsoletepackage>libcamgm100-32bit</obsoletepackage> + <obsoletepackage>libcantorlibs17</obsoletepackage> <obsoletepackage>libcfitsio5</obsoletepackage> <obsoletepackage>libcgroup-devel</obsoletepackage> <obsoletepackage>libcgroup-tools</obsoletepackage> openSUSE-release.spec: same change ++++++ obsoletepackages.inc ++++++ --- /var/tmp/diff_new_pack.lBptdW/_old 2018-04-28 06:32:29.747642047 +0200 +++ /var/tmp/diff_new_pack.lBptdW/_new 2018-04-28 06:32:29.751641901 +0200 @@ -11379,6 +11379,7 @@ <obsoletepackage>libcamgm-devel-32bit</obsoletepackage> <obsoletepackage>libcamgm100</obsoletepackage> <obsoletepackage>libcamgm100-32bit</obsoletepackage> + <obsoletepackage>libcantorlibs17</obsoletepackage> <obsoletepackage>libcfitsio5</obsoletepackage> <obsoletepackage>libcgroup-devel</obsoletepackage> <obsoletepackage>libcgroup-tools</obsoletepackage>

1 0

commit 000product for openSUSE:Factory
by root＠hilbert.suse.de 28 Apr '18

28 Apr '18

Hello community, here is the log from the commit of package 000product for openSUSE:Factory checked in at 2018-04-28 05:45:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/000product (Old) and /work/SRC/openSUSE:Factory/.000product.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "000product" Sat Apr 28 05:45:03 2018 rev:136 rq: version:unknown Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ _service:product_converter:openSUSE-Addon-NonOss-ftp-ftp-i586_x86_64.kiwi: same change _service:product_converter:openSUSE-Addon-NonOss-release.spec: same change _service:product_converter:openSUSE-Tumbleweed-Kubic-dvd5-dvd-x86_64.kiwi: same change _service:product_converter:openSUSE-Tumbleweed-Kubic-release.spec: same change _service:product_converter:openSUSE-cd-mini-i586.kiwi: same change _service:product_converter:openSUSE-cd-mini-x86_64.kiwi: same change _service:product_converter:openSUSE-dvd5-dvd-i586.kiwi: same change ++++++ _service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi ++++++ --- /var/tmp/diff_new_pack.X3xxd0/_old 2018-04-28 05:45:11.399661707 +0200 +++ /var/tmp/diff_new_pack.X3xxd0/_new 2018-04-28 05:45:11.403661561 +0200 @@ -5307,6 +5307,7 @@ <repopackage name="zypper-lifecycle-plugin" arch="x86_64"/> <repopackage name="zypper-log" arch="x86_64"/> <repopackage name="zypper-migration-plugin" arch="x86_64"/> + <repopackage name="zypper-search-packages-plugin" arch="x86_64"/> <repopackage name="openSUSE-release" addarch="x86_64"/> <repopackage name="openSUSE-release-dvd" addarch="x86_64"/> </repopackages> _service:product_converter:openSUSE-release.spec: same change openSUSE-Tumbleweed-Kubic-release.spec: same change openSUSE-release.spec: same change ++++++ DVD5-x86_64.group ++++++ --- /var/tmp/diff_new_pack.X3xxd0/_old 2018-04-28 05:45:11.575655254 +0200 +++ /var/tmp/diff_new_pack.X3xxd0/_new 2018-04-28 05:45:11.579655108 +0200 @@ -5250,5 +5250,6 @@ <package name="zypper-lifecycle-plugin"/> <package name="zypper-log"/> <package name="zypper-migration-plugin"/> + <package name="zypper-search-packages-plugin"/> </packagelist> </group>

1 0

commit 000product for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '18

27 Apr '18

Hello community, here is the log from the commit of package 000product for openSUSE:Factory checked in at 2018-04-27 16:10:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/000product (Old) and /work/SRC/openSUSE:Factory/.000product.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "000product" Fri Apr 27 16:10:21 2018 rev:135 rq: version:unknown Fri Apr 27 16:10:20 2018 rev:134 rq: version:unknown Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ _service:product_converter:openSUSE-Addon-NonOss-ftp-ftp-i586_x86_64.kiwi: same change _service:product_converter:openSUSE-Addon-NonOss-release.spec: same change ++++++ _service:product_converter:openSUSE-Tumbleweed-Kubic-dvd5-dvd-x86_64.kiwi ++++++ --- /var/tmp/diff_new_pack.HNcBFE/_old 2018-04-27 16:10:40.659308423 +0200 +++ /var/tmp/diff_new_pack.HNcBFE/_new 2018-04-27 16:10:40.663308276 +0200 @@ -1,4 +1,4 @@ -<image name="OBS__openSUSE-Tumbleweed-Kubic___20180426" schemaversion="4.1"> +<image name="OBS__openSUSE-Tumbleweed-Kubic___20180427" schemaversion="4.1"> <description type="system"> <author>The SUSE Team</author> <contact>build(a)opensuse.org</contact> @@ -35,9 +35,9 @@ <productvar name="SEPARATE_MEDIA">true</productvar> <productvar name="SHA1OPT">-x -2</productvar> <productvar name="VENDOR">openSUSE</productvar> - <productvar name="VERSION">20180426</productvar> + <productvar name="VERSION">20180427</productvar> <productinfo name="CONTENTSTYLE">11</productinfo> - <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-tumbleweed-kubic:20180426,openSUSE Tumbleweed Kubic</productinfo> + <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-tumbleweed-kubic:20180427,openSUSE Tumbleweed Kubic</productinfo> <productinfo name="LINGUAS">en_US </productinfo> <productinfo name="VENDOR">openSUSE</productinfo> <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption> ++++++ _service:product_converter:openSUSE-Tumbleweed-Kubic-release.spec ++++++ --- /var/tmp/diff_new_pack.HNcBFE/_old 2018-04-27 16:10:40.679307690 +0200 +++ /var/tmp/diff_new_pack.HNcBFE/_new 2018-04-27 16:10:40.683307543 +0200 @@ -17,7 +17,7 @@ Name: openSUSE-Tumbleweed-Kubic-release -Version: 20180426 +Version: 20180427 Release: 0 Summary: openSUSE Tumbleweed Kubic License: GPL-2.0-or-later @@ -38,9 +38,9 @@ ExclusiveArch: %ix86 x86_64 ppc64le s390x aarch64 Provides: %name-%version Provides: product() = openSUSE-Tumbleweed-Kubic -Provides: product(openSUSE-Tumbleweed-Kubic) = 20180426-0 +Provides: product(openSUSE-Tumbleweed-Kubic) = 20180427-0 Provides: product-label() = openSUSE%20Tumbleweed%20Kubic -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Dtumbleweed%2Dkubic%3A20180426 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Dtumbleweed%2Dkubic%3A20180427 Provides: product-url(releasenotes) = http%3A%2F%2Fdoc.opensuse.org%2Frelease%2Dnotes%2Fx86_64%2FopenSUSE%2FTumbleweed%2Frelease%2Dnotes%2DopenSUSE.rpm Provides: product-endoflife() Requires: product_flavor(openSUSE-Tumbleweed-Kubic) @@ -61,7 +61,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(dvd) -Provides: product_flavor(openSUSE-Tumbleweed-Kubic) = 20180426-0 +Provides: product_flavor(openSUSE-Tumbleweed-Kubic) = 20180427-0 Summary: openSUSE Tumbleweed Kubic %description dvd @@ -123,11 +123,11 @@ <product schemeversion="0"> <vendor>openSUSE</vendor> <name>openSUSE-Tumbleweed-Kubic</name> - <version>20180426</version> + <version>20180427</version> <release>0</release> <endoflife></endoflife> <arch>%{_target_cpu}</arch> - <cpeid>cpe:/o:opensuse:opensuse-tumbleweed-kubic:20180426</cpeid> + <cpeid>cpe:/o:opensuse:opensuse-tumbleweed-kubic:20180427</cpeid> <productline>openSUSE-Tumbleweed-Kubic</productline> <register> <pool> ++++++ _service:product_converter:openSUSE-cd-mini-i586.kiwi ++++++ --- /var/tmp/diff_new_pack.HNcBFE/_old 2018-04-27 16:10:40.699306957 +0200 +++ /var/tmp/diff_new_pack.HNcBFE/_new 2018-04-27 16:10:40.699306957 +0200 @@ -1,4 +1,4 @@ -<image name="OBS__openSUSE___20180426" schemaversion="4.1"> +<image name="OBS__openSUSE___20180427" schemaversion="4.1"> <description type="system"> <author>The SUSE Team</author> <contact>build(a)opensuse.org</contact> @@ -32,9 +32,9 @@ <productvar name="SEPARATE_MEDIA">true</productvar> <productvar name="SHA1OPT">-x -2</productvar> <productvar name="VENDOR">openSUSE</productvar> - <productvar name="VERSION">20180426</productvar> + <productvar name="VERSION">20180427</productvar> <productinfo name="CONTENTSTYLE">11</productinfo> - <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20180426,openSUSE Tumbleweed</productinfo> + <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20180427,openSUSE Tumbleweed</productinfo> <productinfo name="LINGUAS">cs da de en en_GB en_US es fi fr hu it ja nb nl pl pt pt_BR ru sv zh zh_CN zh_TW </productinfo> <productinfo name="VENDOR">openSUSE</productinfo> <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption> _service:product_converter:openSUSE-cd-mini-x86_64.kiwi: same change _service:product_converter:openSUSE-dvd5-dvd-i586.kiwi: same change _service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi: same change ++++++ _service:product_converter:openSUSE-ftp-ftp-i586_x86_64.kiwi ++++++ --- /var/tmp/diff_new_pack.HNcBFE/_old 2018-04-27 16:10:40.779304023 +0200 +++ /var/tmp/diff_new_pack.HNcBFE/_new 2018-04-27 16:10:40.779304023 +0200 @@ -1,4 +1,4 @@ -<image name="OBS__openSUSE___20180426" schemaversion="4.1"> +<image name="OBS__openSUSE___20180427" schemaversion="4.1"> <description type="system"> <author>The SUSE Team</author> <contact>build(a)opensuse.org</contact> @@ -24,7 +24,7 @@ <productvar name="DISTNAME">openSUSE</productvar> <productvar name="FLAVOR">ftp</productvar> <productvar name="MAKE_LISTINGS">true</productvar> - <productvar name="MEDIUM_NAME">openSUSE-20180426-i586-x86_64</productvar> + <productvar name="MEDIUM_NAME">openSUSE-20180427-i586-x86_64</productvar> <productvar name="MULTIPLE_MEDIA">true</productvar> <productvar name="PRODUCT_DIR">/</productvar> <productvar name="PRODUCT_NAME">$DISTNAME-$FLAVOR</productvar> @@ -36,9 +36,9 @@ <productvar name="SEPARATE_MEDIA">true</productvar> <productvar name="SHA1OPT">-x -2</productvar> <productvar name="VENDOR">openSUSE</productvar> - <productvar name="VERSION">20180426</productvar> + <productvar name="VERSION">20180427</productvar> <productinfo name="CONTENTSTYLE">11</productinfo> - <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20180426,openSUSE Tumbleweed</productinfo> + <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20180427,openSUSE Tumbleweed</productinfo> <productinfo name="LINGUAS">cs da de en en_GB en_US es fi fr hu it ja nb nl pl pt pt_BR ru sv zh zh_CN zh_TW </productinfo> <productinfo name="VENDOR">openSUSE</productinfo> <productoption name="DEBUGMEDIUM">2</productoption> ++++++ _service:product_converter:openSUSE-release.spec ++++++ --- /var/tmp/diff_new_pack.HNcBFE/_old 2018-04-27 16:10:40.819302556 +0200 +++ /var/tmp/diff_new_pack.HNcBFE/_new 2018-04-27 16:10:40.839301823 +0200 @@ -20,7 +20,7 @@ #define betaversion %{nil} %define codename Tumbleweed Name: openSUSE-release -Version: 20180426 +Version: 20180427 Release: 0 # 0 is the product release, not the build release of this package Summary: openSUSE Tumbleweed @@ -51,7 +51,7 @@ Obsoletes: aaa_version Obsoletes: openSUSE-Promo-release <= 11.1 Obsoletes: openSUSE-release-live <= 11.0 -Obsoletes: product_flavor(%{product}) < 20180426 +Obsoletes: product_flavor(%{product}) < 20180427 # bnc#826592 Provides: weakremover(kernel-default) < 3.11 Provides: weakremover(kernel-desktop) < 4.2 @@ -61,7 +61,7 @@ Provides: weakremover(kernel-xen) < 3.11 Provides: %name-%version Provides: product() = openSUSE -Provides: product(openSUSE) = 20180426-0 +Provides: product(openSUSE) = 20180427-0 %ifarch x86_64 Provides: product-register-target() = openSUSE%2DTumbleweed%2Dx86_64 %endif @@ -75,7 +75,7 @@ Provides: product-register-target() = openSUSE%2DTumbleweed%2Daarch64 %endif Provides: product-label() = openSUSE -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20180426 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20180427 Provides: product-url(releasenotes) = http%3A%2F%2Fdoc.opensuse.org%2Frelease%2Dnotes%2Fx86_64%2FopenSUSE%2FTumbleweed%2Frelease%2Dnotes%2DopenSUSE.rpm Provides: product-url(repository) = http%3A%2F%2Fdownload.opensuse.org%2Ftumbleweed%2Frepo%2Foss%2F Requires: product_flavor(openSUSE) @@ -13557,7 +13557,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(ftp) -Provides: product_flavor(openSUSE) = 20180426-0 +Provides: product_flavor(openSUSE) = 20180427-0 Summary: openSUSE Tumbleweed %description ftp @@ -13572,7 +13572,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(mini) -Provides: product_flavor(openSUSE) = 20180426-0 +Provides: product_flavor(openSUSE) = 20180427-0 Summary: openSUSE Tumbleweed %description mini @@ -13587,7 +13587,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(dvd) -Provides: product_flavor(openSUSE) = 20180426-0 +Provides: product_flavor(openSUSE) = 20180427-0 Summary: openSUSE Tumbleweed %description dvd @@ -13602,7 +13602,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-kde) -Provides: product_flavor(openSUSE) = 20180426-0 +Provides: product_flavor(openSUSE) = 20180427-0 Summary: openSUSE Tumbleweed %description livecd-kde @@ -13617,7 +13617,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-x11) -Provides: product_flavor(openSUSE) = 20180426-0 +Provides: product_flavor(openSUSE) = 20180427-0 Summary: openSUSE Tumbleweed %description livecd-x11 @@ -13632,7 +13632,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-gnome) -Provides: product_flavor(openSUSE) = 20180426-0 +Provides: product_flavor(openSUSE) = 20180427-0 Summary: openSUSE Tumbleweed %description livecd-gnome @@ -13647,7 +13647,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(usb-kde) -Provides: product_flavor(openSUSE) = 20180426-0 +Provides: product_flavor(openSUSE) = 20180427-0 Summary: openSUSE Tumbleweed %description usb-kde @@ -13662,7 +13662,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(usb-gnome) -Provides: product_flavor(openSUSE) = 20180426-0 +Provides: product_flavor(openSUSE) = 20180427-0 Summary: openSUSE Tumbleweed %description usb-gnome @@ -13677,7 +13677,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(usb-x11) -Provides: product_flavor(openSUSE) = 20180426-0 +Provides: product_flavor(openSUSE) = 20180427-0 Summary: openSUSE Tumbleweed %description usb-x11 @@ -13750,10 +13750,10 @@ <product schemeversion="0"> <vendor>openSUSE</vendor> <name>openSUSE</name> - <version>20180426</version> + <version>20180427</version> <release>0</release> <arch>%{_target_cpu}</arch> - <cpeid>cpe:/o:opensuse:opensuse:20180426</cpeid> + <cpeid>cpe:/o:opensuse:opensuse:20180427</cpeid> <productline>openSUSE</productline> <register> <pool> openSUSE-release.spec: same change ++++++ openSUSE-Tumbleweed-Kubic.product ++++++ --- /var/tmp/diff_new_pack.HNcBFE/_old 2018-04-27 16:10:41.159290087 +0200 +++ /var/tmp/diff_new_pack.HNcBFE/_new 2018-04-27 16:10:41.159290087 +0200 @@ -6,7 +6,7 @@ <name>openSUSE-Tumbleweed-Kubic</name> <releasepkgname>openSUSE-Tumbleweed-Kubic-release</releasepkgname> <endoflife/> - <version>20180426</version> + <version>20180427</version>  <release>0</release> <productline>openSUSE-Tumbleweed-Kubic</productline> ++++++ openSUSE.product ++++++ --- /var/tmp/diff_new_pack.HNcBFE/_old 2018-04-27 16:10:41.183289208 +0200 +++ /var/tmp/diff_new_pack.HNcBFE/_new 2018-04-27 16:10:41.183289208 +0200 @@ -4,7 +4,7 @@ <product> <vendor>openSUSE</vendor> <name>openSUSE</name> - <version>20180426</version> + <version>20180427</version> <release>0</release> <productline>openSUSE</productline>

1 0

commit kubernetes-salt for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '18

27 Apr '18

Hello community, here is the log from the commit of package kubernetes-salt for openSUSE:Factory checked in at 2018-04-27 16:10:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kubernetes-salt (Old) and /work/SRC/openSUSE:Factory/.kubernetes-salt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kubernetes-salt" Fri Apr 27 16:10:18 2018 rev:15 rq:601903 version:3.0.0+git_r742_8508870 Changes: -------- --- /work/SRC/openSUSE:Factory/kubernetes-salt/kubernetes-salt.changes 2018-04-24 15:34:13.207854421 +0200 +++ /work/SRC/openSUSE:Factory/.kubernetes-salt.new/kubernetes-salt.changes 2018-04-27 16:10:20.752038484 +0200 @@ -1,0 +2,84 @@ +Thu Apr 26 09:56:06 UTC 2018 - containers-bugowner(a)suse.de + +- Commit c3b81a6 by Flavio Castelli fcastelli(a)suse.com + Ensure swap is disabled before kubelet is started + + We have to ensure the swap state is executed before the kubelet service is + started, otherwise kubelt won't run and this will lead to issues like the + ones causing bsc#1090337 + + Signed-off-by: Flavio Castelli <fcastelli(a)suse.com> + + +------------------------------------------------------------------- +Wed Apr 25 12:10:02 UTC 2018 - containers-bugowner(a)suse.de + +- Commit 24bea3d by Nirmoy Das ndas(a)suse.de + cni: add cilium as alternate to flannel plugin + + +------------------------------------------------------------------- +Tue Apr 24 15:58:27 UTC 2018 - containers-bugowner(a)suse.de + +- Commit 1fd2a98 by Alvaro Saurin alvaro.saurin(a)gmail.com + Remove leftover file + + feature#node_removal + + +------------------------------------------------------------------- +Tue Apr 24 09:21:14 UTC 2018 - containers-bugowner(a)suse.de + +- Commit e1b9c75 by Kiall Mac Innes kiall(a)macinnes.ie + Update tiller tag to 2.8.2 + + This matches the tag used in the updated image via SR#162727. + + +------------------------------------------------------------------- +Tue Apr 24 08:42:18 UTC 2018 - containers-bugowner(a)suse.de + +- Commit 3e70e4f by Alvaro Saurin alvaro.saurin(a)gmail.com + Use get_with_expr() + + feature#node_removal + + Commit b4d09dd by Alvaro Saurin alvaro.saurin(a)gmail.com + Convert integers in the pillar to real integers. Unit tests for the + get_pillar() function. + + See https://trello.com/c/O7daOErL + + feature#node_removal + + Commit 0d65d79 by Alvaro Saurin alvaro.saurin(a)gmail.com + Fix: do not include the current node in the list + of endpoints when adding a new member. Unit tests for the etcd modoule. + + See https://trello.com/c/O7daOErL + + feature#node_removal + + Commit 399f7ea by Alvaro Saurin alvaro.saurin(a)gmail.com + Try to resist unresponsive nodes when removing a node. + * the replacement will not be chosen from + the unresponsive nodes + * affected nodes will exclude them too. Possibility to skip any action on + the target (with the `skip` pillar), so we can remove unresponsive targets + while still looking for replacements. + + See https://trello.com/c/O7daOErL + + feature#node_removal + + +------------------------------------------------------------------- +Tue Apr 24 07:58:31 UTC 2018 - containers-bugowner(a)suse.de + +- Commit f80f752 by Alvaro Saurin alvaro.saurin(a)gmail.com + Don't to remove some things that are not so important. + + feature#node_removal + + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kubernetes-salt.spec ++++++ --- /var/tmp/diff_new_pack.UxiAiM/_old 2018-04-27 16:10:21.396014867 +0200 +++ /var/tmp/diff_new_pack.UxiAiM/_new 2018-04-27 16:10:21.400014720 +0200 @@ -32,7 +32,7 @@ Name: kubernetes-salt %define gitrepo salt -Version: 3.0.0+git_r727_68280fa +Version: 3.0.0+git_r742_8508870 Release: 0 BuildArch: noarch Summary: Production-Grade Container Scheduling and Management ++++++ master.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/pillar/certificates.sls new/salt-master/pillar/certificates.sls --- old/salt-master/pillar/certificates.sls 2018-04-23 14:03:55.000000000 +0200 +++ new/salt-master/pillar/certificates.sls 2018-04-26 11:56:10.000000000 +0200 @@ -50,3 +50,6 @@ kube_proxy_key: '/etc/pki/kube-proxy.key' kube_proxy_crt: '/etc/pki/kube-proxy.crt' + + cilium_key: '/etc/pki/cilium.key' + cilium_crt: '/etc/pki/cilium.crt' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/_modules/caasp_etcd.py new/salt-master/salt/_modules/caasp_etcd.py --- old/salt-master/salt/_modules/caasp_etcd.py 2018-04-23 14:03:55.000000000 +0200 +++ new/salt-master/salt/_modules/caasp_etcd.py 2018-04-26 11:56:10.000000000 +0200 @@ -173,6 +173,7 @@ error('no etcd members available!!') raise NoEtcdServersException() + etcd_members_lst.sort() return sep.join(etcd_members_lst) @@ -221,7 +222,7 @@ return member_line.split(':')[0] except Exception as e: - error("cannot get member ID: %s", e) - error("output: %s", members_output) + error('cannot get member ID for "%s": %s', e, this_nodename) + error('output: %s', members_output) return '' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/_modules/caasp_nodes.py new/salt-master/salt/_modules/caasp_nodes.py --- old/salt-master/salt/_modules/caasp_nodes.py 2018-04-23 14:03:55.000000000 +0200 +++ new/salt-master/salt/_modules/caasp_nodes.py 2018-04-26 11:56:10.000000000 +0200 @@ -100,9 +100,10 @@ } -# filter out empty/None and sort a list +# for a list `lst`, filter out empty/None, remove duplicates and sort it def _sanitize_list(lst): res = [x for x in lst if x] + res = list(set(res)) res.sort() return res @@ -240,6 +241,9 @@ elif replacement_provided and replacement in forbidden: abort('%s cannot be replaced by %s: the replacement has a "ca" or "admin" role', target, replacement) + elif replacement_provided and replacement in excluded: + abort('%s cannot be replaced by %s: the replacement is in the list of nodes excluded', + target, replacement) masters = get_from_args_or_with_expr( 'masters', kwargs, 'G@roles:kube-master') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/_modules/caasp_pillar.py new/salt-master/salt/_modules/caasp_pillar.py --- old/salt-master/salt/_modules/caasp_pillar.py 2018-04-23 14:03:55.000000000 +0200 +++ new/salt-master/salt/_modules/caasp_pillar.py 2018-04-26 11:56:10.000000000 +0200 @@ -20,9 +20,16 @@ res = __salt__['pillar.get'](name, None) if res is None: res = default + if isinstance(res, basestring): + try: + return int(res) + except ValueError: + pass + if res.lower() in ["true", "yes", "on"]: return True elif res.lower() in ["false", "no", "off"]: return False + return res diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/_modules/tests/test_caasp_etcd.py new/salt-master/salt/_modules/tests/test_caasp_etcd.py --- old/salt-master/salt/_modules/tests/test_caasp_etcd.py 1970-01-01 01:00:00.000000000 +0100 +++ new/salt-master/salt/_modules/tests/test_caasp_etcd.py 2018-04-26 11:56:10.000000000 +0200 @@ -0,0 +1,55 @@ +from __future__ import absolute_import + +import unittest + +import caasp_etcd +from caasp_etcd import ETCD_CLIENT_PORT, get_endpoints +from caasp_log import ExecutionAborted + +try: + from mock import patch, MagicMock +except ImportError: + _mocking_lib_available = False +else: + _mocking_lib_available = True + + +caasp_etcd.__salt__ = {} + + +class TestGetEndpoints(unittest.TestCase): + ''' + Some basic tests for get_from_args_or_with_expr() + ''' + + def test_get_endpoints(self): + nodes = { + 'AAA': 'node1', + 'BBB': 'node2', + 'CCC': 'node3' + } + + mock = MagicMock(return_value=nodes) + with patch.dict(caasp_etcd.__salt__, {'caasp_grains.get': mock}): + res = get_endpoints() + mock.assert_called_once_with('G@roles:etcd') + + for i in nodes.values(): + self.assertIn('https://{}:{}'.format(i, ETCD_CLIENT_PORT), res, + 'did not get the expected list of etcd endpoints: {}'.format(res)) + + mock.reset_mock() + + res = get_endpoints(with_id=True) + mock.assert_called_once_with('G@roles:etcd') + + for (j, k) in nodes.items(): + self.assertIn('{}=https://{}:{}'.format(j, k, ETCD_CLIENT_PORT), res, + 'did not get the expected list of etcd endpoints: {}'.format(res)) + + mock.reset_mock() + + res = get_endpoints(skip_removed=True) + mock.assert_called_once_with('G@roles:etcd and not G@removal_in_progress:true') + + mock.reset_mock() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/_modules/tests/test_caasp_nodes.py new/salt-master/salt/_modules/tests/test_caasp_nodes.py --- old/salt-master/salt/_modules/tests/test_caasp_nodes.py 2018-04-23 14:03:55.000000000 +0200 +++ new/salt-master/salt/_modules/tests/test_caasp_nodes.py 2018-04-26 11:56:10.000000000 +0200 @@ -212,6 +212,13 @@ self.assertIn('kube-minion', roles, 'kube-minion role not found in replacement') + # check we cannot use an excluded node + with self.assertRaises(ExecutionAborted): + replacement, roles = get_replacement_for(self.minion_1, + replacement=self.minion_3, + excluded=[self.minion_3], + **self.get_replacement_for_kwargs) + def test_invalid_etcd_replacement(self): ''' Check get_replacement_for() realizes a minion diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/_modules/tests/test_caasp_pillar.py new/salt-master/salt/_modules/tests/test_caasp_pillar.py --- old/salt-master/salt/_modules/tests/test_caasp_pillar.py 1970-01-01 01:00:00.000000000 +0100 +++ new/salt-master/salt/_modules/tests/test_caasp_pillar.py 2018-04-26 11:56:10.000000000 +0200 @@ -0,0 +1,49 @@ +from __future__ import absolute_import + +import unittest + +import caasp_pillar +from caasp_log import ExecutionAborted +from caasp_pillar import get as get_pillar + +try: + from mock import patch, MagicMock +except ImportError: + _mocking_lib_available = False +else: + _mocking_lib_available = True + + +caasp_pillar.__salt__ = {} + + +class TestGetPillar(unittest.TestCase): + ''' + Some basic tests for caasp_pillar.get() + ''' + + def test_get_pillar(self): + + mock = MagicMock() + with patch.dict(caasp_pillar.__salt__, {'pillar.get': mock}): + # check we get a integer + mock.return_value = '123' + res = get_pillar('some_int_pillar') + self.assertTrue(isinstance(res, int), + 'expected to get a integer: {}'.format(res)) + mock.reset_mock() + + # check we get a boolean + for value in ['true', 'on', 'TRUE']: + mock.return_value = value + res = get_pillar('some_bool_pillar') + self.assertTrue(isinstance(res, bool), + 'expected to get a bool: {}'.format(res)) + mock.reset_mock() + + # check we get a string + mock.return_value = 'something' + res = get_pillar('some_str_pillar') + self.assertTrue(isinstance(res, str), + 'expected to get a string: {}'.format(res)) + mock.reset_mock() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/_states/caasp_etcd.py new/salt-master/salt/_states/caasp_etcd.py --- old/salt-master/salt/_states/caasp_etcd.py 2018-04-23 14:03:55.000000000 +0200 +++ new/salt-master/salt/_states/caasp_etcd.py 2018-04-26 11:56:10.000000000 +0200 @@ -21,13 +21,22 @@ def etcdctl(name, retry={}, **kwargs): ''' Run an etcdctl command + + Arguments: + + In addition to all the arguments supported by the `caasp_cmd.run` state. + + * `skip_this`: (optional) skip current node when calculating the list of etcd endpoints. + ''' retry_ = {'attempts': DEFAULT_ATTEMPTS, 'interval': DEFAULT_ATTEMPTS_INTERVAL, 'until': None} retry_.update(retry) - args = __salt__['caasp_etcd.get_etcdctl_args_str']() + skip_this = kwargs.pop('skip_this', False) + + args = __salt__['caasp_etcd.get_etcdctl_args_str'](skip_this=skip_this) cmd = 'etcdctl {} {}'.format(args, name) log.debug('CaaS: running etcdctl as: %s', cmd) @@ -53,7 +62,7 @@ name = 'member add {} {}'.format(this_id, this_peer_url) log.debug('CaaS: adding etcd member') - return etcdctl(name=name, **kwargs) + return etcdctl(name=name, skip_this=True, **kwargs) # once the member has been added to the cluster, we # must make sure etcd joins an "existing" cluster. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/addons/remove-pre-reboot.sls new/salt-master/salt/addons/remove-pre-reboot.sls --- old/salt-master/salt/addons/remove-pre-reboot.sls 2018-04-23 14:03:55.000000000 +0200 +++ new/salt-master/salt/addons/remove-pre-reboot.sls 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ - -/etc/kubernetes/addons/namespace.yaml: - file.absent diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/addons/tiller/manifests/20-deployment.yaml new/salt-master/salt/addons/tiller/manifests/20-deployment.yaml --- old/salt-master/salt/addons/tiller/manifests/20-deployment.yaml 2018-04-23 14:03:55.000000000 +0200 +++ new/salt-master/salt/addons/tiller/manifests/20-deployment.yaml 2018-04-26 11:56:10.000000000 +0200 @@ -34,7 +34,7 @@ - env: - name: TILLER_NAMESPACE value: kube-system - image: sles12/tiller:2.7.2 + image: sles12/tiller:2.8.2 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/cert/remove-pre-reboot.sls new/salt-master/salt/cert/remove-pre-reboot.sls --- old/salt-master/salt/cert/remove-pre-reboot.sls 1970-01-01 01:00:00.000000000 +0100 +++ new/salt-master/salt/cert/remove-pre-reboot.sls 2018-04-26 11:56:10.000000000 +0200 @@ -0,0 +1,6 @@ + +{{ pillar['ssl']['crt_file'] }}: + file.absent + +{{ pillar['ssl']['key_file'] }}: + file.absent diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/cleanup/remove-post-orchestration.sls new/salt-master/salt/cleanup/remove-post-orchestration.sls --- old/salt-master/salt/cleanup/remove-post-orchestration.sls 2018-04-23 14:03:55.000000000 +0200 +++ new/salt-master/salt/cleanup/remove-post-orchestration.sls 2018-04-26 11:56:10.000000000 +0200 @@ -10,7 +10,7 @@ # k8s cluster ############### -{%- set k8s_nodes = salt['mine.get']('roles:(kube-master|kube-minion)', 'nodename', expr_form='grain_pcre').keys() %} +{%- set k8s_nodes = salt.caasp_nodes.get_with_expr('G@roles:kube-master', booted=True) %} {%- if forced or target in k8s_nodes %} {%- from '_macros/kubectl.jinja' import kubectl with context %} @@ -24,7 +24,7 @@ # etcd node ############### -{%- set etcd_members = salt['mine.get']('roles:etcd', 'nodename', expr_form='grain').keys() %} +{%- set etcd_members = salt.caasp_nodes.get_with_expr('G@roles:etcd', booted=True) %} {%- if forced or target in etcd_members %} etcd-remove-member: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/cleanup/remove-pre-reboot.sls new/salt-master/salt/cleanup/remove-pre-reboot.sls --- old/salt-master/salt/cleanup/remove-pre-reboot.sls 2018-04-23 14:03:55.000000000 +0200 +++ new/salt-master/salt/cleanup/remove-pre-reboot.sls 2018-04-26 11:56:10.000000000 +0200 @@ -2,24 +2,10 @@ # try to remove some dirs that could contain sensitive # information, even when they were not directly managed by us -wipe-etc-kubernetes: - cmd.run: - - name: rm -rf /etc/kubernetes/* - wipe-certificates: cmd.run: - name: rm -rf /var/lib/ca-certificates/* -# remove some logs that could contain sensitive information -wipe-var-log: - cmd.run: - - name: |- - for f in apparmor audit containers faillog firewall localmessages pods zypper.log YaST2 ; do - rm -rf /var/log/$f - done - # NOTE: do not try to remove /var/log/salt - # or the Salt minion will crash... - # cleanup all the Salt things we can # NOTE: we must be careful (or Salt will stop working) cleanup-salt: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/cni/cilium/init.sls new/salt-master/salt/cni/cilium/init.sls --- old/salt-master/salt/cni/cilium/init.sls 1970-01-01 01:00:00.000000000 +0100 +++ new/salt-master/salt/cni/cilium/init.sls 2018-04-26 11:56:10.000000000 +0200 @@ -0,0 +1,21 @@ +{% set plugin = salt['pillar.get']('cni:plugin', 'cilium').lower() %} +{% if plugin == "cilium" %} + +include: + - ca-cert + - cert + - crypto + +{% from '_macros/certs.jinja' import certs with context %} +{{ certs("cilium", + pillar['ssl']['cilium_crt'], + pillar['ssl']['cilium_key'], + cn = grains['nodename'], + o = 'system:nodes') }} + +{% else %} +{# See https://github.com/saltstack/salt/issues/14553 #} +dummy_step: + cmd.run: + - name: "echo saltstack bug 14553" +{% endif %} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/cni/cilium-config.yaml.jinja new/salt-master/salt/cni/cilium-config.yaml.jinja --- old/salt-master/salt/cni/cilium-config.yaml.jinja 1970-01-01 01:00:00.000000000 +0100 +++ new/salt-master/salt/cni/cilium-config.yaml.jinja 2018-04-26 11:56:10.000000000 +0200 @@ -0,0 +1,30 @@ +kind: ConfigMap +apiVersion: v1 +metadata: + name: cilium-config + namespace: kube-system +data: + # This etcd-config contains the etcd endpoints of your cluster. If you use + # TLS please make sure you uncomment the ca-file line and add the respective + # certificate has a k8s secret, see explanation below in the comment labeled + # "ETCD-CERT" + etcd-config: |- + --- + endpoints: +{%- for endpoints in salt.caasp_etcd.get_endpoints().split(',') %} + - {{ endpoints }} +{%- endfor %} + # + # In case you want to use TLS in etcd, uncomment the following line + # and add the certificate as explained in the comment labeled "ETCD-CERT" + ca-file: '/etc/pki/trust/anchors/SUSE_CaaSP_CA.crt' + # + # In case you want client to server authentication, uncomment the following + # lines and add the certificate and key in cilium-etcd-secrets below + key-file: '{{ cilium_key }}' + cert-file: '{{ cilium_certificate }}' + + # If you want to run cilium in debug mode change this value to true + debug: "false" + disable-ipv4: "false" + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/cni/cilium-ds.yaml.jinja new/salt-master/salt/cni/cilium-ds.yaml.jinja --- old/salt-master/salt/cni/cilium-ds.yaml.jinja 1970-01-01 01:00:00.000000000 +0100 +++ new/salt-master/salt/cni/cilium-ds.yaml.jinja 2018-04-26 11:56:10.000000000 +0200 @@ -0,0 +1,171 @@ +kind: DaemonSet +apiVersion: apps/v1 +metadata: + name: cilium + namespace: kube-system +spec: + updateStrategy: + type: "RollingUpdate" + rollingUpdate: + # Specifies the maximum number of Pods that can be unavailable during the update process. + # The current default value is 1 or 100% for daemonsets; Adding an explicit value here + # to avoid confusion, as the default value is specific to the type (daemonset/deployment). + maxUnavailable: "100%" + selector: + matchLabels: + k8s-app: cilium + kubernetes.io/cluster-service: "true" + template: + metadata: + labels: + k8s-app: cilium + kubernetes.io/cluster-service: "true" + annotations: + # This annotation plus the CriticalAddonsOnly toleration makes + # cilium to be a critical pod in the cluster, which ensures cilium + # gets priority scheduling. + # https://kubernetes.io/docs/tasks/administer-cluster/guaranteed-scheduling-c… + scheduler.alpha.kubernetes.io/critical-pod: '' + scheduler.alpha.kubernetes.io/tolerations: >- + [{"key":"dedicated","operator":"Equal","value":"master","effect":"NoSchedule"}] + spec: + serviceAccountName: cilium + initContainers: + - name: install-cni-conf + image: {{ pillar['cilium']['image'] }} + command: + - /bin/sh + - "-c" + - "cp -f /etc/cni/net.d/10-cilium-cni.conf /host/etc/cni/net.d/10-cilium-cni.conf" + volumeMounts: + - name: host-cni-conf + mountPath: /host/etc/cni/net.d + - name: install-cni-bin + image: {{ pillar['cilium']['image'] }} + command: + - /bin/sh + - "-c" + - "cp -f /usr/lib/cni/* /host/opt/cni/bin/" + volumeMounts: + - name: host-cni-bin + mountPath: /host/opt/cni/bin/ + + containers: + - image: {{ pillar['cilium']['image'] }} + imagePullPolicy: IfNotPresent + name: cilium-agent + command: [ "cilium-agent" ] + args: + - "--debug=$(CILIUM_DEBUG)" + - "--disable-envoy-version-check" + - "-t=vxlan" + - "--kvstore=etcd" + - "--kvstore-opt=etcd.config=/var/lib/etcd-config/etcd.config" + - "--disable-ipv4=$(DISABLE_IPV4)" + ports: + - name: prometheus + containerPort: 9090 + lifecycle: + preStop: + exec: + command: + - "rm -f /host/etc/cni/net.d/10-cilium-cni.conf /host/opt/cni/bin/cilium-cni" + env: + - name: "K8S_NODE_NAME" + valueFrom: + fieldRef: + fieldPath: spec.nodeName + - name: "CILIUM_DEBUG" + valueFrom: + configMapKeyRef: + name: cilium-config + key: debug + - name: "DISABLE_IPV4" + valueFrom: + configMapKeyRef: + name: cilium-config + key: disable-ipv4 + livenessProbe: + exec: + command: + - cilium + - status + # The initial delay for the liveness probe is intentionally large to + # avoid an endless kill & restart cycle if in the event that the initial + # bootstrapping takes longer than expected. + initialDelaySeconds: 120 + failureThreshold: 10 + periodSeconds: 10 + readinessProbe: + exec: + command: + - cilium + - status + initialDelaySeconds: 5 + periodSeconds: 5 + volumeMounts: + - name: bpf-maps + mountPath: /sys/fs/bpf + - name: cilium-run + mountPath: /var/run/cilium + - name: host-cni-bin + mountPath: /host/opt/cni/bin/ + - name: host-cni-conf + mountPath: /host/etc/cni/net.d + - name: docker-socket + mountPath: /var/run/docker.sock + readOnly: true + - name: etcd-config-path + mountPath: /var/lib/etcd-config + readOnly: true + - name: etcd-certs + mountPath: /etc/pki + readOnly: true + securityContext: + capabilities: + add: + - "NET_ADMIN" + privileged: true + hostNetwork: true + volumes: + # To keep state between restarts / upgrades + - name: cilium-run + hostPath: + path: /var/run/cilium + # To keep state between restarts / upgrades + - name: bpf-maps + hostPath: + path: /sys/fs/bpf + # To read docker events from the node + - name: docker-socket + hostPath: + path: /var/run/docker.sock + # To install cilium cni plugin in the host + - name: host-cni-bin + hostPath: + path: {{ pillar['cni']['dirs']['bin'] }} + # To install cilium cni configuration in the host + - name: host-cni-conf + hostPath: + path: {{ pillar['cni']['dirs']['conf'] }} + # To read the etcd config stored in config maps + - name: etcd-config-path + configMap: + name: cilium-config + items: + - key: etcd-config + path: etcd.config + - name: etcd-certs + hostPath: + path: /etc/pki + restartPolicy: Always + tolerations: + - effect: NoSchedule + key: node-role.kubernetes.io/master + - effect: NoSchedule + key: node.cloudprovider.kubernetes.io/uninitialized + value: "true" + # Mark cilium's pod as critical for rescheduling + - key: CriticalAddonsOnly + operator: "Exists" + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/cni/cilium-rbac.yaml.jinja new/salt-master/salt/cni/cilium-rbac.yaml.jinja --- old/salt-master/salt/cni/cilium-rbac.yaml.jinja 1970-01-01 01:00:00.000000000 +0100 +++ new/salt-master/salt/cni/cilium-rbac.yaml.jinja 2018-04-26 11:56:10.000000000 +0200 @@ -0,0 +1,98 @@ +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: cilium + namespace: kube-system +--- +kind: ClusterRoleBinding +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: cilium +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: cilium +subjects: +- kind: ServiceAccount + name: cilium + namespace: kube-system +- kind: Group + name: system:nodes +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: suse:caasp:psp:cilium +roleRef: + kind: ClusterRole + name: suse:caasp:psp:privileged + apiGroup: rbac.authorization.k8s.io +subjects: +- kind: ServiceAccount + name: cilium + namespace: kube-system +--- +kind: ClusterRole +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: cilium +rules: +- apiGroups: + - "networking.k8s.io" + resources: + - networkpolicies + verbs: + - get + - list + - watch +- apiGroups: + - "" + resources: + - namespaces + - services + - nodes + - endpoints + - componentstatuses + verbs: + - get + - list + - watch +- apiGroups: + - "" + resources: + - pods + - nodes + verbs: + - get + - list + - watch + - update +- apiGroups: + - extensions + resources: + - networkpolicies #FIXME remove this when we drop support for k8s NP-beta GH-1202 + - thirdpartyresources + - ingresses + verbs: + - create + - get + - list + - watch +- apiGroups: + - "apiextensions.k8s.io" + resources: + - customresourcedefinitions + verbs: + - create + - get + - list + - watch + - update +- apiGroups: + - cilium.io + resources: + - ciliumnetworkpolicies + - ciliumendpoints + verbs: + - "*" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/cni/init.sls new/salt-master/salt/cni/init.sls --- old/salt-master/salt/cni/init.sls 2018-04-23 14:03:55.000000000 +0200 +++ new/salt-master/salt/cni/init.sls 2018-04-26 11:56:10.000000000 +0200 @@ -3,11 +3,12 @@ - addons - kubectl-config +{% set plugin = salt['pillar.get']('cni:plugin', 'flannel').lower() %} + ####################### # flannel CNI plugin ####################### -{% set plugin = salt['pillar.get']('cni:plugin', 'flannel').lower() %} {% if plugin == "flannel" %} /etc/kubernetes/addons/kube-flannel-rbac.yaml: @@ -48,3 +49,66 @@ - file: /etc/kubernetes/addons/kube-flannel-rbac.yaml {% endif %} + +{% if plugin == "cilium" %} +/etc/kubernetes/addons/cilium-config.yaml: + file.managed: + - source: salt://cni/cilium-config.yaml.jinja + - template: jinja + - makedirs: true + - require: + - file: /etc/kubernetes/addons + - defaults: + user: 'cluster-admin' + cilium_certificate: {{ pillar['ssl']['cilium_crt'] }} + cilium_key: {{ pillar['ssl']['cilium_key'] }} + + cmd.run: + - name: | + kubectl apply --namespace kube-system -f /etc/kubernetes/addons/cilium-config.yaml + - env: + - KUBECONFIG: {{ pillar['paths']['kubeconfig'] }} + - require: + - kube-apiserver + - file: {{ pillar['paths']['kubeconfig'] }} + - watch: + - file: /etc/kubernetes/addons/cilium-config.yaml + +/etc/kubernetes/addons/cilium-rbac.yaml: + file.managed: + - source: salt://cni/cilium-rbac.yaml.jinja + - template: jinja + - makedirs: true + - require: + - file: /etc/kubernetes/addons + cmd.run: + - name: | + kubectl apply --namespace kube-system -f /etc/kubernetes/addons/cilium-rbac.yaml + - env: + - KUBECONFIG: {{ pillar['paths']['kubeconfig'] }} + - require: + - kube-apiserver + - file: {{ pillar['paths']['kubeconfig'] }} + - watch: + - file: /etc/kubernetes/addons/cilium-rbac.yaml + +/etc/kubernetes/addons/cilium-ds.yaml: + file.managed: + - source: salt://cni/cilium-ds.yaml.jinja + - template: jinja + - makedirs: true + - require: + - file: /etc/kubernetes/addons + cmd.run: + - name: | + kubectl apply --namespace kube-system -f /etc/kubernetes/addons/cilium-ds.yaml + - env: + - KUBECONFIG: {{ pillar['paths']['kubeconfig'] }} + - require: + - kube-apiserver + - file: {{ pillar['paths']['kubeconfig'] }} + - watch: + - /etc/kubernetes/addons/cilium-config.yaml + - file: /etc/kubernetes/addons/cilium-config.yaml + +{% endif %} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/cni/remove-pre-reboot.sls new/salt-master/salt/cni/remove-pre-reboot.sls --- old/salt-master/salt/cni/remove-pre-reboot.sls 2018-04-23 14:03:55.000000000 +0200 +++ new/salt-master/salt/cni/remove-pre-reboot.sls 1970-01-01 01:00:00.000000000 +0100 @@ -1,7 +0,0 @@ -# cleanup all the things we have created - -/etc/kubernetes/addons/kube-flannel-rbac.yaml: - file.absent - -/etc/kubernetes/addons/kube-flannel.yaml: - file.absent diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/crio/remove-pre-reboot.sls new/salt-master/salt/crio/remove-pre-reboot.sls --- old/salt-master/salt/crio/remove-pre-reboot.sls 2018-04-23 14:03:55.000000000 +0200 +++ new/salt-master/salt/crio/remove-pre-reboot.sls 1970-01-01 01:00:00.000000000 +0100 @@ -1,13 +0,0 @@ -# cleanup all the things we have created - -/etc/systemd/system/kubelet.service.d/kubelet.conf: - file.absent - -/var/lib/containers/storage: - cmd.run: - - name: |- - for subvolume in {{pillar['cri']['crio']['dirs']['root']}}/btrfs/subvolumes/* ; do - btrfs subvolume delete $subvolume - done - rm -rf {{pillar['cri']['crio']['dirs']['root']}}* - rm -rf {{pillar['cri']['crio']['dirs']['runroot']}}* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/docker/remove-pre-reboot.sls new/salt-master/salt/docker/remove-pre-reboot.sls --- old/salt-master/salt/docker/remove-pre-reboot.sls 2018-04-23 14:03:55.000000000 +0200 +++ new/salt-master/salt/docker/remove-pre-reboot.sls 2018-04-26 11:56:10.000000000 +0200 @@ -1,21 +1,4 @@ -# cleanup all the things we have created -/etc/systemd/system/docker.service.d/proxy.conf: - file.absent - -/etc/docker/daemon.json: - file.absent - -/etc/sysconfig/docker: - file.absent /etc/docker/certs.d: file.absent - -/var/lib/docker: - cmd.run: - - name: |- - for subvolume in /var/lib/docker/btrfs/subvolumes/* ; do - btrfs subvolume delete $subvolume - done - rm -rf /var/lib/docker/* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/etc-hosts/remove-pre-reboot.sls new/salt-master/salt/etc-hosts/remove-pre-reboot.sls --- old/salt-master/salt/etc-hosts/remove-pre-reboot.sls 2018-04-23 14:03:55.000000000 +0200 +++ new/salt-master/salt/etc-hosts/remove-pre-reboot.sls 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -# cleanup all the things we have created - -/etc/hosts: - file.absent diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/etcd/init.sls new/salt-master/salt/etcd/init.sls --- old/salt-master/salt/etcd/init.sls 2018-04-23 14:03:55.000000000 +0200 +++ new/salt-master/salt/etcd/init.sls 2018-04-26 11:56:10.000000000 +0200 @@ -14,6 +14,9 @@ - require: - file: /etc/zypp/repos.d/containers.repo caasp_etcd.member_add: + - retry: + interval: 4 + attempts: 15 - require: - {{ pillar['ssl']['crt_file'] }} - {{ pillar['ssl']['key_file'] }} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/etcd/remove-pre-reboot.sls new/salt-master/salt/etcd/remove-pre-reboot.sls --- old/salt-master/salt/etcd/remove-pre-reboot.sls 2018-04-23 14:03:55.000000000 +0200 +++ new/salt-master/salt/etcd/remove-pre-reboot.sls 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ - -# cleanup all the things we have created for etcd - -/etc/sysconfig/etcd: - file.absent - -/etc/sysconfig/etcdctl: - file.absent - -/etc/systemd/system/etcd.service.d/etcd.conf: - file.absent - -etcd-user-removal: - user.absent: - - name: etcd - -etcd-group-removal: - group.absent: - - name: etcd - -etcd-wipe-var-lib: - cmd.run: - - name: rm -rf /var/lib/etcd/* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/etcd/remove-pre-stop-services.sls new/salt-master/salt/etcd/remove-pre-stop-services.sls --- old/salt-master/salt/etcd/remove-pre-stop-services.sls 2018-04-23 14:03:55.000000000 +0200 +++ new/salt-master/salt/etcd/remove-pre-stop-services.sls 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ - -# this node is being removed from the cluster, -# but etcd is still running: -# we explicitly remove the node from the etcd cluster, -# so it is not considered a node suffering some -# transient failure... -etcd-remove-member: - caasp_etcd.member_remove: - - nodename: {{ salt['pillar.get']('nodename', grains['nodename']) }} - # NOTE: we are not requiring /etc/hosts or the certificates - # because we are assuming this node was on high state diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/kube-apiserver/remove-pre-reboot.sls new/salt-master/salt/kube-apiserver/remove-pre-reboot.sls --- old/salt-master/salt/kube-apiserver/remove-pre-reboot.sls 2018-04-23 14:03:55.000000000 +0200 +++ new/salt-master/salt/kube-apiserver/remove-pre-reboot.sls 2018-04-26 11:56:10.000000000 +0200 @@ -8,6 +8,3 @@ {{ pillar['ssl']['kube_apiserver_key'] }}: file.absent - -/etc/kubernetes/apiserver: - file.absent diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/kube-controller-manager/remove-pre-reboot.sls new/salt-master/salt/kube-controller-manager/remove-pre-reboot.sls --- old/salt-master/salt/kube-controller-manager/remove-pre-reboot.sls 2018-04-23 14:03:55.000000000 +0200 +++ new/salt-master/salt/kube-controller-manager/remove-pre-reboot.sls 2018-04-26 11:56:10.000000000 +0200 @@ -11,6 +11,3 @@ {{ pillar['paths']['service_account_key'] }}: file.absent - -{{ pillar['paths']['kube_controller_mgr_config'] }}: - file.absent diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/kube-proxy/remove-pre-reboot.sls new/salt-master/salt/kube-proxy/remove-pre-reboot.sls --- old/salt-master/salt/kube-proxy/remove-pre-reboot.sls 2018-04-23 14:03:55.000000000 +0200 +++ new/salt-master/salt/kube-proxy/remove-pre-reboot.sls 2018-04-26 11:56:10.000000000 +0200 @@ -8,6 +8,3 @@ {{ pillar['ssl']['kube_proxy_key'] }}: file.absent - -{{ pillar['paths']['kube_proxy_config'] }}: - file.absent diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/kube-scheduler/remove-pre-reboot.sls new/salt-master/salt/kube-scheduler/remove-pre-reboot.sls --- old/salt-master/salt/kube-scheduler/remove-pre-reboot.sls 2018-04-23 14:03:55.000000000 +0200 +++ new/salt-master/salt/kube-scheduler/remove-pre-reboot.sls 2018-04-26 11:56:10.000000000 +0200 @@ -8,6 +8,3 @@ {{ pillar['ssl']['kube_scheduler_key'] }}: file.absent - -{{ pillar['paths']['kube_scheduler_config'] }}: - file.absent diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/kubectl-config/remove-pre-reboot.sls new/salt-master/salt/kubectl-config/remove-pre-reboot.sls --- old/salt-master/salt/kubectl-config/remove-pre-reboot.sls 2018-04-23 14:03:55.000000000 +0200 +++ new/salt-master/salt/kubectl-config/remove-pre-reboot.sls 2018-04-26 11:56:10.000000000 +0200 @@ -5,9 +5,3 @@ {{ pillar['ssl']['kubectl_key'] }}: file.absent - -{{ pillar['paths']['kubeconfig'] }}: - file.absent - -/root/.kube: - file.absent diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/kubelet/init.sls new/salt-master/salt/kubelet/init.sls --- old/salt-master/salt/kubelet/init.sls 2018-04-23 14:03:55.000000000 +0200 +++ new/salt-master/salt/kubelet/init.sls 2018-04-26 11:56:10.000000000 +0200 @@ -4,6 +4,7 @@ - cert - kubernetes-common - kubectl-config + - swap /etc/kubernetes/kubelet-initial: file.managed: @@ -82,6 +83,7 @@ - file: /etc/kubernetes/manifests - file: /etc/kubernetes/kubelet-initial - kubelet-config + - cmd: unmount-swaps caasp_retriable.retry: - name: iptables-kubelet - target: iptables.append diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/kubelet/remove-pre-reboot.sls new/salt-master/salt/kubelet/remove-pre-reboot.sls --- old/salt-master/salt/kubelet/remove-pre-reboot.sls 2018-04-23 14:03:55.000000000 +0200 +++ new/salt-master/salt/kubelet/remove-pre-reboot.sls 2018-04-26 11:56:10.000000000 +0200 @@ -10,20 +10,10 @@ {{ pillar['ssl']['kubelet_key'] }}: file.absent -/etc/kubernetes/kubelet-initial: - file.absent - +# this file can contain sensitive information, so it must be removed too {{ pillar['paths']['kubelet_config'] }}: file.absent +# and this one too /etc/kubernetes/openstack-config: file.absent - -wipe-var-lib-kubelet: - cmd.run: - - name: |- - mnts=`mount | grep kubelet | grep tmpfs | cut -f3 -d" "` - for i in $mnts ; do - umount $i - done - rm -rf /var/lib/kubelet/* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/kubelet/stop.sls new/salt-master/salt/kubelet/stop.sls --- old/salt-master/salt/kubelet/stop.sls 2018-04-23 14:03:55.000000000 +0200 +++ new/salt-master/salt/kubelet/stop.sls 2018-04-26 11:56:10.000000000 +0200 @@ -23,23 +23,6 @@ - force: True {%- endif %} -{%- if node_removal_in_progress %} - -# we must run the `delete node` when haproxy is still running. -# * in pre-stop-services, we have not cordoned the node yet -# * in pre-reboot, haproxy has been stopped -# so we have to do it here... - -delete-node-from-kubernetes: - cmd.run: - - name: |- - kubectl --kubeconfig={{ pillar['paths']['kubeconfig'] }} delete node {{ grains['nodename'] }} - - require: - - file: {{ pillar['paths']['kubeconfig'] }} - - drain-kubelet - -{%- endif %} - kubelet: service.dead: - enable: False diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/kubernetes-common/remove-pre-reboot.sls new/salt-master/salt/kubernetes-common/remove-pre-reboot.sls --- old/salt-master/salt/kubernetes-common/remove-pre-reboot.sls 2018-04-23 14:03:55.000000000 +0200 +++ new/salt-master/salt/kubernetes-common/remove-pre-reboot.sls 2018-04-26 11:56:10.000000000 +0200 @@ -1,10 +1,8 @@ -# cleanup all the things we have created + +# some files that could contain sensitive information: /etc/kubernetes/config: file.absent /etc/kubernetes/openstack-config: file.absent - -/var/lib/kubernetes: - file.absent diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/motd/remove-pre-reboot.sls new/salt-master/salt/motd/remove-pre-reboot.sls --- old/salt-master/salt/motd/remove-pre-reboot.sls 2018-04-23 14:03:55.000000000 +0200 +++ new/salt-master/salt/motd/remove-pre-reboot.sls 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -/etc/motd: - file.managed: - - contents: |- - This machine has been removed from the CaaS cluster. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/orch/removal.sls new/salt-master/salt/orch/removal.sls --- old/salt-master/salt/orch/removal.sls 2018-04-23 14:03:55.000000000 +0200 +++ new/salt-master/salt/orch/removal.sls 2018-04-26 11:56:10.000000000 +0200 @@ -1,23 +1,44 @@ -# must provide the node (id) to be removed in the 'target' pillar +{#- must provide the node (id) to be removed in the 'target' pillar #} {%- set target = salt['pillar.get']('target') %} +{#- ... and we can provide an optional replacement node #} +{%- set replacement = salt['pillar.get']('replacement', '') %} + +{#- Get a list of nodes seem to be down or unresponsive #} +{#- This sends a "are you still there?" message to all #} +{#- the nodes and wait for a response, so it takes some time. #} +{#- Hopefully this list will not be too long... #} +{%- set nodes_down = salt.saltutil.runner('manage.down') %} +{%- if not nodes_down %} + {%- do salt.caasp_log.debug('all nodes seem to be up') %} + {%- set all_responsive_nodes_tgt = 'P@roles:(etcd|kube-master|kube-minion)' %} +{%- else %} + {%- do salt.caasp_log.debug('nodes "%s" seem to be down', nodes_down|join(',')) %} + {%- set all_responsive_nodes_tgt = 'not L@' + nodes_down|join(',') + + ' and P@roles:(etcd|kube-master|kube-minion)' %} + + {%- if target in nodes_down %} + {%- do salt.caasp_log.abort('target is unresponsive, forced removal must be used') %} + {%- endif %} +{%- endif %} + {%- set etcd_members = salt.saltutil.runner('mine.get', tgt='G@roles:etcd', fun='network.interfaces', tgt_type='compound').keys() %} {%- set masters = salt.saltutil.runner('mine.get', tgt='G@roles:kube-master', fun='network.interfaces', tgt_type='compound').keys() %} {%- set minions = salt.saltutil.runner('mine.get', tgt='G@roles:kube-minion', fun='network.interfaces', tgt_type='compound').keys() %} -{#- ... and we can provide an optional replacement node #} -{%- set replacement = salt['pillar.get']('replacement', '') %} +{%- set super_master_tgt = salt.caasp_nodes.get_super_master(masters=masters, + excluded=[target] + nodes_down) %} +{%- if not super_master_tgt %} + {%- do salt.caasp_log.abort('(after removing %s) no masters are reachable', target) %} +{%- endif %} {#- try to use the user-provided replacement or find a replacement by ourselves #} {#- if no valid replacement can be used/found, `replacement` will be '' #} {%- set replacement, replacement_roles = salt.caasp_nodes.get_replacement_for(target, replacement, masters=masters, minions=minions, - etcd_members=etcd_members) %} - -{############################## - # set grains - #############################} + etcd_members=etcd_members, + excluded=nodes_down) %} # Ensure we mark all nodes with the "as node is being removed" grain. # This will ensure the update-etc-hosts orchestration is not run. @@ -30,6 +51,23 @@ - removal_in_progress - true +# make sure we have a solid ground before starting the removal +# (ie, expired certs produce really funny errors) +update-config: + salt.state: + - tgt: '{{ all_responsive_nodes_tgt }}' + - tgt_type: compound + - sls: + - etc-hosts + - ca-cert + - cert + - require: + - set-cluster-wide-removal-grain + +{############################## + # set grains + #############################} + assign-removal-grain: salt.function: - tgt: {{ target }} @@ -38,47 +76,47 @@ - node_removal_in_progress - true - require: - - set-cluster-wide-removal-grain + - update-config {%- if replacement %} assign-addition-grain: salt.function: - - tgt: {{ replacement }} + - tgt: '{{ replacement }}' - name: grains.setval - arg: - node_addition_in_progress - true - require: - - set-cluster-wide-removal-grain - - assign-removal-grain + - update-config {#- and then we can assign these (new) roles to the replacement #} {% for role in replacement_roles %} assign-{{ role }}-role-to-replacement: salt.function: - - tgt: {{ replacement }} + - tgt: '{{ replacement }}' - name: grains.append - arg: - roles - {{ role }} - require: - - assign-removal-grain + - update-config - assign-addition-grain - {%- endfor %} + {% endfor %} {%- endif %} {# replacement #} sync-all: salt.function: - - tgt: '*' + - tgt: '{{ all_responsive_nodes_tgt }}' + - tgt_type: compound - names: - saltutil.refresh_pillar - saltutil.refresh_grains - mine.update - saltutil.sync_all - require: - - set-cluster-wide-removal-grain + - update-config - assign-removal-grain {%- for role in replacement_roles %} - assign-{{ role }}-role-to-replacement @@ -92,7 +130,7 @@ highstate-replacement: salt.state: - - tgt: {{ replacement }} + - tgt: '{{ replacement }}' - highstate: True - require: - sync-all @@ -108,7 +146,7 @@ set-bootstrap-complete-flag-in-replacement: salt.function: - - tgt: {{ replacement }} + - tgt: '{{ replacement }}' - name: grains.setval - arg: - bootstrap_complete @@ -119,7 +157,7 @@ # remove the we-are-adding-this-node grain remove-addition-grain: salt.function: - - tgt: {{ replacement }} + - tgt: '{{ replacement }}' - name: grains.delval - arg: - node_addition_in_progress @@ -138,21 +176,6 @@ # the replacement should be ready at this point: # we can remove the old node running in {{ target }} -{%- if target in etcd_members %} {# we are only doing this for etcd at the moment... #} -prepare-target-removal: - salt.state: - - tgt: {{ target }} - - sls: - {%- if target in etcd_members %} - - etcd.remove-pre-stop-services - {%- endif %} - - require: - - sync-all - {%- if replacement %} - - set-bootstrap-complete-flag-in-replacement - {%- endif %} -{%- endif %} - stop-services-in-target: salt.state: - tgt: {{ target }} @@ -171,9 +194,9 @@ {%- endif %} - require: - sync-all - {%- if target in etcd_members %} - - prepare-target-removal - {%- endif %} + {%- if replacement %} + - remove-addition-grain + {%- endif %} # remove any other configuration in the machines cleanups-in-target-before-rebooting: @@ -184,7 +207,6 @@ - kube-apiserver.remove-pre-reboot - kube-controller-manager.remove-pre-reboot - kube-scheduler.remove-pre-reboot - - addons.remove-pre-reboot - addons.dns.remove-pre-reboot - addons.tiller.remove-pre-reboot - addons.dex.remove-pre-reboot @@ -193,12 +215,7 @@ - kubelet.remove-pre-reboot - kubectl-config.remove-pre-reboot - cri.remove-pre-reboot - - cni.remove-pre-reboot - {%- if target in etcd_members %} - - etcd.remove-pre-reboot - {%- endif %} - - etc-hosts.remove-pre-reboot - - motd.remove-pre-reboot + - cert.remove-pre-reboot - cleanup.remove-pre-reboot - require: - stop-services-in-target @@ -217,14 +234,30 @@ # (we don't need to wait for the node: # just forget about it...) -# remove the Salt key and the mine for the target +# do any cluster-scope removals in the super_master +remove-from-cluster-in-super-master: + salt.state: + - tgt: '{{ super_master_tgt }}' + - pillar: + target: {{ target }} + - sls: + - cleanup.remove-post-orchestration + - require: + - sync-all + - shutdown-target + {%- if replacement %} + - remove-addition-grain + {%- endif %} + +# remove the Salt key +# (it will appear as "unaccepted") remove-target-salt-key: salt.wheel: - name: key.reject - include_accepted: True - match: {{ target }} - require: - - shutdown-target + - remove-from-cluster-in-super-master # remove target's data in the Salt Master's cache remove-target-mine: @@ -244,18 +277,18 @@ # the etcd server we have just removed (but they would # keep working fine as long as we had >1 etcd servers) -{%- set affected_expr = salt.caasp_nodes.get_expr_affected_by(target, - excluded=[replacement], - masters=masters, - minions=minions, - etcd_members=etcd_members) %} - -{%- do salt.caasp_log.debug('will high-state machines affected by removal: %s', affected_expr) %} +{%- set affected_tgt = salt.caasp_nodes.get_expr_affected_by(target, + excluded=[replacement] + nodes_down, + masters=masters, + minions=minions, + etcd_members=etcd_members) %} +{%- do salt.caasp_log.debug('will high-state machines affected by removal: "%s"', affected_tgt) %} # make sure the cluster has up-to-date state sync-after-removal: salt.function: - - tgt: '*' + - tgt: '{{ all_responsive_nodes_tgt }}' + - tgt_type: compound - names: - saltutil.clear_cache - mine.update @@ -264,7 +297,7 @@ highstate-affected: salt.state: - - tgt: {{ affected_expr }} + - tgt: '{{ affected_tgt }}' - tgt_type: compound - highstate: True - batch: 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-master/salt/top.sls new/salt-master/salt/top.sls --- old/salt-master/salt/top.sls 2018-04-23 14:03:55.000000000 +0200 +++ new/salt-master/salt/top.sls 2018-04-26 11:56:10.000000000 +0200 @@ -37,3 +37,4 @@ - cert - kubelet - kube-proxy + - cni/cilium

1 0

commit netcdf-cxx4 for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '18

27 Apr '18

Hello community, here is the log from the commit of package netcdf-cxx4 for openSUSE:Factory checked in at 2018-04-27 16:10:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/netcdf-cxx4 (Old) and /work/SRC/openSUSE:Factory/.netcdf-cxx4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "netcdf-cxx4" Fri Apr 27 16:10:14 2018 rev:10 rq:601898 version:4.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/netcdf-cxx4/netcdf-cxx4.changes 2018-03-24 16:16:24.669267528 +0100 +++ /work/SRC/openSUSE:Factory/.netcdf-cxx4.new/netcdf-cxx4.changes 2018-04-27 16:10:14.780257490 +0200 @@ -1,0 +2,9 @@ +Fri Apr 27 12:24:16 UTC 2018 - eich(a)suse.com + +- Disable non-HPC builds on non-openSUSE systems: + a. currently only SUSE products/projects are supported/ + b. non-HPC builds are not and have never been supported on SLE, + on openSUSE they are provided for compatibility reasons + (bsc#1091223). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ netcdf-cxx4.spec ++++++ --- /var/tmp/diff_new_pack.o8rbDh/_old 2018-04-27 16:10:15.352236514 +0200 +++ /var/tmp/diff_new_pack.o8rbDh/_new 2018-04-27 16:10:15.356236367 +0200 @@ -43,6 +43,10 @@ %define c_f_ver 7 %endif +%if !0%{?is_opensuse} && !0%{?with_hpc:1} +ExclusiveArch: do_not_build +%endif + %define hpc_upcase_trans_hyph() %(echo %{**} | tr [a-z] [A-Z] | tr '-' '_') %if %{with hpc}

1 0

commit velum for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '18

27 Apr '18

Hello community, here is the log from the commit of package velum for openSUSE:Factory checked in at 2018-04-27 16:10:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/velum (Old) and /work/SRC/openSUSE:Factory/.velum.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "velum" Fri Apr 27 16:10:11 2018 rev:24 rq:601890 version:3.0.0+dev+git_r738_10fcaf450fd1ac030569f55335e6ba1f31662c8e Changes: -------- --- /work/SRC/openSUSE:Factory/velum/velum.changes 2018-04-22 14:40:40.882705992 +0200 +++ /work/SRC/openSUSE:Factory/.velum.new/velum.changes 2018-04-27 16:10:13.572301791 +0200 @@ -1,0 +2,33 @@ +Fri Apr 27 12:05:14 UTC 2018 - containers-bugowner(a)suse.de + +- Commit 162c0d0 by Liam Proven lproven(a)suse.com + Reword force-removal warning as per IRC #docker discussion + + +------------------------------------------------------------------- +Fri Apr 27 09:08:40 UTC 2018 - containers-bugowner(a)suse.de + +- Commit 01fe462 by MalloZup dmaiocchi(a)suse.com + change link to actual one + + +------------------------------------------------------------------- +Thu Apr 26 10:02:52 UTC 2018 - containers-bugowner(a)suse.de + +- Commit 310d614 by Vítor Avelino vavelino(a)suse.com + node removal: improved way of showing removal links + + 'Remove' and 'Force remove' links were being shown at the same time so far. + But 'Force remove' only makes sense to be shown when a previous removal has + failed. + + With this we are showing only one link at a time. When the highstate of a + minion is fine, we show 'Remove'. Whenever it comes 'removal_failed', we show + 'Force remove'. + + enhancemente#node-removal + + Signed-off-by: Vítor Avelino <vavelino(a)suse.com> + + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ velum.spec ++++++ --- /var/tmp/diff_new_pack.1YXFj6/_old 2018-04-27 16:10:14.428270399 +0200 +++ /var/tmp/diff_new_pack.1YXFj6/_new 2018-04-27 16:10:14.428270399 +0200 @@ -23,7 +23,7 @@ # Version: 1.0.0 # %%define branch 1.0.0 -Version: 3.0.0+dev+git_r734_f7dc070fb3c2fa61475e52ed2fb91ca204727921 +Version: 3.0.0+dev+git_r738_10fcaf450fd1ac030569f55335e6ba1f31662c8e Release: 0 %define branch master Summary: Dashboard for CaasP @@ -96,7 +96,7 @@ %description velum is the dashboard for CaasP to manage and deploy kubernetes clusters on top of MicroOS -This package has been built with commit f7dc070fb3c2fa61475e52ed2fb91ca204727921 from branch master on date Fri, 20 Apr 2018 11:31:38 +0000 +This package has been built with commit 10fcaf450fd1ac030569f55335e6ba1f31662c8e from branch master on date Fri, 27 Apr 2018 12:04:35 +0000 %prep %setup -q -n velum-%{branch} ++++++ master.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/velum-master/README.md new/velum-master/README.md --- old/velum-master/README.md 2018-04-20 13:31:45.000000000 +0200 +++ new/velum-master/README.md 2018-04-27 14:05:40.000000000 +0200 @@ -39,7 +39,7 @@ ## Development -You can start a Velum development environment by following the instructions in [caasp-devenv](https://github.com/kubic-project/caasp-devenv). +You can start a Velum development environment by following the instructions in [caasp-devenv](https://github.com/kubic-project/automation#caasp-devenv). ## Licensing diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/velum-master/app/views/dashboard/modals/_warn_node_force_removal_modal.html.slim new/velum-master/app/views/dashboard/modals/_warn_node_force_removal_modal.html.slim --- old/velum-master/app/views/dashboard/modals/_warn_node_force_removal_modal.html.slim 2018-04-20 13:31:45.000000000 +0200 +++ new/velum-master/app/views/dashboard/modals/_warn_node_force_removal_modal.html.slim 2018-04-27 14:05:40.000000000 +0200 @@ -8,10 +8,16 @@ h4#modal-label.modal-title | Forced node removal .modal-body - p You are about to force remove a node from the cluster. This means that... (more info here) - p Only proceed with this operation if you really know what you are doing. + p You are about to forcibly remove a node from the cluster. This action cannot be reversed. + p Any data on this node will be lost and the machine must be re-installed before it can be + p added back. + p + p The operation will perform some basic tasks to maintain the coherence of the cluster, but + p it may not function normally afterwards. + p + p Only proceed with this operation if you are certain it is essential to do so. .modal-footer button.btn.btn-default data-dismiss="modal" type="button" | Cancel button.btn.btn-primary.force-remove-anyway type="button" - | Proceed anyway \ No newline at end of file + | Proceed with forcible removal

1 0