rpms/pcs
7
0
Fork 1
Code Issues Pull Requests Releases Activity

pcs-0.11.12-1.el9

Browse Source 
- Rebased pcs to the latest sources (see CHANGELOG.md)
  Resolves: RHEL-176268, RHEL-176478, RHEL-190558
- Updated pcs-web-ui to 0.1.25 (see CHANGELOG_WUI.md)
- Reverted showing deprecation warnings for removal of multi-cluster support in pcs-web-ui (formerly tracked as RHEL-173500)
This commit is contained in:
Michal Pospíšil 2026-07-02 21:37:58 +02:00
parent 6e1ed0125c
commit b0286107a0
5 changed files with 257 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -304,3 +304,6 @@
/pcs-web-ui-node-modules-0.1.24.1+26-ce49b.tar.xz
/pcs-web-ui-ce49beeeb386cb9c6773e72ee8ca320f73cf8eda.tar.gz
/pcs-7686631f1f30e1088c9ef4260e9883e58a9063dc.tar.gz
/pcs-web-ui-node-modules-0.1.25.tar.xz
/pcs-web-ui-0.1.25.tar.gz
/pcs-0.11.12.tar.gz

235
RHEL-173500-01-revert-feat-deprecate-multi-cluster-management.patch Normal file
View File

