i {
+ color: var(--error);
+ height: $error-icon-size;
+ font-size: $error-icon-size;
+ width: $error-icon-size;
+ }
}
}
diff --git a/shell/plugins/plugin.js b/shell/plugins/plugin.js
index 523f9e5da2e..67c29206ba0 100644
--- a/shell/plugins/plugin.js
+++ b/shell/plugins/plugin.js
@@ -1,6 +1,8 @@
// This plugin loads any UI Plugins at app load time
import { allHashSettled } from '@shell/utils/promise';
import { shouldNotLoadPlugin, UI_PLUGIN_BASE_URL } from '@shell/config/uiplugins';
+import { getKubeVersionData, getVersionData } from '@shell/config/version';
+import versions from '@shell/utils/versions';
export default async function(context) {
if (process.env.excludeOperatorPkg === 'true') {
@@ -26,31 +28,37 @@ export default async function(context) {
}
if (loadPlugins) {
- // TODO: Get rancher version using the new API (can't use setting as we have not loading the store)
- const rancherVersion = undefined;
-
// Fetch list of installed plugins from endpoint
try {
- const res = await context.store.dispatch('management/request', {
- url: `${ UI_PLUGIN_BASE_URL }`,
- method: 'GET',
- headers: { accept: 'application/json' },
- redirectUnauthorized: false,
+ const res = await allHashSettled({
+ versions: versions.fetch(context),
+ plugins: context.store.dispatch('management/request', {
+ url: `${ UI_PLUGIN_BASE_URL }`,
+ method: 'GET',
+ headers: { accept: 'application/json' },
+ redirectUnauthorized: false,
+ })
});
- if (res) {
- const entries = res.entries || res.Entries || {};
+ if (res.plugins.status === 'rejected') {
+ throw new Error(res.reason);
+ }
- Object.values(entries).forEach((plugin) => {
- const shouldNotLoad = shouldNotLoadPlugin(plugin, rancherVersion, context.store.getters['uiplugins/plugins'] || []); // Error key string or boolean
+ const kubeVersion = getKubeVersionData()?.gitVersion;
+ const rancherVersion = getVersionData().Version;
- if (!shouldNotLoad) {
- hash[plugin.name] = context.$plugin.loadPluginAsync(plugin);
- } else {
- context.store.dispatch('uiplugins/setError', { name: plugin.name, error: shouldNotLoad });
- }
- });
- }
+ const plugins = res.plugins.value;
+ const entries = plugins.entries || plugins.Entries || {};
+
+ Object.values(entries).forEach((plugin) => {
+ const shouldNotLoad = shouldNotLoadPlugin(plugin, { rancherVersion, kubeVersion }, context.store.getters['uiplugins/plugins'] || []); // Error key string or boolean
+
+ if (!shouldNotLoad) {
+ hash[plugin.name] = context.$plugin.loadPluginAsync(plugin);
+ } else {
+ context.store.dispatch('uiplugins/setError', { name: plugin.name, error: shouldNotLoad });
+ }
+ });
} catch (e) {
if (e?.code === 404) {
// Not found, so extensions operator probably not installed
diff --git a/shell/plugins/version.js b/shell/plugins/version.js
index d1e51131eec..f3cd4080021 100644
--- a/shell/plugins/version.js
+++ b/shell/plugins/version.js
@@ -1,21 +1,11 @@
/**
- * Fetch version metadata from backend /rancherversion API and store it
+ * Fetch version metadata from backend /rancherversion and /versionAPI and store it
*
* This metadata does not change for an installation of Rancher
*/
-import { setVersionData } from '@shell/config/version';
+import versions from '@shell/utils/versions';
export default async function({ store }) {
- try {
- const response = await store.dispatch('rancher/request', {
- url: '/rancherversion',
- method: 'get',
- redirectUnauthorized: false
- });
-
- setVersionData(response);
- } catch (e) {
- console.warn('Failed to fetch Rancher version metadata', e); // eslint-disable-line no-console
- }
+ await versions.fetch({ store });
}
diff --git a/shell/utils/versions.ts b/shell/utils/versions.ts
new file mode 100644
index 00000000000..9e33b48b72d
--- /dev/null
+++ b/shell/utils/versions.ts
@@ -0,0 +1,39 @@
+import { setKubeVersionData, setVersionData } from '@shell/config/version';
+
+class Versions {
+ private promise?: Promise
;
+
+ async fetch(context: { store: any }): Promise {
+ if (this.promise) {
+ return this.promise;
+ }
+
+ const rancherVersionRequest = context.store.dispatch('rancher/request', {
+ url: '/rancherversion',
+ method: 'get',
+ redirectUnauthorized: false
+ }).then((response: any) => {
+ setVersionData(response);
+ }).catch((e: Error) => {
+ console.warn('Failed to fetch Rancher version metadata', e); // eslint-disable-line no-console
+ });
+
+ const kubeVersionRequest = context.store.dispatch('rancher/request', {
+ url: '/version',
+ method: 'get',
+ redirectUnauthorized: false
+ }).then((response: any) => {
+ setKubeVersionData(response);
+ }).catch((e: Error) => {
+ console.warn('Failed to fetch Kube version metadata', e); // eslint-disable-line no-console
+ });
+
+ this.promise = Promise.allSettled([rancherVersionRequest, kubeVersionRequest]);
+
+ return this.promise;
+ }
+}
+
+const versions = new Versions();
+
+export default versions;
diff --git a/shell/vue.config.js b/shell/vue.config.js
index c00f4ac238d..a17c7043127 100644
--- a/shell/vue.config.js
+++ b/shell/vue.config.js
@@ -74,6 +74,7 @@ const getProxyConfig = (proxyConfig) => ({
'/meta': proxyMetaOpts(api), // Browser API UI
'/v1-*': proxyOpts(api), // SAML, KDM, etc
'/rancherversion': proxyPrimeOpts(api), // Rancher version endpoint
+ '/version': proxyPrimeOpts(api), // Rancher Kube version endpoint
// These are for Ember embedding
'/c/*/edit': proxyOpts('https://127.0.0.1:8000'), // Can't proxy all of /c because that's used by Vue too
'/k/': proxyOpts('https://127.0.0.1:8000'),
@@ -362,6 +363,9 @@ const getVirtualModulesAutoImport = (dir) => {
return new VirtualModulesPlugin(autoImportTypes);
};
+// Get current shell version
+const shellPkgData = require(path.join(__dirname, 'package.json'));
+
/**
* DefinePlugin does string replacement within our code. We may want to consider replacing it with something else. In code we'll see something like
* process.env.commit even though process and env aren't even defined objects. This could cause people to be mislead.
@@ -377,6 +381,7 @@ const createEnvVariablesPlugin = (routerBasePath, rancherEnv) => new webpack.Def
'process.env.rancherEnv': JSON.stringify(rancherEnv),
'process.env.harvesterPkgUrl': JSON.stringify(process.env.HARVESTER_PKG_URL),
'process.env.api': JSON.stringify(api),
+ 'process.env.UI_EXTENSIONS_API_VERSION': JSON.stringify(shellPkgData.version),
// Store the Router Base as env variable that we can use in `shell/config/router.js`
'process.env.routerBase': JSON.stringify(routerBasePath),
__VUE_PROD_HYDRATION_MISMATCH_DETAILS__: 'false',