@openshift-assisted/ui-lib 2.8.7-cim → 2.8.8-cim
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/@types/cim/components/ClusterDeployment/NetworkConfiguration.d.ts.map +1 -1
- package/@types/cim/components/ClusterDeployment/networkConfigurationValidation.d.ts.map +1 -1
- package/@types/common/components/clusterConfiguration/utils.d.ts +0 -1
- package/@types/common/components/clusterConfiguration/utils.d.ts.map +1 -1
- package/@types/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.d.ts.map +1 -1
- package/build/build.json +1 -1
- package/build/cim/components/ClusterDeployment/NetworkConfiguration.js +1 -4
- package/build/cim/components/ClusterDeployment/NetworkConfiguration.js.map +1 -1
- package/build/cim/components/ClusterDeployment/networkConfigurationValidation.js +3 -5
- package/build/cim/components/ClusterDeployment/networkConfigurationValidation.js.map +1 -1
- package/build/common/components/clusterConfiguration/utils.js +1 -4
- package/build/common/components/clusterConfiguration/utils.js.map +1 -1
- package/build/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.js +2 -3
- package/build/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.js.map +1 -1
- package/build/ocm/components/fetching/fetchEvents.js.map +1 -1
- package/lib/cim/components/ClusterDeployment/NetworkConfiguration.tsx +0 -3
- package/lib/cim/components/ClusterDeployment/networkConfigurationValidation.ts +2 -6
- package/lib/common/components/clusterConfiguration/utils.ts +1 -5
- package/lib/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.ts +2 -4
- package/lib/ocm/components/fetching/fetchEvents.ts +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NetworkConfiguration.d.ts","sourceRoot":"","sources":["../../../../lib/cim/components/ClusterDeployment/NetworkConfiguration.tsx"],"names":[],"mappings":"AAMA,OAAO,EAKL,0BAA0B,EAC3B,MAAM,0DAA0D,CAAC;AAClE,OAAO,EAEL,oBAAoB,
|
|
1
|
+
{"version":3,"file":"NetworkConfiguration.d.ts","sourceRoot":"","sources":["../../../../lib/cim/components/ClusterDeployment/NetworkConfiguration.tsx"],"names":[],"mappings":"AAMA,OAAO,EAKL,0BAA0B,EAC3B,MAAM,0DAA0D,CAAC;AAClE,OAAO,EAEL,oBAAoB,EAMrB,MAAM,iBAAiB,CAAC;AAIzB,MAAM,MAAM,yBAAyB,GAAG,0BAA0B,GAAG;IACnE,sBAAsB,EAAE,oBAAoB,CAAC;IAC7C,UAAU,EAAE,MAAM,CAAC;IACnB,qBAAqB,CAAC,EAAE,OAAO,CAAC;CACjC,CAAC;AAEF,QAAA,MAAM,oBAAoB,sHAOvB,yBAAyB,gBAuH3B,CAAC;AAEF,eAAe,oBAAoB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"networkConfigurationValidation.d.ts","sourceRoot":"","sources":["../../../../lib/cim/components/ClusterDeployment/networkConfigurationValidation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAC3B,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AACpE,OAAO,EAAE,WAAW,EAAE,0BAA0B,EAAE,MAAM,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"networkConfigurationValidation.d.ts","sourceRoot":"","sources":["../../../../lib/cim/components/ClusterDeployment/networkConfigurationValidation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAC3B,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AACpE,OAAO,EAAE,WAAW,EAAE,0BAA0B,EAAE,MAAM,gCAAgC,CAAC;AAsCzF,eAAO,MAAM,uBAAuB,YACzB,OAAO,0BACQ,oBAAoB,KAC3C,0BAkBF,CAAC;AAEF,eAAO,MAAM,uCAAuC,kBACnC,0BAA0B,uCAaxC,CAAC"}
|
|
@@ -18,7 +18,6 @@ export declare const serviceNetworksEqual: (array1: ServiceNetwork[], array2: Se
|
|
|
18
18
|
export declare const clusterNetworksEqual: (array1: ClusterNetwork[], array2: ClusterNetwork[]) => boolean;
|
|
19
19
|
export declare const isAdvNetworkConf: (cluster: Cluster, defaultNetworkSettings: ClusterDefaultConfig) => boolean;
|
|
20
20
|
export declare const canSelectNetworkTypeSDN: (isSNO: boolean, isIPv6?: boolean) => boolean;
|
|
21
|
-
export declare const getDefaultNetworkType: (isSNO: boolean, isIPv6?: boolean) => "OpenShiftSDN" | "OVNKubernetes";
|
|
22
21
|
export declare const canBeDualStack: (subnets: HostSubnets) => boolean;
|
|
23
22
|
export declare const isDualStack: ({ machineNetworks, clusterNetworks, serviceNetworks, }: Pick<Cluster, 'machineNetworks' | 'clusterNetworks' | 'serviceNetworks'>) => boolean | undefined;
|
|
24
23
|
export declare const isSubnetInIPv6: ({ clusterNetworkCidr, machineNetworkCidr, serviceNetworkCidr, }: Pick<Cluster, 'clusterNetworkCidr' | 'machineNetworkCidr' | 'serviceNetworkCidr'>) => boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../lib/common/components/clusterConfiguration/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,EACL,OAAO,EACP,oBAAoB,EACpB,cAAc,EAId,cAAc,EAEf,MAAM,WAAW,CAAC;AASnB,OAAO,EACL,sBAAsB,EAEtB,mBAAmB,EACnB,WAAW,EACX,0BAA0B,EAC1B,aAAa,EACb,UAAU,EACV,eAAe,EACf,eAAe,EACf,YAAY,EACb,MAAM,aAAa,CAAC;AAGrB,KAAK,aAAa,GAAG,YAAY,CAAC,IAAI,CAAC,OAAO,EAAE,kBAAkB,CAAC,EAAE,kBAAkB,CAAC,GAAG;IACzF,eAAe,CAAC,EAAE,sBAAsB,CAAC;IACzC,QAAQ,CAAC,EAAE,0BAA0B,EAAE,CAAC;IACxC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,CAAC;AAoBF,eAAO,MAAM,uBAAuB,WAAY,aAAa,WAQ5D,CAAC;AAEF,eAAO,MAAM,SAAS,SAAU,MAAM,KAAG,QAAQ,GAAG,QAAQ,GAAG,IAQ9D,CAAC;AAEF,eAAO,MAAM,uBAAuB,WAAY,QAAQ,GAAG,QAAQ,GAAG,IAAI,WAQzE,CAAC;AAEF,eAAO,MAAM,kBAAkB,WAAY,QAAQ,GAAG,QAAQ,GAAG,IAAI,WAKpE,CAAC;AAaF,eAAO,MAAM,cAAc,YAAa,OAAO,uBAAuB,OAAO,gBAkC5E,CAAC;AAEF,eAAO,MAAM,+BAA+B,wBAAyB,MAAM,uBAO1E,CAAC;AAEF,eAAO,MAAM,oBAAoB,WAAY,cAAc,EAAE,UAAU,cAAc,EAAE,YAGtF,CAAC;AAEF,eAAO,MAAM,oBAAoB,WAAY,cAAc,EAAE,UAAU,cAAc,EAAE,YAOpF,CAAC;AAEJ,eAAO,MAAM,gBAAgB,YAAa,OAAO,0BAA0B,oBAAoB,YAGd,CAAC;AAElF,eAAO,MAAM,uBAAuB,UAAW,OAAO,8BAErD,CAAC;AAEF,eAAO,MAAM,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../lib/common/components/clusterConfiguration/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,EACL,OAAO,EACP,oBAAoB,EACpB,cAAc,EAId,cAAc,EAEf,MAAM,WAAW,CAAC;AASnB,OAAO,EACL,sBAAsB,EAEtB,mBAAmB,EACnB,WAAW,EACX,0BAA0B,EAC1B,aAAa,EACb,UAAU,EACV,eAAe,EACf,eAAe,EACf,YAAY,EACb,MAAM,aAAa,CAAC;AAGrB,KAAK,aAAa,GAAG,YAAY,CAAC,IAAI,CAAC,OAAO,EAAE,kBAAkB,CAAC,EAAE,kBAAkB,CAAC,GAAG;IACzF,eAAe,CAAC,EAAE,sBAAsB,CAAC;IACzC,QAAQ,CAAC,EAAE,0BAA0B,EAAE,CAAC;IACxC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,CAAC;AAoBF,eAAO,MAAM,uBAAuB,WAAY,aAAa,WAQ5D,CAAC;AAEF,eAAO,MAAM,SAAS,SAAU,MAAM,KAAG,QAAQ,GAAG,QAAQ,GAAG,IAQ9D,CAAC;AAEF,eAAO,MAAM,uBAAuB,WAAY,QAAQ,GAAG,QAAQ,GAAG,IAAI,WAQzE,CAAC;AAEF,eAAO,MAAM,kBAAkB,WAAY,QAAQ,GAAG,QAAQ,GAAG,IAAI,WAKpE,CAAC;AAaF,eAAO,MAAM,cAAc,YAAa,OAAO,uBAAuB,OAAO,gBAkC5E,CAAC;AAEF,eAAO,MAAM,+BAA+B,wBAAyB,MAAM,uBAO1E,CAAC;AAEF,eAAO,MAAM,oBAAoB,WAAY,cAAc,EAAE,UAAU,cAAc,EAAE,YAGtF,CAAC;AAEF,eAAO,MAAM,oBAAoB,WAAY,cAAc,EAAE,UAAU,cAAc,EAAE,YAOpF,CAAC;AAEJ,eAAO,MAAM,gBAAgB,YAAa,OAAO,0BAA0B,oBAAoB,YAGd,CAAC;AAElF,eAAO,MAAM,uBAAuB,UAAW,OAAO,8BAErD,CAAC;AAEF,eAAO,MAAM,cAAc,mCAEgC,CAAC;AAU5D,eAAO,MAAM,WAAW,2DAIrB,KAAK,OAAO,EAAE,iBAAiB,GAAG,iBAAiB,GAAG,iBAAiB,CAAC,wBAGpC,CAAC;AAExC,eAAO,MAAM,cAAc,oEAIxB,KAAK,OAAO,EAAE,oBAAoB,GAAG,oBAAoB,GAAG,oBAAoB,CAAC,YAGxC,CAAC;AAE7C,eAAO,MAAM,6BAA6B,YAAa,OAAO,KAAG,mBAKhE,CAAC;AAEF,eAAO,MAAM,uBAAuB,QAAO,aAK1C,CAAC;AAEF,wBAAgB,4BAA4B,CAC1C,eAAe,EAAE,eAAe,EAChC,cAAc,GAAE,eAAe,EAA4D,GAC1F,eAAe,CASjB;AAED,wBAAgB,6BAA6B,CAC3C,eAAe,EAAE,eAAe,EAChC,gBAAgB,GAAE,UAAU,CAAC,QAAQ,CAAC,EAAoC,GACzE,eAAe,CAYjB;AAOD,eAAO,MAAM,qBAAqB,MAC7B,SAAS,0BACY,OAAO,CAAC,iBAAiB,CAAC;;CAkBnD,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,EACL,OAAO,
|
|
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,EACL,OAAO,EAGP,WAAW,EAGX,0BAA0B,EAQ1B,oBAAoB,EACrB,MAAM,oBAAoB,CAAC;AAE5B,eAAO,MAAM,uBAAuB,YACzB,OAAO,wBACM,KACpB,oBAAoB,EAClB,qBAAqB,GACrB,0BAA0B,GAC1B,qBAAqB,GACrB,0BAA0B,CAC7B,KACA,0BAuBF,CAAC;AAEF,eAAO,MAAM,uCAAuC,kBACnC,0BAA0B,uCA0CxC,CAAC"}
|
package/build/build.json
CHANGED
|
@@ -4,7 +4,7 @@ import { Checkbox, Grid } from '@patternfly/react-core';
|
|
|
4
4
|
import AdvancedNetworkFields from '../../../common/components/clusterConfiguration/AdvancedNetworkFields';
|
|
5
5
|
import { Address6 } from 'ip-address';
|
|
6
6
|
import { AvailableSubnetsControl, ManagedNetworkingControlGroup, UserManagedNetworkingTextContent, VirtualIPControlGroup, } from '../../../common/components/clusterWizard/networkingSteps';
|
|
7
|
-
import { canSelectNetworkTypeSDN,
|
|
7
|
+
import { canSelectNetworkTypeSDN, isAdvNetworkConf, isSNO, isSubnetInIPv6, NETWORK_TYPE_OVN, NO_SUBNET_SET, } from '../../../common';
|
|
8
8
|
import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
|
|
9
9
|
import { NetworkTypeControlGroup } from '../../../common/components/clusterWizard/networkingSteps/NetworkTypeControlGroup';
|
|
10
10
|
const NetworkConfiguration = ({ cluster, hostSubnets, isVipDhcpAllocationDisabled, defaultNetworkSettings, hideManagedNetworking, docVersion, }) => {
|
|
@@ -50,9 +50,6 @@ const NetworkConfiguration = ({ cluster, hostSubnets, isVipDhcpAllocationDisable
|
|
|
50
50
|
}, [isUserManagedNetworking, isMultiNodeCluster, values.hostSubnet, setFieldValue, firstSubnet]);
|
|
51
51
|
useEffect(() => {
|
|
52
52
|
if (!cluster.networkType) {
|
|
53
|
-
setFieldValue('networkType', getDefaultNetworkType(!isMultiNodeCluster, isIPv6));
|
|
54
|
-
}
|
|
55
|
-
else if (!isSDNSelectable) {
|
|
56
53
|
setFieldValue('networkType', NETWORK_TYPE_OVN);
|
|
57
54
|
}
|
|
58
55
|
// Skipping "cluster.networkType" as it's ultimately the value we are setting in the form
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NetworkConfiguration.js","sourceRoot":"","sources":["../../../../lib/cim/components/ClusterDeployment/NetworkConfiguration.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,QAAQ,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,qBAAqB,MAAM,uEAAuE,CAAC;AAE1G,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EACL,uBAAuB,EACvB,6BAA6B,EAC7B,gCAAgC,EAChC,qBAAqB,GAEtB,MAAM,0DAA0D,CAAC;AAClE,OAAO,EACL,uBAAuB,EAEvB,
|
|
1
|
+
{"version":3,"file":"NetworkConfiguration.js","sourceRoot":"","sources":["../../../../lib/cim/components/ClusterDeployment/NetworkConfiguration.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import * as Yup from 'yup';
|
|
2
2
|
import { hostPrefixValidationSchema, hostSubnetValidationSchema, ipBlockValidationSchema, sshPublicKeyValidationSchema, vipValidationSchema, } from '../../../common/components/ui';
|
|
3
|
-
import { getSubnetFromMachineNetworkCidr, getHostSubnets,
|
|
3
|
+
import { getSubnetFromMachineNetworkCidr, getHostSubnets, } from '../../../common/components/clusterConfiguration/utils';
|
|
4
4
|
import { isSNO, selectClusterNetworkCIDR, selectClusterNetworkHostPrefix, selectMachineNetworkCIDR, selectServiceNetworkCIDR, } from '../../../common/selectors/clusterSelectors';
|
|
5
|
-
import { NO_SUBNET_SET } from '../../../common/config';
|
|
5
|
+
import { NETWORK_TYPE_OVN, NO_SUBNET_SET } from '../../../common/config';
|
|
6
6
|
const getInitHostSubnet = (cluster, managedNetworkingType) => {
|
|
7
7
|
var _a, _b;
|
|
8
8
|
if (!isSNO(cluster) && managedNetworkingType === 'userManaged') {
|
|
@@ -18,8 +18,6 @@ const getInitHostSubnet = (cluster, managedNetworkingType) => {
|
|
|
18
18
|
};
|
|
19
19
|
export const getNetworkInitialValues = (cluster, defaultNetworkSettings) => {
|
|
20
20
|
const managedNetworkingType = cluster.userManagedNetworking ? 'userManaged' : 'clusterManaged';
|
|
21
|
-
const isIPv6 = isSubnetInIPv6(cluster);
|
|
22
|
-
const isSNOCluster = isSNO(cluster);
|
|
23
21
|
return {
|
|
24
22
|
clusterNetworkCidr: selectClusterNetworkCIDR(cluster) || defaultNetworkSettings.clusterNetworkCidr,
|
|
25
23
|
clusterNetworkHostPrefix: selectClusterNetworkHostPrefix(cluster) || defaultNetworkSettings.clusterNetworkHostPrefix,
|
|
@@ -30,7 +28,7 @@ export const getNetworkInitialValues = (cluster, defaultNetworkSettings) => {
|
|
|
30
28
|
hostSubnet: getInitHostSubnet(cluster, managedNetworkingType) || NO_SUBNET_SET,
|
|
31
29
|
vipDhcpAllocation: cluster.vipDhcpAllocation,
|
|
32
30
|
managedNetworkingType,
|
|
33
|
-
networkType: cluster.networkType ||
|
|
31
|
+
networkType: cluster.networkType || NETWORK_TYPE_OVN,
|
|
34
32
|
};
|
|
35
33
|
};
|
|
36
34
|
export const getNetworkConfigurationValidationSchema = (initialValues, hostSubnets) => Yup.lazy((values) => Yup.object().shape({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"networkConfigurationValidation.js","sourceRoot":"","sources":["../../../../lib/cim/components/ClusterDeployment/networkConfigurationValidation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAG3B,OAAO,EACL,0BAA0B,EAC1B,0BAA0B,EAC1B,uBAAuB,EACvB,4BAA4B,EAC5B,mBAAmB,GACpB,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EACL,+BAA+B,EAC/B,cAAc,
|
|
1
|
+
{"version":3,"file":"networkConfigurationValidation.js","sourceRoot":"","sources":["../../../../lib/cim/components/ClusterDeployment/networkConfigurationValidation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAG3B,OAAO,EACL,0BAA0B,EAC1B,0BAA0B,EAC1B,uBAAuB,EACvB,4BAA4B,EAC5B,mBAAmB,GACpB,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EACL,+BAA+B,EAC/B,cAAc,GACf,MAAM,uDAAuD,CAAC;AAC/D,OAAO,EACL,KAAK,EACL,wBAAwB,EACxB,8BAA8B,EAC9B,wBAAwB,EACxB,wBAAwB,GACzB,MAAM,4CAA4C,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAEzE,MAAM,iBAAiB,GAAG,CACxB,OAAgB,EAChB,qBAAuD,EACvD,EAAE;;IACF,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,qBAAqB,KAAK,aAAa,EAAE;QAC9D,OAAO,aAAa,CAAC;KACtB;IACD,MAAM,kBAAkB,GAAG,wBAAwB,CAAC,OAAO,CAAC,CAAC;IAC7D,IAAI,kBAAkB,EAAE;QACtB,OAAO,+BAA+B,CAAC,kBAAkB,CAAC,CAAC;KAC5D;IACD,IAAI,qBAAqB,KAAK,gBAAgB,EAAE;QAC9C,OAAO,MAAA,MAAA,cAAc,CAAC,OAAO,CAAC,0CAAG,CAAC,CAAC,0CAAE,MAAM,CAAC;KAC7C;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,uBAAuB,GAAG,CACrC,OAAgB,EAChB,sBAA4C,EAChB,EAAE;IAC9B,MAAM,qBAAqB,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,gBAAgB,CAAC;IAE/F,OAAO;QACL,kBAAkB,EAChB,wBAAwB,CAAC,OAAO,CAAC,IAAI,sBAAsB,CAAC,kBAAkB;QAChF,wBAAwB,EACtB,8BAA8B,CAAC,OAAO,CAAC,IAAI,sBAAsB,CAAC,wBAAwB;QAC5F,kBAAkB,EAChB,wBAAwB,CAAC,OAAO,CAAC,IAAI,sBAAsB,CAAC,kBAAkB;QAChF,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,EAAE;QAC5B,UAAU,EAAE,OAAO,CAAC,UAAU,IAAI,EAAE;QACpC,YAAY,EAAE,OAAO,CAAC,YAAY,IAAI,EAAE;QACxC,UAAU,EAAE,iBAAiB,CAAC,OAAO,EAAE,qBAAqB,CAAC,IAAI,aAAa;QAC9E,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;QAC5C,qBAAqB;QACrB,WAAW,EAAE,OAAO,CAAC,WAAW,IAAI,gBAAgB;KACrD,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,uCAAuC,GAAG,CACrD,aAAyC,EACzC,WAAwB,EACxB,EAAE,CACF,GAAG,CAAC,IAAI,CAA6B,CAAC,MAAM,EAAE,EAAE,CAC9C,GAAG,CAAC,MAAM,EAA8B,CAAC,KAAK,CAAC;IAC7C,wBAAwB,EAAE,0BAA0B,CAAC,MAAM,CAAC,kBAAkB,CAAC;IAC/E,kBAAkB,EAAE,uBAAuB,CAAC,MAAM,CAAC,kBAAkB,CAAC;IACtE,kBAAkB,EAAE,uBAAuB,CAAC,MAAM,CAAC,kBAAkB,CAAC;IACtE,MAAM,EAAE,mBAAmB,CAAC,WAAW,EAAE,MAAM,EAAE,aAAa,CAAC,MAAM,CAAC;IACtE,UAAU,EAAE,mBAAmB,CAAC,WAAW,EAAE,MAAM,EAAE,aAAa,CAAC,UAAU,CAAC;IAC9E,YAAY,EAAE,4BAA4B;IAC1C,UAAU,EAAE,0BAA0B;CACvC,CAAC,CACH,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Address4, Address6 } from 'ip-address';
|
|
2
2
|
import { stringToJSON, } from '../../api';
|
|
3
|
-
import {
|
|
3
|
+
import { NO_SUBNET_SET } from '../../config';
|
|
4
4
|
import { selectClusterNetworkCIDR, selectClusterNetworkHostPrefix, selectServiceNetworkCIDR, selectSchedulableMasters, isClusterPlatformTypeVM, } from '../../selectors';
|
|
5
5
|
import { CpuArchitecture, } from '../../types';
|
|
6
6
|
import { getHostname } from '../hosts/utils';
|
|
@@ -102,9 +102,6 @@ export const isAdvNetworkConf = (cluster, defaultNetworkSettings) => selectClust
|
|
|
102
102
|
export const canSelectNetworkTypeSDN = (isSNO, isIPv6 = false) => {
|
|
103
103
|
return !(isSNO || isIPv6);
|
|
104
104
|
};
|
|
105
|
-
export const getDefaultNetworkType = (isSNO, isIPv6 = false) => {
|
|
106
|
-
return isSNO || isIPv6 ? NETWORK_TYPE_OVN : NETWORK_TYPE_SDN;
|
|
107
|
-
};
|
|
108
105
|
export const canBeDualStack = (subnets) => subnets.some((subnet) => Address4.isValid(subnet.subnet)) &&
|
|
109
106
|
subnets.some((subnet) => Address6.isValid(subnet.subnet));
|
|
110
107
|
const areNetworksDualStack = (networks) => networks &&
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../lib/common/components/clusterConfiguration/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEhD,OAAO,EAQL,YAAY,GACb,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../lib/common/components/clusterConfiguration/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import * as Yup from 'yup';
|
|
2
|
-
import { clusterNetworksValidationSchema, dualStackValidationSchema,
|
|
2
|
+
import { clusterNetworksValidationSchema, dualStackValidationSchema, isDualStack, machineNetworksValidationSchema, serviceNetworkValidationSchema, IPv4ValidationSchema, sshPublicKeyListValidationSchema, vipNoSuffixValidationSchema, IPV4_STACK, DUAL_STACK, NETWORK_TYPE_OVN, } from '../../../../common';
|
|
3
3
|
export const getNetworkInitialValues = (cluster, defaultNetworkValues) => {
|
|
4
|
-
const isSNOCluster = isSNO(cluster);
|
|
5
4
|
const isDualStackType = isDualStack(cluster);
|
|
6
5
|
return {
|
|
7
6
|
apiVip: cluster.apiVip || '',
|
|
@@ -9,7 +8,7 @@ export const getNetworkInitialValues = (cluster, defaultNetworkValues) => {
|
|
|
9
8
|
sshPublicKey: cluster.sshPublicKey || '',
|
|
10
9
|
vipDhcpAllocation: cluster.vipDhcpAllocation,
|
|
11
10
|
managedNetworkingType: cluster.userManagedNetworking ? 'userManaged' : 'clusterManaged',
|
|
12
|
-
networkType: cluster.networkType ||
|
|
11
|
+
networkType: cluster.networkType || NETWORK_TYPE_OVN,
|
|
13
12
|
machineNetworks: cluster.machineNetworks || [],
|
|
14
13
|
stackType: isDualStackType ? DUAL_STACK : IPV4_STACK,
|
|
15
14
|
clusterNetworks: cluster.clusterNetworks ||
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"networkConfigurationValidation.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAC3B,OAAO,EAEL,+BAA+B,EAC/B,yBAAyB,
|
|
1
|
+
{"version":3,"file":"networkConfigurationValidation.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetchEvents.js","sourceRoot":"","sources":["../../../../lib/ocm/components/fetching/fetchEvents.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,EAAE,gBAAgB,EAA8B,MAAM,iBAAiB,CAAC;AAC/E,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAGhD,MAAM,YAAY,GAAG,CAAC,OAA6B,EAAE,EAAE;IACrD,MAAM,UAAU,GAAsC;QACpD,KAAK,EAAE,CAAC;QACR,IAAI,EAAE,CAAC;QACP,OAAO,EAAE,CAAC;QACV,QAAQ,EAAE,CAAC;KACZ,CAAC;IACF,gBAAgB,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;QACpC,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,kBAAkB,QAAQ,EAAE,CAAC,CAAC,CAAC;QAC5D,UAAU,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC;IAC/B,CAAC,CAAC,CAAC;IACH,OAAO;QACL,WAAW,EAAE,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QAC3C,UAAU,EAAE,UAAgC;KAC7C,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAyC,CACjE,KAAK,EACL,SAAS,EACT,OAAO,
|
|
1
|
+
{"version":3,"file":"fetchEvents.js","sourceRoot":"","sources":["../../../../lib/ocm/components/fetching/fetchEvents.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,EAAE,gBAAgB,EAA8B,MAAM,iBAAiB,CAAC;AAC/E,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAGhD,MAAM,YAAY,GAAG,CAAC,OAA6B,EAAE,EAAE;IACrD,MAAM,UAAU,GAAsC;QACpD,KAAK,EAAE,CAAC;QACR,IAAI,EAAE,CAAC;QACP,OAAO,EAAE,CAAC;QACV,QAAQ,EAAE,CAAC;KACZ,CAAC;IACF,gBAAgB,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;QACpC,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,kBAAkB,QAAQ,EAAE,CAAC,CAAC,CAAC;QAC5D,UAAU,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC;IAC/B,CAAC,CAAC,CAAC;IACH,OAAO;QACL,WAAW,EAAE,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QAC3C,UAAU,EAAE,UAAgC;KAC7C,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAyC,CACjE,KAAK,EACL,SAAS,EACT,OAAO,EACQ,EAAE;IACjB,IAAI;QACF,SAAS,CAAC,KAAK,EAAE,CAAC;QAClB,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC7C,SAAS,iBACP,IAAI,EAAE,QAAQ,CAAC,IAAI,IAChB,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,EACjC,CAAC;KACJ;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,EAAE,IAAI,EAAE,GAAG,KAAmB,CAAC;QACrC,IAAI,CAAC,IAAI,IAAI,IAAI,KAAK,cAAc,EAAE;YACpC,cAAc,CAAC,KAAK,EAAE,GAAG,EAAE;gBACzB,OAAO,CAAC,uBAAuB,CAAC,CAAC;YACnC,CAAC,CAAC,CAAC;SACJ;KACF;AACH,CAAC,CAAA,CAAC"}
|
|
@@ -14,7 +14,6 @@ import {
|
|
|
14
14
|
import {
|
|
15
15
|
canSelectNetworkTypeSDN,
|
|
16
16
|
ClusterDefaultConfig,
|
|
17
|
-
getDefaultNetworkType,
|
|
18
17
|
isAdvNetworkConf,
|
|
19
18
|
isSNO,
|
|
20
19
|
isSubnetInIPv6,
|
|
@@ -88,8 +87,6 @@ const NetworkConfiguration = ({
|
|
|
88
87
|
|
|
89
88
|
useEffect(() => {
|
|
90
89
|
if (!cluster.networkType) {
|
|
91
|
-
setFieldValue('networkType', getDefaultNetworkType(!isMultiNodeCluster, isIPv6));
|
|
92
|
-
} else if (!isSDNSelectable) {
|
|
93
90
|
setFieldValue('networkType', NETWORK_TYPE_OVN);
|
|
94
91
|
}
|
|
95
92
|
// Skipping "cluster.networkType" as it's ultimately the value we are setting in the form
|
|
@@ -12,8 +12,6 @@ import {
|
|
|
12
12
|
import {
|
|
13
13
|
getSubnetFromMachineNetworkCidr,
|
|
14
14
|
getHostSubnets,
|
|
15
|
-
isSubnetInIPv6,
|
|
16
|
-
getDefaultNetworkType,
|
|
17
15
|
} from '../../../common/components/clusterConfiguration/utils';
|
|
18
16
|
import {
|
|
19
17
|
isSNO,
|
|
@@ -22,7 +20,7 @@ import {
|
|
|
22
20
|
selectMachineNetworkCIDR,
|
|
23
21
|
selectServiceNetworkCIDR,
|
|
24
22
|
} from '../../../common/selectors/clusterSelectors';
|
|
25
|
-
import { NO_SUBNET_SET } from '../../../common/config';
|
|
23
|
+
import { NETWORK_TYPE_OVN, NO_SUBNET_SET } from '../../../common/config';
|
|
26
24
|
|
|
27
25
|
const getInitHostSubnet = (
|
|
28
26
|
cluster: Cluster,
|
|
@@ -45,8 +43,6 @@ export const getNetworkInitialValues = (
|
|
|
45
43
|
defaultNetworkSettings: ClusterDefaultConfig,
|
|
46
44
|
): NetworkConfigurationValues => {
|
|
47
45
|
const managedNetworkingType = cluster.userManagedNetworking ? 'userManaged' : 'clusterManaged';
|
|
48
|
-
const isIPv6 = isSubnetInIPv6(cluster);
|
|
49
|
-
const isSNOCluster = isSNO(cluster);
|
|
50
46
|
|
|
51
47
|
return {
|
|
52
48
|
clusterNetworkCidr:
|
|
@@ -61,7 +57,7 @@ export const getNetworkInitialValues = (
|
|
|
61
57
|
hostSubnet: getInitHostSubnet(cluster, managedNetworkingType) || NO_SUBNET_SET,
|
|
62
58
|
vipDhcpAllocation: cluster.vipDhcpAllocation,
|
|
63
59
|
managedNetworkingType,
|
|
64
|
-
networkType: cluster.networkType ||
|
|
60
|
+
networkType: cluster.networkType || NETWORK_TYPE_OVN,
|
|
65
61
|
};
|
|
66
62
|
};
|
|
67
63
|
|
|
@@ -10,7 +10,7 @@ import {
|
|
|
10
10
|
ServiceNetwork,
|
|
11
11
|
stringToJSON,
|
|
12
12
|
} from '../../api';
|
|
13
|
-
import {
|
|
13
|
+
import { NO_SUBNET_SET } from '../../config';
|
|
14
14
|
import {
|
|
15
15
|
selectClusterNetworkCIDR,
|
|
16
16
|
selectClusterNetworkHostPrefix,
|
|
@@ -173,10 +173,6 @@ export const canSelectNetworkTypeSDN = (isSNO: boolean, isIPv6 = false) => {
|
|
|
173
173
|
return !(isSNO || isIPv6);
|
|
174
174
|
};
|
|
175
175
|
|
|
176
|
-
export const getDefaultNetworkType = (isSNO: boolean, isIPv6 = false) => {
|
|
177
|
-
return isSNO || isIPv6 ? NETWORK_TYPE_OVN : NETWORK_TYPE_SDN;
|
|
178
|
-
};
|
|
179
|
-
|
|
180
176
|
export const canBeDualStack = (subnets: HostSubnets) =>
|
|
181
177
|
subnets.some((subnet) => Address4.isValid(subnet.subnet)) &&
|
|
182
178
|
subnets.some((subnet) => Address6.isValid(subnet.subnet));
|
|
@@ -3,10 +3,8 @@ import {
|
|
|
3
3
|
Cluster,
|
|
4
4
|
clusterNetworksValidationSchema,
|
|
5
5
|
dualStackValidationSchema,
|
|
6
|
-
getDefaultNetworkType,
|
|
7
6
|
HostSubnets,
|
|
8
7
|
isDualStack,
|
|
9
|
-
isSNO,
|
|
10
8
|
machineNetworksValidationSchema,
|
|
11
9
|
NetworkConfigurationValues,
|
|
12
10
|
serviceNetworkValidationSchema,
|
|
@@ -15,6 +13,7 @@ import {
|
|
|
15
13
|
vipNoSuffixValidationSchema,
|
|
16
14
|
IPV4_STACK,
|
|
17
15
|
DUAL_STACK,
|
|
16
|
+
NETWORK_TYPE_OVN,
|
|
18
17
|
ClusterDefaultConfig,
|
|
19
18
|
} from '../../../../common';
|
|
20
19
|
|
|
@@ -28,7 +27,6 @@ export const getNetworkInitialValues = (
|
|
|
28
27
|
| 'serviceNetworksDualstack'
|
|
29
28
|
>,
|
|
30
29
|
): NetworkConfigurationValues => {
|
|
31
|
-
const isSNOCluster = isSNO(cluster);
|
|
32
30
|
const isDualStackType = isDualStack(cluster);
|
|
33
31
|
|
|
34
32
|
return {
|
|
@@ -37,7 +35,7 @@ export const getNetworkInitialValues = (
|
|
|
37
35
|
sshPublicKey: cluster.sshPublicKey || '',
|
|
38
36
|
vipDhcpAllocation: cluster.vipDhcpAllocation,
|
|
39
37
|
managedNetworkingType: cluster.userManagedNetworking ? 'userManaged' : 'clusterManaged',
|
|
40
|
-
networkType: cluster.networkType ||
|
|
38
|
+
networkType: cluster.networkType || NETWORK_TYPE_OVN,
|
|
41
39
|
machineNetworks: cluster.machineNetworks || [],
|
|
42
40
|
stackType: isDualStackType ? DUAL_STACK : IPV4_STACK,
|
|
43
41
|
clusterNetworks:
|
package/package.json
CHANGED