@openshift-assisted/ui-lib 2.9.9-cim → 2.9.10-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/ScaleUpForm.d.ts +1 -0
- package/build/@types/cim/components/ClusterDeployment/ScaleUpForm.d.ts.map +1 -1
- package/build/@types/cim/components/InfraEnv/utils.d.ts.map +1 -1
- package/build/@types/cim/components/modals/ScaleUpModal.d.ts +1 -0
- package/build/@types/cim/components/modals/ScaleUpModal.d.ts.map +1 -1
- package/build/@types/cim/types/k8s/agent-cluster-install.d.ts +1 -1
- package/build/@types/cim/types/k8s/agent-cluster-install.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfigurationForm.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.d.ts +1 -1
- package/build/@types/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.d.ts.map +1 -1
- package/build/@types/ocm/services/ClusterDetailsService.d.ts.map +1 -1
- package/build/cjs/cim/components/ClusterDeployment/ScaleUpForm.js +7 -4
- package/build/cjs/cim/components/ClusterDeployment/ScaleUpForm.js.map +1 -1
- package/build/cjs/cim/components/InfraEnv/utils.js +6 -6
- package/build/cjs/cim/components/InfraEnv/utils.js.map +1 -1
- package/build/cjs/cim/components/modals/ScaleUpModal.js +2 -2
- package/build/cjs/cim/components/modals/ScaleUpModal.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfigurationForm.js +4 -1
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfigurationForm.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.js +5 -2
- package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.js.map +1 -1
- package/build/cjs/ocm/services/ClusterDetailsService.js +0 -3
- package/build/cjs/ocm/services/ClusterDetailsService.js.map +1 -1
- package/lib/cim/components/ClusterDeployment/ScaleUpForm.tsx +11 -5
- package/lib/cim/components/InfraEnv/utils.ts +7 -6
- package/lib/cim/components/modals/ScaleUpModal.tsx +3 -0
- package/lib/cim/types/k8s/agent-cluster-install.ts +4 -7
- package/lib/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfigurationForm.tsx +7 -2
- package/lib/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.ts +6 -1
- package/lib/ocm/services/ClusterDetailsService.ts +0 -4
- package/package.json +8 -4
|
@@ -5,6 +5,7 @@ type ScaleUpFormProps = {
|
|
|
5
5
|
agents: AgentK8sResource[];
|
|
6
6
|
onEditHost: AgentTableActions['onEditHost'];
|
|
7
7
|
onSetInstallationDiskId: AgentTableActions['onSetInstallationDiskId'];
|
|
8
|
+
isNutanix: boolean;
|
|
8
9
|
};
|
|
9
10
|
declare const ScaleUpForm: React.FC<ScaleUpFormProps>;
|
|
10
11
|
export default ScaleUpForm;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ScaleUpForm.d.ts","sourceRoot":"","sources":["../../../../../lib/cim/components/ClusterDeployment/ScaleUpForm.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAI1B,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAKzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAI/D,KAAK,gBAAgB,GAAG;IACtB,MAAM,EAAE,gBAAgB,EAAE,CAAC;IAC3B,UAAU,EAAE,iBAAiB,CAAC,YAAY,CAAC,CAAC;IAC5C,uBAAuB,EAAE,iBAAiB,CAAC,yBAAyB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"ScaleUpForm.d.ts","sourceRoot":"","sources":["../../../../../lib/cim/components/ClusterDeployment/ScaleUpForm.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAI1B,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAKzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAI/D,KAAK,gBAAgB,GAAG;IACtB,MAAM,EAAE,gBAAgB,EAAE,CAAC;IAC3B,UAAU,EAAE,iBAAiB,CAAC,YAAY,CAAC,CAAC;IAC5C,uBAAuB,EAAE,iBAAiB,CAAC,yBAAyB,CAAC,CAAC;IACtE,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,QAAA,MAAM,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,gBAAgB,CAsD3C,CAAC;AAEF,eAAe,WAAW,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../lib/cim/components/InfraEnv/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,8BAA8B,EAC9B,4BAA4B,EAC5B,mBAAmB,EACnB,iBAAiB,EAClB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,yBAAyB,EAAE,MAAM,oBAAoB,CAAC;AAI/D,eAAO,MAAM,SAAS,WAAY,yBAAyB,2BAKzB,CAAC;AAGnC,eAAO,MAAM,+BAA+B,mBAC1B,MAAM,aACX,MAAM,UACT,yBAAyB,KAChC,4BAOC,CAAC;AAEL,KAAK,2BAA2B,GAAG;IACjC,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,yBAAyB,CAAC;CACnC,CAAC;AAEF,eAAO,MAAM,sBAAsB,kDAIhC,2BAA2B,KAAG,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../lib/cim/components/InfraEnv/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,8BAA8B,EAC9B,4BAA4B,EAC5B,mBAAmB,EACnB,iBAAiB,EAClB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,yBAAyB,EAAE,MAAM,oBAAoB,CAAC;AAI/D,eAAO,MAAM,SAAS,WAAY,yBAAyB,2BAKzB,CAAC;AAGnC,eAAO,MAAM,+BAA+B,mBAC1B,MAAM,aACX,MAAM,UACT,yBAAyB,KAChC,4BAOC,CAAC;AAEL,KAAK,2BAA2B,GAAG;IACjC,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,yBAAyB,CAAC;CACnC,CAAC;AAEF,eAAO,MAAM,sBAAsB,kDAIhC,2BAA2B,KAAG,8BA0ChC,CAAC;AAEF,eAAO,MAAM,SAAS,cACT,MAAM,UACT,yBAAyB,KAChC,iBAWD,CAAC;AAEH,eAAO,MAAM,WAAW,cACX,MAAM,UACT,yBAAyB,KAChC,mBA0CF,CAAC"}
|
|
@@ -10,6 +10,7 @@ type ScaleUpModalProps = {
|
|
|
10
10
|
agents: AgentK8sResource[];
|
|
11
11
|
onChangeHostname: (agent: AgentK8sResource, hostname: string) => Promise<AgentK8sResource>;
|
|
12
12
|
onSetInstallationDiskId: AgentTableActions['onSetInstallationDiskId'];
|
|
13
|
+
isNutanix: boolean;
|
|
13
14
|
};
|
|
14
15
|
declare const ScaleUpModal: React.FC<ScaleUpModalProps>;
|
|
15
16
|
export default ScaleUpModal;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ScaleUpModal.d.ts","sourceRoot":"","sources":["../../../../../lib/cim/components/modals/ScaleUpModal.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAe1B,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,4BAA4B,EAAE,MAAM,oCAAoC,CAAC;AAMlF,OAAO,EAAE,iBAAiB,EAAqB,MAAM,4BAA4B,CAAC;AA8BlF,KAAK,iBAAiB,GAAG;IACvB,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,YAAY,CAAC;IACtB,iBAAiB,EAAE,CAAC,WAAW,EAAE,gBAAgB,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACtE,iBAAiB,EAAE,4BAA4B,CAAC;IAChD,MAAM,EAAE,gBAAgB,EAAE,CAAC;IAC3B,gBAAgB,EAAE,CAAC,KAAK,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC3F,uBAAuB,EAAE,iBAAiB,CAAC,yBAAyB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"ScaleUpModal.d.ts","sourceRoot":"","sources":["../../../../../lib/cim/components/modals/ScaleUpModal.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAe1B,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,4BAA4B,EAAE,MAAM,oCAAoC,CAAC;AAMlF,OAAO,EAAE,iBAAiB,EAAqB,MAAM,4BAA4B,CAAC;AA8BlF,KAAK,iBAAiB,GAAG;IACvB,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,YAAY,CAAC;IACtB,iBAAiB,EAAE,CAAC,WAAW,EAAE,gBAAgB,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACtE,iBAAiB,EAAE,4BAA4B,CAAC;IAChD,MAAM,EAAE,gBAAgB,EAAE,CAAC;IAC3B,gBAAgB,EAAE,CAAC,KAAK,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC3F,uBAAuB,EAAE,iBAAiB,CAAC,yBAAyB,CAAC,CAAC;IACtE,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,QAAA,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CA2H7C,CAAC;AAEF,eAAe,YAAY,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-cluster-install.d.ts","sourceRoot":"","sources":["../../../../../lib/cim/types/k8s/agent-cluster-install.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC1E,OAAO,EAAE,OAAO,EAAE,MAAM,sDAAsD,CAAC;AAC/E,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAE3C,MAAM,MAAM,sCAAsC,GAC9C,YAAY,GACZ,WAAW,GACX,iBAAiB,GACjB,WAAW,GACX,QAAQ,GACR,SAAS,CAAC;AAEd,MAAM,MAAM,kCAAkC,GAC5C,eAAe,CAAC,sCAAsC,CAAC,CAAC;AAE1D,MAAM,MAAM,8BAA8B,GAAG,iBAAiB,GAAG;IAC/D,IAAI,CAAC,EAAE;QACL,oBAAoB,CAAC,
|
|
1
|
+
{"version":3,"file":"agent-cluster-install.d.ts","sourceRoot":"","sources":["../../../../../lib/cim/types/k8s/agent-cluster-install.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC1E,OAAO,EAAE,OAAO,EAAE,MAAM,sDAAsD,CAAC;AAC/E,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAE3C,MAAM,MAAM,sCAAsC,GAC9C,YAAY,GACZ,WAAW,GACX,iBAAiB,GACjB,WAAW,GACX,QAAQ,GACR,SAAS,CAAC;AAEd,MAAM,MAAM,kCAAkC,GAC5C,eAAe,CAAC,sCAAsC,CAAC,CAAC;AAE1D,MAAM,MAAM,8BAA8B,GAAG,iBAAiB,GAAG;IAC/D,IAAI,CAAC,EAAE;QACL,oBAAoB,CAAC,EAAE;YACrB,IAAI,EAAE,MAAM,CAAC;YACb,SAAS,EAAE,MAAM,CAAC;SACnB,CAAC;QACF,eAAe,CAAC,EAAE;YAChB,wBAAwB,CAAC,EAAE;gBACzB,IAAI,EAAE,MAAM,CAAC;aACd,CAAC;YACF,sBAAsB,CAAC,EAAE;gBACvB,IAAI,EAAE,MAAM,CAAC;aACd,CAAC;YACF,SAAS,CAAC,EAAE,MAAM,CAAC;SACpB,CAAC;QACF,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,WAAW,CAAC,EAAE;YACZ,IAAI,CAAC,EAAE,MAAM,CAAC;SACf,CAAC;QACF,KAAK,CAAC,EAAE;YACN,SAAS,CAAC,EAAE,MAAM,CAAC;YACnB,UAAU,CAAC,EAAE,MAAM,CAAC;YACpB,OAAO,CAAC,EAAE,MAAM,CAAC;SAClB,CAAC;QACF,qBAAqB,EAAE;YACrB,kBAAkB,EAAE,MAAM,CAAC;YAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;SACvB,CAAC;QACF,UAAU,EAAE;YACV,cAAc,CAAC,EAAE;gBACf,IAAI,EAAE,MAAM,CAAC;gBACb,UAAU,EAAE,MAAM,CAAC;aACpB,EAAE,CAAC;YACJ,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;YAC1B,cAAc,CAAC,EAAE;gBACf,IAAI,EAAE,MAAM,CAAC;aACd,EAAE,CAAC;YACJ,qBAAqB,CAAC,EAAE,OAAO,CAAC;YAChC,WAAW,CAAC,EAAE,cAAc,GAAG,eAAe,CAAC;SAChD,CAAC;QACF,gBAAgB,CAAC,EAAE,OAAO,CAAC;QAC3B,YAAY,EAAE,MAAM,CAAC;KACtB,CAAC;IACF,MAAM,CAAC,EAAE;QACP,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,0BAA0B,CAAC,EAAE,MAAM,CAAC;QACpC,UAAU,CAAC,EAAE,kCAAkC,EAAE,CAAC;QAClD,QAAQ,CAAC,EAAE;YACT,eAAe,EAAE,MAAM,CAAC;SACzB,CAAC;QACF,SAAS,CAAC,EAAE;YACV,SAAS,CAAC,EAAE,MAAM,CAAC;YACnB,OAAO,CAAC,EAAE,MAAM,CAAC;YACjB,KAAK,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;YAC1B,SAAS,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;SACnC,CAAC;QACF,eAAe,CAAC,EAAE,eAAe,CAAC;QAClC,cAAc,CAAC,EAAE;YACf,IAAI,EAAE,MAAM,CAAC;SACd,EAAE,CAAC;KACL,CAAC;CACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NetworkConfigurationForm.d.ts","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfigurationForm.tsx"],"names":[],"mappings":"AA0CA,OAAO,EACL,OAAO,EAIR,MAAM,sDAAsD,CAAC;
|
|
1
|
+
{"version":3,"file":"NetworkConfigurationForm.d.ts","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfigurationForm.tsx"],"names":[],"mappings":"AA0CA,OAAO,EACL,OAAO,EAIR,MAAM,sDAAsD,CAAC;AAwF9D,QAAA,MAAM,wBAAwB;aAA4B,OAAO;iBAsIhE,CAAC;AAEF,eAAe,wBAAwB,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as Yup from 'yup';
|
|
2
2
|
import { HostSubnets, NetworkConfigurationValues } from '../../../../common';
|
|
3
3
|
import { Cluster, ClusterDefaultConfig } from '@openshift-assisted/types/assisted-installer-service';
|
|
4
|
-
export declare const getNetworkInitialValues: (cluster: Cluster, defaultNetworkValues: Pick<ClusterDefaultConfig, 'clusterNetworksIpv4' | 'clusterNetworksDualstack' | 'serviceNetworksIpv4' | 'serviceNetworksDualstack'
|
|
4
|
+
export declare const getNetworkInitialValues: (cluster: Cluster, defaultNetworkValues: Pick<ClusterDefaultConfig, 'clusterNetworksIpv4' | 'clusterNetworksDualstack' | 'serviceNetworksIpv4' | 'serviceNetworksDualstack'>, isClusterManagedNetworkingUnsupported: boolean) => NetworkConfigurationValues;
|
|
5
5
|
export declare const getNetworkConfigurationValidationSchema: (initialValues: NetworkConfigurationValues, hostSubnets: HostSubnets) => Yup.Lazy;
|
|
6
6
|
//# sourceMappingURL=networkConfigurationValidation.d.ts.map
|
|
@@ -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,EAIL,WAAW,EAIX,0BAA0B,EAO3B,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,
|
|
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,EAIL,WAAW,EAIX,0BAA0B,EAO3B,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,0BA4BF,CAAC;AAEF,eAAO,MAAM,uCAAuC,kBACnC,0BAA0B,uCAwCxC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClusterDetailsService.d.ts","sourceRoot":"","sources":["../../../../lib/ocm/services/ClusterDetailsService.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,0BAA0B,EAG3B,MAAM,cAAc,CAAC;AAEtB,OAAO,EACL,uCAAuC,EACvC,0BAA0B,EAE1B,uBAAuB,EACxB,MAAM,SAAS,CAAC;AAIjB,OAAO,EACL,OAAO,EACP,QAAQ,EACR,aAAa,EACb,YAAY,EACb,MAAM,sDAAsD,CAAC;AAY9D,QAAA,MAAM,qBAAqB;mCACM,uBAAuB,GAAG,uCAAuC;
|
|
1
|
+
{"version":3,"file":"ClusterDetailsService.d.ts","sourceRoot":"","sources":["../../../../lib/ocm/services/ClusterDetailsService.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,0BAA0B,EAG3B,MAAM,cAAc,CAAC;AAEtB,OAAO,EACL,uCAAuC,EACvC,0BAA0B,EAE1B,uBAAuB,EACxB,MAAM,SAAS,CAAC;AAIjB,OAAO,EACL,OAAO,EACP,QAAQ,EACR,aAAa,EACb,YAAY,EACb,MAAM,sDAAsD,CAAC;AAY9D,QAAA,MAAM,qBAAqB;mCACM,uBAAuB,GAAG,uCAAuC;mCA8BtF,uBAAuB,YACrB,YAAY,GACrB,0BAA0B;;;;;wBA6BX,aAAa,EAAE;qBAClB,0BAA0B,EAAE;yBACxB,MAAM;;QAErB,uBAAuB;CAsB5B,CAAC;AAEF,eAAe,qBAAqB,CAAC"}
|
|
@@ -10,13 +10,16 @@ const SwitchField_1 = tslib_1.__importDefault(require("../../../common/component
|
|
|
10
10
|
const ClusterScaleUpAutoHostsSelection_1 = tslib_1.__importDefault(require("./ClusterScaleUpAutoHostsSelection"));
|
|
11
11
|
const use_translation_wrapper_1 = require("../../../common/hooks/use-translation-wrapper");
|
|
12
12
|
const RadioField_1 = tslib_1.__importDefault(require("../../../common/components/ui/formik/RadioField"));
|
|
13
|
-
const ScaleUpForm = ({ agents, onEditHost, onSetInstallationDiskId, }) => {
|
|
13
|
+
const ScaleUpForm = ({ agents, onEditHost, onSetInstallationDiskId, isNutanix, }) => {
|
|
14
14
|
const { values } = (0, formik_1.useFormikContext)();
|
|
15
15
|
const { autoSelectHosts } = values;
|
|
16
16
|
const availableAgents = react_1.default.useMemo(() => (0, agents_1.getAgentsForSelection)(agents).filter((agent) => {
|
|
17
|
-
var _a, _b, _c, _d, _e, _f;
|
|
18
|
-
|
|
19
|
-
|
|
17
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j;
|
|
18
|
+
if (isNutanix && ((_c = (_b = (_a = agent.status) === null || _a === void 0 ? void 0 : _a.inventory) === null || _b === void 0 ? void 0 : _b.systemVendor) === null || _c === void 0 ? void 0 : _c.manufacturer) !== 'Nutanix') {
|
|
19
|
+
return false;
|
|
20
|
+
}
|
|
21
|
+
return (!(((_e = (_d = agent.spec) === null || _d === void 0 ? void 0 : _d.clusterDeploymentName) === null || _e === void 0 ? void 0 : _e.name) || ((_g = (_f = agent.spec) === null || _f === void 0 ? void 0 : _f.clusterDeploymentName) === null || _g === void 0 ? void 0 : _g.namespace)) && ((_j = (_h = agent.status) === null || _h === void 0 ? void 0 : _h.inventory.cpu) === null || _j === void 0 ? void 0 : _j.architecture) === values.cpuArchitecture);
|
|
22
|
+
}), [agents, values.cpuArchitecture, isNutanix]);
|
|
20
23
|
const { t } = (0, use_translation_wrapper_1.useTranslation)();
|
|
21
24
|
return (react_1.default.createElement(react_core_1.Form, null,
|
|
22
25
|
react_1.default.createElement(SwitchField_1.default, { name: "autoSelectHosts", label: t('ai:Auto-select hosts') }),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ScaleUpForm.js","sourceRoot":"","sources":["../../../../../lib/cim/components/ClusterDeployment/ScaleUpForm.tsx"],"names":[],"mappings":";;;AAAA,0DAA0B;AAC1B,mCAA0C;AAC1C,uDAAyE;AACzE,8CAA0D;AAE1D,gIAAgG;AAEhG,2GAA2E;AAC3E,kHAAkF;AAElF,2FAA+E;AAC/E,yGAAyE;
|
|
1
|
+
{"version":3,"file":"ScaleUpForm.js","sourceRoot":"","sources":["../../../../../lib/cim/components/ClusterDeployment/ScaleUpForm.tsx"],"names":[],"mappings":";;;AAAA,0DAA0B;AAC1B,mCAA0C;AAC1C,uDAAyE;AACzE,8CAA0D;AAE1D,gIAAgG;AAEhG,2GAA2E;AAC3E,kHAAkF;AAElF,2FAA+E;AAC/E,yGAAyE;AASzE,MAAM,WAAW,GAA+B,CAAC,EAC/C,MAAM,EACN,UAAU,EACV,uBAAuB,EACvB,SAAS,GACV,EAAE,EAAE;IACH,MAAM,EAAE,MAAM,EAAE,GAAG,IAAA,yBAAgB,GAAqB,CAAC;IACzD,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,CAAC;IACnC,MAAM,eAAe,GAAG,eAAK,CAAC,OAAO,CACnC,GAAG,EAAE,CACH,IAAA,8BAAqB,EAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;;QAC7C,IAAI,SAAS,IAAI,CAAA,MAAA,MAAA,MAAA,KAAK,CAAC,MAAM,0CAAE,SAAS,0CAAE,YAAY,0CAAE,YAAY,MAAK,SAAS,EAAE;YAClF,OAAO,KAAK,CAAC;SACd;QACD,OAAO,CACL,CAAC,CACC,CAAA,MAAA,MAAA,KAAK,CAAC,IAAI,0CAAE,qBAAqB,0CAAE,IAAI,MAAI,MAAA,MAAA,KAAK,CAAC,IAAI,0CAAE,qBAAqB,0CAAE,SAAS,CAAA,CACxF,IAAI,CAAA,MAAA,MAAA,KAAK,CAAC,MAAM,0CAAE,SAAS,CAAC,GAAG,0CAAE,YAAY,MAAK,MAAM,CAAC,eAAe,CAC1E,CAAC;IACJ,CAAC,CAAC,EACJ,CAAC,MAAM,EAAE,MAAM,CAAC,eAAe,EAAE,SAAS,CAAC,CAC5C,CAAC;IACF,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,wCAAc,GAAE,CAAC;IAC/B,OAAO,CACL,8BAAC,iBAAI;QACH,8BAAC,qBAAW,IAAC,IAAI,EAAC,iBAAiB,EAAC,KAAK,EAAE,CAAC,CAAC,sBAAsB,CAAC,GAAI;QACxE,8BAAC,sBAAS,IAAC,OAAO,EAAC,iBAAiB,EAAC,KAAK,EAAE,CAAC,CAAC,qBAAqB,CAAC;YAClE,8BAAC,iBAAI,IAAC,cAAc,EAAE,EAAE,OAAO,EAAE,yBAAyB,EAAE;gBAC1D,8BAAC,qBAAQ;oBACP,8BAAC,oBAAU,IAAC,IAAI,EAAC,iBAAiB,EAAC,EAAE,EAAC,QAAQ,EAAC,KAAK,EAAC,QAAQ,EAAC,KAAK,EAAE,CAAC,CAAC,WAAW,CAAC,GAAI,CAC9E;gBAEX,8BAAC,qBAAQ;oBACP,8BAAC,oBAAU,IACT,IAAI,EAAC,iBAAiB,EACtB,EAAE,EAAC,OAAO,EACV,KAAK,EAAC,OAAO,EACb,KAAK,EAAE;4BAAG,CAAC,CAAC,UAAU,CAAC;qCAAU,GACjC,CACO,CACN,CACG;QAEX,eAAe,IAAI,8BAAC,0CAAgC,IAAC,eAAe,EAAE,eAAe,GAAI;QAEzF,CAAC,eAAe,IAAI,CACnB,8BAAC,iDAAuC,IACtC,eAAe,EAAE,eAAe,EAChC,UAAU,EAAE,UAAU,EACtB,uBAAuB,EAAE,uBAAuB,GAChD,CACH,CACI,CACR,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,WAAW,CAAC"}
|
|
@@ -30,12 +30,6 @@ const getAgentClusterInstall = ({ clusterDeploymentName, namespace, values, }) =
|
|
|
30
30
|
// @ts-ignore
|
|
31
31
|
spec: {
|
|
32
32
|
holdInstallation: true,
|
|
33
|
-
clusterDeploymentRef: clusterDeploymentName
|
|
34
|
-
? {
|
|
35
|
-
name: clusterDeploymentName,
|
|
36
|
-
namespace,
|
|
37
|
-
}
|
|
38
|
-
: {},
|
|
39
33
|
networking: {
|
|
40
34
|
clusterNetwork: [
|
|
41
35
|
{
|
|
@@ -53,6 +47,12 @@ const getAgentClusterInstall = ({ clusterDeploymentName, namespace, values, }) =
|
|
|
53
47
|
},
|
|
54
48
|
},
|
|
55
49
|
};
|
|
50
|
+
if (obj.spec && clusterDeploymentName) {
|
|
51
|
+
obj.spec.clusterDeploymentRef = {
|
|
52
|
+
name: clusterDeploymentName,
|
|
53
|
+
namespace,
|
|
54
|
+
};
|
|
55
|
+
}
|
|
56
56
|
if (obj.spec && values.sshPublicKey) {
|
|
57
57
|
obj.spec.sshPublicKey = values.sshPublicKey;
|
|
58
58
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../lib/cim/components/InfraEnv/utils.ts"],"names":[],"mappings":";;;AAOA,wCAA0D;AAC1D,sCAAqD;AAE9C,MAAM,SAAS,GAAG,CAAC,MAAiC,EAAE,EAAE,CAC7D,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;IACjC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC9B,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;IACzB,OAAO,GAAG,CAAC;AACb,CAAC,EAAE,EAA4B,CAAC,CAAC;AALtB,QAAA,SAAS,aAKa;AAEnC,oEAAoE;AAC7D,MAAM,+BAA+B,GAAG,CAC7C,cAAsB,EACtB,SAAiB,EACjB,MAAiC,EACH,EAAE,CAChC,IAAA,sCAA4B,EAAC;IAC3B,IAAI,EAAE,MAAM,CAAC,IAAI;IACjB,SAAS;IACT,aAAa,EAAE,EAAE;IACjB,WAAW,EAAE,IAAA,iBAAS,EAAC,MAAM,CAAC;IAC9B,cAAc;CACf,CAAC,CAAC;AAXQ,QAAA,+BAA+B,mCAWvC;AAQE,MAAM,sBAAsB,GAAG,CAAC,EACrC,qBAAqB,EACrB,SAAS,EACT,MAAM,GACsB,EAAkC,EAAE;IAChE,MAAM,GAAG,GAAmC;QAC1C,UAAU,EAAE,sCAAsC;QAClD,IAAI,EAAE,qBAAqB;QAC3B,QAAQ,EAAE;YACR,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,SAAS;SACV;QACD,6DAA6D;QAC7D,aAAa;QACb,IAAI,EAAE;YACJ,gBAAgB,EAAE,IAAI;YACtB,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../lib/cim/components/InfraEnv/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,7 +29,7 @@ const getValidationSchema = (agentsCount) => {
|
|
|
29
29
|
});
|
|
30
30
|
});
|
|
31
31
|
};
|
|
32
|
-
const ScaleUpModal = ({ isOpen, onClose, addHostsToCluster, clusterDeployment, agents, onChangeHostname, onSetInstallationDiskId, }) => {
|
|
32
|
+
const ScaleUpModal = ({ isOpen, onClose, addHostsToCluster, clusterDeployment, agents, onChangeHostname, onSetInstallationDiskId, isNutanix, }) => {
|
|
33
33
|
const [editAgent, setEditAgent] = react_1.default.useState();
|
|
34
34
|
const [error, setError] = react_1.default.useState();
|
|
35
35
|
const { t } = (0, use_translation_wrapper_1.useTranslation)();
|
|
@@ -72,7 +72,7 @@ const ScaleUpModal = ({ isOpen, onClose, addHostsToCluster, clusterDeployment, a
|
|
|
72
72
|
react_1.default.createElement(react_core_1.ModalBoxBody, null,
|
|
73
73
|
react_1.default.createElement(react_core_1.Stack, { hasGutter: true },
|
|
74
74
|
react_1.default.createElement(react_core_1.StackItem, null,
|
|
75
|
-
react_1.default.createElement(ScaleUpForm_1.default, { agents: agents, onEditHost: setEditAgent, onSetInstallationDiskId: onSetInstallationDiskId })),
|
|
75
|
+
react_1.default.createElement(ScaleUpForm_1.default, { agents: agents, onEditHost: setEditAgent, onSetInstallationDiskId: onSetInstallationDiskId, isNutanix: isNutanix })),
|
|
76
76
|
error && (react_1.default.createElement(react_core_1.StackItem, null,
|
|
77
77
|
react_1.default.createElement(react_core_1.Alert, { title: t('ai:Failed to add hosts to the cluster'), variant: react_core_1.AlertVariant.danger, actionClose: react_1.default.createElement(react_core_1.AlertActionCloseButton, { onClose: () => setError(undefined) }), isInline: true }, error))))),
|
|
78
78
|
react_1.default.createElement(react_core_1.ModalBoxFooter, null,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ScaleUpModal.js","sourceRoot":"","sources":["../../../../../lib/cim/components/modals/ScaleUpModal.tsx"],"names":[],"mappings":";;;AAAA,0DAA0B;AAC1B,iDAA2B;AAC3B,uDAWgC;AAChC,mCAA2D;AAG3D,2FAA2D;AAC3D,oEAGsC;AAEtC,8EAA8C;AAC9C,0DAAmE;AACnE,iDAAwD;AACxD,2FAA+E;AAE/E,MAAM,cAAc,GAAG,CACrB,eAAgG,EAChG,MAA0B,EAC1B,EAAE,CACF,MAAM,CAAC,MAAM,CACX,CAAC,KAAK,EAAE,EAAE;;IACR,OAAA,eAAe,CAAC,QAAQ,CAAC,CAAA,MAAA,KAAK,CAAC,QAAQ,0CAAE,GAAG,KAAI,EAAE,CAAC;QACnD,CAAC,CAAC,CAAA,MAAA,MAAA,KAAK,CAAC,IAAI,0CAAE,qBAAqB,0CAAE,IAAI,MAAI,MAAA,MAAA,KAAK,CAAC,IAAI,0CAAE,qBAAqB,0CAAE,SAAS,CAAA,CAAC,CAAA;CAAA,CAC7F,CAAC;AAEJ,MAAM,mBAAmB,GAAG,CAAC,WAAmB,EAAE,EAAE;IAClD,OAAO,GAAG,CAAC,IAAI,CAAoB,CAAC,MAAM,EAAE,EAAE;QAC5C,OAAO,GAAG,CAAC,MAAM,EAAqB,CAAC,KAAK,CAAC;YAC3C,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC;YAC/C,mBAAmB,EAAE,MAAM,CAAC,eAAe;gBACzC,CAAC,CAAC,GAAG,CAAC,KAAK,EAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC;gBAC7C,CAAC,CAAC,GAAG,CAAC,KAAK,EAAU;YACvB,eAAe,EAAE,MAAM,CAAC,eAAe;gBACrC,CAAC,CAAC,GAAG,CAAC,KAAK,EAAU;gBACrB,CAAC,CAAC,GAAG,CAAC,KAAK,EAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC;SAChD,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"ScaleUpModal.js","sourceRoot":"","sources":["../../../../../lib/cim/components/modals/ScaleUpModal.tsx"],"names":[],"mappings":"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"}
|
|
@@ -21,6 +21,7 @@ const services_1 = require("../../../services");
|
|
|
21
21
|
const slice_1 = require("../../../store/slices/current-cluster/slice");
|
|
22
22
|
const api_1 = require("../../../api");
|
|
23
23
|
const hooks_1 = require("../../../hooks");
|
|
24
|
+
const newFeatureSupportLevels_1 = require("../../../../common/components/newFeatureSupportLevels");
|
|
24
25
|
const NetworkConfigurationForm = ({ cluster, hostSubnets, defaultNetworkSettings, infraEnv }) => {
|
|
25
26
|
const { alerts } = (0, common_1.useAlerts)();
|
|
26
27
|
const clusterWizardContext = (0, ClusterWizardContext_1.useClusterWizardContext)();
|
|
@@ -70,7 +71,9 @@ const NetworkConfigurationPage = ({ cluster }) => {
|
|
|
70
71
|
const dispatch = (0, react_redux_1.useDispatch)();
|
|
71
72
|
const { isViewerMode } = (0, react_redux_1.useSelector)(selectors_1.selectCurrentClusterPermissionsState);
|
|
72
73
|
const hostSubnets = react_1.default.useMemo(() => (0, common_1.getHostSubnets)(cluster, true), [cluster]);
|
|
73
|
-
const
|
|
74
|
+
const featureSupportLevelData = (0, newFeatureSupportLevels_1.useNewFeatureSupportLevel)();
|
|
75
|
+
const isClusterManagedNetworkingUnsupported = !featureSupportLevelData.isFeatureSupported('CLUSTER_MANAGED_NETWORKING');
|
|
76
|
+
const initialValues = react_1.default.useMemo(() => (0, networkConfigurationValidation_1.getNetworkInitialValues)(cluster, defaultNetworkValues, isClusterManagedNetworkingUnsupported),
|
|
74
77
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
75
78
|
[]);
|
|
76
79
|
const memoizedValidationSchema = react_1.default.useMemo(() => (0, networkConfigurationValidation_1.getNetworkConfigurationValidationSchema)(initialValues, hostSubnets), [hostSubnets, initialValues]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NetworkConfigurationForm.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfigurationForm.tsx"],"names":[],"mappings":";;;AAAA,0DAA0B;AAC1B,6CAAuD;AACvD,mCAAgE;AAChE,uDAAiF;AACjF,+CAgB4B;AAC5B,8FAAgF;AAChF,mFAAmF;AACnF,0GAA0E;AAC1E,2EAAsE;AACtE,kHAAkF;AAClF,oGAAoE;AACpE,qFAAqD;AACrD,+EAAuG;AACvG,qFAG0C;AAC1C,0FAA0D;AAC1D,4CAAmD;AACnD,gDAAoD;AACpD,uEAGqD;AACrD,sCAAwF;AACxF,0CAA+C;
|
|
1
|
+
{"version":3,"file":"NetworkConfigurationForm.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfigurationForm.tsx"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ exports.getNetworkConfigurationValidationSchema = exports.getNetworkInitialValue
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const Yup = tslib_1.__importStar(require("yup"));
|
|
6
6
|
const common_1 = require("../../../../common");
|
|
7
|
-
const getNetworkInitialValues = (cluster, defaultNetworkValues) => {
|
|
7
|
+
const getNetworkInitialValues = (cluster, defaultNetworkValues, isClusterManagedNetworkingUnsupported) => {
|
|
8
8
|
const isSNOCluster = (0, common_1.isSNO)(cluster);
|
|
9
9
|
const isDualStackType = (0, common_1.isDualStack)(cluster);
|
|
10
10
|
return {
|
|
@@ -12,7 +12,10 @@ const getNetworkInitialValues = (cluster, defaultNetworkValues) => {
|
|
|
12
12
|
ingressVips: cluster.ingressVips,
|
|
13
13
|
sshPublicKey: cluster.sshPublicKey || '',
|
|
14
14
|
vipDhcpAllocation: cluster.vipDhcpAllocation,
|
|
15
|
-
managedNetworkingType: cluster.
|
|
15
|
+
managedNetworkingType: (cluster.apiVips && cluster.apiVips.length === 0 && isClusterManagedNetworkingUnsupported) ||
|
|
16
|
+
isSNOCluster
|
|
17
|
+
? 'userManaged'
|
|
18
|
+
: 'clusterManaged',
|
|
16
19
|
networkType: cluster.networkType || (0, common_1.getDefaultNetworkType)(isSNOCluster, isDualStackType),
|
|
17
20
|
machineNetworks: cluster.machineNetworks || [],
|
|
18
21
|
stackType: isDualStackType ? common_1.DUAL_STACK : common_1.IPV4_STACK,
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"networkConfigurationValidation.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,9 +30,6 @@ const ClusterDetailsService = {
|
|
|
30
30
|
type: values.platform,
|
|
31
31
|
},
|
|
32
32
|
};
|
|
33
|
-
if (!values.isCMNSupported) {
|
|
34
|
-
params.userManagedNetworking = true;
|
|
35
|
-
}
|
|
36
33
|
if (values.hostsNetworkConfigurationType === types_1.HostsNetworkConfigurationType.STATIC) {
|
|
37
34
|
params.staticNetworkConfig = (0, dummyData_1.getDummyInfraEnvField)();
|
|
38
35
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClusterDetailsService.js","sourceRoot":"","sources":["../../../../lib/ocm/services/ClusterDetailsService.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AACtB,4FAA4D;AAC5D,mCAKiB;AACjB,0FAAmG;AACnG,gCAAiC;AACjC,qEAAqE;AAQrE,MAAM,4BAA4B,GAAG,CAAC,eAAuB,EAAE,EAAE;IAC/D,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC,eAAe,CAAC,CAAC;IACpD,MAAM,iBAAiB,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,MAAM,CAAC;IAC1D,OAAO,iBAAiB,CAAC,CAAC,CAAC,wBAAe,CAAC,GAAG,CAAC,CAAC,CAAC,IAAA,kDAAyB,GAAE,CAAC;AAC/E,CAAC,CAAC;AAEF,MAAM,iCAAiC,GAAG,CAAC,QAAkB,EAAE,EAAE;IAC/D,OAAO,QAAQ,CAAC,eAAe,IAAI,IAAA,kDAAyB,GAAE,CAAC;AACjE,CAAC,CAAC;AAEF,MAAM,qBAAqB,GAAG;IAC5B,sBAAsB,CAAC,MAA+B;;QACpD,MAAM,MAAM,GAA4C;YACtD,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,oBAAoB,EAAE,MAAM,CAAC,oBAAoB;YACjD,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;YACzC,UAAU,EAAE,MAAM,CAAC,UAAU;YAC7B,aAAa,EAAE,MAAM,CAAC,aAAa;YACnC,eAAe,EAAE,MAAM,CAAC,eAAyC;YACjE,cAAc,EAAE,+BAAqB,CAAC,uBAAuB,CAAC,MAAM,CAAC;YACrE,QAAQ,EAAE;gBACR,IAAI,EAAE,MAAM,CAAC,QAAQ;aACtB;SACF,CAAC;QAEF,IAAI,
|
|
1
|
+
{"version":3,"file":"ClusterDetailsService.js","sourceRoot":"","sources":["../../../../lib/ocm/services/ClusterDetailsService.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,24 +15,30 @@ type ScaleUpFormProps = {
|
|
|
15
15
|
agents: AgentK8sResource[];
|
|
16
16
|
onEditHost: AgentTableActions['onEditHost'];
|
|
17
17
|
onSetInstallationDiskId: AgentTableActions['onSetInstallationDiskId'];
|
|
18
|
+
isNutanix: boolean;
|
|
18
19
|
};
|
|
19
20
|
|
|
20
21
|
const ScaleUpForm: React.FC<ScaleUpFormProps> = ({
|
|
21
22
|
agents,
|
|
22
23
|
onEditHost,
|
|
23
24
|
onSetInstallationDiskId,
|
|
25
|
+
isNutanix,
|
|
24
26
|
}) => {
|
|
25
27
|
const { values } = useFormikContext<ScaleUpFormValues>();
|
|
26
28
|
const { autoSelectHosts } = values;
|
|
27
29
|
const availableAgents = React.useMemo(
|
|
28
30
|
() =>
|
|
29
|
-
getAgentsForSelection(agents).filter(
|
|
30
|
-
(agent)
|
|
31
|
+
getAgentsForSelection(agents).filter((agent) => {
|
|
32
|
+
if (isNutanix && agent.status?.inventory?.systemVendor?.manufacturer !== 'Nutanix') {
|
|
33
|
+
return false;
|
|
34
|
+
}
|
|
35
|
+
return (
|
|
31
36
|
!(
|
|
32
37
|
agent.spec?.clusterDeploymentName?.name || agent.spec?.clusterDeploymentName?.namespace
|
|
33
|
-
) && agent.status?.inventory.cpu?.architecture === values.cpuArchitecture
|
|
34
|
-
|
|
35
|
-
|
|
38
|
+
) && agent.status?.inventory.cpu?.architecture === values.cpuArchitecture
|
|
39
|
+
);
|
|
40
|
+
}),
|
|
41
|
+
[agents, values.cpuArchitecture, isNutanix],
|
|
36
42
|
);
|
|
37
43
|
const { t } = useTranslation();
|
|
38
44
|
return (
|
|
@@ -51,12 +51,6 @@ export const getAgentClusterInstall = ({
|
|
|
51
51
|
// @ts-ignore
|
|
52
52
|
spec: {
|
|
53
53
|
holdInstallation: true,
|
|
54
|
-
clusterDeploymentRef: clusterDeploymentName
|
|
55
|
-
? {
|
|
56
|
-
name: clusterDeploymentName,
|
|
57
|
-
namespace,
|
|
58
|
-
}
|
|
59
|
-
: {},
|
|
60
54
|
networking: {
|
|
61
55
|
clusterNetwork: [
|
|
62
56
|
{
|
|
@@ -75,6 +69,13 @@ export const getAgentClusterInstall = ({
|
|
|
75
69
|
},
|
|
76
70
|
};
|
|
77
71
|
|
|
72
|
+
if (obj.spec && clusterDeploymentName) {
|
|
73
|
+
obj.spec.clusterDeploymentRef = {
|
|
74
|
+
name: clusterDeploymentName,
|
|
75
|
+
namespace,
|
|
76
|
+
};
|
|
77
|
+
}
|
|
78
|
+
|
|
78
79
|
if (obj.spec && values.sshPublicKey) {
|
|
79
80
|
obj.spec.sshPublicKey = values.sshPublicKey;
|
|
80
81
|
}
|
|
@@ -58,6 +58,7 @@ type ScaleUpModalProps = {
|
|
|
58
58
|
agents: AgentK8sResource[];
|
|
59
59
|
onChangeHostname: (agent: AgentK8sResource, hostname: string) => Promise<AgentK8sResource>;
|
|
60
60
|
onSetInstallationDiskId: AgentTableActions['onSetInstallationDiskId'];
|
|
61
|
+
isNutanix: boolean;
|
|
61
62
|
};
|
|
62
63
|
|
|
63
64
|
const ScaleUpModal: React.FC<ScaleUpModalProps> = ({
|
|
@@ -68,6 +69,7 @@ const ScaleUpModal: React.FC<ScaleUpModalProps> = ({
|
|
|
68
69
|
agents,
|
|
69
70
|
onChangeHostname,
|
|
70
71
|
onSetInstallationDiskId,
|
|
72
|
+
isNutanix,
|
|
71
73
|
}) => {
|
|
72
74
|
const [editAgent, setEditAgent] = React.useState<AgentK8sResource | undefined>();
|
|
73
75
|
const [error, setError] = React.useState<string | undefined>();
|
|
@@ -138,6 +140,7 @@ const ScaleUpModal: React.FC<ScaleUpModalProps> = ({
|
|
|
138
140
|
agents={agents}
|
|
139
141
|
onEditHost={setEditAgent}
|
|
140
142
|
onSetInstallationDiskId={onSetInstallationDiskId}
|
|
143
|
+
isNutanix={isNutanix}
|
|
141
144
|
/>
|
|
142
145
|
</StackItem>
|
|
143
146
|
{error && (
|
|
@@ -16,13 +16,10 @@ export type AgentClusterInstallStatusCondition =
|
|
|
16
16
|
|
|
17
17
|
export type AgentClusterInstallK8sResource = K8sResourceCommon & {
|
|
18
18
|
spec?: {
|
|
19
|
-
clusterDeploymentRef?:
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
}
|
|
24
|
-
// eslint-disable-next-line @typescript-eslint/ban-types
|
|
25
|
-
| {};
|
|
19
|
+
clusterDeploymentRef?: {
|
|
20
|
+
name: string;
|
|
21
|
+
namespace: string;
|
|
22
|
+
};
|
|
26
23
|
clusterMetadata?: {
|
|
27
24
|
adminKubeconfigSecretRef?: {
|
|
28
25
|
name: string;
|
package/lib/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfigurationForm.tsx
CHANGED
|
@@ -46,6 +46,7 @@ import {
|
|
|
46
46
|
InfraEnv,
|
|
47
47
|
V2ClusterUpdateParams,
|
|
48
48
|
} from '@openshift-assisted/types/assisted-installer-service';
|
|
49
|
+
import { useNewFeatureSupportLevel } from '../../../../common/components/newFeatureSupportLevels';
|
|
49
50
|
|
|
50
51
|
const NetworkConfigurationForm: React.FC<{
|
|
51
52
|
cluster: Cluster;
|
|
@@ -157,10 +158,14 @@ const NetworkConfigurationPage = ({ cluster }: { cluster: Cluster }) => {
|
|
|
157
158
|
const { addAlert, clearAlerts, alerts } = useAlerts();
|
|
158
159
|
const dispatch = useDispatch();
|
|
159
160
|
const { isViewerMode } = useSelector(selectCurrentClusterPermissionsState);
|
|
160
|
-
|
|
161
161
|
const hostSubnets = React.useMemo(() => getHostSubnets(cluster, true), [cluster]);
|
|
162
|
+
const featureSupportLevelData = useNewFeatureSupportLevel();
|
|
163
|
+
const isClusterManagedNetworkingUnsupported = !featureSupportLevelData.isFeatureSupported(
|
|
164
|
+
'CLUSTER_MANAGED_NETWORKING',
|
|
165
|
+
);
|
|
162
166
|
const initialValues = React.useMemo(
|
|
163
|
-
() =>
|
|
167
|
+
() =>
|
|
168
|
+
getNetworkInitialValues(cluster, defaultNetworkValues, isClusterManagedNetworkingUnsupported),
|
|
164
169
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
165
170
|
[], // just once, Formik does not reinitialize
|
|
166
171
|
);
|
|
@@ -31,6 +31,7 @@ export const getNetworkInitialValues = (
|
|
|
31
31
|
| 'serviceNetworksIpv4'
|
|
32
32
|
| 'serviceNetworksDualstack'
|
|
33
33
|
>,
|
|
34
|
+
isClusterManagedNetworkingUnsupported: boolean,
|
|
34
35
|
): NetworkConfigurationValues => {
|
|
35
36
|
const isSNOCluster = isSNO(cluster);
|
|
36
37
|
const isDualStackType = isDualStack(cluster);
|
|
@@ -40,7 +41,11 @@ export const getNetworkInitialValues = (
|
|
|
40
41
|
ingressVips: cluster.ingressVips,
|
|
41
42
|
sshPublicKey: cluster.sshPublicKey || '',
|
|
42
43
|
vipDhcpAllocation: cluster.vipDhcpAllocation,
|
|
43
|
-
managedNetworkingType:
|
|
44
|
+
managedNetworkingType:
|
|
45
|
+
(cluster.apiVips && cluster.apiVips.length === 0 && isClusterManagedNetworkingUnsupported) ||
|
|
46
|
+
isSNOCluster
|
|
47
|
+
? 'userManaged'
|
|
48
|
+
: 'clusterManaged',
|
|
44
49
|
networkType: cluster.networkType || getDefaultNetworkType(isSNOCluster, isDualStackType),
|
|
45
50
|
machineNetworks: cluster.machineNetworks || [],
|
|
46
51
|
stackType: isDualStackType ? DUAL_STACK : IPV4_STACK,
|
|
@@ -47,10 +47,6 @@ const ClusterDetailsService = {
|
|
|
47
47
|
},
|
|
48
48
|
};
|
|
49
49
|
|
|
50
|
-
if (!values.isCMNSupported) {
|
|
51
|
-
params.userManagedNetworking = true;
|
|
52
|
-
}
|
|
53
|
-
|
|
54
50
|
if (values.hostsNetworkConfigurationType === HostsNetworkConfigurationType.STATIC) {
|
|
55
51
|
params.staticNetworkConfig = getDummyInfraEnvField();
|
|
56
52
|
}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"dependencies": {
|
|
3
|
-
"@openshift-assisted/locales": "2.9.
|
|
4
|
-
"@openshift-assisted/types": "2.9.
|
|
3
|
+
"@openshift-assisted/locales": "2.9.10-cim",
|
|
4
|
+
"@openshift-assisted/types": "2.9.10-cim",
|
|
5
5
|
"axios-case-converter": "^0.11.1",
|
|
6
6
|
"camel-case": "^4.1.2",
|
|
7
7
|
"cidr-tools": "^4.3.0",
|
|
@@ -115,7 +115,11 @@
|
|
|
115
115
|
"check_circular_deps": "yarn run -T dpdm --warning false --tree false --exit-code circular:1 ./lib/index.ts",
|
|
116
116
|
"check_types": "yarn run -T tsc --noEmit",
|
|
117
117
|
"clean": "yarn run -T rimraf node_modules build",
|
|
118
|
-
"copy:css": "rsync -Ruv lib/./**/*.css build/cjs"
|
|
118
|
+
"copy:css": "rsync -Ruv lib/./**/*.css build/cjs",
|
|
119
|
+
"format": "yarn run -T prettier --cache --check . \"!build\"",
|
|
120
|
+
"fix-code-style": "yarn lint --fix && yarn format --write",
|
|
121
|
+
"lint": "yarn run -T eslint --cache --cache-location node_modules/.cache/eslint/.eslint-cache .",
|
|
122
|
+
"test": "vitest"
|
|
119
123
|
},
|
|
120
124
|
"typesVersions": {
|
|
121
125
|
"*": {
|
|
@@ -127,5 +131,5 @@
|
|
|
127
131
|
]
|
|
128
132
|
}
|
|
129
133
|
},
|
|
130
|
-
"version": "2.9.
|
|
134
|
+
"version": "2.9.10-cim"
|
|
131
135
|
}
|