diff --git a/pkg/harvester/config/settings.js b/pkg/harvester/config/settings.js index 0364cdccfa8..b7f27807b92 100644 --- a/pkg/harvester/config/settings.js +++ b/pkg/harvester/config/settings.js @@ -1,35 +1,36 @@ export const HCI_SETTING = { - BACKUP_TARGET: 'backup-target', - CONTAINERD_REGISTRY: 'containerd-registry', - LOG_LEVEL: 'log-level', - SERVER_VERSION: 'server-version', - UI_INDEX: 'ui-index', - UI_PLUGIN_INDEX: 'ui-plugin-index', - UPGRADE_CHECKER_ENABLED: 'upgrade-checker-enabled', - UPGRADE_CHECKER_URL: 'upgrade-checker-url', - VLAN: 'vlan', - UI_SOURCE: 'ui-source', - UI_PL: 'ui-pl', - HTTP_PROXY: 'http-proxy', - ADDITIONAL_CA: 'additional-ca', - OVERCOMMIT_CONFIG: 'overcommit-config', - CLUSTER_REGISTRATION_URL: 'cluster-registration-url', - DEFAULT_STORAGE_CLASS: 'default-storage-class', - SUPPORT_BUNDLE_TIMEOUT: 'support-bundle-timeout', - SUPPORT_BUNDLE_EXPIRATION: 'support-bundle-expiration', - SUPPORT_BUNDLE_IMAGE: 'support-bundle-image', - STORAGE_NETWORK: 'storage-network', - VM_FORCE_RESET_POLICY: 'vm-force-reset-policy', - SSL_CERTIFICATES: 'ssl-certificates', - SSL_PARAMETERS: 'ssl-parameters', - SUPPORT_BUNDLE_NAMESPACES: 'support-bundle-namespaces', - AUTO_DISK_PROVISION_PATHS: 'auto-disk-provision-paths', - RELEASE_DOWNLOAD_URL: 'release-download-url', - CCM_CSI_VERSION: 'harvester-csi-ccm-versions', - CSI_DRIVER_CONFIG: 'csi-driver-config', - VM_TERMINATION_PERIOD: 'default-vm-termination-grace-period-seconds', - NTP_SERVERS: 'ntp-servers', - AUTO_ROTATE_RKE2_CERTS: 'auto-rotate-rke2-certs' + BACKUP_TARGET: 'backup-target', + CONTAINERD_REGISTRY: 'containerd-registry', + LOG_LEVEL: 'log-level', + SERVER_VERSION: 'server-version', + UI_INDEX: 'ui-index', + UI_PLUGIN_INDEX: 'ui-plugin-index', + UPGRADE_CHECKER_ENABLED: 'upgrade-checker-enabled', + UPGRADE_CHECKER_URL: 'upgrade-checker-url', + VLAN: 'vlan', + UI_SOURCE: 'ui-source', + UI_PL: 'ui-pl', + HTTP_PROXY: 'http-proxy', + ADDITIONAL_CA: 'additional-ca', + OVERCOMMIT_CONFIG: 'overcommit-config', + CLUSTER_REGISTRATION_URL: 'cluster-registration-url', + DEFAULT_STORAGE_CLASS: 'default-storage-class', + SUPPORT_BUNDLE_TIMEOUT: 'support-bundle-timeout', + SUPPORT_BUNDLE_EXPIRATION: 'support-bundle-expiration', + SUPPORT_BUNDLE_IMAGE: 'support-bundle-image', + SUPPORT_BUNDLE_NODE_COLLECTION_TIMEOUT: 'support-bundle-node-collection-timeout', + STORAGE_NETWORK: 'storage-network', + VM_FORCE_RESET_POLICY: 'vm-force-reset-policy', + SSL_CERTIFICATES: 'ssl-certificates', + SSL_PARAMETERS: 'ssl-parameters', + SUPPORT_BUNDLE_NAMESPACES: 'support-bundle-namespaces', + AUTO_DISK_PROVISION_PATHS: 'auto-disk-provision-paths', + RELEASE_DOWNLOAD_URL: 'release-download-url', + CCM_CSI_VERSION: 'harvester-csi-ccm-versions', + CSI_DRIVER_CONFIG: 'csi-driver-config', + VM_TERMINATION_PERIOD: 'default-vm-termination-grace-period-seconds', + NTP_SERVERS: 'ntp-servers', + AUTO_ROTATE_RKE2_CERTS: 'auto-rotate-rke2-certs' }; export const HCI_ALLOWED_SETTINGS = { @@ -52,15 +53,16 @@ export const HCI_ALLOWED_SETTINGS = { [HCI_SETTING.ADDITIONAL_CA]: { kind: 'multiline', canReset: true, from: 'import' }, - [HCI_SETTING.OVERCOMMIT_CONFIG]: { kind: 'json', from: 'import' }, - [HCI_SETTING.SUPPORT_BUNDLE_TIMEOUT]: {}, - [HCI_SETTING.SUPPORT_BUNDLE_EXPIRATION]: {}, - [HCI_SETTING.SUPPORT_BUNDLE_IMAGE]: { kind: 'json', from: 'import' }, - [HCI_SETTING.STORAGE_NETWORK]: { kind: 'custom', from: 'import' }, - [HCI_SETTING.VM_FORCE_RESET_POLICY]: { kind: 'json', from: 'import' }, - [HCI_SETTING.RANCHER_MANAGER_SUPPORT]: { kind: 'boolean' }, - [HCI_SETTING.SSL_CERTIFICATES]: { kind: 'json', from: 'import' }, - [HCI_SETTING.SSL_PARAMETERS]: { + [HCI_SETTING.OVERCOMMIT_CONFIG]: { kind: 'json', from: 'import' }, + [HCI_SETTING.SUPPORT_BUNDLE_TIMEOUT]: {}, + [HCI_SETTING.SUPPORT_BUNDLE_EXPIRATION]: {}, + [HCI_SETTING.SUPPORT_BUNDLE_NODE_COLLECTION_TIMEOUT]: {}, + [HCI_SETTING.SUPPORT_BUNDLE_IMAGE]: { kind: 'json', from: 'import' }, + [HCI_SETTING.STORAGE_NETWORK]: { kind: 'custom', from: 'import' }, + [HCI_SETTING.VM_FORCE_RESET_POLICY]: { kind: 'json', from: 'import' }, + [HCI_SETTING.RANCHER_MANAGER_SUPPORT]: { kind: 'boolean' }, + [HCI_SETTING.SSL_CERTIFICATES]: { kind: 'json', from: 'import' }, + [HCI_SETTING.SSL_PARAMETERS]: { kind: 'json', from: 'import', canReset: true }, [HCI_SETTING.SUPPORT_BUNDLE_NAMESPACES]: { from: 'import', canReset: true }, diff --git a/pkg/harvester/l10n/en-us.yaml b/pkg/harvester/l10n/en-us.yaml index d5ad0b9f621..8b2df9a8f82 100644 --- a/pkg/harvester/l10n/en-us.yaml +++ b/pkg/harvester/l10n/en-us.yaml @@ -1349,6 +1349,7 @@ advancedSettings: 'harv-overcommit-config': 'Resource overcommit configuration.' 'harv-support-bundle-timeout': 'Support Bundle timeout config in minutes, use 0 to disable the timeout.' 'harv-support-bundle-expiration': 'Support Bundle expiration config in minutes.' + 'harv-support-bundle-node-collection-timeout': 'Support Bundle node collection timeout config in minutes.' 'harv-vm-force-reset-policy': Config the force-reset action when a VM is stuck on a node that is down. 'harv-ssl-parameters': Custom SSL Parameters for TLS validation. 'harv-storage-network': 'Longhorn storage-network setting.'