@rancher/shell 0.3.4 → 0.3.6

package/edit/monitoring.coreos.com.alertmanagerconfig/types/webhook.vue

@@ -143,8 +143,8 @@ export default {
   <div>
     <Banner
       v-if="mode !== view"
+      v-clean-html="t('monitoringReceiver.webhook.banner', {}, raw=true)"
       color="info"
-      v-html="t('monitoringReceiver.webhook.banner', {}, raw=true)"
     />
     <div class="row mb-20">
       <LabeledSelect
@@ -166,8 +166,8 @@ export default {
     </div>
     <Banner
       v-if="showNamespaceBanner"
+      v-clean-html="t('monitoringReceiver.webhook.modifyNamespace', {}, raw=true)"
       color="info"
-      v-html="t('monitoringReceiver.webhook.modifyNamespace', {}, raw=true)"
     />
     <div class="row mb-20">
       <div class="col span-12">

package/edit/monitoring.coreos.com.receiver/tls.vue

@@ -35,37 +35,37 @@ export default {
     <div class="row">
       <div class="col span-12">
         <h3>{{ t('monitoring.receiver.tls.label') }}</h3>
-        <Banner
-          color="info"
-          v-html="t('monitoring.receiver.tls.secretsBanner', {}, true)"
+        <Banner
+          v-clean-html="t('monitoring.receiver.tls.secretsBanner', {}, true)"
+          color="info"
         />
       </div>
     </div>
     <div class="row mb-20">
       <div class="col span-6">
-        <LabeledInput
-          v-model="value.tls_config.ca_file"
-          :mode="mode"
-          :label="t('monitoring.receiver.tls.caFilePath.label')"
-          :placeholder="t('monitoring.receiver.tls.caFilePath.placeholder')"
+        <LabeledInput
+          v-model="value.tls_config.ca_file"
+          :mode="mode"
+          :label="t('monitoring.receiver.tls.caFilePath.label')"
+          :placeholder="t('monitoring.receiver.tls.caFilePath.placeholder')"
         />
       </div>
     </div>
     <div class="row mb-20">
       <div class="col span-6">
-        <LabeledInput
-          v-model="value.tls_config.cert_file"
-          :mode="mode"
-          :label="t('monitoring.receiver.tls.certFilePath.label')"
-          :placeholder="t('monitoring.receiver.tls.certFilePath.placeholder')"
+        <LabeledInput
+          v-model="value.tls_config.cert_file"
+          :mode="mode"
+          :label="t('monitoring.receiver.tls.certFilePath.label')"
+          :placeholder="t('monitoring.receiver.tls.certFilePath.placeholder')"
         />
       </div>
       <div class="col span-6">
-        <LabeledInput
-          v-model="value.tls_config.key_file"
-          :mode="mode"
-          :label="t('monitoring.receiver.tls.keyFilePath.label')"
-          :placeholder="t('monitoring.receiver.tls.keyFilePath.placeholder')"
+        <LabeledInput
+          v-model="value.tls_config.key_file"
+          :mode="mode"
+          :label="t('monitoring.receiver.tls.keyFilePath.label')"
+          :placeholder="t('monitoring.receiver.tls.keyFilePath.placeholder')"
         />
       </div>
     </div>

package/edit/monitoring.coreos.com.receiver/types/webhook.banner.vue

@@ -20,9 +20,9 @@ export default {
 };
 </script>
 <template>
-  <Banner
-    v-if="model.length === 0 && !isView"
-    color="info"
-    v-html="t('monitoringReceiver.webhook.banner', {}, raw=true)"
+  <Banner
+    v-if="model.length === 0 && !isView"
+    v-clean-html="t('monitoringReceiver.webhook.banner', {}, raw=true)"
+    color="info"
   />
 </template>

package/edit/monitoring.coreos.com.receiver/types/webhook.vue

@@ -50,8 +50,8 @@ export default {
     </div>
     <Banner
       v-if="showNamespaceBanner"
+      v-clean-html="t('monitoringReceiver.webhook.modifyNamespace', {}, raw=true)"
       color="info"
-      v-html="t('monitoringReceiver.webhook.modifyNamespace', {}, raw=true)"
     />
     <div class="row mb-20">
       <div class="col span-12">

package/edit/namespace.vue

@@ -10,7 +10,7 @@ import PodSecurityAdmission from '@shell/components/PodSecurityAdmission';
 import Tabbed from '@shell/components/Tabbed';
 import Tab from '@shell/components/Tabbed/Tab';
 import CruResource from '@shell/components/CruResource';
-import { PROJECT_ID, _VIEW } from '@shell/config/query-params';
+import { PROJECT_ID, _VIEW, FLAT_VIEW, _CREATE } from '@shell/config/query-params';
 import MoveModal from '@shell/components/MoveModal';
 import ResourceQuota from '@shell/components/form/ResourceQuota/Namespace';
 import Loading from '@shell/components/Loading';
@@ -67,6 +67,10 @@ export default {
   computed: {
     ...mapGetters(['isSingleProduct']),
 
+    isCreate() {
+      return this.mode === _CREATE;
+    },
+
     isSingleHarvester() {
       return this.$store.getters['currentProduct'].inStore === HARVESTER && this.isSingleProduct;
     },
@@ -77,7 +81,6 @@ export default {
 
       // Filter out projects not for the current cluster
       projects = projects.filter(c => c.spec?.clusterName === clusterId);
-
       const out = projects.map((project) => {
         return {
           label: project.nameDisplay,
@@ -86,7 +89,7 @@ export default {
       });
 
       out.unshift({
-        label: '(None)',
+        label: this.t('namespace.project.none'),
         value: null,
       });
 
@@ -105,11 +108,14 @@ export default {
       return !this.isSingleHarvester;
     },
 
+    flatView() {
+      return (this.$route.query[FLAT_VIEW] || false);
+    }
   },
 
   watch: {
-    project(newProject) {
-      const limits = this.getDefaultContainerResourceLimits(newProject);
+    project() {
+      const limits = this.getDefaultContainerResourceLimits(this.projectName);
 
       this.$set(this, 'containerResourceLimits', limits);
     },
@@ -139,13 +145,11 @@ export default {
       }
 
       const projects = this.$store.getters['management/all'](MANAGEMENT.PROJECT);
-
       const project = projects.find(p => p.id.includes(projectName));
 
       return project?.spec?.containerDefaultResourceLimit || {};
     }
-  }
-
+  },
 };
 </script>
 
@@ -169,9 +173,10 @@ export default {
       :value="value"
       :namespaced="false"
       :mode="mode"
+      :extra-columns="['project-col']"
     >
       <template
-        v-if="project"
+        v-if="flatView && isCreate"
         #project-col
       >
         <LabeledSelect
@@ -181,7 +186,6 @@ export default {
         />
       </template>
     </NameNsDescription>
-
     <Tabbed :side-tabs="true">
       <Tab
         v-if="showResourceQuota"

package/edit/networking.k8s.io.networkpolicy/PolicyRuleTarget.vue

@@ -11,9 +11,12 @@ import { Banner } from '@components/Banner';
 import throttle from 'lodash/throttle';
 import { isValidCIDR } from '@shell/utils/validators/cidr';
 
-const TARGET_OPTION_IP_BLOCK = 'ipBlock';
-const TARGET_OPTION_NAMESPACE_SELECTOR = 'namespaceSelector';
-const TARGET_OPTION_POD_SELECTOR = 'podSelector';
+const TARGET_OPTIONS = {
+  IP_BLOCK:                   'ipBlock',
+  NAMESPACE_SELECTOR:         'namespaceSelector',
+  POD_SELECTOR:               'podSelector',
+  NAMESPACE_AND_POD_SELECTOR: 'namespaceAndPodSelector',
+};
 
 export default {
   components: {
@@ -52,53 +55,48 @@ export default {
     },
   },
   data() {
-    if (!this.value[TARGET_OPTION_IP_BLOCK] && !this.value[TARGET_OPTION_POD_SELECTOR] && !this.value[TARGET_OPTION_NAMESPACE_SELECTOR]) {
+    if (!this.value[TARGET_OPTIONS.IP_BLOCK] &&
+      !this.value[TARGET_OPTIONS.POD_SELECTOR] &&
+      !this.value[TARGET_OPTIONS.NAMESPACE_SELECTOR] &&
+      !this.value[TARGET_OPTIONS.NAMESPACE_AND_POD_SELECTOR]
+    ) {
       this.$nextTick(() => {
-        this.$set(this.value, TARGET_OPTION_IP_BLOCK, {});
+        this.$set(this.value, TARGET_OPTIONS.IP_BLOCK, {});
       });
     }
 
-    const matchingPods = this.getMatchingPods();
-    const matchingNamespaces = this.getMatchingNamespaces();
-
     return {
-      portOptions:   ['TCP', 'UDP'],
-      matchingPods,
-      matchingNamespaces,
-      invalidCidr:   null,
-      invalidCidrs:  [],
-      TARGET_OPTION_IP_BLOCK,
-      TARGET_OPTION_NAMESPACE_SELECTOR,
-      TARGET_OPTION_POD_SELECTOR,
+      portOptions:        ['TCP', 'UDP'],
+      matchingPods:       {},
+      matchingNamespaces: {},
+      invalidCidr:        null,
+      invalidCidrs:       [],
       POD,
-      targetOptions: [
-        TARGET_OPTION_IP_BLOCK,
-        TARGET_OPTION_NAMESPACE_SELECTOR,
-        TARGET_OPTION_POD_SELECTOR
-      ],
+      TARGET_OPTIONS,
+      targetOptions:      Object.values(TARGET_OPTIONS),
     };
   },
   computed: {
     podSelectorExpressions: {
       get() {
         return convert(
-          this.value[TARGET_OPTION_POD_SELECTOR]?.matchLabels || {},
-          this.value[TARGET_OPTION_POD_SELECTOR]?.matchExpressions || []
+          this.value[TARGET_OPTIONS.POD_SELECTOR]?.matchLabels || {},
+          this.value[TARGET_OPTIONS.POD_SELECTOR]?.matchExpressions || []
         );
       },
       set(podSelectorExpressions) {
-        this.$set(this.value, TARGET_OPTION_POD_SELECTOR, simplify(podSelectorExpressions));
+        this.$set(this.value, TARGET_OPTIONS.POD_SELECTOR, simplify(podSelectorExpressions));
       }
     },
     namespaceSelectorExpressions: {
       get() {
         return convert(
-          this.value[TARGET_OPTION_NAMESPACE_SELECTOR]?.matchLabels || {},
-          this.value[TARGET_OPTION_NAMESPACE_SELECTOR]?.matchExpressions || []
+          this.value[TARGET_OPTIONS.NAMESPACE_SELECTOR]?.matchLabels || {},
+          this.value[TARGET_OPTIONS.NAMESPACE_SELECTOR]?.matchExpressions || []
         );
       },
       set(namespaceSelectorExpressions) {
-        this.$set(this.value, TARGET_OPTION_NAMESPACE_SELECTOR, simplify(namespaceSelectorExpressions));
+        this.$set(this.value, TARGET_OPTIONS.NAMESPACE_SELECTOR, simplify(namespaceSelectorExpressions));
       }
     },
     selectTargetOptions() {
@@ -116,6 +114,9 @@ export default {
     targetType: {
       get() {
         for (const option of this.targetOptions) {
+          if (this.value[TARGET_OPTIONS.NAMESPACE_AND_POD_SELECTOR] || (this.value[TARGET_OPTIONS.NAMESPACE_SELECTOR] && this.value[TARGET_OPTIONS.POD_SELECTOR])) {
+            return TARGET_OPTIONS.NAMESPACE_AND_POD_SELECTOR;
+          }
           if (this.value[option]) {
             return option;
           }
@@ -124,13 +125,30 @@ export default {
         return null;
       },
       set(targetType) {
-        this.$delete(this.value, TARGET_OPTION_IP_BLOCK);
-        this.$delete(this.value, TARGET_OPTION_NAMESPACE_SELECTOR);
-        this.$delete(this.value, TARGET_OPTION_POD_SELECTOR);
+        this.$delete(this.value, TARGET_OPTIONS.IP_BLOCK);
+        this.$delete(this.value, TARGET_OPTIONS.NAMESPACE_SELECTOR);
+        this.$delete(this.value, TARGET_OPTIONS.POD_SELECTOR);
+        this.$delete(this.value, TARGET_OPTIONS.NAMESPACE_AND_POD_SELECTOR);
         this.$nextTick(() => {
           this.$set(this.value, targetType, {});
         });
       }
+    },
+    updateMatches() {
+      return {
+        handler: throttle(function() {
+          this.matchingNamespaces = this.getMatchingNamespaces();
+          this.matchingPods = this.getMatchingPods();
+        }, 250, { leading: true }),
+        immediate: true
+      };
+    },
+    matchingNamespacesAndPods() {
+      return {
+        policyNamespace: this.namespace,
+        ...Object.keys(this.matchingNamespaces).reduce((acc, k) => ({ ...acc, [`${ k }Namespaces`]: this.matchingNamespaces[k] }), {}),
+        ...Object.keys(this.matchingPods).reduce((acc, k) => ({ ...acc, [`${ k }Pods`]: this.matchingPods[k] }), {}),
+      };
     }
   },
   watch: {
@@ -144,24 +162,21 @@ export default {
   },
   methods: {
     validateCIDR() {
-      const exceptCidrs = this.value[TARGET_OPTION_IP_BLOCK]?.except || [];
+      const exceptCidrs = this.value[TARGET_OPTIONS.IP_BLOCK]?.except || [];
 
       this.invalidCidrs = exceptCidrs
         .filter(cidr => !isValidCIDR(cidr))
         .map(invalidCidr => invalidCidr || '<blank>');
 
-      if (this.value[TARGET_OPTION_IP_BLOCK]?.cidr && !isValidCIDR(this.value[TARGET_OPTION_IP_BLOCK].cidr)) {
-        this.invalidCidr = this.value[TARGET_OPTION_IP_BLOCK].cidr;
+      if (this.value[TARGET_OPTIONS.IP_BLOCK]?.cidr && !isValidCIDR(this.value[TARGET_OPTIONS.IP_BLOCK].cidr)) {
+        this.invalidCidr = this.value[TARGET_OPTIONS.IP_BLOCK].cidr;
       } else {
         this.invalidCidr = null;
       }
     },
-    updateMatches: throttle(function() {
-      this.matchingPods = this.getMatchingPods();
-      this.matchingNamespaces = this.getMatchingNamespaces();
-    }, 250, { leading: true }),
     getMatchingPods() {
-      const allInNamespace = this.allPods.filter(pod => pod.metadata.namespace === this.namespace);
+      const namespaces = this.targetType === TARGET_OPTIONS.NAMESPACE_AND_POD_SELECTOR ? this.matchingNamespaces.matches : [{ id: this.namespace }];
+      const allInNamespace = this.allPods.filter(pod => namespaces.some(ns => ns.id === pod.metadata.namespace));
       const match = matching(allInNamespace, this.podSelectorExpressions);
       const matched = match.length || 0;
       const sample = match[0]?.nameDisplay;
@@ -199,17 +214,18 @@ export default {
         <LabeledSelect
           v-model="targetType"
           :mode="mode"
+          :tooltip="targetType === TARGET_OPTIONS.NAMESPACE_AND_POD_SELECTOR ? t('networkpolicy.selectors.matchingNamespacesAndPods.tooltip') : null"
           :options="selectTargetOptions"
           :multiple="false"
           :label="t('networkpolicy.rules.type')"
         />
       </div>
     </div>
-    <div v-if="targetType === TARGET_OPTION_IP_BLOCK">
+    <div v-if="targetType === TARGET_OPTIONS.IP_BLOCK">
       <div class="row">
         <div class="col span-6">
           <LabeledInput
-            v-model="value[TARGET_OPTION_IP_BLOCK].cidr"
+            v-model="value[TARGET_OPTIONS.IP_BLOCK].cidr"
             :mode="mode"
             :placeholder="t('networkpolicy.rules.ipBlock.cidr.placeholder')"
             :label="t('networkpolicy.rules.ipBlock.cidr.label')"
@@ -229,7 +245,7 @@ export default {
       <div class="row mt-20">
         <div class="col span-12">
           <ArrayList
-            v-model="value[TARGET_OPTION_IP_BLOCK].except"
+            v-model="value[TARGET_OPTIONS.IP_BLOCK].except"
             :add-label="t('networkpolicy.rules.ipBlock.addExcept')"
             :mode="mode"
             :show-header="true"
@@ -249,11 +265,11 @@ export default {
         </div>
       </div>
     </div>
-    <div v-if="targetType === TARGET_OPTION_POD_SELECTOR">
+    <div v-if="targetType === TARGET_OPTIONS.POD_SELECTOR">
       <div class="row">
         <div class="col span-12">
           <Banner color="success">
-            <span v-html="t('networkpolicy.selectors.matchingPods.matchesSome', matchingPods)" />
+            <span v-clean-html="t('networkpolicy.selectors.matchingPods.matchesSome', matchingPods)" />
           </Banner>
         </div>
       </div>
@@ -269,11 +285,11 @@ export default {
         </div>
       </div>
     </div>
-    <div v-if="targetType === TARGET_OPTION_NAMESPACE_SELECTOR">
+    <div v-if="targetType === TARGET_OPTIONS.NAMESPACE_SELECTOR">
       <div class="row">
         <div class="col span-12">
           <Banner color="success">
-            <span v-html="t('networkpolicy.selectors.matchingNamespaces.matchesSome', matchingNamespaces)" />
+            <span v-clean-html="t('networkpolicy.selectors.matchingNamespaces.matchesSome', matchingNamespaces)" />
           </Banner>
         </div>
       </div>
@@ -289,5 +305,70 @@ export default {
         </div>
       </div>
     </div>
+    <div v-if="targetType === TARGET_OPTIONS.NAMESPACE_AND_POD_SELECTOR">
+      <div class="row">
+        <div class="col span-12">
+          <Banner color="success">
+            <span
+              v-if="!namespaceSelectorExpressions.length"
+              v-clean-html="t('networkpolicy.selectors.matchingPods.matchesSome', matchingPods)"
+            />
+            <span
+              v-else
+              v-clean-html="t('networkpolicy.selectors.matchingNamespacesAndPods.matchesSome', matchingNamespacesAndPods)"
+            />
+          </Banner>
+        </div>
+      </div>
+      <div class="row mb-0">
+        <div class="col span-1 namespace-pod-rule">
+          <span class="label">
+            {{ t('networkpolicy.rules.namespace') }}
+          </span>
+        </div>
+        <div class="col span-11">
+          <MatchExpressions
+            v-model="namespaceSelectorExpressions"
+            :mode="mode"
+            :show-add-button="false"
+            :show-remove-button="false"
+            :show-remove="false"
+            :initial-empty-row="true"
+            :type="POD"
+          />
+        </div>
+      </div>
+      <div class="row mb-0">
+        <div class="col span-1 namespace-pod-rule">
+          <span class="label">
+            {{ t('networkpolicy.rules.pod') }}
+          </span>
+        </div>
+        <div class="col span-11">
+          <MatchExpressions
+            v-model="podSelectorExpressions"
+            :mode="mode"
+            :show-add-button="false"
+            :show-remove-button="false"
+            :show-remove="false"
+            :initial-empty-row="true"
+            :type="POD"
+          />
+        </div>
+      </div>
+    </div>
   </div>
 </template>
+
+<style lang='scss' scoped>
+  .namespace-pod-rule {
+    width: 100px;
+    margin: 0;
+    text-align: center;
+
+    .label {
+      display: block;
+      margin-top: 32px;
+    }
+  }
+</style>

package/edit/networking.k8s.io.networkpolicy/index.vue

@@ -258,7 +258,7 @@ export default {
             <div class="row">
               <div class="col span-12">
                 <Banner color="success">
-                  <span v-html="t('networkpolicy.selectors.matchingPods.matchesSome', matchingPods)" />
+                  <span v-clean-html="t('networkpolicy.selectors.matchingPods.matchesSome', matchingPods)" />
                 </Banner>
               </div>
             </div>

package/edit/provisioning.cattle.io.cluster/MachinePool.vue

@@ -158,6 +158,14 @@ export default {
     // (only used on Elemental because it comes from "machineinventoryselectortemplate" machine-config)
     updateMachineCount(val) {
       this.value.pool.quantity = val || 1;
+    },
+
+    expandAdvanced() {
+      const advancedComponent = this.$refs.advanced;
+
+      if (advancedComponent && !advancedComponent.show) {
+        advancedComponent.toggle();
+      }
     }
   }
 };
@@ -165,6 +173,14 @@ export default {
 
 <template>
   <div>
+    <Banner
+      v-if="value.pool.hostnameLengthLimit"
+      color="info"
+    >
+      <div class="text">
+        {{ t('cluster.machinePool.truncationPool', { limit: value.pool.hostnameLengthLimit }) }}
+      </div>
+    </Banner>
     <div class="row">
       <div class="col span-4">
         <LabeledInput
@@ -192,19 +208,19 @@ export default {
         <Checkbox
           v-model="value.pool.etcdRole"
           :mode="mode"
-          label="etcd"
+          :label="t('cluster.machinePool.role.etcd')"
           :disabled="isWindows"
         />
         <Checkbox
           v-model="value.pool.controlPlaneRole"
           :mode="mode"
-          label="Control Plane"
+          :label="t('cluster.machinePool.role.controlPlane')"
           :disabled="isWindows"
         />
         <Checkbox
           v-model="value.pool.workerRole"
           :mode="mode"
-          label="Worker"
+          :label="t('cluster.machinePool.role.worker')"
         />
       </div>
     </div>
@@ -223,6 +239,7 @@ export default {
       :machine-pools="machinePools"
       @error="e=>errors = e"
       @updateMachineCount="updateMachineCount"
+      @expandAdvanced="expandAdvanced"
     />
     <Banner
       v-else-if="value.configMissing"
@@ -236,6 +253,7 @@ export default {
     />
 
     <AdvancedSection
+      ref="advanced"
       :mode="mode"
       class="advanced"
     >
@@ -284,7 +302,6 @@ export default {
         :read-allowed="false"
         :value-can-be-empty="true"
       />
-
       <div class="spacer" />
 
       <Taints

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

@@ -159,6 +159,7 @@ export default {
           <div class="col span-6">
             <SecretSelector
               v-model="row.value.tlsSecretName"
+              in-store="management"
               :mode="mode"
               :types="[TLS]"
               :namespace="value.metadata.namespace"