@openshift-assisted/ui-lib 2.10.4-cim → 2.10.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/Hypershift/DetailsPage/ConditionsTable.d.ts +1 -1
- package/build/@types/cim/components/Hypershift/DetailsPage/ConditionsTable.d.ts.map +1 -1
- package/build/@types/cim/components/common/ResourceAlerts.d.ts.map +1 -1
- package/build/@types/cim/components/helpers/status.d.ts +0 -2
- package/build/@types/cim/components/helpers/status.d.ts.map +1 -1
- package/build/@types/cim/components/helpers/versions.d.ts +2 -0
- package/build/@types/cim/components/helpers/versions.d.ts.map +1 -1
- package/build/@types/cim/types/k8s/shared.d.ts +2 -2
- package/build/@types/cim/types/k8s/shared.d.ts.map +1 -1
- package/build/cjs/cim/components/Hypershift/DetailsPage/ConditionsTable.js +1 -1
- package/build/cjs/cim/components/Hypershift/DetailsPage/ConditionsTable.js.map +1 -1
- package/build/cjs/cim/components/InfraEnv/EnvironmentErrors.js +1 -1
- package/build/cjs/cim/components/InfraEnv/EnvironmentErrors.js.map +1 -1
- package/build/cjs/cim/components/common/ResourceAlerts.js +13 -5
- package/build/cjs/cim/components/common/ResourceAlerts.js.map +1 -1
- package/build/cjs/cim/components/helpers/status.js +1 -59
- package/build/cjs/cim/components/helpers/status.js.map +1 -1
- package/build/cjs/cim/components/helpers/versions.js +15 -10
- package/build/cjs/cim/components/helpers/versions.js.map +1 -1
- package/lib/cim/components/Hypershift/DetailsPage/ConditionsTable.tsx +2 -2
- package/lib/cim/components/InfraEnv/EnvironmentErrors.tsx +1 -1
- package/lib/cim/components/common/ResourceAlerts.tsx +23 -12
- package/lib/cim/components/helpers/status.ts +2 -85
- package/lib/cim/components/helpers/versions.ts +18 -8
- package/lib/cim/types/k8s/shared.ts +2 -2
- package/package.json +3 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConditionsTable.d.ts","sourceRoot":"","sources":["../../../../../../lib/cim/components/Hypershift/DetailsPage/ConditionsTable.tsx"],"names":[],"mappings":"AAWA,OAAO,uBAAuB,CAAC;AAK/B,KAAK,oBAAoB,GAAG;IAC1B,UAAU,CAAC,EAAE;QACX,MAAM,EAAE,MAAM,CAAC;QACf,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"ConditionsTable.d.ts","sourceRoot":"","sources":["../../../../../../lib/cim/components/Hypershift/DetailsPage/ConditionsTable.tsx"],"names":[],"mappings":"AAWA,OAAO,uBAAuB,CAAC;AAK/B,KAAK,oBAAoB,GAAG;IAC1B,UAAU,CAAC,EAAE;QACX,MAAM,EAAE,MAAM,CAAC;QACf,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,EAAE,CAAC;IACJ,MAAM,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,QAAA,MAAM,eAAe,2BAA4B,oBAAoB,gBAyDpE,CAAC;AAEF,eAAe,eAAe,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ResourceAlerts.d.ts","sourceRoot":"","sources":["../../../../../lib/cim/components/common/ResourceAlerts.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAU1B,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,OAAO,sBAAsB,CAAC;AAE9B,eAAO,MAAM,oBAAoB,EAAE,KAAK,CAAC,EAAE,CAAC;IAC1C,UAAU,EAAE,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC;IACtC,KAAK,EAAE,MAAM,CAAC;CACf,
|
|
1
|
+
{"version":3,"file":"ResourceAlerts.d.ts","sourceRoot":"","sources":["../../../../../lib/cim/components/common/ResourceAlerts.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAU1B,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,OAAO,sBAAsB,CAAC;AAE9B,eAAO,MAAM,oBAAoB,EAAE,KAAK,CAAC,EAAE,CAAC;IAC1C,UAAU,EAAE,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC;IACtC,KAAK,EAAE,MAAM,CAAC;CACf,CA4CA,CAAC"}
|
|
@@ -7,10 +7,8 @@ import { ClusterWizardStepsType } from '../ClusterDeployment/wizardTransition';
|
|
|
7
7
|
import { HostStatusDef } from '../../../common';
|
|
8
8
|
import { TFunction } from 'i18next';
|
|
9
9
|
import { HostStatus } from '../../../common/components/hosts/types';
|
|
10
|
-
export declare const getClusterStatusFromConditions: (agentClusterInstall: AgentClusterInstallK8sResource, t: TFunction) => [Cluster['status'], string];
|
|
11
10
|
export declare const getClusterStatus: (agentClusterInstall?: AgentClusterInstallK8sResource) => [Cluster['status'], Cluster['statusInfo']];
|
|
12
11
|
export declare const isDraft: (agentClusterInstall?: AgentClusterInstallK8sResource) => boolean;
|
|
13
|
-
export declare const getAgentStatusFromConditions: (agent: AgentK8sResource, t: TFunction) => [Host['status'], string];
|
|
14
12
|
export type AgentStatus = Host['status'] | 'discovered';
|
|
15
13
|
export declare const getAgentStatusKey: (agent: AgentK8sResource, excludeDiscovered?: boolean) => "disabled" | "error" | "discovering" | "known" | "disconnected" | "insufficient" | "preparing-for-installation" | "preparing-failed" | "preparing-successful" | "pending-for-input" | "installing" | "installing-in-progress" | "installing-pending-user-action" | "resetting-pending-user-action" | "installed" | "resetting" | "added-to-existing-cluster" | "cancelled" | "binding" | "unbinding" | "unbinding-pending-user-action" | "known-unbound" | "disconnected-unbound" | "insufficient-unbound" | "disabled-unbound" | "discovering-unbound" | "reclaiming" | "reclaiming-rebooting" | "discovered" | "specSyncErr";
|
|
16
14
|
export declare const getAgentStatus: (agent: AgentK8sResource, agentStatuses: HostStatus<string>, excludeDiscovered?: boolean) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../../../../lib/cim/components/helpers/status.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../../../../lib/cim/components/helpers/status.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,8BAA8B,EAAE,MAAM,uCAAuC,CAAC;AACvF,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,sDAAsD,CAAC;AACrF,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAE3E,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAM9D,OAAO,EACL,sBAAsB,EAEvB,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,EAAE,UAAU,EAAE,MAAM,wCAAwC,CAAC;AAWpE,eAAO,MAAM,gBAAgB,yBACL,8BAA8B,KACnD,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,CAG3C,CAAC;AAEF,eAAO,MAAM,OAAO,yBAA0B,8BAA8B,KAAG,OAEoB,CAAC;AAEpG,MAAM,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,YAAY,CAAC;AAKxD,eAAO,MAAM,iBAAiB,UAAW,gBAAgB,goBAaxD,CAAC;AAEF,eAAO,MAAM,cAAc,UAClB,gBAAgB,iBACR,WAAW,MAAM,CAAC;YAEtB,aAAa;qBAAmB,eAAe;;CAgB3D,CAAC;AAEF,eAAO,MAAM,wBAAwB,UAC5B,gBAAgB,gBACT,sBAAsB,KACjC,SAAS;YAED,aAAa;qBAAmB,eAAe;CAgC3D,CAAC;AAEF,eAAO,MAAM,eAAe,QAAS,wBAAwB,uBAM5D,CAAC;AAEF,eAAO,MAAM,YAAY,QAAS,wBAAwB,eAAe,WAAW,MAAM,CAAC;;;CAW1F,CAAC"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { AgentClusterInstallK8sResource, ClusterImageSetK8sResource, ClusterVersionK8sResource } from '../../types';
|
|
2
2
|
import { OpenshiftVersionOptionType } from '../../../common';
|
|
3
3
|
export declare const getVersionFromReleaseImage: (releaseImage?: string) => string | undefined;
|
|
4
|
+
export declare const supportedNutanixPlatforms: string[];
|
|
5
|
+
export declare const isValidImageSet: (cis: ClusterImageSetK8sResource, architectures?: string[]) => boolean;
|
|
4
6
|
export declare const getOCPVersions: (clusterImageSets: ClusterImageSetK8sResource[], isNutanix?: boolean | undefined) => OpenshiftVersionOptionType[];
|
|
5
7
|
export declare const getSelectedVersion: (clusterImages: ClusterImageSetK8sResource[], agentClusterInstall: AgentClusterInstallK8sResource) => string | undefined;
|
|
6
8
|
export declare const getCurrentClusterVersion: (cv?: ClusterVersionK8sResource) => string | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"versions.d.ts","sourceRoot":"","sources":["../../../../../lib/cim/components/helpers/versions.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,8BAA8B,EAC9B,0BAA0B,EAC1B,yBAAyB,EAC1B,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,0BAA0B,EAAE,MAAM,iBAAiB,CAAC;AAG7D,eAAO,MAAM,0BAA0B,+CAKtC,CAAC;AAqBF,eAAO,MAAM,cAAc,qBACP,0BAA0B,EAAE,cAClC,OAAO,GAAG,SAAS,KAC9B,0BAA0B,
|
|
1
|
+
{"version":3,"file":"versions.d.ts","sourceRoot":"","sources":["../../../../../lib/cim/components/helpers/versions.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,8BAA8B,EAC9B,0BAA0B,EAC1B,yBAAyB,EAC1B,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,0BAA0B,EAAE,MAAM,iBAAiB,CAAC;AAG7D,eAAO,MAAM,0BAA0B,+CAKtC,CAAC;AAqBF,eAAO,MAAM,yBAAyB,UAAuB,CAAC;AAE9D,eAAO,MAAM,eAAe,QAAS,0BAA0B,kBAAkB,MAAM,EAAE,YAUxF,CAAC;AAEF,eAAO,MAAM,cAAc,qBACP,0BAA0B,EAAE,cAClC,OAAO,GAAG,SAAS,KAC9B,0BAA0B,EA0B5B,CAAC;AAEF,eAAO,MAAM,kBAAkB,kBACd,0BAA0B,EAAE,uBACtB,8BAA8B,uBAQpD,CAAC;AAEF,eAAO,MAAM,wBAAwB,QAAS,yBAAyB,KAAG,MAAM,GAAG,SACZ,CAAC;AAExE,eAAO,MAAM,oBAAoB,8BAGhC,CAAC;AAEF,eAAO,MAAM,cAAc,eACb,0BAA0B,GAAG,SAAS,KACjD,eAAe,GAAG,cAC6E,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../../../../lib/cim/types/k8s/shared.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,eAAe,CAAC,aAAa,IAAI;IAC3C,kBAAkB,EAAE,MAAM,CAAC;IAC3B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,OAAO,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../../../../lib/cim/types/k8s/shared.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,eAAe,CAAC,aAAa,IAAI;IAC3C,kBAAkB,EAAE,MAAM,CAAC;IAC3B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,CAAC;IACrC,IAAI,EAAE,aAAa,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG;IACrB,EAAE,EAAE,SAAS,GAAG,KAAK,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC;CACxB,EAAE,CAAC"}
|
|
@@ -44,7 +44,7 @@ const ConditionsTable = ({ conditions, isDone }) => {
|
|
|
44
44
|
React.createElement(react_core_1.Flex, { alignItems: { default: 'alignItemsCenter' }, spaceItems: { default: 'spaceItemsXs' } },
|
|
45
45
|
React.createElement(react_core_1.FlexItem, null, icon),
|
|
46
46
|
React.createElement(react_core_1.FlexItem, null, c.type))),
|
|
47
|
-
React.createElement(react_table_1.Td, { span: 8 }, c.message)));
|
|
47
|
+
React.createElement(react_table_1.Td, { span: 8 }, c.message || '-')));
|
|
48
48
|
}))));
|
|
49
49
|
};
|
|
50
50
|
exports.default = ConditionsTable;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConditionsTable.js","sourceRoot":"","sources":["../../../../../../lib/cim/components/Hypershift/DetailsPage/ConditionsTable.tsx"],"names":[],"mappings":";;;AAAA,uDAAwD;AACxD,+FAA0F;AAC1F,2GAAsG;AACtG,6FAAwF;AACxF,qFAAiF;AACjF,yDAAoF;AACpF,wGAAgH;AAChH,sGAAkH;AAClH,qDAA+B;AAC/B,8FAAkF;AAElF,iCAA+B;AAE/B,MAAM,iBAAiB,GAAG,CAAC,aAAa,CAAC,CAAC;AAC1C,MAAM,kBAAkB,GAAG,CAAC,UAAU,CAAC,CAAC;AAWxC,MAAM,eAAe,GAAG,CAAC,EAAE,UAAU,EAAE,MAAM,EAAwB,EAAE,EAAE;IACvE,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,wCAAc,GAAE,CAAC;IAC/B,OAAO,CACL,oBAAC,6BAAe,IAAC,OAAO,EAAC,SAAS;QAChC,oBAAC,mBAAK;YACJ,oBAAC,gBAAE;gBACD,oBAAC,gBAAE,IAAC,KAAK,EAAE,EAAE,IAAG,CAAC,CAAC,cAAc,CAAC,CAAM;gBACvC,oBAAC,gBAAE,QAAE,CAAC,CAAC,YAAY,CAAC,CAAM,CACvB,CACC;QACR,oBAAC,mBAAK,QACH,UAAU,aAAV,UAAU,uBAAV,UAAU,CACP,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,iBAAiB,CAAC,QAAQ,CAAC,IAAI,CAAC,EACvD,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YACT,IAAI,IAAI,GAAG,oBAAC,0BAAW,OAAG,CAAC;YAE3B,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,kBAAkB,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC;gBACjE,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE;gBAC1C,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC;YAE7C,IAAI,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE;gBAClC,8CAA8C;gBAC9C,IAAI;oBACF,CAAC,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,CACtB,oBAAC,iCAAc,OAAG,CACnB,CAAC,CAAC,CAAC,CACF,oBAAC,mCAAe,IAAC,KAAK,EAAE,mDAAO,CAAC,KAAK,GAAI,CAC1C,CAAC;aACL;iBAAM;gBACL,IAAI,CAAC,CAAC,MAAM,KAAK,QAAQ,EAAE;oBACzB,IAAI,GAAG,oBAAC,mCAAe,IAAC,KAAK,EAAE,mDAAO,CAAC,KAAK,GAAI,CAAC;iBAClD;qBAAM,IAAI,CAAC,CAAC,MAAM,KAAK,SAAS,EAAE;oBACjC,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,CACd,oBAAC,+CAAqB,IAAC,KAAK,EAAE,iDAAW,CAAC,KAAK,EAAE,IAAI,EAAC,IAAI,GAAG,CAC9D,CAAC,CAAC,CAAC,CACF,oBAAC,iCAAc,OAAG,CACnB,CAAC;iBACH;aACF;YACD,OAAO,CACL,oBAAC,gBAAE,IAAC,GAAG,EAAE,CAAC,CAAC,IAAI,EAAE,SAAS,EAAC,gCAAgC;gBACzD,oBAAC,gBAAE;oBACD,oBAAC,iBAAI,IACH,UAAU,EAAE,EAAE,OAAO,EAAE,kBAAkB,EAAE,EAC3C,UAAU,EAAE,EAAE,OAAO,EAAE,cAAc,EAAE;wBAEvC,oBAAC,qBAAQ,QAAE,IAAI,CAAY;wBAC3B,oBAAC,qBAAQ,QAAE,CAAC,CAAC,IAAI,CAAY,CACxB,CACJ;gBACL,oBAAC,gBAAE,IAAC,IAAI,EAAE,CAAC,IAAG,CAAC,CAAC,OAAO,CAAM,
|
|
1
|
+
{"version":3,"file":"ConditionsTable.js","sourceRoot":"","sources":["../../../../../../lib/cim/components/Hypershift/DetailsPage/ConditionsTable.tsx"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,7 @@ const react_core_1 = require("@patternfly/react-core");
|
|
|
9
9
|
const constants_1 = require("../common/constants");
|
|
10
10
|
const use_translation_wrapper_1 = require("../../../common/hooks/use-translation-wrapper");
|
|
11
11
|
const EnvironmentErrors = ({ infraEnv, docVersion, children, inModal, }) => {
|
|
12
|
-
const infraEnvAlerts = (0, helpers_1.getFailingResourceConditions)(infraEnv,
|
|
12
|
+
const infraEnvAlerts = (0, helpers_1.getFailingResourceConditions)(infraEnv, ['ImageCreated']);
|
|
13
13
|
const { t } = (0, use_translation_wrapper_1.useTranslation)();
|
|
14
14
|
if (infraEnv.status && !infraEnvAlerts.length) {
|
|
15
15
|
return React.createElement(React.Fragment, null, children);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EnvironmentErrors.js","sourceRoot":"","sources":["../../../../../lib/cim/components/InfraEnv/EnvironmentErrors.tsx"],"names":[],"mappings":";;;;AAAA,qDAA+B;AAC/B,wCAA0D;AAE1D,6DAAgE;AAChE,uDAA2E;AAC3E,mDAAsD;AACtD,2FAA+E;AASxE,MAAM,iBAAiB,GAAqC,CAAC,EAClE,QAAQ,EACR,UAAU,EACV,QAAQ,EACR,OAAO,GACR,EAAE,EAAE;IACH,MAAM,cAAc,GAAG,IAAA,sCAA4B,EAAC,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"EnvironmentErrors.js","sourceRoot":"","sources":["../../../../../lib/cim/components/InfraEnv/EnvironmentErrors.tsx"],"names":[],"mappings":";;;;AAAA,qDAA+B;AAC/B,wCAA0D;AAE1D,6DAAgE;AAChE,uDAA2E;AAC3E,mDAAsD;AACtD,2FAA+E;AASxE,MAAM,iBAAiB,GAAqC,CAAC,EAClE,QAAQ,EACR,UAAU,EACV,QAAQ,EACR,OAAO,GACR,EAAE,EAAE;IACH,MAAM,cAAc,GAAG,IAAA,sCAA4B,EAAC,QAAQ,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC;IAChF,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,wCAAc,GAAE,CAAC;IAE/B,IAAI,QAAQ,CAAC,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE;QAC7C,OAAO,0CAAG,QAAQ,CAAI,CAAC;KACxB;IAED,MAAM,MAAM,GAAG,CACb;QACG,CAAC,QAAQ,CAAC,MAAM,IAAI,CACnB,oBAAC,kBAAK,IACJ,KAAK,EAAE,CAAC,CAAC,qDAAqD,CAAC,EAC/D,OAAO,EAAE,yBAAY,CAAC,OAAO,EAC7B,QAAQ,QACR,SAAS,EAAC,qBAAqB,EAC/B,WAAW,EACT,2BAAG,IAAI,EAAE,IAAA,2BAAe,EAAC,UAAU,CAAC,EAAE,MAAM,EAAC,QAAQ,EAAC,GAAG,EAAC,qBAAqB,IAC5E,CAAC,CAAC,uBAAuB,CAAC,CACzB,IAGL,CAAC,CACA,mLAAmL,CACpL,CACK,CACT;QACD,oBAAC,qCAAoB,IACnB,KAAK,EAAE,CAAC,CAAC,uCAAuC,CAAC,EACjD,UAAU,EAAE,cAAc,GAC1B,CACD,CACJ,CAAC;IAEF,OAAO,OAAO,CAAC,CAAC,CAAC,oBAAC,yBAAY,QAAE,MAAM,CAAgB,CAAC,CAAC,CAAC,MAAM,CAAC;AAClE,CAAC,CAAC;AAxCW,QAAA,iBAAiB,qBAwC5B"}
|
|
@@ -12,11 +12,19 @@ const SingleResourceAlerts = ({ title, conditions }) => {
|
|
|
12
12
|
return (react_1.default.createElement(react_core_1.Alert, { title: title, variant: react_core_1.AlertVariant.danger, isInline: true, className: "cim-resource-alerts cim-resource-alerts--noul" },
|
|
13
13
|
react_1.default.createElement(react_core_1.TextContent, null,
|
|
14
14
|
react_1.default.createElement(react_core_1.TextList, { component: react_core_1.TextListVariants.ul }, conditions.map((c) => {
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
react_1.default.createElement(
|
|
18
|
-
react_1.default.createElement(
|
|
19
|
-
|
|
15
|
+
if (c.message) {
|
|
16
|
+
const [title, ...messages] = c.message.split(/:|\.,/);
|
|
17
|
+
return (react_1.default.createElement(react_1.default.Fragment, { key: c.type },
|
|
18
|
+
react_1.default.createElement(react_core_1.TextListItem, { component: react_core_1.TextListItemVariants.li },
|
|
19
|
+
react_1.default.createElement("strong", null, title)),
|
|
20
|
+
messages.map((m) => (react_1.default.createElement(react_core_1.TextListItem, { key: m, component: react_core_1.TextListItemVariants.li }, m)))));
|
|
21
|
+
}
|
|
22
|
+
else {
|
|
23
|
+
return (react_1.default.createElement(react_1.default.Fragment, { key: c.type },
|
|
24
|
+
react_1.default.createElement(react_core_1.TextListItem, { component: react_core_1.TextListItemVariants.li },
|
|
25
|
+
react_1.default.createElement("strong", null, c.type)),
|
|
26
|
+
react_1.default.createElement(react_core_1.TextListItem, { component: react_core_1.TextListItemVariants.li }, c.reason || '')));
|
|
27
|
+
}
|
|
20
28
|
})))));
|
|
21
29
|
};
|
|
22
30
|
exports.SingleResourceAlerts = SingleResourceAlerts;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ResourceAlerts.js","sourceRoot":"","sources":["../../../../../lib/cim/components/common/ResourceAlerts.tsx"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,uDAQgC;AAGhC,gCAA8B;AAEvB,MAAM,oBAAoB,GAG5B,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE,EAAE;IAC7B,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;QACtB,OAAO,IAAI,CAAC;KACb;IAED,OAAO,CACL,8BAAC,kBAAK,IACJ,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,yBAAY,CAAC,MAAM,EAC5B,QAAQ,QACR,SAAS,EAAC,+CAA+C;QAEzD,8BAAC,wBAAW;YACV,8BAAC,qBAAQ,IAAC,SAAS,EAAE,6BAAgB,CAAC,EAAE,IACrC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;gBACpB,MAAM,CAAC,KAAK,EAAE,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"ResourceAlerts.js","sourceRoot":"","sources":["../../../../../lib/cim/components/common/ResourceAlerts.tsx"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,uDAQgC;AAGhC,gCAA8B;AAEvB,MAAM,oBAAoB,GAG5B,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE,EAAE;IAC7B,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;QACtB,OAAO,IAAI,CAAC;KACb;IAED,OAAO,CACL,8BAAC,kBAAK,IACJ,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,yBAAY,CAAC,MAAM,EAC5B,QAAQ,QACR,SAAS,EAAC,+CAA+C;QAEzD,8BAAC,wBAAW;YACV,8BAAC,qBAAQ,IAAC,SAAS,EAAE,6BAAgB,CAAC,EAAE,IACrC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;gBACpB,IAAI,CAAC,CAAC,OAAO,EAAE;oBACb,MAAM,CAAC,KAAK,EAAE,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;oBACtD,OAAO,CACL,8BAAC,eAAK,CAAC,QAAQ,IAAC,GAAG,EAAE,CAAC,CAAC,IAAI;wBACzB,8BAAC,yBAAY,IAAC,SAAS,EAAE,iCAAoB,CAAC,EAAE;4BAC9C,8CAAS,KAAK,CAAU,CACX;wBACd,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CACnB,8BAAC,yBAAY,IAAC,GAAG,EAAE,CAAC,EAAE,SAAS,EAAE,iCAAoB,CAAC,EAAE,IACrD,CAAC,CACW,CAChB,CAAC,CACa,CAClB,CAAC;iBACH;qBAAM;oBACL,OAAO,CACL,8BAAC,eAAK,CAAC,QAAQ,IAAC,GAAG,EAAE,CAAC,CAAC,IAAI;wBACzB,8BAAC,yBAAY,IAAC,SAAS,EAAE,iCAAoB,CAAC,EAAE;4BAC9C,8CAAS,CAAC,CAAC,IAAI,CAAU,CACZ;wBACf,8BAAC,yBAAY,IAAC,SAAS,EAAE,iCAAoB,CAAC,EAAE,IAAG,CAAC,CAAC,MAAM,IAAI,EAAE,CAAgB,CAClE,CAClB,CAAC;iBACH;YACH,CAAC,CAAC,CACO,CACC,CACR,CACT,CAAC;AACJ,CAAC,CAAC;AA/CW,QAAA,oBAAoB,wBA+C/B"}
|
|
@@ -1,45 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getBMHStatus = exports.getBMHStatusKey = exports.getWizardStepAgentStatus = exports.getAgentStatus = exports.getAgentStatusKey = exports.
|
|
3
|
+
exports.getBMHStatus = exports.getBMHStatusKey = exports.getWizardStepAgentStatus = exports.getAgentStatus = exports.getAgentStatusKey = exports.isDraft = exports.getClusterStatus = void 0;
|
|
4
4
|
const validationsInfoUtils_1 = require("../../../common/components/clusterWizard/validationsInfoUtils");
|
|
5
5
|
const wizardTransition_1 = require("../ClusterDeployment/wizardTransition");
|
|
6
6
|
const agentStatus_1 = require("./agentStatus");
|
|
7
7
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
8
8
|
const conditionsByTypeReducer = (result, condition) => (Object.assign(Object.assign({}, result), { [condition.type]: condition }));
|
|
9
|
-
const getClusterStatusFromConditions = (agentClusterInstall, t) => {
|
|
10
|
-
var _a;
|
|
11
|
-
const conditions = ((_a = agentClusterInstall === null || agentClusterInstall === void 0 ? void 0 : agentClusterInstall.status) === null || _a === void 0 ? void 0 : _a.conditions) || [];
|
|
12
|
-
const conditionsByType = conditions.reduce(conditionsByTypeReducer, {});
|
|
13
|
-
const { Validated, RequirementsMet, Completed, Stopped } = conditionsByType;
|
|
14
|
-
if (!Validated || !RequirementsMet || !Completed || !Stopped) {
|
|
15
|
-
return ['insufficient', t('ai:AgentClusterInstall conditions are missing.')];
|
|
16
|
-
}
|
|
17
|
-
if (Stopped.status === 'True' && Stopped.reason === 'InstallationCancelled')
|
|
18
|
-
return ['cancelled', Stopped.message];
|
|
19
|
-
if (Stopped.status === 'True' && Stopped.reason === 'InstallationFailed')
|
|
20
|
-
return ['error', Stopped.message];
|
|
21
|
-
if (Completed.status === 'True' && Completed.reason === 'InstallationCompleted')
|
|
22
|
-
return ['installed', Completed.message];
|
|
23
|
-
if (Completed.status === 'False' && Completed.reason === 'InstallationInProgress')
|
|
24
|
-
return ['installing', Completed.message];
|
|
25
|
-
if (Validated.status === 'False' && Validated.reason === 'ValidationsFailing')
|
|
26
|
-
return ['insufficient', Validated.message];
|
|
27
|
-
if (Validated.status === 'False' && Validated.reason === 'ValidationsUserPending')
|
|
28
|
-
return ['pending-for-input', Validated.message];
|
|
29
|
-
if (Validated.status === 'False' && Validated.reason === 'ValidationsUnknown')
|
|
30
|
-
return ['insufficient', Validated.message];
|
|
31
|
-
if (RequirementsMet.status === 'False' && RequirementsMet.reason === 'ClusterNotReady')
|
|
32
|
-
return ['insufficient', RequirementsMet.message];
|
|
33
|
-
if (RequirementsMet.status === 'False' && RequirementsMet.reason === 'InsufficientAgents')
|
|
34
|
-
return ['insufficient', RequirementsMet.message];
|
|
35
|
-
if (RequirementsMet.status === 'False' && RequirementsMet.reason === 'UnapprovedAgents')
|
|
36
|
-
return ['insufficient', RequirementsMet.message];
|
|
37
|
-
if (Completed.status === 'False' && Completed.reason === 'UnapprovedAgents')
|
|
38
|
-
return ['insufficient', Completed.message];
|
|
39
|
-
// console.error('Unhandled conditions to cluster status mapping: ', conditionsByType);
|
|
40
|
-
return ['insufficient', t('ai:Unexpected AgentClusterInstall conditions.')];
|
|
41
|
-
};
|
|
42
|
-
exports.getClusterStatusFromConditions = getClusterStatusFromConditions;
|
|
43
9
|
const getClusterStatus = (agentClusterInstall) => {
|
|
44
10
|
var _a;
|
|
45
11
|
const { state: status, stateInfo: statusInfo } = ((_a = agentClusterInstall === null || agentClusterInstall === void 0 ? void 0 : agentClusterInstall.status) === null || _a === void 0 ? void 0 : _a.debugInfo) || {};
|
|
@@ -49,30 +15,6 @@ exports.getClusterStatus = getClusterStatus;
|
|
|
49
15
|
const isDraft = (agentClusterInstall) => !!agentClusterInstall &&
|
|
50
16
|
['pending-for-input', 'insufficient', 'ready'].includes((0, exports.getClusterStatus)(agentClusterInstall)[0]);
|
|
51
17
|
exports.isDraft = isDraft;
|
|
52
|
-
const getAgentStatusFromConditions = (agent, t) => {
|
|
53
|
-
var _a;
|
|
54
|
-
const conditions = (_a = agent.status) === null || _a === void 0 ? void 0 : _a.conditions;
|
|
55
|
-
const conditionsByType = (conditions || []).reduce(conditionsByTypeReducer, {});
|
|
56
|
-
const { Installed, Connected, ReadyForInstallation } = conditionsByType;
|
|
57
|
-
if ((Installed === null || Installed === void 0 ? void 0 : Installed.status) === 'True')
|
|
58
|
-
return ['installed', Installed.message];
|
|
59
|
-
if ((Installed === null || Installed === void 0 ? void 0 : Installed.status) === 'False' && Installed.reason === 'InstallationFailed')
|
|
60
|
-
return ['error', Installed.message];
|
|
61
|
-
if ((Installed === null || Installed === void 0 ? void 0 : Installed.status) === 'False' && (Installed === null || Installed === void 0 ? void 0 : Installed.reason) === 'InstallationInProgress')
|
|
62
|
-
return ['installing', Installed === null || Installed === void 0 ? void 0 : Installed.message];
|
|
63
|
-
if ((Connected === null || Connected === void 0 ? void 0 : Connected.status) === 'False')
|
|
64
|
-
return ['disconnected', Connected.message];
|
|
65
|
-
if ((ReadyForInstallation === null || ReadyForInstallation === void 0 ? void 0 : ReadyForInstallation.status) === 'True')
|
|
66
|
-
return ['known', ReadyForInstallation.message];
|
|
67
|
-
if ((ReadyForInstallation === null || ReadyForInstallation === void 0 ? void 0 : ReadyForInstallation.status) === 'False' &&
|
|
68
|
-
(ReadyForInstallation === null || ReadyForInstallation === void 0 ? void 0 : ReadyForInstallation.reason) === 'AgentIsNotApproved')
|
|
69
|
-
return ['pending-for-input', ReadyForInstallation.message];
|
|
70
|
-
if ((ReadyForInstallation === null || ReadyForInstallation === void 0 ? void 0 : ReadyForInstallation.status) === 'False' && (ReadyForInstallation === null || ReadyForInstallation === void 0 ? void 0 : ReadyForInstallation.reason) === 'AgentNotReady')
|
|
71
|
-
return ['insufficient', ReadyForInstallation.message];
|
|
72
|
-
// console.error('Unhandled conditions to agent status mapping: ', conditionsByType);
|
|
73
|
-
return ['insufficient', t('ai:Unexpected Agent conditions.')];
|
|
74
|
-
};
|
|
75
|
-
exports.getAgentStatusFromConditions = getAgentStatusFromConditions;
|
|
76
18
|
const getInsufficientState = (agent) => { var _a, _b; return ((_b = (_a = agent === null || agent === void 0 ? void 0 : agent.spec) === null || _a === void 0 ? void 0 : _a.clusterDeploymentName) === null || _b === void 0 ? void 0 : _b.name) ? 'insufficient' : 'insufficient-unbound'; };
|
|
77
19
|
const getAgentStatusKey = (agent, excludeDiscovered = false) => {
|
|
78
20
|
var _a, _b, _c, _d;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status.js","sourceRoot":"","sources":["../../../../../lib/cim/components/helpers/status.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"status.js","sourceRoot":"","sources":["../../../../../lib/cim/components/helpers/status.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getNetworkType = exports.getMajorMinorVersion = exports.getCurrentClusterVersion = exports.getSelectedVersion = exports.getOCPVersions = exports.getVersionFromReleaseImage = void 0;
|
|
3
|
+
exports.getNetworkType = exports.getMajorMinorVersion = exports.getCurrentClusterVersion = exports.getSelectedVersion = exports.getOCPVersions = exports.isValidImageSet = exports.supportedNutanixPlatforms = exports.getVersionFromReleaseImage = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const uniqBy_js_1 = tslib_1.__importDefault(require("lodash-es/uniqBy.js"));
|
|
6
6
|
const getVersionFromReleaseImage = (releaseImage = '') => {
|
|
7
7
|
const match = /.+:(.*)-/gm.exec(releaseImage);
|
|
8
|
-
if (match && match[1]) {
|
|
8
|
+
if (match && match.length > 1 && match[1]) {
|
|
9
9
|
return match[1];
|
|
10
10
|
}
|
|
11
11
|
};
|
|
@@ -23,16 +23,21 @@ const getSupportLevelFromChannel = (channel) => {
|
|
|
23
23
|
}
|
|
24
24
|
return 'beta';
|
|
25
25
|
};
|
|
26
|
+
exports.supportedNutanixPlatforms = ['x86_64', 'x86-64'];
|
|
27
|
+
const isValidImageSet = (cis, architectures) => {
|
|
28
|
+
var _a, _b;
|
|
29
|
+
if (((_b = (_a = cis.metadata) === null || _a === void 0 ? void 0 : _a.labels) === null || _b === void 0 ? void 0 : _b.visible) !== 'true') {
|
|
30
|
+
return false;
|
|
31
|
+
}
|
|
32
|
+
if (!architectures) {
|
|
33
|
+
return true;
|
|
34
|
+
}
|
|
35
|
+
return architectures.some((arch) => { var _a, _b, _c; return ((_a = cis.spec) === null || _a === void 0 ? void 0 : _a.releaseImage.endsWith(arch)) || ((_c = (_b = cis.metadata) === null || _b === void 0 ? void 0 : _b.labels) === null || _c === void 0 ? void 0 : _c.architecture) === arch; });
|
|
36
|
+
};
|
|
37
|
+
exports.isValidImageSet = isValidImageSet;
|
|
26
38
|
const getOCPVersions = (clusterImageSets, isNutanix) => {
|
|
27
39
|
const versions = clusterImageSets
|
|
28
|
-
.filter((clusterImageSet) =>
|
|
29
|
-
var _a, _b, _c;
|
|
30
|
-
let supportedPlatform = true;
|
|
31
|
-
if (isNutanix && ((_a = clusterImageSet.spec) === null || _a === void 0 ? void 0 : _a.releaseImage)) {
|
|
32
|
-
supportedPlatform = clusterImageSet.spec.releaseImage.endsWith('-x86_64');
|
|
33
|
-
}
|
|
34
|
-
return supportedPlatform && ((_c = (_b = clusterImageSet.metadata) === null || _b === void 0 ? void 0 : _b.labels) === null || _c === void 0 ? void 0 : _c.visible) !== 'false';
|
|
35
|
-
})
|
|
40
|
+
.filter((clusterImageSet) => (0, exports.isValidImageSet)(clusterImageSet, isNutanix ? exports.supportedNutanixPlatforms : undefined))
|
|
36
41
|
.map((clusterImageSet) => {
|
|
37
42
|
var _a, _b, _c, _d;
|
|
38
43
|
const version = (0, exports.getVersionFromReleaseImage)((_a = clusterImageSet.spec) === null || _a === void 0 ? void 0 : _a.releaseImage);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../lib/cim/components/helpers/versions.ts"],"names":[],"mappings":";;;;AAAA,4EAAyC;AAUlC,MAAM,0BAA0B,GAAG,CAAC,YAAY,GAAG,EAAE,EAAE,EAAE;IAC9D,MAAM,KAAK,GAAG,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC9C,IAAI,KAAK,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../lib/cim/components/helpers/versions.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,7 +18,7 @@ type ConditionsTableProps = {
|
|
|
18
18
|
conditions?: {
|
|
19
19
|
status: string;
|
|
20
20
|
type: string;
|
|
21
|
-
message
|
|
21
|
+
message?: string;
|
|
22
22
|
}[];
|
|
23
23
|
isDone: boolean;
|
|
24
24
|
};
|
|
@@ -73,7 +73,7 @@ const ConditionsTable = ({ conditions, isDone }: ConditionsTableProps) => {
|
|
|
73
73
|
<FlexItem>{c.type}</FlexItem>
|
|
74
74
|
</Flex>
|
|
75
75
|
</Td>
|
|
76
|
-
<Td span={8}>{c.message}</Td>
|
|
76
|
+
<Td span={8}>{c.message || '-'}</Td>
|
|
77
77
|
</Tr>
|
|
78
78
|
);
|
|
79
79
|
})}
|
|
@@ -19,7 +19,7 @@ export const EnvironmentErrors: React.FC<EnvironmentErrorsProps> = ({
|
|
|
19
19
|
children,
|
|
20
20
|
inModal,
|
|
21
21
|
}) => {
|
|
22
|
-
const infraEnvAlerts = getFailingResourceConditions(infraEnv,
|
|
22
|
+
const infraEnvAlerts = getFailingResourceConditions(infraEnv, ['ImageCreated']);
|
|
23
23
|
const { t } = useTranslation();
|
|
24
24
|
|
|
25
25
|
if (infraEnv.status && !infraEnvAlerts.length) {
|
|
@@ -30,19 +30,30 @@ export const SingleResourceAlerts: React.FC<{
|
|
|
30
30
|
<TextContent>
|
|
31
31
|
<TextList component={TextListVariants.ul}>
|
|
32
32
|
{conditions.map((c) => {
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
<
|
|
37
|
-
<
|
|
38
|
-
|
|
39
|
-
{messages.map((m) => (
|
|
40
|
-
<TextListItem key={m} component={TextListItemVariants.li}>
|
|
41
|
-
{m}
|
|
33
|
+
if (c.message) {
|
|
34
|
+
const [title, ...messages] = c.message.split(/:|\.,/);
|
|
35
|
+
return (
|
|
36
|
+
<React.Fragment key={c.type}>
|
|
37
|
+
<TextListItem component={TextListItemVariants.li}>
|
|
38
|
+
<strong>{title}</strong>
|
|
42
39
|
</TextListItem>
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
40
|
+
{messages.map((m) => (
|
|
41
|
+
<TextListItem key={m} component={TextListItemVariants.li}>
|
|
42
|
+
{m}
|
|
43
|
+
</TextListItem>
|
|
44
|
+
))}
|
|
45
|
+
</React.Fragment>
|
|
46
|
+
);
|
|
47
|
+
} else {
|
|
48
|
+
return (
|
|
49
|
+
<React.Fragment key={c.type}>
|
|
50
|
+
<TextListItem component={TextListItemVariants.li}>
|
|
51
|
+
<strong>{c.type}</strong>
|
|
52
|
+
</TextListItem>
|
|
53
|
+
<TextListItem component={TextListItemVariants.li}>{c.reason || ''}</TextListItem>
|
|
54
|
+
</React.Fragment>
|
|
55
|
+
);
|
|
56
|
+
}
|
|
46
57
|
})}
|
|
47
58
|
</TextList>
|
|
48
59
|
</TextContent>
|
|
@@ -1,14 +1,6 @@
|
|
|
1
|
-
import {
|
|
2
|
-
AgentClusterInstallK8sResource,
|
|
3
|
-
AgentClusterInstallStatusCondition,
|
|
4
|
-
AgentClusterInstallStatusConditionType,
|
|
5
|
-
} from '../../types/k8s/agent-cluster-install';
|
|
1
|
+
import { AgentClusterInstallK8sResource } from '../../types/k8s/agent-cluster-install';
|
|
6
2
|
import { Cluster, Host } from '@openshift-assisted/types/assisted-installer-service';
|
|
7
|
-
import {
|
|
8
|
-
AgentK8sResource,
|
|
9
|
-
AgentStatusCondition,
|
|
10
|
-
AgentStatusConditionType,
|
|
11
|
-
} from '../../types/k8s/agent';
|
|
3
|
+
import { AgentK8sResource } from '../../types/k8s/agent';
|
|
12
4
|
import { BareMetalHostK8sResource } from '../../types/k8s/bare-metal-host';
|
|
13
5
|
import { StatusCondition } from '../../types/k8s/shared';
|
|
14
6
|
import { ValidationsInfo } from '../../../common/types/hosts';
|
|
@@ -35,50 +27,6 @@ const conditionsByTypeReducer = <K>(
|
|
|
35
27
|
[condition.type]: condition,
|
|
36
28
|
});
|
|
37
29
|
|
|
38
|
-
export const getClusterStatusFromConditions = (
|
|
39
|
-
agentClusterInstall: AgentClusterInstallK8sResource,
|
|
40
|
-
t: TFunction,
|
|
41
|
-
): [Cluster['status'], string] => {
|
|
42
|
-
const conditions = agentClusterInstall?.status?.conditions || [];
|
|
43
|
-
|
|
44
|
-
const conditionsByType: {
|
|
45
|
-
[key in AgentClusterInstallStatusConditionType]?: AgentClusterInstallStatusCondition;
|
|
46
|
-
} = conditions.reduce(conditionsByTypeReducer, {});
|
|
47
|
-
|
|
48
|
-
const { Validated, RequirementsMet, Completed, Stopped } = conditionsByType;
|
|
49
|
-
|
|
50
|
-
if (!Validated || !RequirementsMet || !Completed || !Stopped) {
|
|
51
|
-
return ['insufficient', t('ai:AgentClusterInstall conditions are missing.')];
|
|
52
|
-
}
|
|
53
|
-
|
|
54
|
-
if (Stopped.status === 'True' && Stopped.reason === 'InstallationCancelled')
|
|
55
|
-
return ['cancelled', Stopped.message];
|
|
56
|
-
if (Stopped.status === 'True' && Stopped.reason === 'InstallationFailed')
|
|
57
|
-
return ['error', Stopped.message];
|
|
58
|
-
if (Completed.status === 'True' && Completed.reason === 'InstallationCompleted')
|
|
59
|
-
return ['installed', Completed.message];
|
|
60
|
-
if (Completed.status === 'False' && Completed.reason === 'InstallationInProgress')
|
|
61
|
-
return ['installing', Completed.message];
|
|
62
|
-
if (Validated.status === 'False' && Validated.reason === 'ValidationsFailing')
|
|
63
|
-
return ['insufficient', Validated.message];
|
|
64
|
-
if (Validated.status === 'False' && Validated.reason === 'ValidationsUserPending')
|
|
65
|
-
return ['pending-for-input', Validated.message];
|
|
66
|
-
if (Validated.status === 'False' && Validated.reason === 'ValidationsUnknown')
|
|
67
|
-
return ['insufficient', Validated.message];
|
|
68
|
-
|
|
69
|
-
if (RequirementsMet.status === 'False' && RequirementsMet.reason === 'ClusterNotReady')
|
|
70
|
-
return ['insufficient', RequirementsMet.message];
|
|
71
|
-
if (RequirementsMet.status === 'False' && RequirementsMet.reason === 'InsufficientAgents')
|
|
72
|
-
return ['insufficient', RequirementsMet.message];
|
|
73
|
-
if (RequirementsMet.status === 'False' && RequirementsMet.reason === 'UnapprovedAgents')
|
|
74
|
-
return ['insufficient', RequirementsMet.message];
|
|
75
|
-
if (Completed.status === 'False' && Completed.reason === 'UnapprovedAgents')
|
|
76
|
-
return ['insufficient', Completed.message];
|
|
77
|
-
|
|
78
|
-
// console.error('Unhandled conditions to cluster status mapping: ', conditionsByType);
|
|
79
|
-
return ['insufficient', t('ai:Unexpected AgentClusterInstall conditions.')];
|
|
80
|
-
};
|
|
81
|
-
|
|
82
30
|
export const getClusterStatus = (
|
|
83
31
|
agentClusterInstall?: AgentClusterInstallK8sResource,
|
|
84
32
|
): [Cluster['status'], Cluster['statusInfo']] => {
|
|
@@ -90,37 +38,6 @@ export const isDraft = (agentClusterInstall?: AgentClusterInstallK8sResource): b
|
|
|
90
38
|
!!agentClusterInstall &&
|
|
91
39
|
['pending-for-input', 'insufficient', 'ready'].includes(getClusterStatus(agentClusterInstall)[0]);
|
|
92
40
|
|
|
93
|
-
export const getAgentStatusFromConditions = (
|
|
94
|
-
agent: AgentK8sResource,
|
|
95
|
-
t: TFunction,
|
|
96
|
-
): [Host['status'], string] => {
|
|
97
|
-
const conditions = agent.status?.conditions;
|
|
98
|
-
|
|
99
|
-
const conditionsByType: {
|
|
100
|
-
[key in AgentStatusConditionType]?: AgentStatusCondition;
|
|
101
|
-
} = (conditions || []).reduce(conditionsByTypeReducer, {});
|
|
102
|
-
|
|
103
|
-
const { Installed, Connected, ReadyForInstallation } = conditionsByType;
|
|
104
|
-
|
|
105
|
-
if (Installed?.status === 'True') return ['installed', Installed.message];
|
|
106
|
-
if (Installed?.status === 'False' && Installed.reason === 'InstallationFailed')
|
|
107
|
-
return ['error', Installed.message];
|
|
108
|
-
if (Installed?.status === 'False' && Installed?.reason === 'InstallationInProgress')
|
|
109
|
-
return ['installing', Installed?.message];
|
|
110
|
-
if (Connected?.status === 'False') return ['disconnected', Connected.message];
|
|
111
|
-
if (ReadyForInstallation?.status === 'True') return ['known', ReadyForInstallation.message];
|
|
112
|
-
if (
|
|
113
|
-
ReadyForInstallation?.status === 'False' &&
|
|
114
|
-
ReadyForInstallation?.reason === 'AgentIsNotApproved'
|
|
115
|
-
)
|
|
116
|
-
return ['pending-for-input', ReadyForInstallation.message];
|
|
117
|
-
if (ReadyForInstallation?.status === 'False' && ReadyForInstallation?.reason === 'AgentNotReady')
|
|
118
|
-
return ['insufficient', ReadyForInstallation.message];
|
|
119
|
-
|
|
120
|
-
// console.error('Unhandled conditions to agent status mapping: ', conditionsByType);
|
|
121
|
-
return ['insufficient', t('ai:Unexpected Agent conditions.')];
|
|
122
|
-
};
|
|
123
|
-
|
|
124
41
|
export type AgentStatus = Host['status'] | 'discovered';
|
|
125
42
|
|
|
126
43
|
const getInsufficientState = (agent: AgentK8sResource) =>
|
|
@@ -10,7 +10,7 @@ import { OpenshiftVersion } from '@openshift-assisted/types/assisted-installer-s
|
|
|
10
10
|
|
|
11
11
|
export const getVersionFromReleaseImage = (releaseImage = '') => {
|
|
12
12
|
const match = /.+:(.*)-/gm.exec(releaseImage);
|
|
13
|
-
if (match && match[1]) {
|
|
13
|
+
if (match && match.length > 1 && match[1]) {
|
|
14
14
|
return match[1];
|
|
15
15
|
}
|
|
16
16
|
};
|
|
@@ -34,18 +34,28 @@ const getSupportLevelFromChannel = (
|
|
|
34
34
|
return 'beta';
|
|
35
35
|
};
|
|
36
36
|
|
|
37
|
+
export const supportedNutanixPlatforms = ['x86_64', 'x86-64'];
|
|
38
|
+
|
|
39
|
+
export const isValidImageSet = (cis: ClusterImageSetK8sResource, architectures?: string[]) => {
|
|
40
|
+
if (cis.metadata?.labels?.visible !== 'true') {
|
|
41
|
+
return false;
|
|
42
|
+
}
|
|
43
|
+
if (!architectures) {
|
|
44
|
+
return true;
|
|
45
|
+
}
|
|
46
|
+
return architectures.some(
|
|
47
|
+
(arch) => cis.spec?.releaseImage.endsWith(arch) || cis.metadata?.labels?.architecture === arch,
|
|
48
|
+
);
|
|
49
|
+
};
|
|
50
|
+
|
|
37
51
|
export const getOCPVersions = (
|
|
38
52
|
clusterImageSets: ClusterImageSetK8sResource[],
|
|
39
53
|
isNutanix?: boolean | undefined,
|
|
40
54
|
): OpenshiftVersionOptionType[] => {
|
|
41
55
|
const versions = clusterImageSets
|
|
42
|
-
.filter((clusterImageSet) =>
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
supportedPlatform = clusterImageSet.spec.releaseImage.endsWith('-x86_64');
|
|
46
|
-
}
|
|
47
|
-
return supportedPlatform && clusterImageSet.metadata?.labels?.visible !== 'false';
|
|
48
|
-
})
|
|
56
|
+
.filter((clusterImageSet) =>
|
|
57
|
+
isValidImageSet(clusterImageSet, isNutanix ? supportedNutanixPlatforms : undefined),
|
|
58
|
+
)
|
|
49
59
|
.map((clusterImageSet): OpenshiftVersionOptionType => {
|
|
50
60
|
const version = getVersionFromReleaseImage(clusterImageSet.spec?.releaseImage);
|
|
51
61
|
return {
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"dependencies": {
|
|
3
|
-
"@openshift-assisted/locales": "2.10.
|
|
4
|
-
"@openshift-assisted/types": "2.10.
|
|
3
|
+
"@openshift-assisted/locales": "2.10.6-cim",
|
|
4
|
+
"@openshift-assisted/types": "2.10.6-cim",
|
|
5
5
|
"@openshift-console/dynamic-plugin-sdk": "0.0.3",
|
|
6
6
|
"@patternfly/patternfly": "^4.222.4",
|
|
7
7
|
"@patternfly/react-code-editor": "^4.82.113",
|
|
@@ -141,5 +141,5 @@
|
|
|
141
141
|
]
|
|
142
142
|
}
|
|
143
143
|
},
|
|
144
|
-
"version": "2.10.
|
|
144
|
+
"version": "2.10.6-cim"
|
|
145
145
|
}
|