@rancher/shell 0.3.4 → 0.3.5

package/edit/namespace.vue

@@ -108,8 +108,8 @@ export default {
   },
 
   watch: {
-    project(newProject) {
-      const limits = this.getDefaultContainerResourceLimits(newProject);
+    project() {
+      const limits = this.getDefaultContainerResourceLimits(this.projectName);
 
       this.$set(this, 'containerResourceLimits', limits);
     },

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();
+      }
     }
   }
 };
@@ -223,6 +231,7 @@ export default {
       :machine-pools="machinePools"
       @error="e=>errors = e"
       @updateMachineCount="updateMachineCount"
+      @expandAdvanced="expandAdvanced"
     />
     <Banner
       v-else-if="value.configMissing"
@@ -236,6 +245,7 @@ export default {
     />
 
     <AdvancedSection
+      ref="advanced"
       :mode="mode"
       class="advanced"
     >

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"

package/edit/provisioning.cattle.io.cluster/__tests__/rke2.test.ts

@@ -2,6 +2,12 @@ import { mount } from '@vue/test-utils';
 import rke2 from '@shell/edit/provisioning.cattle.io.cluster/rke2.vue';
 
 describe('component: rke2', () => {
+  // Disable existing log to avoid pollution
+  // eslint-disable-next-line jest/no-hooks
+  beforeEach(() => {
+    jest.spyOn(console, 'log').mockImplementation(() => {});
+  });
+
   it.each([
     'v1.25.0+rke2r1',
     'v1.24.0+rke2r1',
@@ -9,7 +15,7 @@ describe('component: rke2', () => {
     'v1.25.0+k3s1',
     'v1.24.0+k3s1',
     'v1.23.0+k3s1',
-  ])('should display PSA option', () => {
+  ])('should display PSA option', (k8s) => {
     const label = 'whatever';
     const option = { label, value: label };
     const wrapper = mount(rke2, {
@@ -20,7 +26,7 @@ describe('component: rke2', () => {
             rkeConfig:                                            { etcd: { disableSnapshots: false } },
             chartValues:                                          {},
             defaultPodSecurityAdmissionConfigurationTemplateName: label,
-            kubernetesVersion:                                    'v1.25.0+rke2r1'
+            kubernetesVersion:                                    k8s
           }
         },
         provider: 'whatever',
@@ -93,4 +99,198 @@ describe('component: rke2', () => {
 
     expect((select.vm as unknown as any).options[0].label).toBe(`${ label } (Current)`);
   });
+
+  it.each([
+    ['v1.25.0+rke2r1', 'none'],
+    ['v1.24.0+rke2r1', 'default'],
+    ['v1.23.0+rke2r1', 'default'],
+    ['v1.25.0+k3s1', 'none'],
+    ['v1.24.0+k3s1', 'default'],
+    ['v1.23.0+k3s1', 'default'],
+  ])('should display for version %p PSA option label %p', (k8s, partialLabel) => {
+    const label = `cluster.rke2.defaultPodSecurityAdmissionConfigurationTemplateName.option.${ partialLabel }`;
+    const option = { label, value: label };
+    const wrapper = mount(rke2, {
+      propsData: {
+        mode:  'create',
+        value: {
+          spec: {
+            rkeConfig:                                            { etcd: { disableSnapshots: false } },
+            chartValues:                                          {},
+            defaultPodSecurityAdmissionConfigurationTemplateName: label,
+            kubernetesVersion:                                    k8s
+          }
+        },
+        provider: 'whatever',
+        resource: {}
+      },
+      computed: {
+        showForm() {
+          return true;
+        },
+        hasMachinePools() {
+          return false;
+        },
+        showk8s21LegacyWarning() {
+          return false;
+        },
+      },
+      mocks: {
+        $fetchState: { pending: false },
+        $route:      {
+          name:  'anything',
+          query: { AS: 'yaml' },
+        },
+        $store: {
+          getters: {
+            currentStore:           () => 'current_store',
+            'management/schemaFor': jest.fn(),
+            'current_store/all':    jest.fn(),
+            'i18n/t':               jest.fn(),
+            'i18n/withFallback':    jest.fn(),
+          },
+          dispatch: {
+            'management/find':    jest.fn(),
+            'management/findAll': () => ([option]),
+          }
+        },
+      },
+      stubs: {
+        CruResource:              { template: '<div><slot></slot></div>' }, // Required to render the slot content
+        Banner:                   true,
+        LabeledSelect:            true,
+        ACE:                      true,
+        AgentEnv:                 true,
+        ArrayList:                true,
+        ArrayListGrouped:         true,
+        BadgeState:               true,
+        Checkbox:                 true,
+        ClusterMembershipEditor:  true,
+        DrainOptions:             true,
+        LabeledInput:             true,
+        Labels:                   true,
+        Loading:                  true,
+        MachinePool:              true,
+        MatchExpressions:         true,
+        NameNsDescription:        true,
+        Questions:                true,
+        RadioGroup:               true,
+        RegistryConfigs:          true,
+        RegistryMirrors:          true,
+        S3Config:                 true,
+        SelectCredential:         true,
+        SelectOrCreateAuthSecret: true,
+        Tab:                      true,
+        Tabbed:                   true,
+        UnitInput:                true,
+        YamlEditor:               true,
+      }
+    });
+
+    const select = wrapper.find('[data-testid="rke2-custom-edit-psa"]');
+
+    expect((select.vm as unknown as any).options[0].label).toStrictEqual(`${ label } (Current)`);
+  });
+
+  it.each([
+    ['anything', false, true],
+    ['', false, false],
+    ['', true, false],
+  ])('given CIS value as %p and its override as %p, it should set PSA dropdown as disabled %p', (cis, override, disabled) => {
+    const label = 'whatever';
+    const k8s = 'v1.25.0+rke2r1';
+    const option = { label, value: label };
+    const wrapper = mount(rke2, {
+      propsData: {
+        mode:  'create',
+        value: {
+          agentConfig: { profile: cis },
+          spec:        {
+            rkeConfig:                                            { etcd: { disableSnapshots: false } },
+            chartValues:                                          {},
+            defaultPodSecurityAdmissionConfigurationTemplateName: label,
+            kubernetesVersion:                                    k8s
+          }
+        },
+        provider: 'custom',
+        resource: {}
+      },
+      computed: {
+        showForm() {
+          return true;
+        },
+        hasMachinePools() {
+          return false;
+        },
+        showk8s21LegacyWarning() {
+          return false;
+        },
+        agentArgs:      () => ({ profile: { options: [cis] } }),
+        versionOptions: () => [
+          {
+            value:     k8s,
+            agentArgs: { profile: { options: [cis] } },
+            charts:    {},
+            profile:   { options: [cis] }
+          }
+        ]
+      },
+      mocks: {
+        $fetchState: { pending: false },
+        $route:      {
+          name:  'anything',
+          query: { AS: 'yaml' },
+        },
+        $store: {
+          getters: {
+            currentStore:           () => 'current_store',
+            'management/schemaFor': jest.fn(),
+            'current_store/all':    jest.fn(),
+            'i18n/t':               jest.fn(),
+            'i18n/withFallback':    jest.fn(),
+          },
+          dispatch: {
+            'management/find':    jest.fn(),
+            'management/findAll': () => ([option]),
+          }
+        },
+      },
+      stubs: {
+        CruResource:              { template: '<div><slot></slot></div>' }, // Required to render the slot content
+        Banner:                   true,
+        LabeledSelect:            true,
+        ACE:                      true,
+        AgentEnv:                 true,
+        ArrayList:                true,
+        ArrayListGrouped:         true,
+        BadgeState:               true,
+        Checkbox:                 true,
+        ClusterMembershipEditor:  true,
+        DrainOptions:             true,
+        LabeledInput:             true,
+        Labels:                   true,
+        Loading:                  true,
+        MachinePool:              true,
+        MatchExpressions:         true,
+        NameNsDescription:        true,
+        Questions:                true,
+        RadioGroup:               true,
+        RegistryConfigs:          true,
+        RegistryMirrors:          true,
+        S3Config:                 true,
+        SelectCredential:         true,
+        SelectOrCreateAuthSecret: true,
+        Tab:                      true,
+        Tabbed:                   true,
+        UnitInput:                true,
+        YamlEditor:               true,
+      }
+    });
+
+    wrapper.setData({ cisOverride: override });
+
+    const select = wrapper.find('[data-testid="rke2-custom-edit-psa"]');
+
+    expect((select.vm as unknown as any).disabled).toBe(disabled);
+  });
 });