@openshift-assisted/ui-lib 2.47.2 → 2.47.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/@types/ocm/components/clusterConfiguration/networkConfiguration/AdvancedNetworkFields.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/networkConfiguration/AvailableSubnetsControl.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/networkConfiguration/StackTypeControl.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/networkConfiguration/SubnetsDropdown.d.ts +2 -1
- package/build/@types/ocm/components/clusterConfiguration/networkConfiguration/SubnetsDropdown.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/networkConfiguration/reorderNetworks.d.ts +5 -0
- package/build/@types/ocm/components/clusterConfiguration/networkConfiguration/reorderNetworks.d.ts.map +1 -0
- package/build/@types/ocm/components/clusterConfiguration/staticIp/components/StaticIpPage.d.ts.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/AdvancedNetworkFields.js +1 -50
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/AdvancedNetworkFields.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/AvailableSubnetsControl.js +13 -6
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/AvailableSubnetsControl.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/StackTypeControl.js +3 -0
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/StackTypeControl.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/SubnetsDropdown.js +6 -2
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/SubnetsDropdown.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/reorderNetworks.js +60 -0
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/reorderNetworks.js.map +1 -0
- package/build/cjs/ocm/components/clusterConfiguration/staticIp/components/StaticIpPage.js +2 -1
- package/build/cjs/ocm/components/clusterConfiguration/staticIp/components/StaticIpPage.js.map +1 -1
- package/lib/ocm/components/clusterConfiguration/networkConfiguration/AdvancedNetworkFields.tsx +1 -54
- package/lib/ocm/components/clusterConfiguration/networkConfiguration/AvailableSubnetsControl.tsx +17 -4
- package/lib/ocm/components/clusterConfiguration/networkConfiguration/StackTypeControl.tsx +3 -0
- package/lib/ocm/components/clusterConfiguration/networkConfiguration/SubnetsDropdown.tsx +7 -1
- package/lib/ocm/components/clusterConfiguration/networkConfiguration/reorderNetworks.ts +72 -0
- package/lib/ocm/components/clusterConfiguration/staticIp/components/StaticIpPage.tsx +2 -1
- package/package.json +3 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AdvancedNetworkFields.d.ts","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/AdvancedNetworkFields.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"AdvancedNetworkFields.d.ts","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/AdvancedNetworkFields.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAiC1B,QAAA,MAAM,qBAAqB,yBAiH1B,CAAC;AAEF,eAAe,qBAAqB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AvailableSubnetsControl.d.ts","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/AvailableSubnetsControl.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoB,MAAM,OAAO,CAAC;AAMzC,OAAO,EACL,UAAU,EAKX,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"AvailableSubnetsControl.d.ts","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/AvailableSubnetsControl.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoB,MAAM,OAAO,CAAC;AAMzC,OAAO,EACL,UAAU,EAKX,MAAM,oBAAoB,CAAC;AAI5B,OAAO,EAAE,OAAO,EAAkB,MAAM,sDAAsD,CAAC;AAkB/F,MAAM,WAAW,4BAA4B;IAC3C,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACzB,WAAW,EAAE,UAAU,EAAE,CAAC;IAC1B,UAAU,EAAE,OAAO,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;IACpB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,eAAO,MAAM,uBAAuB,0EAMjC,4BAA4B,sBA+J9B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StackTypeControl.d.ts","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/StackTypeControl.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAM1B,OAAO,EACL,WAAW,EAQZ,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"StackTypeControl.d.ts","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/StackTypeControl.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAM1B,OAAO,EACL,WAAW,EAQZ,MAAM,oBAAoB,CAAC;AAM5B,OAAO,EACL,OAAO,EAIR,MAAM,sDAAsD,CAAC;AAE9D,KAAK,0BAA0B,GAAG;IAChC,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACzB,qBAAqB,EAAE,OAAO,CAAC;IAC/B,WAAW,EAAE,WAAW,CAAC;CAC1B,CAAC;AAgBF,eAAO,MAAM,qBAAqB,uDAI/B,0BAA0B,sBAqQ5B,CAAC"}
|
package/build/@types/ocm/components/clusterConfiguration/networkConfiguration/SubnetsDropdown.d.ts
CHANGED
|
@@ -5,7 +5,8 @@ type SubnetsDropdownProps = {
|
|
|
5
5
|
name: string;
|
|
6
6
|
machineSubnets: HostSubnet[];
|
|
7
7
|
isDisabled: boolean;
|
|
8
|
+
onAfterSelect?: (selectedValue: string) => void;
|
|
8
9
|
};
|
|
9
|
-
export declare const SubnetsDropdown: ({ name, machineSubnets, isDisabled, ...props }: SubnetsDropdownProps & MenuToggleProps) => React.JSX.Element;
|
|
10
|
+
export declare const SubnetsDropdown: ({ name, machineSubnets, isDisabled, onAfterSelect, ...props }: SubnetsDropdownProps & MenuToggleProps) => React.JSX.Element;
|
|
10
11
|
export {};
|
|
11
12
|
//# sourceMappingURL=SubnetsDropdown.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SubnetsDropdown.d.ts","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/SubnetsDropdown.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAML,eAAe,EAEhB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAEL,UAAU,EAIX,MAAM,oBAAoB,CAAC;AAG5B,KAAK,oBAAoB,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,UAAU,EAAE,CAAC;IAC7B,UAAU,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"SubnetsDropdown.d.ts","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/SubnetsDropdown.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAML,eAAe,EAEhB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAEL,UAAU,EAIX,MAAM,oBAAoB,CAAC;AAG5B,KAAK,oBAAoB,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,UAAU,EAAE,CAAC;IAC7B,UAAU,EAAE,OAAO,CAAC;IACpB,aAAa,CAAC,EAAE,CAAC,aAAa,EAAE,MAAM,KAAK,IAAI,CAAC;CACjD,CAAC;AAyBF,eAAO,MAAM,eAAe,kEAMzB,oBAAoB,GAAG,eAAe,sBAqIxC,CAAC"}
|
package/build/@types/ocm/components/clusterConfiguration/networkConfiguration/reorderNetworks.d.ts
ADDED
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import { NetworkConfigurationValues } from '../../../../common';
|
|
2
|
+
import type { FormikHelpers } from 'formik';
|
|
3
|
+
export declare const reorderNetworksForPrimary: (nextPrimaryCidr: string, values: NetworkConfigurationValues, setFieldValue: FormikHelpers<NetworkConfigurationValues>['setFieldValue']) => void;
|
|
4
|
+
export declare const reorderNetworksByCurrentPrimary: (values: NetworkConfigurationValues, setFieldValue: FormikHelpers<NetworkConfigurationValues>['setFieldValue']) => void;
|
|
5
|
+
//# sourceMappingURL=reorderNetworks.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"reorderNetworks.d.ts","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/reorderNetworks.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,0BAA0B,EAAE,MAAM,oBAAoB,CAAC;AAC5E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AAqD5C,eAAO,MAAM,yBAAyB,oBACnB,MAAM,UACf,0BAA0B,iBACnB,cAAc,0BAA0B,CAAC,CAAC,eAAe,CAAC,SAI1E,CAAC;AAEF,eAAO,MAAM,+BAA+B,WAClC,0BAA0B,iBACnB,cAAc,0BAA0B,CAAC,CAAC,eAAe,CAAC,SAK1E,CAAC"}
|
package/build/@types/ocm/components/clusterConfiguration/staticIp/components/StaticIpPage.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StaticIpPage.d.ts","sourceRoot":"","sources":["../../../../../../../lib/ocm/components/clusterConfiguration/staticIp/components/StaticIpPage.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAY1B,OAAO,EAAqB,iBAAiB,EAAqB,MAAM,aAAa,CAAC;AAKtF,OAAO,gBAAgB,CAAC;AAYxB,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,
|
|
1
|
+
{"version":3,"file":"StaticIpPage.d.ts","sourceRoot":"","sources":["../../../../../../../lib/ocm/components/clusterConfiguration/staticIp/components/StaticIpPage.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAY1B,OAAO,EAAqB,iBAAiB,EAAqB,MAAM,aAAa,CAAC;AAKtF,OAAO,gBAAgB,CAAC;AAYxB,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CA6EpD,CAAC"}
|
package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/AdvancedNetworkFields.js
CHANGED
|
@@ -4,7 +4,6 @@ const tslib_1 = require("tslib");
|
|
|
4
4
|
const react_1 = tslib_1.__importDefault(require("react"));
|
|
5
5
|
const react_core_1 = require("@patternfly/react-core");
|
|
6
6
|
const formik_1 = require("formik");
|
|
7
|
-
const ip_address_1 = require("ip-address");
|
|
8
7
|
const common_1 = require("../../../../common");
|
|
9
8
|
const OcmFormFields_1 = require("../../ui/OcmFormFields");
|
|
10
9
|
const IPv4PrefixPopoverText = 'For example, if Cluster Network Host Prefix is set to 23, then each node is assigned a /23 subnet out of the given cidr (clusterNetworkCIDR), which allows for 510 (2^(32 - 23) - 2) pod IPs addresses.';
|
|
@@ -13,56 +12,8 @@ const ClusterPrefixHelperText = 'Defines how big the subnets for each individual
|
|
|
13
12
|
const clusterCidrHelperText = 'The block must not overlap with existing physical networks. To access the Pods from an external network, configure load balancers and routers to manage the traffic.';
|
|
14
13
|
const serviceCidrHelperText = 'Enter only 1 IP address pool. If you need to access the services from an external network, configure load balancers and routers to manage the traffic.';
|
|
15
14
|
const AdvancedNetworkFields = () => {
|
|
16
|
-
const { values, errors
|
|
15
|
+
const { values, errors } = (0, formik_1.useFormikContext)();
|
|
17
16
|
const isDualStack = values.stackType === common_1.DUAL_STACK;
|
|
18
|
-
// Reorder Cluster Networks and Service Networks when Machine Network primary changes
|
|
19
|
-
react_1.default.useEffect(() => {
|
|
20
|
-
var _a, _b;
|
|
21
|
-
if (!isDualStack || !((_b = (_a = values.machineNetworks) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.cidr))
|
|
22
|
-
return;
|
|
23
|
-
const primaryMachineNetworkCidr = values.machineNetworks[0].cidr;
|
|
24
|
-
const isPrimaryIPv6 = ip_address_1.Address6.isValid(primaryMachineNetworkCidr);
|
|
25
|
-
// Check Cluster Networks
|
|
26
|
-
if (values.clusterNetworks && values.clusterNetworks.length >= 2) {
|
|
27
|
-
const firstClusterCidr = values.clusterNetworks[0].cidr;
|
|
28
|
-
if (!firstClusterCidr)
|
|
29
|
-
return;
|
|
30
|
-
const isFirstClusterIPv6 = ip_address_1.Address6.isValid(firstClusterCidr);
|
|
31
|
-
// If primary machine is IPv6 but first cluster is IPv4, swap them
|
|
32
|
-
if (isPrimaryIPv6 && !isFirstClusterIPv6) {
|
|
33
|
-
const reordered = [values.clusterNetworks[1], values.clusterNetworks[0]];
|
|
34
|
-
setFieldValue('clusterNetworks', reordered, false);
|
|
35
|
-
}
|
|
36
|
-
// If primary machine is IPv4 but first cluster is IPv6, swap them
|
|
37
|
-
else if (!isPrimaryIPv6 && isFirstClusterIPv6) {
|
|
38
|
-
const reordered = [values.clusterNetworks[1], values.clusterNetworks[0]];
|
|
39
|
-
setFieldValue('clusterNetworks', reordered, false);
|
|
40
|
-
}
|
|
41
|
-
}
|
|
42
|
-
// Check Service Networks
|
|
43
|
-
if (values.serviceNetworks && values.serviceNetworks.length >= 2) {
|
|
44
|
-
const firstServiceCidr = values.serviceNetworks[0].cidr;
|
|
45
|
-
if (!firstServiceCidr)
|
|
46
|
-
return;
|
|
47
|
-
const isFirstServiceIPv6 = ip_address_1.Address6.isValid(firstServiceCidr);
|
|
48
|
-
// If primary machine is IPv6 but first service is IPv4, swap them
|
|
49
|
-
if (isPrimaryIPv6 && !isFirstServiceIPv6) {
|
|
50
|
-
const reordered = [values.serviceNetworks[1], values.serviceNetworks[0]];
|
|
51
|
-
setFieldValue('serviceNetworks', reordered, false);
|
|
52
|
-
}
|
|
53
|
-
// If primary machine is IPv4 but first service is IPv6, swap them
|
|
54
|
-
else if (!isPrimaryIPv6 && isFirstServiceIPv6) {
|
|
55
|
-
const reordered = [values.serviceNetworks[1], values.serviceNetworks[0]];
|
|
56
|
-
setFieldValue('serviceNetworks', reordered, false);
|
|
57
|
-
}
|
|
58
|
-
}
|
|
59
|
-
}, [
|
|
60
|
-
isDualStack,
|
|
61
|
-
values.machineNetworks,
|
|
62
|
-
values.clusterNetworks,
|
|
63
|
-
values.serviceNetworks,
|
|
64
|
-
setFieldValue,
|
|
65
|
-
]);
|
|
66
17
|
const clusterNetworkCidrPrefix = (index) => parseInt(((values.clusterNetworks && values.clusterNetworks[index].cidr) || '').split('/')[1]) || 1;
|
|
67
18
|
const isSubnetIPv6 = (index) => (isDualStack ? !!index : false);
|
|
68
19
|
const clusterNetworkHostPrefixPopoverText = (index) => (react_1.default.createElement(react_1.default.Fragment, null,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AdvancedNetworkFields.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/AdvancedNetworkFields.tsx"],"names":[],"mappings":";;;AAAA,0DAA0B;AAC1B,uDAOgC;AAChC,mCAAsD;AACtD
|
|
1
|
+
{"version":3,"file":"AdvancedNetworkFields.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/AdvancedNetworkFields.tsx"],"names":[],"mappings":";;;AAAA,0DAA0B;AAC1B,uDAOgC;AAChC,mCAAsD;AACtD,+CAK4B;AAC5B,0DAAuD;AAEvD,MAAM,qBAAqB,GACzB,yMAAyM,CAAC;AAE5M,MAAM,qBAAqB,GACzB,+MAA+M,CAAC;AAElN,MAAM,uBAAuB,GAC3B,4GAA4G,CAAC;AAE/G,MAAM,qBAAqB,GACzB,sKAAsK,CAAC;AAEzK,MAAM,qBAAqB,GACzB,wJAAwJ,CAAC;AAE3J,MAAM,qBAAqB,GAAG,GAAG,EAAE;IACjC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,IAAA,yBAAgB,GAA8B,CAAC;IAE1E,MAAM,WAAW,GAAG,MAAM,CAAC,SAAS,KAAK,mBAAU,CAAC;IAEpD,MAAM,wBAAwB,GAAG,CAAC,KAAa,EAAE,EAAE,CACjD,QAAQ,CACN,CAAC,CAAC,MAAM,CAAC,eAAe,IAAI,MAAM,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CACrF,IAAI,CAAC,CAAC;IAET,MAAM,YAAY,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IAExE,MAAM,mCAAmC,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,CAC7D;QACE;;YAC8D,GAAG;YAC9D,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,qBAAqB,CAClE;QACJ,gLAGI,CACH,CACJ,CAAC;IAEF,OAAO,CACL,8BAAC,iBAAI,IAAC,SAAS,EAAC,eAAe;QAC7B,8BAAC,mBAAU,IAAC,IAAI,EAAC,iBAAiB,IAC/B,GAAG,EAAE;;YAAC,OAAA,CACL,8BAAC,sBAAS,IAAC,OAAO,EAAC,iBAAiB,EAAC,SAAS,EAAE,WAAW,IAAI,SAAS,IACrE,MAAA,MAAM,CAAC,eAAe,0CAAE,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;gBACxC,OAAO,CACL,8BAAC,iBAAI,IAAC,GAAG,EAAE,KAAK,EAAE,SAAS,EAAC,eAAe;oBACzC,8BAAC,qBAAQ,IAAC,SAAS,EAAE,qBAAqB;wBACxC,8BAAC,6BAAa,IACZ,IAAI,EAAE,mBAAmB,KAAK,OAAO,EACrC,KAAK,EACH;gCACE,oEAAkC;gCAClC,8BAAC,oBAAW,IACV,WAAW,EAAE,qDAAqD,GAClE,CACD,EAEL,UAAU,EAAE,qBAAqB,EACjC,UAAU,QACV,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,GACrE,CACO;oBACX,8BAAC,qBAAQ,IAAC,SAAS,EAAE,qBAAqB;wBACxC,8BAAC,6BAAa,IACZ,IAAI,EAAE,mBAAmB,KAAK,aAAa,EAC3C,KAAK,EACH;gCACE,2EAAyC;gCACzC,8BAAC,oBAAW,IACV,WAAW,EAAE,mCAAmC,CAAC,KAAK,CAAC,EACvD,QAAQ,EAAC,OAAO,GAChB,CACD,EAEL,IAAI,EAAE,2BAAc,CAAC,MAAM,EAC3B,GAAG,EAAE,wBAAwB,CAAC,KAAK,CAAC,EACpC,GAAG,EACD,YAAY,CAAC,KAAK,CAAC;gCACjB,CAAC,CAAC,+BAAsB,CAAC,IAAI;gCAC7B,CAAC,CAAC,+BAAsB,CAAC,IAAI,EAEjC,UAAU,EAAE,uBAAuB,EACnC,UAAU,SACV,CACO,CACN,CACR,CAAC;YACJ,CAAC,CAAC,CACQ,CACb,CAAA;SAAA,CACU;QAEZ,OAAO,MAAM,CAAC,eAAe,KAAK,QAAQ,IAAI,CAC7C,8BAAC,kBAAK,IAAC,OAAO,EAAE,yBAAY,CAAC,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,eAAe,EAAE,QAAQ,SAAG,CACjF;QAED,8BAAC,mBAAU,IAAC,IAAI,EAAC,iBAAiB,IAC/B,GAAG,EAAE;;YAAC,OAAA,CACL,8BAAC,sBAAS,IAAC,OAAO,EAAC,iBAAiB,EAAC,SAAS,EAAE,WAAW,IAAI,SAAS,IACrE,MAAA,MAAM,CAAC,eAAe,0CAAE,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,CACzC,8BAAC,qBAAQ,IAAC,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,qBAAqB;gBACpD,8BAAC,6BAAa,IACZ,IAAI,EAAE,mBAAmB,KAAK,OAAO,EACrC,KAAK,EACH;wBACE,oEAAkC;wBAClC,8BAAC,oBAAW,IACV,WAAW,EAAE,oDAAoD,GACjE,CACD,EAEL,UAAU,EAAE,qBAAqB,EACjC,UAAU,QACV,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,GACrE,CACO,CACZ,CAAC,CACQ,CACb,CAAA;SAAA,CACU;QAEZ,OAAO,MAAM,CAAC,eAAe,KAAK,QAAQ,IAAI,CAC7C,8BAAC,kBAAK,IAAC,OAAO,EAAE,yBAAY,CAAC,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,eAAe,EAAE,QAAQ,SAAG,CACjF,CACI,CACR,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,qBAAqB,CAAC"}
|
|
@@ -10,11 +10,12 @@ const ip_address_1 = require("ip-address");
|
|
|
10
10
|
const common_1 = require("../../../../common");
|
|
11
11
|
const selectors_1 = require("../../../store/slices/current-cluster/selectors");
|
|
12
12
|
const SubnetsDropdown_1 = require("./SubnetsDropdown");
|
|
13
|
+
const reorderNetworks_1 = require("./reorderNetworks");
|
|
13
14
|
const subnetSort = (subA, subB) => subA.humanized.localeCompare(subB.humanized);
|
|
14
15
|
const useAutoSelectSingleAvailableSubnet = (autoSelectNetwork, setFieldValue, cidr, clusterId) => {
|
|
15
16
|
(0, react_1.useEffect)(() => {
|
|
16
17
|
if (autoSelectNetwork) {
|
|
17
|
-
setFieldValue('machineNetworks', [{ cidr, clusterId }],
|
|
18
|
+
setFieldValue('machineNetworks', [{ cidr, clusterId }], false);
|
|
18
19
|
}
|
|
19
20
|
}, [autoSelectNetwork, cidr, clusterId, setFieldValue]);
|
|
20
21
|
};
|
|
@@ -59,15 +60,21 @@ const AvailableSubnetsControl = ({ clusterId, hostSubnets, isRequired = false, i
|
|
|
59
60
|
if (ip_address_1.Address6.isValid(first)) {
|
|
60
61
|
const nextIPv4 = ((_e = IPv4Subnets[0]) === null || _e === void 0 ? void 0 : _e.subnet) || common_1.NO_SUBNET_SET;
|
|
61
62
|
const replacement = nextIPv4 !== first ? nextIPv4 : common_1.NO_SUBNET_SET;
|
|
62
|
-
|
|
63
|
+
if (replacement !== second) {
|
|
64
|
+
setFieldValue('machineNetworks.1.cidr', replacement, false);
|
|
65
|
+
}
|
|
63
66
|
}
|
|
64
67
|
else if (ip_address_1.Address4.isValid(first)) {
|
|
65
68
|
const nextIPv6 = ((_f = IPv6Subnets[0]) === null || _f === void 0 ? void 0 : _f.subnet) || common_1.NO_SUBNET_SET;
|
|
66
69
|
const replacement = nextIPv6 !== first ? nextIPv6 : common_1.NO_SUBNET_SET;
|
|
67
|
-
|
|
70
|
+
if (replacement !== second) {
|
|
71
|
+
setFieldValue('machineNetworks.1.cidr', replacement, false);
|
|
72
|
+
}
|
|
68
73
|
}
|
|
69
74
|
else {
|
|
70
|
-
|
|
75
|
+
if (second !== common_1.NO_SUBNET_SET) {
|
|
76
|
+
setFieldValue('machineNetworks.1.cidr', common_1.NO_SUBNET_SET, false);
|
|
77
|
+
}
|
|
71
78
|
}
|
|
72
79
|
}
|
|
73
80
|
}, [isDualStack, values.machineNetworks, IPv4Subnets, IPv6Subnets, setFieldValue]);
|
|
@@ -80,9 +87,9 @@ const AvailableSubnetsControl = ({ clusterId, hostSubnets, isRequired = false, i
|
|
|
80
87
|
return null;
|
|
81
88
|
const machineSubnets = supportsIPv6Primary ? allSubnets : IPv4Subnets;
|
|
82
89
|
return (react_1.default.createElement(react_core_1.StackItem, { key: index },
|
|
83
|
-
react_1.default.createElement(SubnetsDropdown_1.SubnetsDropdown, { name: `machineNetworks.${index}.cidr`, machineSubnets: machineSubnets, isDisabled: isDisabled, "data-testid": `subnets-dropdown-toggle-${index ? 'ipv6' : 'ipv4'}` })));
|
|
90
|
+
react_1.default.createElement(SubnetsDropdown_1.SubnetsDropdown, { name: `machineNetworks.${index}.cidr`, machineSubnets: machineSubnets, isDisabled: isDisabled, onAfterSelect: (newSelection) => (0, reorderNetworks_1.reorderNetworksForPrimary)(newSelection, values, setFieldValue), "data-testid": `subnets-dropdown-toggle-${index ? 'ipv6' : 'ipv4'}` })));
|
|
84
91
|
})) : (react_1.default.createElement(react_core_1.StackItem, null,
|
|
85
|
-
react_1.default.createElement(SubnetsDropdown_1.SubnetsDropdown, { name: `machineNetworks.0.cidr`, machineSubnets: IPv4Subnets, isDisabled: isDisabled, "data-testid": 'subnets-dropdown-toggle-primary' })))));
|
|
92
|
+
react_1.default.createElement(SubnetsDropdown_1.SubnetsDropdown, { name: `machineNetworks.0.cidr`, machineSubnets: IPv4Subnets, isDisabled: isDisabled, onAfterSelect: (newSelection) => (0, reorderNetworks_1.reorderNetworksForPrimary)(newSelection, values, setFieldValue), "data-testid": 'subnets-dropdown-toggle-primary' })))));
|
|
86
93
|
}),
|
|
87
94
|
typeof errors.machineNetworks === 'string' && (react_1.default.createElement(react_core_1.Alert, { variant: react_core_1.AlertVariant.warning, title: errors.machineNetworks, isInline: true }))),
|
|
88
95
|
isDualStack && values.machineNetworks && values.machineNetworks.length > 1 && (react_1.default.createElement(react_core_1.FormGroup, { label: "Machine network", labelInfo: "Secondary", fieldId: "machine-networks-secondary", isRequired: isRequired },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AvailableSubnetsControl.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/AvailableSubnetsControl.tsx"],"names":[],"mappings":";;;;AAAA,uDAAyC;AACzC,6CAA0C;AAC1C,uDAA0F;AAC1F,mCAAqE;AACrE,2CAAgD;AAEhD,+CAM4B;AAC5B,+EAAuG;AACvG,uDAAoD;
|
|
1
|
+
{"version":3,"file":"AvailableSubnetsControl.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/AvailableSubnetsControl.tsx"],"names":[],"mappings":"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"}
|
package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/StackTypeControl.js
CHANGED
|
@@ -12,6 +12,7 @@ const ui_1 = require("../../../../common/components/ui");
|
|
|
12
12
|
const ClusterDefaultConfigurationContext_1 = require("../ClusterDefaultConfigurationContext");
|
|
13
13
|
const selectors_1 = require("../../../store/slices/current-cluster/selectors");
|
|
14
14
|
const OcmFormFields_1 = require("../../ui/OcmFormFields");
|
|
15
|
+
const reorderNetworks_1 = require("./reorderNetworks");
|
|
15
16
|
const hasDualStackConfigurationChanged = (clusterNetworks, serviceNetworks, cidrIPv6, values) => clusterNetworks &&
|
|
16
17
|
serviceNetworks &&
|
|
17
18
|
((values.machineNetworks && values.machineNetworks[1].cidr !== cidrIPv6) ||
|
|
@@ -157,6 +158,8 @@ const StackTypeControlGroup = ({ clusterId, isDualStackSelectable, hostSubnets,
|
|
|
157
158
|
: { cidr: '', clusterId: clusterId },
|
|
158
159
|
], false);
|
|
159
160
|
}
|
|
161
|
+
// Ensure cluster/service networks ordering matches the new primary family
|
|
162
|
+
(0, reorderNetworks_1.reorderNetworksByCurrentPrimary)(values, setFieldValue);
|
|
160
163
|
};
|
|
161
164
|
const setStackType = (e) => {
|
|
162
165
|
if (e.target.value === common_1.DUAL_STACK) {
|
package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/StackTypeControl.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StackTypeControl.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/StackTypeControl.tsx"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,6CAA0C;AAC1C,uDAA6F;AAC7F,mCAA0C;AAC1C,2CAAgD;AAEhD,+CAS4B;AAC5B,yDAAkF;AAClF,8FAAgF;AAChF,+EAAuG;AACvG,0DAAuD;
|
|
1
|
+
{"version":3,"file":"StackTypeControl.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/StackTypeControl.tsx"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,6CAA0C;AAC1C,uDAA6F;AAC7F,mCAA0C;AAC1C,2CAAgD;AAEhD,+CAS4B;AAC5B,yDAAkF;AAClF,8FAAgF;AAChF,+EAAuG;AACvG,0DAAuD;AACvD,uDAAoE;AAcpE,MAAM,gCAAgC,GAAG,CACvC,eAAiC,EACjC,eAAiC,EACjC,QAAgC,EAChC,MAAkC,EAClC,EAAE,CACF,eAAe;IACf,eAAe;IACf,CAAC,CAAC,MAAM,CAAC,eAAe,IAAI,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC;QACtE,CAAC,MAAM,CAAC,eAAe,IAAI,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,eAAe,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QACtF,CAAC,MAAM,CAAC,eAAe;YACrB,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,UAAU,KAAK,eAAe,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;QACzE,CAAC,MAAM,CAAC,eAAe,IAAI,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,eAAe,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;AAErF,MAAM,qBAAqB,GAAG,CAAC,EACpC,SAAS,EACT,qBAAqB,EACrB,WAAW,GACgB,EAAE,EAAE;IAC/B,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,IAAA,yBAAgB,GAA8B,CAAC;IAC/F,MAAM,CAAC,gBAAgB,EAAE,eAAe,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAClE,MAAM,oBAAoB,GAAG,IAAA,4DAAuB,EAAC;QACnD,0BAA0B;QAC1B,qBAAqB;QACrB,0BAA0B;QAC1B,qBAAqB;KACtB,CAAC,CAAC;IAEH,MAAM,WAAW,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,qBAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;IACpF,MAAM,QAAQ,GAAG,WAAW,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,sBAAa,CAAC;IACjF,MAAM,EAAE,YAAY,EAAE,GAAG,IAAA,yBAAW,EAAC,gDAAoC,CAAC,CAAC;IAC3E,MAAM,oBAAoB,GACxB,CAAC,YAAY,IAAI,CAAC,qBAAqB,IAAI,MAAM,CAAC,SAAS,KAAK,mBAAU,CAAC;IAE7E,MAAM,cAAc,GAAG,eAAK,CAAC,WAAW,CAAC,GAAG,EAAE;;QAC5C,aAAa,CAAC,WAAW,EAAE,mBAAU,CAAC,CAAC;QAEvC,sDAAsD;QACtD,MAAM,YAAY,GAAG,MAAA,MAAM,CAAC,eAAe,0CAAG,CAAC,CAAC,CAAC;QACjD,MAAM,WAAW,GAAG,OAAO,CAAC,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,IAAI,KAAI,qBAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC;QAEvF,IAAI,MAAM,CAAC,eAAe,IAAI,CAAA,MAAA,MAAM,CAAC,eAAe,0CAAE,MAAM,KAAI,CAAC,EAAE;YACjE,qDAAqD;YACrD,IAAI,WAAW,EAAE;gBACf,sCAAsC;gBACtC,aAAa,CAAC,iBAAiB,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;aAClD;iBAAM;gBACL,0EAA0E;gBAC1E,MAAM,WAAW,GAAG,MAAM,CAAC,eAAe,CAAC,IAAI,CAC7C,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,IAAI,qBAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAC5D,CAAC;gBACF,IAAI,WAAW,EAAE;oBACf,aAAa,CAAC,iBAAiB,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;iBACjD;qBAAM;oBACL,sDAAsD;oBACtD,aAAa,CAAC,iBAAiB,EAAE,EAAE,CAAC,CAAC;iBACtC;aACF;SACF;QACD,sEAAsE;QACtE,IAAI,MAAM,CAAC,eAAe,IAAI,MAAM,CAAC,eAAe,CAAC,MAAM,IAAI,CAAC,EAAE;YAChE,MAAM,cAAc,GAClB,oBAAoB,CAAC,mBAAmB,IAAI,oBAAoB,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC;YAC1F,MAAM,YAAY,GAAG,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;YAC/C,MAAM,WAAW,GAAG,cAAc;gBAChC,CAAC,CAAC;oBACE,IAAI,EAAE,cAAc,CAAC,IAAI;oBACzB,UAAU,EAAE,cAAc,CAAC,UAAU;oBACrC,SAAS,EAAE,YAAY,CAAC,SAAS,EAAE,6CAA6C;iBACjF;gBACH,CAAC,CAAC;oBACE,IAAI,EAAE,EAAE;oBACR,UAAU,EAAE,EAAE;oBACd,SAAS,EAAE,SAAS,EAAE,0BAA0B;iBACjD,CAAC;YACN,aAAa,CAAC,iBAAiB,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;SACjD;QACD,IAAI,MAAM,CAAC,eAAe,IAAI,MAAM,CAAC,eAAe,CAAC,MAAM,IAAI,CAAC,EAAE;YAChE,MAAM,cAAc,GAClB,oBAAoB,CAAC,mBAAmB,IAAI,oBAAoB,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC;YAC1F,MAAM,YAAY,GAAG,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;YAC/C,MAAM,WAAW,GAAG,cAAc;gBAChC,CAAC,CAAC;oBACE,IAAI,EAAE,cAAc,CAAC,IAAI;oBACzB,SAAS,EAAE,YAAY,CAAC,SAAS,EAAE,6CAA6C;iBACjF;gBACH,CAAC,CAAC;oBACE,IAAI,EAAE,EAAE;oBACR,SAAS,EAAE,SAAS,EAAE,0BAA0B;iBACjD,CAAC;YACN,aAAa,CAAC,iBAAiB,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;SACjD;QAED,sFAAsF;QACtF,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE;YAC7B,MAAM,SAAS,GAAG,CAChB,IAAmD,EACP,EAAE;gBAC9C,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;oBAAE,OAAO,EAAE,CAAC;gBAC1C,wEAAwE;gBACxE,MAAM,SAAS,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBACtC,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC;gBAC/B,OAAO,MAAM,IAAI,MAAM,CAAC,EAAE;oBACxB,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,IAAI,SAAS,EAAE,CAAC;oBAC/D,CAAC,CAAC,EAAE,CAAC;YACT,CAAC,CAAC;YAEF,aAAa,CAAC,SAAS,EAAE,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;YACpD,aAAa,CAAC,aAAa,EAAE,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC;SAC7D;QAED,KAAK,YAAY,EAAE,CAAC;IACtB,CAAC,EAAE;QACD,aAAa;QACb,YAAY;QACZ,SAAS;QACT,oBAAoB,CAAC,mBAAmB;QACxC,oBAAoB,CAAC,mBAAmB;QACxC,MAAM,CAAC,eAAe;QACtB,MAAM,CAAC,eAAe;QACtB,MAAM,CAAC,eAAe;QACtB,MAAM,CAAC,OAAO;QACd,MAAM,CAAC,WAAW;QAClB,MAAM,CAAC,iBAAiB;KACzB,CAAC,CAAC;IAEH,MAAM,YAAY,GAAG,GAAG,EAAE;;QACxB,aAAa,CAAC,WAAW,EAAE,mBAAU,CAAC,CAAC;QACvC,aAAa,CAAC,mBAAmB,EAAE,KAAK,CAAC,CAAC;QAE1C,IAAI,MAAM,CAAC,WAAW,KAAK,yBAAgB,EAAE;YAC3C,aAAa,CAAC,aAAa,EAAE,yBAAgB,CAAC,CAAC;SAChD;QAED,IAAI,MAAM,CAAC,eAAe,IAAI,CAAA,MAAA,MAAM,CAAC,eAAe,0CAAE,MAAM,IAAG,CAAC,EAAE;YAChE,sDAAsD;YACtD,MAAM,YAAY,GAAG,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;YAC/C,MAAM,WAAW,GAAG,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,IAAI,KAAI,qBAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;YAE9E,IAAI,WAAW,EAAE;gBACf,iEAAiE;gBACjE,MAAM,WAAW,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,qBAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;gBACpF,MAAM,QAAQ,GAAG,WAAW,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,sBAAa,CAAC;gBACjF,aAAa,CACX,iBAAiB,EACjB;oBACE,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE;oBACxC,EAAE,IAAI,EAAE,YAAY,CAAC,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE;iBAClD,EACD,KAAK,CACN,CAAC;aACH;iBAAM;gBACL,kDAAkD;gBAClD,aAAa,CACX,iBAAiB,EACjB,CAAC,GAAG,MAAM,CAAC,eAAe,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC,EACrE,KAAK,CACN,CAAC;aACH;SACF;QACD,IAAI,MAAM,CAAC,eAAe,IAAI,CAAA,MAAA,MAAM,CAAC,eAAe,0CAAE,MAAM,IAAG,CAAC,EAAE;YAChE,aAAa,CACX,iBAAiB,EACjB;gBACE,GAAG,MAAM,CAAC,eAAe;gBACzB,CAAA,MAAA,oBAAoB,CAAC,wBAAwB,0CAAE,MAAM;oBACnD,CAAC,CAAC,oBAAoB,CAAC,wBAAwB,CAAC,CAAC,CAAC;oBAClD,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE;aACvD,EACD,KAAK,CACN,CAAC;SACH;QACD,IAAI,MAAM,CAAC,eAAe,IAAI,CAAA,MAAA,MAAM,CAAC,eAAe,0CAAE,MAAM,IAAG,CAAC,EAAE;YAChE,aAAa,CACX,iBAAiB,EACjB;gBACE,GAAG,MAAM,CAAC,eAAe;gBACzB,CAAA,MAAA,oBAAoB,CAAC,wBAAwB,0CAAE,MAAM;oBACnD,CAAC,CAAC,oBAAoB,CAAC,wBAAwB,CAAC,CAAC,CAAC;oBAClD,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE;aACvC,EACD,KAAK,CACN,CAAC;SACH;QACD,0EAA0E;QAC1E,IAAA,iDAA+B,EAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IACzD,CAAC,CAAC;IAEF,MAAM,YAAY,GAAG,CAAC,CAAsC,EAAE,EAAE;QAC9D,IAAI,CAAC,CAAC,MAAM,CAAC,KAAK,KAAK,mBAAU,EAAE;YACjC,YAAY,EAAE,CAAC;SAChB;aAAM,IACL,gCAAgC,CAC9B,oBAAoB,CAAC,wBAAwB,IAAI,EAAE,EACnD,oBAAoB,CAAC,wBAAwB,IAAI,EAAE,EACnD,QAAQ,EACR,MAAM,CACP,EACD;YACA,eAAe,CAAC,IAAI,CAAC,CAAC;SACvB;aAAM;YACL,cAAc,EAAE,CAAC;SAClB;IACH,CAAC,CAAC;IAEF,eAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,IAAI,oBAAoB,EAAE;YACxB,cAAc,EAAE,CAAC;SAClB;IACH,CAAC,EAAE,CAAC,oBAAoB,EAAE,cAAc,CAAC,CAAC,CAAC;IAE3C,OAAO,CACL;QACE,8BAAC,sBAAS,IACR,KAAK,EAAC,uBAAuB,EAC7B,OAAO,EAAE,IAAA,mBAAU,EAAC,WAAW,EAAE,OAAO,CAAC,EACzC,QAAQ,EAAE,YAAY,EACtB,QAAQ;YAER,8BAAC,kBAAK;gBACJ,8BAAC,sBAAS;oBACR,8BAAC,6BAAa,IACZ,IAAI,EAAE,WAAW,EACjB,KAAK,EAAE,mBAAU,EACjB,UAAU,EAAE,CAAC,qBAAqB,EAClC,KAAK,EAAC,YAAY,GAClB,CACQ;gBACZ,8BAAC,sBAAS;oBACR,8BAAC,gBAAW,IACV,WAAW,EAAC,kDAAkD,EAC9D,WAAW,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,GAC5B,CACQ,CACN;YACR,8BAAC,kBAAK;gBACJ,8BAAC,sBAAS;oBACR,8BAAC,oBAAO,IACN,OAAO,EACL,iFAAiF,EAEnF,MAAM,EAAE,qBAAqB;wBAE7B,8BAAC,6BAAa,IACZ,IAAI,EAAE,WAAW,EACjB,KAAK,EAAE,mBAAU,EACjB,UAAU,EAAE,CAAC,qBAAqB,EAClC,KAAK,EAAC,kBAAkB,GACxB,CACM,CACA;gBACZ,8BAAC,sBAAS;oBACR,8BAAC,gBAAW,IACV,WAAW,EAAC,sEAAsE,EAClF,WAAW,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,GAC5B,CACQ,CACN,CACE;QAEX,gBAAgB,IAAI,CACnB,8BAAC,sBAAiB,IAChB,KAAK,EAAE,oBAAoB,EAC3B,gBAAgB,EAAE,SAAS,EAC3B,sBAAsB,EAAE,QAAQ,EAChC,yBAAyB,EAAE,0BAAa,CAAC,OAAO,EAChD,OAAO,EAAE,0GAAqE,EAC9E,OAAO,EAAE,GAAG,EAAE;gBACZ,eAAe,CAAC,KAAK,CAAC,CAAC;gBACvB,YAAY,EAAE,CAAC;YACjB,CAAC,EACD,SAAS,EAAE,GAAG,EAAE;gBACd,eAAe,CAAC,KAAK,CAAC,CAAC;gBACvB,cAAc,EAAE,CAAC;YACnB,CAAC,GACD,CACH,CACA,CACJ,CAAC;AACJ,CAAC,CAAC;AAzQW,QAAA,qBAAqB,yBAyQhC"}
|
package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/SubnetsDropdown.js
CHANGED
|
@@ -28,7 +28,7 @@ const noSubnetAvailableOption = {
|
|
|
28
28
|
id: 'form-input-hostSubnet-field-option-no-subnet-available',
|
|
29
29
|
};
|
|
30
30
|
const SubnetsDropdown = (_a) => {
|
|
31
|
-
var { name, machineSubnets, isDisabled } = _a, props = tslib_1.__rest(_a, ["name", "machineSubnets", "isDisabled"]);
|
|
31
|
+
var { name, machineSubnets, isDisabled, onAfterSelect } = _a, props = tslib_1.__rest(_a, ["name", "machineSubnets", "isDisabled", "onAfterSelect"]);
|
|
32
32
|
const [field, , { setValue }] = (0, formik_1.useField)(name);
|
|
33
33
|
const [isOpen, setOpen] = react_1.default.useState(false);
|
|
34
34
|
const fieldId = (0, common_1.getFieldId)(name, 'input');
|
|
@@ -75,8 +75,12 @@ const SubnetsDropdown = (_a) => {
|
|
|
75
75
|
return itemsSubnets.map(({ value, label, isDisabled }) => (react_1.default.createElement(react_core_1.DropdownItem, { key: value, id: value, isDisabled: isDisabled, value: value }, label)));
|
|
76
76
|
}, [machineSubnets, ipv4Subnets, ipv6Subnets, itemsSubnets]);
|
|
77
77
|
const onSelect = (event) => {
|
|
78
|
-
|
|
78
|
+
const nextValue = event === null || event === void 0 ? void 0 : event.currentTarget.id;
|
|
79
|
+
setValue(nextValue);
|
|
79
80
|
setOpen(false);
|
|
81
|
+
if (onAfterSelect && nextValue) {
|
|
82
|
+
onAfterSelect(nextValue);
|
|
83
|
+
}
|
|
80
84
|
};
|
|
81
85
|
const currentItem = itemsSubnets.find((i) => i.label === currentDisplayValue);
|
|
82
86
|
const showBadge = Boolean(currentItem && ip_address_1.Address6.isValid(currentItem.value));
|
package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/SubnetsDropdown.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SubnetsDropdown.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/SubnetsDropdown.tsx"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,uDAQgC;AAChC,mCAAkC;AAClC,+CAM4B;AAC5B,2CAAgD;
|
|
1
|
+
{"version":3,"file":"SubnetsDropdown.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/SubnetsDropdown.tsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,60 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.reorderNetworksByCurrentPrimary = exports.reorderNetworksForPrimary = void 0;
|
|
4
|
+
const ip_address_1 = require("ip-address");
|
|
5
|
+
const common_1 = require("../../../../common");
|
|
6
|
+
const reorderByPrimaryCidr = (primaryCidr, values, setFieldValue) => {
|
|
7
|
+
const isDualStack = values.stackType === common_1.DUAL_STACK;
|
|
8
|
+
if (!isDualStack || !primaryCidr)
|
|
9
|
+
return;
|
|
10
|
+
const isPrimaryIPv6 = ip_address_1.Address6.isValid(primaryCidr);
|
|
11
|
+
// Reorder Cluster Networks
|
|
12
|
+
if (Array.isArray(values.clusterNetworks) && values.clusterNetworks.length >= 2) {
|
|
13
|
+
const [first, second] = values.clusterNetworks;
|
|
14
|
+
const firstClusterCidr = first === null || first === void 0 ? void 0 : first.cidr;
|
|
15
|
+
const secondClusterCidr = second === null || second === void 0 ? void 0 : second.cidr;
|
|
16
|
+
if (firstClusterCidr && secondClusterCidr) {
|
|
17
|
+
const isFirstClusterIPv6 = ip_address_1.Address6.isValid(firstClusterCidr);
|
|
18
|
+
const isSecondClusterIPv6 = ip_address_1.Address6.isValid(secondClusterCidr);
|
|
19
|
+
if (isFirstClusterIPv6 !== isSecondClusterIPv6) {
|
|
20
|
+
if ((isPrimaryIPv6 && !isFirstClusterIPv6 && isSecondClusterIPv6) ||
|
|
21
|
+
(!isPrimaryIPv6 && isFirstClusterIPv6 && !isSecondClusterIPv6)) {
|
|
22
|
+
const reordered = [values.clusterNetworks[1], values.clusterNetworks[0]];
|
|
23
|
+
setFieldValue('clusterNetworks', reordered, false);
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
// Reorder Service Networks
|
|
29
|
+
if (Array.isArray(values.serviceNetworks) && values.serviceNetworks.length >= 2) {
|
|
30
|
+
const [first, second] = values.serviceNetworks;
|
|
31
|
+
const firstServiceCidr = first === null || first === void 0 ? void 0 : first.cidr;
|
|
32
|
+
const secondServiceCidr = second === null || second === void 0 ? void 0 : second.cidr;
|
|
33
|
+
if (firstServiceCidr && secondServiceCidr) {
|
|
34
|
+
const isFirstServiceIPv6 = ip_address_1.Address6.isValid(firstServiceCidr);
|
|
35
|
+
const isSecondServiceIPv6 = ip_address_1.Address6.isValid(secondServiceCidr);
|
|
36
|
+
if (isFirstServiceIPv6 !== isSecondServiceIPv6) {
|
|
37
|
+
if ((isPrimaryIPv6 && !isFirstServiceIPv6 && isSecondServiceIPv6) ||
|
|
38
|
+
(!isPrimaryIPv6 && isFirstServiceIPv6 && !isSecondServiceIPv6)) {
|
|
39
|
+
const reordered = [values.serviceNetworks[1], values.serviceNetworks[0]];
|
|
40
|
+
setFieldValue('serviceNetworks', reordered, false);
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
};
|
|
46
|
+
const reorderNetworksForPrimary = (nextPrimaryCidr, values, setFieldValue) => {
|
|
47
|
+
if (!nextPrimaryCidr)
|
|
48
|
+
return;
|
|
49
|
+
reorderByPrimaryCidr(nextPrimaryCidr, values, setFieldValue);
|
|
50
|
+
};
|
|
51
|
+
exports.reorderNetworksForPrimary = reorderNetworksForPrimary;
|
|
52
|
+
const reorderNetworksByCurrentPrimary = (values, setFieldValue) => {
|
|
53
|
+
var _a, _b;
|
|
54
|
+
const primaryCidr = (_b = (_a = values.machineNetworks) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.cidr;
|
|
55
|
+
if (!primaryCidr)
|
|
56
|
+
return;
|
|
57
|
+
reorderByPrimaryCidr(primaryCidr, values, setFieldValue);
|
|
58
|
+
};
|
|
59
|
+
exports.reorderNetworksByCurrentPrimary = reorderNetworksByCurrentPrimary;
|
|
60
|
+
//# sourceMappingURL=reorderNetworks.js.map
|
package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/reorderNetworks.js.map
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"reorderNetworks.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/reorderNetworks.ts"],"names":[],"mappings":"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"}
|
|
@@ -58,7 +58,8 @@ const StaticIpPage = ({ infraEnv, updateInfraEnv, onFormStateChange: onFormState
|
|
|
58
58
|
react_1.default.createElement(react_core_1.GridItem, null,
|
|
59
59
|
react_1.default.createElement(react_core_1.Content, { component: react_core_1.ContentVariants.h2 }, "Static network configurations"),
|
|
60
60
|
react_1.default.createElement(react_core_1.Content, { component: react_core_1.ContentVariants.small }, "Network configuration can be done using either the form view or YAML view. Configurations done in this step are for discovering hosts.")),
|
|
61
|
-
clusterWizardContext.currentStepId === 'static-ip-network-wide-configurations'
|
|
61
|
+
(clusterWizardContext.currentStepId === 'static-ip-network-wide-configurations' ||
|
|
62
|
+
clusterWizardContext.currentStepId === 'static-ip-yaml-view') && (react_1.default.createElement(StaticIpViewRadioGroup_1.default, { initialView: initialStaticIpInfo.view, confirmOnChangeView: confirmOnChangeView, onChangeView: onChangeView })),
|
|
62
63
|
initialStaticIpInfo.isDataComplete && isoRegenerationAlert,
|
|
63
64
|
content));
|
|
64
65
|
};
|
package/build/cjs/ocm/components/clusterConfiguration/staticIp/components/StaticIpPage.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StaticIpPage.js","sourceRoot":"","sources":["../../../../../../../lib/ocm/components/clusterConfiguration/staticIp/components/StaticIpPage.tsx"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,uDAOgC;AAEhC,8FAA8D;AAC9D,uDAAuD;AAEvD,kDAA+C;AAC/C,sFAAsF;AACtF,iEAA8D;AAC9D,mFAAgF;AAChF,0BAAwB;AAExB,MAAM,oBAAoB,GAAG,CAC3B,8BAAC,kBAAK,IACJ,OAAO,EAAE,yBAAY,CAAC,OAAO,EAC7B,QAAQ,EAAE,IAAI,iBACF,sBAAsB,EAClC,KAAK,EAAC,+KACoE,GAC1E,CACH,CAAC;AAEK,MAAM,YAAY,GAAgC,CAAC,EACxD,QAAQ,EACR,cAAc,EACd,iBAAiB,EAAE,uBAAuB,GAC3C,EAAE,EAAE;IACH,MAAM,oBAAoB,GAAG,IAAA,8CAAuB,GAAE,CAAC;IACvD,MAAM,CAAC,mBAAmB,EAAE,sBAAsB,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAU,KAAK,CAAC,CAAC;IACrF,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAU,KAAK,CAAC,CAAC;IAErE,MAAM,YAAY,GAAG,eAAK,CAAC,WAAW,CACpC,CAAC,IAAkB,EAAE,EAAE;QACrB,oBAAoB,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;QAChD,cAAc,CAAC,IAAI,CAAC,CAAC;IACvB,CAAC,EACD,CAAC,oBAAoB,CAAC,CACvB,CAAC;IAEF,MAAM,mBAAmB,GAAG,eAAK,CAAC,OAAO,CAA2B,GAAG,EAAE;QACvE,OAAO,IAAA,8BAAe,EAAC,QAAQ,CAAC,CAAC;QACjC,uDAAuD;IACzD,CAAC,EAAE,EAAE,CAAC,CAAC;IACP,IAAI,CAAC,mBAAmB,EAAE;QACxB,OAAO,IAAI,CAAC;KACb;IACD,MAAM,iBAAiB,GAAG,CAAC,SAA4B,EAAE,EAAE;QACzD,MAAM,aAAa,GACjB,oBAAoB,CAAC,aAAa,KAAK,+BAA+B,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;QAC/F,sBAAsB,CAAC,aAAa,CAAC,CAAC;QACtC,uBAAuB,CAAC,SAAS,CAAC,CAAC;IACrC,CAAC,CAAC;IAEF,MAAM,SAAS,GAAsB;QACnC,iBAAiB;QACjB,QAAQ;QACR,cAAc;QACd,eAAe,EAAE,WAAW;KAC7B,CAAC;IAEF,MAAM,UAAU,GAAG,GAAG,EAAE;QACtB,QAAQ,oBAAoB,CAAC,aAAa,EAAE;YAC1C,KAAK,qBAAqB;gBACxB,OAAO,8BAAC,mBAAQ,oBAAK,SAAS,EAAI,CAAC;YACrC,KAAK,uCAAuC;gBAC1C,OAAO,8BAAC,yCAAmB,oBAAK,SAAS,EAAI,CAAC;YAChD,KAAK,+BAA+B;gBAClC,OAAO,8BAAC,6BAAa,oBAAK,SAAS,EAAI,CAAC;YAC1C;gBACE,MAAM,6BAA6B,oBAAoB,CAAC,aAAa,+BAA+B,CAAC;SACxG;IACH,CAAC,CAAC;IAEF,MAAM,OAAO,GAAG,UAAU,EAAE,CAAC;IAC7B,IAAI,CAAC,OAAO,EAAE;QACZ,OAAO,IAAI,CAAC;KACb;IACD,OAAO,CACL,8BAAC,iBAAI,IAAC,SAAS;QACb,8BAAC,qBAAQ;YACP,8BAAC,oBAAO,IAAC,SAAS,EAAE,4BAAe,CAAC,EAAE,oCAAyC;YAC/E,8BAAC,oBAAO,IAAC,SAAS,EAAE,4BAAe,CAAC,KAAK,6IAG/B,CACD;QAEV,oBAAoB,CAAC,aAAa,KAAK,uCAAuC,IAAI,
|
|
1
|
+
{"version":3,"file":"StaticIpPage.js","sourceRoot":"","sources":["../../../../../../../lib/ocm/components/clusterConfiguration/staticIp/components/StaticIpPage.tsx"],"names":[],"mappings":"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"}
|
package/lib/ocm/components/clusterConfiguration/networkConfiguration/AdvancedNetworkFields.tsx
CHANGED
|
@@ -8,7 +8,6 @@ import {
|
|
|
8
8
|
Grid,
|
|
9
9
|
} from '@patternfly/react-core';
|
|
10
10
|
import { FieldArray, useFormikContext } from 'formik';
|
|
11
|
-
import { Address6 } from 'ip-address';
|
|
12
11
|
import {
|
|
13
12
|
DUAL_STACK,
|
|
14
13
|
PREFIX_MAX_RESTRICTION,
|
|
@@ -33,62 +32,10 @@ const serviceCidrHelperText =
|
|
|
33
32
|
'Enter only 1 IP address pool. If you need to access the services from an external network, configure load balancers and routers to manage the traffic.';
|
|
34
33
|
|
|
35
34
|
const AdvancedNetworkFields = () => {
|
|
36
|
-
const { values, errors
|
|
35
|
+
const { values, errors } = useFormikContext<NetworkConfigurationValues>();
|
|
37
36
|
|
|
38
37
|
const isDualStack = values.stackType === DUAL_STACK;
|
|
39
38
|
|
|
40
|
-
// Reorder Cluster Networks and Service Networks when Machine Network primary changes
|
|
41
|
-
React.useEffect(() => {
|
|
42
|
-
if (!isDualStack || !values.machineNetworks?.[0]?.cidr) return;
|
|
43
|
-
|
|
44
|
-
const primaryMachineNetworkCidr = values.machineNetworks[0].cidr;
|
|
45
|
-
const isPrimaryIPv6 = Address6.isValid(primaryMachineNetworkCidr);
|
|
46
|
-
|
|
47
|
-
// Check Cluster Networks
|
|
48
|
-
if (values.clusterNetworks && values.clusterNetworks.length >= 2) {
|
|
49
|
-
const firstClusterCidr = values.clusterNetworks[0].cidr;
|
|
50
|
-
if (!firstClusterCidr) return;
|
|
51
|
-
|
|
52
|
-
const isFirstClusterIPv6 = Address6.isValid(firstClusterCidr);
|
|
53
|
-
|
|
54
|
-
// If primary machine is IPv6 but first cluster is IPv4, swap them
|
|
55
|
-
if (isPrimaryIPv6 && !isFirstClusterIPv6) {
|
|
56
|
-
const reordered = [values.clusterNetworks[1], values.clusterNetworks[0]];
|
|
57
|
-
setFieldValue('clusterNetworks', reordered, false);
|
|
58
|
-
}
|
|
59
|
-
// If primary machine is IPv4 but first cluster is IPv6, swap them
|
|
60
|
-
else if (!isPrimaryIPv6 && isFirstClusterIPv6) {
|
|
61
|
-
const reordered = [values.clusterNetworks[1], values.clusterNetworks[0]];
|
|
62
|
-
setFieldValue('clusterNetworks', reordered, false);
|
|
63
|
-
}
|
|
64
|
-
}
|
|
65
|
-
|
|
66
|
-
// Check Service Networks
|
|
67
|
-
if (values.serviceNetworks && values.serviceNetworks.length >= 2) {
|
|
68
|
-
const firstServiceCidr = values.serviceNetworks[0].cidr;
|
|
69
|
-
if (!firstServiceCidr) return;
|
|
70
|
-
|
|
71
|
-
const isFirstServiceIPv6 = Address6.isValid(firstServiceCidr);
|
|
72
|
-
|
|
73
|
-
// If primary machine is IPv6 but first service is IPv4, swap them
|
|
74
|
-
if (isPrimaryIPv6 && !isFirstServiceIPv6) {
|
|
75
|
-
const reordered = [values.serviceNetworks[1], values.serviceNetworks[0]];
|
|
76
|
-
setFieldValue('serviceNetworks', reordered, false);
|
|
77
|
-
}
|
|
78
|
-
// If primary machine is IPv4 but first service is IPv6, swap them
|
|
79
|
-
else if (!isPrimaryIPv6 && isFirstServiceIPv6) {
|
|
80
|
-
const reordered = [values.serviceNetworks[1], values.serviceNetworks[0]];
|
|
81
|
-
setFieldValue('serviceNetworks', reordered, false);
|
|
82
|
-
}
|
|
83
|
-
}
|
|
84
|
-
}, [
|
|
85
|
-
isDualStack,
|
|
86
|
-
values.machineNetworks,
|
|
87
|
-
values.clusterNetworks,
|
|
88
|
-
values.serviceNetworks,
|
|
89
|
-
setFieldValue,
|
|
90
|
-
]);
|
|
91
|
-
|
|
92
39
|
const clusterNetworkCidrPrefix = (index: number) =>
|
|
93
40
|
parseInt(
|
|
94
41
|
((values.clusterNetworks && values.clusterNetworks[index].cidr) || '').split('/')[1],
|
package/lib/ocm/components/clusterConfiguration/networkConfiguration/AvailableSubnetsControl.tsx
CHANGED
|
@@ -13,6 +13,7 @@ import {
|
|
|
13
13
|
} from '../../../../common';
|
|
14
14
|
import { selectCurrentClusterPermissionsState } from '../../../store/slices/current-cluster/selectors';
|
|
15
15
|
import { SubnetsDropdown } from './SubnetsDropdown';
|
|
16
|
+
import { reorderNetworksForPrimary } from './reorderNetworks';
|
|
16
17
|
import { Cluster, MachineNetwork } from '@openshift-assisted/types/assisted-installer-service';
|
|
17
18
|
|
|
18
19
|
const subnetSort = (subA: HostSubnet, subB: HostSubnet) =>
|
|
@@ -26,7 +27,7 @@ const useAutoSelectSingleAvailableSubnet = (
|
|
|
26
27
|
) => {
|
|
27
28
|
useEffect(() => {
|
|
28
29
|
if (autoSelectNetwork) {
|
|
29
|
-
setFieldValue('machineNetworks', [{ cidr, clusterId }],
|
|
30
|
+
setFieldValue('machineNetworks', [{ cidr, clusterId }], false);
|
|
30
31
|
}
|
|
31
32
|
}, [autoSelectNetwork, cidr, clusterId, setFieldValue]);
|
|
32
33
|
};
|
|
@@ -90,13 +91,19 @@ export const AvailableSubnetsControl = ({
|
|
|
90
91
|
if (Address6.isValid(first)) {
|
|
91
92
|
const nextIPv4 = IPv4Subnets[0]?.subnet || NO_SUBNET_SET;
|
|
92
93
|
const replacement = nextIPv4 !== first ? nextIPv4 : NO_SUBNET_SET;
|
|
93
|
-
|
|
94
|
+
if (replacement !== second) {
|
|
95
|
+
setFieldValue('machineNetworks.1.cidr', replacement, false);
|
|
96
|
+
}
|
|
94
97
|
} else if (Address4.isValid(first)) {
|
|
95
98
|
const nextIPv6 = IPv6Subnets[0]?.subnet || NO_SUBNET_SET;
|
|
96
99
|
const replacement = nextIPv6 !== first ? nextIPv6 : NO_SUBNET_SET;
|
|
97
|
-
|
|
100
|
+
if (replacement !== second) {
|
|
101
|
+
setFieldValue('machineNetworks.1.cidr', replacement, false);
|
|
102
|
+
}
|
|
98
103
|
} else {
|
|
99
|
-
|
|
104
|
+
if (second !== NO_SUBNET_SET) {
|
|
105
|
+
setFieldValue('machineNetworks.1.cidr', NO_SUBNET_SET, false);
|
|
106
|
+
}
|
|
100
107
|
}
|
|
101
108
|
}
|
|
102
109
|
}, [isDualStack, values.machineNetworks, IPv4Subnets, IPv6Subnets, setFieldValue]);
|
|
@@ -124,6 +131,9 @@ export const AvailableSubnetsControl = ({
|
|
|
124
131
|
name={`machineNetworks.${index}.cidr`}
|
|
125
132
|
machineSubnets={machineSubnets}
|
|
126
133
|
isDisabled={isDisabled}
|
|
134
|
+
onAfterSelect={(newSelection) =>
|
|
135
|
+
reorderNetworksForPrimary(newSelection, values, setFieldValue)
|
|
136
|
+
}
|
|
127
137
|
data-testid={`subnets-dropdown-toggle-${index ? 'ipv6' : 'ipv4'}`}
|
|
128
138
|
/>
|
|
129
139
|
</StackItem>
|
|
@@ -135,6 +145,9 @@ export const AvailableSubnetsControl = ({
|
|
|
135
145
|
name={`machineNetworks.0.cidr`}
|
|
136
146
|
machineSubnets={IPv4Subnets}
|
|
137
147
|
isDisabled={isDisabled}
|
|
148
|
+
onAfterSelect={(newSelection) =>
|
|
149
|
+
reorderNetworksForPrimary(newSelection, values, setFieldValue)
|
|
150
|
+
}
|
|
138
151
|
data-testid={'subnets-dropdown-toggle-primary'}
|
|
139
152
|
/>
|
|
140
153
|
</StackItem>
|
|
@@ -18,6 +18,7 @@ import { ConfirmationModal, PopoverIcon } from '../../../../common/components/ui
|
|
|
18
18
|
import { useDefaultConfiguration } from '../ClusterDefaultConfigurationContext';
|
|
19
19
|
import { selectCurrentClusterPermissionsState } from '../../../store/slices/current-cluster/selectors';
|
|
20
20
|
import { OcmRadioField } from '../../ui/OcmFormFields';
|
|
21
|
+
import { reorderNetworksByCurrentPrimary } from './reorderNetworks';
|
|
21
22
|
import {
|
|
22
23
|
Cluster,
|
|
23
24
|
ClusterNetwork,
|
|
@@ -215,6 +216,8 @@ export const StackTypeControlGroup = ({
|
|
|
215
216
|
false,
|
|
216
217
|
);
|
|
217
218
|
}
|
|
219
|
+
// Ensure cluster/service networks ordering matches the new primary family
|
|
220
|
+
reorderNetworksByCurrentPrimary(values, setFieldValue);
|
|
218
221
|
};
|
|
219
222
|
|
|
220
223
|
const setStackType = (e: React.ChangeEvent<HTMLInputElement>) => {
|
|
@@ -22,6 +22,7 @@ type SubnetsDropdownProps = {
|
|
|
22
22
|
name: string;
|
|
23
23
|
machineSubnets: HostSubnet[];
|
|
24
24
|
isDisabled: boolean;
|
|
25
|
+
onAfterSelect?: (selectedValue: string) => void;
|
|
25
26
|
};
|
|
26
27
|
|
|
27
28
|
const toFormSelectOptions = (subnets: HostSubnet[]) => {
|
|
@@ -51,6 +52,7 @@ export const SubnetsDropdown = ({
|
|
|
51
52
|
name,
|
|
52
53
|
machineSubnets,
|
|
53
54
|
isDisabled,
|
|
55
|
+
onAfterSelect,
|
|
54
56
|
...props
|
|
55
57
|
}: SubnetsDropdownProps & MenuToggleProps) => {
|
|
56
58
|
const [field, , { setValue }] = useField(name);
|
|
@@ -142,8 +144,12 @@ export const SubnetsDropdown = ({
|
|
|
142
144
|
}, [machineSubnets, ipv4Subnets, ipv6Subnets, itemsSubnets]);
|
|
143
145
|
|
|
144
146
|
const onSelect = (event?: React.MouseEvent<Element, MouseEvent>): void => {
|
|
145
|
-
|
|
147
|
+
const nextValue = event?.currentTarget.id;
|
|
148
|
+
setValue(nextValue);
|
|
146
149
|
setOpen(false);
|
|
150
|
+
if (onAfterSelect && nextValue) {
|
|
151
|
+
onAfterSelect(nextValue);
|
|
152
|
+
}
|
|
147
153
|
};
|
|
148
154
|
|
|
149
155
|
const currentItem = itemsSubnets.find((i) => i.label === currentDisplayValue);
|
|
@@ -0,0 +1,72 @@
|
|
|
1
|
+
import { Address6 } from 'ip-address';
|
|
2
|
+
import { DUAL_STACK, NetworkConfigurationValues } from '../../../../common';
|
|
3
|
+
import type { FormikHelpers } from 'formik';
|
|
4
|
+
|
|
5
|
+
const reorderByPrimaryCidr = (
|
|
6
|
+
primaryCidr: string,
|
|
7
|
+
values: NetworkConfigurationValues,
|
|
8
|
+
setFieldValue: FormikHelpers<NetworkConfigurationValues>['setFieldValue'],
|
|
9
|
+
) => {
|
|
10
|
+
const isDualStack = values.stackType === DUAL_STACK;
|
|
11
|
+
if (!isDualStack || !primaryCidr) return;
|
|
12
|
+
|
|
13
|
+
const isPrimaryIPv6 = Address6.isValid(primaryCidr);
|
|
14
|
+
|
|
15
|
+
// Reorder Cluster Networks
|
|
16
|
+
if (Array.isArray(values.clusterNetworks) && values.clusterNetworks.length >= 2) {
|
|
17
|
+
const [first, second] = values.clusterNetworks;
|
|
18
|
+
const firstClusterCidr = first?.cidr;
|
|
19
|
+
const secondClusterCidr = second?.cidr;
|
|
20
|
+
if (firstClusterCidr && secondClusterCidr) {
|
|
21
|
+
const isFirstClusterIPv6 = Address6.isValid(firstClusterCidr);
|
|
22
|
+
const isSecondClusterIPv6 = Address6.isValid(secondClusterCidr);
|
|
23
|
+
if (isFirstClusterIPv6 !== isSecondClusterIPv6) {
|
|
24
|
+
if (
|
|
25
|
+
(isPrimaryIPv6 && !isFirstClusterIPv6 && isSecondClusterIPv6) ||
|
|
26
|
+
(!isPrimaryIPv6 && isFirstClusterIPv6 && !isSecondClusterIPv6)
|
|
27
|
+
) {
|
|
28
|
+
const reordered = [values.clusterNetworks[1], values.clusterNetworks[0]];
|
|
29
|
+
setFieldValue('clusterNetworks', reordered, false);
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
// Reorder Service Networks
|
|
36
|
+
if (Array.isArray(values.serviceNetworks) && values.serviceNetworks.length >= 2) {
|
|
37
|
+
const [first, second] = values.serviceNetworks;
|
|
38
|
+
const firstServiceCidr = first?.cidr;
|
|
39
|
+
const secondServiceCidr = second?.cidr;
|
|
40
|
+
if (firstServiceCidr && secondServiceCidr) {
|
|
41
|
+
const isFirstServiceIPv6 = Address6.isValid(firstServiceCidr);
|
|
42
|
+
const isSecondServiceIPv6 = Address6.isValid(secondServiceCidr);
|
|
43
|
+
if (isFirstServiceIPv6 !== isSecondServiceIPv6) {
|
|
44
|
+
if (
|
|
45
|
+
(isPrimaryIPv6 && !isFirstServiceIPv6 && isSecondServiceIPv6) ||
|
|
46
|
+
(!isPrimaryIPv6 && isFirstServiceIPv6 && !isSecondServiceIPv6)
|
|
47
|
+
) {
|
|
48
|
+
const reordered = [values.serviceNetworks[1], values.serviceNetworks[0]];
|
|
49
|
+
setFieldValue('serviceNetworks', reordered, false);
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
};
|
|
55
|
+
|
|
56
|
+
export const reorderNetworksForPrimary = (
|
|
57
|
+
nextPrimaryCidr: string,
|
|
58
|
+
values: NetworkConfigurationValues,
|
|
59
|
+
setFieldValue: FormikHelpers<NetworkConfigurationValues>['setFieldValue'],
|
|
60
|
+
) => {
|
|
61
|
+
if (!nextPrimaryCidr) return;
|
|
62
|
+
reorderByPrimaryCidr(nextPrimaryCidr, values, setFieldValue);
|
|
63
|
+
};
|
|
64
|
+
|
|
65
|
+
export const reorderNetworksByCurrentPrimary = (
|
|
66
|
+
values: NetworkConfigurationValues,
|
|
67
|
+
setFieldValue: FormikHelpers<NetworkConfigurationValues>['setFieldValue'],
|
|
68
|
+
) => {
|
|
69
|
+
const primaryCidr = values.machineNetworks?.[0]?.cidr;
|
|
70
|
+
if (!primaryCidr) return;
|
|
71
|
+
reorderByPrimaryCidr(primaryCidr, values, setFieldValue);
|
|
72
|
+
};
|
|
@@ -92,7 +92,8 @@ export const StaticIpPage: React.FC<StaticIpPageProps> = ({
|
|
|
92
92
|
</Content>
|
|
93
93
|
</GridItem>
|
|
94
94
|
|
|
95
|
-
{clusterWizardContext.currentStepId === 'static-ip-network-wide-configurations'
|
|
95
|
+
{(clusterWizardContext.currentStepId === 'static-ip-network-wide-configurations' ||
|
|
96
|
+
clusterWizardContext.currentStepId === 'static-ip-yaml-view') && (
|
|
96
97
|
<StaticIpViewRadioGroup
|
|
97
98
|
initialView={initialStaticIpInfo.view}
|
|
98
99
|
confirmOnChangeView={confirmOnChangeView}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"dependencies": {
|
|
3
|
-
"@openshift-assisted/locales": "2.47.
|
|
4
|
-
"@openshift-assisted/types": "2.47.
|
|
3
|
+
"@openshift-assisted/locales": "2.47.4",
|
|
4
|
+
"@openshift-assisted/types": "2.47.4",
|
|
5
5
|
"@openshift-console/dynamic-plugin-sdk": "0.0.3",
|
|
6
6
|
"@patternfly/patternfly": "6.2.3",
|
|
7
7
|
"@patternfly/react-code-editor": "6.2.2",
|
|
@@ -140,5 +140,5 @@
|
|
|
140
140
|
]
|
|
141
141
|
}
|
|
142
142
|
},
|
|
143
|
-
"version": "2.47.
|
|
143
|
+
"version": "2.47.4"
|
|
144
144
|
}
|