@rancher/shell 1.2.3 → 1.2.5

package/edit/provisioning.cattle.io.cluster/__tests__/utils/cluster.ts

@@ -0,0 +1,386 @@
+export const PROV_CLUSTER = {
+  id:         'fleet-default/test-args',
+  type:       'provisioning.cattle.io.cluster',
+  apiVersion: 'provisioning.cattle.io/v1',
+  kind:       'Cluster',
+  metadata:   {
+    annotations:       { 'field.cattle.io/creatorId': 'user' },
+    creationTimestamp: '2024-01-14T10:03:39Z',
+    generation:        3,
+    name:              'test-args',
+    namespace:         'fleet-default',
+    state:             {
+      error:         false,
+      message:       'Resource is Ready',
+      name:          'active',
+      transitioning: false
+    },
+    uid:    'eab4ed52-c339-4d61-8dc2-804d09f36425',
+    labels: {}
+  },
+  spec: {
+    kubernetesVersion:        'v1.27.8+rke2r1',
+    localClusterAuthEndpoint: {
+      enabled: false,
+      caCerts: '',
+      fqdn:    ''
+    },
+    rkeConfig: {
+      chartValues: { 'rke2-calico': {} },
+      etcd:        {
+        snapshotRetention:    5,
+        snapshotScheduleCron: '0 */5 * * *',
+        disableSnapshots:     false
+      },
+      machineGlobalConfig: {
+        cni:                   'calico',
+        'disable-kube-proxy':  false,
+        'etcd-expose-metrics': false
+      },
+      machinePoolDefaults: {},
+      machinePools:        [
+        {
+          controlPlaneRole:  true,
+          drainBeforeDelete: true,
+          etcdRole:          true,
+          machineConfigRef:  {
+            kind: 'DigitaloceanConfig',
+            name: 'nc-test-args-pool1-dfvbh'
+          },
+          name:                 'pool1',
+          quantity:             1,
+          unhealthyNodeTimeout: '0s',
+          workerRole:           true
+        }
+      ],
+      machineSelectorConfig: [
+        { config: { 'protect-kernel-defaults': false } }
+      ],
+      registries: {
+        configs: {},
+        mirrors: {}
+      },
+    },
+    defaultPodSecurityAdmissionConfigurationTemplateName: '',
+  },
+  status: {
+    agentDeployed:      true,
+    clientSecretName:   'test-args-kubeconfig',
+    clusterName:        'c-m-qk7hvstl',
+    fleetWorkspaceName: 'fleet-default',
+    observedGeneration: 3,
+    ready:              true
+  }
+};
+
+export const VERSION_CLUSTER = {
+  label:      'v1.27.8+rke2r1',
+  value:      'v1.27.8+rke2r1',
+  sort:       '0000000001.0000000027.0000000008.rke0000000002r0000000001',
+  serverArgs: {
+    'audit-policy-file': {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    'cluster-cidr': {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    'cluster-dns': {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    'cluster-domain': {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    cni: {
+      type:    'array',
+      default: 'calico',
+      create:  false,
+      update:  false,
+      options: [
+        'canal',
+        'cilium',
+        'calico',
+        'multus,canal',
+        'multus,cilium',
+        'multus,calico'
+      ]
+    },
+    'container-runtime-endpoint': {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    disable: {
+      type:    'array',
+      create:  false,
+      update:  false,
+      options: [
+        'rke2-coredns',
+        'rke2-ingress-nginx',
+        'rke2-metrics-server'
+      ]
+    },
+    'disable-cloud-controller': {
+      type:   'bool',
+      create: false,
+      update: false
+    },
+    'disable-kube-proxy': {
+      type:    'boolean',
+      default: false,
+      create:  false,
+      update:  false
+    },
+    'disable-scheduler': {
+      type:   'bool',
+      create: false,
+      update: false
+    },
+    'egress-selector-mode': {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    'etcd-arg': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    'etcd-expose-metrics': {
+      type:    'boolean',
+      default: false,
+      create:  false,
+      update:  false
+    },
+    'etcd-image': {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    'kube-apiserver-arg': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    'kube-apiserver-image': {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    'kube-cloud-controller-manager-arg': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    'kube-controller-manager-arg': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    'kube-controller-manager-image': {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    'kube-proxy-arg': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    'kube-scheduler-arg': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    'kube-scheduler-image': {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    'kubelet-path': {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    'pause-image': {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    'runtime-image': {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    'service-cidr': {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    'service-node-port-range': {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    snapshotter: {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    'tls-san': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    'tls-san-security': {
+      type:   'boolean',
+      create: false,
+      update: false
+    }
+  },
+  agentArgs: {
+    'audit-policy-file': {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    'cloud-controller-manager-extra-env': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    'cloud-controller-manager-extra-mount': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    'cloud-provider-config': {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    'cloud-provider-name': {
+      type:     'enum',
+      nullable: true,
+      create:   false,
+      update:   false,
+      options:  [
+        'aws',
+        'azure',
+        'gcp',
+        'rancher-vsphere',
+        'harvester',
+        'external'
+      ]
+    },
+    'control-plane-resource-limits': {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    'control-plane-resource-requests': {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    'etcd-extra-env': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    'etcd-extra-mount': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    'kube-apiserver-extra-env': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    'kube-apiserver-extra-mount': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    'kube-controller-manager-extra-env': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    'kube-controller-manager-extra-mount': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    'kube-proxy-arg': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    'kube-proxy-extra-env': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    'kube-proxy-extra-mount': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    'kube-scheduler-extra-env': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    'kube-scheduler-extra-mount': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    'kubelet-arg': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    profile: {
+      type:     'enum',
+      nullable: true,
+      create:   false,
+      update:   false,
+      options:  [
+        'cis',
+        'cis-1.23'
+      ]
+    },
+    'protect-kernel-defaults': {
+      type:    'boolean',
+      default: false,
+      create:  false,
+      update:  false
+    },
+    'resolv-conf': {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    selinux: {
+      type:   'bool',
+      create: false,
+      update: false
+    },
+    'system-default-registry': {
+      type:   'string',
+      create: false,
+      update: false
+    }
+  },
+  disabled: false
+};

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

@@ -28,9 +28,8 @@ import {
 import { allHash } from '@shell/utils/promise';
 import { sortBy } from '@shell/utils/sort';
 
-import { camelToTitle } from '@shell/utils/string';
 import { compare, sortable } from '@shell/utils/version';
-import { isHarvesterSatisfiesVersion } from '@shell/utils/cluster';
+import { isHarvesterSatisfiesVersion, labelForAddon } from '@shell/utils/cluster';
 import * as VERSION from '@shell/utils/version';
 
 import ArrayList from '@shell/components/form/ArrayList';
@@ -74,6 +73,9 @@ import { getApplicableExtensionEnhancements } from '@shell/core/plugin-helpers';
 import { ExtensionPoint, TabLocation } from '@shell/core/types';
 import MemberRoles from '@shell/edit/provisioning.cattle.io.cluster/MemberRoles';
 import Basics from '@shell/edit/provisioning.cattle.io.cluster/Basics';
+import AddOnConfig from '@shell/edit/provisioning.cattle.io.cluster/tabs/AddOnConfig';
+import AddOnAdditionalManifest from '@shell/edit/provisioning.cattle.io.cluster/tabs/AddOnAdditionalManifest';
+import VsphereUtils from '@shell/utils/v-sphere';
 
 const HARVESTER = 'harvester';
 const HARVESTER_CLOUD_PROVIDER = 'harvester-cloud-provider';
@@ -132,7 +134,9 @@ export default {
     UnitInput,
     YamlEditor,
     MemberRoles,
-    Basics
+    Basics,
+    AddOnConfig,
+    AddOnAdditionalManifest
   },
 
   mixins: [CreateEditView, FormValidation],
@@ -250,6 +254,7 @@ export default {
       machinePoolErrors:     {},
       allNamespaces:         [],
       extensionTabs:         getApplicableExtensionEnhancements(this, ExtensionPoint.TAB, TabLocation.CLUSTER_CREATE_RKE2, this.$route, this),
+      labelForAddon,
     };
   },
 
@@ -835,6 +840,8 @@ export default {
   created() {
     this.registerBeforeHook(this.saveMachinePools, 'save-machine-pools', 1);
     this.registerBeforeHook(this.setRegistryConfig, 'set-registry-config');
+    this.registerBeforeHook(this.handleVsphereCpiSecret, 'sync-vsphere-cpi');
+    this.registerBeforeHook(this.handleVsphereCsiSecret, 'sync-vsphere-csi');
     this.registerAfterHook(this.cleanupMachinePools, 'cleanup-machine-pools');
     this.registerAfterHook(this.saveRoleBindings, 'save-role-bindings');
 
@@ -847,6 +854,13 @@ export default {
   methods: {
     set,
 
+    async handleVsphereCpiSecret() {
+      return VsphereUtils.handleVsphereCpiSecret(this);
+    },
+    async handleVsphereCsiSecret() {
+      return VsphereUtils.handleVsphereCsiSecret(this);
+    },
+
     /**
      * Initialize all the cluster specs
      */
@@ -1549,30 +1563,34 @@ export default {
       }
     },
 
-    labelForAddon(name) {
-      const fallback = `${ camelToTitle(name.replace(/^(rke|rke2|rancher)-/, '')) } Configuration`;
-
-      return this.$store.getters['i18n/withFallback'](`cluster.addonChart."${ name }"`, null, fallback);
-    },
-
-    showAddons() {
+    showAddons(key) {
       this.addonsRev++;
       this.addonNames.forEach((name) => {
         const chartValues = this.versionInfo[name]?.questions ? this.initYamlEditor(name) : {};
 
         set(this.userChartValuesTemp, name, chartValues);
       });
-      this.refreshYamls();
+      this.refreshComponentWithYamls(key);
+    },
+
+    refreshComponentWithYamls(key) {
+      const component = this.$refs[key];
+
+      if (Array.isArray(component) && component.length > 0) {
+        this.refreshYamls(component[0].$refs);
+      } else if (component) {
+        this.refreshYamls(component.$refs);
+      }
     },
 
-    refreshYamls() {
-      const keys = Object.keys(this.$refs).filter((x) => x.startsWith('yaml'));
+    refreshYamls(refs) {
+      const keys = Object.keys(refs).filter((x) => x.startsWith('yaml'));
 
-      for ( const k of keys ) {
-        const entry = this.$refs[k];
+      for (const k of keys) {
+        const entry = refs[k];
         const list = isArray(entry) ? entry : [entry];
 
-        for ( const component of list ) {
+        for (const component of list) {
           component?.refresh(); // `yaml` ref can be undefined on switching from Basic to Addon tab (Azure --> Amazon --> addon)
         }
       }
@@ -2005,6 +2023,10 @@ export default {
       }
     },
 
+    updateAdditionalManifest(neu) {
+      this.value.spec.rkeConfig.additionalManifest = neu;
+    },
+
     /**
      * Keep last PSP value
      */
@@ -2279,7 +2301,7 @@ export default {
           name="basic"
           label-key="cluster.tabs.basic"
           :weight="11"
-          @active="refreshYamls"
+          @active="refreshComponentWithYamls('tab-Basics')"
         >
           <!-- Basic -->
           <Basics
@@ -2665,68 +2687,43 @@ export default {
           </template>
         </Tab>
 
-        <!-- Add-on Config -->
+        <!-- Add-on Configs -->
         <Tab
-          name="addons"
-          label-key="cluster.tabs.addons"
-          @active="showAddons"
+          v-for="v in addonVersions"
+          :key="v.name"
+          :name="v.name"
+          :label="labelForAddon(v.name, false)"
+          :weight="9"
+          :showHeader="false"
+          @active="showAddons(v.name)"
         >
-          <Banner
-            v-if="isEdit"
-            color="warning"
-          >
-            {{ t('cluster.addOns.dependencyBanner') }}
-          </Banner>
-          <div
-            v-if="versionInfo && addonVersions.length"
-            :key="addonsRev"
-          >
-            <div
-              v-for="v in addonVersions"
-              :key="v._key"
-            >
-              <h3>{{ labelForAddon(v.name) }}</h3>
-              <Questions
-                v-if="versionInfo[v.name] && versionInfo[v.name].questions && v.name && userChartValuesTemp[v.name]"
-                v-model="userChartValuesTemp[v.name]"
-                :emit="true"
-                in-store="management"
-                :mode="mode"
-                :tabbed="false"
-                :source="versionInfo[v.name]"
-                :target-namespace="value.metadata.namespace"
-                @updated="updateQuestions(v.name)"
-              />
-              <YamlEditor
-                v-else
-                ref="yaml-values"
-                :value="initYamlEditor(v.name)"
-                :scrolling="true"
-                :as-object="true"
-                :editor-mode="mode === 'view' ? 'VIEW_CODE' : 'EDIT_CODE'"
-                :hide-preview-buttons="true"
-                @input="data => updateValues(v.name, data)"
-              />
-              <div class="spacer" />
-            </div>
-          </div>
+          <AddOnConfig
+            :ref="v.name"
+            v-model="value"
+            :mode="mode"
+            :version-info="versionInfo"
+            :addon-version="v"
+            :addons-rev="addonsRev"
+            :user-chart-values-temp="userChartValuesTemp"
+            :init-yaml-editor="initYamlEditor"
+            @update-questions="syncChartValues"
+            @update-values="updateValues"
+          />
+        </Tab>
 
-          <div>
-            <h3>
-              {{ t('cluster.addOns.additionalManifest.title') }}
-              <i
-                v-clean-tooltip="t('cluster.addOns.additionalManifest.tooltip')"
-                class="icon icon-info"
-              />
-            </h3>
-            <YamlEditor
-              ref="yaml-additional"
-              v-model="rkeConfig.additionalManifest"
-              :editor-mode="mode === 'view' ? 'VIEW_CODE' : 'EDIT_CODE'"
-              initial-yaml-values="# Additional Manifest YAML"
-              class="yaml-editor"
-            />
-          </div>
+        <!-- Add-on Additional Manifest -->
+        <Tab
+          name="additionalmanifest"
+          label-key="cluster.tabs.addOnAdditionalManifest"
+          :showHeader="false"
+          @active="refreshComponentWithYamls('additionalmanifest')"
+        >
+          <AddOnAdditionalManifest
+            ref="additionalmanifest"
+            :value="value"
+            :mode="mode"
+            @additional-manifest-changed="updateAdditionalManifest"
+          />
         </Tab>
 
         <!-- Cluster Agent Configuration -->
@@ -2763,7 +2760,6 @@ export default {
           name="advanced"
           label-key="cluster.tabs.advanced"
           :weight="-1"
-          @active="refreshYamls"
         >
           <template v-if="haveArgInfo">
             <h3>{{ t('cluster.advanced.argInfo.title') }}</h3>

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

@@ -0,0 +1,45 @@
+<script>
+import YamlEditor from '@shell/components/YamlEditor';
+export default {
+  components: { YamlEditor },
+  props:      {
+    mode: {
+      type:     String,
+      required: true,
+    },
+    value: {
+      type:     Object,
+      required: true,
+    }
+  },
+  computed: {
+    additionalManifest: {
+      get() {
+        return this.value.spec.rkeConfig.additionalManifest;
+      },
+      set(neu) {
+        this.$emit('additional-manifest-changed', neu);
+      }
+    }
+  }
+};
+</script>
+
+<template>
+  <div>
+    <h3>
+      {{ t('cluster.addOns.additionalManifest.title') }}
+      <i
+        v-clean-tooltip="t('cluster.addOns.additionalManifest.tooltip')"
+        class="icon icon-info"
+      />
+    </h3>
+    <YamlEditor
+      ref="yaml-additional"
+      v-model="additionalManifest"
+      :editor-mode="mode === 'view' ? 'VIEW_CODE' : 'EDIT_CODE'"
+      initial-yaml-values="# Additional Manifest YAML"
+      class="yaml-editor"
+    />
+  </div>
+</template>