@rancher/shell 0.2.3 → 0.2.4

package/edit/auth/saml.vue

@@ -93,7 +93,11 @@ export default {
       @cancel="cancel"
     >
       <template v-if="model.enabled && !isEnabling && !editConfig">
-        <AuthBanner :t-args="tArgs" :disable="disable" :edit="goToEdit">
+        <AuthBanner
+          :t-args="tArgs"
+          :disable="disable"
+          :edit="goToEdit"
+        >
           <template slot="rows">
             <tr><td>{{ t(`authConfig.saml.displayName`) }}: </td><td>{{ model.displayNameField }}</td></tr>
             <tr><td>{{ t(`authConfig.saml.userName`) }}: </td><td>{{ model.userNameField }}</td></tr>
@@ -104,13 +108,21 @@ export default {
           </template>
         </AuthBanner>
 
-        <hr />
+        <hr>
 
-        <AllowedPrincipals :provider="NAME" :auth-config="model" :mode="mode" />
+        <AllowedPrincipals
+          :provider="NAME"
+          :auth-config="model"
+          :mode="mode"
+        />
       </template>
 
       <template v-else>
-        <Banner v-if="!model.enabled" :label="t('authConfig.stateBanner.disabled', tArgs)" color="warning" />
+        <Banner
+          v-if="!model.enabled"
+          :label="t('authConfig.stateBanner.disabled', tArgs)"
+          color="warning"
+        />
 
         <h3>{{ t(`authConfig.saml.${NAME}`) }}</h3>
         <div class="row mb-20">
@@ -151,7 +163,10 @@ export default {
           </div>
         </div>
         <div class="row mb-20">
-          <div v-if="NAME === 'keycloak' || NAME === 'ping'" class="col span-6">
+          <div
+            v-if="NAME === 'keycloak' || NAME === 'ping'"
+            class="col span-6"
+          >
             <LabeledInput
               v-model="model.entityID"
               :label="t(`authConfig.saml.entityID`)"
@@ -178,7 +193,12 @@ export default {
               required
               type="multiline"
             />
-            <FileSelector class="role-tertiary add mt-5" :label="t('generic.readFromFile')" :mode="mode" @selected="$set(model, 'spKey', $event)" />
+            <FileSelector
+              class="role-tertiary add mt-5"
+              :label="t('generic.readFromFile')"
+              :mode="mode"
+              @selected="$set(model, 'spKey', $event)"
+            />
           </div>
           <div class="col span-4">
             <LabeledInput
@@ -189,7 +209,12 @@ export default {
               required
               type="multiline"
             />
-            <FileSelector class="role-tertiary add mt-5" :label="t('generic.readFromFile')" :mode="mode" @selected="$set(model, 'spCert', $event)" />
+            <FileSelector
+              class="role-tertiary add mt-5"
+              :label="t('generic.readFromFile')"
+              :mode="mode"
+              @selected="$set(model, 'spCert', $event)"
+            />
           </div>
           <div class="col span-4">
             <LabeledInput
@@ -200,21 +225,41 @@ export default {
               required
               type="multiline"
             />
-            <FileSelector class="role-tertiary add mt-5" :label="t('generic.readFromFile')" :mode="mode" @selected="$set(model, 'idpMetadataContent', $event)" />
+            <FileSelector
+              class="role-tertiary add mt-5"
+              :label="t('generic.readFromFile')"
+              :mode="mode"
+              @selected="$set(model, 'idpMetadataContent', $event)"
+            />
           </div>
         </div>
         <div v-if="NAME === 'shibboleth'">
           <div class="row">
-            <Checkbox v-model="showLdap" :mode="mode" :label="t('authConfig.saml.showLdap')" />
+            <Checkbox
+              v-model="showLdap"
+              :mode="mode"
+              :label="t('authConfig.saml.showLdap')"
+            />
           </div>
           <div class="row mt-20 mb-20">
-            <config v-if="showLdap" v-model="model.openLdapConfig" :type="NAME" :mode="mode" />
+            <config
+              v-if="showLdap"
+              v-model="model.openLdapConfig"
+              :type="NAME"
+              :mode="mode"
+            />
           </div>
         </div>
       </template>
-      <div v-if="!model.enabled" class="row">
+      <div
+        v-if="!model.enabled"
+        class="row"
+      >
         <div class="col span-12">
-          <Banner color="info" v-html="t('authConfig.associatedWarning', tArgs, true)" />
+          <Banner
+            color="info"
+            v-html="t('authConfig.associatedWarning', tArgs, true)"
+          />
         </div>
       </div>
     </CruResource>

package/edit/autoscaling.horizontalpodautoscaler/external-metric.vue

@@ -42,10 +42,17 @@ export default {
 <template>
   <div>
     <div class="row mb-20">
-      <MetricTarget v-model="value.target" :mode="mode" metric-resource="external" />
+      <MetricTarget
+        v-model="value.target"
+        :mode="mode"
+        metric-resource="external"
+      />
     </div>
     <div class="row">
-      <MetricIdentifier v-model="value.metric" :mode="mode" />
+      <MetricIdentifier
+        v-model="value.metric"
+        :mode="mode"
+      />
     </div>
   </div>
 </template>

package/edit/autoscaling.horizontalpodautoscaler/index.vue

@@ -70,7 +70,10 @@ export default {
         Object.values(SCALABLE_WORKLOAD_TYPES)
           .flatMap(type => this.$store.getters['cluster/all'](type))
           .filter(
-            wl => wl.metadata.namespace === this.value.metadata.namespace
+            // Filter out anything that has an owner, which should probably be the one with the HPA
+            // For example ReplicaSets can be associated with a HPA (https://kubernetes.io/docs/concepts/workloads/controllers/replicaset/#replicaset-as-a-horizontal-pod-autoscaler-target)
+            // but wouldn't make sense if it's owned by a deployment
+            wl => wl.metadata.namespace === this.value.metadata.namespace && !wl.ownedByWorkload
           )
       );
     },
@@ -143,7 +146,10 @@ export default {
 
 <template>
   <Loading v-if="$fetchState.pending" />
-  <form v-else class="filled-height">
+  <form
+    v-else
+    class="filled-height"
+  >
     <CruResource
       :done-route="doneRoute"
       :mode="mode"
@@ -154,10 +160,18 @@ export default {
       @finish="save"
       @cancel="done"
     >
-      <NameNsDescription v-if="!isView" :value="value" :mode="mode" />
+      <NameNsDescription
+        v-if="!isView"
+        :value="value"
+        :mode="mode"
+      />
 
       <Tabbed :side-tabs="true">
-        <Tab name="target" :label="t('hpa.tabs.target')" :weight="10">
+        <Tab
+          name="target"
+          :label="t('hpa.tabs.target')"
+          :weight="10"
+        >
           <div class="row mb-20">
             <div class="col span-6">
               <LabeledSelect
@@ -197,7 +211,10 @@ export default {
             </div>
           </div>
         </Tab>
-        <Tab name="metrics" :label="t('hpa.tabs.metrics')">
+        <Tab
+          name="metrics"
+          :label="t('hpa.tabs.metrics')"
+        >
           <ArrayListGrouped
             v-model="value.spec.metrics"
             :default-add-value="{ ...defaultResourceMetric }"
@@ -213,7 +230,7 @@ export default {
               >
                 <i class="icon icon-2x icon-x" />
               </button>
-              <span v-else></span>
+              <span v-else />
             </template>
             <template #default="props">
               <MetricsRow

package/edit/autoscaling.horizontalpodautoscaler/metric-target.vue

@@ -159,7 +159,10 @@ export default {
           :options="targetTypes"
         />
       </div>
-      <div v-if="isResourceMetricType" class="col span-6">
+      <div
+        v-if="isResourceMetricType"
+        class="col span-6"
+      >
         <UnitInput
           v-if="value.type === 'Utilization'"
           v-model="value.averageUtilization"
@@ -194,7 +197,10 @@ export default {
           @input="updateQuantityValue"
         />
       </div>
-      <div v-else class="col span-6">
+      <div
+        v-else
+        class="col span-6"
+      >
         <LabeledInput
           v-model="quantity"
           placeholder="1"

package/edit/autoscaling.horizontalpodautoscaler/metrics-row.vue

@@ -172,16 +172,28 @@ export default {
       </div>
     </div>
     <div v-if="isPodMetric">
-      <PodMetric v-model="value.pods" :mode="mode" />
+      <PodMetric
+        v-model="value.pods"
+        :mode="mode"
+      />
     </div>
     <div v-else-if="isExternalMetric">
-      <ExternalMetric v-model="value.external" :mode="mode" />
+      <ExternalMetric
+        v-model="value.external"
+        :mode="mode"
+      />
     </div>
     <div v-else-if="isObjectMetric">
-      <ObjectMetric v-model="value.object" :mode="mode" />
+      <ObjectMetric
+        v-model="value.object"
+        :mode="mode"
+      />
     </div>
     <div v-else-if="isResourceMetric">
-      <ResourceMetric v-model="value.resource" :mode="mode" />
+      <ResourceMetric
+        v-model="value.resource"
+        :mode="mode"
+      />
     </div>
   </div>
 </template>

package/edit/autoscaling.horizontalpodautoscaler/object-metric.vue

@@ -49,13 +49,23 @@ export default {
 <template>
   <div>
     <div class="row mb-20">
-      <MetricTarget v-model="value.target" :mode="mode" metric-resource="object" />
+      <MetricTarget
+        v-model="value.target"
+        :mode="mode"
+        metric-resource="object"
+      />
     </div>
     <div class="row mb-20">
-      <MetricObjectReference v-model="value.describedObject" :mode="mode" />
+      <MetricObjectReference
+        v-model="value.describedObject"
+        :mode="mode"
+      />
     </div>
     <div class="row">
-      <MetricIdentifier v-model="value.metric" :mode="mode" />
+      <MetricIdentifier
+        v-model="value.metric"
+        :mode="mode"
+      />
     </div>
   </div>
 </template>

package/edit/autoscaling.horizontalpodautoscaler/pod-metric.vue

@@ -42,10 +42,17 @@ export default {
 <template>
   <div>
     <div class="row mb-20">
-      <MetricTarget v-model="value.target" :mode="mode" metric-resource="pods" />
+      <MetricTarget
+        v-model="value.target"
+        :mode="mode"
+        metric-resource="pods"
+      />
     </div>
     <div class="row">
-      <MetricIdentifier v-model="value.metric" :mode="mode" />
+      <MetricIdentifier
+        v-model="value.metric"
+        :mode="mode"
+      />
     </div>
   </div>
 </template>

package/edit/autoscaling.horizontalpodautoscaler/resource-metric.vue

@@ -54,7 +54,12 @@ export default {
       </div>
     </div>
     <div class="row">
-      <MetricTarget v-model="value.target" :mode="mode" metric-resource="resource" :resource-name="value.name" />
+      <MetricTarget
+        v-model="value.target"
+        :mode="mode"
+        metric-resource="resource"
+        :resource-name="value.name"
+      />
     </div>
   </div>
 </template>

package/edit/catalog.cattle.io.clusterrepo.vue

@@ -44,7 +44,11 @@ export default {
 
 <template>
   <form>
-    <NameNsDescription v-model="value" :mode="mode" :namespaced="isNamespaced" />
+    <NameNsDescription
+      v-model="value"
+      :mode="mode"
+      :namespaced="isNamespaced"
+    />
 
     <h2>{{ t('catalog.repo.target.label') }}</h2>
     <div class="row mb-10">
@@ -59,7 +63,10 @@ export default {
       </div>
     </div>
 
-    <div v-if="isGit" class="row mb-10">
+    <div
+      v-if="isGit"
+      class="row mb-10"
+    >
       <div class="col span-6">
         <LabeledInput
           v-model.trim="value.spec.gitRepo"
@@ -104,6 +111,11 @@ export default {
       :display-side-by-side="false"
     />
 
-    <Footer :mode="mode" :errors="errors" @save="save" @done="done" />
+    <Footer
+      :mode="mode"
+      :errors="errors"
+      @save="save"
+      @done="done"
+    />
   </form>
 </template>

package/edit/cis.cattle.io.clusterscan.vue

@@ -243,9 +243,16 @@ export default {
     @error="e=>errors = e"
   >
     <template>
-      <Banner v-if="!validProfiles.length" color="warning" :label="t('cis.noProfiles')" />
-
-      <div v-else class="row mb-20">
+      <Banner
+        v-if="!validProfiles.length"
+        color="warning"
+        :label="t('cis.noProfiles')"
+      />
+
+      <div
+        v-else
+        class="row mb-20"
+      >
         <div class="col span-6">
           <LabeledSelect
             v-model="value.spec.scanProfileName"
@@ -254,16 +261,33 @@ export default {
             :options="validProfiles"
           />
         </div>
-        <div v-if="canBeScheduled" class="col span-6">
-          <span>{{ t('cis.scoreWarning.label') }}</span> <i v-tooltip="t('cis.scoreWarning.protip')" class="icon icon-info" />
-          <RadioGroup v-model="value.spec.scoreWarning" :mode="mode" name="scoreWarning" :options="['pass', 'fail']" :labels="[t('cis.scan.pass'), t('cis.scan.fail')]" />
+        <div
+          v-if="canBeScheduled"
+          class="col span-6"
+        >
+          <span>{{ t('cis.scoreWarning.label') }}</span> <i
+            v-tooltip="t('cis.scoreWarning.protip')"
+            class="icon icon-info"
+          />
+          <RadioGroup
+            v-model="value.spec.scoreWarning"
+            :mode="mode"
+            name="scoreWarning"
+            :options="['pass', 'fail']"
+            :labels="[t('cis.scan.pass'), t('cis.scan.fail')]"
+          />
         </div>
       </div>
       <template v-if="canBeScheduled">
         <h3>Scheduling</h3>
         <div class="row mb-20">
           <div class="col">
-            <RadioGroup v-model="isScheduled" :mode="mode" name="scheduling" :options="[ {value: false, label: t('cis.scheduling.disable')}, {value: true, label: t('cis.scheduling.enable')}]" />
+            <RadioGroup
+              v-model="isScheduled"
+              :mode="mode"
+              name="scheduling"
+              :options="[ {value: false, label: t('cis.scheduling.disable')}, {value: true, label: t('cis.scheduling.enable')}]"
+            />
           </div>
         </div>
         <template v-if="isScheduled">
@@ -279,7 +303,13 @@ export default {
               />
             </div>
             <div class="col span-6">
-              <UnitInput v-model.number="scheduledScanConfig.retentionCount" :suffix="t('cis.reports')" type="number" :mode="mode" :label="t('cis.retention')" />
+              <UnitInput
+                v-model.number="scheduledScanConfig.retentionCount"
+                :suffix="t('cis.reports')"
+                type="number"
+                :mode="mode"
+                :label="t('cis.retention')"
+              />
             </div>
           </div>
           <h3>
@@ -287,11 +317,23 @@ export default {
           </h3>
           <div class="row mb-20">
             <div class="col span-12">
-              <Banner v-if="scanAlertRule.alertOnFailure || scanAlertRule.alertOnComplete" class="mt-0" :color="hasAlertManager ? 'info' : 'warning'">
+              <Banner
+                v-if="scanAlertRule.alertOnFailure || scanAlertRule.alertOnComplete"
+                class="mt-0"
+                :color="hasAlertManager ? 'info' : 'warning'"
+              >
                 <span v-html="t('cis.alertNeeded', {link: monitoringUrl}, true)" />
               </banner>
-              <Checkbox v-model="scanAlertRule.alertOnComplete" :mode="mode" :label="t('cis.alertOnComplete')" />
-              <Checkbox v-model="scanAlertRule.alertOnFailure" :mode="mode" :label="t('cis.alertOnFailure')" />
+              <Checkbox
+                v-model="scanAlertRule.alertOnComplete"
+                :mode="mode"
+                :label="t('cis.alertOnComplete')"
+              />
+              <Checkbox
+                v-model="scanAlertRule.alertOnFailure"
+                :mode="mode"
+                :label="t('cis.alertOnFailure')"
+              />
             </div>
           </div>
         </template>

package/edit/cis.cattle.io.clusterscanbenchmark.vue

@@ -71,7 +71,11 @@ export default {
   >
     <div class="row">
       <div class="col span-12">
-        <NameNsDescription :mode="mode" :value="value" :namespaced="false" />
+        <NameNsDescription
+          :mode="mode"
+          :value="value"
+          :namespaced="false"
+        />
       </div>
     </div>
     <div class="row mb-20">
@@ -97,10 +101,18 @@ export default {
     </div>
     <div class="row mb-20">
       <div class="col span-6">
-        <LabeledInput v-model="value.spec.minKubernetesVersion" :mode="mode" :label="t('cis.minKubernetesVersion')" />
+        <LabeledInput
+          v-model="value.spec.minKubernetesVersion"
+          :mode="mode"
+          :label="t('cis.minKubernetesVersion')"
+        />
       </div>
       <div class="col span-6">
-        <LabeledInput v-model="value.spec.maxKubernetesVersion" :mode="mode" :label="t('cis.maxKubernetesVersion')" />
+        <LabeledInput
+          v-model="value.spec.maxKubernetesVersion"
+          :mode="mode"
+          :label="t('cis.maxKubernetesVersion')"
+        />
       </div>
     </div>
   </CruResource>

package/edit/cis.cattle.io.clusterscanprofile.vue

@@ -114,15 +114,25 @@ export default {
       @error="e=>errors = e"
     >
       <template>
-        <div class="spacer"></div>
+        <div class="spacer" />
         <div class="row">
           <div class="col span-12">
-            <NameNsDescription :mode="mode" :value="value" :namespaced="false" @change="name=value.metadata.name" />
+            <NameNsDescription
+              :mode="mode"
+              :value="value"
+              :namespaced="false"
+              @change="name=value.metadata.name"
+            />
           </div>
         </div>
         <div class="row">
           <div class="col span-6">
-            <LabeledSelect v-model="value.spec.benchmarkVersion" :mode="mode" :label="t('cis.benchmarkVersion')" :options="compatibleBenchmarkNames" />
+            <LabeledSelect
+              v-model="value.spec.benchmarkVersion"
+              :mode="mode"
+              :label="t('cis.benchmarkVersion')"
+              :options="compatibleBenchmarkNames"
+            />
           </div>
         </div>
         <div class="spacer" />

package/edit/configmap.vue

@@ -74,7 +74,11 @@ export default {
     />
 
     <Tabbed :side-tabs="true">
-      <Tab name="data" :label="t('configmap.tabs.data.label')" :weight="2">
+      <Tab
+        name="data"
+        :label="t('configmap.tabs.data.label')"
+        :weight="2"
+      >
         <KeyValue
           key="data"
           v-model="data"

package/edit/constraints.gatekeeper.sh.constraint/index.vue

@@ -236,7 +236,10 @@ export default {
     @finish="save"
     @select-type="selectTemplateSubtype"
   >
-    <div v-if="value" class="gatekeeper-constraint">
+    <div
+      v-if="value"
+      class="gatekeeper-constraint"
+    >
       <div>
         <NameNsDescription
           v-if="!isView"
@@ -258,14 +261,28 @@ export default {
           />
         </div>
       </div>
-      <Tabbed :side-tabs="true" @changed="onTabChanged">
-        <Tab name="namespaces" :label="t('gatekeeperConstraint.tab.namespaces.title')" :weight="3">
+      <Tabbed
+        :side-tabs="true"
+        @changed="onTabChanged"
+      >
+        <Tab
+          name="namespaces"
+          :label="t('gatekeeperConstraint.tab.namespaces.title')"
+          :weight="3"
+        >
           <div class="row">
             <div class="col span-6">
-              <Scope v-model="value.spec.match.scope" :mode="mode" @input="onScopeChange($event)" />
+              <Scope
+                v-model="value.spec.match.scope"
+                :mode="mode"
+                @input="onScopeChange($event)"
+              />
             </div>
           </div>
-          <div v-if="showNamespaceLists" class="row mt-20">
+          <div
+            v-if="showNamespaceLists"
+            class="row mt-20"
+          >
             <div class="col span-12">
               <NamespaceList
                 v-model="value.spec.match.namespaces"
@@ -277,7 +294,10 @@ export default {
               />
             </div>
           </div>
-          <div v-if="showNamespaceLists" class="row mt-20">
+          <div
+            v-if="showNamespaceLists"
+            class="row mt-20"
+          >
             <div class="col span-12">
               <NamespaceList
                 v-model="value.spec.match.excludedNamespaces"
@@ -299,10 +319,17 @@ export default {
             </div>
           </div>
         </Tab>
-        <Tab name="rules" :label="t('gatekeeperConstraint.tab.rules.title')" :weight="2">
+        <Tab
+          name="rules"
+          :label="t('gatekeeperConstraint.tab.rules.title')"
+          :weight="2"
+        >
           <div class="row">
             <div class="col span-12">
-              <MatchKinds v-model="value.spec.match.kinds" :mode="mode" />
+              <MatchKinds
+                v-model="value.spec.match.kinds"
+                :mode="mode"
+              />
             </div>
           </div>
           <div class="row mt-40">
@@ -316,7 +343,11 @@ export default {
             </div>
           </div>
         </Tab>
-        <Tab name="parameters" :label="t('gatekeeperConstraint.tab.parameters.title')" :weight="1">
+        <Tab
+          name="parameters"
+          :label="t('gatekeeperConstraint.tab.parameters.title')"
+          :weight="1"
+        >
           <YamlEditor
             ref="yamlEditor"
             v-model="parametersYaml"

package/edit/fleet.cattle.io.cluster.vue

@@ -79,9 +79,13 @@ export default {
     @finish="save"
     @cancel="done"
   >
-    <NameNsDescription v-model="value" :mode="mode" :namespaced="isNamespaced" />
+    <NameNsDescription
+      v-model="value"
+      :mode="mode"
+      :namespaced="isNamespaced"
+    />
 
-    <hr class="mt-20 mb-20" />
+    <hr class="mt-20 mb-20">
 
     <Labels
       default-section-class="mt-20"