@rancher/shell 3.0.5-rc.6 → 3.0.5-rc.8

package/edit/provisioning.cattle.io.cluster/tabs/etcd/S3Config.vue

@@ -3,15 +3,17 @@ import { Checkbox } from '@components/Form/Checkbox';
 import { LabeledInput } from '@components/Form/LabeledInput';
 import SelectOrCreateAuthSecret from '@shell/components/form/SelectOrCreateAuthSecret';
 import { NORMAN } from '@shell/config/types';
+import FormValidation from '@shell/mixins/form-validation';
 
 export default {
-  emits: ['update:value'],
+  emits: ['update:value', 'validationChanged'],
 
   components: {
     LabeledInput,
     Checkbox,
     SelectOrCreateAuthSecret,
   },
+  mixins: [FormValidation],
 
   props: {
     mode: {
@@ -36,22 +38,30 @@ export default {
   },
 
   data() {
-    const config = {
-      bucket:              '',
-      cloudCredentialName: null,
-      endpoint:            '',
-      endpointCA:          '',
-      folder:              '',
-      region:              '',
-      skipSSLVerify:       false,
-
-      ...(this.value || {}),
+    return {
+      config: {
+        bucket:              '',
+        cloudCredentialName: null,
+        endpoint:            '',
+        endpointCA:          '',
+        folder:              '',
+        region:              '',
+        skipSSLVerify:       false,
+        ...(this.value || {}),
+      },
+      fvFormRuleSets: [
+        {
+          path: 'endpoint', rootObject: this.config, rules: ['awsStyleEndpoint']
+        },
+        {
+          path: 'bucket', rootObject: this.config, rules: ['required']
+        },
+      ]
     };
-
-    return { config };
   },
 
   computed: {
+
     ccData() {
       if ( this.config.cloudCredentialName ) {
         const cred = this.$store.getters['rancher/byId'](NORMAN.CLOUD_CREDENTIAL, this.config.cloudCredentialName);
@@ -64,6 +74,11 @@ export default {
       return {};
     },
   },
+  watch: {
+    fvFormIsValid(newValue) {
+      this.$emit('validationChanged', !!newValue);
+    }
+  },
 
   methods: {
     update() {
@@ -79,6 +94,7 @@ export default {
   <div>
     <SelectOrCreateAuthSecret
       v-model:value="config.cloudCredentialName"
+      :mode="mode"
       :register-before-hook="registerBeforeHook"
       in-store="management"
       :allow-ssh="false"
@@ -94,16 +110,19 @@ export default {
       <div class="col span-6">
         <LabeledInput
           v-model:value="config.bucket"
-          label="Bucket"
+          :label="t('cluster.rke2.etcd.s3config.bucket.label')"
+          :mode="mode"
           :placeholder="ccData.defaultBucket"
           :required="!ccData.defaultBucket"
+          :rules="!ccData.defaultBucket ? fvGetAndReportPathRules('bucket') : []"
           @update:value="update"
         />
       </div>
       <div class="col span-6">
         <LabeledInput
           v-model:value="config.folder"
-          label="Folder"
+          :label="t('cluster.rke2.etcd.s3config.folder.label')"
+          :mode="mode"
           :placeholder="ccData.defaultFolder"
           @update:value="update"
         />
@@ -114,7 +133,8 @@ export default {
       <div class="col span-6">
         <LabeledInput
           v-model:value="config.region"
-          label="Region"
+          :label="t('cluster.rke2.etcd.s3config.region.label')"
+          :mode="mode"
           :placeholder="ccData.defaultRegion"
           @update:value="update"
         />
@@ -122,8 +142,10 @@ export default {
       <div class="col span-6">
         <LabeledInput
           v-model:value="config.endpoint"
-          label="Endpoint"
+          :label="t('cluster.rke2.etcd.s3config.endpoint.label')"
+          :mode="mode"
           :placeholder="ccData.defaultEndpoint"
+          :rules="fvGetAndReportPathRules('endpoint')"
           @update:value="update"
         />
       </div>
@@ -136,7 +158,7 @@ export default {
       <Checkbox
         v-model:value="config.skipSSLVerify"
         :mode="mode"
-        label="Accept any certificate (insecure)"
+        :label="t('cluster.rke2.etcd.s3config.skipSSLVerify.label')"
         @update:value="update"
       />
 
@@ -144,7 +166,7 @@ export default {
         v-if="!config.skipSSLVerify"
         v-model:value="config.endpointCA"
         type="multiline"
-        label="Endpoint CA Cert"
+        :label="t('cluster.rke2.etcd.s3config.endpointCA.label')"
         :placeholder="ccData.defaultEndpointCA"
         @update:value="update"
       />

package/edit/provisioning.cattle.io.cluster/tabs/etcd/index.vue

@@ -7,7 +7,7 @@ import S3Config from '@shell/edit/provisioning.cattle.io.cluster/tabs/etcd/S3Con
 import UnitInput from '@shell/components/form/UnitInput';
 
 export default {
-  emits: ['s3-backup-changed', 'config-etcd-expose-metrics-changed'],
+  emits: ['s3-backup-changed', 'config-etcd-expose-metrics-changed', 'etcd-validation-changed'],
 
   components: {
     LabeledInput,
@@ -53,8 +53,19 @@ export default {
     configEtcdExposeMetrics() {
       return !!this.value.spec.rkeConfig.machineGlobalConfig['etcd-expose-metrics'];
     },
-
   },
+  methods: {
+    s3BackupChanged(val) {
+      this.$emit('s3-backup-changed', val);
+      this.$emit('etcd-validation-changed', !val);
+    },
+    disableSnapshotsChanged(val) {
+      if (val) {
+        this.$emit('etcd-validation-changed', true);
+        this.$emit('s3-backup-changed', false);
+      }
+    }
+  }
 };
 </script>
 
@@ -69,6 +80,7 @@ export default {
           :label="t('cluster.rke2.etcd.disableSnapshots.label')"
           :labels="[t('generic.disable'), t('generic.enable')]"
           :mode="mode"
+          @update:value="disableSnapshotsChanged"
         />
       </div>
     </div>
@@ -106,7 +118,7 @@ export default {
         :label="t('cluster.rke2.etcd.s3backups.label')"
         :labels="[t('generic.disable'),t('generic.enable')]"
         :mode="mode"
-        @update:value="$emit('s3-backup-changed', $event)"
+        @update:value="s3BackupChanged"
       />
 
       <S3Config
@@ -115,6 +127,7 @@ export default {
         :namespace="value.metadata.namespace"
         :register-before-hook="registerBeforeHook"
         :mode="mode"
+        @validationChanged="$emit('etcd-validation-changed', $event)"
       />
     </template>
 

package/edit/provisioning.cattle.io.cluster/tabs/registries/RegistryConfigs.vue

@@ -44,35 +44,16 @@ export default {
   },
 
   data() {
-    const configMap = clone(this.value.spec.rkeConfig?.registries?.configs) || {};
-    const entries = [];
-
-    const defaultAddValue = {
-      hostname:             '',
-      authConfigSecretName: null,
-      caBundle:             '',
-      insecureSkipVerify:   false,
-      tlsSecretName:        null,
-    };
-
-    for ( const hostname in configMap ) {
-      if (configMap[hostname]) {
-        configMap[hostname].insecureSkipVerify = configMap[hostname].insecureSkipVerify ?? defaultAddValue.insecureSkipVerify;
-        configMap[hostname].authConfigSecretName = configMap[hostname].authConfigSecretName ?? defaultAddValue.authConfigSecretName;
-
-        const caBundle = configMap[hostname].caBundle ?? defaultAddValue.caBundle;
-
-        configMap[hostname].caBundle = isBase64(caBundle) ? base64Decode(caBundle) : caBundle;
-
-        configMap[hostname].tlsSecretName = configMap[hostname].tlsSecretName ?? defaultAddValue.tlsSecretName;
+    return {
+      entries:         [],
+      defaultAddValue: {
+        hostname:             '',
+        authConfigSecretName: null,
+        caBundle:             '',
+        insecureSkipVerify:   false,
+        tlsSecretName:        null,
       }
-      entries.push({
-        hostname,
-        ...configMap[hostname],
-      });
-    }
-
-    return { entries, defaultAddValue };
+    };
   },
 
   computed: {
@@ -87,9 +68,27 @@ export default {
     window.z = this;
   },
 
-  // created() {
-  //   set(this.value, 'spec.rkeConfig.registries.configs', {});
-  // },
+  created() {
+    const configMap = clone(this.value.spec.rkeConfig?.registries?.configs) || {};
+
+    for ( const hostname in configMap ) {
+      if (configMap[hostname]) {
+        configMap[hostname].insecureSkipVerify = configMap[hostname].insecureSkipVerify ?? this.defaultAddValue.insecureSkipVerify;
+        configMap[hostname].authConfigSecretName = configMap[hostname].authConfigSecretName ?? this.defaultAddValue.authConfigSecretName;
+
+        const caBundle = configMap[hostname].caBundle ?? this.defaultAddValue.caBundle;
+
+        configMap[hostname].caBundle = isBase64(caBundle) ? base64Decode(caBundle) : caBundle;
+
+        configMap[hostname].tlsSecretName = configMap[hostname].tlsSecretName ?? this.defaultAddValue.tlsSecretName;
+      }
+
+      this.entries.push({
+        hostname,
+        ...configMap[hostname],
+      });
+    }
+  },
 
   methods: {
     update() {
@@ -104,7 +103,7 @@ export default {
 
         configs[h] = {
           ...entry,
-          caBundle: base64Encode(entry.caBundle)
+          caBundle: entry.caBundle ? base64Encode(entry.caBundle) : null
         };
 
         delete configs[h].hostname;
@@ -172,7 +171,7 @@ export default {
               :mode="mode"
               generate-name="registryconfig-auth-"
               :data-testid="`registry-auth-select-or-create-${i}`"
-              :cache-secrets="true"
+              :cache-secrets="false"
               @update:value="update"
             />
           </div>

package/edit/provisioning.cattle.io.cluster/tabs/registries/RegistryMirrors.vue

@@ -22,24 +22,23 @@ export default {
   },
 
   data() {
+    return { entries: [] };
+  },
+
+  created() {
+    if (!this.value.spec.rkeConfig?.registries?.mirrors) {
+      set(this.value, 'spec.rkeConfig.registries.mirrors', {});
+    }
+
     const mirrorMap = this.value.spec.rkeConfig?.registries?.mirrors || {};
-    const entries = [];
 
     for ( const hostname in mirrorMap ) {
-      entries.push({
+      this.entries.push({
         hostname,
         endpoints: (mirrorMap[hostname].endpoint || []).join(', '),
         rewrite:   mirrorMap[hostname].rewrite || {},
       });
     }
-
-    return { entries };
-  },
-
-  created() {
-    if (!this.value.spec.rkeConfig?.registries?.mirrors) {
-      set(this.value, 'spec.rkeConfig.registries.mirrors', {});
-    }
   },
 
   computed: {

package/edit/provisioning.cattle.io.cluster/tabs/registries/index.vue

@@ -78,7 +78,6 @@ export default {
     <div class="row">
       <Checkbox
         :value="showCustomRegistryInput"
-        class="mb-20"
         :label="t('cluster.privateRegistry.label')"
         data-testid="registries-enable-checkbox"
         @update:value="$emit('custom-registry-changed', $event)"
@@ -86,7 +85,7 @@ export default {
     </div>
     <div
       v-if="showCustomRegistryInput"
-      class="row"
+      class="row mt-20"
     >
       <div class="col span-6">
         <LabeledInput
@@ -114,7 +113,6 @@ export default {
       </div>
     </div>
     <div
-      v-if="showCustomRegistryInput"
       class="row"
     >
       <AdvancedSection

package/edit/provisioning.cattle.io.cluster/tabs/upgrade/DrainOptions.vue

@@ -34,23 +34,30 @@ export default {
   },
 
   data() {
-    const out = {};
+    return {
+      deleteEmptyDirData:              DEFAULTS.deleteEmptyDirData,
+      disableEviction:                 DEFAULTS.disableEviction,
+      enabled:                         DEFAULTS.enabled,
+      force:                           DEFAULTS.force,
+      gracePeriod:                     DEFAULTS.gracePeriod,
+      ignoreDaemonSets:                DEFAULTS.ignoreDaemonSets,
+      skipWaitForDeleteTimeoutSeconds: DEFAULTS.skipWaitForDeleteTimeoutSeconds,
+      timeout:                         DEFAULTS.timeout,
+    };
+  },
 
+  created() {
     for ( const k in DEFAULTS ) {
       if ( typeof this.value[k] === 'undefined' ) {
-        out[k] = DEFAULTS[k];
+        this.$data[k] = DEFAULTS[k];
       } else {
-        out[k] = this.value[k];
+        this.$data[k] = this.value[k];
       }
     }
 
-    out.customGracePeriod = out.gracePeriod >= 0;
-    out.customTimeout = out.timeout >= 0;
+    this.customGracePeriod = this.gracePeriod >= 0;
+    this.customTimeout = this.timeout >= 0;
 
-    return out;
-  },
-
-  created() {
     this.update();
   },
 

package/edit/secret/basic.vue

@@ -49,6 +49,7 @@ export default {
           required
           :label="t('secret.basic.username')"
           :mode="mode"
+          data-testid="secret-basic-username"
         />
       </div>
       <div class="col span-6">

package/edit/secret/index.vue

@@ -1,22 +1,23 @@
 <script>
 import { SECRET_TYPES as TYPES } from '@shell/config/secret';
-import { MANAGEMENT, NAMESPACE, DEFAULT_WORKSPACE } from '@shell/config/types';
+import {
+  SECRET_SCOPE, SECRET_QUERY_PARAMS,
+  CLOUD_CREDENTIAL, _CLONE, _CREATE, _EDIT, _FLAGGED
+} from '@shell/config/query-params';
+import { MANAGEMENT, NAMESPACE, DEFAULT_WORKSPACE, VIRTUAL_TYPES } from '@shell/config/types';
+import { CAPI, UI_PROJECT_SECRET } from '@shell/config/labels-annotations';
+import FormValidation from '@shell/mixins/form-validation';
 import CreateEditView from '@shell/mixins/create-edit-view';
 import NameNsDescription from '@shell/components/form/NameNsDescription';
 import { LabeledInput } from '@components/Form/LabeledInput';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
 import CruResource from '@shell/components/CruResource';
-import {
-  CLOUD_CREDENTIAL, _CLONE, _CREATE, _EDIT, _FLAGGED
-} from '@shell/config/query-params';
 import Loading from '@shell/components/Loading';
 import Tabbed from '@shell/components/Tabbed';
 import Tab from '@shell/components/Tabbed/Tab';
 import Labels from '@shell/components/form/Labels';
 import { HIDE_SENSITIVE } from '@shell/store/prefs';
-import { CAPI } from '@shell/config/labels-annotations';
 import { clear, uniq } from '@shell/utils/array';
-import { NAME as MANAGER } from '@shell/config/product/manager';
 import SelectIconGrid from '@shell/components/SelectIconGrid';
 import { sortBy } from '@shell/utils/sort';
 import { ucFirst } from '@shell/utils/string';
@@ -46,12 +47,34 @@ export default {
     SelectIconGrid
   },
 
-  mixins: [CreateEditView],
+  mixins: [CreateEditView, FormValidation],
 
   async fetch() {
     if ( this.isCloud ) {
       this.nodeDrivers = await this.$store.dispatch('management/findAll', { type: MANAGEMENT.NODE_DRIVER });
     }
+
+    const projectScopedLabel = this.value.metadata?.labels?.[UI_PROJECT_SECRET];
+    const isProjectScoped = !!projectScopedLabel || (this.isCreate && this.$route.query[SECRET_SCOPE] === SECRET_QUERY_PARAMS.PROJECT_SCOPED);
+
+    this.isProjectScoped = isProjectScoped;
+
+    if (isProjectScoped) {
+      // If ssp is enabled the store not have all projects. ensure we have them all
+      await this.$store.dispatch('management/findAll', { type: MANAGEMENT.PROJECT });
+      if (this.isCreate) {
+        // Pick first project as default
+        this.projectName = this.filteredProjects[0].metadata.name;
+
+        this.value.metadata.labels = this.value.metadata.labels || {};
+
+        // Set namespace and project-scoped label
+        this.value.metadata.namespace = this.filteredProjects[0].status.backingNamespace;
+        this.value.metadata.labels[UI_PROJECT_SECRET] = this.filteredProjects[0].metadata.name;
+      } else {
+        this.projectName = this.filteredProjects.find((p) => p.metadata.name === projectScopedLabel).metadata.name;
+      }
+    }
   },
 
   data() {
@@ -89,14 +112,50 @@ export default {
 
     return {
       isCloud,
+      isProjectScoped:   false,
       nodeDrivers:       null,
       secretTypes,
       secretType:        this.value._type,
-      initialSecretType: this.value._type
+      initialSecretType: this.value._type,
+      projectName:       null,
+      fvFormRuleSets:    [
+        {
+          path:  'metadata.name',
+          rules: ['required'],
+        },
+        {
+          path:  'metadata.namespace',
+          rules: ['required'],
+        },
+      ],
     };
   },
 
   computed: {
+    clusterId() {
+      return this.$store.getters['currentCluster'].id;
+    },
+
+    filteredProjects() {
+      const allProjects = this.$store.getters['management/all'](MANAGEMENT.PROJECT);
+
+      return allProjects.filter((p) => p.spec?.clusterName === this.clusterId);
+    },
+
+    projectOpts() {
+      let projects = this.$store.getters['management/all'](MANAGEMENT.PROJECT);
+
+      // Filter out projects not for the current cluster
+      projects = projects.filter((c) => c.spec?.clusterName === this.clusterId);
+      const out = projects.map((project) => {
+        return {
+          label: project.nameDisplay,
+          value: project.metadata.name,
+        };
+      });
+
+      return out;
+    },
     isCustomSecretCreate() {
       return this.mode === _CREATE && this.$route.query.type === 'custom';
     },
@@ -214,12 +273,15 @@ export default {
       }
     },
 
-    doneRoute() {
-      if ( this.$store.getters['currentProduct'].name === MANAGER ) {
-        return 'c-cluster-manager-secret';
-      } else {
-        return 'c-cluster-product-resource';
+    doneLocationOverride() {
+      if (this.isProjectScoped) {
+        return {
+          ...this.value.listLocation,
+          params: { resource: VIRTUAL_TYPES.PROJECT_SECRETS }
+        };
       }
+
+      return this.value.listLocation;
     },
   },
 
@@ -251,6 +313,13 @@ export default {
         }
       }
 
+      if (this.isProjectScoped) {
+        // Always create project-scoped secrets in the upstream local cluster
+        const url = this.$store.getters['management/urlFor'](this.value.type, this.value.id);
+
+        return this.save(btnCb, url);
+      }
+
       return this.save(btnCb);
     },
 
@@ -301,8 +370,25 @@ export default {
       if (type !== 'custom') {
         this.value['_type'] = type;
       }
+    },
+
+    redirectAfterCancel() {
+      this.$router.replace(this.doneLocationOverride);
     }
   },
+
+  watch: {
+    projectName(neu) {
+      if (this.isCreate && neu) {
+        this.value.metadata.labels = this.value.metadata.labels || {};
+        this.value.metadata.labels[UI_PROJECT_SECRET] = neu;
+
+        const projectScopedNamespace = this.filteredProjects.find((p) => p.metadata.name === neu).status.backingNamespace;
+
+        this.value.metadata.namespace = projectScopedNamespace;
+      }
+    }
+  }
 };
 </script>
 
@@ -312,22 +398,47 @@ export default {
     <CruResource
       v-else
       :mode="mode"
-      :validation-passed="true"
+      :validation-passed="fvFormIsValid"
       :selected-subtype="value._type"
       :resource="value"
       :errors="errors"
-      :done-route="doneRoute"
       :subtypes="secretSubTypes"
+      :cancel-event="true"
+      :done-route="doneLocationOverride"
       @finish="saveSecret"
       @select-type="selectType"
       @error="e=>errors = e"
+      @cancel="redirectAfterCancel"
     >
       <NameNsDescription
+        v-if="!isProjectScoped"
         :value="value"
         :mode="mode"
         :namespaced="!isCloud"
         @update:value="$emit('input', $event)"
       />
+      <NameNsDescription
+        v-else
+        :value="value"
+        :namespaced="false"
+        :mode="mode"
+        :rules="{
+          name: fvGetAndReportPathRules('metadata.name'),
+          namespace: fvGetAndReportPathRules('metadata.namespace'),
+        }"
+      >
+        <template #project-selector>
+          <LabeledSelect
+            v-model:value="projectName"
+            class="mr-20"
+            :disabled="!isCreate"
+            :label="t('namespace.project.label')"
+            :options="projectOpts"
+            required
+            data-testid="secret-project-select"
+          />
+        </template>
+      </NameNsDescription>
 
       <div
         v-if="isCustomSecretCreate"

package/edit/workload/index.vue

@@ -20,19 +20,10 @@ export default {
     },
   },
   data() {
-    return { selectedName: null, closedErrorMessages: [] };
+    return { selectedName: null, errors: [] };
   },
-  computed: {
-    ...mapGetters({ t: 'i18n/t' }),
-    errorMessages() {
-      if (!this.type) {
-        return [];
-      }
-
-      return this.fvUnreportedValidationErrors.filter((e) => !this.closedErrorMessages.includes(e));
-    }
-  },
-  methods: {
+  computed: { ...mapGetters({ t: 'i18n/t' }) },
+  methods:  {
     changed(tab) {
       const key = this.idKey;
 
@@ -94,7 +85,7 @@ export default {
       :selected-subtype="type"
       :resource="value"
       :mode="mode"
-      :errors="errorMessages"
+      :errors="errors"
       :done-route="doneRoute"
       :subtypes="workloadSubTypes"
       :apply-hooks="applyHooks"
@@ -102,7 +93,7 @@ export default {
       :errors-map="getErrorsMap(fvUnreportedValidationErrors)"
       @finish="save"
       @select-type="selectType"
-      @error="(_, closedError) => closedErrorMessages.push(closedError)"
+      @error="e=>errors = e"
     >
       <NameNsDescription
         :value="value"