@openshift-assisted/ui-lib 2.47.1 → 2.47.3
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/common/components/clusterConfiguration/utils.d.ts +1 -3
- package/build/@types/common/components/clusterConfiguration/utils.d.ts.map +1 -1
- package/build/@types/common/components/ui/formik/validationSchemas.d.ts.map +1 -1
- 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/networkConfigurationValidation.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/review/ReviewNetworkingTable.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterDetail/ClusterProperties.d.ts.map +1 -1
- package/build/cjs/common/components/clusterConfiguration/utils.js.map +1 -1
- package/build/cjs/common/components/ui/formik/validationSchemas.js +110 -6
- package/build/cjs/common/components/ui/formik/validationSchemas.js.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 +41 -3
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/AvailableSubnetsControl.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/StackTypeControl.js +26 -4
- 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/networkConfigurationValidation.js +32 -37
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.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/review/ReviewNetworkingTable.js +27 -9
- package/build/cjs/ocm/components/clusterConfiguration/review/ReviewNetworkingTable.js.map +1 -1
- package/build/cjs/ocm/components/clusterDetail/ClusterProperties.js +2 -2
- package/build/cjs/ocm/components/clusterDetail/ClusterProperties.js.map +1 -1
- package/build/cjs/ocm/components/clusters/AssistedInstallerHeader.js +1 -1
- package/build/cjs/ocm/components/clusters/AssistedInstallerHeader.js.map +1 -1
- package/lib/common/components/clusterConfiguration/utils.ts +1 -3
- package/lib/common/components/ui/formik/validationSchemas.ts +132 -16
- package/lib/ocm/components/clusterConfiguration/networkConfiguration/AdvancedNetworkFields.tsx +1 -54
- package/lib/ocm/components/clusterConfiguration/networkConfiguration/AvailableSubnetsControl.tsx +43 -1
- package/lib/ocm/components/clusterConfiguration/networkConfiguration/StackTypeControl.tsx +28 -3
- package/lib/ocm/components/clusterConfiguration/networkConfiguration/SubnetsDropdown.tsx +7 -1
- package/lib/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.ts +6 -14
- package/lib/ocm/components/clusterConfiguration/networkConfiguration/reorderNetworks.ts +72 -0
- package/lib/ocm/components/clusterConfiguration/review/ReviewNetworkingTable.tsx +39 -14
- package/lib/ocm/components/clusterDetail/ClusterProperties.tsx +2 -2
- package/lib/ocm/components/clusters/AssistedInstallerHeader.tsx +1 -1
- package/package.json +3 -3
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) ||
|
|
@@ -33,12 +34,13 @@ const StackTypeControlGroup = ({ clusterId, isDualStackSelectable, hostSubnets,
|
|
|
33
34
|
const { isViewerMode } = (0, react_redux_1.useSelector)(selectors_1.selectCurrentClusterPermissionsState);
|
|
34
35
|
const shouldSetSingleStack = !isViewerMode && !isDualStackSelectable && values.stackType === common_1.DUAL_STACK;
|
|
35
36
|
const setSingleStack = react_1.default.useCallback(() => {
|
|
36
|
-
var _a;
|
|
37
|
+
var _a, _b;
|
|
37
38
|
setFieldValue('stackType', common_1.IPV4_STACK);
|
|
38
|
-
|
|
39
|
+
// Determine whether the first machine network is IPv4
|
|
40
|
+
const firstNetwork = (_a = values.machineNetworks) === null || _a === void 0 ? void 0 : _a[0];
|
|
41
|
+
const isFirstIPv4 = Boolean((firstNetwork === null || firstNetwork === void 0 ? void 0 : firstNetwork.cidr) && ip_address_1.Address4.isValid(firstNetwork.cidr));
|
|
42
|
+
if (values.machineNetworks && ((_b = values.machineNetworks) === null || _b === void 0 ? void 0 : _b.length) >= 2) {
|
|
39
43
|
// For single-stack IPv4, prefer IPv4 machine network
|
|
40
|
-
const firstNetwork = values.machineNetworks[0];
|
|
41
|
-
const isFirstIPv4 = (firstNetwork === null || firstNetwork === void 0 ? void 0 : firstNetwork.cidr) && ip_address_1.Address4.isValid(firstNetwork.cidr);
|
|
42
44
|
if (isFirstIPv4) {
|
|
43
45
|
// Keep the first network if it's IPv4
|
|
44
46
|
setFieldValue('machineNetworks', [firstNetwork]);
|
|
@@ -86,6 +88,21 @@ const StackTypeControlGroup = ({ clusterId, isDualStackSelectable, hostSubnets,
|
|
|
86
88
|
};
|
|
87
89
|
setFieldValue('serviceNetworks', [ipv4Service]);
|
|
88
90
|
}
|
|
91
|
+
// Keep only IPv4 VIPs when switching to single-stack (unless DHCP allocation is used)
|
|
92
|
+
if (!values.vipDhcpAllocation) {
|
|
93
|
+
const pruneVips = (vips) => {
|
|
94
|
+
if (!vips || vips.length === 0)
|
|
95
|
+
return [];
|
|
96
|
+
// Choose which index to keep based on whether the first network is IPv4
|
|
97
|
+
const keepIndex = isFirstIPv4 ? 0 : 1;
|
|
98
|
+
const chosen = vips[keepIndex];
|
|
99
|
+
return chosen && chosen.ip
|
|
100
|
+
? [{ ip: chosen.ip, clusterId: chosen.clusterId || clusterId }]
|
|
101
|
+
: [];
|
|
102
|
+
};
|
|
103
|
+
setFieldValue('apiVips', pruneVips(values.apiVips));
|
|
104
|
+
setFieldValue('ingressVips', pruneVips(values.ingressVips));
|
|
105
|
+
}
|
|
89
106
|
void validateForm();
|
|
90
107
|
}, [
|
|
91
108
|
setFieldValue,
|
|
@@ -96,6 +113,9 @@ const StackTypeControlGroup = ({ clusterId, isDualStackSelectable, hostSubnets,
|
|
|
96
113
|
values.clusterNetworks,
|
|
97
114
|
values.machineNetworks,
|
|
98
115
|
values.serviceNetworks,
|
|
116
|
+
values.apiVips,
|
|
117
|
+
values.ingressVips,
|
|
118
|
+
values.vipDhcpAllocation,
|
|
99
119
|
]);
|
|
100
120
|
const setDualStack = () => {
|
|
101
121
|
var _a, _b, _c, _d, _e;
|
|
@@ -138,6 +158,8 @@ const StackTypeControlGroup = ({ clusterId, isDualStackSelectable, hostSubnets,
|
|
|
138
158
|
: { cidr: '', clusterId: clusterId },
|
|
139
159
|
], false);
|
|
140
160
|
}
|
|
161
|
+
// Ensure cluster/service networks ordering matches the new primary family
|
|
162
|
+
(0, reorderNetworks_1.reorderNetworksByCurrentPrimary)(values, setFieldValue);
|
|
141
163
|
};
|
|
142
164
|
const setStackType = (e) => {
|
|
143
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":"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"}
|
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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"}
|
|
@@ -7,7 +7,7 @@ const common_1 = require("../../../../common");
|
|
|
7
7
|
const getNetworkInitialValues = (cluster, defaultNetworkValues, isClusterManagedNetworkingUnsupported) => {
|
|
8
8
|
var _a, _b, _c;
|
|
9
9
|
const isSNOCluster = (0, common_1.isSNO)(cluster);
|
|
10
|
-
const isDualStackType = (0, common_1.isDualStack)(
|
|
10
|
+
const isDualStackType = (0, common_1.isDualStack)(cluster);
|
|
11
11
|
return {
|
|
12
12
|
apiVips: cluster.apiVips,
|
|
13
13
|
ingressVips: cluster.ingressVips,
|
|
@@ -32,47 +32,42 @@ 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
|
-
|
|
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', {
|
|
35
|
+
const getNetworkConfigurationValidationSchema = (initialValues, hostSubnets, openshiftVersion) => Yup.lazy((values) => Yup.object().shape({
|
|
36
|
+
apiVips: (0, common_1.vipArrayValidationSchema)(hostSubnets, values, initialValues.apiVips),
|
|
37
|
+
ingressVips: (0, common_1.vipArrayValidationSchema)(hostSubnets, values, initialValues.ingressVips),
|
|
38
|
+
sshPublicKey: common_1.sshPublicKeyListValidationSchema,
|
|
39
|
+
machineNetworks: values.managedNetworkingType === 'userManaged'
|
|
40
|
+
? Yup.array()
|
|
41
|
+
: common_1.machineNetworksValidationSchema.when('stackType', {
|
|
56
42
|
is: (stackType) => stackType === common_1.IPV4_STACK,
|
|
57
|
-
then: () => common_1.
|
|
43
|
+
then: () => common_1.machineNetworksValidationSchema.concat(common_1.IPv4ValidationSchema),
|
|
58
44
|
otherwise: () => {
|
|
59
45
|
var _a;
|
|
60
|
-
return values.
|
|
61
|
-
? common_1.
|
|
46
|
+
return values.machineNetworks && ((_a = values.machineNetworks) === null || _a === void 0 ? void 0 : _a.length) >= 2
|
|
47
|
+
? common_1.machineNetworksValidationSchema.concat((0, common_1.dualStackValidationSchema)('machine networks', openshiftVersion))
|
|
62
48
|
: Yup.array();
|
|
63
49
|
},
|
|
64
50
|
}),
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
51
|
+
clusterNetworks: common_1.clusterNetworksValidationSchema.when('stackType', {
|
|
52
|
+
is: (stackType) => stackType === common_1.IPV4_STACK,
|
|
53
|
+
then: () => common_1.clusterNetworksValidationSchema.concat(common_1.IPv4ValidationSchema),
|
|
54
|
+
otherwise: () => {
|
|
55
|
+
var _a;
|
|
56
|
+
return values.clusterNetworks && ((_a = values.clusterNetworks) === null || _a === void 0 ? void 0 : _a.length) >= 2
|
|
57
|
+
? common_1.clusterNetworksValidationSchema.concat((0, common_1.dualStackValidationSchema)('cluster network', openshiftVersion))
|
|
58
|
+
: Yup.array();
|
|
59
|
+
},
|
|
60
|
+
}),
|
|
61
|
+
serviceNetworks: common_1.serviceNetworkValidationSchema.when('stackType', {
|
|
62
|
+
is: (stackType) => stackType === common_1.IPV4_STACK,
|
|
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
|
+
}));
|
|
77
72
|
exports.getNetworkConfigurationValidationSchema = getNetworkConfigurationValidationSchema;
|
|
78
73
|
//# 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,
|
|
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,EAAC,OAAO,CAAC,CAAC;IAE7C,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,CAC9C,GAAG,CAAC,MAAM,EAA8B,CAAC,KAAK,CAAC;IAC7C,OAAO,EAAE,IAAA,iCAAwB,EAAS,WAAW,EAAE,MAAM,EAAE,aAAa,CAAC,OAAO,CAAC;IACrF,WAAW,EAAE,IAAA,iCAAwB,EACnC,WAAW,EACX,MAAM,EACN,aAAa,CAAC,WAAW,CAC1B;IACD,YAAY,EAAE,yCAAgC;IAC9C,eAAe,EACb,MAAM,CAAC,qBAAqB,KAAK,aAAa;QAC5C,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE;QACb,CAAC,CAAC,wCAA+B,CAAC,IAAI,CAAC,WAAW,EAAE;YAChD,EAAE,EAAE,CAAC,SAAkD,EAAE,EAAE,CAAC,SAAS,KAAK,mBAAU;YACpF,IAAI,EAAE,GAAG,EAAE,CAAC,wCAA+B,CAAC,MAAM,CAAC,6BAAoB,CAAC;YACxE,SAAS,EAAE,GAAG,EAAE;;gBACd,OAAA,MAAM,CAAC,eAAe,IAAI,CAAA,MAAA,MAAM,CAAC,eAAe,0CAAE,MAAM,KAAI,CAAC;oBAC3D,CAAC,CAAC,wCAA+B,CAAC,MAAM,CACpC,IAAA,kCAAyB,EAAC,kBAAkB,EAAE,gBAAgB,CAAC,CAChE;oBACH,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,CAAA;aAAA;SAClB,CAAC;IACR,eAAe,EAAE,wCAA+B,CAAC,IAAI,CAAC,WAAW,EAAE;QACjE,EAAE,EAAE,CAAC,SAAkD,EAAE,EAAE,CAAC,SAAS,KAAK,mBAAU;QACpF,IAAI,EAAE,GAAG,EAAE,CAAC,wCAA+B,CAAC,MAAM,CAAC,6BAAoB,CAAC;QACxE,SAAS,EAAE,GAAG,EAAE;;YACd,OAAA,MAAM,CAAC,eAAe,IAAI,CAAA,MAAA,MAAM,CAAC,eAAe,0CAAE,MAAM,KAAI,CAAC;gBAC3D,CAAC,CAAC,wCAA+B,CAAC,MAAM,CACpC,IAAA,kCAAyB,EAAC,iBAAiB,EAAE,gBAAgB,CAAC,CAC/D;gBACH,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,CAAA;SAAA;KAClB,CAAC;IACF,eAAe,EAAE,uCAA8B,CAAC,IAAI,CAAC,WAAW,EAAE;QAChE,EAAE,EAAE,CAAC,SAAkD,EAAE,EAAE,CAAC,SAAS,KAAK,mBAAU;QACpF,IAAI,EAAE,GAAG,EAAE,CAAC,uCAA8B,CAAC,MAAM,CAAC,6BAAoB,CAAC;QACvE,SAAS,EAAE,GAAG,EAAE;;YACd,OAAA,MAAM,CAAC,eAAe,IAAI,CAAA,MAAA,MAAM,CAAC,eAAe,0CAAE,MAAM,KAAI,CAAC;gBAC3D,CAAC,CAAC,uCAA8B,CAAC,MAAM,CACnC,IAAA,kCAAyB,EAAC,iBAAiB,EAAE,gBAAgB,CAAC,CAC/D;gBACH,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,CAAA;SAAA;KAClB,CAAC;CACH,CAAC,CACH,CAAC;AAhDS,QAAA,uCAAuC,2CAgDhD"}
|
|
@@ -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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"}
|
|
@@ -9,7 +9,7 @@ const common_1 = require("../../../../common");
|
|
|
9
9
|
const ClusterProperties_1 = require("../../clusterDetail/ClusterProperties");
|
|
10
10
|
const ReviewNetworkingTable = ({ cluster }) => {
|
|
11
11
|
const rows = react_1.default.useMemo(() => {
|
|
12
|
-
var _a, _b, _c;
|
|
12
|
+
var _a, _b, _c, _d, _e, _f, _g;
|
|
13
13
|
const networkRows = [
|
|
14
14
|
{
|
|
15
15
|
rowId: 'network-management',
|
|
@@ -43,7 +43,7 @@ const ReviewNetworkingTable = ({ cluster }) => {
|
|
|
43
43
|
react_1.default.createElement("br", null)))),
|
|
44
44
|
props: { 'data-testid': 'machine-networks' },
|
|
45
45
|
},
|
|
46
|
-
(0, common_1.isDualStack)(
|
|
46
|
+
(0, common_1.isDualStack)(cluster)
|
|
47
47
|
? {
|
|
48
48
|
title: (_c = cluster.machineNetworks) === null || _c === void 0 ? void 0 : _c.map((network, index) => (react_1.default.createElement("span", { key: network.cidr },
|
|
49
49
|
index === 0 ? 'Primary' : 'Secondary',
|
|
@@ -59,9 +59,18 @@ const ReviewNetworkingTable = ({ cluster }) => {
|
|
|
59
59
|
cells: [
|
|
60
60
|
{ title: 'API IP' },
|
|
61
61
|
{
|
|
62
|
-
title: (0
|
|
63
|
-
|
|
62
|
+
title: (_d = cluster.apiVips) === null || _d === void 0 ? void 0 : _d.map((apiVip) => (react_1.default.createElement("span", { key: apiVip.ip },
|
|
63
|
+
apiVip.ip,
|
|
64
|
+
react_1.default.createElement("br", null)))),
|
|
65
|
+
props: { 'data-testid': 'api-vip' },
|
|
64
66
|
},
|
|
67
|
+
(0, common_1.isDualStack)(cluster)
|
|
68
|
+
? {
|
|
69
|
+
title: (_e = cluster.apiVips) === null || _e === void 0 ? void 0 : _e.map((apiVip, index) => (react_1.default.createElement("span", { key: apiVip.ip },
|
|
70
|
+
index === 0 ? 'Primary' : 'Secondary',
|
|
71
|
+
react_1.default.createElement("br", null)))),
|
|
72
|
+
}
|
|
73
|
+
: { title: '' },
|
|
65
74
|
],
|
|
66
75
|
});
|
|
67
76
|
cluster.ingressVips &&
|
|
@@ -71,9 +80,18 @@ const ReviewNetworkingTable = ({ cluster }) => {
|
|
|
71
80
|
cells: [
|
|
72
81
|
{ title: 'Ingress IP' },
|
|
73
82
|
{
|
|
74
|
-
title: (0
|
|
75
|
-
|
|
83
|
+
title: (_f = cluster.ingressVips) === null || _f === void 0 ? void 0 : _f.map((ingressVip) => (react_1.default.createElement("span", { key: ingressVip.ip },
|
|
84
|
+
ingressVip.ip,
|
|
85
|
+
react_1.default.createElement("br", null)))),
|
|
86
|
+
props: { 'data-testid': 'ingress-vip' },
|
|
76
87
|
},
|
|
88
|
+
(0, common_1.isDualStack)(cluster)
|
|
89
|
+
? {
|
|
90
|
+
title: (_g = cluster.ingressVips) === null || _g === void 0 ? void 0 : _g.map((ingressVip, index) => (react_1.default.createElement("span", { key: ingressVip.ip },
|
|
91
|
+
index === 0 ? 'Primary' : 'Secondary',
|
|
92
|
+
react_1.default.createElement("br", null)))),
|
|
93
|
+
}
|
|
94
|
+
: { title: '' },
|
|
77
95
|
],
|
|
78
96
|
});
|
|
79
97
|
return networkRows;
|
|
@@ -91,7 +109,7 @@ const ReviewNetworkingTable = ({ cluster }) => {
|
|
|
91
109
|
react_1.default.createElement("br", null)))),
|
|
92
110
|
props: { 'data-testid': 'cluster-network-cidr' },
|
|
93
111
|
},
|
|
94
|
-
(0, common_1.isDualStack)(
|
|
112
|
+
(0, common_1.isDualStack)(cluster) && {
|
|
95
113
|
title: (_b = cluster.clusterNetworks) === null || _b === void 0 ? void 0 : _b.map((network, index) => (react_1.default.createElement("span", { key: network.cidr },
|
|
96
114
|
index === 0 ? 'Primary' : 'Secondary',
|
|
97
115
|
react_1.default.createElement("br", null)))),
|
|
@@ -108,7 +126,7 @@ const ReviewNetworkingTable = ({ cluster }) => {
|
|
|
108
126
|
react_1.default.createElement("br", null)))),
|
|
109
127
|
props: { 'data-testid': 'cluster-network-prefix' },
|
|
110
128
|
},
|
|
111
|
-
(0, common_1.isDualStack)(
|
|
129
|
+
(0, common_1.isDualStack)(cluster) && {
|
|
112
130
|
title: (_d = cluster.clusterNetworks) === null || _d === void 0 ? void 0 : _d.map((network, index) => (react_1.default.createElement("span", { key: network.hostPrefix },
|
|
113
131
|
index === 0 ? 'Primary' : 'Secondary',
|
|
114
132
|
react_1.default.createElement("br", null)))),
|
|
@@ -125,7 +143,7 @@ const ReviewNetworkingTable = ({ cluster }) => {
|
|
|
125
143
|
react_1.default.createElement("br", null)))),
|
|
126
144
|
props: { 'data-testid': 'service-network-cidr' },
|
|
127
145
|
},
|
|
128
|
-
(0, common_1.isDualStack)(
|
|
146
|
+
(0, common_1.isDualStack)(cluster) && {
|
|
129
147
|
title: (_f = cluster.serviceNetworks) === null || _f === void 0 ? void 0 : _f.map((network, index) => (react_1.default.createElement("span", { key: network.cidr },
|
|
130
148
|
index === 0 ? 'Primary' : 'Secondary',
|
|
131
149
|
react_1.default.createElement("br", null)))),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReviewNetworkingTable.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/review/ReviewNetworkingTable.tsx"],"names":[],"mappings":";;;;AAAA,uDAA+C;AAC/C,yDAA6E;AAC7E,0DAA0B;AAC1B,+
|
|
1
|
+
{"version":3,"file":"ReviewNetworkingTable.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/review/ReviewNetworkingTable.tsx"],"names":[],"mappings":"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"}
|
|
@@ -25,7 +25,7 @@ const getManagementType = ({ userManagedNetworking }) => {
|
|
|
25
25
|
return managementType;
|
|
26
26
|
};
|
|
27
27
|
exports.getManagementType = getManagementType;
|
|
28
|
-
const getStackTypeLabel = (cluster) => (0, common_1.isDualStack)(
|
|
28
|
+
const getStackTypeLabel = (cluster) => (0, common_1.isDualStack)(cluster) ? 'Dual-stack' : 'IPv4';
|
|
29
29
|
exports.getStackTypeLabel = getStackTypeLabel;
|
|
30
30
|
const getDiskEncryptionEnabledOnStatus = (diskEncryption) => {
|
|
31
31
|
let diskEncryptionType = null;
|
|
@@ -49,7 +49,7 @@ exports.getDiskEncryptionEnabledOnStatus = getDiskEncryptionEnabledOnStatus;
|
|
|
49
49
|
const ClusterProperties = ({ cluster, externalMode = false }) => {
|
|
50
50
|
var _a, _b;
|
|
51
51
|
const { t } = (0, use_translation_wrapper_1.useTranslation)();
|
|
52
|
-
const isDualStackType = (0, common_1.isDualStack)(
|
|
52
|
+
const isDualStackType = (0, common_1.isDualStack)(cluster);
|
|
53
53
|
const featureSupportLevelContext = (0, newFeatureSupportLevels_1.useNewFeatureSupportLevel)();
|
|
54
54
|
const activeFeatureConfiguration = featureSupportLevelContext.activeFeatureConfiguration;
|
|
55
55
|
const underlyingCpuArchitecture = (activeFeatureConfiguration === null || activeFeatureConfiguration === void 0 ? void 0 : activeFeatureConfiguration.underlyingCpuArchitecture) || (0, common_1.getDefaultCpuArchitecture)();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClusterProperties.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterDetail/ClusterProperties.tsx"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,uDAA2D;AAC3D,4CAYyB;AACzB,2FAA+E;AAC/E,kEAAgF;AAChF,8FAA8D;AAC9D,gGAA+F;AAQxF,MAAM,cAAc,GAAG,CAAC,kBAA0C,EAAU,EAAE;IACnF,IAAI,WAAmB,CAAC;IACxB,kBAAkB,KAAK,yBAAgB;QACrC,CAAC,CAAC,CAAC,WAAW,GAAG,mCAAmC,CAAC;QACrD,CAAC,CAAC,CAAC,WAAW,GAAG,4BAA4B,CAAC,CAAC;IACjD,OAAO,WAAW,CAAC;AACrB,CAAC,CAAC;AANW,QAAA,cAAc,kBAMzB;AAEK,MAAM,iBAAiB,GAAG,CAAC,EAAE,qBAAqB,EAAW,EAAU,EAAE;IAC9E,IAAI,cAAsB,CAAC;IAC3B,qBAAqB;QACnB,CAAC,CAAC,CAAC,cAAc,GAAG,yBAAyB,CAAC;QAC9C,CAAC,CAAC,CAAC,cAAc,GAAG,4BAA4B,CAAC,CAAC;IACpD,OAAO,cAAc,CAAC;AACxB,CAAC,CAAC;AANW,QAAA,iBAAiB,qBAM5B;AAEK,MAAM,iBAAiB,GAAG,CAAC,OAAgB,EAAU,EAAE,CAC5D,IAAA,oBAAW,
|
|
1
|
+
{"version":3,"file":"ClusterProperties.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterDetail/ClusterProperties.tsx"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,7 @@ const AssistedInstallerHeader = () => {
|
|
|
15
15
|
react_1.default.createElement(react_core_1.SplitItem, null,
|
|
16
16
|
react_1.default.createElement(common_1.ExternalLink, { href: common_1.ASSISTED_INSTALLER_DOCUMENTATION_LINK }, "Assisted Installer documentation")),
|
|
17
17
|
common_1.isInOcm && (react_1.default.createElement(react_core_1.SplitItem, null,
|
|
18
|
-
react_1.default.createElement(react_core_1.Content, { component: "a", "data-testid": "whats-new-link" }, "What's new in Assisted Installer?"))))));
|
|
18
|
+
react_1.default.createElement(react_core_1.Content, { component: "a", "data-testid": "whats-new-link", hidden: true }, "What's new in Assisted Installer?"))))));
|
|
19
19
|
};
|
|
20
20
|
exports.AssistedInstallerHeader = AssistedInstallerHeader;
|
|
21
21
|
//# sourceMappingURL=AssistedInstallerHeader.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AssistedInstallerHeader.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusters/AssistedInstallerHeader.tsx"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,uDAAmE;AACnE,4CAKyB;AACzB,yDAAqD;AAE9C,MAAM,uBAAuB,GAAG,GAAG,EAAE;IAC1C,MAAM,6BAA6B,GAAG,IAAA,wBAAU,EAAC,2CAA2C,CAAC,CAAC;IAC9F,OAAO,CACL;QACE,8BAAC,oBAAO,IAAC,SAAS,EAAC,IAAI,EAAC,SAAS,EAAC,wBAAwB,oDAEhD;QACT,6BAA6B,IAAI,8BAAC,yBAAgB,OAAG;QACtD,8BAAC,kBAAK,IAAC,SAAS;YACd,8BAAC,sBAAS;gBACR,8BAAC,qBAAY,IAAC,IAAI,EAAE,8CAAqC,uCAE1C,CACL;YACX,gBAAO,IAAI,CACV,8BAAC,sBAAS;gBACR,8BAAC,oBAAO,IAAC,SAAS,EAAC,GAAG,iBAAa,gBAAgB,
|
|
1
|
+
{"version":3,"file":"AssistedInstallerHeader.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusters/AssistedInstallerHeader.tsx"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,uDAAmE;AACnE,4CAKyB;AACzB,yDAAqD;AAE9C,MAAM,uBAAuB,GAAG,GAAG,EAAE;IAC1C,MAAM,6BAA6B,GAAG,IAAA,wBAAU,EAAC,2CAA2C,CAAC,CAAC;IAC9F,OAAO,CACL;QACE,8BAAC,oBAAO,IAAC,SAAS,EAAC,IAAI,EAAC,SAAS,EAAC,wBAAwB,oDAEhD;QACT,6BAA6B,IAAI,8BAAC,yBAAgB,OAAG;QACtD,8BAAC,kBAAK,IAAC,SAAS;YACd,8BAAC,sBAAS;gBACR,8BAAC,qBAAY,IAAC,IAAI,EAAE,8CAAqC,uCAE1C,CACL;YACX,gBAAO,IAAI,CACV,8BAAC,sBAAS;gBACR,8BAAC,oBAAO,IAAC,SAAS,EAAC,GAAG,iBAAa,gBAAgB,EAAC,MAAM,EAAE,IAAI,wCAEtD,CACA,CACb,CACK,CACP,CACJ,CAAC;AACJ,CAAC,CAAC;AAxBW,QAAA,uBAAuB,2BAwBlC"}
|
|
@@ -206,9 +206,7 @@ export const isDualStack = ({
|
|
|
206
206
|
clusterNetworks,
|
|
207
207
|
serviceNetworks,
|
|
208
208
|
openshiftVersion,
|
|
209
|
-
}: Pick<Cluster, 'machineNetworks' | 'clusterNetworks' | 'serviceNetworks'>
|
|
210
|
-
openshiftVersion?: string;
|
|
211
|
-
}) =>
|
|
209
|
+
}: Pick<Cluster, 'machineNetworks' | 'clusterNetworks' | 'serviceNetworks' | 'openshiftVersion'>) =>
|
|
212
210
|
areNetworksDualStack(machineNetworks, openshiftVersion) &&
|
|
213
211
|
areNetworksDualStack(clusterNetworks, openshiftVersion) &&
|
|
214
212
|
areNetworksDualStack(serviceNetworks, openshiftVersion);
|