@rancher/shell 3.0.9-rc.3 → 3.0.9-rc.5

package/edit/management.cattle.io.user.vue

@@ -1,5 +1,5 @@
 <script>
-import { MANAGEMENT, NORMAN } from '@shell/config/types';
+import { MANAGEMENT, SECRET } from '@shell/config/types';
 import CreateEditView from '@shell/mixins/create-edit-view';
 import GlobalRoleBindings from '@shell/components/GlobalRoleBindings.vue';
 import ChangePassword from '@shell/components/form/ChangePassword';
@@ -9,6 +9,7 @@ import { exceptionToErrorsArray } from '@shell/utils/error';
 import { _CREATE, _EDIT } from '@shell/config/query-params';
 import Loading from '@shell/components/Loading';
 import { wait } from '@shell/utils/async';
+import { base64Encode } from '@shell/utils/crypto';
 
 export default {
   components: {
@@ -128,26 +129,33 @@ export default {
     },
 
     async createUser() {
-      // Ensure username is unique (this does not happen in the backend)
-      const users = await this.$store.dispatch('management/findAll', { type: MANAGEMENT.USER });
-
-      if (users.find((u) => u.username === this.form.username)) {
-        throw new Error(this.t('user.edit.credentials.username.exists'));
-      }
-
-      const user = await this.$store.dispatch('rancher/create', {
-        type:               NORMAN.USER,
+      // never use "password" as it's deprecated!
+      const user = await this.$store.dispatch('management/create', {
+        type:               MANAGEMENT.USER,
         description:        this.form.description,
         enabled:            true,
         mustChangePassword: this.form.password.userChangeOnLogin,
-        name:               this.form.displayName,
-        password:           this.form.password.password,
+        displayName:        this.form.displayName,
         username:           this.form.username
       });
 
-      const newNormanUser = await user.save();
+      const userSaved = await user.save();
+
+      if (this.form.password.password) {
+        // create secret to hold user password
+        const secret = await this.$store.dispatch('management/create', {
+          type:     SECRET,
+          metadata: {
+            namespace: 'cattle-local-user-passwords',
+            name:      userSaved.id
+          },
+          data: { password: base64Encode(this.form.password.password) }
+        });
+
+        await secret.save();
+      }
 
-      return this.$store.dispatch('management/find', { type: MANAGEMENT.USER, id: newNormanUser.id });
+      return userSaved;
     },
 
     async editUser() {
@@ -155,16 +163,13 @@ export default {
         return;
       }
 
-      const normanUser = await this.$store.dispatch('rancher/find', {
-        type: NORMAN.USER,
-        id:   this.value.id || this.user?.id,
-      });
+      // never use this.value.password as it's deprecated!
+      this.value.description = this.form.description;
+      this.value.displayName = this.form.displayName;
+      this.value.mustChangePassword = this.form.password.userChangeOnLogin;
 
-      // Save change of password
-      // - Password must be changed before editing mustChangePassword (setpassword action sets this to false)
       if (this.form.password.password) {
-        await this.$refs.changePassword.save(normanUser);
-
+        await this.$refs.changePassword.save(this.value);
         // Why the wait? Without these the user updates below are ignored
         // - The update request succeeds and shows the correct values in it's response.
         // - Fetching the norman user again sometimes shows the correct value, sometimes not
@@ -173,18 +178,7 @@ export default {
         await wait(5000);
       }
 
-      // Save user updates
-      normanUser.description = this.form.description;
-      normanUser._name = this.form.displayName;
-      normanUser.mustChangePassword = this.form.password.userChangeOnLogin;
-
-      await normanUser.save();
-
-      return await this.$store.dispatch('management/find', {
-        type: MANAGEMENT.USER,
-        id:   this.value.id,
-        opt:  { force: true }
-      });
+      this.value.save();
     },
 
     async updateRoles(userId) {
@@ -267,6 +261,7 @@ export default {
         v-model:value="form.password"
         :mode="mode"
         :must-change-password="value.mustChangePassword"
+        :user="value"
         @valid="validation.password = $event"
       />
     </div>

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

@@ -4,6 +4,7 @@ import { _CREATE } from '@shell/config/query-params';
 import rke2 from '@shell/edit/provisioning.cattle.io.cluster/rke2.vue';
 import { get } from '@shell/utils/object';
 import { rke2TestTable } from './utils/rke2-test-data';
+import { NGINX_SUPPORTED, INGRESS_CONTROLLER, INGRESS_NGINX } from '@shell/edit/provisioning.cattle.io.cluster/shared';
 
 /**
  * DISCLAIMER ***************************************************************************************
@@ -612,4 +613,181 @@ describe('component: rke2', () => {
 
     expect(wrapper.vm.value.spec.rkeConfig.chartValues).toStrictEqual(expected);
   });
+
+  describe('should correctly update NGINX configuration', () => {
+    const k8sVersion = 'v1.25.0+rke2r1';
+    const createWrapper = () => {
+      return shallowMount(rke2, {
+        props: {
+          mode:  _CREATE,
+          value: {
+            spec: {
+              ...defaultSpec,
+              rkeConfig: {
+                machineGlobalConfig:   {},
+                chartValues:           {},
+                upgradeStrategy:       {},
+                dataDirectories:       {},
+                machineSelectorConfig: []
+              },
+              kubernetesVersion: k8sVersion,
+            },
+            agentConfig: {}
+          },
+          provider: 'custom',
+        },
+        global: {
+          mocks: {
+            ...defaultMocks,
+            $store:     { dispatch: () => jest.fn(), getters: defaultGetters },
+            $extension: { getDynamic: jest.fn(() => undefined ) },
+          },
+          stubs: defaultStubs,
+        },
+      });
+    };
+
+    it('should set ingress-controller to ingress-nginx by default when nginx is supported and not disabled', async() => {
+      const wrapper = createWrapper();
+
+      await wrapper.setData({
+        rke2Versions: [{
+          id:         k8sVersion,
+          version:    k8sVersion,
+          serverArgs: { disable: { options: [NGINX_SUPPORTED] } }
+        }]
+      });
+
+      expect(wrapper.vm.value.spec.rkeConfig.machineGlobalConfig[INGRESS_CONTROLLER]).toBe(INGRESS_NGINX);
+    });
+
+    it('should set ingress-controller to undefined by default when nginx is not supported', async() => {
+      const wrapper = createWrapper();
+
+      await wrapper.setData({
+        rke2Versions: [{
+          id:         k8sVersion,
+          version:    k8sVersion,
+          serverArgs: { disable: { options: [] } }
+        }]
+      });
+
+      expect(wrapper.vm.value.spec.rkeConfig.machineGlobalConfig[INGRESS_CONTROLLER]).toBeUndefined();
+    });
+
+    it('should set ingress-controller to ingress-nginx on change when nginx is supported and not disabled', () => {
+      const wrapper = createWrapper();
+
+      wrapper.setData({
+        rke2Versions: [{
+          id:         k8sVersion,
+          version:    k8sVersion,
+          serverArgs: { disable: { options: [NGINX_SUPPORTED] } }
+        }]
+      });
+
+      (wrapper.vm as any).handleEnabledSystemServicesChanged([]);
+
+      expect(wrapper.vm.value.spec.rkeConfig.machineGlobalConfig[INGRESS_CONTROLLER]).toBe(INGRESS_NGINX);
+    });
+
+    it('should set ingress-controller to undefined when nginx is supported but disabled', () => {
+      const wrapper = createWrapper();
+
+      wrapper.setData({
+        rke2Versions: [{
+          id:         k8sVersion,
+          version:    k8sVersion,
+          serverArgs: { disable: { options: [NGINX_SUPPORTED] } }
+        }]
+      });
+
+      (wrapper.vm as any).handleEnabledSystemServicesChanged([NGINX_SUPPORTED]);
+
+      expect(wrapper.vm.value.spec.rkeConfig.machineGlobalConfig[INGRESS_CONTROLLER]).toBeUndefined();
+    });
+
+    it('should set ingress-controller to undefined when nginx is not supported', () => {
+      const wrapper = createWrapper();
+
+      wrapper.setData({
+        rke2Versions: [{
+          id:         k8sVersion,
+          version:    k8sVersion,
+          serverArgs: { disable: { options: [] } }
+        }]
+      });
+
+      (wrapper.vm as any).handleEnabledSystemServicesChanged([]);
+
+      expect(wrapper.vm.value.spec.rkeConfig.machineGlobalConfig[INGRESS_CONTROLLER]).toBeUndefined();
+    });
+
+    it('should correctly update disable list in serverConfig', () => {
+      const wrapper = createWrapper();
+
+      wrapper.setData({
+        rke2Versions: [{
+          id:         k8sVersion,
+          version:    k8sVersion,
+          serverArgs: { disable: { options: [NGINX_SUPPORTED] } }
+        }]
+      });
+      const disabledServices = ['other-service'];
+
+      (wrapper.vm as any).handleEnabledSystemServicesChanged(disabledServices);
+
+      expect(wrapper.vm.value.spec.rkeConfig.machineGlobalConfig.disable).toStrictEqual(disabledServices);
+    });
+
+    it('should set ingress-controller to ingress-nginx on version change when nginx is supported', async() => {
+      const wrapper = createWrapper();
+      const newVersion = 'v1.26.0+rke2r1';
+
+      await wrapper.setData({
+        rke2Versions: [
+          {
+            id:         k8sVersion,
+            version:    k8sVersion,
+            serverArgs: { disable: { options: [NGINX_SUPPORTED] } }
+          },
+          {
+            id:         newVersion,
+            version:    newVersion,
+            serverArgs: { disable: { options: [NGINX_SUPPORTED] } }
+          }
+        ]
+      });
+
+      wrapper.vm.value.spec.kubernetesVersion = newVersion;
+      (wrapper.vm as any).handleKubernetesChange(newVersion);
+
+      expect(wrapper.vm.value.spec.rkeConfig.machineGlobalConfig[INGRESS_CONTROLLER]).toBe(INGRESS_NGINX);
+    });
+
+    it('should not set ingress-controller to ingress-nginx on version change when nginx is not supported', async() => {
+      const wrapper = createWrapper();
+      const newVersion = 'v1.26.0+rke2r1';
+
+      await wrapper.setData({
+        k3sVersions: [
+          {
+            id:         k8sVersion,
+            version:    k8sVersion,
+            serverArgs: { disable: { options: [] } }
+          },
+          {
+            id:         newVersion,
+            version:    newVersion,
+            serverArgs: { disable: { options: [] } }
+          }
+        ]
+      });
+
+      wrapper.vm.value.spec.kubernetesVersion = newVersion;
+      (wrapper.vm as any).handleKubernetesChange(newVersion);
+
+      expect(wrapper.vm.value.spec.rkeConfig.machineGlobalConfig[INGRESS_CONTROLLER]).toBeUndefined();
+    });
+  });
 });

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

@@ -66,6 +66,7 @@ import { DEFAULT_COMMON_BASE_PATH, DEFAULT_SUBDIRS } from '@shell/edit/provision
 import ClusterAppearance from '@shell/components/form/ClusterAppearance';
 import AddOnAdditionalManifest from '@shell/edit/provisioning.cattle.io.cluster/tabs/AddOnAdditionalManifest';
 import VsphereUtils, { VMWARE_VSPHERE } from '@shell/utils/v-sphere';
+import { RETENTION_DEFAULT, NGINX_SUPPORTED, INGRESS_CONTROLLER, INGRESS_NGINX } from '@shell/edit/provisioning.cattle.io.cluster/shared';
 import { mapGetters } from 'vuex';
 const HARVESTER = 'harvester';
 const GOOGLE = 'google';
@@ -891,7 +892,13 @@ export default {
             this.fvFormIsValid &&
             this.etcdConfigValid;
     },
+    nginxSupported() {
+      if (this.serverArgs?.disable?.options.includes(NGINX_SUPPORTED)) {
+        return true;
+      }
 
+      return false;
+    },
   },
 
   watch: {
@@ -999,7 +1006,7 @@ export default {
 
         this.localValue.spec.rkeConfig.networking.stackPreference = STACK_PREFS.IPV4;
       }
-    },
+    }
   },
 
   created() {
@@ -1061,7 +1068,7 @@ export default {
         this.rkeConfig.etcd = {
           disableSnapshots:     false,
           s3:                   null,
-          snapshotRetention:    5,
+          snapshotRetention:    RETENTION_DEFAULT,
           snapshotScheduleCron: '0 */5 * * *',
         };
       } else if (typeof this.rkeConfig.etcd.disableSnapshots === 'undefined') {
@@ -1882,6 +1889,7 @@ export default {
       if (!this.serverConfig?.profile) {
         this.serverConfig.profile = null;
       }
+      this.updateNginxConfiguration(this.serverConfig?.disable || []);
     },
 
     chartVersionKey(name) {
@@ -2116,6 +2124,8 @@ export default {
     handleKubernetesChange(value, old) {
       if (value) {
         this.togglePsaDefault();
+        // Need to make sure we explicitly set ingress due to a default change
+        this.updateNginxConfiguration(this.serverConfig?.disable || []);
 
         // If Harvester driver, reset cloud provider if not compatible
         if (this.isHarvesterDriver && this.mode === _CREATE && this.isHarvesterIncompatible) {
@@ -2137,8 +2147,18 @@ export default {
         this.machinePoolValidation[id] = value;
       }
     },
+
+    updateNginxConfiguration(val) {
+      if (val.includes(NGINX_SUPPORTED) || !this.nginxSupported) {
+        this.serverConfig[INGRESS_CONTROLLER] = undefined;
+      } else if (this.serverConfig[INGRESS_CONTROLLER] !== INGRESS_NGINX) {
+        this.serverConfig[INGRESS_CONTROLLER] = INGRESS_NGINX;
+      }
+    },
+
     handleEnabledSystemServicesChanged(val) {
       this.serverConfig.disable = val;
+      this.updateNginxConfiguration(val);
     },
 
     handleCiliumValuesChanged(neu) {

package/edit/provisioning.cattle.io.cluster/shared.ts

@@ -0,0 +1,4 @@
+export const RETENTION_DEFAULT = 5;
+export const NGINX_SUPPORTED = 'rke2-ingress-nginx';
+export const INGRESS_NGINX = 'ingress-nginx';
+export const INGRESS_CONTROLLER = 'ingress-controller';

package/edit/provisioning.cattle.io.cluster/tabs/Basics.vue

@@ -580,6 +580,7 @@ export default {
       <div class="col span-6">
         <!-- PSA template selector -->
         <LabeledSelect
+          :key="value.isK3s"
           v-model:value="value.spec.defaultPodSecurityAdmissionConfigurationTemplateName"
           :mode="mode"
           data-testid="rke2-custom-edit-psa"

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

@@ -4,6 +4,10 @@ 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';
+import UnitInput from '@shell/components/form/UnitInput';
+import RadioGroup from '@components/Form/Radio/RadioGroup.vue';
+import { _CREATE } from '@shell/config/query-params';
+import { RETENTION_DEFAULT } from '@shell/edit/provisioning.cattle.io.cluster/shared';
 
 export default {
   emits: ['update:value', 'validationChanged'],
@@ -12,6 +16,8 @@ export default {
     LabeledInput,
     Checkbox,
     SelectOrCreateAuthSecret,
+    UnitInput,
+    RadioGroup
   },
   mixins: [FormValidation],
 
@@ -35,6 +41,10 @@ export default {
       type:     Function,
       required: true,
     },
+    localRetentionCount: {
+      type:    Number,
+      default: null,
+    }
   },
 
   data() {
@@ -47,9 +57,11 @@ export default {
         folder:              '',
         region:              '',
         skipSSLVerify:       false,
+        retention:           null,
         ...(this.value || {}),
       },
-      fvFormRuleSets: [
+      differentRetention: false,
+      fvFormRuleSets:     [
         {
           path: 'endpoint', rootObject: this.config, rules: ['awsStyleEndpoint']
         },
@@ -59,6 +71,9 @@ export default {
       ]
     };
   },
+  mounted() {
+    this.differentRetention = !(this.mode === _CREATE || this.value?.retention === this.localRetentionCount);
+  },
 
   computed: {
 
@@ -73,10 +88,25 @@ export default {
 
       return {};
     },
+
+    localCountToUse() {
+      return this.localRetentionCount === null || this.localRetentionCount === undefined ? RETENTION_DEFAULT : this.localRetentionCount;
+    },
+    retentionOptionsOptions() {
+      return [
+        { label: this.t('cluster.rke2.etcd.s3config.snapshotRetention.options.localDefined', { count: this.localCountToUse }), value: false }, { label: this.t('cluster.rke2.etcd.s3config.snapshotRetention.options.manual'), value: true }
+      ];
+    }
   },
   watch: {
     fvFormIsValid(newValue) {
       this.$emit('validationChanged', !!newValue);
+    },
+    localRetentionCount(neu) {
+      if (!this.differentRetention) {
+        this.config.retention = this.localCountToUse;
+        this.update();
+      }
     }
   },
 
@@ -86,6 +116,10 @@ export default {
 
       this.$emit('update:value', out);
     },
+    resetRetention() {
+      this.config.retention = this.localCountToUse;
+      this.update();
+    }
   },
 };
 </script>
@@ -150,7 +184,6 @@ export default {
         />
       </div>
     </div>
-
     <div
       v-if="!ccData.defaultSkipSSLVerify"
       class="mt-20"
@@ -172,5 +205,27 @@ export default {
         @update:value="update"
       />
     </div>
+    <div class="row mt-20">
+      <div class="col span-6">
+        <h4>{{ t('cluster.rke2.etcd.s3config.snapshotRetention.title') }}</h4>
+        <RadioGroup
+          v-model:value="differentRetention"
+          name="s3config-retention"
+          :mode="mode"
+          :options="retentionOptionsOptions"
+          :row="true"
+          @update:value="resetRetention"
+        />
+        <UnitInput
+          v-if="differentRetention"
+          v-model:value="config.retention"
+          :label="t('cluster.rke2.etcd.s3config.snapshotRetention.label')"
+          :mode="mode"
+          :suffix="t('cluster.rke2.snapshots.s3Suffix')"
+          class="mt-10"
+          @update:value="update"
+        />
+      </div>
+    </div>
   </div>
 </template>

package/edit/provisioning.cattle.io.cluster/tabs/etcd/__tests__/S3Config.test.ts

@@ -0,0 +1,109 @@
+import { shallowMount } from '@vue/test-utils';
+import S3Config from '@shell/edit/provisioning.cattle.io.cluster/tabs/etcd/S3Config.vue';
+
+describe('s3Config', () => {
+  const defaultProps = {
+    mode:                'create',
+    namespace:           'test-ns',
+    registerBeforeHook:  jest.fn(),
+    localRetentionCount: 5,
+    value:               {}
+  };
+
+  const mockStore = { getters: { 'rancher/byId': jest.fn() } };
+
+  const createWrapper = (props = {}) => {
+    return shallowMount(S3Config, {
+      propsData: {
+        ...defaultProps,
+        ...props
+      },
+      mocks: {
+        $store: mockStore,
+        t:      (key) => key,
+      },
+      stubs: {
+        LabeledInput:             true,
+        Checkbox:                 true,
+        SelectOrCreateAuthSecret: true,
+        UnitInput:                true,
+        RadioGroup:               true,
+      }
+    });
+  };
+
+  it('renders correctly', () => {
+    const wrapper = createWrapper();
+
+    expect(wrapper.exists()).toBe(true);
+  });
+
+  it('initializes config with default values', () => {
+    const wrapper = createWrapper();
+
+    expect(wrapper.vm.config.bucket).toBe('');
+    expect(wrapper.vm.config.skipSSLVerify).toBe(false);
+  });
+
+  it('initializes config with provided value prop', () => {
+    const value = {
+      bucket:    'test',
+      region:    'us-east-1',
+      retention: 2
+    };
+    const wrapper = createWrapper({ value });
+
+    expect(wrapper.vm.config.bucket).toBe('test');
+    expect(wrapper.vm.config.region).toBe('us-east-1');
+    expect(wrapper.vm.config.retention).toBe(2);
+  });
+
+  describe('retention Logic', () => {
+    it('computes localCountToUse correctly', () => {
+      const wrapper = createWrapper({ localRetentionCount: 3 });
+
+      expect(wrapper.vm.localCountToUse).toBe(3);
+    });
+
+    it('uses default retention if localRetentionCount is null', () => {
+      const wrapper = createWrapper({ localRetentionCount: null });
+
+      expect(wrapper.vm.localCountToUse).toBe(5);
+    });
+
+    it('sets differentRetention to false in create mode', () => {
+      const wrapper = createWrapper({ mode: 'create' });
+
+      expect(wrapper.vm.differentRetention).toBe(false);
+    });
+
+    it('sets differentRetention to false in edit mode if retention matches', () => {
+      const wrapper = createWrapper({
+        mode:                'edit',
+        value:               { retention: 5 },
+        localRetentionCount: 5
+      });
+
+      expect(wrapper.vm.differentRetention).toBe(false);
+    });
+
+    it('sets differentRetention to true in edit mode if retention differs', () => {
+      const wrapper = createWrapper({
+        mode:                'edit',
+        value:               { retention: 2 },
+        localRetentionCount: 5
+      });
+
+      expect(wrapper.vm.differentRetention).toBe(true);
+    });
+
+    it('updates retention when localRetentionCount changes and differentRetention is false', async() => {
+      const wrapper = createWrapper({ localRetentionCount: 5 });
+
+      // differentRetention is false by default in create mode
+      await wrapper.setProps({ localRetentionCount: 10 });
+      expect(wrapper.vm.config.retention).toBe(10);
+      expect(wrapper.emitted('update:value')).toBeTruthy();
+    });
+  });
+});

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

@@ -124,6 +124,7 @@ export default {
       <S3Config
         v-if="s3Backup"
         v-model:value="etcd.s3"
+        :local-retention-count="etcd.snapshotRetention"
         :namespace="value.metadata.namespace"
         :register-before-hook="registerBeforeHook"
         :mode="mode"

package/list/auditlog.cattle.io.auditpolicy.vue

@@ -0,0 +1,63 @@
+<script lang="ts">
+import { BadgeState } from '@components/BadgeState';
+import { AGE } from '@shell/config/table-headers';
+import ResourceFetch from '@shell/mixins/resource-fetch';
+import ResourceTable from '@shell/components/ResourceTable.vue';
+
+export default {
+  components: { BadgeState, ResourceTable },
+  mixins:     [ResourceFetch],
+  props:      {
+    resource: {
+      type:     String,
+      required: true,
+    },
+
+    schema: {
+      type:     Object,
+      required: true,
+    },
+
+    useQueryParamsForSimpleFiltering: {
+      type:    Boolean,
+      default: false
+    }
+  },
+
+  async fetch() {
+    await this.$fetchType(this.resource);
+  },
+
+  computed: {
+    headers() {
+      const headersFromSchema = this.$store.getters['type-map/headersFor'](this.schema);
+
+      const headers = headersFromSchema.filter((h: {name : string}) => h.name !== 'valid' && h.name !== 'active');
+
+      headers.push(AGE);
+
+      return headers;
+    },
+  }
+
+};
+</script>
+
+<template>
+  <ResourceTable
+    :schema="schema"
+    :headers="headers"
+    :rows="rows"
+    :loading="loading"
+    :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
+    :namespaced="schema.attributes.namespaced"
+    fetchSecondaryResources="fetchSecondaryResources"
+  >
+    <template #cell:enabled="{row}">
+      <BadgeState
+        :color="row.spec.enabled ? 'bg-success' : 'badge-disabled'"
+        :label="row.spec.enabled ? t('generic.enabled') : t('generic.disabled') "
+      />
+    </template>
+  </ResourceTable>
+</template>