@openshift-assisted/ui-lib 2.10.5-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/helpers/versions.d.ts +2 -0
- package/build/@types/cim/components/helpers/versions.d.ts.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/helpers/versions.ts +18 -8
- package/package.json +3 -3
|
@@ -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,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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"}
|
|
@@ -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
|
}
|