@openshift-assisted/ui-lib 2.47.0 → 2.47.1
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/SubnetsDropdown.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/networkConfiguration/VirtualIPControlGroup.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterWizard/OperatorsBundle.d.ts.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/SubnetsDropdown.js +9 -3
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/SubnetsDropdown.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/VirtualIPControlGroup.js +22 -4
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/VirtualIPControlGroup.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.js +36 -31
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.js.map +1 -1
- package/build/cjs/ocm/components/clusterWizard/OperatorsBundle.js +3 -1
- package/build/cjs/ocm/components/clusterWizard/OperatorsBundle.js.map +1 -1
- package/build/cjs/ocm/components/featureSupportLevels/featureStateUtils.js +0 -3
- package/build/cjs/ocm/components/featureSupportLevels/featureStateUtils.js.map +1 -1
- package/lib/ocm/components/clusterConfiguration/networkConfiguration/SubnetsDropdown.tsx +20 -4
- package/lib/ocm/components/clusterConfiguration/networkConfiguration/VirtualIPControlGroup.tsx +66 -5
- package/lib/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.ts +13 -5
- package/lib/ocm/components/clusterWizard/OperatorsBundle.tsx +3 -1
- package/lib/ocm/components/featureSupportLevels/featureStateUtils.ts +1 -3
- package/package.json +3 -3
|
@@ -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,
|
|
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;CACrB,CAAC;AAyBF,eAAO,MAAM,eAAe,mDAKzB,oBAAoB,GAAG,eAAe,sBAiIxC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VirtualIPControlGroup.d.ts","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/VirtualIPControlGroup.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"VirtualIPControlGroup.d.ts","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/VirtualIPControlGroup.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AA2B1B,OAAO,EAEL,OAAO,EAEP,YAAY,EACb,MAAM,sDAAsD,CAAC;AA4C9D,MAAM,MAAM,0BAA0B,GAAG;IACvC,OAAO,EAAE,OAAO,CAAC;IACjB,2BAA2B,CAAC,EAAE,OAAO,CAAC;IACtC,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B,CAAC;AAEF,eAAO,MAAM,qBAAqB,4DAI/B,0BAA0B,sBAsM5B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"networkConfigurationValidation.d.ts","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAC3B,OAAO,EAGL,WAAW,EAIX,0BAA0B,EAQ3B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAEL,OAAO,EACP,oBAAoB,EAErB,MAAM,sDAAsD,CAAC;AAE9D,eAAO,MAAM,uBAAuB,YACzB,OAAO,wBACM,KACpB,oBAAoB,EAClB,qBAAqB,GACrB,0BAA0B,GAC1B,qBAAqB,GACrB,0BAA0B,CAC7B,yCACsC,OAAO,KAC7C,0BAmCF,CAAC;AAEF,eAAO,MAAM,uCAAuC,kBACnC,0BAA0B,+CAEtB,MAAM;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"networkConfigurationValidation.d.ts","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAC3B,OAAO,EAGL,WAAW,EAIX,0BAA0B,EAQ3B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAEL,OAAO,EACP,oBAAoB,EAErB,MAAM,sDAAsD,CAAC;AAE9D,eAAO,MAAM,uBAAuB,YACzB,OAAO,wBACM,KACpB,oBAAoB,EAClB,qBAAqB,GACrB,0BAA0B,GAC1B,qBAAqB,GACrB,0BAA0B,CAC7B,yCACsC,OAAO,KAC7C,0BAmCF,CAAC;AAEF,eAAO,MAAM,uCAAuC,kBACnC,0BAA0B,+CAEtB,MAAM;;;;;;;;;;;;;;;;;;;;;;;sBAqDvB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OperatorsBundle.d.ts","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterWizard/OperatorsBundle.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAe/B,OAAO,EACL,MAAM,EACN,6BAA6B,EAC9B,MAAM,sDAAsD,CAAC;AAc9D,OAAO,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"OperatorsBundle.d.ts","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterWizard/OperatorsBundle.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAe/B,OAAO,EACL,MAAM,EACN,6BAA6B,EAC9B,MAAM,sDAAsD,CAAC;AAc9D,OAAO,uBAAuB,CAAC;AA4I/B,QAAA,MAAM,eAAe;aAKV,MAAM,EAAE;2BACM,6BAA6B,GAAG,SAAS;;uBA+BjE,CAAC;AAEF,eAAe,eAAe,CAAC"}
|
package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/SubnetsDropdown.js
CHANGED
|
@@ -39,7 +39,7 @@ const SubnetsDropdown = (_a) => {
|
|
|
39
39
|
// Separate IPv4 and IPv6 subnets
|
|
40
40
|
const ipv4Subnets = machineSubnets.filter((subnet) => ip_address_1.Address4.isValid(subnet.subnet));
|
|
41
41
|
const ipv6Subnets = machineSubnets.filter((subnet) => ip_address_1.Address6.isValid(subnet.subnet));
|
|
42
|
-
let currentDisplayValue = itemsSubnets[0].label; // The placeholder is the fallback
|
|
42
|
+
let currentDisplayValue = itemsSubnets.length > 1 ? itemsSubnets[1].label : itemsSubnets[0].label; // The placeholder is the fallback in some cases
|
|
43
43
|
if (field.value) {
|
|
44
44
|
const subnetItem = itemsSubnets.find((item) => item.value === field.value);
|
|
45
45
|
if (subnetItem) {
|
|
@@ -63,11 +63,12 @@ const SubnetsDropdown = (_a) => {
|
|
|
63
63
|
// If we have both IPv4 and IPv6, group them
|
|
64
64
|
if (hasIpv4 && hasIpv6) {
|
|
65
65
|
const ipv4Items = toFormSelectOptions(ipv4Subnets).map(({ value, label, isDisabled }) => (react_1.default.createElement(react_core_1.DropdownItem, { key: value, id: value, isDisabled: isDisabled, value: value }, label)));
|
|
66
|
+
ipv4Items.push(react_1.default.createElement(react_core_1.Divider, { key: "ipv4-divider" }));
|
|
66
67
|
const ipv6Items = toFormSelectOptions(ipv6Subnets).map(({ value, label, isDisabled }) => (react_1.default.createElement(react_core_1.DropdownItem, { key: value, id: value, isDisabled: isDisabled, value: value }, label)));
|
|
67
68
|
return [
|
|
68
69
|
react_1.default.createElement(react_core_1.DropdownItem, { key: makeNoSubnetSelectedOption(machineSubnets.length).value, id: makeNoSubnetSelectedOption(machineSubnets.length).value, isDisabled: makeNoSubnetSelectedOption(machineSubnets.length).isDisabled, value: makeNoSubnetSelectedOption(machineSubnets.length).value }, makeNoSubnetSelectedOption(machineSubnets.length).label),
|
|
69
70
|
react_1.default.createElement(react_core_1.DropdownGroup, { label: "IPv4", key: "ipv4-group" }, ipv4Items),
|
|
70
|
-
react_1.default.createElement(react_core_1.DropdownGroup, { label: "IPv6", key: "ipv6-group" }, ipv6Items),
|
|
71
|
+
react_1.default.createElement(react_core_1.DropdownGroup, { label: "IPv6 (Technology Preview)", key: "ipv6-group" }, ipv6Items),
|
|
71
72
|
];
|
|
72
73
|
}
|
|
73
74
|
// If only one type, don't group
|
|
@@ -77,7 +78,12 @@ const SubnetsDropdown = (_a) => {
|
|
|
77
78
|
setValue(event === null || event === void 0 ? void 0 : event.currentTarget.id);
|
|
78
79
|
setOpen(false);
|
|
79
80
|
};
|
|
80
|
-
const
|
|
81
|
+
const currentItem = itemsSubnets.find((i) => i.label === currentDisplayValue);
|
|
82
|
+
const showBadge = Boolean(currentItem && ip_address_1.Address6.isValid(currentItem.value));
|
|
83
|
+
const toggle = (toggleRef) => (react_1.default.createElement(react_core_1.MenuToggle, Object.assign({ ref: toggleRef, onClick: () => setOpen(!isOpen), isExpanded: isOpen, isDisabled: isDisabled, id: fieldId, className: "pf-v6-u-w-100", style: { minWidth: '100%' } }, props),
|
|
84
|
+
currentDisplayValue,
|
|
85
|
+
showBadge && (react_1.default.createElement("span", { onClick: (e) => e.stopPropagation() },
|
|
86
|
+
react_1.default.createElement(common_1.TechnologyPreview, { position: common_1.PreviewBadgePosition.inlineRight })))));
|
|
81
87
|
return (react_1.default.createElement(react_core_1.Dropdown, Object.assign({}, field, { id: `${fieldId}-dropdown`, onOpenChange: (isOpen) => setOpen(isOpen), onSelect: onSelect, toggle: toggle, isOpen: isOpen }), dropdownItems));
|
|
82
88
|
};
|
|
83
89
|
exports.SubnetsDropdown = SubnetsDropdown;
|
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,
|
|
1
|
+
{"version":3,"file":"SubnetsDropdown.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/SubnetsDropdown.tsx"],"names":[],"mappings":"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"}
|
package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/VirtualIPControlGroup.js
CHANGED
|
@@ -35,6 +35,7 @@ const VirtualIPControlGroup = ({ cluster, isVipDhcpAllocationDisabled, supportLe
|
|
|
35
35
|
const ipPopoverContent = 'Provides an endpoint for users, both human and machine, to interact with and configure the platform.';
|
|
36
36
|
const { 'api-vips-defined': apiVipFailedValidationMessage, 'ingress-vips-defined': ingressVipFailedValidationMessage, } = react_1.default.useMemo(() => (0, common_1.getVipValidationsById)(t, cluster.validationsInfo), [t, cluster.validationsInfo]);
|
|
37
37
|
const enableAllocation = values.networkType === common_1.NETWORK_TYPE_SDN;
|
|
38
|
+
const isDualStack = values.stackType === common_1.DUAL_STACK;
|
|
38
39
|
react_1.default.useEffect(() => {
|
|
39
40
|
if (!isViewerMode && !enableAllocation) {
|
|
40
41
|
setFieldValue('vipDhcpAllocation', false);
|
|
@@ -45,8 +46,15 @@ const VirtualIPControlGroup = ({ cluster, isVipDhcpAllocationDisabled, supportLe
|
|
|
45
46
|
setFieldValue('apiVips', hasDhcp ? [] : cluster.apiVips, true);
|
|
46
47
|
setFieldValue('ingressVips', hasDhcp ? [] : cluster.ingressVips, true);
|
|
47
48
|
}, [cluster.apiVips, cluster.ingressVips, setFieldValue]);
|
|
48
|
-
const
|
|
49
|
-
|
|
49
|
+
const setVipValueAtIndex = (field, index, e) => {
|
|
50
|
+
const fieldArray = field === 'apiVips' ? values.apiVips || [] : values.ingressVips || [];
|
|
51
|
+
const next = Array.isArray(fieldArray) ? [...fieldArray] : [];
|
|
52
|
+
// Ensure array has the desired length
|
|
53
|
+
while (next.length <= index) {
|
|
54
|
+
next.push({ ip: '', clusterId: cluster.id });
|
|
55
|
+
}
|
|
56
|
+
next[index] = { ip: e.target.value, clusterId: cluster.id };
|
|
57
|
+
setFieldValue(field, next, true);
|
|
50
58
|
};
|
|
51
59
|
return (react_1.default.createElement(react_1.default.Fragment, null,
|
|
52
60
|
!isVipDhcpAllocationDisabled && (react_1.default.createElement(OcmFormFields_1.OcmCheckboxField, { onChange: onChangeDhcp, label: react_1.default.createElement(react_1.default.Fragment, null,
|
|
@@ -69,12 +77,22 @@ const VirtualIPControlGroup = ({ cluster, isVipDhcpAllocationDisabled, supportLe
|
|
|
69
77
|
react_1.default.createElement(OcmFormFields_1.OcmInputField, { label: react_1.default.createElement(react_1.default.Fragment, null,
|
|
70
78
|
react_1.default.createElement("span", null, "API IP"),
|
|
71
79
|
" ",
|
|
72
|
-
react_1.default.createElement(common_1.PopoverIcon, { bodyContent: ipPopoverContent })), name: "apiVips.0.ip", helperText: ipHelperText, isRequired: true, onChange: (e) =>
|
|
80
|
+
react_1.default.createElement(common_1.PopoverIcon, { bodyContent: ipPopoverContent })), name: "apiVips.0.ip", helperText: ipHelperText, isRequired: true, labelInfo: isDualStack ? 'Primary' : undefined, onChange: (e) => setVipValueAtIndex('apiVips', 0, e) })),
|
|
81
|
+
isDualStack && (react_1.default.createElement(react_core_1.StackItem, null,
|
|
82
|
+
react_1.default.createElement(OcmFormFields_1.OcmInputField, { label: react_1.default.createElement(react_1.default.Fragment, null,
|
|
83
|
+
react_1.default.createElement("span", null, "API IP"),
|
|
84
|
+
" ",
|
|
85
|
+
react_1.default.createElement(common_1.PopoverIcon, { bodyContent: ipPopoverContent })), name: "apiVips.1.ip", helperText: ipHelperText, isRequired: true, labelInfo: 'Secondary', onChange: (e) => setVipValueAtIndex('apiVips', 1, e) }))),
|
|
73
86
|
react_1.default.createElement(react_core_1.StackItem, null,
|
|
74
87
|
react_1.default.createElement(OcmFormFields_1.OcmInputField, { name: "ingressVips.0.ip", label: react_1.default.createElement(react_1.default.Fragment, null,
|
|
75
88
|
react_1.default.createElement("span", null, "Ingress IP"),
|
|
76
89
|
" ",
|
|
77
|
-
react_1.default.createElement(common_1.PopoverIcon, { bodyContent: ipPopoverContent })), helperText: ipHelperText, isRequired: true, onChange: (e) =>
|
|
90
|
+
react_1.default.createElement(common_1.PopoverIcon, { bodyContent: ipPopoverContent })), helperText: ipHelperText, isRequired: true, labelInfo: isDualStack ? 'Primary' : undefined, onChange: (e) => setVipValueAtIndex('ingressVips', 0, e) })),
|
|
91
|
+
isDualStack && (react_1.default.createElement(react_core_1.StackItem, null,
|
|
92
|
+
react_1.default.createElement(OcmFormFields_1.OcmInputField, { name: "ingressVips.1.ip", label: react_1.default.createElement(react_1.default.Fragment, null,
|
|
93
|
+
react_1.default.createElement("span", null, "Ingress IP"),
|
|
94
|
+
" ",
|
|
95
|
+
react_1.default.createElement(common_1.PopoverIcon, { bodyContent: ipPopoverContent })), helperText: ipHelperText, isRequired: true, labelInfo: 'Secondary', onChange: (e) => setVipValueAtIndex('ingressVips', 1, e) }))))))))));
|
|
78
96
|
};
|
|
79
97
|
exports.VirtualIPControlGroup = VirtualIPControlGroup;
|
|
80
98
|
//# sourceMappingURL=VirtualIPControlGroup.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VirtualIPControlGroup.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/VirtualIPControlGroup.tsx"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,6CAA0C;AAC1C,mCAAsD;AACtD,uDAQgC;AAChC,+
|
|
1
|
+
{"version":3,"file":"VirtualIPControlGroup.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/VirtualIPControlGroup.tsx"],"names":[],"mappings":"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"}
|
|
@@ -32,42 +32,47 @@ const getNetworkInitialValues = (cluster, defaultNetworkValues, isClusterManaged
|
|
|
32
32
|
};
|
|
33
33
|
};
|
|
34
34
|
exports.getNetworkInitialValues = getNetworkInitialValues;
|
|
35
|
-
const getNetworkConfigurationValidationSchema = (initialValues, hostSubnets, openshiftVersion) => Yup.lazy((values) =>
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
: common_1.
|
|
35
|
+
const getNetworkConfigurationValidationSchema = (initialValues, hostSubnets, openshiftVersion) => Yup.lazy((values) => {
|
|
36
|
+
const apiVipSchema = values.stackType === common_1.DUAL_STACK
|
|
37
|
+
? (0, common_1.vipArrayValidationSchema)(hostSubnets, values, initialValues.apiVips).min(2, 'Provide both Primary and Secondary API IPs.')
|
|
38
|
+
: (0, common_1.vipArrayValidationSchema)(hostSubnets, values, initialValues.apiVips);
|
|
39
|
+
return Yup.object().shape({
|
|
40
|
+
apiVips: apiVipSchema,
|
|
41
|
+
ingressVips: (0, common_1.vipArrayValidationSchema)(hostSubnets, values, initialValues.ingressVips),
|
|
42
|
+
sshPublicKey: common_1.sshPublicKeyListValidationSchema,
|
|
43
|
+
machineNetworks: values.managedNetworkingType === 'userManaged'
|
|
44
|
+
? Yup.array()
|
|
45
|
+
: common_1.machineNetworksValidationSchema.when('stackType', {
|
|
46
|
+
is: (stackType) => stackType === common_1.IPV4_STACK,
|
|
47
|
+
then: () => common_1.machineNetworksValidationSchema.concat(common_1.IPv4ValidationSchema),
|
|
48
|
+
otherwise: () => {
|
|
49
|
+
var _a;
|
|
50
|
+
return values.machineNetworks && ((_a = values.machineNetworks) === null || _a === void 0 ? void 0 : _a.length) >= 2
|
|
51
|
+
? common_1.machineNetworksValidationSchema.concat((0, common_1.dualStackValidationSchema)('machine networks', openshiftVersion))
|
|
52
|
+
: Yup.array();
|
|
53
|
+
},
|
|
54
|
+
}),
|
|
55
|
+
clusterNetworks: common_1.clusterNetworksValidationSchema.when('stackType', {
|
|
42
56
|
is: (stackType) => stackType === common_1.IPV4_STACK,
|
|
43
|
-
then: () => common_1.
|
|
57
|
+
then: () => common_1.clusterNetworksValidationSchema.concat(common_1.IPv4ValidationSchema),
|
|
44
58
|
otherwise: () => {
|
|
45
59
|
var _a;
|
|
46
|
-
return values.
|
|
47
|
-
? common_1.
|
|
60
|
+
return values.clusterNetworks && ((_a = values.clusterNetworks) === null || _a === void 0 ? void 0 : _a.length) >= 2
|
|
61
|
+
? common_1.clusterNetworksValidationSchema.concat((0, common_1.dualStackValidationSchema)('cluster network', openshiftVersion))
|
|
48
62
|
: Yup.array();
|
|
49
63
|
},
|
|
50
64
|
}),
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
then: () => common_1.serviceNetworkValidationSchema.concat(common_1.IPv4ValidationSchema),
|
|
64
|
-
otherwise: () => {
|
|
65
|
-
var _a;
|
|
66
|
-
return values.serviceNetworks && ((_a = values.serviceNetworks) === null || _a === void 0 ? void 0 : _a.length) >= 2
|
|
67
|
-
? common_1.serviceNetworkValidationSchema.concat((0, common_1.dualStackValidationSchema)('service network', openshiftVersion))
|
|
68
|
-
: Yup.array();
|
|
69
|
-
},
|
|
70
|
-
}),
|
|
71
|
-
}));
|
|
65
|
+
serviceNetworks: common_1.serviceNetworkValidationSchema.when('stackType', {
|
|
66
|
+
is: (stackType) => stackType === common_1.IPV4_STACK,
|
|
67
|
+
then: () => common_1.serviceNetworkValidationSchema.concat(common_1.IPv4ValidationSchema),
|
|
68
|
+
otherwise: () => {
|
|
69
|
+
var _a;
|
|
70
|
+
return values.serviceNetworks && ((_a = values.serviceNetworks) === null || _a === void 0 ? void 0 : _a.length) >= 2
|
|
71
|
+
? common_1.serviceNetworkValidationSchema.concat((0, common_1.dualStackValidationSchema)('service network', openshiftVersion))
|
|
72
|
+
: Yup.array();
|
|
73
|
+
},
|
|
74
|
+
}),
|
|
75
|
+
});
|
|
76
|
+
});
|
|
72
77
|
exports.getNetworkConfigurationValidationSchema = getNetworkConfigurationValidationSchema;
|
|
73
78
|
//# sourceMappingURL=networkConfigurationValidation.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"networkConfigurationValidation.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.ts"],"names":[],"mappings":";;;;AAAA,iDAA2B;AAC3B,+CAe4B;AAQrB,MAAM,uBAAuB,GAAG,CACrC,OAAgB,EAChB,oBAMC,EACD,qCAA8C,EAClB,EAAE;;IAC9B,MAAM,YAAY,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,CAAC;IACpC,MAAM,eAAe,GAAG,IAAA,oBAAW,kCAAM,OAAO,KAAE,gBAAgB,EAAE,OAAO,CAAC,gBAAgB,IAAG,CAAC;IAEhG,OAAO;QACL,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,YAAY,EAAE,OAAO,CAAC,YAAY,IAAI,EAAE;QACxC,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;QAC5C,qBAAqB,EACnB,CAAA,MAAA,OAAO,CAAC,QAAQ,0CAAE,IAAI,MAAK,MAAM;YACjC,CAAC,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,IAAI,qCAAqC,CAAC;YAC1F,YAAY;YACV,CAAC,CAAC,aAAa;YACf,CAAC,CAAC,gBAAgB;QACtB,WAAW,EAAE,OAAO,CAAC,WAAW,IAAI,yBAAgB;QACpD,eAAe,EAAE,OAAO,CAAC,eAAe,IAAI,EAAE;QAC9C,SAAS,EAAE,eAAe,CAAC,CAAC,CAAC,mBAAU,CAAC,CAAC,CAAC,mBAAU;QACpD,eAAe,EACb,OAAO,CAAC,eAAe;YACvB,CAAC,eAAe;gBACd,CAAC,CAAC,oBAAoB,CAAC,wBAAwB;gBAC/C,CAAC,CAAC,MAAA,oBAAoB,CAAC,mBAAmB,0CAAE,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,iCACtD,OAAO,KACV,SAAS,EAAE,OAAO,CAAC,EAAE,IACrB,CAAC,CAAC;QACV,eAAe,EACb,OAAO,CAAC,eAAe;YACvB,CAAC,eAAe;gBACd,CAAC,CAAC,oBAAoB,CAAC,wBAAwB;gBAC/C,CAAC,CAAC,MAAA,oBAAoB,CAAC,mBAAmB,0CAAE,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,iCACtD,OAAO,KACV,SAAS,EAAE,OAAO,CAAC,EAAE,IACrB,CAAC,CAAC;KACX,CAAC;AACJ,CAAC,CAAC;AA7CW,QAAA,uBAAuB,2BA6ClC;AAEK,MAAM,uCAAuC,GAAG,CACrD,aAAyC,EACzC,WAAwB,EACxB,gBAAyB,EACzB,EAAE,CACF,GAAG,CAAC,IAAI,CAAC,CAAC,MAAkC,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"networkConfigurationValidation.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.ts"],"names":[],"mappings":"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"}
|
|
@@ -55,7 +55,9 @@ const BundleCard = ({ bundle, bundles, preflightRequirements, searchTerm, }) =>
|
|
|
55
55
|
const disabledReason = hasUnsupportedOperators
|
|
56
56
|
? 'Some operators in this bundle are not supported with the current configuration.'
|
|
57
57
|
: isSNO && (bundleSpec === null || bundleSpec === void 0 ? void 0 : bundleSpec.noSNO)
|
|
58
|
-
?
|
|
58
|
+
? bundle.id === 'openshift-ai'
|
|
59
|
+
? 'This bundle is not available when deploying a Single Node OpenShift, but you can use the standalone operator instead.'
|
|
60
|
+
: 'This bundle is not available when deploying a Single Node OpenShift.'
|
|
59
61
|
: incompatibleBundle
|
|
60
62
|
? `Bundle cannot be installed together with ${((_c = bundles.find(({ id }) => id === incompatibleBundle)) === null || _c === void 0 ? void 0 : _c.title) || incompatibleBundle}`
|
|
61
63
|
: isAssistedMigration
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OperatorsBundle.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterWizard/OperatorsBundle.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"OperatorsBundle.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterWizard/OperatorsBundle.tsx"],"names":[],"mappings":"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"}
|
|
@@ -227,9 +227,6 @@ const getOpenShiftAIDisabledReason = (cluster, activeFeatureConfiguration, isSup
|
|
|
227
227
|
if (isArm) {
|
|
228
228
|
return `${operatorTitle} is not available when ARM CPU architecture is selected.`;
|
|
229
229
|
}
|
|
230
|
-
if ((0, common_1.isSNO)(cluster)) {
|
|
231
|
-
return `${operatorTitle} is not available when deploying a Single Node OpenShift.`;
|
|
232
|
-
}
|
|
233
230
|
if (!isSupported) {
|
|
234
231
|
return `The installer cannot currently enable ${operatorTitle} with the selected OpenShift version, but it can be enabled later through the OpenShift Console once the installation is complete.`;
|
|
235
232
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"featureStateUtils.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/featureSupportLevels/featureStateUtils.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"featureStateUtils.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/featureSupportLevels/featureStateUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,9 +6,16 @@ import {
|
|
|
6
6
|
MenuToggle,
|
|
7
7
|
MenuToggleElement,
|
|
8
8
|
MenuToggleProps,
|
|
9
|
+
Divider,
|
|
9
10
|
} from '@patternfly/react-core';
|
|
10
11
|
import { useField } from 'formik';
|
|
11
|
-
import {
|
|
12
|
+
import {
|
|
13
|
+
getFieldId,
|
|
14
|
+
HostSubnet,
|
|
15
|
+
NO_SUBNET_SET,
|
|
16
|
+
TechnologyPreview,
|
|
17
|
+
PreviewBadgePosition,
|
|
18
|
+
} from '../../../../common';
|
|
12
19
|
import { Address4, Address6 } from 'ip-address';
|
|
13
20
|
|
|
14
21
|
type SubnetsDropdownProps = {
|
|
@@ -62,7 +69,8 @@ export const SubnetsDropdown = ({
|
|
|
62
69
|
const ipv4Subnets = machineSubnets.filter((subnet) => Address4.isValid(subnet.subnet));
|
|
63
70
|
const ipv6Subnets = machineSubnets.filter((subnet) => Address6.isValid(subnet.subnet));
|
|
64
71
|
|
|
65
|
-
let currentDisplayValue =
|
|
72
|
+
let currentDisplayValue =
|
|
73
|
+
itemsSubnets.length > 1 ? itemsSubnets[1].label : itemsSubnets[0].label; // The placeholder is the fallback in some cases
|
|
66
74
|
if (field.value) {
|
|
67
75
|
const subnetItem = itemsSubnets.find((item) => item.value === field.value);
|
|
68
76
|
if (subnetItem) {
|
|
@@ -100,7 +108,7 @@ export const SubnetsDropdown = ({
|
|
|
100
108
|
{label}
|
|
101
109
|
</DropdownItem>
|
|
102
110
|
));
|
|
103
|
-
|
|
111
|
+
ipv4Items.push(<Divider key="ipv4-divider" />);
|
|
104
112
|
const ipv6Items = toFormSelectOptions(ipv6Subnets).map(({ value, label, isDisabled }) => (
|
|
105
113
|
<DropdownItem key={value} id={value} isDisabled={isDisabled} value={value}>
|
|
106
114
|
{label}
|
|
@@ -119,7 +127,7 @@ export const SubnetsDropdown = ({
|
|
|
119
127
|
<DropdownGroup label="IPv4" key="ipv4-group">
|
|
120
128
|
{ipv4Items}
|
|
121
129
|
</DropdownGroup>,
|
|
122
|
-
<DropdownGroup label="IPv6" key="ipv6-group">
|
|
130
|
+
<DropdownGroup label="IPv6 (Technology Preview)" key="ipv6-group">
|
|
123
131
|
{ipv6Items}
|
|
124
132
|
</DropdownGroup>,
|
|
125
133
|
];
|
|
@@ -138,6 +146,9 @@ export const SubnetsDropdown = ({
|
|
|
138
146
|
setOpen(false);
|
|
139
147
|
};
|
|
140
148
|
|
|
149
|
+
const currentItem = itemsSubnets.find((i) => i.label === currentDisplayValue);
|
|
150
|
+
const showBadge = Boolean(currentItem && Address6.isValid(currentItem.value));
|
|
151
|
+
|
|
141
152
|
const toggle = (toggleRef: React.Ref<MenuToggleElement>) => (
|
|
142
153
|
<MenuToggle
|
|
143
154
|
ref={toggleRef}
|
|
@@ -150,6 +161,11 @@ export const SubnetsDropdown = ({
|
|
|
150
161
|
{...props}
|
|
151
162
|
>
|
|
152
163
|
{currentDisplayValue}
|
|
164
|
+
{showBadge && (
|
|
165
|
+
<span onClick={(e) => e.stopPropagation()}>
|
|
166
|
+
<TechnologyPreview position={PreviewBadgePosition.inlineRight} />
|
|
167
|
+
</span>
|
|
168
|
+
)}
|
|
153
169
|
</MenuToggle>
|
|
154
170
|
);
|
|
155
171
|
|
package/lib/ocm/components/clusterConfiguration/networkConfiguration/VirtualIPControlGroup.tsx
CHANGED
|
@@ -14,6 +14,7 @@ import {
|
|
|
14
14
|
NetworkConfigurationValues,
|
|
15
15
|
FormikStaticField,
|
|
16
16
|
NETWORK_TYPE_SDN,
|
|
17
|
+
DUAL_STACK,
|
|
17
18
|
selectMachineNetworkCIDR,
|
|
18
19
|
getVipValidationsById,
|
|
19
20
|
PopoverIcon,
|
|
@@ -24,7 +25,12 @@ import { selectCurrentClusterPermissionsState } from '../../../store/slices/curr
|
|
|
24
25
|
import { OcmCheckboxField, OcmInputField } from '../../ui/OcmFormFields';
|
|
25
26
|
import { useTranslation } from '../../../../common/hooks/use-translation-wrapper';
|
|
26
27
|
import NewFeatureSupportLevelBadge from '../../../../common/components/newFeatureSupportLevels/NewFeatureSupportLevelBadge';
|
|
27
|
-
import {
|
|
28
|
+
import {
|
|
29
|
+
ApiVip,
|
|
30
|
+
Cluster,
|
|
31
|
+
Ip,
|
|
32
|
+
SupportLevel,
|
|
33
|
+
} from '@openshift-assisted/types/assisted-installer-service';
|
|
28
34
|
|
|
29
35
|
interface VipStaticValueProps {
|
|
30
36
|
id?: string;
|
|
@@ -96,6 +102,7 @@ export const VirtualIPControlGroup = ({
|
|
|
96
102
|
);
|
|
97
103
|
|
|
98
104
|
const enableAllocation = values.networkType === NETWORK_TYPE_SDN;
|
|
105
|
+
const isDualStack = values.stackType === DUAL_STACK;
|
|
99
106
|
|
|
100
107
|
React.useEffect(() => {
|
|
101
108
|
if (!isViewerMode && !enableAllocation) {
|
|
@@ -112,8 +119,20 @@ export const VirtualIPControlGroup = ({
|
|
|
112
119
|
[cluster.apiVips, cluster.ingressVips, setFieldValue],
|
|
113
120
|
);
|
|
114
121
|
|
|
115
|
-
const
|
|
116
|
-
|
|
122
|
+
const setVipValueAtIndex = (
|
|
123
|
+
field: 'apiVips' | 'ingressVips',
|
|
124
|
+
index: number,
|
|
125
|
+
e: React.ChangeEvent<HTMLInputElement>,
|
|
126
|
+
) => {
|
|
127
|
+
const fieldArray: ApiVip[] =
|
|
128
|
+
field === 'apiVips' ? values.apiVips || [] : values.ingressVips || [];
|
|
129
|
+
const next: ApiVip[] = Array.isArray(fieldArray) ? [...fieldArray] : [];
|
|
130
|
+
// Ensure array has the desired length
|
|
131
|
+
while (next.length <= index) {
|
|
132
|
+
next.push({ ip: '', clusterId: cluster.id });
|
|
133
|
+
}
|
|
134
|
+
next[index] = { ip: e.target.value, clusterId: cluster.id };
|
|
135
|
+
setFieldValue(field, next, true);
|
|
117
136
|
};
|
|
118
137
|
|
|
119
138
|
return (
|
|
@@ -194,11 +213,30 @@ export const VirtualIPControlGroup = ({
|
|
|
194
213
|
name="apiVips.0.ip"
|
|
195
214
|
helperText={ipHelperText}
|
|
196
215
|
isRequired
|
|
216
|
+
labelInfo={isDualStack ? 'Primary' : undefined}
|
|
197
217
|
onChange={(e) =>
|
|
198
|
-
|
|
218
|
+
setVipValueAtIndex('apiVips', 0, e as React.ChangeEvent<HTMLInputElement>)
|
|
199
219
|
}
|
|
200
220
|
/>
|
|
201
221
|
</StackItem>
|
|
222
|
+
{isDualStack && (
|
|
223
|
+
<StackItem>
|
|
224
|
+
<OcmInputField
|
|
225
|
+
label={
|
|
226
|
+
<>
|
|
227
|
+
<span>API IP</span> <PopoverIcon bodyContent={ipPopoverContent} />
|
|
228
|
+
</>
|
|
229
|
+
}
|
|
230
|
+
name="apiVips.1.ip"
|
|
231
|
+
helperText={ipHelperText}
|
|
232
|
+
isRequired
|
|
233
|
+
labelInfo={'Secondary'}
|
|
234
|
+
onChange={(e) =>
|
|
235
|
+
setVipValueAtIndex('apiVips', 1, e as React.ChangeEvent<HTMLInputElement>)
|
|
236
|
+
}
|
|
237
|
+
/>
|
|
238
|
+
</StackItem>
|
|
239
|
+
)}
|
|
202
240
|
<StackItem>
|
|
203
241
|
<OcmInputField
|
|
204
242
|
name="ingressVips.0.ip"
|
|
@@ -209,11 +247,34 @@ export const VirtualIPControlGroup = ({
|
|
|
209
247
|
}
|
|
210
248
|
helperText={ipHelperText}
|
|
211
249
|
isRequired
|
|
250
|
+
labelInfo={isDualStack ? 'Primary' : undefined}
|
|
212
251
|
onChange={(e) =>
|
|
213
|
-
|
|
252
|
+
setVipValueAtIndex('ingressVips', 0, e as React.ChangeEvent<HTMLInputElement>)
|
|
214
253
|
}
|
|
215
254
|
/>
|
|
216
255
|
</StackItem>
|
|
256
|
+
{isDualStack && (
|
|
257
|
+
<StackItem>
|
|
258
|
+
<OcmInputField
|
|
259
|
+
name="ingressVips.1.ip"
|
|
260
|
+
label={
|
|
261
|
+
<>
|
|
262
|
+
<span>Ingress IP</span> <PopoverIcon bodyContent={ipPopoverContent} />
|
|
263
|
+
</>
|
|
264
|
+
}
|
|
265
|
+
helperText={ipHelperText}
|
|
266
|
+
isRequired
|
|
267
|
+
labelInfo={'Secondary'}
|
|
268
|
+
onChange={(e) =>
|
|
269
|
+
setVipValueAtIndex(
|
|
270
|
+
'ingressVips',
|
|
271
|
+
1,
|
|
272
|
+
e as React.ChangeEvent<HTMLInputElement>,
|
|
273
|
+
)
|
|
274
|
+
}
|
|
275
|
+
/>
|
|
276
|
+
</StackItem>
|
|
277
|
+
)}
|
|
217
278
|
</Stack>
|
|
218
279
|
)}
|
|
219
280
|
</FieldArray>
|
|
@@ -74,9 +74,17 @@ export const getNetworkConfigurationValidationSchema = (
|
|
|
74
74
|
hostSubnets: HostSubnets,
|
|
75
75
|
openshiftVersion?: string,
|
|
76
76
|
) =>
|
|
77
|
-
Yup.lazy((values: NetworkConfigurationValues) =>
|
|
78
|
-
|
|
79
|
-
|
|
77
|
+
Yup.lazy((values: NetworkConfigurationValues) => {
|
|
78
|
+
const apiVipSchema =
|
|
79
|
+
values.stackType === DUAL_STACK
|
|
80
|
+
? vipArrayValidationSchema<ApiVip>(hostSubnets, values, initialValues.apiVips).min(
|
|
81
|
+
2,
|
|
82
|
+
'Provide both Primary and Secondary API IPs.',
|
|
83
|
+
)
|
|
84
|
+
: vipArrayValidationSchema<ApiVip>(hostSubnets, values, initialValues.apiVips);
|
|
85
|
+
|
|
86
|
+
return Yup.object<NetworkConfigurationValues>().shape({
|
|
87
|
+
apiVips: apiVipSchema,
|
|
80
88
|
ingressVips: vipArrayValidationSchema<IngressVip>(
|
|
81
89
|
hostSubnets,
|
|
82
90
|
values,
|
|
@@ -116,5 +124,5 @@ export const getNetworkConfigurationValidationSchema = (
|
|
|
116
124
|
)
|
|
117
125
|
: Yup.array(),
|
|
118
126
|
}),
|
|
119
|
-
})
|
|
120
|
-
);
|
|
127
|
+
});
|
|
128
|
+
});
|
|
@@ -106,7 +106,9 @@ const BundleCard = ({
|
|
|
106
106
|
const disabledReason = hasUnsupportedOperators
|
|
107
107
|
? 'Some operators in this bundle are not supported with the current configuration.'
|
|
108
108
|
: isSNO && bundleSpec?.noSNO
|
|
109
|
-
?
|
|
109
|
+
? bundle.id === 'openshift-ai'
|
|
110
|
+
? 'This bundle is not available when deploying a Single Node OpenShift, but you can use the standalone operator instead.'
|
|
111
|
+
: 'This bundle is not available when deploying a Single Node OpenShift.'
|
|
110
112
|
: incompatibleBundle
|
|
111
113
|
? `Bundle cannot be installed together with ${
|
|
112
114
|
bundles.find(({ id }) => id === incompatibleBundle)?.title || incompatibleBundle
|
|
@@ -294,9 +294,7 @@ const getOpenShiftAIDisabledReason = (
|
|
|
294
294
|
if (isArm) {
|
|
295
295
|
return `${operatorTitle} is not available when ARM CPU architecture is selected.`;
|
|
296
296
|
}
|
|
297
|
-
|
|
298
|
-
return `${operatorTitle} is not available when deploying a Single Node OpenShift.`;
|
|
299
|
-
}
|
|
297
|
+
|
|
300
298
|
if (!isSupported) {
|
|
301
299
|
return `The installer cannot currently enable ${operatorTitle} with the selected OpenShift version, but it can be enabled later through the OpenShift Console once the installation is complete.`;
|
|
302
300
|
}
|
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.1",
|
|
4
|
+
"@openshift-assisted/types": "2.47.1",
|
|
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.1"
|
|
144
144
|
}
|