@rancher/shell 0.3.11 → 0.3.12

package/pages/c/_cluster/apps/charts/install.vue

@@ -1120,6 +1120,7 @@ export default {
         Refer to the developer docs at docs/developer/helm-chart-apps.md
         for details on what values are injected and where they come from.
       */
+
       this.addGlobalValuesTo(values);
 
       const form = JSON.parse(JSON.stringify(this.value));
@@ -1510,6 +1511,7 @@ export default {
         <div class="step__values__controls">
           <ButtonGroup
             v-model="preFormYamlOption"
+            data-testid="btn-group-options-view"
             :options="formYamlOptions"
             inactive-class="bg-disabled btn-sm"
             active-class="bg-primary btn-sm"
@@ -1979,7 +1981,7 @@ export default {
   display: flex;
   flex-direction: column;
   padding: 0;
-  height: calc(100% - 112px);
+  overflow: auto;
 }
 
 .header {
@@ -2052,10 +2054,11 @@ export default {
 }
 
 .os-label {
-  position: absolute;
+  position: relative;
   background-color: var(--warning-banner-bg);
   color:var(--warning);
   margin-top: 5px;
+  top: 21px;
 }
 
 </style>

package/pages/c/_cluster/monitoring/index.vue

@@ -4,10 +4,10 @@ import isEmpty from 'lodash/isEmpty';
 import InstallRedirect from '@shell/utils/install-redirect';
 import AlertTable from '@shell/components/AlertTable';
 import { NAME, CHART_NAME } from '@shell/config/product/monitoring';
-import { ENDPOINTS, MONITORING } from '@shell/config/types';
+import { CATALOG, ENDPOINTS, MONITORING } from '@shell/config/types';
 import { allHash } from '@shell/utils/promise';
 import { findBy } from '@shell/utils/array';
-
+import { getClusterPrefix } from '@shell/utils/grafana';
 import { Banner } from '@components/Banner';
 import LazyImage from '@shell/components/LazyImage';
 import SimpleBox from '@shell/components/SimpleBox';
@@ -58,7 +58,7 @@ export default {
           iconSrc:     grafanaSrc,
           label:       'monitoring.overview.linkedList.grafana.label',
           description: 'monitoring.overview.linkedList.grafana.description',
-          link:        `/k8s/clusters/${ currentCluster.id }/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-grafana:80/proxy`,
+          link:        '',
         },
         {
           enabled:     false,
@@ -94,10 +94,13 @@ export default {
   methods: {
     async fetchDeps() {
       const { $store, externalLinks } = this;
+      const currentCluster = this.$store.getters['currentCluster'];
 
       this.v1Installed = await haveV1MonitoringWorkloads($store);
-
-      const hash = await allHash({ endpoints: $store.dispatch('cluster/findAll', { type: ENDPOINTS }) });
+      const hash = await allHash({
+        endpoints: $store.dispatch('cluster/findAll', { type: ENDPOINTS }),
+        app:       $store.dispatch(`cluster/find`, { type: CATALOG.APP, id: 'cattle-monitoring-system/rancher-monitoring' })
+      });
 
       if (!isEmpty(hash.endpoints)) {
         const amMatch = findBy(externalLinks, 'group', 'alertmanager');
@@ -105,6 +108,8 @@ export default {
         const promeMatch = externalLinks.filter(
           el => el.group === 'prometheus'
         );
+
+        grafanaMatch.link = `${ getClusterPrefix(hash.app?.currentVersion || '', currentCluster.id) }/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-grafana:80/proxy/`;
         const alertmanager = findBy(
           hash.endpoints,
           'id',

package/pages/c/_cluster/settings/performance.vue

@@ -174,6 +174,7 @@ export default {
           <div class="ml-20">
             <LabeledInput
               v-model="value.inactivity.threshold"
+              data-testid="inactivity-threshold"
               :mode="mode"
               :label="t('performance.inactivity.inputLabel')"
               :disabled="!value.inactivity.enabled"
@@ -382,6 +383,7 @@ export default {
     </template>
     <div v-if="mode === 'edit'">
       <AsyncButton
+        data-testid="performance__save-btn"
         class="pull-right mt-20"
         mode="apply"
         :disabled="!canSave"

package/pages/c/_cluster/uiplugins/CatalogList/CatalogLoadDialog.vue

@@ -0,0 +1,601 @@
+<script>
+import { mapGetters } from 'vuex';
+import isEmpty from 'lodash/isEmpty';
+
+import {
+  CATALOG, SECRET, SERVICE, UI_PLUGIN, WORKLOAD_TYPES
+} from '@shell/config/types';
+import { UI_PLUGIN_LABELS, UI_PLUGIN_NAMESPACE } from '@shell/config/uiplugins';
+import { TYPES as SECRET_TYPES } from '@shell/models/secret';
+import { allHash } from '@shell/utils/promise';
+
+import ResourceManager from '@shell/mixins/resource-manager';
+
+import AsyncButton from '@shell/components/AsyncButton';
+import LabeledSelect from '@shell/components/form/LabeledSelect';
+import Loading from '@shell/components/Loading.vue';
+import { Banner } from '@components/Banner';
+import { LabeledInput } from '@components/Form/LabeledInput';
+
+const DEFAULT_DEPLOYMENT = {
+  type:     WORKLOAD_TYPES.DEPLOYMENT,
+  metadata: {
+    name:      '',
+    namespace: UI_PLUGIN_NAMESPACE,
+    labels:    {}
+  },
+  spec: {
+    replicas: 1,
+    selector: { matchLabels: {} },
+    template: {
+      metadata: {
+        namespace: UI_PLUGIN_NAMESPACE,
+        labels:    {}
+      },
+      spec: {
+        containers: [
+          {
+            image:           '',
+            imagePullPolicy: 'Always',
+            name:            'container-0'
+          }
+        ],
+        imagePullSecrets: [],
+        restartPolicy:    'Always'
+      }
+    }
+  }
+};
+
+const DEFAULT_SERVICE = {
+  type:     SERVICE,
+  metadata: {
+    name:      '',
+    namespace: UI_PLUGIN_NAMESPACE,
+    labels:    { [UI_PLUGIN_LABELS.CATALOG_IMAGE]: '' }
+  },
+  spec: {
+    ports: [
+      {
+        name:       '',
+        port:       8080,
+        protocol:   'TCP',
+        targetPort: 8080
+      }
+    ],
+    selector: { [UI_PLUGIN_LABELS.CATALOG_IMAGE]: '' },
+    type:     'ClusterIP'
+  }
+};
+
+const DEFAULT_REPO = {
+  type:     CATALOG.CLUSTER_REPO,
+  metadata: {
+    name:   '',
+    labels: { [UI_PLUGIN_LABELS.CATALOG_IMAGE]: '' }
+  },
+  spec: { url: null }
+};
+
+const initialState = () => {
+  const deploymentValues = structuredClone(DEFAULT_DEPLOYMENT);
+  const serviceValues = structuredClone(DEFAULT_SERVICE);
+  const repoValues = structuredClone(DEFAULT_REPO);
+
+  return {
+    deploymentValues,
+    serviceValues,
+    repoValues,
+    canModifyName:              true,
+    canModifyImage:             true,
+    imagePullSecrets:           [],
+    imagePullNamespacedSecrets: [],
+    extensionUrl:               null,
+    extensionDeployment:        null,
+    extensionSvc:               null,
+    extensionRepo:              null,
+    extensionCrd:               null
+  };
+};
+
+export default {
+  components: {
+    AsyncButton, Banner, LabeledInput, Loading, LabeledSelect
+  },
+
+  mixins: [ResourceManager],
+
+  async fetch() {
+    const hash = {};
+
+    if ( this.$store.getters['management/canList'](WORKLOAD_TYPES.DEPLOYMENT) ) {
+      hash.deployments = this.$store.dispatch('management/findAll', { type: WORKLOAD_TYPES.DEPLOYMENT });
+    }
+
+    if ( this.$store.getters['management/canList'](SERVICE) ) {
+      hash.services = this.$store.dispatch('management/findAll', { type: SERVICE });
+    }
+
+    await allHash(hash);
+
+    this.secondaryResourceData = this.secondaryResourceDataConfig();
+    this.resourceManagerFetchSecondaryResources(this.secondaryResourceData);
+  },
+
+  data() {
+    return {
+      ...initialState(),
+      secondaryResourceData: null
+    };
+  },
+
+  computed: {
+    ...mapGetters({ allRepos: 'catalog/repos' }),
+
+    namespacedDeployments() {
+      return this.$store.getters['management/all'](WORKLOAD_TYPES.DEPLOYMENT).filter(dep => dep.metadata.namespace === UI_PLUGIN_NAMESPACE);
+    },
+
+    namespacedServices() {
+      return this.$store.getters['management/all'](SERVICE).filter(svc => svc.metadata.namespace === UI_PLUGIN_NAMESPACE);
+    }
+  },
+
+  methods: {
+    secondaryResourceDataConfig() {
+      return {
+        namespace: UI_PLUGIN_NAMESPACE,
+        data:      {
+          [SECRET]: {
+            applyTo: [
+              {
+                var:         'imagePullNamespacedSecrets',
+                parsingFunc: (data) => {
+                  return data.filter(secret => (secret._type === SECRET_TYPES.DOCKER || secret._type === SECRET_TYPES.DOCKER_JSON));
+                }
+              }
+            ]
+          }
+        }
+      };
+    },
+
+    showDialog() {
+      this.$modal.show('catalogLoadDialog');
+    },
+
+    closeDialog(result) {
+      this.$modal.hide('catalogLoadDialog');
+      this.$emit('closed', result);
+
+      // Reset state
+      Object.assign(this.$data, initialState());
+      this.secondaryResourceData = this.secondaryResourceDataConfig();
+      this.resourceManagerFetchSecondaryResources(this.secondaryResourceData);
+    },
+
+    async loadImage(btnCb) {
+      try {
+        if (!isEmpty(this.deploymentValues.spec.template.spec.containers[0].image)) {
+          const image = this.deploymentValues.spec.template.spec.containers[0].image;
+          const name = this.extractImageName(image);
+
+          if (name) {
+            // Create deployment
+            await this.loadDeployment(image, name, btnCb);
+
+            if (this.extensionDeployment) {
+              // Create service
+              await this.loadService(name, btnCb);
+            }
+
+            if (this.extensionSvc) {
+              // Create helm repo
+              await this.loadRepo(name, btnCb);
+            }
+
+            if (this.extensionRepo) {
+              // Create uiplugin crd
+              await this.loadPlugin(name, this.extensionUrl, image);
+            }
+
+            btnCb(true);
+          } else {
+            throw new Error('Unable to determine image name');
+          }
+        }
+      } catch (e) {
+        this.handleGrowlError(e, true);
+        btnCb(false);
+      }
+    },
+
+    async loadDeployment(image, name, btnCb) {
+      const exists = this.namespacedDeployments.find(dep => dep.spec.template.spec.containers[0].image === image);
+
+      if (!exists) {
+        // Sets deploymentValues with name, labels, and imagePullSecrets
+        const deploymentValues = this.parseDeploymentValues(name);
+
+        this.extensionDeployment = await this.$store.dispatch('management/create', deploymentValues);
+
+        try {
+          await this.extensionDeployment.save();
+        } catch (e) {
+          this.handleGrowlError(e, true);
+          btnCb(false);
+        }
+      } else {
+        const error = {
+          _statusText: this.t('plugins.manageCatalog.imageLoad.error.exists.deployment.title'),
+          message:     this.t('plugins.manageCatalog.imageLoad.error.exists.deployment.message', { image })
+        };
+
+        this.handleGrowlError(error);
+        btnCb(false);
+      }
+    },
+
+    async loadService(name, btnCb) {
+      const serviceName = `${ name }-svc`;
+      const exists = this.namespacedServices.find(svc => svc.metadata.name === serviceName);
+
+      if (exists) {
+        const error = {
+          _statusText: this.t('plugins.manageCatalog.imageLoad.error.exists.service.title'),
+          message:     this.t('plugins.manageCatalog.imageLoad.error.exists.service.message', { svc: serviceName })
+        };
+
+        this.handleGrowlError(error, true);
+        btnCb(false);
+
+        return;
+      }
+
+      // Sets serviceValues with name, label, and selector
+      const serviceValues = this.parseServiceValues(name, serviceName);
+      const serviceResource = await this.$store.dispatch('management/create', serviceValues);
+
+      try {
+        await serviceResource.save();
+      } catch (e) {
+        this.handleGrowlError(e, true);
+        btnCb(false);
+
+        return;
+      }
+
+      try {
+        this.extensionSvc = await this.$store.dispatch('management/find', {
+          type:      SERVICE,
+          id:        `${ UI_PLUGIN_NAMESPACE }/${ serviceResource.metadata.name }`,
+          namespace: UI_PLUGIN_NAMESPACE
+        });
+
+        if (this.extensionSvc) {
+          this.extensionUrl = `http://${ this.extensionSvc.spec.clusterIP }:${ this.extensionSvc.spec.ports[0].port }`;
+        } else {
+          throw new Error('Error fetching extension service');
+        }
+      } catch (e) {
+        this.handleGrowlError(e, true);
+        btnCb(false);
+      }
+    },
+
+    async loadRepo(name, btnCb) {
+      const chartName = `${ name }-charts`;
+      const exists = this.allRepos.find(repo => repo.metadata.name === chartName);
+
+      if (exists) {
+        const error = {
+          _statusText: this.t('plugins.manageCatalog.imageLoad.error.exists.repo.title'),
+          message:     this.t('plugins.manageCatalog.imageLoad.error.exists.repo.message', { repo: chartName })
+        };
+
+        this.handleGrowlError(error);
+        btnCb(false);
+        this.clean();
+
+        return;
+      }
+
+      // Set repoValues with name, label, and url
+      const repoValues = this.parseRepoValues(chartName);
+
+      this.extensionRepo = await this.$store.dispatch('management/create', repoValues);
+
+      try {
+        await this.extensionRepo.save();
+      } catch (e) {
+        this.handleGrowlError(e, true);
+        btnCb(false);
+      }
+    },
+
+    async loadPlugin(name, url, image, btnCb) {
+      // Try and parse version number from the image
+      const version = this.extractImageVersion(image) || 'latest';
+
+      if (!this.extractImageVersion(image)) {
+        this.$store.dispatch('growl/warning', {
+          title:   this.t('plugins.manageCatalog.imageLoad.imageVersion.title'),
+          message: this.t('plugins.manageCatalog.imageLoad.imageVersion.message', { image }),
+          timeout: 4000,
+        }, { root: true });
+      }
+
+      let crdName = name;
+
+      const parts = name.split('-');
+
+      if (parts.length >= 2) {
+        crdName = parts.join('-');
+      }
+
+      this.extensionCrd = await this.$store.dispatch('management/create', {
+        type:     UI_PLUGIN,
+        metadata: {
+          name,
+          namespace: UI_PLUGIN_NAMESPACE,
+          labels:    {
+            [UI_PLUGIN_LABELS.CATALOG_IMAGE]: name,
+            [UI_PLUGIN_LABELS.REPOSITORY]:    this.extensionRepo.metadata.name
+          }
+        },
+        spec: {
+          plugin: {
+            name:     crdName,
+            version,
+            endpoint: url,
+            noCache:  false,
+            metadata: { [UI_PLUGIN_LABELS.CATALOG]: 'true' }
+          }
+        }
+      });
+
+      try {
+        await this.extensionCrd.save({ url: `/v1/${ UI_PLUGIN }`, method: 'POST' });
+
+        this.closeDialog();
+        this.$store.dispatch('growl/success', {
+          title:   this.t('plugins.manageCatalog.imageLoad.success.title', { name }),
+          message: this.t('plugins.manageCatalog.imageLoad.success.message'),
+          timeout: 4000,
+        }, { root: true });
+      } catch (e) {
+        this.handleGrowlError(e, true);
+        btnCb(false);
+      }
+    },
+
+    parseDeploymentValues(name) {
+      let out = {};
+
+      this.$set(this.deploymentValues.metadata, 'name', name);
+
+      const addLabel = { [UI_PLUGIN_LABELS.CATALOG_IMAGE]: name };
+      const addTo = ['metadata.labels', 'spec.selector.matchLabels', 'spec.template.metadata.labels'];
+
+      // Populates workloadselector labels
+      out = this.assignLabels(this.deploymentValues, addLabel, addTo);
+
+      if (this.imagePullSecrets.length) {
+        out.spec.template.spec.imagePullSecrets = this.imagePullSecrets.map((secret) => {
+          return { name: secret };
+        });
+      }
+
+      return out;
+    },
+
+    parseServiceValues(name, serviceName) {
+      const out = this.serviceValues;
+
+      out.metadata.name = serviceName;
+      out.metadata.labels[UI_PLUGIN_LABELS.CATALOG_IMAGE] = name;
+      out.spec.selector[UI_PLUGIN_LABELS.CATALOG_IMAGE] = name;
+
+      return out;
+    },
+
+    parseRepoValues(chartName) {
+      const out = this.repoValues;
+
+      out.metadata.name = chartName;
+      out.metadata.labels[UI_PLUGIN_LABELS.CATALOG_IMAGE] = this.deploymentValues.metadata.name;
+      out.spec.url = this.extensionUrl;
+
+      return out;
+    },
+
+    assignLabels(source, labels, args) {
+      for (let i = 0; i < args.length; i++) {
+        const path = args[i].split('.');
+        let currentObj = source;
+
+        for (let j = 0; j < path.length - 1; j++) {
+          currentObj = currentObj[path[j]];
+        }
+
+        currentObj[path[path.length - 1]] = labels;
+      }
+
+      return source;
+    },
+
+    extractImageVersion(image) {
+      // Returns the version number with optional pre-release identifiers
+      const regex = /:(\d+\.\d+\.\d+([-\w\d]+)*)$/;
+      const matches = regex.exec(image);
+
+      if (matches) {
+        return matches[1];
+      }
+
+      return null;
+    },
+
+    extractImageName(image) {
+      // Returns the name within the image that prefixes the version number
+      const regex = /\/([^/:]+)(?::\d+\.\d+\.\d+(-[a-zA-Z0-9]+)?|$)/;
+      const matches = regex.exec(image);
+
+      if (matches) {
+        return matches[1];
+      }
+
+      return null;
+    },
+
+    clean() {
+      // Remove failed resources
+      if (this.extensionDeployment) {
+        this.extensionDeployment.remove();
+      }
+      if (this.extensionSvc) {
+        this.extensionSvc.remove();
+      }
+      if (this.extensionRepo) {
+        this.extensionRepo.remove();
+      }
+      if (this.extensionCrd) {
+        this.extensionCrd.remove();
+      }
+    },
+
+    handleGrowlError(e, clean = false) {
+      const error = e?.data || e;
+
+      this.$store.dispatch('growl/error', {
+        title:   error._statusText,
+        message: error.message,
+        timeout: 5000,
+      }, { root: true });
+
+      if (clean) {
+        this.clean();
+      }
+    }
+  }
+};
+</script>
+
+<template>
+  <modal
+    name="catalogLoadDialog"
+    height="auto"
+    :scrollable="true"
+    @closed="closeDialog()"
+  >
+    <Loading
+      v-if="$fetchState.loading"
+      mode="relative"
+    />
+    <div
+      v-else
+      class="plugin-install-dialog"
+    >
+      <template>
+        <div>
+          <h4>
+            {{ t('plugins.manageCatalog.imageLoad.load') }}
+          </h4>
+          <p>
+            {{ t('plugins.manageCatalog.imageLoad.prompt') }}
+          </p>
+
+          <div class="custom mt-10">
+            <Banner
+              color="info"
+              :label="t('plugins.manageCatalog.imageLoad.banner')"
+              class="mt-10"
+            />
+          </div>
+
+          <div class="custom mt-10">
+            <div class="fields">
+              <LabeledInput
+                v-model.trim="deploymentValues.spec.template.spec.containers[0].image"
+                label-key="plugins.manageCatalog.imageLoad.fields.image.label"
+                placeholder-key="plugins.manageCatalog.imageLoad.fields.image.placeholder"
+              />
+            </div>
+          </div>
+          <div class="custom mt-10">
+            <div class="fields">
+              <LabeledSelect
+                v-model="imagePullSecrets"
+                :label="t('workload.container.imagePullSecrets')"
+                :multiple="true"
+                :taggable="true"
+                :options="imagePullNamespacedSecrets"
+                option-label="metadata.name"
+                :reduce="service => service.metadata.name"
+              />
+              <Banner
+                color="warning"
+                class="mt-10"
+              >
+                <span v-clean-html="t('plugins.manageCatalog.imageLoad.fields.secrets.banner', {}, true)" />
+              </Banner>
+            </div>
+          </div>
+        </div>
+      </template>
+
+      <div class="custom mt-10">
+        <div class="fields">
+          <div class="dialog-buttons mt-20">
+            <button
+              class="btn role-secondary"
+              data-testid="image-load-ext-modal-cancel-btn"
+              @click="closeDialog()"
+            >
+              {{ t('generic.cancel') }}
+            </button>
+            <AsyncButton
+              mode="load"
+              data-testid="image-load-ext-modal-install-btn"
+              @click="loadImage"
+            />
+          </div>
+        </div>
+      </div>
+    </div>
+  </modal>
+</template>
+
+<style lang="scss" scoped>
+  .plugin-install-dialog {
+    padding: 10px;
+
+    h4 {
+      font-weight: bold;
+    }
+
+    .dialog-panel {
+      display: flex;
+      flex-direction: column;
+      min-height: 100px;
+
+      p {
+        margin-bottom: 5px;
+      }
+
+      .dialog-info {
+        flex: 1;
+      }
+    }
+
+    .dialog-buttons {
+      display: flex;
+      justify-content: flex-end;
+      margin-top: 10px;
+
+      > *:not(:last-child) {
+        margin-right: 10px;
+      }
+    }
+  }
+</style>