@openshift-assisted/ui-lib 2.17.4-cim → 2.17.6-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/build/@types/cim/components/ClusterDeployment/NetworkConfiguration.d.ts +1 -1
- package/build/@types/cim/components/ClusterDeployment/NetworkConfiguration.d.ts.map +1 -1
- package/build/@types/cim/components/ClusterDeployment/networkConfigurationValidation.d.ts +1 -1
- package/build/@types/cim/components/ClusterDeployment/networkConfigurationValidation.d.ts.map +1 -1
- package/build/@types/cim/components/ClusterDeployment/use-networking-formik.d.ts +4 -4
- package/build/@types/cim/components/ClusterDeployment/use-networking-formik.d.ts.map +1 -1
- package/build/@types/common/components/clusterWizard/networkingSteps/AvailableSubnetsControl.d.ts +2 -1
- package/build/@types/common/components/clusterWizard/networkingSteps/AvailableSubnetsControl.d.ts.map +1 -1
- package/build/@types/common/components/clusterWizard/networkingSteps/StackTypeControlGroup.d.ts +2 -1
- package/build/@types/common/components/clusterWizard/networkingSteps/StackTypeControlGroup.d.ts.map +1 -1
- package/build/@types/common/components/ui/formik/utils.d.ts +1 -0
- package/build/@types/common/components/ui/formik/utils.d.ts.map +1 -1
- package/build/@types/common/config/constants.d.ts +2 -2
- package/build/@types/common/config/constants.d.ts.map +1 -1
- package/build/@types/common/validationSchemas/networkingValidation.d.ts +10 -0
- package/build/@types/common/validationSchemas/networkingValidation.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.d.ts.map +1 -1
- package/build/cjs/cim/components/ClusterDeployment/NetworkConfiguration.js +44 -5
- package/build/cjs/cim/components/ClusterDeployment/NetworkConfiguration.js.map +1 -1
- package/build/cjs/cim/components/ClusterDeployment/networkConfigurationValidation.js +27 -11
- package/build/cjs/cim/components/ClusterDeployment/networkConfigurationValidation.js.map +1 -1
- package/build/cjs/cim/components/ClusterDeployment/use-networking-formik.js +13 -18
- package/build/cjs/cim/components/ClusterDeployment/use-networking-formik.js.map +1 -1
- package/build/cjs/common/components/clusterWizard/networkingSteps/AvailableSubnetsControl.js +8 -2
- package/build/cjs/common/components/clusterWizard/networkingSteps/AvailableSubnetsControl.js.map +1 -1
- package/build/cjs/common/components/clusterWizard/networkingSteps/StackTypeControlGroup.js +29 -19
- package/build/cjs/common/components/clusterWizard/networkingSteps/StackTypeControlGroup.js.map +1 -1
- package/build/cjs/common/components/ui/formik/utils.js +5 -1
- package/build/cjs/common/components/ui/formik/utils.js.map +1 -1
- package/build/cjs/common/config/constants.js +9 -2
- package/build/cjs/common/config/constants.js.map +1 -1
- package/build/cjs/common/validationSchemas/networkingValidation.js +19 -1
- package/build/cjs/common/validationSchemas/networkingValidation.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfigurationForm.js +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfigurationForm.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.js +4 -4
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.js.map +1 -1
- package/lib/cim/components/ClusterDeployment/NetworkConfiguration.tsx +51 -3
- package/lib/cim/components/ClusterDeployment/networkConfigurationValidation.ts +22 -8
- package/lib/cim/components/ClusterDeployment/use-networking-formik.ts +14 -22
- package/lib/common/components/clusterWizard/networkingSteps/AvailableSubnetsControl.tsx +8 -1
- package/lib/common/components/clusterWizard/networkingSteps/StackTypeControlGroup.tsx +37 -27
- package/lib/common/components/ui/formik/utils.ts +6 -0
- package/lib/common/config/constants.ts +10 -1
- package/lib/common/validationSchemas/networkingValidation.tsx +39 -1
- package/lib/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfigurationForm.tsx +2 -2
- package/lib/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.ts +6 -5
- package/package.json +3 -3
|
@@ -2,7 +2,7 @@ import React from 'react';
|
|
|
2
2
|
import { VirtualIPControlGroupProps } from '../../../common/components/clusterWizard/networkingSteps';
|
|
3
3
|
import { ClusterDefaultConfig } from '@openshift-assisted/types/assisted-installer-service';
|
|
4
4
|
export type NetworkConfigurationProps = VirtualIPControlGroupProps & {
|
|
5
|
-
defaultNetworkSettings: Pick<ClusterDefaultConfig, 'clusterNetworksIpv4' | 'clusterNetworksDualstack' | 'serviceNetworksIpv4' | 'serviceNetworksDualstack'>;
|
|
5
|
+
defaultNetworkSettings: Pick<ClusterDefaultConfig, 'clusterNetworksIpv4' | 'clusterNetworksIpv6' | 'clusterNetworksDualstack' | 'serviceNetworksIpv4' | 'serviceNetworksIpv6' | 'serviceNetworksDualstack'>;
|
|
6
6
|
hideManagedNetworking?: boolean;
|
|
7
7
|
};
|
|
8
8
|
declare const NetworkConfiguration: ({ cluster, hostSubnets, isVipDhcpAllocationDisabled, defaultNetworkSettings, hideManagedNetworking, }: NetworkConfigurationProps) => React.JSX.Element;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NetworkConfiguration.d.ts","sourceRoot":"","sources":["../../../../../lib/cim/components/ClusterDeployment/NetworkConfiguration.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAiC,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"NetworkConfiguration.d.ts","sourceRoot":"","sources":["../../../../../lib/cim/components/ClusterDeployment/NetworkConfiguration.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAiC,MAAM,OAAO,CAAC;AAKtD,OAAO,EAML,0BAA0B,EAE3B,MAAM,0DAA0D,CAAC;AAWlE,OAAO,EAAE,oBAAoB,EAAE,MAAM,sDAAsD,CAAC;AAE5F,MAAM,MAAM,yBAAyB,GAAG,0BAA0B,GAAG;IACnE,sBAAsB,EAAE,IAAI,CAC1B,oBAAoB,EAClB,qBAAqB,GACrB,qBAAqB,GACrB,0BAA0B,GAC1B,qBAAqB,GACrB,qBAAqB,GACrB,0BAA0B,CAC7B,CAAC;IACF,qBAAqB,CAAC,EAAE,OAAO,CAAC;CACjC,CAAC;AAEF,QAAA,MAAM,oBAAoB,0GAMvB,yBAAyB,sBA+K3B,CAAC;AAEF,eAAe,oBAAoB,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { Cluster, ClusterDefaultConfig } from '@openshift-assisted/types/assisted-installer-service';
|
|
2
2
|
import { NetworkConfigurationValues } from '../../../common/types/clusters';
|
|
3
|
-
export declare const getNetworkInitialValues: (cluster: Cluster, defaultNetworkSettings: Pick<ClusterDefaultConfig, 'clusterNetworksIpv4' | 'clusterNetworksDualstack' | 'serviceNetworksIpv4' | 'serviceNetworksDualstack'>) => NetworkConfigurationValues;
|
|
3
|
+
export declare const getNetworkInitialValues: (cluster: Cluster, defaultNetworkSettings: Pick<ClusterDefaultConfig, 'clusterNetworksIpv4' | 'clusterNetworksIpv6' | 'clusterNetworksDualstack' | 'serviceNetworksIpv4' | 'serviceNetworksIpv6' | 'serviceNetworksDualstack'>) => NetworkConfigurationValues;
|
|
4
4
|
//# sourceMappingURL=networkConfigurationValidation.d.ts.map
|
package/build/@types/cim/components/ClusterDeployment/networkConfigurationValidation.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"networkConfigurationValidation.d.ts","sourceRoot":"","sources":["../../../../../lib/cim/components/ClusterDeployment/networkConfigurationValidation.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"networkConfigurationValidation.d.ts","sourceRoot":"","sources":["../../../../../lib/cim/components/ClusterDeployment/networkConfigurationValidation.ts"],"names":[],"mappings":"AACA,OAAO,EACL,OAAO,EACP,oBAAoB,EACrB,MAAM,sDAAsD,CAAC;AAC9D,OAAO,EAAE,0BAA0B,EAAE,MAAM,gCAAgC,CAAC;AAI5E,eAAO,MAAM,uBAAuB,YACzB,OAAO,0BACQ,KACtB,oBAAoB,EAClB,qBAAqB,GACrB,qBAAqB,GACrB,0BAA0B,GAC1B,qBAAqB,GACrB,qBAAqB,GACrB,0BAA0B,CAC7B,KACA,0BA2CF,CAAC"}
|
|
@@ -35,15 +35,15 @@ export declare const useNetworkingFormik: ({ clusterDeployment, agentClusterInst
|
|
|
35
35
|
ip?: {} | undefined;
|
|
36
36
|
}[] | undefined;
|
|
37
37
|
sshPublicKey?: string | undefined;
|
|
38
|
-
clusterNetworks?: {
|
|
38
|
+
clusterNetworks?: ({
|
|
39
39
|
clusterId?: string | undefined;
|
|
40
40
|
cidr: string;
|
|
41
41
|
hostPrefix: number;
|
|
42
|
-
}[] | undefined;
|
|
43
|
-
serviceNetworks?: {
|
|
42
|
+
}[] & any[]) | undefined;
|
|
43
|
+
serviceNetworks?: ({
|
|
44
44
|
clusterId?: string | undefined;
|
|
45
45
|
cidr: string;
|
|
46
|
-
}[] | undefined;
|
|
46
|
+
}[] & any[]) | undefined;
|
|
47
47
|
httpProxy?: string | undefined;
|
|
48
48
|
httpsProxy?: string | undefined;
|
|
49
49
|
noProxy?: string | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-networking-formik.d.ts","sourceRoot":"","sources":["../../../../../lib/cim/components/ClusterDeployment/use-networking-formik.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAM3B,OAAO,EACL,8BAA8B,EAC9B,gBAAgB,EAChB,4BAA4B,EAC5B,mBAAmB,EACpB,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"use-networking-formik.d.ts","sourceRoot":"","sources":["../../../../../lib/cim/components/ClusterDeployment/use-networking-formik.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAM3B,OAAO,EACL,8BAA8B,EAC9B,gBAAgB,EAChB,4BAA4B,EAC5B,mBAAmB,EACpB,MAAM,aAAa,CAAC;AA4DrB,KAAK,uBAAuB,GAAG;IAC7B,iBAAiB,EAAE,4BAA4B,CAAC;IAChD,mBAAmB,EAAE,8BAA8B,CAAC;IACpD,MAAM,EAAE,gBAAgB,EAAE,CAAC;CAC5B,CAAC;AAEF,eAAO,MAAM,mBAAmB,wDAI7B,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAoCzB,CAAC;AAEF,KAAK,sBAAsB,GAAG;IAC5B,MAAM,EAAE,gBAAgB,EAAE,CAAC;IAC3B,aAAa,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,mBAAmB,CAAC,CAAC;CAClF,CAAC;AAEF,eAAO,MAAM,kBAAkB,8BAA+B,sBAAsB;;;;;CAsCnF,CAAC"}
|
package/build/@types/common/components/clusterWizard/networkingSteps/AvailableSubnetsControl.d.ts
CHANGED
|
@@ -10,6 +10,7 @@ export interface AvailableSubnetsControlProps {
|
|
|
10
10
|
isViewerMode?: boolean;
|
|
11
11
|
hosts?: Host[];
|
|
12
12
|
isMultiNodeCluster?: boolean;
|
|
13
|
+
allowSingleStackIPv6?: boolean;
|
|
13
14
|
}
|
|
14
|
-
export declare const AvailableSubnetsControl: ({ clusterId, hostSubnets, isRequired, isDisabled, openshiftVersion, isViewerMode, hosts, isMultiNodeCluster, }: AvailableSubnetsControlProps) => React.JSX.Element;
|
|
15
|
+
export declare const AvailableSubnetsControl: ({ clusterId, hostSubnets, isRequired, isDisabled, openshiftVersion, isViewerMode, hosts, isMultiNodeCluster, allowSingleStackIPv6, }: AvailableSubnetsControlProps) => React.JSX.Element;
|
|
15
16
|
//# sourceMappingURL=AvailableSubnetsControl.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AvailableSubnetsControl.d.ts","sourceRoot":"","sources":["../../../../../../lib/common/components/clusterWizard/networkingSteps/AvailableSubnetsControl.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoB,MAAM,OAAO,CAAC;AAazC,OAAO,EAAE,UAAU,EAA8B,MAAM,gBAAgB,CAAC;AAMxE,OAAO,EACL,OAAO,EACP,IAAI,EAEL,MAAM,sDAAsD,CAAC;AA6B9D,MAAM,WAAW,4BAA4B;IAC3C,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACzB,WAAW,EAAE,UAAU,EAAE,CAAC;IAC1B,UAAU,EAAE,OAAO,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;IACpB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC;IACf,kBAAkB,CAAC,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"AvailableSubnetsControl.d.ts","sourceRoot":"","sources":["../../../../../../lib/common/components/clusterWizard/networkingSteps/AvailableSubnetsControl.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoB,MAAM,OAAO,CAAC;AAazC,OAAO,EAAE,UAAU,EAA8B,MAAM,gBAAgB,CAAC;AAMxE,OAAO,EACL,OAAO,EACP,IAAI,EAEL,MAAM,sDAAsD,CAAC;AA6B9D,MAAM,WAAW,4BAA4B;IAC3C,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACzB,WAAW,EAAE,UAAU,EAAE,CAAC;IAC1B,UAAU,EAAE,OAAO,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;IACpB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC;IACf,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC;AAED,eAAO,MAAM,uBAAuB,yIAUjC,4BAA4B,sBAuN9B,CAAC"}
|
package/build/@types/common/components/clusterWizard/networkingSteps/StackTypeControlGroup.d.ts
CHANGED
|
@@ -8,6 +8,7 @@ export type StackTypeControlGroupProps = {
|
|
|
8
8
|
hostSubnets: HostSubnets;
|
|
9
9
|
defaultNetworkValues: StackTypeDefaultNetworkValues;
|
|
10
10
|
isViewerMode?: boolean;
|
|
11
|
+
allowSingleStackIPv6?: boolean;
|
|
11
12
|
};
|
|
12
|
-
export declare const StackTypeControlGroup: ({ clusterId, isDualStackSelectable, hostSubnets, defaultNetworkValues, isViewerMode, }: StackTypeControlGroupProps) => React.JSX.Element;
|
|
13
|
+
export declare const StackTypeControlGroup: ({ clusterId, isDualStackSelectable, hostSubnets, defaultNetworkValues, isViewerMode, allowSingleStackIPv6, }: StackTypeControlGroupProps) => React.JSX.Element;
|
|
13
14
|
//# sourceMappingURL=StackTypeControlGroup.d.ts.map
|
package/build/@types/common/components/clusterWizard/networkingSteps/StackTypeControlGroup.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StackTypeControlGroup.d.ts","sourceRoot":"","sources":["../../../../../../lib/common/components/clusterWizard/networkingSteps/StackTypeControlGroup.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAK1B,OAAO,EAAE,WAAW,EAA8B,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"StackTypeControlGroup.d.ts","sourceRoot":"","sources":["../../../../../../lib/common/components/clusterWizard/networkingSteps/StackTypeControlGroup.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAK1B,OAAO,EAAE,WAAW,EAA8B,MAAM,gBAAgB,CAAC;AAazE,OAAO,EACL,OAAO,EACP,oBAAoB,EAIrB,MAAM,sDAAsD,CAAC;AAE9D,MAAM,MAAM,6BAA6B,GAAG,IAAI,CAC9C,oBAAoB,EAClB,0BAA0B,GAC1B,qBAAqB,GACrB,0BAA0B,GAC1B,qBAAqB,CACxB,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACvC,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACzB,qBAAqB,EAAE,OAAO,CAAC;IAC/B,WAAW,EAAE,WAAW,CAAC;IACzB,oBAAoB,EAAE,6BAA6B,CAAC;IACpD,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AAkBF,eAAO,MAAM,qBAAqB,iHAO/B,0BAA0B,sBAqS5B,CAAC"}
|
|
@@ -19,6 +19,7 @@ export declare const getRichTextValidation: <T extends object>(schema: Yup.Objec
|
|
|
19
19
|
export declare const getFormikArrayItemFieldName: (arrayFieldName: string, idx: number) => string;
|
|
20
20
|
export declare const getFormikObjectItemFieldName: (objectFieldName: string, idx: number) => string;
|
|
21
21
|
export declare const allSubnetsIPv4: (networks: (MachineNetwork | ClusterNetwork | ServiceNetwork)[] | undefined) => boolean;
|
|
22
|
+
export declare const allSubnetsIPv6: (networks: (MachineNetwork | ClusterNetwork | ServiceNetwork)[] | undefined) => boolean;
|
|
22
23
|
export declare const labelsToArray: (labels?: {
|
|
23
24
|
[x: string]: string;
|
|
24
25
|
}) => string[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../../lib/common/components/ui/formik/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AACrD,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAC3B,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAIhD,OAAO,EAAE,0BAA0B,EAAE,MAAM,gBAAgB,CAAC;AAC5D,OAAO,EACL,cAAc,EACd,cAAc,EACd,cAAc,EACf,MAAM,sDAAsD,CAAC;AAG9D,eAAO,MAAM,UAAU,cAAe,MAAM,aAAa,MAAM,WAAW,MAAM,WAG/E,CAAC;AAEF,eAAO,MAAM,gBAAgB,QAAS,MAAM,WAK7B,CAAC;AAEhB,eAAO,MAAM,sBAAsB,SAAU,MAAM,WAKrC,CAAC;AAEf,eAAO,MAAM,oBAAoB,oHAGqB,CAAC;AAEvD,eAAO,MAAM,0BAA0B,aAAc,0BAA0B,EAAE,WACb,CAAC;AAGrE,eAAO,MAAM,iBAAiB,cACjB,MAAM,EAAE;;CAUpB,CAAC;AAIF,KAAK,WAAW,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;CAAE,CAAC;AAY/C,eAAO,MAAM,aAAa,SAAU,MAAM,EAAE,KAAG,MAAM,EAGpD,CAAC;AAEF,eAAO,MAAM,qBAAqB,8HAEb,QAAQ,WAAW,GAAG,SAAS,CAoCjD,CAAC;AAEJ,eAAO,MAAM,2BAA2B,mBAAoB,MAAM,OAAO,MAAM,WAE9E,CAAC;AAEF,eAAO,MAAM,4BAA4B,oBAAqB,MAAM,OAAO,MAAM,WAEhF,CAAC;AAEF,eAAO,MAAM,cAAc,aACf,CAAC,cAAc,GAAG,cAAc,GAAG,cAAc,CAAC,EAAE,GAAG,SAAS,YAG3E,CAAC;AAEF,eAAO,MAAM,aAAa;;MAA+C,MAAM,EAM9E,CAAC;AAEF,eAAO,MAAM,UAAU,SAAU,MAAM,oCAOtC,CAAC"}
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../../lib/common/components/ui/formik/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AACrD,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAC3B,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAIhD,OAAO,EAAE,0BAA0B,EAAE,MAAM,gBAAgB,CAAC;AAC5D,OAAO,EACL,cAAc,EACd,cAAc,EACd,cAAc,EACf,MAAM,sDAAsD,CAAC;AAG9D,eAAO,MAAM,UAAU,cAAe,MAAM,aAAa,MAAM,WAAW,MAAM,WAG/E,CAAC;AAEF,eAAO,MAAM,gBAAgB,QAAS,MAAM,WAK7B,CAAC;AAEhB,eAAO,MAAM,sBAAsB,SAAU,MAAM,WAKrC,CAAC;AAEf,eAAO,MAAM,oBAAoB,oHAGqB,CAAC;AAEvD,eAAO,MAAM,0BAA0B,aAAc,0BAA0B,EAAE,WACb,CAAC;AAGrE,eAAO,MAAM,iBAAiB,cACjB,MAAM,EAAE;;CAUpB,CAAC;AAIF,KAAK,WAAW,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;CAAE,CAAC;AAY/C,eAAO,MAAM,aAAa,SAAU,MAAM,EAAE,KAAG,MAAM,EAGpD,CAAC;AAEF,eAAO,MAAM,qBAAqB,8HAEb,QAAQ,WAAW,GAAG,SAAS,CAoCjD,CAAC;AAEJ,eAAO,MAAM,2BAA2B,mBAAoB,MAAM,OAAO,MAAM,WAE9E,CAAC;AAEF,eAAO,MAAM,4BAA4B,oBAAqB,MAAM,OAAO,MAAM,WAEhF,CAAC;AAEF,eAAO,MAAM,cAAc,aACf,CAAC,cAAc,GAAG,cAAc,GAAG,cAAc,CAAC,EAAE,GAAG,SAAS,YAG3E,CAAC;AAEF,eAAO,MAAM,cAAc,aACf,CAAC,cAAc,GAAG,cAAc,GAAG,cAAc,CAAC,EAAE,GAAG,SAAS,YAG3E,CAAC;AAEF,eAAO,MAAM,aAAa;;MAA+C,MAAM,EAM9E,CAAC;AAEF,eAAO,MAAM,UAAU,SAAU,MAAM,oCAOtC,CAAC"}
|
|
@@ -230,7 +230,7 @@ export declare const CLUSTER_DEFAULT_NETWORK_SETTINGS_IPV6: {
|
|
|
230
230
|
clusterNetworkHostPrefix: number;
|
|
231
231
|
serviceNetworkCidr: string;
|
|
232
232
|
};
|
|
233
|
-
export declare const CLUSTER_DEFAULT_NETWORK_SETTINGS: Pick<ClusterDefaultConfig, 'clusterNetworksIpv4' | 'clusterNetworksDualstack' | 'serviceNetworksIpv4' | 'serviceNetworksDualstack'>;
|
|
233
|
+
export declare const CLUSTER_DEFAULT_NETWORK_SETTINGS: Pick<ClusterDefaultConfig, 'clusterNetworksIpv4' | 'clusterNetworksIpv6' | 'clusterNetworksDualstack' | 'serviceNetworksIpv4' | 'serviceNetworksIpv6' | 'serviceNetworksDualstack'>;
|
|
234
234
|
/**
|
|
235
235
|
* The function returns the build-time generated version.
|
|
236
236
|
* It can be overriden via the AIUI_APP_VERSION environment variable.
|
|
@@ -242,7 +242,7 @@ export declare const MS_PER_DAY: number;
|
|
|
242
242
|
export declare const NO_SUBNET_SET = "NO_SUBNET_SET";
|
|
243
243
|
export declare const NETWORK_TYPE_OVN = "OVNKubernetes";
|
|
244
244
|
export declare const NETWORK_TYPE_SDN = "OpenShiftSDN";
|
|
245
|
-
export declare const
|
|
245
|
+
export declare const SINGLE_STACK = "singleStack";
|
|
246
246
|
export declare const DUAL_STACK = "dualStack";
|
|
247
247
|
export declare const PREFIX_MAX_RESTRICTION: {
|
|
248
248
|
IPv6: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../lib/common/config/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EACL,OAAO,EACP,oBAAoB,EACpB,mBAAmB,EACnB,QAAQ,EACR,KAAK,EACL,gBAAgB,EACjB,MAAM,sDAAsD,CAAC;AAC9D,OAAO,EAAE,eAAe,IAAI,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAG9E,eAAO,MAAM,wBAAwB,QAAY,CAAC;AAClD,eAAO,MAAM,wBAAwB,QAAgB,CAAC;AAEtD,eAAO,MAAM,SAAS,MAAO,SAAS,KAAG,QAAQ,EAyBhD,CAAC;AAEF,eAAO,MAAM,mBAAmB,MAAO,SAAS;;;;;;;;;;;;CAY9C,CAAC;AAEH,eAAO,MAAM,kBAAkB,MAAO,SAAS;;CAkB7C,CAAC;AAEH,eAAO,MAAM,yBAAyB,MACjC,SAAS;;;;;CAMZ,CAAC;AAEH,eAAO,MAAM,oBAAoB,MAAO,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAmE/C,CAAC;AAEH,eAAO,MAAM,0BAA0B,MAClC,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAsEZ,CAAC;AAEH,eAAO,MAAM,uBAAuB,MAC/B,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAiCZ,CAAC;AAEH,eAAO,MAAM,4BAA4B,MACpC,SAAS;;;;;;CAOZ,CAAC;AAEH,eAAO,MAAM,qCAAqC;;;;CAIjD,CAAC;AAEF,eAAO,MAAM,qCAAqC;;;;CAIjD,CAAC;AAEF,eAAO,MAAM,gCAAgC,EAAE,IAAI,CACjD,oBAAoB,EAClB,qBAAqB,GACrB,0BAA0B,GAC1B,qBAAqB,GACrB,0BAA0B,
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../lib/common/config/constants.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,4 +15,14 @@ export declare const serviceNetworkValidationSchema: (t: TFunction) => Yup.Array
|
|
|
15
15
|
}[] | undefined, Yup.AnyObject, "", "">;
|
|
16
16
|
export declare const dualStackValidationSchema: (field: string, t: TFunction, openshiftVersion?: string) => Yup.ArraySchema<any[] | undefined, Yup.AnyObject, undefined, "">;
|
|
17
17
|
export declare const IPv4ValidationSchema: Yup.ArraySchema<any[] | undefined, Yup.AnyObject, undefined, "">;
|
|
18
|
+
export declare const IPv6ValidationSchema: Yup.ArraySchema<any[] | undefined, Yup.AnyObject, undefined, "">;
|
|
19
|
+
export declare const clusterNetworksSchema: (t: TFunction, stackType: string, primaryCidr: string | undefined, openshiftVersion?: string) => Yup.ArraySchema<({
|
|
20
|
+
clusterId?: string | undefined;
|
|
21
|
+
cidr: string;
|
|
22
|
+
hostPrefix: number;
|
|
23
|
+
}[] & any[]) | undefined, Yup.AnyObject, "", "">;
|
|
24
|
+
export declare const serviceNetworksSchema: (t: TFunction, stackType: string, primaryCidr: string | undefined, openshiftVersion?: string) => Yup.ArraySchema<({
|
|
25
|
+
clusterId?: string | undefined;
|
|
26
|
+
cidr: string;
|
|
27
|
+
}[] & any[]) | undefined, Yup.AnyObject, "", "">;
|
|
18
28
|
//# sourceMappingURL=networkingValidation.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"networkingValidation.d.ts","sourceRoot":"","sources":["../../../../lib/common/validationSchemas/networkingValidation.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAE3B,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"networkingValidation.d.ts","sourceRoot":"","sources":["../../../../lib/common/validationSchemas/networkingValidation.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAE3B,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAgBpC,eAAO,MAAM,+BAA+B;;;uCAE3C,CAAC;AAEF,eAAO,MAAM,+BAA+B,MAAO,SAAS;;;;uCAYzD,CAAC;AAEJ,eAAO,MAAM,8BAA8B,MAAO,SAAS;;;uCASxD,CAAC;AAEJ,eAAO,MAAM,yBAAyB,UAAW,MAAM,KAAK,SAAS,qBAAqB,MAAM,qEA4D3F,CAAC;AAEN,eAAO,MAAM,oBAAoB,kEAIhC,CAAC;AAEF,eAAO,MAAM,oBAAoB,kEAIhC,CAAC;AAEF,eAAO,MAAM,qBAAqB,MAC7B,SAAS,aACD,MAAM,eACJ,MAAM,GAAG,SAAS,qBACZ,MAAM;;;;gDAU1B,CAAC;AAEF,eAAO,MAAM,qBAAqB,MAC7B,SAAS,aACD,MAAM,eACJ,MAAM,GAAG,SAAS,qBACZ,MAAM;;;gDAS1B,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,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,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,+BAEtC,SAAS,qBACO,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,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,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,+BAEtC,SAAS,qBACO,MAAM;;;;;;;;;;;;;;;;;;;;;;;sBAkCxB,CAAC"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
4
|
const react_1 = tslib_1.__importStar(require("react"));
|
|
5
5
|
const formik_1 = require("formik");
|
|
6
|
+
const is_cidr_1 = tslib_1.__importDefault(require("is-cidr"));
|
|
6
7
|
const react_core_1 = require("@patternfly/react-core");
|
|
7
8
|
const networkingSteps_1 = require("../../../common/components/clusterWizard/networkingSteps");
|
|
8
9
|
const common_1 = require("../../../common");
|
|
@@ -18,18 +19,56 @@ const NetworkConfiguration = ({ cluster, hostSubnets, isVipDhcpAllocationDisable
|
|
|
18
19
|
const isSDNSelectable = react_1.default.useMemo(() => (0, common_1.canSelectNetworkTypeSDN)(!isMultiNodeCluster, isDualStack), [isMultiNodeCluster, isDualStack]);
|
|
19
20
|
const [isAdvanced, setAdvanced] = react_1.default.useState(isDualStack || (0, common_1.isAdvNetworkConf)(cluster, defaultNetworkSettings));
|
|
20
21
|
const toggleAdvConfiguration = (0, react_1.useCallback)((checked) => {
|
|
22
|
+
var _a, _b;
|
|
21
23
|
setAdvanced(checked);
|
|
22
24
|
if (!checked) {
|
|
23
|
-
|
|
24
|
-
|
|
25
|
+
const primaryCidr = (_b = (_a = values.machineNetworks) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.cidr;
|
|
26
|
+
const useIPv6Defaults = primaryCidr && is_cidr_1.default.v6(primaryCidr);
|
|
27
|
+
setFieldValue('clusterNetworks', useIPv6Defaults
|
|
28
|
+
? defaultNetworkSettings.clusterNetworksIpv6
|
|
29
|
+
: defaultNetworkSettings.clusterNetworksIpv4);
|
|
30
|
+
setFieldValue('serviceNetworks', useIPv6Defaults
|
|
31
|
+
? defaultNetworkSettings.serviceNetworksIpv6
|
|
32
|
+
: defaultNetworkSettings.serviceNetworksIpv4);
|
|
25
33
|
}
|
|
26
|
-
}, [setFieldValue, defaultNetworkSettings]);
|
|
34
|
+
}, [setFieldValue, defaultNetworkSettings, values.machineNetworks]);
|
|
27
35
|
// Auto-enable advanced networking when switching to dual-stack
|
|
28
36
|
(0, react_1.useEffect)(() => {
|
|
29
37
|
if (isDualStack) {
|
|
30
38
|
toggleAdvConfiguration(true);
|
|
31
39
|
}
|
|
32
40
|
}, [isDualStack, toggleAdvConfiguration]);
|
|
41
|
+
// Sync cluster/service networks to match primary machine network family when single-stack (fix mismatch)
|
|
42
|
+
(0, react_1.useEffect)(() => {
|
|
43
|
+
var _a, _b, _c, _d;
|
|
44
|
+
if (isDualStack) {
|
|
45
|
+
return;
|
|
46
|
+
}
|
|
47
|
+
const primaryCidr = (_b = (_a = values.machineNetworks) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.cidr;
|
|
48
|
+
const firstClusterCidr = (_d = (_c = values.clusterNetworks) === null || _c === void 0 ? void 0 : _c[0]) === null || _d === void 0 ? void 0 : _d.cidr;
|
|
49
|
+
if (!primaryCidr || !firstClusterCidr) {
|
|
50
|
+
return;
|
|
51
|
+
}
|
|
52
|
+
const primaryIsIPv6 = is_cidr_1.default.v6(primaryCidr);
|
|
53
|
+
const primaryIsIPv4 = is_cidr_1.default.v4(primaryCidr);
|
|
54
|
+
const clusterIsIPv6 = is_cidr_1.default.v6(firstClusterCidr);
|
|
55
|
+
const clusterIsIPv4 = is_cidr_1.default.v4(firstClusterCidr);
|
|
56
|
+
if (primaryIsIPv4 && clusterIsIPv6) {
|
|
57
|
+
setFieldValue('clusterNetworks', defaultNetworkSettings.clusterNetworksIpv4);
|
|
58
|
+
setFieldValue('serviceNetworks', defaultNetworkSettings.serviceNetworksIpv4);
|
|
59
|
+
}
|
|
60
|
+
else if (primaryIsIPv6 && clusterIsIPv4) {
|
|
61
|
+
setFieldValue('clusterNetworks', defaultNetworkSettings.clusterNetworksIpv6);
|
|
62
|
+
setFieldValue('serviceNetworks', defaultNetworkSettings.serviceNetworksIpv6);
|
|
63
|
+
}
|
|
64
|
+
}, [
|
|
65
|
+
isDualStack,
|
|
66
|
+
values.machineNetworks,
|
|
67
|
+
values.clusterNetworks,
|
|
68
|
+
values.serviceNetworks,
|
|
69
|
+
setFieldValue,
|
|
70
|
+
defaultNetworkSettings,
|
|
71
|
+
]);
|
|
33
72
|
const isUserManagedNetworking = values.managedNetworkingType === 'userManaged';
|
|
34
73
|
const primaryMachineNetwork = (_b = (_a = values.machineNetworks) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.cidr;
|
|
35
74
|
// Clear machine networks when switching to user-managed networking for multi-node clusters
|
|
@@ -72,9 +111,9 @@ const NetworkConfiguration = ({ cluster, hostSubnets, isVipDhcpAllocationDisable
|
|
|
72
111
|
return (react_1.default.createElement(react_core_1.Grid, { hasGutter: true },
|
|
73
112
|
!hideManagedNetworking && react_1.default.createElement(networkingSteps_1.ManagedNetworkingControlGroup, null),
|
|
74
113
|
isUserManagedNetworking && (react_1.default.createElement(networkingSteps_1.UserManagedNetworkingTextContent, { shouldDisplayLoadBalancersBullet: isMultiNodeCluster, docVersion: cluster.openshiftVersion })),
|
|
75
|
-
(!isMultiNodeCluster || !isUserManagedNetworking) && (react_1.default.createElement(networkingSteps_1.StackTypeControlGroup, { clusterId: cluster.id, isDualStackSelectable: isDualStackSelectable, hostSubnets: hostSubnets, defaultNetworkValues: defaultNetworkSettings })),
|
|
114
|
+
(!isMultiNodeCluster || !isUserManagedNetworking) && (react_1.default.createElement(networkingSteps_1.StackTypeControlGroup, { clusterId: cluster.id, isDualStackSelectable: isDualStackSelectable, hostSubnets: hostSubnets, defaultNetworkValues: defaultNetworkSettings, allowSingleStackIPv6: true })),
|
|
76
115
|
react_1.default.createElement(NetworkTypeControlGroup_1.NetworkTypeControlGroup, { isSDNSelectable: isSDNSelectable }),
|
|
77
|
-
!(isMultiNodeCluster && isUserManagedNetworking) && (react_1.default.createElement(networkingSteps_1.AvailableSubnetsControl, { clusterId: cluster.id, hostSubnets: hostSubnets, isRequired: !isUserManagedNetworking, isDisabled: hostSubnets.length === 0, openshiftVersion: cluster.openshiftVersion, hosts: cluster.hosts || [], isMultiNodeCluster: isMultiNodeCluster })),
|
|
116
|
+
!(isMultiNodeCluster && isUserManagedNetworking) && (react_1.default.createElement(networkingSteps_1.AvailableSubnetsControl, { clusterId: cluster.id, hostSubnets: hostSubnets, isRequired: !isUserManagedNetworking, isDisabled: hostSubnets.length === 0, openshiftVersion: cluster.openshiftVersion, hosts: cluster.hosts || [], isMultiNodeCluster: isMultiNodeCluster, allowSingleStackIPv6: true })),
|
|
78
117
|
!isUserManagedNetworking && (react_1.default.createElement(networkingSteps_1.VirtualIPControlGroup, { cluster: cluster, hostSubnets: hostSubnets, isVipDhcpAllocationDisabled: isVipDhcpAllocationDisabled })),
|
|
79
118
|
react_1.default.createElement(react_core_1.Checkbox, { id: "useAdvancedNetworking", label: t('ai:Use advanced networking'), description: t('ai:Configure advanced networking properties (e.g. CIDR ranges).'), isChecked: isAdvanced, onChange: (_event, checked) => toggleAdvConfiguration(checked), isDisabled: isDualStack, body: isAdvanced && react_1.default.createElement(networkingSteps_1.AdvancedNetworkFields, null) })));
|
|
80
119
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NetworkConfiguration.js","sourceRoot":"","sources":["../../../../../lib/cim/components/ClusterDeployment/NetworkConfiguration.tsx"],"names":[],"mappings":";;;AAAA,uDAAsD;AACtD,mCAA0C;AAC1C,uDAAwD;AAExD,8FAQkE;AAClE,4CAOyB;AACzB,2FAA+E;AAC/E,8HAA2H;
|
|
1
|
+
{"version":3,"file":"NetworkConfiguration.js","sourceRoot":"","sources":["../../../../../lib/cim/components/ClusterDeployment/NetworkConfiguration.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,23 +1,39 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getNetworkInitialValues = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const is_cidr_1 = tslib_1.__importDefault(require("is-cidr"));
|
|
4
6
|
const utils_1 = require("../../../common/components/clusterConfiguration/utils");
|
|
5
|
-
const
|
|
7
|
+
const common_1 = require("../../../common");
|
|
6
8
|
const getNetworkInitialValues = (cluster, defaultNetworkSettings) => {
|
|
7
|
-
var _a;
|
|
9
|
+
var _a, _b, _c;
|
|
8
10
|
const managedNetworkingType = cluster.userManagedNetworking ? 'userManaged' : 'clusterManaged';
|
|
9
11
|
const isDualStackCluster = (0, utils_1.isDualStack)(cluster);
|
|
12
|
+
const primaryMachineCidr = (_b = (_a = cluster.machineNetworks) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.cidr;
|
|
13
|
+
const isSingleStackIPv6 = !isDualStackCluster && primaryMachineCidr && is_cidr_1.default.v6(primaryMachineCidr);
|
|
10
14
|
let clusterNetworks = cluster.clusterNetworks;
|
|
11
|
-
if (!((
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
+
if (!((_c = cluster.clusterNetworks) === null || _c === void 0 ? void 0 : _c.length)) {
|
|
16
|
+
if (isDualStackCluster) {
|
|
17
|
+
clusterNetworks = defaultNetworkSettings.clusterNetworksDualstack;
|
|
18
|
+
}
|
|
19
|
+
else if (isSingleStackIPv6) {
|
|
20
|
+
clusterNetworks = defaultNetworkSettings.clusterNetworksIpv6;
|
|
21
|
+
}
|
|
22
|
+
else {
|
|
23
|
+
clusterNetworks = defaultNetworkSettings.clusterNetworksIpv4;
|
|
24
|
+
}
|
|
15
25
|
}
|
|
16
26
|
let serviceNetworks = cluster.serviceNetworks;
|
|
17
27
|
if (!(serviceNetworks === null || serviceNetworks === void 0 ? void 0 : serviceNetworks.length)) {
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
28
|
+
if (isDualStackCluster) {
|
|
29
|
+
serviceNetworks = defaultNetworkSettings.serviceNetworksDualstack;
|
|
30
|
+
}
|
|
31
|
+
else if (isSingleStackIPv6) {
|
|
32
|
+
serviceNetworks = defaultNetworkSettings.serviceNetworksIpv6;
|
|
33
|
+
}
|
|
34
|
+
else {
|
|
35
|
+
serviceNetworks = defaultNetworkSettings.serviceNetworksIpv4;
|
|
36
|
+
}
|
|
21
37
|
}
|
|
22
38
|
const machineNetworks = cluster.machineNetworks || [];
|
|
23
39
|
return {
|
|
@@ -29,8 +45,8 @@ const getNetworkInitialValues = (cluster, defaultNetworkSettings) => {
|
|
|
29
45
|
sshPublicKey: cluster.sshPublicKey || '',
|
|
30
46
|
vipDhcpAllocation: cluster.vipDhcpAllocation,
|
|
31
47
|
managedNetworkingType,
|
|
32
|
-
networkType: cluster.networkType ||
|
|
33
|
-
stackType: isDualStackCluster ?
|
|
48
|
+
networkType: cluster.networkType || common_1.NETWORK_TYPE_OVN,
|
|
49
|
+
stackType: isDualStackCluster ? common_1.DUAL_STACK : common_1.SINGLE_STACK,
|
|
34
50
|
};
|
|
35
51
|
};
|
|
36
52
|
exports.getNetworkInitialValues = getNetworkInitialValues;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"networkConfigurationValidation.js","sourceRoot":"","sources":["../../../../../lib/cim/components/ClusterDeployment/networkConfigurationValidation.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"networkConfigurationValidation.js","sourceRoot":"","sources":["../../../../../lib/cim/components/ClusterDeployment/networkConfigurationValidation.ts"],"names":[],"mappings":";;;;AAAA,8DAA6B;AAM7B,iFAAoF;AACpF,4CAA6E;AAEtE,MAAM,uBAAuB,GAAG,CACrC,OAAgB,EAChB,sBAQC,EAC2B,EAAE;;IAC9B,MAAM,qBAAqB,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,gBAAgB,CAAC;IAC/F,MAAM,kBAAkB,GAAG,IAAA,mBAAW,EAAC,OAAO,CAAC,CAAC;IAChD,MAAM,kBAAkB,GAAG,MAAA,MAAA,OAAO,CAAC,eAAe,0CAAG,CAAC,CAAC,0CAAE,IAAI,CAAC;IAC9D,MAAM,iBAAiB,GACrB,CAAC,kBAAkB,IAAI,kBAAkB,IAAI,iBAAM,CAAC,EAAE,CAAC,kBAAkB,CAAC,CAAC;IAE7E,IAAI,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC;IAC9C,IAAI,CAAC,CAAA,MAAA,OAAO,CAAC,eAAe,0CAAE,MAAM,CAAA,EAAE;QACpC,IAAI,kBAAkB,EAAE;YACtB,eAAe,GAAG,sBAAsB,CAAC,wBAAwB,CAAC;SACnE;aAAM,IAAI,iBAAiB,EAAE;YAC5B,eAAe,GAAG,sBAAsB,CAAC,mBAAmB,CAAC;SAC9D;aAAM;YACL,eAAe,GAAG,sBAAsB,CAAC,mBAAmB,CAAC;SAC9D;KACF;IAED,IAAI,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC;IAC9C,IAAI,CAAC,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,MAAM,CAAA,EAAE;QAC5B,IAAI,kBAAkB,EAAE;YACtB,eAAe,GAAG,sBAAsB,CAAC,wBAAwB,CAAC;SACnE;aAAM,IAAI,iBAAiB,EAAE;YAC5B,eAAe,GAAG,sBAAsB,CAAC,mBAAmB,CAAC;SAC9D;aAAM;YACL,eAAe,GAAG,sBAAsB,CAAC,mBAAmB,CAAC;SAC9D;KACF;IAED,MAAM,eAAe,GAAG,OAAO,CAAC,eAAe,IAAI,EAAE,CAAC;IAEtD,OAAO;QACL,eAAe;QACf,eAAe;QACf,eAAe;QACf,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;QACrB,WAAW,EAAE,OAAO,CAAC,WAAW,IAAI,yBAAgB;QACpD,SAAS,EAAE,kBAAkB,CAAC,CAAC,CAAC,mBAAU,CAAC,CAAC,CAAC,qBAAY;KAC1D,CAAC;AACJ,CAAC,CAAC;AAtDW,QAAA,uBAAuB,2BAsDlC"}
|
|
@@ -23,24 +23,19 @@ const getInfraEnvProxy = (infraEnvs) => {
|
|
|
23
23
|
}),
|
|
24
24
|
};
|
|
25
25
|
};
|
|
26
|
-
const getNetworkConfigurationValidationSchema = (initialValues, hostSubnets, t, openshiftVersion) => Yup.lazy((values) =>
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
sshPublicKey: (0, common_2.sshPublicKeyListValidationSchema)(t),
|
|
40
|
-
httpProxy: (0, common_2.httpProxyValidationSchema)({ values, pairValueName: 'httpsProxy', t }),
|
|
41
|
-
httpsProxy: (0, common_2.httpProxyValidationSchema)({ values, pairValueName: 'httpProxy', t }),
|
|
42
|
-
noProxy: (0, common_2.noProxyValidationSchema)(t),
|
|
43
|
-
}));
|
|
26
|
+
const getNetworkConfigurationValidationSchema = (initialValues, hostSubnets, t, openshiftVersion) => Yup.lazy((values) => {
|
|
27
|
+
var _a, _b, _c, _d, _e, _f;
|
|
28
|
+
return Yup.object().shape({
|
|
29
|
+
clusterNetworks: (0, common_2.clusterNetworksSchema)(t, (_a = values.stackType) !== null && _a !== void 0 ? _a : '', (_c = (_b = values.machineNetworks) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.cidr, openshiftVersion),
|
|
30
|
+
serviceNetworks: (0, common_2.serviceNetworksSchema)(t, (_d = values.stackType) !== null && _d !== void 0 ? _d : '', (_f = (_e = values.machineNetworks) === null || _e === void 0 ? void 0 : _e[0]) === null || _f === void 0 ? void 0 : _f.cidr, openshiftVersion),
|
|
31
|
+
apiVips: (0, common_2.vipArrayValidationSchema)(hostSubnets, values, t),
|
|
32
|
+
ingressVips: (0, common_2.vipArrayValidationSchema)(hostSubnets, values, t),
|
|
33
|
+
sshPublicKey: (0, common_2.sshPublicKeyListValidationSchema)(t),
|
|
34
|
+
httpProxy: (0, common_2.httpProxyValidationSchema)({ values, pairValueName: 'httpsProxy', t }),
|
|
35
|
+
httpsProxy: (0, common_2.httpProxyValidationSchema)({ values, pairValueName: 'httpProxy', t }),
|
|
36
|
+
noProxy: (0, common_2.noProxyValidationSchema)(t),
|
|
37
|
+
});
|
|
38
|
+
});
|
|
44
39
|
const useNetworkingFormik = ({ clusterDeployment, agentClusterInstall, agents, }) => {
|
|
45
40
|
const { t } = (0, use_translation_wrapper_1.useTranslation)();
|
|
46
41
|
const initialValues = react_1.default.useMemo(() => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-networking-formik.js","sourceRoot":"","sources":["../../../../../lib/cim/components/ClusterDeployment/use-networking-formik.ts"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,iDAA2B;AAG3B,sCAA4D;AAC5D,iFAAuF;AACvF,qFAA2E;AAO3E,wCAA0C;AAC1C,iDAA8D;AAC9D,
|
|
1
|
+
{"version":3,"file":"use-networking-formik.js","sourceRoot":"","sources":["../../../../../lib/cim/components/ClusterDeployment/use-networking-formik.ts"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,iDAA2B;AAG3B,sCAA4D;AAC5D,iFAAuF;AACvF,qFAA2E;AAO3E,wCAA0C;AAC1C,iDAA8D;AAC9D,4CASyB;AAEzB,2FAA+E;AAE/E,MAAM,gBAAgB,GAAG,CAAC,SAAgC,EAAE,EAAE;IAC5D,MAAM,iBAAiB,GAAG,SAAS,CAAC,IAAI,CACtC,CAAC,EAAE,EAAE,EAAE,+BAAC,OAAA,CAAA,MAAA,MAAA,EAAE,CAAC,IAAI,0CAAE,KAAK,0CAAE,SAAS,MAAI,MAAA,MAAA,EAAE,CAAC,IAAI,0CAAE,KAAK,0CAAE,UAAU,CAAA,KAAI,MAAA,MAAA,EAAE,CAAC,IAAI,0CAAE,KAAK,0CAAE,OAAO,CAAA,CAAA,EAAA,CAC3F,CAAC;IACF,OAAO;QACL,iBAAiB;QACjB,WAAW,EAAE,SAAS,CAAC,KAAK,CAC1B,CAAC,EAAE,EAAE,EAAE;;YACL,OAAA,CAAA,MAAA,MAAA,EAAE,CAAC,IAAI,0CAAE,KAAK,0CAAE,SAAS,OAAK,MAAA,MAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,IAAI,0CAAE,KAAK,0CAAE,SAAS,CAAA;gBACvE,CAAA,MAAA,MAAA,EAAE,CAAC,IAAI,0CAAE,KAAK,0CAAE,UAAU,OAAK,MAAA,MAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,IAAI,0CAAE,KAAK,0CAAE,UAAU,CAAA;gBACzE,CAAA,MAAA,MAAA,EAAE,CAAC,IAAI,0CAAE,KAAK,0CAAE,OAAO,OAAK,MAAA,MAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,IAAI,0CAAE,KAAK,0CAAE,OAAO,CAAA,CAAA;SAAA,CACtE;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,uCAAuC,GAAG,CAC9C,aAAgD,EAChD,WAAwB,EACxB,CAAY,EACZ,gBAAyB,EACzB,EAAE,CACF,GAAG,CAAC,IAAI,CAAC,CAAC,MAAyC,EAAE,EAAE;;IACrD,OAAA,GAAG,CAAC,MAAM,EAAqC,CAAC,KAAK,CAAC;QACpD,eAAe,EAAE,IAAA,8BAAqB,EACpC,CAAC,EACD,MAAA,MAAM,CAAC,SAAS,mCAAI,EAAE,EACtB,MAAA,MAAA,MAAM,CAAC,eAAe,0CAAG,CAAC,CAAC,0CAAE,IAAI,EACjC,gBAAgB,CACjB;QACD,eAAe,EAAE,IAAA,8BAAqB,EACpC,CAAC,EACD,MAAA,MAAM,CAAC,SAAS,mCAAI,EAAE,EACtB,MAAA,MAAA,MAAM,CAAC,eAAe,0CAAG,CAAC,CAAC,0CAAE,IAAI,EACjC,gBAAgB,CACjB;QACD,OAAO,EAAE,IAAA,iCAAwB,EAAC,WAAW,EAAE,MAAM,EAAE,CAAC,CAAC;QACzD,WAAW,EAAE,IAAA,iCAAwB,EAAC,WAAW,EAAE,MAAM,EAAE,CAAC,CAAC;QAC7D,YAAY,EAAE,IAAA,yCAAgC,EAAC,CAAC,CAAC;QACjD,SAAS,EAAE,IAAA,kCAAyB,EAAC,EAAE,MAAM,EAAE,aAAa,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC;QAChF,UAAU,EAAE,IAAA,kCAAyB,EAAC,EAAE,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,CAAC,EAAE,CAAC;QAChF,OAAO,EAAE,IAAA,gCAAuB,EAAC,CAAC,CAAC;KACpC,CAAC,CAAA;CAAA,CACH,CAAC;AAQG,MAAM,mBAAmB,GAAG,CAAC,EAClC,iBAAiB,EACjB,mBAAmB,EACnB,MAAM,GACkB,EAAE,EAAE;IAC5B,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,wCAAc,GAAE,CAAC;IAC/B,MAAM,aAAa,GAAG,eAAK,CAAC,OAAO,CACjC,GAAG,EAAE;QACH,MAAM,OAAO,GAAG,IAAA,sBAAY,EAAC;YAC3B,iBAAiB;YACjB,mBAAmB;YACnB,MAAM;SACP,CAAC,CAAC;QACH,uCACK,IAAA,wDAAuB,EAAC,OAAO,EAAE,yCAAgC,CAAC,KACrE,WAAW,EAAE,KAAK,EAClB,SAAS,EAAE,KAAK,IAChB;IACJ,CAAC,EACD,EAAE,CACH,CAAC;IACF,MAAM,gBAAgB,GAAG,eAAK,CAAC,OAAO,CAAC,GAAG,EAAE;QAC1C,MAAM,OAAO,GAAG,IAAA,sBAAY,EAAC;YAC3B,iBAAiB;YACjB,mBAAmB;YACnB,MAAM;SACP,CAAC,CAAC;QACH,MAAM,WAAW,GAAG,IAAA,sBAAc,EAAC,OAAO,CAAC,CAAC;QAC5C,OAAO,uCAAuC,CAC5C,aAAa,EACb,WAAW,EACX,CAAC,EACD,OAAO,CAAC,gBAAgB,CACzB,CAAC;IACJ,CAAC,EAAE,CAAC,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,EAAE,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC;IAEvE,OAAO;QACL,aAAa;QACb,gBAAgB;KACjB,CAAC;AACJ,CAAC,CAAC;AAxCW,QAAA,mBAAmB,uBAwC9B;AAOK,MAAM,kBAAkB,GAAG,CAAC,EAAE,MAAM,EAAE,aAAa,EAA0B,EAAE,EAAE;IACtF,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,eAAK,CAAC,QAAQ,EAAyB,CAAC;IAC1E,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,GAAG,eAAK,CAAC,QAAQ,EAAU,CAAC;IACrE,MAAM,EAAE,iBAAiB,EAAE,WAAW,EAAE,GAAG,gBAAgB,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;IAE7E,MAAM,iBAAiB,GAAG,MAAM;SAC7B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;;QAAC,OAAA,CAAC;YACX,IAAI,EAAE,MAAA,MAAA,CAAC,CAAC,QAAQ,0CAAE,MAAM,0CAAG,wCAA+B,CAAC;YAC3D,SAAS,EAAE,MAAA,CAAC,CAAC,QAAQ,0CAAE,SAAS;SACjC,CAAC,CAAA;KAAA,CAAC;SACF,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC,SAAS,CAAC;SACvC,IAAI,EAA2C,CAAC;IAEnD,MAAM,aAAa,GAAG,IAAA,6BAAqB,EAAC,iBAAiB,CAAC,CAAC;IAC/D,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,wCAAc,GAAE,CAAC;IAC/B,eAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,MAAM,KAAK,GAAG,GAAS,EAAE;YACvB,YAAY,CAAC,SAAS,CAAC,CAAC;YACxB,iBAAiB,CAAC,SAAS,CAAC,CAAC;YAC7B,MAAM,gBAAgB,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,aAAa,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;YACzF,IAAI;gBACF,MAAM,eAAe,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;gBAC5D,YAAY,CAAC,eAAe,CAAC,CAAC;aAC/B;YAAC,OAAO,CAAC,EAAE;gBACV,MAAM,KAAK,GAAG,CAAU,CAAC;gBACzB,iBAAiB,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,CAAC,uCAAuC,CAAC,CAAC,CAAC;aAChF;QACH,CAAC,CAAA,CAAC;QAEF,KAAK,KAAK,EAAE,CAAC;IACf,CAAC,EAAE,CAAC,aAAa,EAAE,aAAa,EAAE,YAAY,EAAE,iBAAiB,EAAE,CAAC,CAAC,CAAC,CAAC;IAEvE,OAAO;QACL,iBAAiB;QACjB,WAAW;QACX,cAAc;QACd,gBAAgB,EAAE,CAAC,SAAS;KAC7B,CAAC;AACJ,CAAC,CAAC;AAtCW,QAAA,kBAAkB,sBAsC7B"}
|
package/build/cjs/common/components/clusterWizard/networkingSteps/AvailableSubnetsControl.js
CHANGED
|
@@ -24,7 +24,7 @@ const useAutoSelectDefaultMachineNetworks = (autoSelectNetwork, setFieldValue, c
|
|
|
24
24
|
}
|
|
25
25
|
}, [autoSelectNetwork, cidrV4, cidrV6, clusterId, isDualStack, setFieldValue]);
|
|
26
26
|
};
|
|
27
|
-
const AvailableSubnetsControl = ({ clusterId, hostSubnets, isRequired = false, isDisabled, openshiftVersion, isViewerMode = false, hosts, isMultiNodeCluster = true, }) => {
|
|
27
|
+
const AvailableSubnetsControl = ({ clusterId, hostSubnets, isRequired = false, isDisabled, openshiftVersion, isViewerMode = false, hosts, isMultiNodeCluster = true, allowSingleStackIPv6 = false, }) => {
|
|
28
28
|
var _a, _b, _c;
|
|
29
29
|
const { t } = (0, use_translation_wrapper_1.useTranslation)();
|
|
30
30
|
const { values, errors, setFieldValue } = (0, formik_1.useFormikContext)();
|
|
@@ -104,7 +104,13 @@ const AvailableSubnetsControl = ({ clusterId, hostSubnets, isRequired = false, i
|
|
|
104
104
|
const excludedHostsAlert = getExcludedHostsAlert(primaryNetworkCidr);
|
|
105
105
|
const showSecondaryMachineNetwork = isDualStack && values.machineNetworks && values.machineNetworks.length > 1;
|
|
106
106
|
// Determine available subnets for primary dropdown
|
|
107
|
-
|
|
107
|
+
let primaryMachineSubnets;
|
|
108
|
+
if ((isDualStack && supportsIPv6Primary) || (!isDualStack && allowSingleStackIPv6)) {
|
|
109
|
+
primaryMachineSubnets = allSubnets;
|
|
110
|
+
}
|
|
111
|
+
else {
|
|
112
|
+
primaryMachineSubnets = IPv4Subnets;
|
|
113
|
+
}
|
|
108
114
|
// Determine available subnets for secondary dropdown
|
|
109
115
|
const secondaryMachineSubnets = react_1.default.useMemo(() => {
|
|
110
116
|
if (supportsIPv6Primary) {
|
package/build/cjs/common/components/clusterWizard/networkingSteps/AvailableSubnetsControl.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AvailableSubnetsControl.js","sourceRoot":"","sources":["../../../../../../lib/common/components/clusterWizard/networkingSteps/AvailableSubnetsControl.tsx"],"names":[],"mappings":";;;;AAAA,uDAAyC;AACzC,uDAQgC;AAChC,mCAAqE;AACrE,2CAAgD;AAGhD,4CAA4D;AAC5D,0CAAmE;AACnE,oFAAwE;AACxE,uDAAoD;AACpD,uDAA8D;AAO9D,MAAM,UAAU,GAAG,CAAC,IAAgB,EAAE,IAAgB,EAAE,EAAE,CACxD,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;AAE/C,MAAM,mCAAmC,GAAG,CAC1C,iBAA0B,EAC1B,aAAyE,EACzE,MAA8B,EAC9B,MAA8B,EAC9B,SAAiB,EACjB,WAAoB,EACpB,EAAE;IACF,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,iBAAiB,EAAE;YACrB,aAAa,CACX,iBAAiB,EACjB,WAAW;gBACT,CAAC,CAAC;oBACE,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE;oBAC3B,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE;iBAC5B;gBACH,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,EACjC,KAAK,CACN,CAAC;SACH;IACH,CAAC,EAAE,CAAC,iBAAiB,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC;AACjF,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"AvailableSubnetsControl.js","sourceRoot":"","sources":["../../../../../../lib/common/components/clusterWizard/networkingSteps/AvailableSubnetsControl.tsx"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ const ui_1 = require("../../ui");
|
|
|
10
10
|
const config_1 = require("../../../config");
|
|
11
11
|
const formik_2 = require("../../ui/formik");
|
|
12
12
|
const ui_2 = require("../../ui");
|
|
13
|
+
const use_translation_wrapper_1 = require("../../../hooks/use-translation-wrapper");
|
|
13
14
|
const reorderNetworks_1 = require("./reorderNetworks");
|
|
14
15
|
const hasDualStackConfigurationChanged = (clusterNetworks, serviceNetworks, cidrIPv6, values) => {
|
|
15
16
|
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
|
|
@@ -23,16 +24,18 @@ const hasDualStackConfigurationChanged = (clusterNetworks, serviceNetworks, cidr
|
|
|
23
24
|
((_j = (_h = values.apiVips) === null || _h === void 0 ? void 0 : _h[1]) === null || _j === void 0 ? void 0 : _j.ip) ||
|
|
24
25
|
((_l = (_k = values.ingressVips) === null || _k === void 0 ? void 0 : _k[1]) === null || _l === void 0 ? void 0 : _l.ip));
|
|
25
26
|
};
|
|
26
|
-
const StackTypeControlGroup = ({ clusterId, isDualStackSelectable, hostSubnets, defaultNetworkValues, isViewerMode = false, }) => {
|
|
27
|
+
const StackTypeControlGroup = ({ clusterId, isDualStackSelectable, hostSubnets, defaultNetworkValues, isViewerMode = false, allowSingleStackIPv6 = false, }) => {
|
|
27
28
|
var _a, _b;
|
|
29
|
+
const { t } = (0, use_translation_wrapper_1.useTranslation)();
|
|
28
30
|
const { setFieldValue, values, validateForm } = (0, formik_1.useFormikContext)();
|
|
29
31
|
const [openConfirmModal, setConfirmModal] = react_1.default.useState(false);
|
|
32
|
+
const singleStackLabel = allowSingleStackIPv6 ? t('ai:Single stack') : t('ai:IPv4');
|
|
30
33
|
const IPv6Subnets = hostSubnets.filter((subnet) => ip_address_1.Address6.isValid(subnet.subnet));
|
|
31
34
|
const cidrIPv6 = IPv6Subnets.length >= 1 ? IPv6Subnets[0].subnet : config_1.NO_SUBNET_SET;
|
|
32
35
|
const shouldSetSingleStack = !isViewerMode && !isDualStackSelectable && values.stackType === config_1.DUAL_STACK;
|
|
33
36
|
const setSingleStack = react_1.default.useCallback(() => {
|
|
34
37
|
var _a, _b;
|
|
35
|
-
setFieldValue('stackType', config_1.
|
|
38
|
+
setFieldValue('stackType', config_1.SINGLE_STACK);
|
|
36
39
|
// Determine whether the first machine network is IPv4
|
|
37
40
|
const firstNetwork = (_a = values.machineNetworks) === null || _a === void 0 ? void 0 : _a[0];
|
|
38
41
|
const isFirstIPv4 = Boolean((firstNetwork === null || firstNetwork === void 0 ? void 0 : firstNetwork.cidr) && ip_address_1.Address4.isValid(firstNetwork.cidr));
|
|
@@ -54,7 +57,7 @@ const StackTypeControlGroup = ({ clusterId, isDualStackSelectable, hostSubnets,
|
|
|
54
57
|
}
|
|
55
58
|
}
|
|
56
59
|
}
|
|
57
|
-
//
|
|
60
|
+
// Set cluster/service to IPv4 defaults when switching to single-stack
|
|
58
61
|
if (values.clusterNetworks && values.clusterNetworks.length >= 1) {
|
|
59
62
|
const defaultCluster = defaultNetworkValues.clusterNetworksIpv4 && defaultNetworkValues.clusterNetworksIpv4[0];
|
|
60
63
|
const firstCluster = values.clusterNetworks[0];
|
|
@@ -115,7 +118,7 @@ const StackTypeControlGroup = ({ clusterId, isDualStackSelectable, hostSubnets,
|
|
|
115
118
|
values.vipDhcpAllocation,
|
|
116
119
|
]);
|
|
117
120
|
const setDualStack = () => {
|
|
118
|
-
var _a, _b, _c, _d, _e;
|
|
121
|
+
var _a, _b, _c, _d, _e, _f, _g;
|
|
119
122
|
setFieldValue('stackType', config_1.DUAL_STACK);
|
|
120
123
|
setFieldValue('vipDhcpAllocation', false);
|
|
121
124
|
if (values.networkType === config_1.NETWORK_TYPE_SDN) {
|
|
@@ -140,20 +143,25 @@ const StackTypeControlGroup = ({ clusterId, isDualStackSelectable, hostSubnets,
|
|
|
140
143
|
}
|
|
141
144
|
}
|
|
142
145
|
if (values.clusterNetworks && ((_b = values.clusterNetworks) === null || _b === void 0 ? void 0 : _b.length) < 2) {
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
146
|
+
const firstClusterCidr = (_c = values.clusterNetworks[0]) === null || _c === void 0 ? void 0 : _c.cidr;
|
|
147
|
+
const isPrimaryIPv6 = firstClusterCidr && ip_address_1.Address6.isValid(firstClusterCidr);
|
|
148
|
+
const missingFamilyNetworkDefault = (_d = defaultNetworkValues.clusterNetworksDualstack) === null || _d === void 0 ? void 0 : _d[isPrimaryIPv6 ? 0 : 1];
|
|
149
|
+
const secondClusterNetwork = missingFamilyNetworkDefault !== null && missingFamilyNetworkDefault !== void 0 ? missingFamilyNetworkDefault : {
|
|
150
|
+
cidr: '',
|
|
151
|
+
hostPrefix: '',
|
|
152
|
+
clusterId: clusterId,
|
|
153
|
+
};
|
|
154
|
+
setFieldValue('clusterNetworks', [...values.clusterNetworks, secondClusterNetwork], false);
|
|
149
155
|
}
|
|
150
|
-
if (values.serviceNetworks && ((
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
156
|
+
if (values.serviceNetworks && ((_e = values.serviceNetworks) === null || _e === void 0 ? void 0 : _e.length) < 2) {
|
|
157
|
+
const firstServiceCidr = (_f = values.serviceNetworks[0]) === null || _f === void 0 ? void 0 : _f.cidr;
|
|
158
|
+
const isPrimaryIPv6 = firstServiceCidr && ip_address_1.Address6.isValid(firstServiceCidr);
|
|
159
|
+
const missingFamilyNetworkDefault = (_g = defaultNetworkValues.serviceNetworksDualstack) === null || _g === void 0 ? void 0 : _g[isPrimaryIPv6 ? 0 : 1];
|
|
160
|
+
const secondServiceNetwork = missingFamilyNetworkDefault !== null && missingFamilyNetworkDefault !== void 0 ? missingFamilyNetworkDefault : {
|
|
161
|
+
cidr: '',
|
|
162
|
+
clusterId: clusterId,
|
|
163
|
+
};
|
|
164
|
+
setFieldValue('serviceNetworks', [...values.serviceNetworks, secondServiceNetwork], false);
|
|
157
165
|
}
|
|
158
166
|
// Initialize VIPs for dual-stack
|
|
159
167
|
if (values.apiVips && values.apiVips.length < 2) {
|
|
@@ -202,9 +210,11 @@ const StackTypeControlGroup = ({ clusterId, isDualStackSelectable, hostSubnets,
|
|
|
202
210
|
react_1.default.createElement(react_core_1.FormGroup, { label: "Networking stack type", fieldId: (0, ui_1.getFieldId)('stackType', 'radio'), onChange: setStackType, isInline: true },
|
|
203
211
|
react_1.default.createElement(react_core_1.Split, null,
|
|
204
212
|
react_1.default.createElement(react_core_1.SplitItem, null,
|
|
205
|
-
react_1.default.createElement(formik_2.RadioField, { name: 'stackType', value: config_1.
|
|
213
|
+
react_1.default.createElement(formik_2.RadioField, { name: 'stackType', value: config_1.SINGLE_STACK, isDisabled: !isDualStackSelectable || isViewerMode, label: `${singleStackLabel}\u00A0` })),
|
|
206
214
|
react_1.default.createElement(react_core_1.SplitItem, null,
|
|
207
|
-
react_1.default.createElement(ui_2.PopoverIcon, { bodyContent:
|
|
215
|
+
react_1.default.createElement(ui_2.PopoverIcon, { bodyContent: allowSingleStackIPv6
|
|
216
|
+
? t('ai:Select a single address family (IPv4 or IPv6) for your machine network.')
|
|
217
|
+
: t('ai:Select this when your hosts are using only IPv4.'), buttonStyle: { top: '-4px' } }))),
|
|
208
218
|
react_1.default.createElement(react_core_1.Split, null,
|
|
209
219
|
react_1.default.createElement(react_core_1.SplitItem, null,
|
|
210
220
|
react_1.default.createElement(react_core_1.Tooltip, { content: 'Dual-stack is only available when your hosts are using IPV4 together with IPV6.', hidden: isDualStackSelectable },
|