@ -0,0 +1,235 @@
From cab85b898e69e9eb7590f10449b5c134b3b6e0ed Mon Sep 17 00:00:00 2001
From: Ivan Devat <idevat@redhat.com>
Date: Wed, 3 Jun 2026 13:25:11 +0200
Subject: [PATCH] Revert "feat: deprecate multi cluster management"
This reverts commit f26ee4ce4c2fc1e2ed15d0bf62e4ebeb57a72d50.
---
CHANGELOG.md | 5 --
packages/app/Makefile.am | 1 -
.../src/app/view/dashboard/DashboardApp.tsx | 36 --------------
.../useDashboardDeprecationDismiss.ts | 21 ---------
.../src/app/view/dataTest/json/dashboard.json | 4 --
packages/test/Makefile.am | 1 -
.../dashboard/deprecation-alert.test.ts | 47 -------------------
7 files changed, 115 deletions(-)
delete mode 100644 packages/app/src/app/view/dashboard/useDashboardDeprecationDismiss.ts
delete mode 100644 packages/test/src/test/scenes/dashboard/deprecation-alert.test.ts
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bea609c9..5f66dce2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,11 +6,6 @@
* Support for pacemaker CIB secrets ([RHEL-7604])
-### Deprecated
-
-* Multi-cluster management is deprecated and will be removed in a future version
- ([RHEL-148956])
-
### Fixed
* Omit empty link options in cluster setup request
diff --git a/packages/app/Makefile.am b/packages/app/Makefile.am
index f2919961..15b98600 100644
--- a/packages/app/Makefile.am
+++ b/packages/app/Makefile.am
@@ -560,7 +560,6 @@ EXTRA_DIST = \
src/app/view/dashboard/DashboardApp.tsx \
src/app/view/dashboard/DashboardToolbar.tsx \
src/app/view/dashboard/index.ts \
- src/app/view/dashboard/useDashboardDeprecationDismiss.ts \
src/app/view/dataTest/index.ts \
src/app/view/dataTest/json/cluster/acl.json \
src/app/view/dataTest/json/cluster/aclToolbar.json \
diff --git a/packages/app/src/app/view/dashboard/DashboardApp.tsx b/packages/app/src/app/view/dashboard/DashboardApp.tsx
index 80404724..b5d23d2a 100644
--- a/packages/app/src/app/view/dashboard/DashboardApp.tsx
+++ b/packages/app/src/app/view/dashboard/DashboardApp.tsx
@@ -1,16 +1,12 @@
import React from "react";
import {useSelector} from "react-redux";
import {
- Alert,
- AlertActionCloseButton,
Breadcrumb,
BreadcrumbItem,
- Button,
PageSection,
Stack,
StackItem,
} from "@patternfly/react-core";
-import {InfoCircleIcon} from "@patternfly/react-icons";
import {testMarks} from "app/view/dataTest";
import {selectors} from "app/store";
@@ -25,7 +21,6 @@ import {
import {DashboardClusterList} from "./clusterList";
import {DashboardToolbar} from "./DashboardToolbar";
-import {useDashboardDeprecationDismiss} from "./useDashboardDeprecationDismiss";
const useDashboardSync = () => {
const dispatch = useDispatch();
@@ -51,7 +46,6 @@ export const DashboardApp = () => {
const dispatch = useDispatch();
const importedClusterNameList = useSelector(selectors.getImportedClusterList);
const loading = useSelector(selectors.dashboardGetLoadingStatus);
- const {dismissed, dismiss, restore} = useDashboardDeprecationDismiss();
return (
<Page>
@@ -69,17 +63,6 @@ export const DashboardApp = () => {
when={loading.when}
isLoading={loading.currently}
/>
- {dismissed && (
- <Button
- variant="link"
- icon={<InfoCircleIcon />}
- onClick={restore}
- {...testMarks.dashboard.deprecationAlert.showNotices
- .mark}
- >
- Deprecation
- </Button>
- )}
</BreadcrumbItem>
</Breadcrumb>
}
@@ -90,25 +73,6 @@ export const DashboardApp = () => {
</StackItem>
</Stack>
</PageSection>
- {!dismissed && (
- <PageSection>
- <Alert
- variant="info"
- isInline
- title="Multi-cluster management is deprecated"
- actionClose={
- <AlertActionCloseButton
- {...testMarks.dashboard.deprecationAlert.close.mark}
- onClose={dismiss}
- />
- }
- {...testMarks.dashboard.deprecationAlert.mark}
- >
- Management of multiple clusters will be removed in a future
- version.
- </Alert>
- </PageSection>
- )}
<PageSection {...testMarks.dashboard.mark}>
{loading.status === "SUCCESS" && (
<DashboardClusterList
diff --git a/packages/app/src/app/view/dashboard/useDashboardDeprecationDismiss.ts b/packages/app/src/app/view/dashboard/useDashboardDeprecationDismiss.ts
deleted file mode 100644
index 88fead22..00000000
--- a/packages/app/src/app/view/dashboard/useDashboardDeprecationDismiss.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import React from "react";
-
-const storageKey = "deprecationMultiClusterDismissed";
-
-export const useDashboardDeprecationDismiss = () => {
- const [dismissed, setDismissed] = React.useState(
- () => localStorage.getItem(storageKey) === "true",
- );
-
- const dismiss = () => {
- localStorage.setItem(storageKey, "true");
- setDismissed(true);
- };
-
- const restore = () => {
- localStorage.removeItem(storageKey);
- setDismissed(false);
- };
-
- return {dismissed, dismiss, restore};
-};
diff --git a/packages/app/src/app/view/dataTest/json/dashboard.json b/packages/app/src/app/view/dataTest/json/dashboard.json
index 7d92a3ab..909f3fd4 100644
--- a/packages/app/src/app/view/dataTest/json/dashboard.json
+++ b/packages/app/src/app/view/dataTest/json/dashboard.json
@@ -1,8 +1,4 @@
{
- "deprecationAlert": {
- "close": {},
- "showNotices": {}
- },
"clusterList": {
"cluster": {
"actions": {
diff --git a/packages/test/Makefile.am b/packages/test/Makefile.am
index b0cd2c38..d7c201c0 100644
--- a/packages/test/Makefile.am
+++ b/packages/test/Makefile.am
@@ -43,7 +43,6 @@ EXTRA_DIST = \
src/test/scenes/dashboard/cluster-status.test.ts \
src/test/scenes/dashboard/cluster-stop.test.ts \
src/test/scenes/dashboard/common.ts \
- src/test/scenes/dashboard/deprecation-alert.test.ts \
src/test/scenes/dashboard/import-existring-cluster.test.ts \
src/test/scenes/dashboard/to-cluster-transition.test.ts \
src/test/scenes/fence-devices/arguments-view.test.ts \
diff --git a/packages/test/src/test/scenes/dashboard/deprecation-alert.test.ts b/packages/test/src/test/scenes/dashboard/deprecation-alert.test.ts
deleted file mode 100644
index bba245e4..00000000
--- a/packages/test/src/test/scenes/dashboard/deprecation-alert.test.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import {mock} from "test/tools";
-
-const {deprecationAlert} = marks.dashboard;
-
-describe("Deprecation alert", () => {
- beforeEach(async () => {
- await page.evaluate(() =>
- localStorage.removeItem("deprecationMultiClusterDismissed"),
- );
- mock.shortcuts.withDashboard({clusterStatus: []});
- });
-
- afterEach(mock.stop);
-
- it("should display deprecation alert", async () => {
- await goToDashboard();
- await isVisible(deprecationAlert);
- });
-
- it("should hide alert after clicking close", async () => {
- await goToDashboard();
- await click(deprecationAlert.close);
- await isAbsent(deprecationAlert);
- });
-
- it("should show 'Show deprecation notices' after dismiss", async () => {
- await goToDashboard();
- await click(deprecationAlert.close);
- await isVisible(deprecationAlert.showNotices);
- });
-
- it("should restore alert when clicking 'Show deprecation notices'", async () => {
- await goToDashboard();
- await click(deprecationAlert.close);
- await click(deprecationAlert.showNotices);
- await isVisible(deprecationAlert);
- });
-
- it("should stay hidden when previously dismissed", async () => {
- await page.evaluate(() =>
- localStorage.setItem("deprecationMultiClusterDismissed", "true"),
- );
- await goToDashboard();
- await isAbsent(deprecationAlert);
- await isVisible(deprecationAlert.showNotices);
- });
-});
--
2.54.0

4
do-not-support-cluster-setup-with-udp-u-transport.patch
View File

@ -1,4 +1,4 @@
From 245ecff6959c316e26f3bbcb0450fd688d67b1ad Mon Sep 17 00:00:00 2001
From 20140bbe7ac508ae38dea9ff5dd6fa92ec84b8bf Mon Sep 17 00:00:00 2001
From: Ivan Devat <idevat@redhat.com>
Date: Tue, 20 Nov 2018 15:03:56 +0100
Subject: [PATCH] do not support cluster setup with udp(u) transport in RHEL9
@ -34,5 +34,5 @@ index 4bcef3d25..d6eb51750 100644
support traffic encryption nor compression.
Transport options are:
--
2.53.0
2.54.0

20
pcs.spec
View File

@ -1,6 +1,6 @@
Name: pcs
Version: 0.11.11
Release: 3%{?dist}
Version: 0.11.12
Release: 1%{?dist}
# https://docs.fedoraproject.org/en-US/packaging-guidelines/LicensingGuidelines/
# https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing#Good_Licenses
# GPL-2.0-only: pcs
@ -19,7 +19,7 @@ ExclusiveArch: i686 x86_64 s390x ppc64le aarch64
# To build an official pcs release, comment out branch_or_commit
# Use long commit hash or branch name to build an unreleased version
%global branch_or_commit 7686631f1f30e1088c9ef4260e9883e58a9063dc
# %%global branch_or_commit 7686631f1f30e1088c9ef4260e9883e58a9063dc
%global version_or_commit %{version}
%if 0%{?branch_or_commit:1}
@ -30,10 +30,10 @@ ExclusiveArch: i686 x86_64 s390x ppc64le aarch64
# To build an official pcs-web-ui release, comment out ui_branch_or_commit
# Last tagged version, also used as fallback version for untagged tarballs
%global ui_version 0.1.24.2
%global ui_version 0.1.25
# Use long commit hash or branch name to build an unreleased version
%global ui_branch_or_commit ce49beeeb386cb9c6773e72ee8ca320f73cf8eda
%global ui_modules_version 0.1.24.1+26-ce49b
# %%global ui_branch_or_commit ce49beeeb386cb9c6773e72ee8ca320f73cf8eda
%global ui_modules_version 0.1.25
%global ui_version_or_commit %{ui_version}
%if 0%{?ui_branch_or_commit:1}
@ -118,6 +118,7 @@ Patch1: do-not-support-cluster-setup-with-udp-u-transport.patch
# ui patches: >200
# Patch201: bzNUMBER-01-name.patch
Patch201: RHEL-173500-01-revert-feat-deprecate-multi-cluster-management.patch
# git for patches
@ -324,6 +325,7 @@ update_times_patch(){
%autosetup -T -b 100 -a 101 -N -n %{ui_src_name}
%autopatch -p1 -m 201
# update_times_patch %%{PATCH201}
update_times_patch %%{PATCH201}
# patch pcs sources
%autosetup -S git -n %{pcs_source_name} -N
@ -624,6 +626,12 @@ run_all_tests
%changelog
* Thu Jul 2 2026 Michal Pospíšil <mpospisi@redhat.com> - 0.11.12-1
- Rebased pcs to the latest sources (see CHANGELOG.md)
Resolves: RHEL-176268, RHEL-176478, RHEL-190558
- Updated pcs-web-ui to 0.1.25 (see CHANGELOG_WUI.md)
- Reverted showing deprecation warnings for removal of multi-cluster support in pcs-web-ui (formerly tracked as RHEL-173500)
* Tue May 5 2026 Michal Pospíšil <mpospisi@redhat.com> - 0.11.11-3
- Rebased pcs to the latest sources (see CHANGELOG.md)
Resolves: RHEL-149172, RHEL-164221

6
sources
View File

@ -17,6 +17,6 @@ SHA512 (rack-3.2.6.gem) = 61d6f880dd4bd7078da1135f905a0aedb63837996b8cd80f770d5a
SHA512 (puma-8.0.1.gem) = f8d7a59f8aa1c6a6bded25449ab1e926d52da927c0b71a8d17b8624e3b2507ef1cf9ba4c91dee092c4d20d5c8a9538dd4f33fa7533e7aef9536f26e925cab926
SHA512 (mustermann-3.1.1.gem) = 10dd72c7e44c76e2d04cf68d62f2d81a9cbb6fe457e2b81219467356627c2ae99db34d8c149371f92c79fd4652eb9a0ede7998b7d74f886a26c1b071b66df97b
SHA512 (backports-3.25.3.gem) = a9d929d945032387064e43fa0a3bda55d345ae1ad9fbceb8819ae2d413b29054e22cc5be80c65335a6f14f13dbbe8ddfd0ea1636634c5555bd5b9054e34afd23
SHA512 (pcs-web-ui-node-modules-0.1.24.1+26-ce49b.tar.xz) = b36a8514ce764ea66dead6a211504e3c13352caecb3b8958631b68f425f45636b0af40fc996635a9b04752b5f95b1cc3d3c273c7bae90180d6a359cd571565ac
SHA512 (pcs-web-ui-ce49beeeb386cb9c6773e72ee8ca320f73cf8eda.tar.gz) = edb54e58b0b8da95b278794ac658ca29ff0eb612653a218bcc3d3abd9fe380723110ddd0ad6140a0e9155767580169b4714c0865ae837e3cf215d8cc056c69ad
SHA512 (pcs-7686631f1f30e1088c9ef4260e9883e58a9063dc.tar.gz) = b99e7df74422a1679ad7963bf8cc3508b0ef52583d301e54fb182b5757916fe687844a6324a975011e7f0e00ac169829dbd2533827f810bcc1b06b29b202149f
SHA512 (pcs-web-ui-node-modules-0.1.25.tar.xz) = 56003da4a14db540ebc939bbcd13ac44a9b6a75d064f0ba6267368a4cbebc58382fc008fd1ce85624f97c01f7020dafbbed3333c009ce347f0ee919a41d8a6c4
SHA512 (pcs-web-ui-0.1.25.tar.gz) = 8380e17743b47099e1fa941d2099a162c10bbc9cbb4103d21c340f0f0385d26550aced5e14dd180deacb4102678ea5f5a5e990e3156b6c087b2ff4aeaed5f41b
SHA512 (pcs-0.11.12.tar.gz) = c96bffe126ad95dfae39456d666fcb5a86f3df91a82fd22991c7f33c19c9ce88bb4b948caf86e692d17dccce87b070af54b4d836a78ec60dabfdd6335945718d