Hello community, here is the log from the commit of package velum for openSUSE:Factory checked in at 2018-06-05 12:52:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/velum (Old) and /work/SRC/openSUSE:Factory/.velum.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "velum" Tue Jun 5 12:52:58 2018 rev:31 rq:614021 version:4.0.0+dev+git_r812_70ac7085850ee488a3bed38990076c820f6cd395 Changes: -------- --- /work/SRC/openSUSE:Factory/velum/velum.changes 2018-06-02 12:12:02.536223162 +0200 +++ /work/SRC/openSUSE:Factory/.velum.new/velum.changes 2018-06-05 12:53:00.357430606 +0200 @@ -1,0 +2,28 @@ +Thu May 31 13:56:55 UTC 2018 - [email protected] + +- Commit f50fb8a by Vítor Avelino [email protected] + ui: fix forced node removal modal paragraphs + + bsc#1095252 + + Signed-off-by: Vítor Avelino <[email protected]> + + +------------------------------------------------------------------- +Thu May 31 13:54:53 UTC 2018 - [email protected] + +- Commit 7e70efd by Vítor Avelino [email protected] + ui: show proper update failed message and reboot button + + Changed update failed error message stating a generic state instead of saying + that the update failed itself. + + Update admin node link only showing if `tx_update_reboot_needed` flag is + truthy. Otherwise keeps it hidden. + + bsc#1082786 + + Signed-off-by: Vítor Avelino <[email protected]> + + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ velum.spec ++++++ --- /var/tmp/diff_new_pack.YlDAFI/_old 2018-06-05 12:53:01.237398375 +0200 +++ /var/tmp/diff_new_pack.YlDAFI/_new 2018-06-05 12:53:01.237398375 +0200 @@ -23,7 +23,7 @@ # Version: 1.0.0 # %%define branch 1.0.0 -Version: 4.0.0+dev+git_r808_1dbbecc8a60ef4939b41f048eaf80b2922d9d8b3 +Version: 4.0.0+dev+git_r812_70ac7085850ee488a3bed38990076c820f6cd395 Release: 0 %define branch master Summary: Dashboard for CaasP @@ -92,7 +92,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 1dbbecc8a60ef4939b41f048eaf80b2922d9d8b3 from branch master on date Wed, 30 May 2018 14:23:41 +0000 +This package has been built with commit 70ac7085850ee488a3bed38990076c820f6cd395 from branch master on date Thu, 31 May 2018 13:56:20 +0000 %prep %setup -q -n velum-%{branch} ++++++ master.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/velum-master/app/assets/javascripts/dashboard/dashboard.js new/velum-master/app/assets/javascripts/dashboard/dashboard.js --- old/velum-master/app/assets/javascripts/dashboard/dashboard.js 2018-05-30 16:25:04.000000000 +0200 +++ new/velum-master/app/assets/javascripts/dashboard/dashboard.js 2018-05-31 15:57:40.000000000 +0200 @@ -288,23 +288,25 @@ handleAdminUpdate: function(admin) { var $notification = $('.admin-outdated-notification'); - if (State.hasPendingStateNode || - State.pendingRemovalMinionId) { + if (State.hasPendingStateNode || State.pendingRemovalMinionId) { State.updateAdminNode = false; return; } + var updateFlag = admin.tx_update_reboot_needed || admin.tx_update_failed; + + State.updateAdminNode = updateFlag; + $notification.toggleClass('hidden', !updateFlag); + + $notification.removeClass('admin-outdated-notification--reboot'); + $notification.removeClass('admin-outdated-notification--failed'); + if (admin.tx_update_reboot_needed) { - State.updateAdminNode = true; - $notification.removeClass('hidden'); - $notification.removeClass('admin-outdated-notification--failed'); - } else if (admin.tx_update_failed) { - State.updateAdminNode = true; - $notification.removeClass('hidden'); + $notification.addClass('admin-outdated-notification--reboot'); + } + + if (admin.tx_update_failed) { $notification.addClass('admin-outdated-notification--failed'); - } else { - State.updateAdminNode = false; - $notification.addClass('hidden'); } }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/velum-master/app/assets/stylesheets/pages/nodes_list.scss new/velum-master/app/assets/stylesheets/pages/nodes_list.scss --- old/velum-master/app/assets/stylesheets/pages/nodes_list.scss 2018-05-30 16:25:04.000000000 +0200 +++ new/velum-master/app/assets/stylesheets/pages/nodes_list.scss 2018-05-31 15:57:40.000000000 +0200 @@ -98,6 +98,7 @@ .btn-link { font-weight: bold; + visibility: hidden; } } @@ -107,9 +108,18 @@ vertical-align: middle; } + &--reboot { + .actions .btn-link { + visibility: visible; + } + } + &--failed { background-color: #f2dede; - color: #a94442; + + &, .btn-link { + color: #a94442; + } .message { display: none; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/velum-master/app/views/dashboard/index.html.slim new/velum-master/app/views/dashboard/index.html.slim --- old/velum-master/app/views/dashboard/index.html.slim 2018-05-30 16:25:04.000000000 +0200 +++ new/velum-master/app/views/dashboard/index.html.slim 2018-05-31 15:57:40.000000000 +0200 @@ -42,7 +42,7 @@ strong Admin node is running outdated software .failed-message i.fa.fw.fa-exclamation-circle - strong Admin node is running outdated software (failed to update) + strong An error occurred during the admin node update process .actions a.btn.btn-link.update-admin-btn data-toggle="modal" data-target=".update-admin-modal" | Update admin node 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-05-30 16:25:04.000000000 +0200 +++ new/velum-master/app/views/dashboard/modals/_warn_node_force_removal_modal.html.slim 2018-05-31 15:57:40.000000000 +0200 @@ -8,13 +8,13 @@ h4#modal-label.modal-title | Forced node removal .modal-body - 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 You are about to forcibly remove a node from the cluster. This action cannot be reversed. + Any data on this node will be lost and the machine must be re-installed before it can be + added back. + p The operation will perform some basic tasks to maintain the coherence of the cluster, but - p it may not function normally afterwards. - p + it may not function normally afterwards. + 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" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/velum-master/spec/features/admin_node_update_feature_spec.rb new/velum-master/spec/features/admin_node_update_feature_spec.rb --- old/velum-master/spec/features/admin_node_update_feature_spec.rb 2018-05-30 16:25:04.000000000 +0200 +++ new/velum-master/spec/features/admin_node_update_feature_spec.rb 2018-05-31 15:57:40.000000000 +0200 @@ -1,6 +1,6 @@ require "rails_helper" -describe "Manage nodes updates feature" do +describe "Manage nodes updates feature", js: true do let!(:user) { create(:user) } before do @@ -10,7 +10,7 @@ setup_stubbed_pending_minions! end - it "Admin node has no update available", js: true do + it "Admin node has no update available" do visit authenticated_root_path expect(page).not_to have_content("Update admin node") @@ -25,14 +25,11 @@ visit authenticated_root_path end - it "Admin node has an update available", js: true do + it "Admin node has an update available" do expect(page).to have_content("Admin node is running outdated software") end - it "User clicks on admin 'Update admin node'", js: true do - expect(page).not_to have_content("Reboot to update") - - # clicks on "Update admin node" + it "User clicks on admin 'Update admin node'" do find(".update-admin-btn").click expect(page).to have_content("The admin node needs to reboot "\ @@ -41,10 +38,9 @@ end # rubocop:disable RSpec/ExampleLength - it "User clicks on 'Reboot to update'", js: true do + it "User clicks on 'Reboot to update'" do allow(::Velum::Salt).to receive(:call).and_return(true) - # clicks on "Update admin node" find(".update-admin-btn").click # wait modal to appear @@ -60,13 +56,25 @@ # rubocop:enable RSpec/ExampleLength end - it "Admin node has an update available (failed to update)", js: true do + it "shows admin update failed message" do # rubocop:disable Rails/SkipsModelValidations Minion.where(minion_id: "admin").update_all(tx_update_reboot_needed: false, tx_update_failed: true) # rubocop:enable Rails/SkipsModelValidations visit authenticated_root_path - expect(page).to have_content("Admin node is running outdated software (failed to update)") + expect(page).to have_content("An error occurred during the admin node update process") + expect(page).not_to have_content("UPDATE ADMIN NODE") + end + + it "shows admin update failed message and update button" do + # rubocop:disable Rails/SkipsModelValidations + Minion.where(minion_id: "admin").update_all(tx_update_reboot_needed: true, + tx_update_failed: true) + # rubocop:enable Rails/SkipsModelValidations + visit authenticated_root_path + + expect(page).to have_content("An error occurred during the admin node update process") + expect(page).to have_content("UPDATE ADMIN NODE") end end
