Compare commits

..
39 Commits
Author SHA1 Message Date
Andy Lee 28aa1061d5 ci: build UI artifact
Signed-off-by: Andy Lee <andy.lee@suse.com>
2026-07-08 15:45:07 +08:00
Marcelo Fukumoto a4299a9597 feat: added comments from copilot review
Signed-off-by: Marcelo Fukumoto <marcelo.fukumoto@suse.com>
2026-07-07 13:37:15 +02:00
Marcelo Fukumoto 107e44bd4b feat: added loading to provider steps
Signed-off-by: Marcelo Fukumoto <marcelo.fukumoto@suse.com>
2026-07-07 13:37:15 +02:00
Marcelo Fukumoto a11369ad6d feat: Added some final fixes to structure
Signed-off-by: Marcelo Fukumoto <marcelo.fukumoto@suse.com>
2026-07-07 13:37:14 +02:00
Marcelo Fukumoto f270a7b1f8 feat: Fix some labels
Signed-off-by: Marcelo Fukumoto <marcelo.fukumoto@suse.com>
2026-07-07 13:37:14 +02:00
Marcelo Fukumoto 0d9b976dd2 feat: Added new API for the vms
Signed-off-by: Marcelo Fukumoto <marcelo.fukumoto@suse.com>
2026-07-07 13:37:14 +02:00
Marcelo Fukumoto 77d80051c9 feat(forklift): small changes before rebase
Signed-off-by: Marcelo Fukumoto <marcelo.fukumoto@suse.com>
2026-07-07 13:37:14 +02:00
Marcelo Fukumoto fbcc235fa7 feat(forklift): Fixed the type for VMware
Signed-off-by: Marcelo Fukumoto <marcelo.fukumoto@suse.com>
2026-07-07 13:37:13 +02:00
Marcelo Fukumoto 9ddfaefc39 feat(forklift): Fix the way it is registered
Signed-off-by: Marcelo Fukumoto <marcelo.fukumoto@suse.com>
2026-07-07 13:37:13 +02:00
Marcelo Fukumoto a180372564 feat(forklift): small fixes after Copilot
Signed-off-by: Marcelo Fukumoto <marcelo.fukumoto@suse.com>
2026-07-07 13:37:13 +02:00
Marcelo Fukumoto b4210037e9 feat(forklift): reverted settings.json changes
Signed-off-by: Marcelo Fukumoto <marcelo.fukumoto@suse.com>
2026-07-07 13:37:13 +02:00
Marcelo Fukumoto 97e4b7271c feat(forklift): small fixes after Copilot
Signed-off-by: Marcelo Fukumoto <marcelo.fukumoto@suse.com>
2026-07-07 13:37:12 +02:00
Marcelo Fukumoto 2deb0aa254 feat(forklift): small fixes after Copilot
Signed-off-by: Marcelo Fukumoto <marcelo.fukumoto@suse.com>
2026-07-07 13:37:12 +02:00
Marcelo Fukumoto 5c7dd1953d feat(forklift): small fixes
Signed-off-by: Marcelo Fukumoto <marcelo.fukumoto@suse.com>
2026-07-07 13:37:12 +02:00
Marcelo Fukumoto 3ecb6bfc4a feat(forklift): update size
Signed-off-by: Marcelo Fukumoto <marcelo.fukumoto@suse.com>
2026-07-07 13:37:11 +02:00
Marcelo Fukumoto d67813eb39 feat(forklift): Removed wrong configs used for testing
Signed-off-by: Marcelo Fukumoto <marcelo.fukumoto@suse.com>
2026-07-07 13:37:11 +02:00
Marcelo Fukumoto 1d26c48117 feat(forklift): Fixed some UI changes
Signed-off-by: Marcelo Fukumoto <marcelo.fukumoto@suse.com>
2026-07-07 13:37:11 +02:00
Marcelo Fukumoto de7598b7af feat(forklift): added the provider wizard
Signed-off-by: Marcelo Fukumoto <marcelo.fukumoto@suse.com>
2026-07-07 13:37:11 +02:00
Marcelo Fukumoto e703f34879 feat(forklift): Changed to Wizard
Signed-off-by: Marcelo Fukumoto <marcelo.fukumoto@suse.com>
2026-07-07 13:37:10 +02:00
Marcelo Fukumoto 7c8f172012 feat(forklift): Design changes
Signed-off-by: Marcelo Fukumoto <marcelo.fukumoto@suse.com>
2026-07-07 13:36:48 +02:00
Marcelo Fukumoto 6e17a84581 feat(forklift): fixed title and button
Signed-off-by: Marcelo Fukumoto <marcelo.fukumoto@suse.com>
2026-07-07 13:36:48 +02:00
Marcelo Fukumoto d075871afc feat(forklift): Changed based on review
Signed-off-by: Marcelo Fukumoto <marcelo.fukumoto@suse.com>
2026-07-07 13:36:48 +02:00
Marcelo Fukumoto 4d230ebd42 feat(forklift): Remove test flags
Signed-off-by: Marcelo Fukumoto <marcelo.fukumoto@suse.com>
2026-07-07 13:36:47 +02:00
Marcelo Fukumoto c887186e1a feat(forklift): Added better handling on the saving and testing
Signed-off-by: Marcelo Fukumoto <marcelo.fukumoto@suse.com>
2026-07-07 13:36:47 +02:00
Marcelo Fukumoto dc6ae60b9d feat(forklift): Added overflow hidden to mapping target list
Signed-off-by: Marcelo Fukumoto <marcelo.fukumoto@suse.com>
2026-07-07 13:36:47 +02:00
Marcelo Fukumoto 5d8d7ec986 feat(forklift): fixed to fix the icon on extension
Signed-off-by: Marcelo Fukumoto <marcelo.fukumoto@suse.com>
2026-07-07 13:36:47 +02:00
Marcelo Fukumoto bf01a9dc43 feat(forklift): route and router doesnt work properly on extensions
Signed-off-by: Marcelo Fukumoto <marcelo.fukumoto@suse.com>
2026-07-07 13:36:46 +02:00
Marcelo Fukumoto 4480b2cd8f feat(forklift): FIxed the routing for the extension
Signed-off-by: Marcelo Fukumoto <marcelo.fukumoto@suse.com>
2026-07-07 13:36:46 +02:00
Marcelo Fukumoto b84167a4da feat(forklift): Added pagination UI
Signed-off-by: Marcelo Fukumoto <marcelo.fukumoto@suse.com>
2026-07-07 13:36:46 +02:00
Marcelo Fukumoto f7a1dec58f feat(forklift): Change to use the proper provider instead of a hardcoded
Signed-off-by: Marcelo Fukumoto <marcelo.fukumoto@suse.com>
2026-07-07 13:36:46 +02:00
Marcelo Fukumoto a0d145ee60 feat(forklift): Added icons, critical state, fix grids, action button
Signed-off-by: Marcelo Fukumoto <marcelo.fukumoto@suse.com>
2026-07-07 13:36:45 +02:00
Marcelo Fukumoto 740ca94841 feat(forklift): Applied fix to select the proper data on network. Added condition to show critical
Signed-off-by: Marcelo Fukumoto <marcelo.fukumoto@suse.com>
2026-07-07 13:36:45 +02:00
Marcelo Fukumoto d4f59a04be Merge the new APIs
Signed-off-by: Marcelo Fukumoto <marcelo.fukumoto@suse.com>
2026-07-07 13:36:45 +02:00
Marcelo Fukumoto d195c5dd18 feat(forklift): Add the succeded state
Signed-off-by: Marcelo Fukumoto <marcelo.fukumoto@suse.com>
2026-07-07 13:36:45 +02:00
Marcelo Fukumoto 341f7734a9 feat(forklift): New changes added based on new figma
Signed-off-by: Marcelo Fukumoto <marcelo.fukumoto@suse.com>
2026-07-07 13:36:44 +02:00
Marcelo Fukumoto 63d726aa91 feat(forklift): Fixed config based on new figma changes
Signed-off-by: Marcelo Fukumoto <marcelo.fukumoto@suse.com>
2026-07-07 13:36:44 +02:00
Marcelo Fukumoto 2259910be1 feat(forklift): UI based on the FIGMA
Signed-off-by: Marcelo Fukumoto <marcelo.fukumoto@suse.com>
2026-07-07 13:36:44 +02:00
Marcelo Fukumoto 7d8d74ce17 feat: add migration and plan detail pages with progress tracking
Signed-off-by: Marcelo Fukumoto <marcelo.fukumoto@suse.com>
2026-07-07 13:36:44 +02:00
Marcelo Fukumoto 9a20ad5edd feat: forklift poc first commit
Signed-off-by: Marcelo Fukumoto <marcelo.fukumoto@suse.com>
2026-07-07 13:36:43 +02:00
138 changed files with 2543 additions and 8721 deletions

No files matched your search

-12
View File
@@ -1,12 +0,0 @@
name: Run Unit Tests
description: Run Unit Tests
runs:
using: 'composite'
steps:
- name: Setup env
uses: ./.github/actions/setup
- name: Run unit tests
shell: bash
run: yarn test:ci
+5 -10
View File
@@ -1,19 +1,14 @@
<!-- This template is for Devs to give QA details before moving the issue To-Test -->
### Summary ### Summary
<!-- Give the fix root cause or feature requirement, at least list what this PR changes -->
### PR Checklists
### PR Checklist
<!-- Check Yes if there is backend PR related to this UI PR, tag the backend owner's Github account -->
- Are backend engineers aware of UI changes ? - Are backend engineers aware of UI changes ?
- [ ] Yes, the backend owner is @ - [ ] Yes, the backend owner is:
- [ ] No, frontend-only.
### Related Issue # ### Related Issue #
<!-- Link the issue as harvester/harvester#<issue_number> --> <!-- Define findings related to the feature or bug issue. -->
harvester/harvester#<issue_number>
### Test screenshot or video
### Test screenshot or video (Required)
<!-- Attach screenshot or video of the changes and eventual comparison if you find it necessary --> <!-- Attach screenshot or video of the changes and eventual comparison if you find it necessary -->
@@ -125,13 +125,6 @@ jobs:
node-version-file: '.nvmrc' node-version-file: '.nvmrc'
cache: 'yarn' cache: 'yarn'
# Tag builds (RC, formal and sprint releases) ship the tag as the package
# version. RC/formal tags already match package.json; sprint tags
# (vX.Y.Z-dev-YYYYMMDD) only share its prefix, so pin it here for the build.
- name: Pin package version to tag
if: ${{ inputs.CI_BUILD_TAG != '' }}
run: ./scripts/bump_version.sh "${{ inputs.CI_BUILD_TAG }}"
- id: ci-build-pkg - id: ci-build-pkg
name: Build pkg name: Build pkg
run: ./scripts/ci-build-pkg.sh harvester run: ./scripts/ci-build-pkg.sh harvester
@@ -58,12 +58,6 @@ jobs:
- name: Setup Nodejs with yarn install - name: Setup Nodejs with yarn install
uses: ./.github/actions/setup uses: ./.github/actions/setup
# The catalog image is tagged with the package.json version. Sprint tags
# (vX.Y.Z-dev-YYYYMMDD) only share its prefix, so pin it to the tag here.
- name: Pin package version to tag
if: ${{ github.ref_type == 'tag' }}
run: ./scripts/bump_version.sh "${{ github.ref_name }}"
- name: Build and push UI image - name: Build and push UI image
run: | run: |
publish="yarn publish-pkgs -cp -r ${{ inputs.registry_target }} -o ${{ inputs.registry_user }}" publish="yarn publish-pkgs -cp -r ${{ inputs.registry_target }} -o ${{ inputs.registry_user }}"
@@ -6,11 +6,13 @@ on:
- main - main
- 'release-harvester-v*' - 'release-harvester-v*'
- '*-dev' - '*-dev'
- forklift-poc
pull_request: pull_request:
branches: branches:
- main - main
- 'release-harvester-v*' - 'release-harvester-v*'
- '*-dev' - '*-dev'
- forklift-poc
types: types:
- merged - merged
-8
View File
@@ -71,11 +71,3 @@ jobs:
GITHUB_HEAD_SHA: ${{ github.event.pull_request.head.sha }} GITHUB_HEAD_SHA: ${{ github.event.pull_request.head.sha }}
GITHUB_BEFORE: ${{ github.event.before }} GITHUB_BEFORE: ${{ github.event.before }}
GITHUB_AFTER: ${{ github.event.after }} GITHUB_AFTER: ${{ github.event.after }}
unit-tests:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
- name: Run unit tests
uses: ./.github/actions/test
+20 -45
View File
@@ -1,4 +1,4 @@
> This `./AGENTS.md` file is generated by running `yarn agents:generate`. `CLAUDE.md` and `GEMINI.md` are symlinks to this file so Claude Code, GitHub Copilot and Gemini all read the same content. > This `./AGENTS.md` file is generated by running `yarn agents:generate`.
# Project Overview # Project Overview
@@ -28,7 +28,9 @@ You are an expert Senior Software Engineer specializing in Vue.js and TypeScript
- Run `yarn lint:fix` before commits. - Run `yarn lint:fix` before commits.
- Use conventional commit format: - Use conventional commit format:
``` ```
<type>: <description> <type>:
<description>
``` ```
- Follow existing naming conventions (PascalCase for components, camelCase for functions). - Follow existing naming conventions (PascalCase for components, camelCase for functions).
- After changing a Vue, JS, or TS file, make sure it's automatically formatted with ESLint. - After changing a Vue, JS, or TS file, make sure it's automatically formatted with ESLint.
@@ -59,8 +61,6 @@ You are an expert Senior Software Engineer specializing in Vue.js and TypeScript
| `yarn serve-pkgs` | Serve the locally built extension for testing | | `yarn serve-pkgs` | Serve the locally built extension for testing |
| `yarn lint` | Run ESLint (zero warnings allowed) | | `yarn lint` | Run ESLint (zero warnings allowed) |
| `yarn lint:fix` | Run ESLint with auto-fix | | `yarn lint:fix` | Run ESLint with auto-fix |
| `yarn test` | Run the unit tests (Jest) in watch mode |
| `yarn test:ci` | Run the unit tests once, as CI does (silent) |
| `yarn clean` | Clean build artifacts | | `yarn clean` | Clean build artifacts |
| `yarn agents:generate` | Regenerate `AGENTS.md` from `docs/agents.md/` sources | | `yarn agents:generate` | Regenerate `AGENTS.md` from `docs/agents.md/` sources |
@@ -97,16 +97,6 @@ You are an expert Senior Software Engineer specializing in Vue.js and TypeScript
- ESLint covers `.js`, `.ts`, and `.vue` files. - ESLint covers `.js`, `.ts`, and `.vue` files.
- Always run `yarn lint:fix` before committing. - Always run `yarn lint:fix` before committing.
### Unit Tests
- **Run**:
```bash
yarn test
```
- `yarn test` starts Jest in watch mode (like in the Rancher dashboard) and only runs the tests related to changed files. It does not exit, so use `yarn test:ci` for a single run of all tests, e.g. in scripts.
- CI runs `yarn test:ci` on every pull request.
- See the Unit Tests section of the Contributors Guide for how the tests are set up.
### Commit Conventions ### Commit Conventions
- Commits are validated by [commitlint](https://commitlint.js.org/) via a Husky `commit-msg` hook. - Commits are validated by [commitlint](https://commitlint.js.org/) via a Husky `commit-msg` hook.
@@ -140,8 +130,8 @@ To get started, follow the `Development Setup` section.
- `Vue.js`: - `Vue.js`:
- Composition API components are preferred over Options API. - Composition API components are preferred over Options API.
- Large pages with lots of code and styles should be avoided by breaking the page up into smaller Vue components. - Large pages with lots of code and styles should be avoided by breaking the page up into smaller Vue components.
- Order the Single File Component blocks as `<script>`, then `<template>`, then `<style>`. - Place source tag above template above style.
- The `<style>` tag should include `lang="scss" scoped`. - style tag should contain `lang='scss' scoped`.
- `Linting`: Follow the ESLint configuration in the root. - `Linting`: Follow the ESLint configuration in the root.
- **File Structure:** - **File Structure:**
@@ -173,45 +163,30 @@ To get started, follow the `Development Setup` section.
## Harvester UI Extension Development Guide ## Harvester UI Extension Development Guide
### Backward Compatibility 1. Backward Compatibility
The Harvester UI Extension supports earlier cluster versions (e.g., UI Ext v1.8.0 works with clusters v1.7.0 and v1.6.0). It uses Feature Flags defined in pkg/config/feature-flags to ensure the UI matches the cluster's specific version.
The Harvester UI Extension supports earlier cluster versions (e.g., UI Ext v1.8.0 works with clusters v1.7.0 and v1.6.0). It uses Feature Flags defined in `pkg/harvester/config/` to ensure the UI matches the cluster's specific version.
### Implementation Steps for New Features
2. Implementation Steps for New Features
To add a feature in a new release, follow these steps: To add a feature in a new release, follow these steps:
1. **Register**: Add a unique `[Feature Name]` to the corresponding release array in the configuration. Register: Add a unique [Feature Name] to the corresponding release array in the configuration.
2. **Check**: Use the following getter to verify if the feature is enabled for the current version:
```js Check: Use the following getter to verify if the feature is enabled for the current version:
computed: {
newFeatureEnabled() {
return this.$store.getters['harvester-common/getFeatureEnabled']('[Feature Name]');
},
},
```
3. **Render**: Use the result of the check to conditionally render the UI components. ```
computed: {
newFeatureEnabled() {
return this.$store.getters['harvester-common/getFeatureEnabled']('[Feature Name]');
},
},
```
Render: Use the result of the check to conditionally render the UI components.
## E2E Tests (Cypress) ## E2E Tests (Cypress)
See https://github.com/harvester/harvester-ui-tests See https://github.com/harvester/harvester-ui-tests
## Unit Tests (Jest)
Unit and component tests run with [Jest](https://jestjs.io/). The setup follows the Rancher dashboard and the Rancher extension template ([rancher/ui-plugin-examples](https://github.com/rancher/ui-plugin-examples)), so both stay aligned.
- Run the tests in watch mode with `yarn test`, all tests once with `yarn test:ci`, a single file with `yarn test <path>`. CI runs `yarn test:ci` on every pull request.
- Test files live next to the code in `__tests__` folders and are named `<name>.test.js` or `<name>.test.ts`.
- Configuration:
- `jest.config.js`: environment, module aliases (`@shell`, `@components`, `@pkg`) and transforms.
- `jest.setup.js`: global mocks (`t`, `$store`, common directives) and browser APIs that jsdom does not provide.
- `vue3JestRegisterTs.js`: makes TypeScript available to the Vue compiler, otherwise `.vue` files with typed props fail to compile.
- Components are tested with the Vue Test Utils 2 API: use `props` and `global.mocks`, not the Vue 2 options `propsData` and `mocks`.
- Models and utils can be tested without mounting anything, see `pkg/harvester/models/__tests__` for examples.
## Node Dependencies ## Node Dependencies
Dependencies are managed via `package.json` and `yarn` Dependencies are managed via `package.json` and `yarn`
@@ -253,7 +228,7 @@ For the Renovate config, see `.github/renovate.json`.
### Commit Message Format ### Commit Message Format
All commit messages must follow the conventional commit format: All commit messages must follow the conventional commit format:
``` ```
<type>: <description> <type>[optional scope]: <description>
[optional body] [optional body]
-1
View File
@@ -1 +0,0 @@
./AGENTS.md
-1
View File
@@ -1 +0,0 @@
./AGENTS.md
+1 -1
View File
@@ -25,7 +25,7 @@ For Harvester UI extension installation instructions, please refer to the page *
## Development Setup ## Development Setup
Ensure **Node.js v24 or later** is installed for development and debugging. Ensure **Node.js v20 or later** is installed for development and debugging.
### Standalone Mode ### Standalone Mode
+1 -2
View File
@@ -32,11 +32,10 @@ module.exports = {
'subject-empty': [2, 'never'], 'subject-empty': [2, 'never'],
'subject-full-stop': [2, 'never', '.'], 'subject-full-stop': [2, 'never', '.'],
'subject-max-length': [0, 'never'], 'subject-max-length': [0, 'never'],
'header-max-length': [0, 'always', 100],
'body-leading-blank': [2, 'always'], 'body-leading-blank': [2, 'always'],
'body-max-line-length': [0, 'always', 100], 'body-max-line-length': [0, 'always', 100],
'footer-leading-blank': [2, 'always'], 'footer-leading-blank': [2, 'always'],
'footer-max-line-length': [0, 'always', 100], 'footer-max-line-length': [2, 'always', 100],
}, },
// Ignore merge commits and revert commits // Ignore merge commits and revert commits
ignores: [ ignores: [
+3 -1
View File
@@ -6,7 +6,9 @@
- Run `yarn lint:fix` before commits. - Run `yarn lint:fix` before commits.
- Use conventional commit format: - Use conventional commit format:
``` ```
<type>: <description> <type>:
<description>
``` ```
- Follow existing naming conventions (PascalCase for components, camelCase for functions). - Follow existing naming conventions (PascalCase for components, camelCase for functions).
- After changing a Vue, JS, or TS file, make sure it's automatically formatted with ESLint. - After changing a Vue, JS, or TS file, make sure it's automatically formatted with ESLint.
-12
View File
@@ -15,8 +15,6 @@
| `yarn serve-pkgs` | Serve the locally built extension for testing | | `yarn serve-pkgs` | Serve the locally built extension for testing |
| `yarn lint` | Run ESLint (zero warnings allowed) | | `yarn lint` | Run ESLint (zero warnings allowed) |
| `yarn lint:fix` | Run ESLint with auto-fix | | `yarn lint:fix` | Run ESLint with auto-fix |
| `yarn test` | Run the unit tests (Jest) in watch mode |
| `yarn test:ci` | Run the unit tests once, as CI does (silent) |
| `yarn clean` | Clean build artifacts | | `yarn clean` | Clean build artifacts |
| `yarn agents:generate` | Regenerate `AGENTS.md` from `docs/agents.md/` sources | | `yarn agents:generate` | Regenerate `AGENTS.md` from `docs/agents.md/` sources |
@@ -53,16 +51,6 @@
- ESLint covers `.js`, `.ts`, and `.vue` files. - ESLint covers `.js`, `.ts`, and `.vue` files.
- Always run `yarn lint:fix` before committing. - Always run `yarn lint:fix` before committing.
### Unit Tests
- **Run**:
```bash
yarn test
```
- `yarn test` starts Jest in watch mode (like in the Rancher dashboard) and only runs the tests related to changed files. It does not exit, so use `yarn test:ci` for a single run of all tests, e.g. in scripts.
- CI runs `yarn test:ci` on every pull request.
- See the Unit Tests section of the Contributors Guide for how the tests are set up.
### Commit Conventions ### Commit Conventions
- Commits are validated by [commitlint](https://commitlint.js.org/) via a Husky `commit-msg` hook. - Commits are validated by [commitlint](https://commitlint.js.org/) via a Husky `commit-msg` hook.
+15 -17
View File
@@ -16,8 +16,8 @@ To get started, follow the `Development Setup` section.
- `Vue.js`: - `Vue.js`:
- Composition API components are preferred over Options API. - Composition API components are preferred over Options API.
- Large pages with lots of code and styles should be avoided by breaking the page up into smaller Vue components. - Large pages with lots of code and styles should be avoided by breaking the page up into smaller Vue components.
- Order the Single File Component blocks as `<script>`, then `<template>`, then `<style>`. - Place source tag above template above style.
- The `<style>` tag should include `lang="scss" scoped`. - style tag should contain `lang='scss' scoped`.
- `Linting`: Follow the ESLint configuration in the root. - `Linting`: Follow the ESLint configuration in the root.
- **File Structure:** - **File Structure:**
@@ -49,24 +49,22 @@ To get started, follow the `Development Setup` section.
## Harvester UI Extension Development Guide ## Harvester UI Extension Development Guide
### Backward Compatibility 1. Backward Compatibility
The Harvester UI Extension supports earlier cluster versions (e.g., UI Ext v1.8.0 works with clusters v1.7.0 and v1.6.0). It uses Feature Flags defined in pkg/config/feature-flags to ensure the UI matches the cluster's specific version.
The Harvester UI Extension supports earlier cluster versions (e.g., UI Ext v1.8.0 works with clusters v1.7.0 and v1.6.0). It uses Feature Flags defined in `pkg/harvester/config/` to ensure the UI matches the cluster's specific version.
### Implementation Steps for New Features
2. Implementation Steps for New Features
To add a feature in a new release, follow these steps: To add a feature in a new release, follow these steps:
1. **Register**: Add a unique `[Feature Name]` to the corresponding release array in the configuration. Register: Add a unique [Feature Name] to the corresponding release array in the configuration.
2. **Check**: Use the following getter to verify if the feature is enabled for the current version:
```js Check: Use the following getter to verify if the feature is enabled for the current version:
computed: {
newFeatureEnabled() {
return this.$store.getters['harvester-common/getFeatureEnabled']('[Feature Name]');
},
},
```
3. **Render**: Use the result of the check to conditionally render the UI components. ```
computed: {
newFeatureEnabled() {
return this.$store.getters['harvester-common/getFeatureEnabled']('[Feature Name]');
},
},
```
Render: Use the result of the check to conditionally render the UI components.
@@ -1,12 +0,0 @@
## Unit Tests (Jest)
Unit and component tests run with [Jest](https://jestjs.io/). The setup follows the Rancher dashboard and the Rancher extension template ([rancher/ui-plugin-examples](https://github.com/rancher/ui-plugin-examples)), so both stay aligned.
- Run the tests in watch mode with `yarn test`, all tests once with `yarn test:ci`, a single file with `yarn test <path>`. CI runs `yarn test:ci` on every pull request.
- Test files live next to the code in `__tests__` folders and are named `<name>.test.js` or `<name>.test.ts`.
- Configuration:
- `jest.config.js`: environment, module aliases (`@shell`, `@components`, `@pkg`) and transforms.
- `jest.setup.js`: global mocks (`t`, `$store`, common directives) and browser APIs that jsdom does not provide.
- `vue3JestRegisterTs.js`: makes TypeScript available to the Vue compiler, otherwise `.vue` files with typed props fail to compile.
- Components are tested with the Vue Test Utils 2 API: use `props` and `global.mocks`, not the Vue 2 options `propsData` and `mocks`.
- Models and utils can be tested without mounting anything, see `pkg/harvester/models/__tests__` for examples.
@@ -26,7 +26,7 @@
### Commit Message Format ### Commit Message Format
All commit messages must follow the conventional commit format: All commit messages must follow the conventional commit format:
``` ```
<type>: <description> <type>[optional scope]: <description>
[optional body] [optional body]
+1 -1
View File
@@ -1,4 +1,4 @@
> This `./AGENTS.md` file is generated by running `yarn agents:generate`. `CLAUDE.md` and `GEMINI.md` are symlinks to this file so Claude Code, GitHub Copilot and Gemini all read the same content. > This `./AGENTS.md` file is generated by running `yarn agents:generate`.
# Project Overview # Project Overview
-46
View File
@@ -1,46 +0,0 @@
// Same settings in every environment, otherwise tests that format dates depend on the machine
process.env.TZ = 'UTC';
// The setup follows the one of the Rancher dashboard and of the Rancher extension template (rancher/ui-plugin-examples)
module.exports = {
roots: ['<rootDir>/pkg'],
testEnvironment: 'jsdom',
// Jest 28+ (jest-environment-jsdom) defaults package resolution to the "browser" export condition, which makes
// packages like @vue/test-utils resolve their browser (global-Vue) build and throw "Vue is not defined".
testEnvironmentOptions: { customExportConditions: ['node', 'node-addons'] },
setupFilesAfterEnv: ['<rootDir>/jest.setup.js'],
watchman: false,
moduleFileExtensions: ['js', 'mjs', 'json', 'vue', 'ts'],
modulePaths: ['<rootDir>'],
moduleNameMapper: {
'^~/(.*)$': '<rootDir>/$1',
'^@/(.*)$': '<rootDir>/$1',
'^@shell/(.*)$': '<rootDir>/node_modules/@rancher/shell/$1',
'^@components/(.*)$': '<rootDir>/node_modules/@rancher/shell/rancher-components/$1',
// At build time @pkg/<path> is resolved to the package that imports it (see vue.config.js of @rancher/shell)
'^@pkg/harvester/(.*)$': '<rootDir>/pkg/harvester/$1',
'^@pkg/(.*)$': '<rootDir>/pkg/harvester/$1',
// clipboard-polyfill's package `exports` only declares an `import` condition, so map it to its ESM build
// (transpiled via transformIgnorePatterns below)
'^clipboard-polyfill$': '<rootDir>/node_modules/clipboard-polyfill/dist/es6/clipboard-polyfill.es6.js',
'\\.(jpe?g|png|gif|webp|svg|mp4|webm|ogg|mp3|wav|flac|aac|woff2?|eot|ttf|otf)$': '<rootDir>/svgTransform.js',
},
modulePathIgnorePatterns: ['<rootDir>/pkg/harvester/node_modules'],
testPathIgnorePatterns: ['<rootDir>/node_modules/', '<rootDir>(/.*)*/__tests__/utils/'],
transform: {
// vue3-jest, but with TypeScript registered for the Vue compiler first, see vue3JestRegisterTs.js
'^.+\\.vue$': '<rootDir>/vue3JestRegisterTs.js',
// isolatedModules: transpile only, the types are not checked while testing
'^.+\\.tsx?$': ['ts-jest', { tsconfig: { sourceMap: true, isolatedModules: true } }],
// Use the project babel config (babel.config.js, which extends the one of @rancher/shell)
'^.+\\.js$': '<rootDir>/node_modules/babel-jest',
// process mjs (e.g. vee-validate ESM) with babel-jest
'^.+\\.mjs$': '<rootDir>/node_modules/babel-jest',
'^.+\\.svg$': '<rootDir>/svgTransform.js',
},
transformIgnorePatterns: [
// @rancher/shell is shipped untranspiled, the other packages are ESM-only. @replit/codemirror-vim-core is
// required by the CommonJS build of @replit/codemirror-vim, which the shell's YamlEditor imports
'/node_modules/(?!(@rancher/shell|color|color-string|color-convert|color-name|vee-validate|@vee-validate|clipboard-polyfill|intl-messageformat|@formatjs|@replit/codemirror-vim-core)/)',
],
};
-106
View File
@@ -1,106 +0,0 @@
/* eslint-env jest */
import { createApp } from 'vue';
import { config } from '@vue/test-utils';
import i18n from '@shell/plugins/i18n';
import FloatingVue from 'floating-vue';
import { floatingVueOptions } from '@shell/plugins/floating-vue';
import vSelect from 'vue-select';
import cleanTooltipDirective from '@shell/directives/clean-tooltip';
import cleanHtmlDirective from '@shell/directives/clean-html';
import htmlStrippedAriaLabelDirective from '@shell/directives/strip-html-aria-label';
import '@shell/plugins/replaceall';
import { TextEncoder, TextDecoder } from 'util';
const vueApp = createApp({});
global.TextEncoder = TextEncoder;
global.TextDecoder = TextDecoder;
// vueApp.config.productionTip = false;
vueApp.use(i18n, { store: { dispatch() {} } });
vueApp.use(FloatingVue, floatingVueOptions);
vueApp.directive('clean-html', cleanHtmlDirective);
vueApp.directive('clean-tooltip', cleanTooltipDirective);
vueApp.component('v-select', vSelect);
config.global.components['v-select'] = vSelect;
config.global.plugins = [FloatingVue];
config.global.mocks['t'] = (key) => `%${ key }%`;
config.global.mocks['$store'] = {
getters: {},
dispatch: jest.fn(),
commit: jest.fn(),
};
config.global.directives = {
...config.global.directives,
t: {
mounted(el, binding) {
el.textContent = `%${ binding.value }%`;
},
updated(el, binding) {
el.textContent = `%${ binding.value }%`;
}
},
'clean-tooltip': cleanTooltipDirective,
'clean-html': cleanHtmlDirective,
'stripped-aria-label': htmlStrippedAriaLabelDirective,
};
config.global.stubs['t'] = { template: '<span><slot /></span>' };
/**
* Global configuration for Jest tests
*/
beforeAll(() => {
// matchMedia and getContext methods aren't included in jest's version of jsdom for us to mock
// implemented as per jest documentation: https://jestjs.io/docs/manual-mocks#mocking-methods-which-are-not-implemented-in-jsdom
Object.defineProperty(window, 'matchMedia', {
value: jest.fn().mockImplementation(() => ({
addListener: jest.fn(),
removeListener: jest.fn(),
addEventListener: jest.fn(),
removeEventListener: jest.fn()
}))
});
Object.defineProperty(HTMLCanvasElement.prototype, 'getContext', {
value: jest.fn().mockImplementation(() => ({
createLinearGradient: jest.fn(),
fillRect: jest.fn(),
getImageData: jest.fn(() => ({ data: [] }))
}))
});
Object.defineProperty(window, 'IntersectionObserver', {
writable: true,
value: jest.fn().mockImplementation(() => ({
observe: jest.fn(),
unobserve: jest.fn(),
disconnect: jest.fn(),
})),
});
});
jest.mock('@shell/composables/useI18n', () => {
return {
useI18n() {
return { t: (key, options) => `${ key }${ options ? `-${ JSON.stringify(options) }` : '' }` };
}
};
});
// eslint-disable-next-line no-console
jest.spyOn(console, 'warn').mockImplementation((warning) => warning.includes('[Vue warn]') ? null : console.log(warning));
/**
* Common initialization for each test, required for resetting states
*/
beforeEach(() => {
// jest.resetModules(); // Use this function inside your test if you need to remove any cache stored
// jest.clearAllMocks(); // Use this function inside your test if you need to reset mocks
jest.restoreAllMocks(); // Use this function inside your test if you need to reset mocks and restore existing functionality
// Mock the $extension object
// config.mocks['$extension'] = { getDynamic: () => undefined };
config.global.mocks['$store'] = { getters: { 'i18n/t': jest.fn() } };
// Overrides some components
// config.stubs['my-component'] = { template: "<div></div> "};
});
+10 -28
View File
@@ -1,13 +1,13 @@
{ {
"name": "harvester-ui-extension", "name": "harvester-ui-extension",
"version": "1.9.1", "version": "1.9.0-dev",
"private": false, "private": false,
"engines": { "engines": {
"node": ">=24.0.0" "node": ">=24.0.0"
}, },
"dependencies": { "dependencies": {
"@babel/plugin-transform-class-static-block": "7.29.7", "@babel/plugin-transform-class-static-block": "7.29.7",
"@rancher/shell": "3.0.14", "@rancher/shell": "3.0.12-rc.3",
"@vue-flow/background": "^1.3.0", "@vue-flow/background": "^1.3.0",
"@vue-flow/controls": "^1.1.1", "@vue-flow/controls": "^1.1.1",
"@vue-flow/core": "^1.33.5", "@vue-flow/core": "^1.33.5",
@@ -15,19 +15,13 @@
"cache-loader": "^4.1.0", "cache-loader": "^4.1.0",
"color": "4.2.3", "color": "4.2.3",
"ip": "2.0.1", "ip": "2.0.1",
"@xterm/xterm": "6.0.0",
"@xterm/addon-fit": "0.11.0",
"@xterm/addon-search": "0.16.0",
"@xterm/addon-web-links": "0.12.0",
"@xterm/addon-webgl": "0.19.0",
"@xterm/addon-canvas": "0.7.0",
"node-polyfill-webpack-plugin": "^3.0.0", "node-polyfill-webpack-plugin": "^3.0.0",
"elkjs": "^0.11.0", "elkjs": "^0.11.0",
"vue-draggable-next": "^2.2.1", "vue-draggable-next": "^2.2.1",
"yaml": "^2.5.1" "yaml": "^2.5.1"
}, },
"resolutions": { "resolutions": {
"@types/node": "25.9.5", "@types/node": "25.9.4",
"cronstrue": "2.59.0", "cronstrue": "2.59.0",
"d3-color": "3.1.0", "d3-color": "3.1.0",
"ejs": "3.1.10", "ejs": "3.1.10",
@@ -35,12 +29,12 @@
"glob": "7.2.3", "glob": "7.2.3",
"glob-parent": "6.0.2", "glob-parent": "6.0.2",
"json5": "2.2.3", "json5": "2.2.3",
"@types/lodash": "4.17.25", "@types/lodash": "4.17.24",
"merge": "2.1.1", "merge": "2.1.1",
"node-forge": "1.4.0", "node-forge": "1.4.0",
"nth-check": "2.1.1", "nth-check": "2.1.1",
"qs": "6.16.0", "qs": "6.15.3",
"roarr": "7.21.7", "roarr": "7.21.6",
"semver": "7.8.5", "semver": "7.8.5",
"@vue/cli-service/html-webpack-plugin": "^5.0.0" "@vue/cli-service/html-webpack-plugin": "^5.0.0"
}, },
@@ -48,19 +42,15 @@
"dev": "NODE_ENV=dev ./node_modules/.bin/vue-cli-service serve", "dev": "NODE_ENV=dev ./node_modules/.bin/vue-cli-service serve",
"build": "./node_modules/.bin/vue-cli-service build", "build": "./node_modules/.bin/vue-cli-service build",
"clean": "./node_modules/@rancher/shell/scripts/clean", "clean": "./node_modules/@rancher/shell/scripts/clean",
"lint": "./node_modules/@rancher/shell/scripts/lint --max-warnings 0 --ext .js,.ts,.vue .", "lint": "./node_modules/.bin/eslint --max-warnings 0 --ext .js,.ts,.vue .",
"lint:fix": "./node_modules/@rancher/shell/scripts/lint --fix --max-warnings 0 --ext .js,.ts,.vue .", "lint:fix": "./node_modules/.bin/eslint --fix --max-warnings 0 --ext .js,.ts,.vue .",
"test": "jest --watch",
"test:ci": "NODE_OPTIONS=--max_old_space_size=8192 jest --silent",
"build-pkg": "./node_modules/@rancher/shell/scripts/build-pkg.sh", "build-pkg": "./node_modules/@rancher/shell/scripts/build-pkg.sh",
"serve-pkgs": "./node_modules/@rancher/shell/scripts/serve-pkgs", "serve-pkgs": "./node_modules/@rancher/shell/scripts/serve-pkgs",
"publish-pkgs": "./node_modules/@rancher/shell/scripts/extension/publish", "publish-pkgs": "./node_modules/@rancher/shell/scripts/extension/publish",
"parse-tag-name": "./node_modules/@rancher/shell/scripts/extension/parse-tag-name", "parse-tag-name": "./node_modules/@rancher/shell/scripts/extension/parse-tag-name",
"commitlint": "commitlint --edit", "commitlint": "commitlint --edit",
"prepare": "husky", "prepare": "husky",
"agents:generate": "./scripts/generate-agent-and-persona-mds.sh", "agents:generate": "./scripts/generate-agent-and-persona-mds.sh"
"prelint": "npm --prefix node_modules/@rancher/shell/eslint-legacy install eslint-plugin-jest@^24 --no-save --no-audit --no-fund --legacy-peer-deps --loglevel=error",
"prelint:fix": "npm --prefix node_modules/@rancher/shell/eslint-legacy install eslint-plugin-jest@^24 --no-save --no-audit --no-fund --legacy-peer-deps --loglevel=error"
}, },
"devDependencies": { "devDependencies": {
"@commitlint/load": "^19.8.1", "@commitlint/load": "^19.8.1",
@@ -68,14 +58,6 @@
"@commitlint/config-conventional": "^19.8.1", "@commitlint/config-conventional": "^19.8.1",
"eslint-plugin-node": "^11.1.0", "eslint-plugin-node": "^11.1.0",
"eslint-plugin-promise": "^7.1.0", "eslint-plugin-promise": "^7.1.0",
"husky": "^9.1.7", "husky": "^9.1.7"
"@types/jest": "29.5.12",
"@vue/test-utils": "2.4.6",
"@vue/vue3-jest": "29.2.6",
"babel-jest": "29.7.0",
"babel-plugin-transform-require-context": "0.1.1",
"jest": "29.7.0",
"jest-environment-jsdom": "29.7.0",
"ts-jest": "29.4.12"
} }
} }
@@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="3326" height="324" data-surface="transparent" viewBox="0 0 3326.24 324.48"><path fill="#30ba78" d="M535.12 100.88c-3.04 2-7.12 2-10.16 0-4.96-3.28-5.44-10.24-1.44-14.24a9.08 9.08 0 0 1 13.04 0c4 4 3.52 10.88-1.44 14.24m14.48-20.16c5.76 24.64-16.32 46.72-40.96 40.96-12.56-2.96-22.48-12.88-25.44-25.44-5.76-24.56 16.32-46.72 40.96-40.96 12.56 2.96 22.48 12.88 25.44 25.36M383.92 213.12c2.8 4.08 5.12 7.92 6.48 11.84.88 2.8 2.08 6.4 4.88 7.92l.48.24c5.04 1.84 17.92 1.52 17.92 1.52h23.76c2 0 19.84 0 19.44-2-2.16-9.52-13.2-11.28-21.6-16.24-7.76-4.64-15.04-9.84-18.4-18.88-1.76-4.64-.72-15.36 2.32-19.28 2.16-2.8 5.36-4.72 8.88-5.44 3.84-.8 7.76-.08 11.6.24 4.72.48 9.36 1.36 14.08 1.92 9.12 1.2 18.24 1.68 27.44 1.44 15.12-.4 30.24-2.8 44.56-7.68 10-3.36 19.84-7.92 28.32-14.24 9.68-7.2 7.12-6.48-2.64-5.52-11.76 1.2-23.6 1.36-35.36.72-10.96-.64-21.84-1.92-31.76-7.04-7.84-4-14.56-8.08-20.72-14.32-.96-.96-1.52-3.68.16-5.44 1.68-1.68 5.12-.72 6.24.16 10.8 9.04 26.96 16.48 43.68 17.28 9.04.48 17.84.64 26.88.24 4.48-.24 11.36-.16 15.84-.24 2.32 0 8.72.64 9.92-1.84.4-.72.32-1.52.32-2.4-1.36-36.16-4-76.96-41.84-94.24-28.24-12.88-70.56-32.88-88.4-41.2-4.16-2-8.96 1.12-8.96 5.76 0 12.08.64 29.44.64 45.2-8.56-8.72-22.96-14.24-34-19.28-12.48-5.76-25.36-10.56-38.48-14.64-26.4-8.16-53.76-13.2-81.2-15.92-31.12-3.12-62.88-1.6-93.52 4.72C130.32 16.96 80.64 41.28 42.96 76.8 19.52 98.56 1.36 129.6.16 161.04c-1.76 44.56 10.72 68.48 33.68 93.12 36.56 39.28 115.28 44.8 147.12-1.84 14.32-20.96 17.44-49.44 7.04-72.56-10.4-23.2-34.32-39.92-59.68-40.8-19.68-.64-40.64 9.36-48.16 27.6-5.76 13.92-2.48 31.04 8 41.84 4.08 4.24 9.6 7.68 15.68 6.32 3.52-.8 6.56-3.44 7.04-7.12.8-5.36-3.84-8.8-6.72-12.88-5.2-7.36-4.16-18.48 2.32-24.72 5.44-5.28 13.6-6.88 21.2-6.88 7.12 0 14.32 1.28 20.48 4.88 8.64 5.04 14.32 14.32 16.32 24.08 5.92 29.28-17.84 53.04-50.08 54.88-16.48.96-33.28-3.36-46.16-13.68-32.56-26.24-40.56-79.84-3.28-108.48 35.36-27.2 80-20.16 106.32-6.08 21.04 11.28 36.8 29.76 48.64 50.24 6 10.24 11.04 21.04 15.76 31.92 4.56 10.48 8.8 21.04 17.84 28.72 6 5.12 13.44 4.88 21.36 4.88h45.04c6.08 0 4.64-4.08 2-6.8-6-6.08-14.56-7.44-22.48-9.68-18.16-4.96-16.32-29.04-11.28-29.04 16.24 0 16.72.48 30.96.32 20.48-.32 26.72-1.44 42.72 4.48 8.56 3.2 16.8 11.52 22.16 19.2"/><path fill="#ffffff" d="M717.92 232.96c48.64 0 81.6-27.84 81.6-70.72 0-80.96-112.64-49.28-112.64-97.92 0-18.88 15.36-31.04 38.72-31.04 17.28 0 30.08 6.72 43.2 19.84l24.96-24.96C778.72 11.2 754.72 0 725.92 0c-47.04 0-78.08 26.56-78.08 68.16 0 77.44 111.68 48.32 111.68 99.84 0 18.88-15.04 31.68-40.32 31.68-18.88 0-34.88-7.36-52.16-24.96l-24.32 24.32c17.28 20.48 41.6 33.92 75.2 33.92m203.2 0c52.48 0 87.04-27.2 87.04-81.92V4.48H968.8v143.36c0 32.64-18.88 48.64-47.68 48.64s-47.36-16-47.36-48.64V4.48H834.4v146.56c0 54.72 33.92 81.92 86.72 81.92m195.2 0c48.64 0 81.6-27.84 81.6-70.72 0-80.96-112.64-49.28-112.64-97.92 0-18.88 15.36-31.04 38.72-31.04 17.28 0 30.08 6.72 43.2 19.84l24.96-24.96C1177.12 11.2 1153.12 0 1124.32 0c-47.04 0-78.08 26.56-78.08 68.16 0 77.44 111.68 48.32 111.68 99.84 0 18.88-15.04 31.68-40.32 31.68-18.88 0-34.88-7.36-52.16-24.96l-24.32 24.32c17.28 20.48 41.6 33.92 75.2 33.92m153.6-4.48h109.12v-35.84h-96c-6.4 0-11.52-5.12-11.52-11.52v-48h100.8V98.88h-100.8V51.84c0-6.4 5.12-11.52 11.52-11.52h96V4.48h-109.12c-21.76 0-37.12 15.68-37.12 37.44v149.12c0 21.76 15.36 37.44 37.12 37.44m293.12 0h29.12l83.52-224h-29.12l-68.8 189.76-69.12-189.76h-28.8zm145.6-187.84h28.8V3.52h-28.8zm1.6 187.84h25.6V74.56h-55.68v22.4h30.08zm73.92 0h25.92v-91.2c0-25.6 14.72-37.76 39.68-37.76h15.04v-25.6h-13.12c-18.88 0-34.88 5.76-42.56 25.28V74.56h-24.96zm163.52 0h23.68V206.4H1948c-9.6 0-17.28-7.36-17.28-17.28V96.96h40.64v-22.4h-40.64V36.48h-25.6v38.08h-27.84v22.4h27.84v90.56c0 29.76 21.44 40.96 42.56 40.96m115.52 3.2c16 0 37.44-6.08 50.24-26.24v23.04h23.04V74.56h-25.6v87.04c0 31.04-19.52 46.4-42.56 46.4-22.4 0-38.72-11.2-38.72-44.16V74.56h-25.92v93.76c0 44.16 25.28 63.36 59.52 63.36m167.36 0c21.44 0 37.44-6.4 46.72-18.56l.32 15.36h23.04c-.64-16.64-.96-33.6-.96-50.56v-49.28c0-38.08-24.32-57.28-60.48-57.28-23.36 0-47.36 8.32-61.12 24l12.16 18.24c12.16-12.8 31.04-18.88 47.68-18.88 22.08 0 36.16 9.92 36.16 35.2v19.2c-9.6-6.72-23.36-10.56-40.32-10.56-34.88 0-61.12 20.16-61.12 47.04 0 27.2 22.72 46.08 57.92 46.08m6.72-19.52c-23.68 0-38.4-11.2-38.4-26.56 0-15.68 14.72-26.24 38.08-26.24 23.68 0 37.44 10.56 37.44 26.24s-13.76 26.56-37.12 26.56m150.08 16.32h16V206.4h-14.72c-9.6 0-16.96-7.04-16.96-16.96V-5.12h-54.08v22.08h28.16v172.16c0 24 16.64 39.36 41.6 39.36m52.48-187.84h28.8V3.52h-28.8zm1.6 187.84h25.6V74.56h-55.68v22.4h30.08zm61.44 0h116.8v-22.72h-86.08l84.8-110.4v-20.8h-114.56V97.6h82.88l-83.84 110.72zm198.4 3.2c21.44 0 37.44-6.4 46.72-18.56l.32 15.36h23.04c-.64-16.64-.96-33.6-.96-50.56v-49.28c0-38.08-24.32-57.28-60.48-57.28-23.36 0-47.36 8.32-61.12 24l12.16 18.24c12.16-12.8 31.04-18.88 47.68-18.88 22.08 0 36.16 9.92 36.16 35.2v19.2c-9.6-6.72-23.36-10.56-40.32-10.56-3Line truncated

Before

Width:  |  Height:  |  Size: 5.8 KiB

@@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="3326" height="324" data-surface="transparent" viewBox="0 0 3326.24 324.48"><path fill="#30ba78" d="M535.12 100.88c-3.04 2-7.12 2-10.16 0-4.96-3.28-5.44-10.24-1.44-14.24a9.08 9.08 0 0 1 13.04 0c4 4 3.52 10.88-1.44 14.24m14.48-20.16c5.76 24.64-16.32 46.72-40.96 40.96-12.56-2.96-22.48-12.88-25.44-25.44-5.76-24.56 16.32-46.72 40.96-40.96 12.56 2.96 22.48 12.88 25.44 25.36M383.92 213.12c2.8 4.08 5.12 7.92 6.48 11.84.88 2.8 2.08 6.4 4.88 7.92l.48.24c5.04 1.84 17.92 1.52 17.92 1.52h23.76c2 0 19.84 0 19.44-2-2.16-9.52-13.2-11.28-21.6-16.24-7.76-4.64-15.04-9.84-18.4-18.88-1.76-4.64-.72-15.36 2.32-19.28 2.16-2.8 5.36-4.72 8.88-5.44 3.84-.8 7.76-.08 11.6.24 4.72.48 9.36 1.36 14.08 1.92 9.12 1.2 18.24 1.68 27.44 1.44 15.12-.4 30.24-2.8 44.56-7.68 10-3.36 19.84-7.92 28.32-14.24 9.68-7.2 7.12-6.48-2.64-5.52-11.76 1.2-23.6 1.36-35.36.72-10.96-.64-21.84-1.92-31.76-7.04-7.84-4-14.56-8.08-20.72-14.32-.96-.96-1.52-3.68.16-5.44 1.68-1.68 5.12-.72 6.24.16 10.8 9.04 26.96 16.48 43.68 17.28 9.04.48 17.84.64 26.88.24 4.48-.24 11.36-.16 15.84-.24 2.32 0 8.72.64 9.92-1.84.4-.72.32-1.52.32-2.4-1.36-36.16-4-76.96-41.84-94.24-28.24-12.88-70.56-32.88-88.4-41.2-4.16-2-8.96 1.12-8.96 5.76 0 12.08.64 29.44.64 45.2-8.56-8.72-22.96-14.24-34-19.28-12.48-5.76-25.36-10.56-38.48-14.64-26.4-8.16-53.76-13.2-81.2-15.92-31.12-3.12-62.88-1.6-93.52 4.72C130.32 16.96 80.64 41.28 42.96 76.8 19.52 98.56 1.36 129.6.16 161.04c-1.76 44.56 10.72 68.48 33.68 93.12 36.56 39.28 115.28 44.8 147.12-1.84 14.32-20.96 17.44-49.44 7.04-72.56-10.4-23.2-34.32-39.92-59.68-40.8-19.68-.64-40.64 9.36-48.16 27.6-5.76 13.92-2.48 31.04 8 41.84 4.08 4.24 9.6 7.68 15.68 6.32 3.52-.8 6.56-3.44 7.04-7.12.8-5.36-3.84-8.8-6.72-12.88-5.2-7.36-4.16-18.48 2.32-24.72 5.44-5.28 13.6-6.88 21.2-6.88 7.12 0 14.32 1.28 20.48 4.88 8.64 5.04 14.32 14.32 16.32 24.08 5.92 29.28-17.84 53.04-50.08 54.88-16.48.96-33.28-3.36-46.16-13.68-32.56-26.24-40.56-79.84-3.28-108.48 35.36-27.2 80-20.16 106.32-6.08 21.04 11.28 36.8 29.76 48.64 50.24 6 10.24 11.04 21.04 15.76 31.92 4.56 10.48 8.8 21.04 17.84 28.72 6 5.12 13.44 4.88 21.36 4.88h45.04c6.08 0 4.64-4.08 2-6.8-6-6.08-14.56-7.44-22.48-9.68-18.16-4.96-16.32-29.04-11.28-29.04 16.24 0 16.72.48 30.96.32 20.48-.32 26.72-1.44 42.72 4.48 8.56 3.2 16.8 11.52 22.16 19.2"/><path fill="#0c322c" d="M717.92 232.96c48.64 0 81.6-27.84 81.6-70.72 0-80.96-112.64-49.28-112.64-97.92 0-18.88 15.36-31.04 38.72-31.04 17.28 0 30.08 6.72 43.2 19.84l24.96-24.96C778.72 11.2 754.72 0 725.92 0c-47.04 0-78.08 26.56-78.08 68.16 0 77.44 111.68 48.32 111.68 99.84 0 18.88-15.04 31.68-40.32 31.68-18.88 0-34.88-7.36-52.16-24.96l-24.32 24.32c17.28 20.48 41.6 33.92 75.2 33.92m203.2 0c52.48 0 87.04-27.2 87.04-81.92V4.48H968.8v143.36c0 32.64-18.88 48.64-47.68 48.64s-47.36-16-47.36-48.64V4.48H834.4v146.56c0 54.72 33.92 81.92 86.72 81.92m195.2 0c48.64 0 81.6-27.84 81.6-70.72 0-80.96-112.64-49.28-112.64-97.92 0-18.88 15.36-31.04 38.72-31.04 17.28 0 30.08 6.72 43.2 19.84l24.96-24.96C1177.12 11.2 1153.12 0 1124.32 0c-47.04 0-78.08 26.56-78.08 68.16 0 77.44 111.68 48.32 111.68 99.84 0 18.88-15.04 31.68-40.32 31.68-18.88 0-34.88-7.36-52.16-24.96l-24.32 24.32c17.28 20.48 41.6 33.92 75.2 33.92m153.6-4.48h109.12v-35.84h-96c-6.4 0-11.52-5.12-11.52-11.52v-48h100.8V98.88h-100.8V51.84c0-6.4 5.12-11.52 11.52-11.52h96V4.48h-109.12c-21.76 0-37.12 15.68-37.12 37.44v149.12c0 21.76 15.36 37.44 37.12 37.44m293.12 0h29.12l83.52-224h-29.12l-68.8 189.76-69.12-189.76h-28.8zm145.6-187.84h28.8V3.52h-28.8zm1.6 187.84h25.6V74.56h-55.68v22.4h30.08zm73.92 0h25.92v-91.2c0-25.6 14.72-37.76 39.68-37.76h15.04v-25.6h-13.12c-18.88 0-34.88 5.76-42.56 25.28V74.56h-24.96zm163.52 0h23.68V206.4H1948c-9.6 0-17.28-7.36-17.28-17.28V96.96h40.64v-22.4h-40.64V36.48h-25.6v38.08h-27.84v22.4h27.84v90.56c0 29.76 21.44 40.96 42.56 40.96m115.52 3.2c16 0 37.44-6.08 50.24-26.24v23.04h23.04V74.56h-25.6v87.04c0 31.04-19.52 46.4-42.56 46.4-22.4 0-38.72-11.2-38.72-44.16V74.56h-25.92v93.76c0 44.16 25.28 63.36 59.52 63.36m167.36 0c21.44 0 37.44-6.4 46.72-18.56l.32 15.36h23.04c-.64-16.64-.96-33.6-.96-50.56v-49.28c0-38.08-24.32-57.28-60.48-57.28-23.36 0-47.36 8.32-61.12 24l12.16 18.24c12.16-12.8 31.04-18.88 47.68-18.88 22.08 0 36.16 9.92 36.16 35.2v19.2c-9.6-6.72-23.36-10.56-40.32-10.56-34.88 0-61.12 20.16-61.12 47.04 0 27.2 22.72 46.08 57.92 46.08m6.72-19.52c-23.68 0-38.4-11.2-38.4-26.56 0-15.68 14.72-26.24 38.08-26.24 23.68 0 37.44 10.56 37.44 26.24s-13.76 26.56-37.12 26.56m150.08 16.32h16V206.4h-14.72c-9.6 0-16.96-7.04-16.96-16.96V-5.12h-54.08v22.08h28.16v172.16c0 24 16.64 39.36 41.6 39.36m52.48-187.84h28.8V3.52h-28.8zm1.6 187.84h25.6V74.56h-55.68v22.4h30.08zm61.44 0h116.8v-22.72h-86.08l84.8-110.4v-20.8h-114.56V97.6h82.88l-83.84 110.72zm198.4 3.2c21.44 0 37.44-6.4 46.72-18.56l.32 15.36h23.04c-.64-16.64-.96-33.6-.96-50.56v-49.28c0-38.08-24.32-57.28-60.48-57.28-23.36 0-47.36 8.32-61.12 24l12.16 18.24c12.16-12.8 31.04-18.88 47.68-18.88 22.08 0 36.16 9.92 36.16 35.2v19.2c-9.6-6.72-23.36-10.56-40.32-10.56-3Line truncated

Before

Width:  |  Height:  |  Size: 5.8 KiB

-5
View File
@@ -271,9 +271,4 @@ export default {
.filter-label .v-popper__arrow-container { .filter-label .v-popper__arrow-container {
display: none; display: none;
} }
.fixed-header-actions .middle .filter + .btn-group {
display: inline-flex;
vertical-align: middle;
}
</style> </style>
@@ -116,11 +116,6 @@ export default {
.vm-schedule-dropdown .v-popper__arrow-container { .vm-schedule-dropdown .v-popper__arrow-container {
display: none; display: none;
} }
.fixed-header-actions .middle .vm-schedule-filter + .btn-group {
display: inline-flex;
vertical-align: middle;
}
</style> </style>
<style lang="scss" scoped> <style lang="scss" scoped>
+8 -34
View File
@@ -55,12 +55,8 @@ export default {
!this.latestUpgrade.isUpgradeFailed; !this.latestUpgrade.isUpgradeFailed;
}, },
canUpgrade() {
return this.versionOptions.length > 0 && !this.isUpgradeInProgress;
},
versionOptions() { versionOptions() {
const versions = this.$store.getters['harvester/all'](HCI.VERSION) || []; const versions = this.$store.getters['harvester/all'](HCI.VERSION);
return versions.map((V) => V.metadata.name); return versions.map((V) => V.metadata.name);
}, },
@@ -128,7 +124,6 @@ export default {
try { try {
await proxyResource.save(); await proxyResource.save();
proxyResource.notifyGeneratedName?.();
this.cancel(); this.cancel();
} catch (err) { } catch (err) {
@@ -159,23 +154,14 @@ export default {
:cluster="currentCluster.nameDisplay" :cluster="currentCluster.nameDisplay"
/> />
</h1> </h1>
<span <button
v-clean-tooltip="{ v-if="versionOptions.length && !isUpgradeInProgress"
content: canUpgrade ? t('harvester.upgradePage.upgradeAvailable') : t('harvester.upgradePage.upgradeUnavailable'), type="button"
triggers: ['hover', 'focus', 'touch'], class="btn bg-warning btn-sm"
}" @click="open"
class="upgrade-btn-wrap"
:tabindex="canUpgrade ? -1 : 0"
> >
<button <t k="harvester.upgradePage.upgrade" />
:disabled="!canUpgrade" </button>
type="button"
class="btn bg-warning btn-sm"
@click="open"
>
<t k="harvester.upgradePage.upgrade" />
</button>
</span>
</header> </header>
<ModalWithCard <ModalWithCard
@@ -310,18 +296,6 @@ export default {
line-height: 23px; line-height: 23px;
} }
.upgrade-btn-wrap {
display: inline-flex;
button {
color: #000 !important;
}
button:hover {
color: #000 !important;
}
}
.currentVersion { .currentVersion {
margin-top: 10px; margin-top: 10px;
display: flex; display: flex;
+63 -442
View File
@@ -1,6 +1,7 @@
<script> <script>
import { allHash } from '@shell/utils/promise'; import { allHash } from '@shell/utils/promise';
import debounce from 'lodash/debounce'; import debounce from 'lodash/debounce';
import Socket, { import Socket, {
EVENT_CONNECTED, EVENT_CONNECTED,
EVENT_CONNECTING, EVENT_CONNECTING,
@@ -21,98 +22,74 @@ export default {
data() { data() {
return { return {
socket: null, socket: null,
terminal: null, terminal: null,
textDecoder: null, fitAddon: null,
fitAddon: null, searchAddon: null,
searchAddon: null, webglAddon: null,
webglAddon: null, isOpen: false,
onResize: null, isOpening: false,
isOpen: false, backlog: [],
isOpening: false, firstTime: true,
backlog: [], queue: []
firstTime: true,
queue: [],
isDraining: false,
drainScheduled: false,
drainTimer: null,
showSearch: false,
searchQuery: '',
searchOptions: {
caseSensitive: false,
regex: false,
wholeWord: false,
incremental: true,
decorations: {
matchBackground: '#B45309',
matchBorder: '#FDBA74',
matchOverviewRuler: '#FDBA74',
activeMatchBackground: '#EA580C',
activeMatchBorder: '#FED7AA',
activeMatchColorOverviewRuler: '#FED7AA',
},
},
}; };
}, },
computed: { computed: {
serialConsoleUrl() {
return this.value?.getSerialConsolePath || '';
},
xtermConfig() { xtermConfig() {
return { return {
allowProposedApi: true, allowProposedApi: true,
cursorBlink: true, cursorBlink: true,
cursorStyle: 'bar',
cursorWidth: 2,
scrollback: 5000,
useStyle: true, useStyle: true,
fontFamily: 'JetBrains Mono, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace', fontSize: 12,
fontSize: 16,
lineHeight: 1.3,
}; };
}, },
}, },
watch: {
queue: {
handler: debounce(async function(neu) {
if (neu.length === 0) {
return;
}
const msg = await Promise.all(neu);
(msg || []).forEach((m) => {
this.terminal.write(m);
});
this.queue = [];
}, 10),
deep: true
}
},
beforeUnmount() { beforeUnmount() {
this.close(); this.close();
}, },
watch: {
serialConsoleUrl() {
if (this.terminal) {
this.connect();
}
},
},
async mounted() { async mounted() {
this.textDecoder = new TextDecoder('utf-8');
await this.setupTerminal(); await this.setupTerminal();
await this.connect(); await this.connect();
this.onResize = debounce(() => this.fit(), 100);
window.addEventListener('resize', this.onResize);
this.scheduleFit();
}, },
methods: { methods: {
async setupTerminal() { async setupTerminal() {
const docStyle = getComputedStyle(document.querySelector('body')); const docStyle = getComputedStyle(document.querySelector('body'));
const xterm = await import(/* webpackChunkName: "xterm" */ '@xterm/xterm'); const xterm = await import(/* webpackChunkName: "xterm" */ 'xterm');
const addons = await allHash({ const addons = await allHash({
fit: import(/* webpackChunkName: "xterm" */ '@xterm/addon-fit'), fit: import(/* webpackChunkName: "xterm" */ 'xterm-addon-fit'),
webgl: import(/* webpackChunkName: "xterm" */ '@xterm/addon-webgl'), webgl: import(/* webpackChunkName: "xterm" */ 'xterm-addon-webgl'),
weblinks: import(/* webpackChunkName: "xterm" */ '@xterm/addon-web-links'), weblinks: import(/* webpackChunkName: "xterm" */ 'xterm-addon-web-links'),
search: import(/* webpackChunkName: "xterm" */ '@xterm/addon-search'), search: import(/* webpackChunkName: "xterm" */ 'xterm-addon-search'),
canvas: import(/* webpackChunkName: "xterm" */ '@xterm/addon-canvas'),
}); });
const terminal = new xterm.Terminal({ const terminal = new xterm.Terminal({
theme: { theme: {
background: docStyle.getPropertyValue('--terminal-bg').trim(), background: docStyle.getPropertyValue('--terminal-bg').trim(),
cursor: docStyle.getPropertyValue('--terminal-text').trim(), cursor: docStyle.getPropertyValue('--terminal-cursor').trim(),
foreground: docStyle.getPropertyValue('--terminal-text').trim() foreground: docStyle.getPropertyValue('--terminal-text').trim()
}, },
...this.xtermConfig, ...this.xtermConfig,
@@ -120,48 +97,25 @@ export default {
this.fitAddon = new addons.fit.FitAddon(); this.fitAddon = new addons.fit.FitAddon();
this.searchAddon = new addons.search.SearchAddon(); this.searchAddon = new addons.search.SearchAddon();
try {
this.webglAddon = new addons.webgl.WebGlAddon();
} catch (e) {
// Some browsers (Safari) don't support the webgl renderer, so don't use it.
this.webglAddon = null;
}
terminal.loadAddon(this.fitAddon); terminal.loadAddon(this.fitAddon);
terminal.loadAddon(this.searchAddon); terminal.loadAddon(this.searchAddon);
terminal.loadAddon(new addons.weblinks.WebLinksAddon()); terminal.loadAddon(new addons.weblinks.WebLinksAddon());
terminal.open(this.$refs.xterm); terminal.open(this.$refs.xterm);
// The webgl renderer can fail without throwing: the context may be lost if ( this.webglAddon ) {
// mid-session, or it can attach but silently never paint, leaving the
// terminal's helper textarea at 0x0. Detect both cases and fall back to the
// canvas renderer so the terminal stays interactive.
try {
this.webglAddon = new addons.webgl.WebglAddon();
this.webglAddon.onContextLoss(() => {
if (!this.isUnmounted && this.terminal) {
this.fallbackToCanvas(terminal, addons);
}
});
terminal.loadAddon(this.webglAddon); terminal.loadAddon(this.webglAddon);
// Detect the silent "attaches but never paints" failure after a render frame.
requestAnimationFrame(() => {
if (this.isUnmounted || !this.terminal) {
return;
}
const textarea = this.$refs.xterm?.querySelector('.xterm-helper-textarea');
const hasPainted = textarea && textarea.getBoundingClientRect().height > 0;
if (this.webglAddon && !hasPainted) {
this.fallbackToCanvas(terminal, addons);
this.fit();
}
});
} catch (e) {
// Some browsers (e.g. Safari) don't support the webgl renderer, so don't use it.
this.fallbackToCanvas(terminal, addons);
} }
this.fit(); this.fit();
this.flush(); this.flush();
this.scheduleDrainQueue();
terminal.onData((input) => { terminal.onData((input) => {
const msg = this.str2ab(input); const msg = this.str2ab(input);
@@ -169,132 +123,9 @@ export default {
this.write(msg); this.write(msg);
}); });
terminal.attachCustomKeyEventHandler((event) => {
const key = event.key?.toLowerCase();
if ((event.ctrlKey || event.metaKey) && key === 'f') {
event.preventDefault();
this.openSearch();
return false;
}
if (key === 'escape' && this.showSearch) {
event.preventDefault();
this.closeSearch();
return false;
}
return true;
});
this.terminal = terminal; this.terminal = terminal;
}, },
openSearch() {
this.showSearch = true;
this.$nextTick(() => {
const input = this.$refs.searchInput;
if (input) {
input.focus();
input.select();
}
});
},
closeSearch() {
this.showSearch = false;
this.searchQuery = '';
this.clearSearchHighlights();
this.terminal?.focus();
},
clearSearchHighlights() {
this.searchAddon?.clearActiveDecoration();
this.searchAddon?.clearDecorations();
this.terminal?.clearSelection();
// Disposing the search decorations doesn't repaint the webgl/canvas
// layer, so force a refresh to remove the lingering highlight.
if (this.terminal) {
this.terminal.refresh(0, this.terminal.rows - 1);
}
},
findNext() {
if (!this.searchAddon || !this.searchQuery) {
return;
}
this.searchAddon.findNext(this.searchQuery, this.searchOptions);
},
findPrevious() {
if (!this.searchAddon || !this.searchQuery) {
return;
}
this.searchAddon.findPrevious(this.searchQuery, this.searchOptions);
},
onSearchInput() {
if (!this.searchQuery) {
this.clearSearchHighlights();
return;
}
this.findNext();
},
onSearchKeydown(event) {
if (event.key === 'Enter') {
event.preventDefault();
if (event.shiftKey) {
this.findPrevious();
} else {
this.findNext();
}
}
if (event.key === 'Escape') {
event.preventDefault();
this.closeSearch();
}
},
scheduleFit() {
this.$nextTick(() => {
requestAnimationFrame(() => {
this.fit();
// Re-fit after layout settles to avoid undersized rows on first paint.
setTimeout(() => this.fit(), 120);
});
});
},
// Dispose the webgl renderer (if any) and switch to the canvas renderer.
// Used when webgl fails to construct, loses its context, or silently never paints.
fallbackToCanvas(terminal, addons) {
if (this.isUnmounted) {
return;
}
this.webglAddon?.dispose();
this.webglAddon = null;
if (!this.canvasAddon) {
this.canvasAddon = new addons.canvas.CanvasAddon();
terminal.loadAddon(this.canvasAddon);
}
this.fit();
},
str2ab(str) { str2ab(str) {
const enc = new TextEncoder(); const enc = new TextEncoder();
@@ -309,131 +140,12 @@ export default {
} }
}, },
enqueueMessage(messagePromise) {
this.queue.push(messagePromise);
this.scheduleDrainQueue();
},
scheduleDrainQueue() {
if (this.drainScheduled || this.isDraining || !this.terminal) {
return;
}
this.drainScheduled = true;
const shouldDrainImmediately = this.queue.length <= 3;
const runDrain = () => {
this.drainScheduled = false;
this.drainTimer = null;
this.drainQueue();
};
if (shouldDrainImmediately) {
runDrain();
return;
}
this.drainTimer = requestAnimationFrame(runDrain);
},
async decodeMessageData(data) {
if (typeof data === 'string') {
return data;
}
if (!this.textDecoder) {
this.textDecoder = new TextDecoder('utf-8');
}
if (data instanceof Blob) {
const buffer = await data.arrayBuffer();
return this.textDecoder.decode(new Uint8Array(buffer), { stream: true });
}
if (data instanceof ArrayBuffer) {
return this.textDecoder.decode(new Uint8Array(data), { stream: true });
}
if (ArrayBuffer.isView(data)) {
const view = data;
const bytes = new Uint8Array(view.buffer, view.byteOffset, view.byteLength);
return this.textDecoder.decode(bytes, { stream: true });
}
return String(data || '');
},
async drainQueue() {
if (this.isDraining || !this.terminal) {
return;
}
this.isDraining = true;
try {
while (this.queue.length > 0) {
const pendingMessages = this.queue.splice(0, this.queue.length);
const settledMessages = await Promise.allSettled(pendingMessages);
const messages = settledMessages
.filter((result) => result.status === 'fulfilled')
.map((result) => result.value);
const output = messages.filter(Boolean).join('');
if (output) {
await this.writeOutputInChunks(output);
}
if (this.queue.length > 0) {
await this.nextFrame();
}
}
} finally {
this.isDraining = false;
// If data arrived between the last while-check and releasing the lock,
// immediately schedule another drain so output never gets stuck.
if (this.queue.length > 0 && this.terminal) {
this.scheduleDrainQueue();
}
}
},
async writeOutputInChunks(output) {
if (!output) {
return;
}
const chunkSize = output.length > 20000 ? 16000 : output.length > 8000 ? 8000 : output.length;
if (chunkSize === output.length) {
this.terminal.write(output);
return;
}
for (let index = 0; index < output.length; index += chunkSize) {
this.terminal.write(output.slice(index, index + chunkSize));
if (index + chunkSize < output.length) {
await this.nextFrame();
}
}
},
nextFrame() {
return new Promise((resolve) => requestAnimationFrame(resolve));
},
clear() { clear() {
this.terminal.clear(); this.terminal.clear();
}, },
getSocketUrl() { getSocketUrl() {
return this.serialConsoleUrl; return `${ this.value?.getSerialConsolePath }`;
}, },
async connect() { async connect() {
@@ -469,7 +181,6 @@ export default {
this.fit(); this.fit();
this.flush(); this.flush();
} }
this.scheduleFit();
if (this.firstTime) { if (this.firstTime) {
this.socket.send(this.str2ab('\n')); this.socket.send(this.str2ab('\n'));
@@ -484,7 +195,7 @@ export default {
}); });
this.socket.addEventListener(EVENT_MESSAGE, (e) => { this.socket.addEventListener(EVENT_MESSAGE, (e) => {
this.enqueueMessage(this.decodeMessageData(e.detail.data)); this.queue.push(e.detail.data.text());
}); });
this.socket.connect(); this.socket.connect();
@@ -507,19 +218,22 @@ export default {
} }
this.fitAddon.fit(); this.fitAddon.fit();
const { rows, cols } = this.fitAddon.proposeDimensions();
if ( !this.isOpen ) {
return;
}
const message = JSON.stringify({
Width: cols,
Height: rows
});
this.socket.send(this.str2ab(message));
}, },
close() { close() {
if (this.onResize) {
window.removeEventListener('resize', this.onResize);
this.onResize = null;
}
if (this.drainTimer) {
cancelAnimationFrame(this.drainTimer);
this.drainTimer = null;
}
if ( this.socket ) { if ( this.socket ) {
this.socket.disconnect(); this.socket.disconnect();
} }
@@ -534,44 +248,6 @@ export default {
<template> <template>
<div class="harvester-shell-container"> <div class="harvester-shell-container">
<div
v-if="showSearch"
class="shell-search"
>
<input
ref="searchInput"
v-model="searchQuery"
type="text"
class="shell-search-input"
placeholder="Search in terminal"
@input="onSearchInput"
@keydown="onSearchKeydown"
>
<button
class="btn role-secondary btn-sm shell-search-btn"
type="button"
title="Shift+Enter"
@click="findPrevious"
>
Prev
</button>
<button
class="btn role-secondary btn-sm shell-search-btn"
type="button"
title="Enter"
@click="findNext"
>
Next
</button>
<button
class="btn role-secondary btn-sm shell-search-btn"
type="button"
title="Esc"
@click="closeSearch"
>
Close
</button>
</div>
<div <div
ref="xterm" ref="xterm"
class="shell-body" class="shell-body"
@@ -581,73 +257,18 @@ export default {
</template> </template>
<style lang="scss"> <style lang="scss">
@import '../../../../node_modules/@xterm/xterm/css/xterm.css'; @import '../../../../node_modules/xterm/css/xterm.css';
body, #__nuxt, #__layout, MAIN { body, #__nuxt, #__layout, MAIN {
height: 100%; height: 100%;
} }
.harvester-shell-container { .harvester-shell-container {
display: flex;
flex-direction: column;
position: relative;
height: 100%; height: 100%;
min-height: 0;
overflow: hidden; overflow: hidden;
.resize-observer { .shell-body, .terminal.xterm {
display: none;
}
.shell-search {
display: flex;
align-items: center;
gap: 8px;
justify-content: flex-end;
position: absolute;
top: 8px;
right: 10px;
z-index: 5;
padding: 8px;
border-radius: 6px;
border: 1px solid var(--border);
background: color-mix(in srgb, var(--body-bg) 88%, transparent);
}
.shell-search-input {
min-width: 220px;
max-width: 420px;
flex: 0 1 320px;
border: 1px solid var(--border);
border-radius: 4px;
background: var(--body-bg);
color: var(--body-text);
padding: 6px 8px;
}
.shell-search-btn {
min-width: 64px;
}
.shell-body {
flex: 1 1 auto;
height: 100%; height: 100%;
width: 100%;
min-height: 0;
padding: 0 10px;
box-sizing: border-box;
}
.terminal.xterm,
.terminal.xterm .xterm-viewport,
.terminal.xterm .xterm-screen,
.terminal.xterm .xterm-scrollable-element {
width: 100%;
height: 100%;
}
.terminal.xterm .xterm-scrollable-element {
min-height: 100%;
} }
} }
</style> </style>
+14 -21
View File
@@ -10,7 +10,6 @@ import { docLink } from '../utils/feature-flags';
const CATEGORY = { const CATEGORY = {
ui: [ ui: [
'branding', 'branding',
HCI_SETTING.SERVER_FLAVOR,
'ui-source', 'ui-source',
'ui-index', 'ui-index',
] ]
@@ -54,7 +53,7 @@ export default {
}; };
}, },
computed: { ...mapGetters({ t: 'i18n/t', isHarvesterPrime: 'harvester-common/isHarvesterPrime' }) }, computed: { ...mapGetters({ t: 'i18n/t' }) },
watch: { watch: {
settings: { settings: {
@@ -232,21 +231,14 @@ export default {
v-if="setting.customized" v-if="setting.customized"
class="modified" class="modified"
> >
{{ t('advancedSettings.tags.modified.label') }} Modified
</span> </span>
<span <span
v-if="setting.experimental" v-if="setting.experimental"
v-clean-tooltip="t('advancedSettings.tags.experimental.description')" v-clean-tooltip="t('advancedSettings.experimental')"
class="experimental" class="experimental"
> >
{{ t('advancedSettings.tags.experimental.label') }} Experimental
</span>
<span
v-if="setting.preview"
v-clean-tooltip="t('advancedSettings.tags.preview.description')"
class="preview"
>
{{ t('advancedSettings.tags.preview.label') }}
</span> </span>
</h1> </h1>
<h2 v-clean-html="t(setting.description, getDocLinkParams(setting) || {}, true)"> <h2 v-clean-html="t(setting.description, getDocLinkParams(setting) || {}, true)">
@@ -270,8 +262,7 @@ export default {
v-if="!setting.hide" v-if="!setting.hide"
class="settings-value" class="settings-value"
> >
<pre v-if="setting.id === 'branding' && isHarvesterPrime">{{ $store.getters['harvester-common/privateLabel'] }}</pre> <pre v-if="setting.kind === 'json'">{{ setting.json }}</pre>
<pre v-else-if="setting.kind === 'json'">{{ setting.json }}</pre>
<pre v-else-if="setting.kind === 'multiline'">{{ setting.data.value || setting.data.default }}</pre> <pre v-else-if="setting.kind === 'multiline'">{{ setting.data.value || setting.data.default }}</pre>
<pre v-else-if="setting.kind === 'enum'">{{ t(setting.enum) }}</pre> <pre v-else-if="setting.kind === 'enum'">{{ t(setting.enum) }}</pre>
<pre v-else-if="setting.kind === 'custom' && setting.custom">{{ setting.custom }}</pre> <pre v-else-if="setting.kind === 'custom' && setting.custom">{{ setting.custom }}</pre>
@@ -361,19 +352,21 @@ export default {
flex: 1; flex: 1;
} }
.modified, .modified {
.experimental,
.preview {
margin-left: 10px; margin-left: 10px;
border: 1px solid; border: 1px solid var(--primary);
border-radius: 5px; border-radius: 5px;
padding: 2px 10px; padding: 2px 10px;
font-size: 12px; font-size: 12px;
} }
.modified { border-color: var(--primary); } .experimental {
.experimental { border-color: var(--error); } margin-left: 10px;
.preview { border-color: var(--warning); } border: 1px solid var(--error);
border-radius: 5px;
padding: 2px 10px;
font-size: 12px;
}
.no-search-match { .no-search-match {
text-align: center; text-align: center;
+1 -5
View File
@@ -55,10 +55,6 @@ export default {
const host = window.location.host; const host = window.location.host;
const prefix = window.location.pathname.replace(this.$route.path, ''); const prefix = window.location.pathname.replace(this.$route.path, '');
const params = this.$route?.params; const params = this.$route?.params;
const popupWidth = Math.max(800, screen.width - 200);
const popupHeight = Math.max(600, screen.height - 200);
const popupLeft = Math.max(0, window.screenX + Math.floor((window.outerWidth - popupWidth) / 2));
const popupTop = Math.max(0, window.screenY + Math.floor((window.outerHeight - popupHeight) / 2));
const url = `https://${ host }${ prefix }/${ PRODUCT_NAME }/c/${ params.cluster }/console/${ uid }/${ type }`; const url = `https://${ host }${ prefix }/${ PRODUCT_NAME }/c/${ params.cluster }/console/${ uid }/${ type }`;
@@ -67,7 +63,7 @@ export default {
window.open( window.open(
url, url,
'_blank', '_blank',
`toolbars=0,width=${ popupWidth },height=${ popupHeight },left=${ popupLeft },top=${ popupTop },noreferrer` `toolbars=0,width=${ screen.width - 200 },height=${ screen.height - 200 },left=0,top=0,noreferrer`
); );
}); });
}, },
@@ -19,8 +19,7 @@ export default {
<div class="row mb-20"> <div class="row mb-20">
<div class="col span-12"> <div class="col span-12">
<FileSelector <FileSelector
variant="primary" class="btn btn-sm bg-primary mb-10"
class="mb-10"
:label="t('generic.readFromFile')" :label="t('generic.readFromFile')"
@selected="onKeySelected" @selected="onKeySelected"
/> />
@@ -191,8 +191,7 @@ export default {
> >
<div class="col span-12"> <div class="col span-12">
<FileSelector <FileSelector
variant="primary" class="btn btn-sm bg-primary mb-10"
class="mb-10"
:label="t('generic.readFromFile')" :label="t('generic.readFromFile')"
@selected="onKeySelected" @selected="onKeySelected"
/> />
@@ -214,7 +213,9 @@ $yaml-height: 540px;
:deep() .yaml-editor{ :deep() .yaml-editor{
flex: 1; flex: 1;
min-height: $yaml-height; min-height: $yaml-height;
& .code-mirror .cm-editor { & .code-mirror .CodeMirror {
position: initial;
height: auto;
min-height: $yaml-height; min-height: $yaml-height;
} }
} }
@@ -3,7 +3,7 @@ import { LabeledInput } from '@components/Form/LabeledInput';
import LabeledSelect from '@shell/components/form/LabeledSelect.vue'; import LabeledSelect from '@shell/components/form/LabeledSelect.vue';
import { RadioGroup } from '@components/Form/Radio'; import { RadioGroup } from '@components/Form/Radio';
import ArrayList from '@shell/components/form/ArrayList'; import ArrayList from '@shell/components/form/ArrayList';
import { isValidCIDR } from '@pkg/harvester/utils/regular'; import { isValidCIDR } from '@shell/utils/validators/cidr';
import { _EDIT } from '@shell/config/query-params'; import { _EDIT } from '@shell/config/query-params';
import { Banner } from '@components/Banner'; import { Banner } from '@components/Banner';
import { allHash } from '@shell/utils/promise'; import { allHash } from '@shell/utils/promise';
@@ -62,8 +62,7 @@ export default {
<div class="chooseFile"> <div class="chooseFile">
<FileSelector <FileSelector
:include-file-name="true" :include-file-name="true"
variant="primary" class="btn btn-sm bg-primary mr-20"
class="mr-20"
label="Choose File" label="Choose File"
@selected="onKeySelectedCa('publicCertificate', $event)" @selected="onKeySelectedCa('publicCertificate', $event)"
/> />
@@ -81,8 +80,7 @@ export default {
<div class="chooseFile"> <div class="chooseFile">
<FileSelector <FileSelector
:include-file-name="true" :include-file-name="true"
variant="primary" class="btn btn-sm bg-primary mr-20"
class="mr-20"
label="Choose File" label="Choose File"
@selected="onKeySelectedCa('privateKey', $event)" @selected="onKeySelectedCa('privateKey', $event)"
/> />
@@ -100,8 +98,7 @@ export default {
<div class="chooseFile"> <div class="chooseFile">
<FileSelector <FileSelector
:include-file-name="true" :include-file-name="true"
variant="primary" class="btn btn-sm bg-primary mr-20"
class="mr-20"
label="Choose File" label="Choose File"
@selected="onKeySelectedCa('ca', $event)" @selected="onKeySelectedCa('ca', $event)"
/> />
@@ -3,7 +3,7 @@ import { LabeledInput } from '@components/Form/LabeledInput';
import LabeledSelect from '@shell/components/form/LabeledSelect.vue'; import LabeledSelect from '@shell/components/form/LabeledSelect.vue';
import { RadioGroup } from '@components/Form/Radio'; import { RadioGroup } from '@components/Form/Radio';
import ArrayList from '@shell/components/form/ArrayList'; import ArrayList from '@shell/components/form/ArrayList';
import { isValidCIDR } from '@pkg/harvester/utils/regular'; import { isValidCIDR } from '@shell/utils/validators/cidr';
import { _EDIT } from '@shell/config/query-params'; import { _EDIT } from '@shell/config/query-params';
import { Banner } from '@components/Banner'; import { Banner } from '@components/Banner';
import Tip from '@shell/components/Tip'; import Tip from '@shell/components/Tip';
@@ -5,7 +5,7 @@ import { RadioGroup } from '@components/Form/Radio';
import { Banner } from '@components/Banner'; import { Banner } from '@components/Banner';
import ArrayList from '@shell/components/form/ArrayList'; import ArrayList from '@shell/components/form/ArrayList';
import { allHash } from '@shell/utils/promise'; import { allHash } from '@shell/utils/promise';
import { isValidCIDR } from '@pkg/harvester/utils/regular'; import { isValidCIDR } from '@shell/utils/validators/cidr';
import { NODE } from '@shell/config/types'; import { NODE } from '@shell/config/types';
import { _EDIT } from '@shell/config/query-params'; import { _EDIT } from '@shell/config/query-params';
import { HCI } from '../../types'; import { HCI } from '../../types';
@@ -7,15 +7,9 @@ import { STORAGE_CLASS, NETWORK_ATTACHMENT } from '@shell/config/types';
import { useI18n } from '@shell/composables/useI18n'; import { useI18n } from '@shell/composables/useI18n';
import { randomStr } from '@shell/utils/string'; import { randomStr } from '@shell/utils/string';
import { HCI } from '../../types'; import { HCI } from '../../types';
import { VOLUME_MODE, ACCESS_MODE } from '../../config/types';
import { FORKLIFT_NAMESPACE } from '../../config/harvester-map'; import { FORKLIFT_NAMESPACE } from '../../config/harvester-map';
import { buildNetworkMapEntries, buildStorageMapEntries } from '../../utils/forklift'; import { buildNetworkMapEntries, buildStorageMapEntries } from '../../utils/forklift';
import { isInternalStorageClass } from '../../utils/storage-class';
import MappingColumn from './MappingColumn.vue'; import MappingColumn from './MappingColumn.vue';
import StorageDefaultsModal from './StorageDefaultsModal.vue';
const DEFAULT_VOLUME_MODE = VOLUME_MODE.FILE_SYSTEM;
const DEFAULT_ACCESS_MODE = ACCESS_MODE?.READ_WRITE_MANY ?? 'ReadWriteMany';
const props = defineProps({ const props = defineProps({
providerName: { type: String, default: '' }, providerName: { type: String, default: '' },
@@ -40,10 +34,6 @@ const allStorageMaps = ref([]);
const errors = ref([]); const errors = ref([]);
const loading = ref(true); const loading = ref(true);
// Storage defaults edit modal state.
const showStorageDefaultsModal = ref(false);
const editingStorageEntry = ref(null);
const { networkEntries, storageEntries } = toRefs(props.stepData); const { networkEntries, storageEntries } = toRefs(props.stepData);
const NAMESPACE = FORKLIFT_NAMESPACE; const NAMESPACE = FORKLIFT_NAMESPACE;
@@ -66,22 +56,10 @@ const harvesterNetworkOptions = computed(() => {
}); });
const storageClassOptions = computed(() => { const storageClassOptions = computed(() => {
const options = storageClasses.value.filter((s) => !s.parameters?.backingImage).map((sc) => { const options = storageClasses.value.map((sc) => ({
const value = sc.name; label: sc.metadata?.name || sc.id,
let label = sc.isDefault ? `${ value } (${ t('generic.default') })` : value; value: sc.metadata?.name || sc.id,
let disabled = false; }));
if (isInternalStorageClass(value)) {
label += ` (${ t('harvester.storage.internal.label') })`;
disabled = true;
}
return {
label,
value,
disabled,
};
});
if (!options.find((o) => o.value === 'harvester-longhorn')) { if (!options.find((o) => o.value === 'harvester-longhorn')) {
options.unshift({ label: 'harvester-longhorn', value: 'harvester-longhorn' }); options.unshift({ label: 'harvester-longhorn', value: 'harvester-longhorn' });
@@ -114,7 +92,7 @@ const applyNetworkMapTargets = (mapSpec) => {
}); });
}; };
const applyStorageMapTargets = (mapSpec, { markOverridden = false, captureInherited = false } = {}) => { const applyStorageMapTargets = (mapSpec) => {
if (!mapSpec) { if (!mapSpec) {
return; return;
} }
@@ -126,30 +104,6 @@ const applyStorageMapTargets = (mapSpec, { markOverridden = false, captureInheri
if (match?.destination?.storageClass) { if (match?.destination?.storageClass) {
entry.target = match.destination.storageClass; entry.target = match.destination.storageClass;
if (captureInherited) {
entry.inheritedFromProvider = true;
}
if (match.destination.volumeMode) {
entry.volumeMode = match.destination.volumeMode;
if (captureInherited) {
entry.inheritedVolumeMode = match.destination.volumeMode;
}
}
if (match.destination.accessMode) {
entry.accessModes = [match.destination.accessMode];
if (captureInherited) {
entry.inheritedAccessModes = [match.destination.accessMode];
}
}
if (markOverridden) {
entry.overridden = true;
}
} }
}); });
}; };
@@ -167,39 +121,12 @@ const applyDefaultStorageMap = () => {
(sm) => sm.metadata.name === `${ props.providerName }-storage-map-default` (sm) => sm.metadata.name === `${ props.providerName }-storage-map-default`
); );
applyStorageMapTargets(defaultMap?.spec?.map, { captureInherited: true }); applyStorageMapTargets(defaultMap?.spec?.map);
}; };
const allNetworksMapped = computed(() => networkEntries.value.length > 0 && networkEntries.value.every((e) => !!e.target)); const allNetworksMapped = computed(() => networkEntries.value.length > 0 && networkEntries.value.every((e) => !!e.target));
const allStorageMapped = computed(() => storageEntries.value.length > 0 && storageEntries.value.every((e) => !!e.target)); const allStorageMapped = computed(() => storageEntries.value.length > 0 && storageEntries.value.every((e) => !!e.target));
// The "Inherited from provider" hint only appears in the migration plan wizard
// (where mappings inherit from the provider default), not on the provider creation page.
const inheritedProviderName = computed(() => (props.useAllProviderData ? '' : props.providerName));
const openStorageDefaults = (entry) => {
editingStorageEntry.value = entry;
showStorageDefaultsModal.value = true;
};
const closeStorageDefaults = () => {
showStorageDefaultsModal.value = false;
editingStorageEntry.value = null;
};
const applyStorageDefaults = ({ volumeMode, accessModes }) => {
if (editingStorageEntry.value) {
editingStorageEntry.value.volumeMode = volumeMode;
editingStorageEntry.value.accessModes = accessModes;
const inheritedVolumeMode = editingStorageEntry.value.inheritedVolumeMode;
const inheritedAccessMode = editingStorageEntry.value.inheritedAccessModes?.[0];
const selectedAccessMode = accessModes?.[0];
editingStorageEntry.value.overridden = volumeMode !== inheritedVolumeMode || selectedAccessMode !== inheritedAccessMode;
}
};
const canSave = computed(() => { const canSave = computed(() => {
if (props.useAllProviderData) { if (props.useAllProviderData) {
return true; return true;
@@ -262,19 +189,13 @@ const buildStorageEntries = () => {
if (ds && ds.id) { if (ds && ds.id) {
if (!datastoreMap[ds.id]) { if (!datastoreMap[ds.id]) {
datastoreMap[ds.id] = { datastoreMap[ds.id] = {
name: ds.name || t('harvester.addons.vmMigration.generic.unknown'), name: ds.name || t('harvester.addons.vmMigration.generic.unknown'),
id: ds.id, id: ds.id,
type: ds.type || '', type: ds.type || '',
capacity: 0, capacity: 0,
target: '', target: '',
volumeMode: DEFAULT_VOLUME_MODE, usedBy: [],
accessModes: [DEFAULT_ACCESS_MODE], _key: `stor-${ ds.id }`,
inheritedVolumeMode: DEFAULT_VOLUME_MODE,
inheritedAccessModes: [DEFAULT_ACCESS_MODE],
inheritedFromProvider: false,
overridden: false,
usedBy: [],
_key: `stor-${ ds.id }`,
}; };
} }
@@ -304,19 +225,13 @@ const buildNetworkEntriesFromProvider = (networksData) => {
const buildStorageEntriesFromProvider = (datastoresData) => { const buildStorageEntriesFromProvider = (datastoresData) => {
storageEntries.value = (Array.isArray(datastoresData) ? datastoresData : []).map((ds) => ({ storageEntries.value = (Array.isArray(datastoresData) ? datastoresData : []).map((ds) => ({
name: ds.name || ds.id, name: ds.name || ds.id,
id: ds.id || '', id: ds.id || '',
type: ds.type || '', type: ds.type || '',
capacity: ds.capacity || 0, capacity: ds.capacity || 0,
target: '', target: '',
volumeMode: DEFAULT_VOLUME_MODE, usedBy: [],
accessModes: [DEFAULT_ACCESS_MODE], _key: `stor-${ ds.id || ds.name }`,
inheritedVolumeMode: DEFAULT_VOLUME_MODE,
inheritedAccessModes: [DEFAULT_ACCESS_MODE],
inheritedFromProvider: false,
overridden: false,
usedBy: [],
_key: `stor-${ ds.id || ds.name }`,
})); }));
}; };
@@ -533,7 +448,7 @@ const init = async() => {
if (!hasExistingStorageTargets) { if (!hasExistingStorageTargets) {
if (props.existingStorageMap?.spec?.map) { if (props.existingStorageMap?.spec?.map) {
applyStorageMapTargets(props.existingStorageMap.spec.map, { markOverridden: true }); applyStorageMapTargets(props.existingStorageMap.spec.map);
} else { } else {
applyDefaultStorageMap(); applyDefaultStorageMap();
} }
@@ -583,9 +498,6 @@ init();
:placeholder="t('harvester.addons.vmMigration.configureMappings.storageMapping.placeholder')" :placeholder="t('harvester.addons.vmMigration.configureMappings.storageMapping.placeholder')"
:show-used-by="!useAllProviderData" :show-used-by="!useAllProviderData"
:clearable="useAllProviderData" :clearable="useAllProviderData"
:show-volume-settings="true"
:inherited-provider-name="inheritedProviderName"
@edit-defaults="openStorageDefaults"
> >
<template #source-detail="{ entry }"> <template #source-detail="{ entry }">
<span <span
@@ -595,19 +507,6 @@ init();
</template> </template>
</MappingColumn> </MappingColumn>
</div> </div>
<StorageDefaultsModal
v-if="showStorageDefaultsModal && editingStorageEntry"
:storage-class-name="editingStorageEntry.target"
:provider-name="providerName"
:show-inherited="!!inheritedProviderName"
:volume-mode="editingStorageEntry.volumeMode"
:access-modes="editingStorageEntry.accessModes"
:inherited-volume-mode="editingStorageEntry.inheritedVolumeMode"
:inherited-access-modes="editingStorageEntry.inheritedAccessModes"
@apply="applyStorageDefaults"
@close="closeStorageDefaults"
/>
</div> </div>
</template> </template>
@@ -42,7 +42,6 @@ const {
username, username,
password, password,
skipTlsVerify, skipTlsVerify,
vddkInitImage,
testPassed, testPassed,
testResult, testResult,
testError, testError,
@@ -98,7 +97,6 @@ watch(selectedProvider, (val) => {
username.value = ''; username.value = '';
password.value = ''; password.value = '';
skipTlsVerify.value = false; skipTlsVerify.value = false;
vddkInitImage.value = '';
createdProvider.value = null; createdProvider.value = null;
createdSecret.value = null; createdSecret.value = null;
} else { } else {
@@ -109,7 +107,6 @@ watch(selectedProvider, (val) => {
if (provider) { if (provider) {
providerName.value = provider.metadata.name; providerName.value = provider.metadata.name;
url.value = provider.spec?.url || ''; url.value = provider.spec?.url || '';
vddkInitImage.value = provider.spec?.settings?.vddkInitImage || '';
const secretRef = provider.spec?.secret; const secretRef = provider.spec?.secret;
@@ -242,18 +239,6 @@ const testConnection = async(buttonCb) => {
if (props.editMode && createdProvider.value) { if (props.editMode && createdProvider.value) {
try { try {
createdProvider.value.spec.url = url.value; createdProvider.value.spec.url = url.value;
const vddkImage = vddkInitImage.value?.trim();
if (vddkImage) {
createdProvider.value.spec.settings = {
...(createdProvider.value.spec.settings || {}),
vddkInitImage: vddkImage,
};
} else if (createdProvider.value.spec.settings) {
delete createdProvider.value.spec.settings.vddkInitImage;
}
await createdProvider.value.save(); await createdProvider.value.save();
const secretRef = createdProvider.value.spec?.secret; const secretRef = createdProvider.value.spec?.secret;
@@ -298,28 +283,20 @@ const testConnection = async(buttonCb) => {
const namespace = FORKLIFT_NAMESPACE; const namespace = FORKLIFT_NAMESPACE;
const secretName = `${ providerName.value }-creds-${ randomStr(4).toLowerCase() }`; const secretName = `${ providerName.value }-creds-${ randomStr(4).toLowerCase() }`;
const spec = {
type: 'vsphere',
url: url.value,
secret: {
name: secretName,
namespace,
},
};
const vddkImage = vddkInitImage.value?.trim();
if (vddkImage) {
spec.settings = { vddkInitImage: vddkImage };
}
const provider = await store.dispatch(`${ inStore }/create`, { const provider = await store.dispatch(`${ inStore }/create`, {
type: HCI.FORKLIFT_PROVIDER, type: HCI.FORKLIFT_PROVIDER,
metadata: { metadata: {
name: providerName.value, name: providerName.value,
namespace, namespace,
}, },
spec, spec: {
type: 'vsphere',
url: url.value,
secret: {
name: secretName,
namespace,
},
}
}); });
await provider.save(); await provider.save();
@@ -425,7 +402,6 @@ defineExpose({ testConnection, clickTestButton });
<div v-if="!createOnly && !editMode"> <div v-if="!createOnly && !editMode">
<LabeledSelect <LabeledSelect
v-model:value="selectedProvider" v-model:value="selectedProvider"
required
:label="t('harvester.addons.vmMigration.configureProvider.providerSelect')" :label="t('harvester.addons.vmMigration.configureProvider.providerSelect')"
:options="providerOptions" :options="providerOptions"
:reduce="(opt) => opt.value" :reduce="(opt) => opt.value"
@@ -443,28 +419,17 @@ defineExpose({ testConnection, clickTestButton });
/> />
</div> </div>
<div class="row"> <div>
<div class="col span-6"> <LabeledInput
<LabeledInput v-model:value="url"
v-model:value="url" :label="t('harvester.addons.vmMigration.configureProvider.urlLabel')"
:label="t('harvester.addons.vmMigration.configureProvider.urlLabel')" :placeholder="t('harvester.addons.vmMigration.configureProvider.urlPlaceholder')"
:placeholder="t('harvester.addons.vmMigration.configureProvider.urlPlaceholder')" :disabled="isExistingProvider && !editMode"
:disabled="isExistingProvider && !editMode" required
required />
/> <p class="text-deemphasized mt-5">
<p class="text-deemphasized mt-5"> {{ t('harvester.addons.vmMigration.configureProvider.urlHint') }}
{{ t('harvester.addons.vmMigration.configureProvider.urlHint') }} </p>
</p>
</div>
<div class="col span-6">
<LabeledInput
v-model:value="vddkInitImage"
:label="t('harvester.addons.vmMigration.configureProvider.vddkImageLabel')"
:placeholder="t('harvester.addons.vmMigration.configureProvider.vddkImagePlaceholder')"
:tooltip="t('harvester.addons.vmMigration.configureProvider.vddkImageTooltip')"
:disabled="isExistingProvider && !editMode"
/>
</div>
</div> </div>
<div class="row"> <div class="row">
@@ -1,33 +1,25 @@
<script setup> <script setup>
import { computed } from 'vue';
import { useStore } from 'vuex'; import { useStore } from 'vuex';
import LabeledSelect from '@shell/components/form/LabeledSelect'; import LabeledSelect from '@shell/components/form/LabeledSelect';
import { RcItemCard } from '@components/RcItemCard'; import { RcItemCard } from '@components/RcItemCard';
import { useI18n } from '@shell/composables/useI18n'; import { useI18n } from '@shell/composables/useI18n';
import { VOLUME_MODE } from '../../config/types';
const store = useStore(); const store = useStore();
const { t } = useI18n(store); const { t } = useI18n(store);
const props = defineProps({ const props = defineProps({
title: { type: String, required: true }, title: { type: String, required: true },
description: { type: String, default: '' }, description: { type: String, default: '' },
entries: { type: Array, default: () => [] }, entries: { type: Array, default: () => [] },
options: { type: Array, default: () => [] }, options: { type: Array, default: () => [] },
placeholder: { type: String, default: '' }, placeholder: { type: String, default: '' },
showUsedBy: { type: Boolean, default: false }, showUsedBy: { type: Boolean, default: false },
clearable: { type: Boolean, default: false }, clearable: { type: Boolean, default: false },
// Storage-specific: show the volume/access mode defaults row with an Edit action.
showVolumeSettings: { type: Boolean, default: false },
// When set, the defaults row shows an "Inherited from provider" hint (migration plan wizard only).
inheritedProviderName: { type: String, default: '' },
}); });
const emit = defineEmits(['edit-defaults']); const selectOptions = computed(() => {
if (!props.clearable) {
// Only offer "Remove Map" for entries that already have a target selected;
// entries without a selection just show the regular options.
const optionsFor = (entry) => {
if (!props.clearable || !entry.target) {
return props.options; return props.options;
} }
@@ -42,16 +34,14 @@ const optionsFor = (entry) => {
disabled: true, disabled: true,
kind: 'divider', kind: 'divider',
}, },
{
label: `${ props.placeholder }:`,
disabled: true,
kind: 'title',
},
...props.options, ...props.options,
]; ];
}; });
const formatModes = (entry) => {
const volumeMode = entry.volumeMode || VOLUME_MODE.FILE_SYSTEM;
const accessModes = (entry.accessModes || []).join(', ');
return t('harvester.addons.vmMigration.storageDefaults.summary', { volumeMode, accessModes });
};
</script> </script>
<template> <template>
@@ -95,35 +85,12 @@ const formatModes = (entry) => {
<div class="mapping-target"> <div class="mapping-target">
<LabeledSelect <LabeledSelect
v-model:value="entry.target" v-model:value="entry.target"
:options="optionsFor(entry)" :options="selectOptions"
:placeholder="placeholder+'...'" :placeholder="placeholder+'...'"
:searchable="true" :searchable="true"
/> />
</div> </div>
</div> </div>
<div
v-if="showVolumeSettings && entry.target"
class="storage-defaults-row"
>
<div class="storage-defaults">
<div class="storage-defaults-info">
<span class="storage-defaults-summary">{{ formatModes(entry) }}</span>
<span
v-if="inheritedProviderName && entry.inheritedFromProvider && !entry.overridden"
class="text-deemphasized storage-defaults-inherited"
>
{{ t('harvester.addons.vmMigration.storageDefaults.inherited', { provider: inheritedProviderName }) }}
</span>
</div>
<a
role="button"
class="storage-defaults-edit"
@click.prevent="emit('edit-defaults', entry)"
>
{{ t('harvester.addons.vmMigration.storageDefaults.edit') }}
</a>
</div>
</div>
<div v-if="showUsedBy && entry.usedBy && entry.usedBy.length"> <div v-if="showUsedBy && entry.usedBy && entry.usedBy.length">
<span class="used-by"> <span class="used-by">
{{ t('harvester.addons.vmMigration.generic.usedBy') }} <b>{{ entry.usedBy.join(', ') }}</b> {{ t('harvester.addons.vmMigration.generic.usedBy') }} <b>{{ entry.usedBy.join(', ') }}</b>
@@ -210,41 +177,6 @@ const formatModes = (entry) => {
line-height: 20px; line-height: 20px;
} }
.storage-defaults-row {
width: 100%;
}
.storage-defaults {
display: flex;
align-items: center;
justify-content: space-between;
gap: 12px;
padding: 8px 12px;
border-radius: 4px;
background-color: var(--body-bg);
.storage-defaults-info {
display: flex;
flex-direction: column;
min-width: 0;
}
.storage-defaults-summary {
font-size: 13px;
line-height: 20px;
}
.storage-defaults-inherited {
font-size: 12px;
line-height: 18px;
}
.storage-defaults-edit {
flex-shrink: 0;
cursor: pointer;
}
}
.bg-light-gray { .bg-light-gray {
background-color: var(--category-active) !important; background-color: var(--category-active) !important;
border: 0; border: 0;
@@ -2,14 +2,11 @@
import { ref, computed, watch } from 'vue'; import { ref, computed, watch } from 'vue';
import { useStore } from 'vuex'; import { useStore } from 'vuex';
import Loading from '@shell/components/Loading'; import Loading from '@shell/components/Loading';
import SortableTable from '@shell/components/SortableTable';
import { Banner } from '@components/Banner'; import { Banner } from '@components/Banner';
import { BadgeState } from '@components/BadgeState'; import { RcItemCard } from '@components/RcItemCard';
import { RcDropdown, RcDropdownItem, RcDropdownTrigger } from '@components/RcDropdown';
import { LabeledInput } from '@components/Form/LabeledInput'; import { LabeledInput } from '@components/Form/LabeledInput';
import LabeledSelect from '@shell/components/form/LabeledSelect'; import MappingsCell from '../MappingsCell';
import { useI18n } from '@shell/composables/useI18n'; import { useI18n } from '@shell/composables/useI18n';
import { NAMESPACE } from '@shell/config/types';
import { HCI } from '../../types'; import { HCI } from '../../types';
import { FORKLIFT_NAMESPACE } from '../../config/harvester-map'; import { FORKLIFT_NAMESPACE } from '../../config/harvester-map';
import { import {
@@ -24,70 +21,29 @@ const props = defineProps({
stepData: { type: Object, required: true }, stepData: { type: Object, required: true },
}); });
const emit = defineEmits(['ready', 'edit-selection', 'edit-mappings', 'remove-vm']); const emit = defineEmits(['ready']);
const store = useStore(); const store = useStore();
const { t } = useI18n(store); const { t } = useI18n(store);
const vms = computed(() => props.selectedVms); const vms = ref([]);
const networkMappings = ref([]); const networkMappings = ref([]);
const storageMappings = ref([]); const storageMappings = ref([]);
const planName = ref(''); const planName = ref('');
const targetNamespace = ref('');
const namespaceOptions = ref([]);
const existingProviderNames = ref([]);
const existingPlanNames = ref([]);
const errors = ref([]); const errors = ref([]);
const loading = ref(true); const loading = ref(true);
// Restore persisted state // Restore persisted state
planName.value = props.stepData.planName; planName.value = props.stepData.planName;
targetNamespace.value = props.stepData.targetNamespace || '';
const NS = FORKLIFT_NAMESPACE; const NAMESPACE = FORKLIFT_NAMESPACE;
const TARGET_NAMESPACE = 'default';
const nameConflictError = computed(() => {
const name = (planName.value || '').trim();
if (!name) {
return '';
}
if (existingProviderNames.value.includes(name)) {
return t('harvester.addons.vmMigration.reviewMigration.planNameProviderConflict', { name });
}
if (existingPlanNames.value.includes(name)) {
return t('harvester.addons.vmMigration.reviewMigration.planNamePlanConflict', { name });
}
return '';
});
watch(planName, (val) => { watch(planName, (val) => {
props.stepData.planName = val; props.stepData.planName = val;
emit('ready', !!val);
}, { immediate: true }); }, { immediate: true });
watch(targetNamespace, (val) => {
props.stepData.targetNamespace = val;
});
watch([planName, targetNamespace, nameConflictError], () => {
emit('ready', !!planName.value && !!targetNamespace.value && !nameConflictError.value);
}, { immediate: true });
const formatNetworkTarget = (target = '') => {
if (target === 'pod') {
return t('harvester.addons.vmMigration.configureMappings.networkMapping.options.podNetworking');
}
if (target === 'ignored') {
return t('harvester.addons.vmMigration.generic.ignored');
}
return target;
};
const totalVCpu = computed(() => vms.value.reduce((sum, vm) => sum + (vm.cpuCount || vm.numCPU || 0), 0)); const totalVCpu = computed(() => vms.value.reduce((sum, vm) => sum + (vm.cpuCount || vm.numCPU || 0), 0));
const totalMemoryGB = computed(() => { const totalMemoryGB = computed(() => {
@@ -108,7 +64,7 @@ const totalStorageGB = computed(() => {
return bytesToGB(totalBytes); return bytesToGB(totalBytes);
}); });
const vmRows = computed(() => { const vmCards = computed(() => {
return vms.value.map((vm) => { return vms.value.map((vm) => {
const cpus = vm.cpuCount || vm.numCPU || 0; const cpus = vm.cpuCount || vm.numCPU || 0;
const memMB = vm.memoryMB || vm.memory || 0; const memMB = vm.memoryMB || vm.memory || 0;
@@ -122,93 +78,23 @@ const vmRows = computed(() => {
const diskDisplay = totalDiskBytes ? t('harvester.addons.vmMigration.generic.memoryGb', { value: bytesToGB(totalDiskBytes) }) : '-'; const diskDisplay = totalDiskBytes ? t('harvester.addons.vmMigration.generic.memoryGb', { value: bytesToGB(totalDiskBytes) }) : '-';
const os = vm.guestName || vm.guestOS || vm.os || '-'; const os = vm.guestName || vm.guestOS || vm.os || '-';
const rawPowerState = vm.powerState || vm.status?.phase || '-';
const powerState = rawPowerState.replace(/([a-z])([A-Z])/g, '$1 $2').replace(/^./, (c) => c.toUpperCase());
const powerStateClass = powerState.toLowerCase().includes('on') || powerState.toLowerCase().includes('running') ? 'power-on' : 'power-off';
const vmNetworkMappings = networkMappings.value.filter((m) => m.usedBy && m.usedBy.includes(vm.name || vm.id)); const vmNetworkMappings = networkMappings.value.filter((m) => m.usedBy && m.usedBy.includes(vm.name || vm.id));
const vmStorageMappings = storageMappings.value.filter((m) => m.usedBy && m.usedBy.includes(vm.name || vm.id)); const vmStorageMappings = storageMappings.value.filter((m) => m.usedBy && m.usedBy.includes(vm.name || vm.id));
const networkMappingSort = vmNetworkMappings.map((m) => `${ m.source } ${ formatNetworkTarget(m.target) }`).join(', ');
const storageMappingSort = vmStorageMappings.map((m) => `${ m.source } ${ m.target }`).join(', ');
return { return {
_key: vm.id || vm.vmId || vm.metadata?.name,
id: vm.id, id: vm.id,
name: vm.name || vm.id, name: vm.name || vm.id,
identifier: vm.id || vm.vmId || vm.metadata?.name || '-',
os, os,
resources: t('harvester.addons.vmMigration.generic.vCpu', { count: cpus }), cpus,
resourcesSub: `${ memGB } • ${ diskDisplay }`, memGB,
powerState, diskDisplay,
powerStateClass,
networkMappings: vmNetworkMappings, networkMappings: vmNetworkMappings,
storageMappings: vmStorageMappings, storageMappings: vmStorageMappings,
networkMapping: networkMappingSort,
storageMapping: storageMappingSort,
}; };
}); });
}); });
const vmHeaders = [
{
name: 'vmName',
labelKey: 'harvester.addons.vmMigration.reviewMigration.columns.vmName',
value: 'name',
sort: ['name'],
subLabel: t('harvester.addons.vmMigration.generic.identifier'),
width: 200,
},
{
name: 'os',
labelKey: 'harvester.addons.vmMigration.reviewMigration.columns.os',
value: 'os',
sort: ['os'],
width: 140,
},
{
name: 'resources',
labelKey: 'harvester.addons.vmMigration.reviewMigration.columns.resources',
value: 'resources',
sort: false,
width: 120,
},
{
name: 'powerState',
labelKey: 'harvester.addons.vmMigration.reviewMigration.columns.powerState',
value: 'powerState',
sort: ['powerState'],
width: 100,
},
{
name: 'networkMapping',
labelKey: 'harvester.addons.vmMigration.reviewMigration.columns.networkMapping',
value: 'networkMapping',
sort: ['networkMapping'],
subLabel: t('harvester.addons.vmMigration.reviewMigration.columns.sourceTarget'),
width: 220,
},
{
name: 'storageMapping',
labelKey: 'harvester.addons.vmMigration.reviewMigration.columns.storageMapping',
value: 'storageMapping',
sort: ['storageMapping'],
subLabel: t('harvester.addons.vmMigration.reviewMigration.columns.sourceTarget'),
width: 220,
},
{
name: 'actions',
label: ' ',
align: 'right',
sort: false,
width: 40,
},
];
const onEditSelection = () => emit('edit-selection');
const onEditMappings = () => emit('edit-mappings');
const onRemoveVm = (id) => emit('remove-vm', id);
const startMigrationAction = async() => { const startMigrationAction = async() => {
const inStore = store.getters['currentProduct'].inStore; const inStore = store.getters['currentProduct'].inStore;
@@ -217,13 +103,13 @@ const startMigrationAction = async() => {
apiVersion: FORKLIFT_API_VERSION, apiVersion: FORKLIFT_API_VERSION,
kind: 'Provider', kind: 'Provider',
name: props.providerName, name: props.providerName,
namespace: NS, namespace: NAMESPACE,
}, },
destination: { destination: {
apiVersion: FORKLIFT_API_VERSION, apiVersion: FORKLIFT_API_VERSION,
kind: 'Provider', kind: 'Provider',
name: 'host', name: 'host',
namespace: NS, namespace: NAMESPACE,
}, },
}; };
@@ -232,15 +118,15 @@ const startMigrationAction = async() => {
const networkMap = await store.dispatch(`${ inStore }/create`, { const networkMap = await store.dispatch(`${ inStore }/create`, {
type: HCI.FORKLIFT_NETWORK_MAP, type: HCI.FORKLIFT_NETWORK_MAP,
metadata: { name: networkMapName, namespace: NS }, metadata: { name: networkMapName, namespace: NAMESPACE },
spec: { map: buildNetworkMapEntries(props.mappingEntries?.networkEntries || [], NS), provider: providerRef }, spec: { map: buildNetworkMapEntries(props.mappingEntries?.networkEntries || [], NAMESPACE), provider: providerRef },
}); });
await networkMap.save(); await networkMap.save();
const storageMap = await store.dispatch(`${ inStore }/create`, { const storageMap = await store.dispatch(`${ inStore }/create`, {
type: HCI.FORKLIFT_STORAGE_MAP, type: HCI.FORKLIFT_STORAGE_MAP,
metadata: { name: storageMapName, namespace: NS }, metadata: { name: storageMapName, namespace: NAMESPACE },
spec: { map: buildStorageMapEntries(props.mappingEntries?.storageEntries || []), provider: providerRef }, spec: { map: buildStorageMapEntries(props.mappingEntries?.storageEntries || []), provider: providerRef },
}); });
@@ -248,7 +134,7 @@ const startMigrationAction = async() => {
const plan = await store.dispatch(`${ inStore }/create`, { const plan = await store.dispatch(`${ inStore }/create`, {
type: HCI.FORKLIFT_PLAN, type: HCI.FORKLIFT_PLAN,
metadata: { name: planName.value, namespace: NS }, metadata: { name: planName.value, namespace: NAMESPACE },
spec: { spec: {
provider: providerRef, provider: providerRef,
map: { map: {
@@ -256,16 +142,16 @@ const startMigrationAction = async() => {
apiVersion: FORKLIFT_API_VERSION, apiVersion: FORKLIFT_API_VERSION,
kind: 'NetworkMap', kind: 'NetworkMap',
name: networkMapName, name: networkMapName,
namespace: NS, namespace: NAMESPACE,
}, },
storage: { storage: {
apiVersion: FORKLIFT_API_VERSION, apiVersion: FORKLIFT_API_VERSION,
kind: 'StorageMap', kind: 'StorageMap',
name: storageMapName, name: storageMapName,
namespace: NS, namespace: NAMESPACE,
}, },
}, },
targetNamespace: targetNamespace.value, targetNamespace: TARGET_NAMESPACE,
vms: vms.value.map((vm) => ({ id: vm.id, name: vm.name || vm.id })), vms: vms.value.map((vm) => ({ id: vm.id, name: vm.name || vm.id })),
warm: false, warm: false,
}, },
@@ -273,37 +159,26 @@ const startMigrationAction = async() => {
await plan.save(); await plan.save();
const planOwnerRef = {
apiVersion: FORKLIFT_API_VERSION,
kind: 'Plan',
name: plan.metadata.name,
uid: plan.metadata.uid,
blockOwnerDeletion: true,
};
networkMap.metadata.ownerReferences = [planOwnerRef];
await networkMap.save();
storageMap.metadata.ownerReferences = [planOwnerRef];
await storageMap.save();
// Kick off the first migration through the model so the Migration payload // Kick off the first migration through the model so the Migration payload
// lives in a single place (also reused by the dashboard start/restart action). // lives in a single place (also reused by the dashboard start/restart action).
await plan.startMigration(); await plan.startMigration();
}; };
const init = async() => { const init = () => {
const inStore = store.getters['currentProduct'].inStore; vms.value = props.selectedVms;
try {
const namespaces = await store.dispatch(`${ inStore }/findAll`, { type: NAMESPACE });
namespaceOptions.value = namespaces.filter((ns) => !ns.isSystem).map((ns) => ns.metadata.name).sort().map((name) => ({ label: name, value: name }));
} catch (e) {
namespaceOptions.value = [];
}
try {
await store.dispatch(`${ inStore }/findAll`, { type: HCI.FORKLIFT_PROVIDER });
} catch (e) {}
existingProviderNames.value = (store.getters[`${ inStore }/all`](HCI.FORKLIFT_PROVIDER) || [])
.map((p) => p.metadata?.name)
.filter(Boolean);
try {
await store.dispatch(`${ inStore }/findAll`, { type: HCI.FORKLIFT_PLAN });
} catch (e) {}
existingPlanNames.value = (store.getters[`${ inStore }/all`](HCI.FORKLIFT_PLAN) || [])
.map((p) => p.metadata?.name)
.filter(Boolean);
if (props.mappingEntries) { if (props.mappingEntries) {
networkMappings.value = (props.mappingEntries.networkEntries || []).map((entry) => ({ networkMappings.value = (props.mappingEntries.networkEntries || []).map((entry) => ({
@@ -336,178 +211,116 @@ defineExpose({ startMigration: startMigrationAction });
<div <div
class="review-migration-content" class="review-migration-content"
> >
<Banner
v-if="nameConflictError"
color="error"
:label="nameConflictError"
/>
<!-- Migration Details Summary --> <!-- Migration Details Summary -->
<div class="migration-details"> <div class="migration-details">
<div class="section-header"> <h3 class="section-title m-0">
<h3 class="section-title m-0"> {{ t('harvester.addons.vmMigration.reviewMigration.migrationDetails') }}
{{ t('harvester.addons.vmMigration.reviewMigration.migrationDetails') }} </h3>
</h3> <div class="span-9">
<span class="section-description text-deemphasized">
{{ t('harvester.addons.vmMigration.reviewMigration.migrationDetailsDescription') }}
</span>
</div>
<div class="name-row">
<LabeledInput <LabeledInput
v-model:value="planName" v-model:value="planName"
class="name-input"
:label="t('harvester.addons.vmMigration.reviewMigration.planName')" :label="t('harvester.addons.vmMigration.reviewMigration.planName')"
:placeholder="t('harvester.addons.vmMigration.reviewMigration.planNamePlaceholder')" :placeholder="t('harvester.addons.vmMigration.reviewMigration.planNamePlaceholder')"
required required
/> />
<LabeledSelect
v-model:value="targetNamespace"
class="namespace-select"
:label="t('harvester.addons.vmMigration.reviewMigration.targetNamespace')"
:placeholder="t('harvester.addons.vmMigration.reviewMigration.targetNamespacePlaceholder')"
:options="namespaceOptions"
required
/>
</div> </div>
<div class="details-grid span-9">
<div class="summary-row"> <div class="detail-column">
<div class="migration-mode-column"> <div class="detail-item">
<span class="detail-label">{{ t('harvester.addons.vmMigration.reviewMigration.migrationMode') }}</span> <span class="detail-label">{{ t('harvester.addons.vmMigration.reviewMigration.totalVms') }}</span>
<span class="cold-migration-badge">{{ t('harvester.addons.vmMigration.reviewMigration.coldMigration') }}</span> <span class="detail-value detail-value-large">{{ vms.length }}</span>
<span class="text-deemphasized">{{ t('harvester.addons.vmMigration.reviewMigration.coldMigrationDescription') }}</span> </div>
<span class="text-deemphasized">{{ t('harvester.addons.vmMigration.reviewMigration.coldMigrationHint') }}</span>
</div> </div>
<div class="detail-column">
<div class="stats-column"> <div class="detail-item">
<span class="detail-label">{{ t('harvester.addons.vmMigration.reviewMigration.provider') }}</span> <span class="detail-label">{{ t('harvester.addons.vmMigration.reviewMigration.source') }}</span>
<span class="detail-value">{{ providerName }}</span> </div>
<span class="detail-label">{{ t('harvester.addons.vmMigration.reviewMigration.totalVms') }}</span> <div class="detail-item">
<span class="detail-value">{{ vms.length }}</span> <span class="detail-value">{{ providerName }}</span>
<span class="detail-label">{{ t('harvester.addons.vmMigration.reviewMigration.vcpu') }}</span> </div>
<span class="detail-value">{{ totalVCpu }}</span> </div>
<span class="detail-label">{{ t('harvester.addons.vmMigration.reviewMigration.memory') }}</span> <div class="detail-column">
<span class="detail-value">{{ t('harvester.addons.vmMigration.generic.memoryGb', { value: totalMemoryGB }) }}</span> <div class="detail-item">
<span class="detail-label">{{ t('harvester.addons.vmMigration.reviewMigration.storage') }}</span> <span class="detail-label">{{ t('harvester.addons.vmMigration.reviewMigration.targetNamespace') }}</span>
<span class="detail-value">{{ t('harvester.addons.vmMigration.generic.memoryGb', { value: totalStorageGB }) }}</span> </div>
<div class="detail-item">
<span class="detail-value">{{ TARGET_NAMESPACE }}</span>
</div>
</div>
<div class="detail-column">
<div class="detail-item">
<span class="detail-label">{{ t('harvester.addons.vmMigration.reviewMigration.vcpu') }}</span>
<span class="detail-value">{{ totalVCpu }}</span>
</div>
<div class="detail-item">
<span class="detail-label">{{ t('harvester.addons.vmMigration.reviewMigration.memory') }}</span>
<span class="detail-value">{{ t('harvester.addons.vmMigration.generic.memoryGb', { value: totalMemoryGB }) }}</span>
</div>
<div class="detail-item">
<span class="detail-label">{{ t('harvester.addons.vmMigration.reviewMigration.storage') }}</span>
<span class="detail-value">{{ t('harvester.addons.vmMigration.generic.memoryGb', { value: totalStorageGB }) }}</span>
</div>
</div>
<div class="detail-column grid-column-2">
<div class="detail-item">
<span class="detail-label">{{ t('harvester.addons.vmMigration.reviewMigration.migrationMode') }}</span>
</div>
<div class="detail-item">
<span class="detail-value">
{{ t('harvester.addons.vmMigration.reviewMigration.coldMigration') }}
</span>
</div>
</div> </div>
</div> </div>
</div> </div>
<!-- Virtual Machines --> <!-- Virtual Machines -->
<div class="vm-section"> <div class="vm-section">
<SortableTable <h3 class="section-title m-0">
class="vm-sortable-table" {{ t('harvester.addons.vmMigration.reviewMigration.virtualMachines') }} ({{ vms.length }})
:rows="vmRows" </h3>
:headers="vmHeaders"
:search="false" <div class="vm-cards-grid">
:table-actions="false" <RcItemCard
:row-actions="false" v-for="vm in vmCards"
:groupable="false" :id="vm.id"
:paging="true" :key="vm.id"
key-field="_key" :variant="'small'"
> :header="{ title: { text: vm.name } }"
<template #header-left> >
<h4 class="section-title m-0"> <template #item-card-content>
{{ t('harvester.addons.vmMigration.reviewMigration.virtualMachines') }} ({{ vms.length }}) <div class="vm-card-content">
</h4> <div class="vm-card-specs">
</template> <span class="vm-os text-deemphasized">{{ vm.os }}</span>
<template #header-right> <span class="vm-resources">
<a <i
href="#" class="icon icon-disk"
class="edit-selection-link" aria-hidden="true"
@click.prevent="onEditSelection" />
> {{ t('harvester.addons.vmMigration.generic.vCpu', { count: vm.cpus }) }} &bull; {{ vm.memGB }} &bull; {{ vm.diskDisplay }}
{{ t('harvester.addons.vmMigration.reviewMigration.editSelection') }} </span>
</a> </div>
</template> <MappingsCell
<template #cell:vmName="{ row }"> :network-entries="vm.networkMappings.map(m => `${m.source} → ${m.target}`)"
<div class="vm-name-cell"> :storage-entries="vm.storageMappings.map(m => `${m.source} → ${m.target}`)"
<span class="vm-name">{{ row.name }}</span> />
<span class="vm-id text-deemphasized">{{ row.identifier }}</span>
</div>
</template>
<template #cell:resources="{ row }">
<span>{{ row.resources }}</span><br>
<span class="text-deemphasized">{{ row.resourcesSub }}</span>
</template>
<template #cell:powerState="{ row }">
<BadgeState
:label="row.powerState"
:color="row.powerStateClass === 'power-on' ? 'bg-warning' : 'bg-darker'"
/>
</template>
<template #cell:networkMapping="{ row }">
<template v-if="row.networkMappings.length">
<div
v-for="(m, i) in row.networkMappings"
:key="'net-' + i"
class="mapping-cell"
>
<span class="mapping-source">{{ m.source }}</span>
<span class="mapping-target text-deemphasized">&rarr; {{ formatNetworkTarget(m.target) }}</span>
</div> </div>
</template> </template>
<span </RcItemCard>
v-else </div>
class="text-deemphasized"
>-</span>
</template>
<template #cell:storageMapping="{ row }">
<template v-if="row.storageMappings.length">
<div
v-for="(m, i) in row.storageMappings"
:key="'stor-' + i"
class="mapping-cell"
>
<span class="mapping-source">{{ m.source }}</span>
<span class="mapping-target text-deemphasized">&rarr; {{ m.target }}</span>
</div>
</template>
<span
v-else
class="text-deemphasized"
>-</span>
</template>
<template #cell:actions="{ row }">
<rc-dropdown :aria-label="t('harvester.addons.vmMigration.reviewMigration.actions.menuLabel')">
<rc-dropdown-trigger
variant="ghost"
:aria-label="t('harvester.addons.vmMigration.reviewMigration.actions.menuLabel')"
>
<i class="icon icon-actions" />
</rc-dropdown-trigger>
<template #dropdownCollection>
<rc-dropdown-item @click="onEditMappings">
{{ t('harvester.addons.vmMigration.reviewMigration.actions.editMappings') }}
</rc-dropdown-item>
<rc-dropdown-item
class="text-error"
@click="onRemoveVm(row.id)"
>
{{ t('harvester.addons.vmMigration.reviewMigration.actions.removeFromPlan') }}
</rc-dropdown-item>
</template>
</rc-dropdown>
</template>
<template #no-rows>
<tr class="no-rows">
<td
:colspan="vmHeaders.length"
class="text-center"
>
{{ t('harvester.addons.vmMigration.reviewMigration.noVmSelected') }}
<a
href="#"
class="edit-selection-link"
@click.prevent="onEditSelection"
>{{ t('harvester.addons.vmMigration.reviewMigration.noVmSelectedLink') }}</a>
</td>
</tr>
</template>
</SortableTable>
</div> </div>
<!-- Cold Migration Warning -->
<Banner
color="warning"
class="m-0"
>
<div>
<span class="banner-title">{{ t('harvester.addons.vmMigration.reviewMigration.warningTitle') }}</span><br>
{{ t('harvester.addons.vmMigration.reviewMigration.warningMessage') }}
</div>
</Banner>
<!-- Error banner --> <!-- Error banner -->
<Banner <Banner
v-for="(err, i) in errors" v-for="(err, i) in errors"
@@ -534,122 +347,74 @@ defineExpose({ startMigration: startMigrationAction });
font-weight: 600; font-weight: 600;
} }
.name-row { .details-grid {
display: grid; display: grid;
grid-template-columns: 1fr 1fr; grid-template-columns: minmax(230px, 1fr) 1fr 1fr;
gap: 12px clamp(12px, 1vw, 96px); grid-template-rows: minmax(0, 1fr) minmax(0, 1fr);
align-items: start; gap: 12px clamp(64px, 8vw, 128px);
}
.summary-row {
display: grid;
grid-template-columns: 1fr 1fr;
gap: 12px clamp(12px, 1vw, 96px);
line-height: 20px; line-height: 20px;
margin-top: 12px;
} }
.section-header { .detail-column {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
gap: 4px; gap: 4px;
.section-description { &.grid-column-2 {
font-size: 14px; grid-column: span 2;
} }
} }
.migration-mode-column { .detail-item {
display: flex; display: flex;
flex-direction: column; flex-direction: row;
align-items: flex-start; justify-content: space-between;
gap: 8px;
font-size: 14px;
.cold-migration-badge { .detail-label {
padding: 2px 10px; font-size: 14px;
border-radius: 4px; color: var(--muted);
opacity: 0.8; }
font-weight: 600;
background: rgba(224, 191, 90, 0.16);
color: #E0BF5A;
font-size: 12px;
line-height: 18px;
font-weight: 600;
.theme-light & { .detail-value {
background: rgba(168, 128, 26, 0.16); font-weight: 600;
font-size: 14px;
&.detail-value-large {
font-size: 24px;
} }
} }
} }
.stats-column { .vm-cards-grid {
display: grid; display: grid;
grid-template-columns: auto auto; grid-template-columns: repeat(auto-fill, minmax(380px, 1fr));
justify-content: start; gap: 16px;
align-content: start;
column-gap: clamp(24px, 4vw, 64px);
row-gap: 8px;
} }
.detail-label { .vm-card-content {
font-size: 14px;
color: var(--muted);
}
.detail-value {
font-weight: 600;
font-size: 14px;
}
.edit-selection-link {
cursor: pointer;
color: var(--link);
font-size: 14px;
}
.vm-sortable-table {
:deep(.fixed-header-actions) {
align-items: end;
}
:deep(table) {
table-layout: fixed;
}
:deep(td) {
vertical-align: middle;
overflow: hidden;
}
:deep(th:first-child),
:deep(td:first-child) {
padding-left: 16px;
}
}
.vm-name-cell {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
gap: 16px;
.vm-name { line-height: 20px;
font-weight: 600;
}
.vm-id {
font-size: 12px;
}
} }
.mapping-cell { .vm-card-specs {
.mapping-target { display: flex;
margin-left: 4px; flex-direction: row;
white-space: nowrap; gap: 16px;
} align-items: center;
}
.mapping-cell + .mapping-cell { .vm-os {
margin-top: 8px; font-size: 14px;
}
.vm-resources {
font-size: 14px;
color: var(--muted);
display: inline-flex;
align-items: center;
gap: 8px;
}
} }
.banner-title { .banner-title {
@@ -25,9 +25,8 @@ const { discoveredVMs, selectedVMIds, tableRows } = toRefs(props.stepData);
const selectedVMs = ref([]); const selectedVMs = ref([]);
const loading = ref(true); const loading = ref(true);
// Restored from stepData so friendly names survive step navigation / remount. const networkMap = ref({});
const networkMap = ref(props.stepData.networkMap || {}); const datastoreMap = ref({});
const datastoreMap = ref(props.stepData.datastoreMap || {});
const sortableTableRef = ref(null); const sortableTableRef = ref(null);
const allVMsSelected = ref(false); const allVMsSelected = ref(false);
const errors = ref([]); const errors = ref([]);
@@ -95,7 +94,7 @@ const showSelectAllBanner = computed(() => {
const theadElement = computed(() => sortableTableRef.value?.$el?.querySelector('thead')); const theadElement = computed(() => sortableTableRef.value?.$el?.querySelector('thead'));
const headers = ref([ const headers = [
{ {
name: 'vmName', name: 'vmName',
labelKey: 'harvester.addons.vmMigration.selectVms.columns.vmName', labelKey: 'harvester.addons.vmMigration.selectVms.columns.vmName',
@@ -108,21 +107,18 @@ const headers = ref([
labelKey: 'harvester.addons.vmMigration.selectVms.columns.os', labelKey: 'harvester.addons.vmMigration.selectVms.columns.os',
value: 'os', value: 'os',
sort: ['os'], sort: ['os'],
width: 180,
}, },
{ {
name: 'resources', name: 'resources',
labelKey: 'harvester.addons.vmMigration.selectVms.columns.resources', labelKey: 'harvester.addons.vmMigration.selectVms.columns.resources',
value: 'resources', value: 'resources',
sort: false, sort: false,
width: 140,
}, },
{ {
name: 'powerState', name: 'powerState',
labelKey: 'harvester.addons.vmMigration.selectVms.columns.powerState', labelKey: 'harvester.addons.vmMigration.selectVms.columns.powerState',
value: 'powerState', value: 'powerState',
sort: ['powerState'], sort: ['powerState'],
width: 130,
}, },
{ {
name: 'network', name: 'network',
@@ -130,7 +126,6 @@ const headers = ref([
value: 'network', value: 'network',
sort: ['network'], sort: ['network'],
subLabel: t('harvester.addons.vmMigration.generic.identifier'), subLabel: t('harvester.addons.vmMigration.generic.identifier'),
width: 200,
}, },
{ {
name: 'datastore', name: 'datastore',
@@ -138,9 +133,8 @@ const headers = ref([
value: 'datastore', value: 'datastore',
sort: ['datastore'], sort: ['datastore'],
subLabel: t('harvester.addons.vmMigration.generic.identifier'), subLabel: t('harvester.addons.vmMigration.generic.identifier'),
width: 200,
}, },
]); ];
const buildTableRows = () => { const buildTableRows = () => {
return discoveredVMs.value.map((vm) => { return discoveredVMs.value.map((vm) => {
@@ -191,7 +185,6 @@ const buildTableRows = () => {
return { return {
_original: vm, _original: vm,
_key: vm.id || vm.vmId || vm.metadata?.name, _key: vm.id || vm.vmId || vm.metadata?.name,
selectedSort: selectedVMIds.value.has(vm.id) ? 0 : 1,
vmName: vm.name || vm.metadata?.name || '-', vmName: vm.name || vm.metadata?.name || '-',
vmId: vm.id || vm.vmId || vm.metadata?.name || '-', vmId: vm.id || vm.vmId || vm.metadata?.name || '-',
os: vm.guestName || vm.guestOS || vm.os || '-', os: vm.guestName || vm.guestOS || vm.os || '-',
@@ -241,10 +234,6 @@ const clearSelection = () => {
if (table) { if (table) {
table.clearSelection(); table.clearSelection();
if (typeof table.setPage === 'function') {
table.setPage(1);
}
} }
}); });
}; };
@@ -255,49 +244,6 @@ const selectAllVMs = () => {
selectedVMs.value = discoveredVMs.value.slice(); selectedVMs.value = discoveredVMs.value.slice();
}; };
// Moves currently-selected VMs to the first page(s) and re-checks them.
const sortSelectedToFront = () => {
if (selectedVMIds.value.size === 0) {
return;
}
tableRows.value.forEach((row) => {
row.selectedSort = selectedVMIds.value.has(row._original?.id) ? 0 : 1;
});
headers.value = headers.value.map((h) => (
h.name === 'vmName' ? { ...h, sort: ['selectedSort', 'vmName'] } : h
));
skipNextSelectionEvent = true;
nextTick(() => {
const table = sortableTableRef.value;
if (!table) {
skipNextSelectionEvent = false;
return;
}
if (typeof table.changeSort === 'function') {
table.changeSort('vmName', false);
} else if (typeof table.setPage === 'function') {
table.setPage(1);
}
nextTick(() => {
const rowsToReselect = (table.pagedRows || []).filter((row) => selectedVMIds.value.has(row._original?.id));
if (rowsToReselect.length > 0) {
table.update(rowsToReselect, []);
}
skipNextSelectionEvent = false;
});
});
};
watch( watch(
() => sortableTableRef.value?.page, () => sortableTableRef.value?.page,
() => { () => {
@@ -367,9 +313,6 @@ const fetchVMs = async() => {
return map; return map;
}, {}); }, {});
props.stepData.networkMap = networkMap.value;
props.stepData.datastoreMap = datastoreMap.value;
lastFetchedAt.value = Date.now(); lastFetchedAt.value = Date.now();
tableRows.value = buildTableRows(); tableRows.value = buildTableRows();
}; };
@@ -426,10 +369,6 @@ const init = async() => {
tableRows.value = buildTableRows(); tableRows.value = buildTableRows();
loading.value = false; loading.value = false;
// Returning to the step with an existing selection: bring selected VMs forward and re-check them.
await nextTick();
sortSelectedToFront();
return; return;
} }
@@ -497,6 +436,7 @@ init();
:row-actions="false" :row-actions="false"
:groupable="false" :groupable="false"
:paging="true" :paging="true"
:rows-per-page="20"
key-field="_key" key-field="_key"
@selection="onSelect" @selection="onSelect"
> >
@@ -505,20 +445,7 @@ init();
<h3 class="m-0"> <h3 class="m-0">
{{ t('harvester.addons.vmMigration.selectVms.availableVms') }} {{ t('harvester.addons.vmMigration.selectVms.availableVms') }}
</h3> </h3>
<span class="selected-actions"> <span class="text-deemphasized">{{ selectedCount }} {{ t('harvester.addons.vmMigration.selectVms.selected') }}</span>
<span class="text-deemphasized">
{{ selectedCount }} {{ t('harvester.addons.vmMigration.selectVms.selected') }}
</span>
<template v-if="selectedCount > 0">
<span class="text-deemphasized">|</span>
<a
role="button"
@click.prevent="clearSelection"
>
{{ t('harvester.addons.vmMigration.selectVms.clearAll') }}
</a>
</template>
</span>
</div> </div>
</template> </template>
<template #cell:vmName="{ row }"> <template #cell:vmName="{ row }">
@@ -534,7 +461,7 @@ init();
<template #cell:powerState="{ row }"> <template #cell:powerState="{ row }">
<BadgeState <BadgeState
:label="row.powerState" :label="row.powerState"
:color="row.powerStateClass === 'power-on' ? 'bg-success' : 'bg-darker'" :color="row.powerStateClass === 'power-on' ? 'bg-warning' : 'bg-darker'"
/> />
</template> </template>
<template #cell:network="{ row }"> <template #cell:network="{ row }">
@@ -601,23 +528,6 @@ init();
.text-deemphasized { .text-deemphasized {
font-size: 13px; font-size: 13px;
} }
.selected-actions {
display: flex;
align-items: center;
gap: 8px;
font-size: 13px;
a {
cursor: pointer;
&.disabled {
color: var(--muted);
cursor: default;
pointer-events: none;
}
}
}
} }
.vm-name-cell { .vm-name-cell {
@@ -1,181 +0,0 @@
<script setup>
import { ref } from 'vue';
import { useStore } from 'vuex';
import { Card } from '@components/Card';
import LabeledSelect from '@shell/components/form/LabeledSelect';
import AppModal from '@shell/components/AppModal';
import { useI18n } from '@shell/composables/useI18n';
import { VOLUME_MODE, ACCESS_MODE } from '../../config/types';
const VOLUME_MODE_OPTIONS = [VOLUME_MODE.FILE_SYSTEM, VOLUME_MODE.BLOCK];
const {
READ_WRITE_ONCE = 'ReadWriteOnce',
READ_ONLY_MANY = 'ReadOnlyMany',
READ_WRITE_MANY = 'ReadWriteMany',
READ_WRITE_ONCE_POD = 'ReadWriteOncePod'
} = ACCESS_MODE || {};
const ACCESS_MODE_OPTIONS = [READ_WRITE_ONCE, READ_WRITE_MANY, READ_ONLY_MANY, READ_WRITE_ONCE_POD];
const props = defineProps({
storageClassName: { type: String, default: '' },
providerName: { type: String, default: '' },
showInherited: { type: Boolean, default: false },
volumeMode: { type: String, default: VOLUME_MODE.FILE_SYSTEM },
accessModes: { type: Array, default: () => ['ReadWriteMany'] },
inheritedVolumeMode: { type: String, default: VOLUME_MODE.FILE_SYSTEM },
inheritedAccessModes: { type: Array, default: () => ['ReadWriteMany'] },
});
const emit = defineEmits(['apply', 'close']);
const store = useStore();
const { t } = useI18n(store);
const localVolumeMode = ref(props.volumeMode || VOLUME_MODE.FILE_SYSTEM);
const localAccessMode = ref(props.accessModes?.[0] || READ_WRITE_MANY);
const volumeModeOptions = VOLUME_MODE_OPTIONS.map((value) => ({ label: value, value }));
const accessModeOptions = ACCESS_MODE_OPTIONS.map((value) => ({ label: value, value }));
const apply = () => {
emit('apply', {
volumeMode: localVolumeMode.value,
accessModes: [localAccessMode.value],
});
emit('close');
};
// Repopulate the dropdowns with the provider default values; the user then applies.
const reset = () => {
localVolumeMode.value = props.inheritedVolumeMode || VOLUME_MODE.FILE_SYSTEM;
localAccessMode.value = props.inheritedAccessModes?.[0] || READ_WRITE_MANY;
};
const cancel = () => {
emit('close');
};
</script>
<template>
<app-modal
class="storage-defaults-modal"
name="storageDefaultsDialog"
:width="620"
height="auto"
:click-to-close="false"
@close="cancel"
>
<Card
class="storage-defaults-card"
:show-highlight-border="false"
>
<template #title>
<h4 class="text-default-text">
{{ t('harvester.addons.vmMigration.storageDefaults.title', { name: storageClassName }) }}
</h4>
</template>
<template #body>
<p class="text-deemphasized description">
<template v-if="showInherited">
{{ t('harvester.addons.vmMigration.storageDefaults.descriptionInherited', { name: storageClassName, provider: providerName }) }}
</template>
<template v-else>
{{ t('harvester.addons.vmMigration.storageDefaults.description', { name: storageClassName }) }}
</template>
</p>
<div class="settings-box">
<LabeledSelect
v-model:value="localVolumeMode"
class="volume-mode"
:label="t('harvester.addons.vmMigration.storageDefaults.volumeMode')"
:options="volumeModeOptions"
:searchable="false"
:clearable="false"
/>
<LabeledSelect
v-model:value="localAccessMode"
class="access-mode"
:label="t('harvester.addons.vmMigration.storageDefaults.accessMode')"
:options="accessModeOptions"
:searchable="false"
:clearable="false"
/>
</div>
</template>
<template #actions>
<div class="buttons">
<button
class="btn role-secondary"
@click="cancel"
>
{{ t('harvester.addons.vmMigration.storageDefaults.cancel') }}
</button>
<div class="right-buttons">
<button
v-if="showInherited"
class="btn role-secondary mr-10"
@click="reset"
>
{{ t('harvester.addons.vmMigration.storageDefaults.resetToProviderDefault') }}
</button>
<button
class="btn role-primary"
:disabled="!localAccessMode"
@click="apply"
>
{{ showInherited ? t('harvester.addons.vmMigration.storageDefaults.applyOverride') : t('harvester.addons.vmMigration.storageDefaults.apply') }}
</button>
</div>
</div>
</template>
</Card>
</app-modal>
</template>
<style lang="scss" scoped>
.storage-defaults-modal {
z-index: 45;
}
.storage-defaults-card {
margin: 0;
padding: 20px;
}
.description {
margin-bottom: 16px;
line-height: 20px;
}
.settings-box {
display: flex;
flex-direction: column;
gap: 20px;
padding: 16px;
border-radius: 6px;
background-color: var(--category-active);
}
.volume-mode {
max-width: 280px;
}
.access-mode {
max-width: 280px;
}
.buttons {
display: flex;
align-items: center;
justify-content: space-between;
width: 100%;
.right-buttons {
display: flex;
}
}
</style>
+1 -8
View File
@@ -73,15 +73,8 @@ const FEATURE_FLAGS = {
'supportFilesystem', 'supportFilesystem',
'disableResourcePooling', 'disableResourcePooling',
'expandOnlineEncryptedVolume', 'expandOnlineEncryptedVolume',
'longhornV2HugepageSettings', 'longhornV2HugepageSettings'
'staticIPForVM',
'fsFreezeDeadline',
], ],
'v1.9.1': [
'lvmDmThinOnly',
'highPerformanceStorage',
],
'v1.10.0': [],
}; };
const generateFeatureFlags = () => { const generateFeatureFlags = () => {
+18 -71
View File
@@ -57,12 +57,6 @@ import {
} from './table-headers'; } from './table-headers';
import { ADD_ONS } from './harvester-map'; import { ADD_ONS } from './harvester-map';
import { registerAddonSideNav } from '../utils/dynamic-nav'; import { registerAddonSideNav } from '../utils/dynamic-nav';
import { setStandalonePrime } from '../utils/l10n-globals';
import { setVendor } from '@shell/config/private-label';
import { CONFIGURABLE_TABLES } from '@shell/store/features';
import { tableViewsOffFeature } from '../utils/table-views';
import { SETTING } from '@shell/config/settings';
import { primeBrandUpdater } from '../utils/prime-brand';
const TEMPLATE = HCI.VM_VERSION; const TEMPLATE = HCI.VM_VERSION;
const MONITORING_GROUP = 'Monitoring & Logging::Monitoring'; const MONITORING_GROUP = 'Monitoring & Logging::Monitoring';
@@ -115,57 +109,15 @@ export function init($plugin, store) {
} }
}; };
store.watch( store.dispatch('setIsSingleProduct', {
(_state, getters) => JSON.stringify([ productName: PRODUCT_NAME,
!!getters['harvester-common/isHarvesterPrime'], logo: require(`@shell/assets/images/providers/harvester.svg`),
getters['prefs/theme'] === 'dark', productNameKey: 'harvester.productLabel',
getters['harvester-common/privateLabel'] getVersionInfo: (store) => store.getters[`${ PRODUCT_NAME }/byId`]?.(HCI.SETTING, 'server-version')?.value || 'unknown',
]), afterLoginRoute: home,
(value) => { logoRoute: home,
const [isHarvesterPrime, isDark, privateLabel] = JSON.parse(value); supportCustomLogo: true
const primeLogo = isDark ? require('../assets/images/dark/suse-virtualization.svg') : require('../assets/images/suse-virtualization.svg'); });
setStandalonePrime(isHarvesterPrime);
setVendor(privateLabel || '');
const primeLabelKey = privateLabel ? 'harvester.branding.primeLabel' : 'harvester.branding.primeEmptyLabel';
store.dispatch('setIsSingleProduct', {
productName: PRODUCT_NAME,
logo: isHarvesterPrime ? primeLogo : require(`@shell/assets/images/providers/harvester.svg`),
productNameKey: isHarvesterPrime ? primeLabelKey : 'harvester.productLabel',
getVersionInfo: (store) => store.getters[`${ PRODUCT_NAME }/byId`]?.(HCI.SETTING, 'server-version')?.value || 'unknown',
afterLoginRoute: home,
logoRoute: home,
supportCustomLogo: !isHarvesterPrime
});
},
{ immediate: true }
);
// Keep the shell's table views off: they drop the filters the lists put in the table header
store.watch(
(_state, getters) => getters['management/byId'](MANAGEMENT.FEATURE, CONFIGURABLE_TABLES),
(feature) => {
if (!feature) {
store.dispatch('management/load', { data: tableViewsOffFeature() });
}
},
{ immediate: true }
);
const updateBrand = primeBrandUpdater();
// The value is read too: a change event from the server is loaded into the same setting object
store.watch(
(_state, getters) => {
const brandSetting = getters['management/byId'](MANAGEMENT.SETTING, SETTING.BRAND);
return [!!getters['harvester-common/isHarvesterPrime'], brandSetting, brandSetting?.value];
},
([isHarvesterPrime, brandSetting]) => updateBrand(brandSetting, isHarvesterPrime),
{ immediate: true }
);
} }
product({ product({
@@ -1426,7 +1378,7 @@ export function init($plugin, store) {
virtualType({ virtualType({
name: HCI.FORKLIFT_NETWORK_MAP, name: HCI.FORKLIFT_NETWORK_MAP,
labelKey: 'harvester.addons.vmMigration.labels.networkMap', labelKey: 'harvester.addons.vmMigration.labels.networkMap',
group: 'vmMigration::Configurations', group: 'vmMigration::Advanced',
namespaced: true, namespaced: true,
route: { route: {
name: `${ PRODUCT_NAME }-c-cluster-resource`, name: `${ PRODUCT_NAME }-c-cluster-resource`,
@@ -1453,7 +1405,7 @@ export function init($plugin, store) {
virtualType({ virtualType({
name: HCI.FORKLIFT_STORAGE_MAP, name: HCI.FORKLIFT_STORAGE_MAP,
labelKey: 'harvester.addons.vmMigration.labels.storageMap', labelKey: 'harvester.addons.vmMigration.labels.storageMap',
group: 'vmMigration::Configurations', group: 'vmMigration::Advanced',
namespaced: true, namespaced: true,
route: { route: {
name: `${ PRODUCT_NAME }-c-cluster-resource`, name: `${ PRODUCT_NAME }-c-cluster-resource`,
@@ -1481,7 +1433,7 @@ export function init($plugin, store) {
virtualType({ virtualType({
name: HCI.FORKLIFT_PLAN, name: HCI.FORKLIFT_PLAN,
labelKey: 'harvester.addons.vmMigration.labels.plan', labelKey: 'harvester.addons.vmMigration.labels.plan',
group: 'vmMigration::Configurations', group: 'vmMigration::Advanced',
namespaced: true, namespaced: true,
route: { route: {
name: `${ PRODUCT_NAME }-c-cluster-resource`, name: `${ PRODUCT_NAME }-c-cluster-resource`,
@@ -1507,7 +1459,7 @@ export function init($plugin, store) {
virtualType({ virtualType({
name: HCI.FORKLIFT_MIGRATION, name: HCI.FORKLIFT_MIGRATION,
labelKey: 'harvester.addons.vmMigration.labels.migration', labelKey: 'harvester.addons.vmMigration.labels.migration',
group: 'vmMigration::Configurations', group: 'vmMigration::Advanced',
namespaced: true, namespaced: true,
route: { route: {
name: `${ PRODUCT_NAME }-c-cluster-resource`, name: `${ PRODUCT_NAME }-c-cluster-resource`,
@@ -1527,16 +1479,11 @@ export function init($plugin, store) {
} }
}); });
// Register the dashboard entry directly — it's a virtual type with no schema,
// so it cannot go through registerAddonSideNav (which filters by schema).
basicType(['forklift-create'], 'vmMigration');
// Enable SideNav based on Forklift Addon Status // Enable SideNav based on Forklift Addon Status
// The dashboard entry ('forklift-create') is a schema-less virtual type, so it
// is registered with requireSchema:false to still be gated by the addon status.
registerAddonSideNav(store, PRODUCT_NAME, {
addonName: ADD_ONS.FORKLIFT_OPERATOR,
resourceType: HCI.ADD_ONS,
navGroup: 'vmMigration',
requireSchema: false,
types: ['forklift-create']
});
registerAddonSideNav(store, PRODUCT_NAME, { registerAddonSideNav(store, PRODUCT_NAME, {
addonName: ADD_ONS.FORKLIFT_OPERATOR, addonName: ADD_ONS.FORKLIFT_OPERATOR,
resourceType: HCI.ADD_ONS, resourceType: HCI.ADD_ONS,
@@ -1548,7 +1495,7 @@ export function init($plugin, store) {
registerAddonSideNav(store, PRODUCT_NAME, { registerAddonSideNav(store, PRODUCT_NAME, {
addonName: ADD_ONS.FORKLIFT_OPERATOR, addonName: ADD_ONS.FORKLIFT_OPERATOR,
resourceType: HCI.ADD_ONS, resourceType: HCI.ADD_ONS,
navGroup: 'vmMigration::Configurations', navGroup: 'vmMigration::Advanced',
types: [ types: [
HCI.FORKLIFT_NETWORK_MAP, HCI.FORKLIFT_NETWORK_MAP,
HCI.FORKLIFT_STORAGE_MAP, HCI.FORKLIFT_STORAGE_MAP,
-15
View File
@@ -39,21 +39,6 @@ export const VOLUME_TYPE = [{
value: 'cd-rom' value: 'cd-rom'
}]; }];
// KubeVirt high-performance disk features
// https://kubevirt.io/user-guide/storage/disks_and_volumes/#high-performance-features
export const DISK_CACHE_MODE = ['', 'none', 'writeback', 'writethrough'];
export const DISK_IO_MODE = ['', 'native', 'threads'];
export const IO_THREADS_POLICY = ['', 'shared', 'auto', 'supplementalPool'];
// "Easy-to-consume" presets layered on top of the raw KubeVirt fields.
export const DISK_PERFORMANCE_PROFILE = {
DEFAULT: 'default',
HIGH: 'highPerformance',
CUSTOM: 'custom',
};
export const VOLUME_HOTPLUG_ACTION = { export const VOLUME_HOTPLUG_ACTION = {
INSERT_CDROM_IMAGE: 'INSERT_CDROM_IMAGE', INSERT_CDROM_IMAGE: 'INSERT_CDROM_IMAGE',
EJECT_CDROM_IMAGE: 'EJECT_CDROM_IMAGE', EJECT_CDROM_IMAGE: 'EJECT_CDROM_IMAGE',
@@ -16,7 +16,6 @@ export const HCI = {
CREATOR: 'harvesterhci.io/creator', CREATOR: 'harvesterhci.io/creator',
OS: 'harvesterhci.io/os', OS: 'harvesterhci.io/os',
GOLDEN_IMAGE: 'harvesterhci.io/goldenImage', GOLDEN_IMAGE: 'harvesterhci.io/goldenImage',
CLUSTER_NETWORK: 'network.harvesterhci.io/clusternetwork',
NETWORK_TYPE: 'network.harvesterhci.io/type', NETWORK_TYPE: 'network.harvesterhci.io/type',
VM_NAME: 'harvesterhci.io/vmName', VM_NAME: 'harvesterhci.io/vmName',
VM_NAME_PREFIX: 'harvesterhci.io/vmNamePrefix', VM_NAME_PREFIX: 'harvesterhci.io/vmNamePrefix',
@@ -33,11 +32,6 @@ export const HCI = {
CLONE_BACKEND_STORAGE_STATUS: 'harvesterhci.io/clone-backend-storage-status', CLONE_BACKEND_STORAGE_STATUS: 'harvesterhci.io/clone-backend-storage-status',
MIGRATION_STATE: 'harvesterhci.io/migrationState', MIGRATION_STATE: 'harvesterhci.io/migrationState',
VOLUME_CLAIM_TEMPLATE: 'harvesterhci.io/volumeClaimTemplates', VOLUME_CLAIM_TEMPLATE: 'harvesterhci.io/volumeClaimTemplates',
// Default KubeVirt high-performance disk settings, applied when the volume is
// attached to a VM as a disk. See disks_and_volumes.md#high-performance-features.
DISK_CACHE_MODE: 'harvesterhci.io/disk-cache-mode',
DISK_IO_MODE: 'harvesterhci.io/disk-io-mode',
DISK_DEDICATED_IOTHREAD: 'harvesterhci.io/disk-dedicated-iothread',
IMAGE_NAME: 'harvesterhci.io/image-name', IMAGE_NAME: 'harvesterhci.io/image-name',
INIT_IP: 'etcd.rke2.cattle.io/node-address', INIT_IP: 'etcd.rke2.cattle.io/node-address',
NODE_SCHEDULABLE: 'kubevirt.io/schedulable', NODE_SCHEDULABLE: 'kubevirt.io/schedulable',
@@ -86,10 +80,8 @@ export const HCI = {
VOLUME_MODE_ACCESS_MODES: 'cdi.harvesterhci.io/storageProfileVolumeModeAccessModes', VOLUME_MODE_ACCESS_MODES: 'cdi.harvesterhci.io/storageProfileVolumeModeAccessModes',
VOLUME_SNAPSHOT_CLASS: 'cdi.harvesterhci.io/storageProfileVolumeSnapshotClass', VOLUME_SNAPSHOT_CLASS: 'cdi.harvesterhci.io/storageProfileVolumeSnapshotClass',
MAC_ADDRESS: 'harvesterhci.io/mac-address', MAC_ADDRESS: 'harvesterhci.io/mac-address',
STATIC_IP: 'static-ip.harvesterhci.io',
NODE_UPGRADE_PAUSE_MAP: 'harvesterhci.io/node-upgrade-pause-map', NODE_UPGRADE_PAUSE_MAP: 'harvesterhci.io/node-upgrade-pause-map',
CDI_POPULATOR_KIND: 'cdi.kubevirt.io/storage.populator.kind', CDI_POPULATOR_KIND: 'cdi.kubevirt.io/storage.populator.kind',
CNI_NETWORKS: 'k8s.v1.cni.cncf.io/networks', CNI_NETWORKS: 'k8s.v1.cni.cncf.io/networks',
WINDOWS_SYSPREP: 'harvesterhci.io/windows-sysprep', WINDOWS_SYSPREP: 'harvesterhci.io/windows-sysprep',
SKIP_MIG_CONFIGURATION: 'harvesterhci.io/skip-mig-configuration',
}; };
+1 -5
View File
@@ -3,7 +3,6 @@ export const HCI_SETTING = {
CONTAINERD_REGISTRY: 'containerd-registry', CONTAINERD_REGISTRY: 'containerd-registry',
LOG_LEVEL: 'log-level', LOG_LEVEL: 'log-level',
SERVER_VERSION: 'server-version', SERVER_VERSION: 'server-version',
SERVER_FLAVOR: 'server-flavor',
UI_INDEX: 'ui-index', UI_INDEX: 'ui-index',
UPGRADE_CHECKER_ENABLED: 'upgrade-checker-enabled', UPGRADE_CHECKER_ENABLED: 'upgrade-checker-enabled',
UPGRADE_CHECKER_URL: 'upgrade-checker-url', UPGRADE_CHECKER_URL: 'upgrade-checker-url',
@@ -69,7 +68,6 @@ export const HCI_ALLOWED_SETTINGS = {
kind: 'json', from: 'import', featureFlag: 'csiOnlineExpandValidation' kind: 'json', from: 'import', featureFlag: 'csiOnlineExpandValidation'
}, },
[HCI_SETTING.SERVER_VERSION]: { readOnly: true }, [HCI_SETTING.SERVER_VERSION]: { readOnly: true },
[HCI_SETTING.SERVER_FLAVOR]: { readOnly: true },
[HCI_SETTING.UPGRADE_CHECKER_ENABLED]: { kind: 'boolean' }, [HCI_SETTING.UPGRADE_CHECKER_ENABLED]: { kind: 'boolean' },
[HCI_SETTING.UPGRADE_CHECKER_URL]: { kind: 'url' }, [HCI_SETTING.UPGRADE_CHECKER_URL]: { kind: 'url' },
[HCI_SETTING.HTTP_PROXY]: { kind: 'json', from: 'import' }, [HCI_SETTING.HTTP_PROXY]: { kind: 'json', from: 'import' },
@@ -113,17 +111,15 @@ export const HCI_ALLOWED_SETTINGS = {
[HCI_SETTING.KUBECONFIG_DEFAULT_TOKEN_TTL_MINUTES]: { kind: 'number', featureFlag: 'kubeconfigDefaultTokenTTLMinutesSetting' }, [HCI_SETTING.KUBECONFIG_DEFAULT_TOKEN_TTL_MINUTES]: { kind: 'number', featureFlag: 'kubeconfigDefaultTokenTTLMinutesSetting' },
[HCI_SETTING.LONGHORN_V2_DATA_ENGINE_ENABLED]: { [HCI_SETTING.LONGHORN_V2_DATA_ENGINE_ENABLED]: {
kind: 'boolean', kind: 'boolean',
preview: true, experimental: true,
featureFlag: 'longhornV2LVMSupport' featureFlag: 'longhornV2LVMSupport'
}, },
[HCI_SETTING.LONGHORN_V2_DATA_ENGINE_HUGEPAGE_ENABLED]: { [HCI_SETTING.LONGHORN_V2_DATA_ENGINE_HUGEPAGE_ENABLED]: {
kind: 'boolean', kind: 'boolean',
preview: true,
featureFlag: 'longhornV2HugepageSettings' featureFlag: 'longhornV2HugepageSettings'
}, },
[HCI_SETTING.LONGHORN_V2_DATA_ENGINE_MEMORY_SIZE]: { [HCI_SETTING.LONGHORN_V2_DATA_ENGINE_MEMORY_SIZE]: {
kind: 'number', kind: 'number',
preview: true,
featureFlag: 'longhornV2HugepageSettings' featureFlag: 'longhornV2HugepageSettings'
}, },
[HCI_SETTING.ADDITIONAL_GUEST_MEMORY_OVERHEAD_RATIO]: { kind: 'string', from: 'import' }, [HCI_SETTING.ADDITIONAL_GUEST_MEMORY_OVERHEAD_RATIO]: { kind: 'string', from: 'import' },
+1 -1
View File
@@ -286,7 +286,7 @@ export const FORKLIFT_PLAN_VM_COUNT = {
labelKey: 'harvester.tableHeaders.vmMigrationPlanVmCount', labelKey: 'harvester.tableHeaders.vmMigrationPlanVmCount',
value: 'spec.vms.length', value: 'spec.vms.length',
sort: 'spec.vms.length', sort: 'spec.vms.length',
align: 'center', align: 'left',
}; };
// Plan reference column in forklift.konveyor.io.migration list page // Plan reference column in forklift.konveyor.io.migration list page
+2 -3
View File
@@ -7,7 +7,6 @@ import { MiniMap } from '@vue-flow/minimap';
import { allHash } from '@shell/utils/promise'; import { allHash } from '@shell/utils/promise';
import { NETWORK_ATTACHMENT } from '@shell/config/types'; import { NETWORK_ATTACHMENT } from '@shell/config/types';
import Checkbox from '@components/Form/Checkbox/Checkbox.vue'; import Checkbox from '@components/Form/Checkbox/Checkbox.vue';
import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations';
import { HCI } from '../types'; import { HCI } from '../types';
import { NETWORK_TYPE } from '../config/types'; import { NETWORK_TYPE } from '../config/types';
@@ -455,10 +454,10 @@ export default {
const overlayName = nad?.parseConfig?.name || nad?.metadata?.name; const overlayName = nad?.parseConfig?.name || nad?.metadata?.name;
const clusterNetwork = const clusterNetwork =
nad?.metadata?.labels?.[HCI_ANNOTATIONS.CLUSTER_NETWORK] || 'mgmt'; nad?.metadata?.labels?.[HCI.CLUSTER_NETWORK] || 'mgmt';
const nadType = const nadType =
nad?.metadata?.labels?.[HCI_ANNOTATIONS.NETWORK_TYPE] || NETWORK_TYPE.OVERLAY; nad?.metadata?.labels?.[HCI.NETWORK_TYPE] || NETWORK_TYPE.OVERLAY;
const overlayNodeId = `overlay-${ provider }`; const overlayNodeId = `overlay-${ provider }`;
nodes.push({ nodes.push({
@@ -214,14 +214,6 @@ export default {
this['diskRows'] = diskRows; this['diskRows'] = diskRows;
this['networkRows'] = this.getNetworkRows(neu, { fromTemplate: false, init: false }); this['networkRows'] = this.getNetworkRows(neu, { fromTemplate: false, init: false });
// getInitConfig() seeds these on created(); refresh them here too so the
// VM-wide performance panel does not go stale when the spec changes.
const domain = neu?.spec?.template?.spec?.domain;
this['blockMultiQueue'] = domain?.devices?.blockMultiQueue || false;
this['ioThreadsPolicy'] = domain?.ioThreadsPolicy || '';
this['ioThreadCount'] = domain?.ioThreads?.supplementalPoolThreadCount || 2;
}, },
deep: true deep: true
} }
@@ -262,9 +254,6 @@ export default {
:namespace="value.metadata.namespace" :namespace="value.metadata.namespace"
:vm="value" :vm="value"
:resource-type="value.type" :resource-type="value.type"
:block-multi-queue="blockMultiQueue"
:io-threads-policy="ioThreadsPolicy"
:io-thread-count="ioThreadCount"
/> />
</Tab> </Tab>
@@ -401,17 +390,14 @@ export default {
:vmi-resource="vmi" :vmi-resource="vmi"
:vmim-resource="vmim" :vmim-resource="vmim"
/> />
<div <DashboardMetrics
v-if="showVmMetrics && liveMigrationProgressEnabled" v-if="showVmMetrics && liveMigrationProgressEnabled"
class="migration-metrics-scroll mb-30" :detail-url="VM_MIGRATION_DETAIL_URL"
> graph-height="640px"
<DashboardMetrics :has-summary-and-detail="false"
:detail-url="VM_MIGRATION_DETAIL_URL" :vars="graphVars"
graph-height="960px" class="mb-30"
:has-summary-and-detail="false" />
:vars="graphVars"
/>
</div>
<Events <Events
v-if="liveMigrationProgressEnabled" v-if="liveMigrationProgressEnabled"
:resource="vmi" :resource="vmi"
@@ -450,10 +436,3 @@ export default {
</Tabbed> </Tabbed>
</div> </div>
</template> </template>
<style lang="scss" scoped>
.migration-metrics-scroll {
max-height: 640px;
overflow-y: auto;
}
</style>
@@ -1,133 +0,0 @@
<script>
import { mapGetters } from 'vuex';
import { Card } from '@components/Card';
import AsyncButton from '@shell/components/AsyncButton';
import { Checkbox } from '@components/Form/Checkbox';
import { escapeHtml } from '@shell/utils/string';
import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations';
export default {
name: 'HarvesterEnableSriovGpuDevice',
emits: ['close'],
components: {
AsyncButton,
Card,
Checkbox,
},
props: {
resources: {
type: Array,
required: true
}
},
data() {
return { skipMigConfiguration: this.resources[0]?.metadata?.annotations?.[HCI_ANNOTATIONS.SKIP_MIG_CONFIGURATION] === 'true' };
},
computed: { ...mapGetters({ t: 'i18n/t' }) },
methods: {
close() {
this.$emit('close');
},
async save(buttonCb) {
const actionResource = this.resources[0];
const prevEnabled = actionResource.spec.enabled;
const prevAnnotation = actionResource.metadata.annotations?.[HCI_ANNOTATIONS.SKIP_MIG_CONFIGURATION];
try {
if (this.skipMigConfiguration) {
if (!actionResource.metadata.annotations) {
actionResource.metadata.annotations = {};
}
actionResource.metadata.annotations[HCI_ANNOTATIONS.SKIP_MIG_CONFIGURATION] = 'true';
} else {
if (actionResource.metadata.annotations) {
delete actionResource.metadata.annotations[HCI_ANNOTATIONS.SKIP_MIG_CONFIGURATION];
}
}
actionResource.spec.enabled = true;
await actionResource.save();
buttonCb(true);
this.close();
} catch (err) {
actionResource.spec.enabled = prevEnabled;
if (prevAnnotation !== undefined) {
actionResource.metadata.annotations[HCI_ANNOTATIONS.SKIP_MIG_CONFIGURATION] = prevAnnotation;
} else if (actionResource.metadata.annotations) {
delete actionResource.metadata.annotations[HCI_ANNOTATIONS.SKIP_MIG_CONFIGURATION];
}
this.$store.dispatch('growl/fromError', {
title: this.t('generic.notification.title.error', { name: escapeHtml(actionResource.metadata.name) }),
err,
}, { root: true });
buttonCb(false);
}
}
}
};
</script>
<template>
<Card :show-highlight-border="false">
<template #title>
<h4
v-clean-html="t('harvester.sriovgpu.enable.title')"
class="text-default-text"
/>
</template>
<template #body>
<div class="body">
<Checkbox
v-model:value="skipMigConfiguration"
:label="t('harvester.sriovgpu.enable.skipMigConfiguration')"
/>
<p class="note mt-10">
{{ t('harvester.sriovgpu.enable.note') }}
</p>
</div>
</template>
<template #actions>
<div class="buttons actions">
<button
class="btn role-secondary mr-10"
@click="close"
>
{{ t('generic.cancel') }}
</button>
<AsyncButton
mode="enable"
@click="save"
/>
</div>
</template>
</Card>
</template>
<style lang="scss" scoped>
.actions {
width: 100%;
}
.buttons {
display: flex;
justify-content: flex-end;
width: 100%;
}
.note {
font-size: 12px;
color: var(--muted);
line-height: 1.5;
}
</style>
@@ -2,16 +2,13 @@
import { exceptionToErrorsArray } from '@shell/utils/error'; import { exceptionToErrorsArray } from '@shell/utils/error';
import { sortBy } from '@shell/utils/sort'; import { sortBy } from '@shell/utils/sort';
import { mapGetters } from 'vuex'; import { mapGetters } from 'vuex';
import { PVC, STORAGE_CLASS, LONGHORN_DRIVER } from '@shell/config/types'; import { PVC } from '@shell/config/types';
import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations'; import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations';
import { VOLUME_MODE } from '@pkg/harvester/config/types';
import { HCI } from '@pkg/harvester/types';
import { Card } from '@components/Card'; import { Card } from '@components/Card';
import { Banner } from '@components/Banner'; import { Banner } from '@components/Banner';
import AsyncButton from '@shell/components/AsyncButton'; import AsyncButton from '@shell/components/AsyncButton';
import { LabeledInput } from '@components/Form/LabeledInput'; import { LabeledInput } from '@components/Form/LabeledInput';
import LabeledSelect from '@shell/components/form/LabeledSelect'; import LabeledSelect from '@shell/components/form/LabeledSelect';
import { Checkbox } from '@components/Form/Checkbox';
export default { export default {
name: 'HotplugVolumeModal', name: 'HotplugVolumeModal',
@@ -19,7 +16,7 @@ export default {
emits: ['close'], emits: ['close'],
components: { components: {
AsyncButton, Card, LabeledInput, LabeledSelect, Banner, Checkbox AsyncButton, Card, LabeledInput, LabeledSelect, Banner
}, },
props: { props: {
@@ -31,19 +28,14 @@ export default {
async fetch() { async fetch() {
this.allPVCs = await this.$store.dispatch('harvester/findAll', { type: PVC }); this.allPVCs = await this.$store.dispatch('harvester/findAll', { type: PVC });
this.allStorageClasses = await this.$store.dispatch('harvester/findAll', { type: STORAGE_CLASS });
this.allVMs = await this.$store.dispatch('harvester/findAll', { type: HCI.VM });
}, },
data() { data() {
return { return {
diskName: '', diskName: '',
volumeName: '', volumeName: '',
shareable: false, errors: [],
errors: [], allPVCs: [],
allPVCs: [],
allStorageClasses: [],
allVMs: [],
}; };
}, },
@@ -58,31 +50,6 @@ export default {
return this.resources[0]; return this.resources[0];
}, },
// claim names already attached to the VM this modal was opened for
currentVMClaimNames() {
const volumes = this.actionResource?.spec?.template?.spec?.volumes || [];
return volumes.map((vol) => vol.persistentVolumeClaim?.claimName).filter((name) => !!name);
},
// claim names attached to other VMs in the same namespace
otherVMClaimNames() {
const out = [];
this.allVMs.forEach((vm) => {
if (vm.metadata.namespace !== this.actionResource?.metadata?.namespace || vm.id === this.actionResource?.id) {
return;
}
(vm.spec?.template?.spec?.volumes || []).forEach((vol) => {
if (vol.persistentVolumeClaim?.claimName) {
out.push(vol.persistentVolumeClaim.claimName);
}
});
});
return out;
},
volumeOption() { volumeOption() {
return sortBy( return sortBy(
this.PVCs this.PVCs
@@ -94,14 +61,6 @@ export default {
if (pvc.isGoldenImageVolume) { if (pvc.isGoldenImageVolume) {
return false; return false;
} }
// a volume attached to this VM can never be attached to it again
if (this.currentVMClaimNames.includes(pvc.metadata.name)) {
return false;
}
// a volume attached to another VM can only be re-attached as a shareable disk
if (this.otherVMClaimNames.includes(pvc.metadata.name) && !this.isShareableCapablePVC(pvc)) {
return false;
}
return true; return true;
}) })
@@ -114,62 +73,19 @@ export default {
'label' 'label'
); );
}, },
selectedPVC() {
return this.PVCs.find((P) => P.metadata.name === this.volumeName);
},
isShareableCapable() {
return this.selectedPVC ? this.isShareableCapablePVC(this.selectedPVC) : false;
},
},
watch: {
isShareableCapable(neu) {
if (!neu) {
this.shareable = false;
}
},
}, },
methods: { methods: {
isShareableCapablePVC(pvc) {
const pvcSpec = pvc?.spec;
if (!pvcSpec) {
return false;
}
const isRWX = (pvcSpec.accessModes || []).includes('ReadWriteMany');
const isBlock = pvcSpec.volumeMode === VOLUME_MODE.BLOCK;
const storageClass = this.allStorageClasses.find((sc) => sc.name === pvcSpec.storageClassName);
// fail closed: without a resolved StorageClass the provisioner
// requirement cannot be evaluated
if (!storageClass) {
return false;
}
return isRWX && isBlock && storageClass.provisioner !== LONGHORN_DRIVER;
},
close() { close() {
this.diskName = ''; this.diskName = '';
this.volumeName = ''; this.volumeName = '';
this.shareable = false;
this.$emit('close'); this.$emit('close');
}, },
async save(buttonCb) { async save(buttonCb) {
if (this.actionResource) { if (this.actionResource) {
try { try {
const input = { volumeSourceName: this.volumeName, diskName: this.diskName }; const res = await this.actionResource.doAction('addVolume', { volumeSourceName: this.volumeName, diskName: this.diskName }, {}, false);
if (this.isShareableCapable && this.shareable) {
input.shareable = true;
}
const res = await this.actionResource.doAction('addVolume', input, {}, false);
if (res._status === 200 || res._status === 204) { if (res._status === 200 || res._status === 204) {
this.$store.dispatch('growl/success', { this.$store.dispatch('growl/success', {
@@ -225,19 +141,6 @@ export default {
class="mt-20" class="mt-20"
required required
/> />
<Checkbox
v-if="isShareableCapable"
v-model:value="shareable"
class="mt-20"
type="checkbox"
label-key="harvester.virtualMachine.volume.shareable.label"
tooltip-key="harvester.virtualMachine.volume.shareable.tip"
/>
<Banner
v-if="isShareableCapable && shareable"
color="warning"
:label="t('harvester.virtualMachine.volume.shareable.warning')"
/>
<Banner <Banner
v-for="(err, i) in errors" v-for="(err, i) in errors"
:key="i" :key="i"
+3 -26
View File
@@ -5,8 +5,6 @@ import { Card } from '@components/Card';
import { Banner } from '@components/Banner'; import { Banner } from '@components/Banner';
import AsyncButton from '@shell/components/AsyncButton'; import AsyncButton from '@shell/components/AsyncButton';
import { LabeledInput } from '@components/Form/LabeledInput'; import { LabeledInput } from '@components/Form/LabeledInput';
import LabeledSelect from '@shell/components/form/LabeledSelect';
import { DEFAULT_FS_FREEZE_DEADLINE, getFsFreezeDeadlineOptions } from '../utils/backup';
export default { export default {
name: 'HarvesterBackupModal', name: 'HarvesterBackupModal',
@@ -17,7 +15,6 @@ export default {
AsyncButton, AsyncButton,
Card, Card,
LabeledInput, LabeledInput,
LabeledSelect,
Banner Banner
}, },
@@ -30,9 +27,8 @@ export default {
data() { data() {
return { return {
backUpName: '', backUpName: '',
errors: [], errors: []
fsFreezeDeadline: DEFAULT_FS_FREEZE_DEADLINE
}; };
}, },
@@ -41,22 +37,12 @@ export default {
actionResource() { actionResource() {
return this.resources[0]; return this.resources[0];
},
fsFreezeDeadlineEnabled() {
return this.$store.getters['harvester-common/getFeatureEnabled']('fsFreezeDeadline');
},
fsFreezeDeadlineOptions() {
return getFsFreezeDeadlineOptions(this.t);
} }
}, },
methods: { methods: {
close() { close() {
this.backUpName = ''; this.backUpName = '';
this.fsFreezeDeadline = DEFAULT_FS_FREEZE_DEADLINE;
this.errors = [];
this.$emit('close'); this.$emit('close');
}, },
@@ -65,7 +51,7 @@ export default {
try { try {
const res = await this.actionResource.doAction( const res = await this.actionResource.doAction(
'backup', 'backup',
{ name: this.backUpName, fsFreezeDeadline: this.fsFreezeDeadline }, { name: this.backUpName },
{}, {},
false false
); );
@@ -114,18 +100,9 @@ export default {
<template #body> <template #body>
<LabeledInput <LabeledInput
v-model:value="backUpName" v-model:value="backUpName"
class="mt-20"
:label="t('generic.name')" :label="t('generic.name')"
required required
/> />
<LabeledSelect
v-if="fsFreezeDeadlineEnabled"
v-model:value="fsFreezeDeadline"
class="mt-20"
:options="fsFreezeDeadlineOptions"
:label="t('harvester.modal.backup.fileSystemFreezeDeadline.label')"
required
/>
<Banner <Banner
v-for="(err, i) in errors" v-for="(err, i) in errors"
:key="i" :key="i"
-164
View File
@@ -1,164 +0,0 @@
<script>
import merge from 'lodash/merge';
import jsyaml from 'js-yaml';
import { mapGetters } from 'vuex';
import { Card } from '@components/Card';
import { LabeledInput } from '@components/Form/LabeledInput';
import AsyncButton from '@shell/components/AsyncButton';
import { escapeHtml } from '@shell/utils/string';
const DEFAULT_VALUE = {
rancher: {
hostname: '',
version: '',
bootstrapPassword: '',
},
};
export default {
name: 'HarvesterEnableK3k',
emits: ['close'],
components: {
AsyncButton,
Card,
LabeledInput,
},
props: {
resources: {
type: Array,
required: true
}
},
data() {
const addon = this.resources[0];
let valuesContentJson;
try {
valuesContentJson = merge({}, DEFAULT_VALUE, jsyaml.load(addon.spec.valuesContent));
} catch (e) {
valuesContentJson = merge({}, DEFAULT_VALUE);
}
return { valuesContentJson };
},
computed: {
...mapGetters({ t: 'i18n/t' }),
buttonDisabled() {
const { rancher } = this.valuesContentJson;
return !(rancher?.hostname || '').trim() || !(rancher?.version || '').trim() || !(rancher?.bootstrapPassword || '').trim();
}
},
methods: {
close() {
this.$emit('close');
},
async enable(buttonCb) {
const addon = this.resources[0];
try {
addon.spec.valuesContent = jsyaml.dump(this.valuesContentJson);
addon.spec.enabled = true;
await addon.save();
buttonCb(true);
this.close();
} catch (err) {
addon.spec.enabled = false;
this.$store.dispatch('growl/fromError', {
title: this.t('generic.notification.title.error', { name: escapeHtml(addon.metadata.name) }),
err,
}, { root: true });
buttonCb(false);
}
}
}
};
</script>
<template>
<Card :show-highlight-border="false">
<template #title>
<h4
v-clean-html="t('harvester.addons.rancherK3k.enable.title')"
class="text-default-text"
/>
</template>
<template #body>
<div class="body">
<div class="row mb-15">
<div class="col span-6">
<LabeledInput
v-model:value="valuesContentJson.rancher.hostname"
:required="true"
:label="t('harvester.addons.rancherK3k.hostname')"
placeholder="rancher.$vip.nip.io"
/>
</div>
<div class="col span-6">
<LabeledInput
v-model:value="valuesContentJson.rancher.version"
:required="true"
:label="t('harvester.addons.rancherK3k.version')"
placeholder="v1.14.0"
/>
</div>
</div>
<div class="row mb-15">
<div class="col span-12">
<LabeledInput
v-model:value="valuesContentJson.rancher.bootstrapPassword"
:required="true"
type="password"
:label="t('harvester.addons.rancherK3k.password')"
:tooltip="t('harvester.addons.rancherK3k.passwordTooltip')"
/>
</div>
</div>
</div>
</template>
<template #actions>
<div class="buttons actions">
<button
class="btn role-secondary mr-10"
@click="close"
>
{{ t('generic.cancel') }}
</button>
<AsyncButton
mode="enable"
:disabled="buttonDisabled"
@click="enable"
/>
</div>
</template>
</Card>
</template>
<style lang="scss" scoped>
.body {
display: flex;
flex-direction: column;
min-width: 400px;
}
.actions {
width: 100%;
}
.buttons {
display: flex;
justify-content: flex-end;
width: 100%;
}
</style>
@@ -5,10 +5,8 @@ import { Card } from '@components/Card';
import { Banner } from '@components/Banner'; import { Banner } from '@components/Banner';
import AsyncButton from '@shell/components/AsyncButton'; import AsyncButton from '@shell/components/AsyncButton';
import { LabeledInput } from '@components/Form/LabeledInput'; import { LabeledInput } from '@components/Form/LabeledInput';
import LabeledSelect from '@shell/components/form/LabeledSelect';
import { HCI } from '../types'; import { HCI } from '../types';
import { BACKUP_TYPE } from '../config/types'; import { BACKUP_TYPE } from '../config/types';
import { DEFAULT_FS_FREEZE_DEADLINE, getFsFreezeDeadlineOptions } from '../utils/backup';
export default { export default {
name: 'HarvesterVMSnapshotDialog', name: 'HarvesterVMSnapshotDialog',
@@ -19,7 +17,6 @@ export default {
AsyncButton, AsyncButton,
Card, Card,
LabeledInput, LabeledInput,
LabeledSelect,
Banner Banner
}, },
@@ -34,8 +31,7 @@ export default {
return { return {
snapshotName: '', snapshotName: '',
snapshotNamespace: '', snapshotNamespace: '',
errors: [], errors: []
fsFreezeDeadline: DEFAULT_FS_FREEZE_DEADLINE
}; };
}, },
@@ -44,23 +40,13 @@ export default {
actionResource() { actionResource() {
return this.resources[0]; return this.resources[0];
},
fsFreezeDeadlineEnabled() {
return this.$store.getters['harvester-common/getFeatureEnabled']('fsFreezeDeadline');
},
fsFreezeDeadlineOptions() {
return getFsFreezeDeadlineOptions(this.t);
} }
}, },
methods: { methods: {
close() { close() {
this.fsFreezeDeadline = DEFAULT_FS_FREEZE_DEADLINE;
this.snapshotNamespace = ''; this.snapshotNamespace = '';
this.snapshotName = ''; this.snapshotName = '';
this.errors = [];
this.$emit('close'); this.$emit('close');
}, },
@@ -74,8 +60,7 @@ export default {
ownerReferences: this.getOwnerReferencesFromVM(this.actionResource) ownerReferences: this.getOwnerReferencesFromVM(this.actionResource)
}, },
spec: { spec: {
fsFreezeDeadline: this.fsFreezeDeadline, source: {
source: {
apiGroup: 'kubevirt.io', apiGroup: 'kubevirt.io',
kind: 'VirtualMachine', kind: 'VirtualMachine',
name: this.actionResource.metadata.name name: this.actionResource.metadata.name
@@ -147,14 +132,6 @@ export default {
:label="t('generic.name')" :label="t('generic.name')"
required required
/> />
<LabeledSelect
v-if="fsFreezeDeadlineEnabled"
v-model:value="fsFreezeDeadline"
class="mt-20"
:options="fsFreezeDeadlineOptions"
:label="t('harvester.modal.vmSnapshot.fileSystemFreezeDeadline.label')"
required
/>
<Banner <Banner
v-for="(err, i) in errors" v-for="(err, i) in errors"
:key="i" :key="i"
@@ -1,141 +0,0 @@
import { mount } from '@vue/test-utils';
import { _CREATE, _EDIT, _VIEW } from '@shell/config/query-params';
import YamlEditor from '@shell/components/YamlEditor';
import { HCI } from '@pkg/harvester/config/labels-annotations';
import HarvesterEditCloudTemplate from '../harvesterhci.io.cloudtemplate.vue';
const OLD_CONFIG = '#cloud-config\npassword: old\n';
const NEW_CONFIG = '#cloud-config\npassword: new\n';
// A cloud-config template as the store gives it, `save` records what would be sent to the API
function cloudTemplate({ isNew = false } = {}) {
const value = {
type: 'configmap',
metadata: {
name: 'tpl',
namespace: 'default',
...(isNew ? {} : { labels: { [HCI.CLOUD_INIT]: 'user' } }),
},
data: isNew ? undefined : { cloudInit: OLD_CONFIG },
$dispatch: jest.fn(),
save: () => Promise.resolve(),
saved: [],
};
jest.spyOn(value, 'save').mockImplementation(() => {
value.saved.push(JSON.parse(JSON.stringify({ metadata: value.metadata, data: value.data })));
return Promise.resolve();
});
return value;
}
// The real shell YamlEditor, with only its CodeMirror editor stubbed, so the events the form listens to are the
// ones the shell emits
function mountForm(mode, value) {
return mount(HarvesterEditCloudTemplate, {
props: { value, mode },
global: {
stubs: {
CruResource: { template: '<div><slot /></div>' },
Tabbed: { template: '<div><slot /></div>' },
Tab: { template: '<div><slot /></div>' },
NameNsDescription: true,
LabeledSelect: true,
CodeMirror: {
name: 'CodeMirror', template: '<div />', emits: ['onInput', 'onReady', 'validationChanged']
},
FileDiff: true,
},
mocks: {
$store: {
getters: {
'prefs/get': jest.fn(),
'type-map/isSpoofed': () => false,
currentStore: () => 'harvester',
'harvester/schemaFor': () => ({ linkFor: () => '/v1/harvester/configmaps' }),
'i18n/t': (key) => key,
},
},
$router: { replace: jest.fn() },
$route: {
name: 'c-cluster-product-resource-id', params: {}, query: {}
},
},
},
});
}
// What a user typing in the editor does: CodeMirror reports the new text to the YamlEditor
async function typeInEditor(wrapper, text) {
wrapper.findComponent(YamlEditor).findComponent({ name: 'CodeMirror' }).vm.$emit('onInput', text);
await wrapper.vm.$nextTick();
}
describe('component: HarvesterEditCloudTemplate', () => {
it('should save the edited cloud config when editing a template', async() => {
const value = cloudTemplate();
const wrapper = mountForm(_EDIT, value);
await typeInEditor(wrapper, NEW_CONFIG);
await wrapper.vm.save(jest.fn());
expect(value.save).toHaveBeenCalledTimes(1);
expect(value.saved[0].data).toStrictEqual({ cloudInit: NEW_CONFIG });
});
it('should keep the template type label when editing a template', async() => {
const value = cloudTemplate();
const wrapper = mountForm(_EDIT, value);
await typeInEditor(wrapper, NEW_CONFIG);
await wrapper.vm.save(jest.fn());
expect(value.saved[0].metadata.labels).toStrictEqual({ [HCI.CLOUD_INIT]: 'user' });
});
it('should save the last text when the cloud config is edited several times', async() => {
const value = cloudTemplate();
const wrapper = mountForm(_EDIT, value);
await typeInEditor(wrapper, '#cloud-config\n');
await typeInEditor(wrapper, NEW_CONFIG);
await wrapper.vm.save(jest.fn());
expect(value.saved[0].data).toStrictEqual({ cloudInit: NEW_CONFIG });
});
it('should save the cloud config unchanged when only saving a template', async() => {
const value = cloudTemplate();
const wrapper = mountForm(_EDIT, value);
await wrapper.vm.save(jest.fn());
expect(value.saved[0].data).toStrictEqual({ cloudInit: OLD_CONFIG });
});
it('should save the cloud config and the template type when creating a template', async() => {
const value = cloudTemplate({ isNew: true });
const wrapper = mountForm(_CREATE, value);
await typeInEditor(wrapper, NEW_CONFIG);
await wrapper.vm.save(jest.fn());
expect(value.save).toHaveBeenCalledWith({ url: '/v1/harvester/configmaps' });
expect(value.saved[0]).toStrictEqual({
metadata: {
name: 'tpl', namespace: 'default', labels: { [HCI.CLOUD_INIT]: 'user' }
},
data: { cloudInit: NEW_CONFIG },
});
});
it('should show the template cloud config in the editor when viewing a template', () => {
const value = cloudTemplate();
const wrapper = mountForm(_VIEW, value);
expect(wrapper.findComponent(YamlEditor).props('value')).toBe(OLD_CONFIG);
expect(value.data).toStrictEqual({ cloudInit: OLD_CONFIG });
});
});
@@ -1,167 +0,0 @@
<script>
import merge from 'lodash/merge';
import jsyaml from 'js-yaml';
import { LabeledInput } from '@components/Form/LabeledInput';
import { RadioGroup } from '@components/Form/Radio';
const DEFAULT_VALUE = {
certManagerVersion: 'v1.20.2',
rancher: {
hostname: '',
version: '',
bootstrapPassword: '',
},
k3kCluster: {
servers: 1,
version: 'v1.35.4-k3s1',
storageClassName: 'harvester-longhorn',
},
};
export default {
name: 'EditAddonRancherK3k',
components: { LabeledInput, RadioGroup },
inheritAttrs: false,
props: {
value: {
type: Object,
required: true,
},
mode: {
type: String,
required: true
},
registerBeforeHook: {
type: Function,
required: true,
},
},
data() {
let valuesContentJson = {};
try {
valuesContentJson = merge({}, DEFAULT_VALUE, jsyaml.load(this.value.spec.valuesContent));
} catch (err) {
valuesContentJson = merge({}, DEFAULT_VALUE);
this.$store.dispatch('growl/fromError', {
title: this.$store.getters['i18n/t']('generic.notification.title.error'),
err: err.data || err,
}, { root: true });
}
return { valuesContentJson };
},
created() {
if (this.registerBeforeHook) {
this.registerBeforeHook(this.willSave, 'willSave');
}
},
methods: {
willSave() {
const errors = [];
if (!this.value.spec.enabled) {
return Promise.resolve();
}
if (!this.valuesContentJson.rancher.hostname) {
errors.push(this.t('validation.required', { key: this.t('harvester.addons.rancherK3k.hostname') }, true));
}
if (!this.valuesContentJson.rancher.version) {
errors.push(this.t('validation.required', { key: this.t('harvester.addons.rancherK3k.version') }, true));
}
if (!this.valuesContentJson.rancher.bootstrapPassword) {
errors.push(this.t('validation.required', { key: this.t('harvester.addons.rancherK3k.password') }, true));
}
if (errors.length > 0) {
return Promise.reject(errors);
} else {
return Promise.resolve();
}
},
},
watch: {
valuesContentJson: {
handler(neu) {
this.value.spec['valuesContent'] = jsyaml.dump(neu);
},
deep: true,
immediate: true
},
},
};
</script>
<template>
<div>
<div class="row">
<div class="col span-12">
<RadioGroup
v-model:value="value.spec.enabled"
class="mb-20"
name="model"
:mode="mode"
:options="[true,false]"
:labels="[t('generic.enabled'), t('generic.disabled')]"
/>
</div>
</div>
<template v-if="value.spec.enabled">
<div class="row mb-20">
<div class="col span-6">
<LabeledInput
v-model:value="valuesContentJson.rancher.hostname"
label-key="harvester.addons.rancherK3k.hostname"
:required="true"
:mode="mode"
placeholder="rancher.$vip.nip.io"
/>
</div>
<div class="col span-6">
<LabeledInput
v-model:value="valuesContentJson.rancher.version"
label-key="harvester.addons.rancherK3k.version"
:required="true"
:mode="mode"
placeholder="v1.14.0"
/>
</div>
</div>
<div class="row mt-20">
<div class="col span-6">
<LabeledInput
v-model:value="valuesContentJson.rancher.bootstrapPassword"
label-key="harvester.addons.rancherK3k.password"
:mode="mode"
:required="true"
type="password"
:tooltip="t('harvester.addons.rancherK3k.passwordTooltip')"
/>
</div>
</div>
</template>
</div>
</template>
<style lang="scss" scoped>
:deep() .radio-group {
display: flex;
.radio-container {
margin-right: 30px;
}
}
</style>
@@ -7,7 +7,6 @@ import NameNsDescription from '@shell/components/form/NameNsDescription';
import YamlEditor from '@shell/components/YamlEditor'; import YamlEditor from '@shell/components/YamlEditor';
import CreateEditView from '@shell/mixins/create-edit-view'; import CreateEditView from '@shell/mixins/create-edit-view';
import FormValidation from '@shell/mixins/form-validation';
import { HCI } from '@pkg/harvester/config/labels-annotations'; import { HCI } from '@pkg/harvester/config/labels-annotations';
export default { export default {
@@ -24,19 +23,14 @@ export default {
NameNsDescription, NameNsDescription,
}, },
mixins: [CreateEditView, FormValidation], mixins: [CreateEditView],
inheritAttrs: false, inheritAttrs: false,
data() { data() {
return { return {
config: this.value.data?.cloudInit || '', config: this.value.data?.cloudInit || '',
type: this.value?.metadata?.labels?.[HCI.CLOUD_INIT] || 'user', type: this.value?.metadata?.labels?.[HCI.CLOUD_INIT] || 'user',
fvFormRuleSets: [{
path: 'metadata.name',
rules: ['required'],
translationKey: 'nameNsDescription.name.label',
}],
}; };
}, },
@@ -59,8 +53,8 @@ export default {
}, },
methods: { methods: {
update(config) { update() {
this.value.data = { cloudInit: config }; this.value.data = { cloudInit: this.config };
}, },
updateBeforeSave() { updateBeforeSave() {
@@ -84,7 +78,6 @@ export default {
:resource="value" :resource="value"
:errors="errors" :errors="errors"
:apply-hooks="applyHooks" :apply-hooks="applyHooks"
:validation-passed="fvFormIsValid"
@finish="save" @finish="save"
@cancel="done" @cancel="done"
@error="e=>errors=e" @error="e=>errors=e"
@@ -93,7 +86,6 @@ export default {
:value="value" :value="value"
:mode="mode" :mode="mode"
:namespaced="true" :namespaced="true"
:rules="{ name: fvGetAndReportPathRules('metadata.name') }"
@update:value="$emit('update:value', $event)" @update:value="$emit('update:value', $event)"
/> />
@@ -119,7 +111,7 @@ export default {
:mode="mode" :mode="mode"
class="yaml-editor" class="yaml-editor"
:editor-mode="mode === 'view' ? 'VIEW_CODE' : 'EDIT_CODE'" :editor-mode="mode === 'view' ? 'VIEW_CODE' : 'EDIT_CODE'"
@update:value="update" @onChanges="update"
/> />
</div> </div>
</Tab> </Tab>
@@ -133,7 +125,9 @@ export default {
:deep() .yaml-editor{ :deep() .yaml-editor{
flex: 1; flex: 1;
min-height: $yaml-height; min-height: $yaml-height;
& .code-mirror .cm-editor { & .code-mirror .CodeMirror {
position: initial;
height: auto;
min-height: $yaml-height; min-height: $yaml-height;
} }
} }
@@ -468,15 +468,10 @@ export default {
const size = formatSi(sizeBytes, { increment: 1024, suffix: UNIT_SUFFIX }); const size = formatSi(sizeBytes, { increment: 1024, suffix: UNIT_SUFFIX });
const parentDevice = d.status?.deviceStatus?.parentDevice; const parentDevice = d.status?.deviceStatus?.parentDevice;
const isChildAdded = this.newDisks.find((newDisk) => newDisk.blockDevice?.status?.deviceStatus?.parentDevice === devPath); const isChildAdded = this.newDisks.find((newDisk) => newDisk.blockDevice?.status?.deviceStatus?.parentDevice === devPath);
const mountPoint = d.status?.deviceStatus?.fileSystem?.mountPoint;
const name = d.displayName; const name = d.displayName;
let label = `${ name } (Type: ${ deviceType }, Size: ${ size })`; let label = `${ name } (Type: ${ deviceType }, Size: ${ size })`;
if (mountPoint) {
label = `${ label } - ${ this.t('harvester.host.disk.mounted') }`;
}
if (parentDevice) { if (parentDevice) {
label = `- ${ label }`; label = `- ${ label }`;
} }
@@ -486,7 +481,7 @@ export default {
value: d.id, value: d.id,
action: this.addDisk, action: this.addDisk,
kind: !parentDevice ? 'group' : '', kind: !parentDevice ? 'group' : '',
disabled: !!isChildAdded || !!mountPoint, disabled: !!isChildAdded,
group: parentDevice || devPath, group: parentDevice || devPath,
isParent: !!parentDevice, isParent: !!parentDevice,
}; };
@@ -88,8 +88,7 @@ export default {
<div class="header mb-20"> <div class="header mb-20">
<FileSelector <FileSelector
v-if="isCreate" v-if="isCreate"
variant="primary" class="btn btn-sm bg-primary mt-10"
class="mt-10"
:label="t('generic.readFromFile')" :label="t('generic.readFromFile')"
accept=".pub" accept=".pub"
@selected="onKeySelected" @selected="onKeySelected"
@@ -16,8 +16,6 @@ import isEmpty from 'lodash/isEmpty';
import jsyaml from 'js-yaml'; import jsyaml from 'js-yaml';
import { createYaml } from '@shell/utils/create-yaml'; import { createYaml } from '@shell/utils/create-yaml';
import YamlEditor, { EDITOR_MODES } from '@shell/components/YamlEditor'; import YamlEditor, { EDITOR_MODES } from '@shell/components/YamlEditor';
import { foldAllComments } from '@components/RcCodeMirror';
import { unfoldCode } from '@codemirror/language';
import { FLOW_TYPE } from '../config/harvester-map'; import { FLOW_TYPE } from '../config/harvester-map';
const LOGGING_EVENT = 'Logging/Event'; const LOGGING_EVENT = 'Logging/Event';
@@ -174,9 +172,10 @@ export default {
}); });
} }
}, },
onYamlEditorReady(view) { onYamlEditorReady(cm) {
foldAllComments(view); cm.getMode().fold = 'yamlcomments';
unfoldCode(view); cm.execCommand('foldAll');
cm.execCommand('unfold');
}, },
} }
}; };
@@ -7,12 +7,8 @@ import { allHash } from '@shell/utils/promise';
import { clone } from '@shell/utils/object'; import { clone } from '@shell/utils/object';
import { HCI } from '../../../types'; import { HCI } from '../../../types';
import { NODE } from '@shell/config/types'; import { NODE } from '@shell/config/types';
import { _CREATE, _CLONE } from '@shell/config/query-params';
import { LVM_TOPOLOGY_LABEL } from '../index.vue'; import { LVM_TOPOLOGY_LABEL } from '../index.vue';
const STRIPED_TYPE = 'striped';
const DM_THIN_TYPE = 'dm-thin';
const DEFAULT_PARAMETERS = [ const DEFAULT_PARAMETERS = [
'type', 'type',
'vgName' 'vgName'
@@ -58,17 +54,8 @@ export default {
data() { data() {
const node = (this.value.allowedTopologies?.[0]?.matchLabelExpressions || []).find((t) => t.key === LVM_TOPOLOGY_LABEL)?.values[0]; const node = (this.value.allowedTopologies?.[0]?.matchLabelExpressions || []).find((t) => t.key === LVM_TOPOLOGY_LABEL)?.values[0];
// striped is dropped once the LVM add-on reaches GA (v1.9.1); dm-thin is the only supported type.
const dmThinOnly = this.$store.getters['harvester-common/getFeatureEnabled']('lvmDmThinOnly');
const volumeGroupTypes = dmThinOnly ? [DM_THIN_TYPE] : [STRIPED_TYPE, DM_THIN_TYPE];
// Default new storage classes to dm-thin, and reset a cloned striped type that is no longer selectable.
if (dmThinOnly && [_CREATE, _CLONE].includes(this.realMode) && !volumeGroupTypes.includes(this.value.parameters.type)) {
this.value.parameters.type = DM_THIN_TYPE;
}
return { return {
volumeGroupTypes, volumeGroupTypes: ['striped', 'dm-thin'],
node, node,
}; };
}, },
@@ -173,7 +173,6 @@ export default {
try { try {
await proxyResource.save(); await proxyResource.save();
proxyResource.notifyGeneratedName?.();
buttonCb(true); buttonCb(true);
this.$router.push({ this.$router.push({
@@ -299,7 +299,6 @@ export default {
const res = await this.value.save(); const res = await this.value.save();
res.notifyGeneratedName?.();
res.uploadImage(file); res.uploadImage(file);
buttonCb(true); buttonCb(true);
@@ -308,9 +308,6 @@ export default {
> >
<Volume <Volume
v-model:value="diskRows" v-model:value="diskRows"
v-model:block-multi-queue="blockMultiQueue"
v-model:io-threads-policy="ioThreadsPolicy"
v-model:io-thread-count="ioThreadCount"
:mode="mode" :mode="mode"
:namespace="value.metadata.namespace" :namespace="value.metadata.namespace"
:existing-volume-disabled="true" :existing-volume-disabled="true"
@@ -172,7 +172,6 @@ export default {
try { try {
await proxyResource.save(); await proxyResource.save();
proxyResource.notifyGeneratedName?.();
buttonCb(true); buttonCb(true);
this.$router.push({ this.$router.push({
+2 -40
View File
@@ -8,7 +8,6 @@ import LabeledSelect from '@shell/components/form/LabeledSelect';
import { LabeledInput } from '@components/Form/LabeledInput'; import { LabeledInput } from '@components/Form/LabeledInput';
import NameNsDescription from '@shell/components/form/NameNsDescription'; import NameNsDescription from '@shell/components/form/NameNsDescription';
import Conditions from '@shell/components/form/Conditions'; import Conditions from '@shell/components/form/Conditions';
import DiskPerformanceOptions from './kubevirt.io.virtualmachine/VirtualMachineVolume/DiskPerformanceOptions';
import { Banner } from '@components/Banner'; import { Banner } from '@components/Banner';
import { Checkbox } from '@components/Form/Checkbox'; import { Checkbox } from '@components/Form/Checkbox';
import jsyaml from 'js-yaml'; import jsyaml from 'js-yaml';
@@ -46,8 +45,7 @@ export default {
LabeledSelect, LabeledSelect,
LabeledInput, LabeledInput,
NameNsDescription, NameNsDescription,
Conditions, Conditions
DiskPerformanceOptions
}, },
mixins: [CreateEditView], mixins: [CreateEditView],
@@ -100,15 +98,7 @@ export default {
createWithDataVolume: false, createWithDataVolume: false,
snapshots: [], snapshots: [],
images: [], images: [],
GIBIBYTE, GIBIBYTE
// Default KubeVirt high-performance disk profile, stored as annotations and
// applied when this volume is later attached to a VM as a disk.
perf: {
cache: get(this.value, `metadata.annotations."${ HCI_ANNOTATIONS.DISK_CACHE_MODE }"`) || '',
io: get(this.value, `metadata.annotations."${ HCI_ANNOTATIONS.DISK_IO_MODE }"`) || '',
dedicatedIOThread: get(this.value, `metadata.annotations."${ HCI_ANNOTATIONS.DISK_DEDICATED_IOTHREAD }"`) === 'true',
volumeMode: this.value?.spec?.volumeMode,
},
}; };
}, },
@@ -340,7 +330,6 @@ export default {
} }
}, },
'value.spec.volumeMode'(neu) { 'value.spec.volumeMode'(neu) {
this.perf.volumeMode = neu;
if (neu === VOLUME_MODE.FILE_SYSTEM) { if (neu === VOLUME_MODE.FILE_SYSTEM) {
this.setVolumeForVmAnnotation(); this.setVolumeForVmAnnotation();
} else if (neu === VOLUME_MODE.BLOCK ) { } else if (neu === VOLUME_MODE.BLOCK ) {
@@ -455,23 +444,6 @@ export default {
imageAnnotations = { ...this.value.metadata.annotations }; imageAnnotations = { ...this.value.metadata.annotations };
} }
// Persist the default high-performance disk profile as annotations.
if (this.perf.cache) {
imageAnnotations[HCI_ANNOTATIONS.DISK_CACHE_MODE] = this.perf.cache;
} else {
delete imageAnnotations[HCI_ANNOTATIONS.DISK_CACHE_MODE];
}
if (this.perf.io) {
imageAnnotations[HCI_ANNOTATIONS.DISK_IO_MODE] = this.perf.io;
} else {
delete imageAnnotations[HCI_ANNOTATIONS.DISK_IO_MODE];
}
if (this.perf.dedicatedIOThread) {
imageAnnotations[HCI_ANNOTATIONS.DISK_DEDICATED_IOTHREAD] = 'true';
} else {
delete imageAnnotations[HCI_ANNOTATIONS.DISK_DEDICATED_IOTHREAD];
}
const spec = { const spec = {
...this.value.spec, ...this.value.spec,
resources: { requests: { storage: this.storage } }, resources: { requests: { storage: this.storage } },
@@ -636,16 +608,6 @@ export default {
class="mb-20" class="mb-20"
@update:value="update" @update:value="update"
/> />
<Banner
color="info"
:label="t('harvester.volume.performance.pvcTip')"
/>
<DiskPerformanceOptions
:value="perf"
:mode="mode"
@update="update"
/>
</Tab> </Tab>
<Tab <Tab
v-if="!isCreate" v-if="!isCreate"
+3 -14
View File
@@ -9,7 +9,7 @@ import Loading from '@shell/components/Loading';
import CreateEditView from '@shell/mixins/create-edit-view'; import CreateEditView from '@shell/mixins/create-edit-view';
import { RadioGroup } from '@components/Form/Radio'; import { RadioGroup } from '@components/Form/Radio';
import { NETWORK_PROTOCOL, NETWORK_TYPE } from '@pkg/harvester/config/types'; import { NETWORK_PROTOCOL, NETWORK_TYPE } from '@pkg/harvester/config/types';
import { set, remove } from '@shell/utils/object'; import { set } from '@shell/utils/object';
import ArrayList from '@shell/components/form/ArrayList'; import ArrayList from '@shell/components/form/ArrayList';
import { allHash } from '@shell/utils/promise'; import { allHash } from '@shell/utils/promise';
import { HCI } from '../../types'; import { HCI } from '../../types';
@@ -142,12 +142,10 @@ export default {
const inStore = this.$store.getters['currentProduct'].inStore; const inStore = this.$store.getters['currentProduct'].inStore;
const vlans = this.$store.getters[`${ inStore }/all`](HCI.VLAN) || []; const vlans = this.$store.getters[`${ inStore }/all`](HCI.VLAN) || [];
const options = vlans.map((vlan) => ({ return vlans.map((vlan) => ({
label: vlan.id, label: vlan.id,
value: vlan.id, value: vlan.id,
})); }));
return [{ label: this.t('generic.none'), value: '' }, ...options];
} }
}, },
@@ -162,14 +160,6 @@ export default {
} }
}, },
methods: { methods: {
onVlanChange(value) {
if (value === '') {
remove(this.value.spec, 'vlan');
} else {
set(this.value, 'spec.vlan', value);
}
},
async saveSubnet(buttonCb) { async saveSubnet(buttonCb) {
const errors = []; const errors = [];
const name = this.value?.metadata?.name; const name = this.value?.metadata?.name;
@@ -293,13 +283,12 @@ export default {
</div> </div>
<div class="col span-6"> <div class="col span-6">
<LabeledSelect <LabeledSelect
:value="value.spec.vlan ?? ''" v-model:value="value.spec.vlan"
class="mb-20" class="mb-20"
:options="vlanOptions" :options="vlanOptions"
:placeholder="t('harvester.subnet.vlan.placeholder')" :placeholder="t('harvester.subnet.vlan.placeholder')"
:label="t('harvester.subnet.vlan.label')" :label="t('harvester.subnet.vlan.label')"
:mode="mode" :mode="mode"
@update:value="onVlanChange"
/> />
</div> </div>
</div> </div>
@@ -68,6 +68,12 @@ export default {
}, },
watch: { watch: {
osType(neu) {
if (neu === 'windows') {
this.id = '';
}
},
value(neu) { value(neu) {
this.yamlScript = neu; this.yamlScript = neu;
}, },
@@ -157,7 +163,7 @@ $yaml-height: 200px;
flex: 1; flex: 1;
min-height: $yaml-height; min-height: $yaml-height;
& .code-mirror .cm-editor { & .code-mirror .CodeMirror {
min-height: $yaml-height; min-height: $yaml-height;
} }
} }
@@ -287,7 +287,7 @@ $yaml-height: 350px;
flex: 1; flex: 1;
min-height: $yaml-height; min-height: $yaml-height;
& .code-mirror .cm-editor { & .code-mirror .CodeMirror {
min-height: $yaml-height; min-height: $yaml-height;
} }
} }
@@ -133,10 +133,6 @@ export default {
}]; }];
return this.isMasquerade ? masquerade : other; return this.isMasquerade ? masquerade : other;
},
staticIPForVMEnabled() {
return this.$store.getters['harvester-common/getFeatureEnabled']('staticIPForVM');
} }
}, },
@@ -154,7 +150,6 @@ export default {
isSingle(neu) { isSingle(neu) {
if (!neu) { if (!neu) {
this.value['macAddress'] = ''; this.value['macAddress'] = '';
this.value['staticIp'] = '';
this.update(); this.update();
} }
} }
@@ -168,7 +163,6 @@ export default {
if (neu === MANAGEMENT_NETWORK) { if (neu === MANAGEMENT_NETWORK) {
this.value.isPod = true; this.value.isPod = true;
this.value.macAddress = ''; this.value.macAddress = '';
this.value.staticIp = '';
} else { } else {
this.value.isPod = false; this.value.isPod = false;
} }
@@ -295,30 +289,9 @@ export default {
</a> </a>
</div> </div>
<div <div class="row">
v-if="showAdvanced"
class="row"
>
<div
v-if="staticIPForVMEnabled"
data-testid="input-hen-staticIp"
class="col span-6"
>
<InputOrDisplay
:name="t('harvester.fields.staticIp')"
:value="value.staticIp"
:mode="mode"
>
<LabeledInput
v-model:value="value.staticIp"
label-key="harvester.fields.staticIp"
:mode="mode"
:tooltip="t('harvester.virtualMachine.volume.staticIpTip', { nic_name: value.name || 'default' })"
@update:value="update"
/>
</InputOrDisplay>
</div>
<div <div
v-if="showAdvanced"
data-testid="input-hen-macAddress" data-testid="input-hen-macAddress"
class="col span-6" class="col span-6"
> >
@@ -246,27 +246,4 @@ export default {
.group-actions { .group-actions {
display: inline; display: inline;
} }
// Match the enable/disable passthrough bulk-action buttons height to the .btn (40px) on the right.
:deep(.bulk .rc-button.btn-medium.bulk-action:not(.btn-sm)) {
min-height: 40px;
}
// Make the collapsed "Actions" dropdown button 40px too.
:deep(.bulk .rc-button.btn-medium.bulk-actions-dropdown:not(.btn-sm)) {
min-height: 40px;
}
// Lay the bulk row out with flex so the "N selected" label can wrap below the buttons.
:deep(.bulk) {
display: flex;
flex-wrap: wrap;
align-items: center;
}
:deep(.bulk .action-availability) {
flex-basis: 100%;
margin-left: 0;
margin-top: 6px;
}
</style> </style>
@@ -5,7 +5,6 @@ import LabeledSelect from '@shell/components/form/LabeledSelect';
import Banner from '@components/Banner/Banner.vue'; import Banner from '@components/Banner/Banner.vue';
import remove from 'lodash/remove'; import remove from 'lodash/remove';
import { set } from '@shell/utils/object'; import { set } from '@shell/utils/object';
import { uniq } from '@shell/utils/array';
import { HCI } from '../../../types'; import { HCI } from '../../../types';
import DeviceList from './DeviceList'; import DeviceList from './DeviceList';
import CompatibilityMatrix from '../CompatibilityMatrix'; import CompatibilityMatrix from '../CompatibilityMatrix';
@@ -61,15 +60,7 @@ export default {
row.allowDisable = !vmDeviceNames.includes(row.metadata.name); row.allowDisable = !vmDeviceNames.includes(row.metadata.name);
}); });
// When off, read from spec; otherwise the spec name is a placeholder ('provisioned'), vmDevices.forEach(({ name }) => {
// so read the real allocated device names from the deviceAllocationDetails annotation.
const hostDeviceNames = this.vm.isOff ? [
...vmDevices.map(({ name }) => name),
] : [
...Object.values(this.vm?.provisionedHostDevices || {}).reduce((acc, devices) => [...acc, ...devices], []),
];
uniq(hostDeviceNames).forEach((name) => {
if (this.enabledDevices.find((device) => device?.metadata?.name === name)) { if (this.enabledDevices.find((device) => device?.metadata?.name === name)) {
selectedDevices.push(name); selectedDevices.push(name);
} }
@@ -1,334 +0,0 @@
<script>
import LabeledSelect from '@shell/components/form/LabeledSelect';
import { Checkbox } from '@components/Form/Checkbox';
import { Banner } from '@components/Banner';
import { _VIEW } from '@shell/config/query-params';
import { DISK_CACHE_MODE, DISK_IO_MODE, DISK_PERFORMANCE_PROFILE } from '../../../config/harvester-map';
const { DEFAULT, HIGH, CUSTOM } = DISK_PERFORMANCE_PROFILE;
export default {
name: 'DiskPerformanceOptions',
components: {
LabeledSelect, Checkbox, Banner
},
emits: ['update'],
props: {
// The disk row. This component reads/writes value.cache, value.io,
// value.dedicatedIOThread and (for the "High Performance" preset) value.bus.
value: {
type: Object,
default: () => ({})
},
mode: {
type: String,
default: 'create'
},
},
data() {
const hasPerf = !!(this.value.cache || this.value.io || this.value.dedicatedIOThread);
return {
DISK_PERFORMANCE_PROFILE,
expanded: hasPerf,
profile: this.detectProfile(),
// Bus the disk used before the "High Performance" preset switched it to
// virtio, so returning to "Default" can put it back.
busBeforeHighProfile: null,
// True only while the user has explicitly picked "Custom" in the selector.
userSelectedCustom: false,
};
},
computed: {
isView() {
return this.mode === _VIEW;
},
storagePerformanceEnabled() {
return this.$store.getters['harvester-common/getFeatureEnabled']('highPerformanceStorage');
},
isCdRom() {
return this.value.type === 'cd-rom';
},
isCustom() {
return this.profile === CUSTOM;
},
isNativeIo() {
return this.value.io === 'native';
},
profileOptions() {
return [DEFAULT, HIGH, CUSTOM].map((value) => ({
label: this.t(`harvester.virtualMachine.volume.performance.profile.${ value }`),
value,
}));
},
cacheOptions() {
return DISK_CACHE_MODE.map((value) => ({
label: this.cacheLabel(value),
value,
// Native AIO only works with an uncached (O_DIRECT) disk, so while it is
// selected the only valid cache option is "none" — disable everything
// else, including "Default", to prevent an invalid combination.
disabled: this.isNativeIo && value !== 'none',
}));
},
ioOptions() {
return DISK_IO_MODE.map((value) => ({
label: value === '' ? this.t('harvester.virtualMachine.volume.performance.ioMode.default') : this.t(`harvester.virtualMachine.volume.performance.ioMode.${ value }`),
value,
}));
},
showFilesystemCacheWarning() {
return this.value.cache === 'none' && this.value.volumeMode === 'Filesystem';
},
showBusTip() {
const hasPerf = !!(this.value.cache || this.value.io || this.value.dedicatedIOThread);
return hasPerf && this.value.bus && this.value.bus !== 'virtio';
},
},
watch: {
// Keep the profile selector in sync if the row is repopulated (e.g. editing an existing VM).
'value.cache'() {
this.syncProfile();
},
'value.io'() {
this.syncProfile();
},
'value.dedicatedIOThread'() {
this.syncProfile();
},
},
methods: {
detectProfile() {
const { cache, io, dedicatedIOThread } = this.value;
if (!cache && !io && !dedicatedIOThread) {
return DEFAULT;
}
if (cache === 'none' && io === 'native' && dedicatedIOThread) {
return HIGH;
}
return CUSTOM;
},
syncProfile() {
// An explicit "Custom" choice sticks, even if the options happen to
// match the Default or High Performance preset. An inferred "Custom"
// still follows the disk values.
if (this.userSelectedCustom) {
return;
}
this.profile = this.detectProfile();
},
cacheLabel(value) {
if (value === '') {
return this.t('harvester.virtualMachine.volume.performance.cacheMode.default');
}
return this.t(`harvester.virtualMachine.volume.performance.cacheMode.${ value }`);
},
onProfileChange(profile) {
const previous = this.profile;
this.profile = profile;
this.userSelectedCustom = profile === CUSTOM;
if (profile === DEFAULT) {
this.value.cache = '';
this.value.io = '';
this.value.dedicatedIOThread = false;
// "Default" means no overrides, so also undo the virtio bus that the
// "High Performance" preset applied. Skip it if the user has since
// picked a different bus themselves — that choice is theirs to keep.
if (this.busBeforeHighProfile !== null) {
if (this.value.bus === 'virtio') {
this.value.bus = this.busBeforeHighProfile;
}
this.busBeforeHighProfile = null;
}
} else if (profile === HIGH) {
this.value.cache = 'none';
this.value.io = 'native';
this.value.dedicatedIOThread = true;
if (previous !== HIGH) {
this.busBeforeHighProfile = this.value.bus || '';
}
this.value.bus = 'virtio';
}
// CUSTOM keeps whatever is currently set, including the bus.
this.update();
},
onIoChange(io) {
this.value.io = io;
// Native AIO requires an uncached disk; force cache to "none" to keep the
// combo valid — including when cache is still on its "Default" ('') value,
// which libvirt would otherwise reject at domain start.
if (io === 'native' && this.value.cache !== 'none') {
this.value.cache = 'none';
}
this.update();
},
update() {
this.$emit('update');
},
},
};
</script>
<template>
<div
v-if="!isCdRom && storagePerformanceEnabled"
class="disk-performance"
>
<button
v-if="!isView"
type="button"
class="btn btn-sm role-link expand-toggle"
:aria-expanded="expanded"
:aria-label="expanded ? t('harvester.virtualMachine.volume.performance.collapse') : t('harvester.virtualMachine.volume.performance.expand')"
@click.prevent="expanded = !expanded"
>
<i
class="icon"
:class="expanded ? 'icon-chevron-down' : 'icon-chevron-right'"
/>
{{ t('harvester.virtualMachine.volume.performance.title') }}
</button>
<div
v-if="expanded || isView"
class="perf-body mt-10"
>
<div class="row mb-20">
<div
class="col span-6"
data-testid="input-disk-perf-profile"
>
<LabeledSelect
:value="profile"
:label="t('harvester.virtualMachine.volume.performance.profile.label')"
:tooltip="t('harvester.virtualMachine.volume.performance.profile.tip')"
:options="profileOptions"
:mode="mode"
@update:value="onProfileChange"
/>
</div>
</div>
<Banner
v-if="profile === DISK_PERFORMANCE_PROFILE.HIGH"
color="info"
label-key="harvester.virtualMachine.volume.performance.highProfileTip"
/>
<div
v-if="isCustom || isView"
class="row mb-20"
>
<div
class="col span-6"
data-testid="input-disk-cache"
>
<LabeledSelect
v-model:value="value.cache"
:label="t('harvester.virtualMachine.volume.performance.cacheMode.label')"
:tooltip="t('harvester.virtualMachine.volume.performance.cacheMode.tip')"
:options="cacheOptions"
:mode="mode"
@update:value="update"
/>
</div>
<div
class="col span-6"
data-testid="input-disk-io"
>
<LabeledSelect
:value="value.io"
:label="t('harvester.virtualMachine.volume.performance.ioMode.label')"
:tooltip="t('harvester.virtualMachine.volume.performance.ioMode.tip')"
:options="ioOptions"
:mode="mode"
@update:value="onIoChange"
/>
</div>
</div>
<div
v-if="isCustom || isView"
class="row mb-10"
>
<div
class="col span-12"
data-testid="input-disk-dedicated-iothread"
>
<Checkbox
v-model:value="value.dedicatedIOThread"
:label="t('harvester.virtualMachine.volume.performance.dedicatedIOThread.label')"
:tooltip="t('harvester.virtualMachine.volume.performance.dedicatedIOThread.tip')"
:mode="mode"
@update:value="update"
/>
</div>
</div>
<Banner
v-if="isNativeIo"
color="info"
label-key="harvester.virtualMachine.volume.performance.ioMode.nativeRequiresNoCacheTip"
/>
<Banner
v-if="showFilesystemCacheWarning"
color="warning"
label-key="harvester.virtualMachine.volume.performance.cacheMode.filesystemWarning"
/>
<Banner
v-if="showBusTip"
color="warning"
label-key="harvester.virtualMachine.volume.performance.busTip"
/>
</div>
</div>
</template>
<style lang="scss" scoped>
.disk-performance {
border-top: 1px solid var(--border);
margin-top: 10px;
padding-top: 10px;
.expand-toggle {
padding: 0;
font-weight: 600;
.icon {
margin-right: 4px;
}
}
}
</style>
@@ -1,191 +0,0 @@
<script>
import InfoBox from '@shell/components/InfoBox';
import LabeledSelect from '@shell/components/form/LabeledSelect';
import { LabeledInput } from '@components/Form/LabeledInput';
import { Checkbox } from '@components/Form/Checkbox';
import { Banner } from '@components/Banner';
import { _VIEW } from '@shell/config/query-params';
import { IO_THREADS_POLICY } from '../../../config/harvester-map';
export default {
name: 'VMPerformanceOptions',
components: {
InfoBox, LabeledSelect, LabeledInput, Checkbox, Banner
},
emits: ['update:blockMultiQueue', 'update:ioThreadsPolicy', 'update:ioThreadCount'],
props: {
blockMultiQueue: {
type: Boolean,
default: false
},
ioThreadsPolicy: {
type: String,
default: ''
},
ioThreadCount: {
type: Number,
default: 2
},
mode: {
type: String,
default: 'create'
},
// Whether the current disk set contains a virtio disk (VM context only).
hasVirtioDisk: {
type: Boolean,
default: true
},
// Whether any disk requests a dedicated I/O thread (drives the auto-enable hint).
hasDedicatedIothread: {
type: Boolean,
default: false
},
},
data() {
// These are specialist tuning options, so keep the panel collapsed unless the
// VM already has something configured.
return { expanded: !!(this.blockMultiQueue || this.ioThreadsPolicy) };
},
computed: {
isView() {
return this.mode === _VIEW;
},
storagePerformanceEnabled() {
return this.$store.getters['harvester-common/getFeatureEnabled']('highPerformanceStorage');
},
ioThreadsPolicyOptions() {
return IO_THREADS_POLICY.map((value) => ({
label: value === '' ? this.t('harvester.virtualMachine.volume.diskPerformance.ioThreadsPolicy.default') : this.t(`harvester.virtualMachine.volume.diskPerformance.ioThreadsPolicy.${ value }`),
value,
}));
},
},
watch: {
// Block Multi-Queue only applies to virtio disks. If the last virtio disk is
// removed while it is enabled, clear it so the VM is not left with an invalid
// setting the disabled checkbox can no longer surface.
hasVirtioDisk(neu) {
if (!neu && this.blockMultiQueue) {
this.$emit('update:blockMultiQueue', false);
}
},
},
};
</script>
<template>
<InfoBox
v-if="storagePerformanceEnabled && (!isView || blockMultiQueue || !!ioThreadsPolicy)"
class="vm-perf mt-10"
>
<button
v-if="!isView"
type="button"
class="btn btn-sm role-link expand-toggle"
:aria-expanded="expanded"
:aria-label="expanded ? t('harvester.virtualMachine.volume.diskPerformance.collapse') : t('harvester.virtualMachine.volume.diskPerformance.expand')"
@click.prevent="expanded = !expanded"
>
<i
class="icon"
:class="expanded ? 'icon-chevron-down' : 'icon-chevron-right'"
/>
{{ t('harvester.virtualMachine.volume.diskPerformance.title') }}
</button>
<h3
v-else
class="mb-5"
>
{{ t('harvester.virtualMachine.volume.diskPerformance.title') }}
</h3>
<template v-if="expanded || isView">
<p class="text-muted mb-15 mt-10">
{{ t('harvester.virtualMachine.volume.diskPerformance.description') }}
</p>
<div class="row mb-10">
<div
class="col span-12"
data-testid="input-vm-block-multi-queue"
>
<Checkbox
:value="blockMultiQueue"
:label="t('harvester.virtualMachine.volume.diskPerformance.blockMultiQueue.label')"
:tooltip="t('harvester.virtualMachine.volume.diskPerformance.blockMultiQueue.tip')"
:mode="mode"
:disabled="!hasVirtioDisk"
@update:value="$emit('update:blockMultiQueue', $event)"
/>
</div>
</div>
<Banner
v-if="!hasVirtioDisk && !isView"
color="info"
label-key="harvester.virtualMachine.volume.diskPerformance.blockMultiQueue.noVirtioTip"
/>
<div class="row mb-10">
<div
class="col span-6"
data-testid="input-vm-iothreads-policy"
>
<LabeledSelect
:value="ioThreadsPolicy"
:label="t('harvester.virtualMachine.volume.diskPerformance.ioThreadsPolicy.label')"
:tooltip="t('harvester.virtualMachine.volume.diskPerformance.ioThreadsPolicy.tip')"
:options="ioThreadsPolicyOptions"
:mode="mode"
@update:value="$emit('update:ioThreadsPolicy', $event)"
/>
</div>
<div
v-if="ioThreadsPolicy === 'supplementalPool'"
class="col span-6"
data-testid="input-vm-iothread-count"
>
<LabeledInput
type="number"
min="1"
:value="ioThreadCount"
:label="t('harvester.virtualMachine.volume.diskPerformance.ioThreadCount.label')"
:tooltip="t('harvester.virtualMachine.volume.diskPerformance.ioThreadCount.tip')"
:mode="mode"
@update:value="$emit('update:ioThreadCount', Number($event))"
/>
</div>
</div>
<Banner
v-if="hasDedicatedIothread && !ioThreadsPolicy"
color="info"
label-key="harvester.virtualMachine.volume.diskPerformance.ioThreadsPolicy.autoEnabledTip"
/>
</template>
</InfoBox>
</template>
<style lang="scss" scoped>
.vm-perf {
.expand-toggle {
padding: 0;
font-weight: 600;
.icon {
margin-right: 4px;
}
}
}
</style>
@@ -1,182 +0,0 @@
import { mount } from '@vue/test-utils';
import { nextTick } from 'vue';
import { _EDIT } from '@shell/config/query-params';
import { Banner } from '@components/Banner';
import DiskPerformanceOptions from '../DiskPerformanceOptions.vue';
const mountOptions = (value, { featureEnabled = true } = {}) => ({
props: { value, mode: _EDIT },
global: {
mocks: {
$store: {
getters: {
'harvester-common/getFeatureEnabled': () => featureEnabled,
'i18n/t': (key) => key,
'i18n/exists': () => true,
}
},
t: (key) => key,
},
}
});
const hardDisk = (overrides = {}) => ({
type: 'disk', bus: 'virtio', cache: '', io: '', dedicatedIOThread: false, ...overrides
});
describe('component: DiskPerformanceOptions', () => {
it('is hidden when the highPerformanceStorage feature is disabled', () => {
const wrapper = mount(DiskPerformanceOptions, mountOptions(hardDisk(), { featureEnabled: false }));
expect(wrapper.find('.disk-performance').exists()).toBe(false);
});
it('renders for a hard disk when the feature is enabled', () => {
const wrapper = mount(DiskPerformanceOptions, mountOptions(hardDisk()));
expect(wrapper.find('.disk-performance').exists()).toBe(true);
});
it('applies the High Performance preset and emits update', () => {
const value = hardDisk();
const wrapper = mount(DiskPerformanceOptions, mountOptions(value));
wrapper.vm.onProfileChange('highPerformance');
expect(value.cache).toBe('none');
expect(value.io).toBe('native');
expect(value.dedicatedIOThread).toBe(true);
expect(value.bus).toBe('virtio');
expect(wrapper.emitted('update')).toHaveLength(1);
});
it('clears all overrides when switching back to Default', () => {
const value = hardDisk({
cache: 'none', io: 'native', dedicatedIOThread: true
});
const wrapper = mount(DiskPerformanceOptions, mountOptions(value));
wrapper.vm.onProfileChange('default');
expect(value.cache).toBe('');
expect(value.io).toBe('');
expect(value.dedicatedIOThread).toBe(false);
expect(wrapper.emitted('update')).toHaveLength(1);
});
it('restores the original bus when leaving High Performance for Default', () => {
const value = hardDisk({ bus: 'sata' });
const wrapper = mount(DiskPerformanceOptions, mountOptions(value));
wrapper.vm.onProfileChange('highPerformance');
expect(value.bus).toBe('virtio');
wrapper.vm.onProfileChange('default');
expect(value.bus).toBe('sata');
});
it('keeps a bus the user picked themselves after High Performance', () => {
const value = hardDisk({ bus: 'sata' });
const wrapper = mount(DiskPerformanceOptions, mountOptions(value));
wrapper.vm.onProfileChange('highPerformance');
value.bus = 'scsi';
wrapper.vm.onProfileChange('default');
expect(value.bus).toBe('scsi');
});
it('leaves the bus alone for a disk that never used the High Performance preset', () => {
const value = hardDisk({
bus: 'sata', cache: 'writeback', io: 'threads'
});
const wrapper = mount(DiskPerformanceOptions, mountOptions(value));
wrapper.vm.onProfileChange('default');
expect(value.bus).toBe('sata');
});
it.each([
['a cached state', 'writeback'],
['the Default cache', ''],
])('forces cache to none when Native I/O is selected from %s', (_label, cache) => {
const value = hardDisk({ cache });
const wrapper = mount(DiskPerformanceOptions, mountOptions(value));
wrapper.vm.onIoChange('native');
expect(value.io).toBe('native');
expect(value.cache).toBe('none');
expect(wrapper.emitted('update')).toHaveLength(1);
});
it('disables every cache option except none while Native I/O is active', () => {
const wrapper = mount(DiskPerformanceOptions, mountOptions(hardDisk({ io: 'native' })));
const disabledByValue = wrapper.vm.cacheOptions.reduce((acc, opt) => {
acc[opt.value] = opt.disabled;
return acc;
}, {});
expect(disabledByValue['none']).toBe(false);
expect(disabledByValue['']).toBe(true);
expect(disabledByValue['writeback']).toBe(true);
expect(disabledByValue['writethrough']).toBe(true);
});
it.each([
['Default', {
cache: '', io: '', dedicatedIOThread: false
}],
['High Performance', {
cache: 'none', io: 'native', dedicatedIOThread: true
}],
])('stays on Custom when the options match the %s preset', async(_label, opts) => {
const value = hardDisk({ cache: 'writeback' });
const wrapper = mount(DiskPerformanceOptions, mountOptions(value));
wrapper.vm.onProfileChange('custom');
await wrapper.setProps({ value: { ...value, ...opts } });
await nextTick();
expect(wrapper.vm.profile).toBe('custom');
});
it('detects the profile from an existing disk', async() => {
const wrapper = mount(DiskPerformanceOptions, mountOptions(hardDisk()));
expect(wrapper.vm.profile).toBe('default');
await wrapper.setProps({
value: hardDisk({
cache: 'none', io: 'native', dedicatedIOThread: true
})
});
expect(wrapper.vm.profile).toBe('highPerformance');
});
it('updates an automatically detected Custom profile when preset values are loaded', async() => {
const wrapper = mount(DiskPerformanceOptions, mountOptions(hardDisk({ cache: 'writeback' })));
expect(wrapper.vm.profile).toBe('custom');
await wrapper.setProps({
value: hardDisk({
cache: 'none', io: 'native', dedicatedIOThread: true
})
});
expect(wrapper.vm.profile).toBe('highPerformance');
});
it('passes the Native I/O hint as a label key so its quotes are not double-escaped', () => {
const wrapper = mount(DiskPerformanceOptions, mountOptions(hardDisk({ io: 'native' })));
const banner = wrapper.findAllComponents(Banner)
.find((b) => b.props('labelKey') === 'harvester.virtualMachine.volume.performance.ioMode.nativeRequiresNoCacheTip');
expect(banner).toBeDefined();
expect(banner?.props('label')).toBeFalsy();
});
});
@@ -1,61 +0,0 @@
import { mount } from '@vue/test-utils';
import { _CREATE } from '@shell/config/query-params';
import { Banner } from '@components/Banner';
import VMPerformanceOptions from '../VMPerformanceOptions.vue';
const AUTO_ENABLED_TIP = 'harvester.virtualMachine.volume.diskPerformance.ioThreadsPolicy.autoEnabledTip';
const NO_VIRTIO_TIP = 'harvester.virtualMachine.volume.diskPerformance.blockMultiQueue.noVirtioTip';
function mountOptions(props = {}) {
return mount(VMPerformanceOptions, {
props: { mode: _CREATE, ...props },
global: {
mocks: {
$store: {
getters: {
'harvester-common/getFeatureEnabled': () => true,
'i18n/t': (key) => key,
'i18n/exists': () => true,
}
},
t: (key) => key,
},
},
});
}
async function expand(wrapper) {
await wrapper.find('.expand-toggle').trigger('click');
}
function bannerFor(wrapper, labelKey) {
return wrapper.findAllComponents(Banner).find((b) => b.props('labelKey') === labelKey);
}
describe('component: VMPerformanceOptions', () => {
it('should pass the I/O threads policy hint as a label key so its quotes are not double-escaped', async() => {
const wrapper = mountOptions({ hasDedicatedIothread: true });
await expand(wrapper);
const banner = bannerFor(wrapper, AUTO_ENABLED_TIP);
expect(banner).toBeDefined();
expect(banner.props('label')).toBeFalsy();
});
it('should not show the I/O threads policy hint when a policy is set', async() => {
const wrapper = mountOptions({ hasDedicatedIothread: true, ioThreadsPolicy: 'shared' });
expect(bannerFor(wrapper, AUTO_ENABLED_TIP)).toBeUndefined();
});
it('should pass the no virtio disk hint as a label key', async() => {
const wrapper = mountOptions({ hasVirtioDisk: false });
await expand(wrapper);
const banner = bannerFor(wrapper, NO_VIRTIO_TIP);
expect(banner).toBeDefined();
expect(banner.props('label')).toBeFalsy();
});
});
@@ -7,14 +7,13 @@ import UnitInput from '@shell/components/form/UnitInput';
import { LabeledInput } from '@components/Form/LabeledInput'; import { LabeledInput } from '@components/Form/LabeledInput';
import LabeledSelect from '@shell/components/form/LabeledSelect'; import LabeledSelect from '@shell/components/form/LabeledSelect';
import ModalWithCard from '@shell/components/ModalWithCard'; import ModalWithCard from '@shell/components/ModalWithCard';
import VMPerformanceOptions from './VMPerformanceOptions';
import { VOLUME_HOTPLUG_ACTION, SOURCE_TYPE } from '../../../config/harvester-map';
import { PVC, STORAGE_CLASS } from '@shell/config/types'; import { PVC, STORAGE_CLASS } from '@shell/config/types';
import { clone } from '@shell/utils/object'; import { clone } from '@shell/utils/object';
import { ucFirst, randomStr } from '@shell/utils/string'; import { ucFirst, randomStr } from '@shell/utils/string';
import { removeObject } from '@shell/utils/array'; import { removeObject } from '@shell/utils/array';
import { _VIEW, _EDIT, _CREATE } from '@shell/config/query-params'; import { _VIEW, _EDIT, _CREATE } from '@shell/config/query-params';
import { PLUGIN_DEVELOPER, DEV } from '@shell/store/prefs'; import { PLUGIN_DEVELOPER, DEV } from '@shell/store/prefs';
import { VOLUME_HOTPLUG_ACTION, SOURCE_TYPE } from '../../../config/harvester-map';
import { PRODUCT_NAME as HARVESTER_PRODUCT } from '../../../config/harvester'; import { PRODUCT_NAME as HARVESTER_PRODUCT } from '../../../config/harvester';
import { HCI } from '../../../types'; import { HCI } from '../../../types';
import { VOLUME_MODE } from '@pkg/harvester/config/types'; import { VOLUME_MODE } from '@pkg/harvester/config/types';
@@ -22,10 +21,10 @@ import { OFF } from '../../../models/kubevirt.io.virtualmachine';
import { EMPTY_IMAGE } from '../../../utils/vm'; import { EMPTY_IMAGE } from '../../../utils/vm';
export default { export default {
emits: ['update:value', 'update:blockMultiQueue', 'update:ioThreadsPolicy', 'update:ioThreadCount'], emits: ['update:value'],
components: { components: {
Banner, BadgeStateFormatter, VueDraggableNext, InfoBox, LabeledInput, UnitInput, LabeledSelect, ModalWithCard, VMPerformanceOptions Banner, BadgeStateFormatter, VueDraggableNext, InfoBox, LabeledInput, UnitInput, LabeledSelect, ModalWithCard
}, },
props: { props: {
@@ -76,22 +75,6 @@ export default {
resourceType: { resourceType: {
type: String, type: String,
default: '' default: ''
},
// KubeVirt high-performance VM-level features
blockMultiQueue: {
type: Boolean,
default: false
},
ioThreadsPolicy: {
type: String,
default: ''
},
ioThreadCount: {
type: Number,
default: 2
} }
}, },
@@ -162,14 +145,6 @@ export default {
isLHV2VolExpansionFeatureEnabled() { isLHV2VolExpansionFeatureEnabled() {
return this.$store.getters['harvester-common/getFeatureEnabled']('lhV2VolExpansion'); return this.$store.getters['harvester-common/getFeatureEnabled']('lhV2VolExpansion');
}, },
hasVirtioDisk() {
return this.rows.some((R) => R.type === 'disk' && R.bus === 'virtio');
},
hasDedicatedIOThread() {
return this.rows.some((R) => R.dedicatedIOThread);
},
}, },
watch: { watch: {
@@ -531,18 +506,6 @@ export default {
</button> </button>
</div> </div>
<VMPerformanceOptions
:block-multi-queue="blockMultiQueue"
:io-threads-policy="ioThreadsPolicy"
:io-thread-count="ioThreadCount"
:has-virtio-disk="hasVirtioDisk"
:has-dedicated-iothread="hasDedicatedIOThread"
:mode="mode"
@update:block-multi-queue="$emit('update:blockMultiQueue', $event)"
@update:io-threads-policy="$emit('update:ioThreadsPolicy', $event)"
@update:io-thread-count="$emit('update:ioThreadCount', $event)"
/>
<ModalWithCard <ModalWithCard
v-if="isOpen" v-if="isOpen"
name="deleteTip" name="deleteTip"
@@ -2,23 +2,9 @@ import { mount } from '@vue/test-utils';
import { _EDIT } from '@shell/config/query-params'; import { _EDIT } from '@shell/config/query-params';
import HarvesterEditContainer from '../container.vue'; import HarvesterEditContainer from '../container.vue';
const mountOptions = () => ({
props: { mode: _EDIT, value: {} },
global: {
mocks: {
$store: {
getters: {
'harvester-common/getFeatureEnabled': () => true,
'i18n/t': jest.fn(),
}
}
}
}
});
describe('component: HarvesterEditContainer', () => { describe('component: HarvesterEditContainer', () => {
it('should display all the inputs', () => { it('should display all the inputs', () => {
const wrapper = mount(HarvesterEditContainer, mountOptions()); const wrapper = mount(HarvesterEditContainer, { propsData: { mode: _EDIT, value: {} } });
const inputWraps = wrapper.findAll('[data-testid^=input-hec-]'); const inputWraps = wrapper.findAll('[data-testid^=input-hec-]');
@@ -29,7 +15,7 @@ describe('component: HarvesterEditContainer', () => {
'name', 'name',
'container', 'container',
])('should emit an update on %p input', (field) => { ])('should emit an update on %p input', (field) => {
const wrapper = mount(HarvesterEditContainer, mountOptions()); const wrapper = mount(HarvesterEditContainer, { propsData: { mode: _EDIT, value: {} } });
const input = wrapper.find(`[data-testid="input-hec-${ field }"]`).find('input'); const input = wrapper.find(`[data-testid="input-hec-${ field }"]`).find('input');
const newValue = 123; const newValue = 123;
@@ -42,7 +28,7 @@ describe('component: HarvesterEditContainer', () => {
'type', 'type',
'bus', 'bus',
])('should emit an update on %p selection change', async(field) => { ])('should emit an update on %p selection change', async(field) => {
const wrapper = mount(HarvesterEditContainer, mountOptions()); const wrapper = mount(HarvesterEditContainer, { propsData: { mode: _EDIT, value: {} } });
const select = wrapper.find(`[data-testid="input-hec-${ field }"]`); const select = wrapper.find(`[data-testid="input-hec-${ field }"]`);
select.find('button').trigger('click'); select.find('button').trigger('click');
@@ -5,17 +5,14 @@ import HarvesterEditExisting from '../existing.vue';
describe('component: HarvesterEditExisting', () => { describe('component: HarvesterEditExisting', () => {
it('should display all the inputs', () => { it('should display all the inputs', () => {
const wrapper = mount(HarvesterEditExisting, { const wrapper = mount(HarvesterEditExisting, {
props: { propsData: {
mode: _EDIT, value: {}, rows: [] mode: _EDIT, value: {}, rows: []
}, },
global: { mocks: {
mocks: { $store: {
$store: { getters: {
getters: { 'harvester/all': () => [],
'harvester-common/getFeatureEnabled': () => true, 'i18n/t': jest.fn()
'harvester/all': () => [],
'i18n/t': jest.fn()
}
} }
} }
} }
@@ -30,17 +27,14 @@ describe('component: HarvesterEditExisting', () => {
'name', 'name',
])('should emit an update on %p input', (field) => { ])('should emit an update on %p input', (field) => {
const wrapper = mount(HarvesterEditExisting, { const wrapper = mount(HarvesterEditExisting, {
props: { propsData: {
mode: _EDIT, value: {}, rows: [] mode: _EDIT, value: {}, rows: []
}, },
global: { mocks: {
mocks: { $store: {
$store: { getters: {
getters: { 'harvester/all': () => [],
'harvester-common/getFeatureEnabled': () => true, 'i18n/t': jest.fn()
'harvester/all': () => [],
'i18n/t': jest.fn()
}
} }
} }
} }
@@ -59,17 +53,14 @@ describe('component: HarvesterEditExisting', () => {
'size', 'size',
])('should emit an update on %p input and blur', (field) => { ])('should emit an update on %p input and blur', (field) => {
const wrapper = mount(HarvesterEditExisting, { const wrapper = mount(HarvesterEditExisting, {
props: { propsData: {
mode: _EDIT, value: {}, rows: [] mode: _EDIT, value: {}, rows: []
}, },
global: { mocks: {
mocks: { $store: {
$store: { getters: {
getters: { 'harvester/all': () => [],
'harvester-common/getFeatureEnabled': () => true, 'i18n/t': jest.fn()
'harvester/all': () => [],
'i18n/t': jest.fn()
}
} }
} }
} }
@@ -89,17 +80,14 @@ describe('component: HarvesterEditExisting', () => {
// 'bus', // disabled // 'bus', // disabled
])('should emit an update on %p selection change', async(field) => { ])('should emit an update on %p selection change', async(field) => {
const wrapper = mount(HarvesterEditExisting, { const wrapper = mount(HarvesterEditExisting, {
props: { propsData: {
mode: _EDIT, value: {}, rows: [] mode: _EDIT, value: {}, rows: []
}, },
global: { mocks: {
mocks: { $store: {
$store: { getters: {
getters: { 'harvester/all': () => [],
'harvester-common/getFeatureEnabled': () => true, 'i18n/t': jest.fn()
'harvester/all': () => [],
'i18n/t': jest.fn()
}
} }
} }
} }
@@ -2,29 +2,23 @@ import { mount } from '@vue/test-utils';
import { _CREATE } from '@shell/config/query-params'; import { _CREATE } from '@shell/config/query-params';
import HarvesterEditVMImage from '../vmImage.vue'; import HarvesterEditVMImage from '../vmImage.vue';
// The form emits an update when it is created, so count only the updates that an interaction adds
const updates = (wrapper) => wrapper.emitted('update')?.length ?? 0;
describe('component: HarvesterEditVMImage', () => { describe('component: HarvesterEditVMImage', () => {
it('should display all the inputs', () => { it('should display all the inputs', () => {
const wrapper = mount(HarvesterEditVMImage, { const wrapper = mount(HarvesterEditVMImage, {
props: { propsData: {
mode: _CREATE, mode: _CREATE,
isVirtualType: false, isVirtualType: false,
newCreateId: '123', newCreateId: '123',
validateRequired: true, validateRequired: true,
idx: 1 idx: 1
}, },
global: { mocks: {
mocks: { $store: {
$store: { getters: {
getters: { 'harvester/all': jest.fn(),
'harvester-common/getFeatureEnabled': () => true, 'i18n/t': jest.fn(),
'harvester/all': jest.fn(), }
'i18n/t': jest.fn(), },
}
},
}
} }
}); });
@@ -37,23 +31,20 @@ describe('component: HarvesterEditVMImage', () => {
'name', 'name',
])('should emit an update on %p input', (field) => { ])('should emit an update on %p input', (field) => {
const wrapper = mount(HarvesterEditVMImage, { const wrapper = mount(HarvesterEditVMImage, {
props: { propsData: {
mode: _CREATE, mode: _CREATE,
isVirtualType: false, isVirtualType: false,
newCreateId: '123', newCreateId: '123',
validateRequired: true, validateRequired: true,
idx: 1 idx: 1
}, },
global: { mocks: {
mocks: { $store: {
$store: { getters: {
getters: { 'harvester/all': jest.fn(),
'harvester-common/getFeatureEnabled': () => true, 'i18n/t': jest.fn(),
'harvester/all': jest.fn(), }
'i18n/t': jest.fn(), },
}
},
}
} }
}); });
const input = wrapper.find(`[data-testid="input-hevi-${ field }"]`).find('input'); const input = wrapper.find(`[data-testid="input-hevi-${ field }"]`).find('input');
@@ -66,38 +57,31 @@ describe('component: HarvesterEditVMImage', () => {
it.each([ it.each([
'size', 'size',
])('should emit an update on %p input blur', async(field) => { ])('should emit an update on %p input blur', (field) => {
const wrapper = mount(HarvesterEditVMImage, { const wrapper = mount(HarvesterEditVMImage, {
props: { propsData: {
mode: _CREATE, mode: _CREATE,
isVirtualType: false, isVirtualType: false,
newCreateId: '123', newCreateId: '123',
validateRequired: true, validateRequired: true,
idx: 1 idx: 1
}, },
global: { mocks: {
mocks: { $store: {
$store: { getters: {
getters: { 'harvester/all': jest.fn(),
'harvester-common/getFeatureEnabled': () => true, 'i18n/t': jest.fn(),
'harvester/all': jest.fn(), }
'i18n/t': jest.fn(), },
}
},
}
} }
}); });
const input = wrapper.find(`[data-testid="input-hevi-${ field }"]`).find('input'); const input = wrapper.find(`[data-testid="input-hevi-${ field }"]`).find('input');
const newValue = 123; const newValue = 123;
// setting the value already emits an update, so the blur has to add one on top of that input.setValue(newValue);
await input.setValue(newValue); input.trigger('blur');
const afterSetValue = updates(wrapper); expect(wrapper.emitted('update')).toHaveLength(1);
await input.trigger('blur');
expect(updates(wrapper)).toBeGreaterThan(afterSetValue);
}); });
it.each([ it.each([
@@ -106,23 +90,20 @@ describe('component: HarvesterEditVMImage', () => {
'bus', 'bus',
])('should emit an update on %p selection change', async(field) => { ])('should emit an update on %p selection change', async(field) => {
const wrapper = mount(HarvesterEditVMImage, { const wrapper = mount(HarvesterEditVMImage, {
props: { propsData: {
mode: _CREATE, mode: _CREATE,
isVirtualType: false, isVirtualType: false,
newCreateId: '123', newCreateId: '123',
validateRequired: true, validateRequired: true,
idx: 1 idx: 1
}, },
global: { mocks: {
mocks: { $store: {
$store: { getters: {
getters: { 'harvester/all': jest.fn(),
'harvester-common/getFeatureEnabled': () => true, 'i18n/t': jest.fn(),
'harvester/all': jest.fn(), }
'i18n/t': jest.fn(), },
}
},
}
} }
}); });
const select = wrapper.find(`[data-testid="input-hevi-${ field }"]`); const select = wrapper.find(`[data-testid="input-hevi-${ field }"]`);
@@ -2,24 +2,18 @@ import { mount } from '@vue/test-utils';
import { _EDIT } from '@shell/config/query-params'; import { _EDIT } from '@shell/config/query-params';
import HarvesterEditVolume from '../volume.vue'; import HarvesterEditVolume from '../volume.vue';
// The form emits an update when it is created, so count only the updates that an interaction adds
const updates = (wrapper) => wrapper.emitted('update')?.length ?? 0;
describe('component: HarvesterEditVolume', () => { describe('component: HarvesterEditVolume', () => {
it('should display all the inputs', () => { it('should display all the inputs', () => {
const wrapper = mount(HarvesterEditVolume, { const wrapper = mount(HarvesterEditVolume, {
props: { validateRequired: true }, propsData: { validateRequired: true },
global: { mocks: {
mocks: { $store: {
$store: { getters: {
getters: { 'harvester/all': jest.fn(),
'harvester-common/getFeatureEnabled': () => true, 'i18n/t': jest.fn(),
'harvester/all': jest.fn(), 'i18n/exists': jest.fn(),
'i18n/t': jest.fn(), }
'i18n/exists': jest.fn(), },
}
},
}
} }
}); });
@@ -28,56 +22,29 @@ describe('component: HarvesterEditVolume', () => {
expect(inputWraps).toHaveLength(4); expect(inputWraps).toHaveLength(4);
}); });
it('should emit an update on name input', async() => { it.each([
'name',
'size',
])('should emit an update on %p input blur', (field) => {
const wrapper = mount(HarvesterEditVolume, { const wrapper = mount(HarvesterEditVolume, {
props: { mode: _EDIT, validateRequired: true }, propsData: { mode: _EDIT, validateRequired: true },
global: { mocks: {
mocks: { $store: {
$store: { getters: {
getters: { 'harvester/all': jest.fn(),
'harvester-common/getFeatureEnabled': () => true, 'i18n/t': jest.fn(),
'harvester/all': jest.fn(), 'i18n/exists': jest.fn(),
'i18n/t': jest.fn(), }
'i18n/exists': jest.fn(), },
}
},
}
} }
}); });
const before = updates(wrapper); const input = wrapper.find(`[data-testid="input-hev-${ field }"]`).find('input');
const input = wrapper.find('[data-testid="input-hev-name"]').find('input'); const newValue = 123;
await input.setValue(123); input.setValue(newValue);
input.trigger('blur');
expect(updates(wrapper)).toBeGreaterThan(before); expect(wrapper.emitted('update')).toHaveLength(1);
});
it('should emit an update on size input blur', async() => {
const wrapper = mount(HarvesterEditVolume, {
props: { mode: _EDIT, validateRequired: true },
global: {
mocks: {
$store: {
getters: {
'harvester-common/getFeatureEnabled': () => true,
'harvester/all': jest.fn(),
'i18n/t': jest.fn(),
'i18n/exists': jest.fn(),
}
},
}
}
});
const input = wrapper.find('[data-testid="input-hev-size"]').find('input');
// setting the value already emits an update, so the blur has to add one on top of that
await input.setValue(123);
const afterSetValue = updates(wrapper);
await input.trigger('blur');
expect(updates(wrapper)).toBeGreaterThan(afterSetValue);
}); });
it.each([ it.each([
@@ -85,27 +52,23 @@ describe('component: HarvesterEditVolume', () => {
'bus' 'bus'
])('should emit an update on %p selection change', async(field) => { ])('should emit an update on %p selection change', async(field) => {
const wrapper = mount(HarvesterEditVolume, { const wrapper = mount(HarvesterEditVolume, {
props: { mode: _EDIT, validateRequired: true }, propsData: { mode: _EDIT, validateRequired: true },
global: { mocks: {
mocks: { $store: {
$store: { getters: {
getters: { 'harvester/all': jest.fn(),
'harvester-common/getFeatureEnabled': () => true, 'i18n/t': jest.fn(),
'harvester/all': jest.fn(), 'i18n/exists': jest.fn(),
'i18n/t': jest.fn(), }
'i18n/exists': jest.fn(), },
}
},
}
} }
}); });
const before = updates(wrapper);
const select = wrapper.find(`[data-testid="input-hev-${ field }"]`); const select = wrapper.find(`[data-testid="input-hev-${ field }"]`);
select.find('button').trigger('click'); select.find('button').trigger('click');
await wrapper.trigger('keydown.down'); await wrapper.trigger('keydown.down');
await wrapper.trigger('keydown.enter'); await wrapper.trigger('keydown.enter');
expect(updates(wrapper)).toBeGreaterThan(before); expect(wrapper.emitted('update')).toHaveLength(1);
}); });
}); });
@@ -4,7 +4,6 @@ import LabeledSelect from '@shell/components/form/LabeledSelect';
import InputOrDisplay from '@shell/components/InputOrDisplay'; import InputOrDisplay from '@shell/components/InputOrDisplay';
import { VOLUME_TYPE, InterfaceOption } from '../../../../config/harvester-map'; import { VOLUME_TYPE, InterfaceOption } from '../../../../config/harvester-map';
import { Banner } from '@components/Banner'; import { Banner } from '@components/Banner';
import DiskPerformanceOptions from '../DiskPerformanceOptions';
export default { export default {
name: 'HarvesterEditContainer', name: 'HarvesterEditContainer',
@@ -12,7 +11,7 @@ export default {
emits: ['update'], emits: ['update'],
components: { components: {
LabeledInput, LabeledSelect, InputOrDisplay, Banner, DiskPerformanceOptions LabeledInput, LabeledSelect, InputOrDisplay, Banner
}, },
props: { props: {
@@ -154,11 +153,5 @@ export default {
class="mb-20" class="mb-20"
:label="value.volumeBackups.error.message" :label="value.volumeBackups.error.message"
/> />
<DiskPerformanceOptions
:value="value"
:mode="mode"
@update="update"
/>
</div> </div>
</template> </template>
@@ -5,16 +5,13 @@ import LabelValue from '@shell/components/LabelValue';
import LabeledSelect from '@shell/components/form/LabeledSelect'; import LabeledSelect from '@shell/components/form/LabeledSelect';
import InputOrDisplay from '@shell/components/InputOrDisplay'; import InputOrDisplay from '@shell/components/InputOrDisplay';
import { Banner } from '@components/Banner'; import { Banner } from '@components/Banner';
import { Checkbox } from '@components/Form/Checkbox';
import { sortBy } from '@shell/utils/sort'; import { sortBy } from '@shell/utils/sort';
import { PVC, STORAGE_CLASS, LONGHORN_DRIVER } from '@shell/config/types'; import { PVC } from '@shell/config/types';
import { _CREATE } from '@shell/config/query-params'; import { _CREATE } from '@shell/config/query-params';
import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations'; import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations';
import { VOLUME_MODE } from '@pkg/harvester/config/types';
import { HCI } from '../../../../types'; import { HCI } from '../../../../types';
import { VOLUME_TYPE, InterfaceOption } from '../../../../config/harvester-map'; import { VOLUME_TYPE, InterfaceOption } from '../../../../config/harvester-map';
import { GIBIBYTE } from '../../../../utils/unit'; import { GIBIBYTE } from '../../../../utils/unit';
import DiskPerformanceOptions from '../DiskPerformanceOptions';
export default { export default {
name: 'HarvesterEditExisting', name: 'HarvesterEditExisting',
@@ -22,7 +19,7 @@ export default {
emits: ['update'], emits: ['update'],
components: { components: {
UnitInput, LabeledInput, LabeledSelect, InputOrDisplay, LabelValue, Banner, Checkbox, DiskPerformanceOptions UnitInput, LabeledInput, LabeledSelect, InputOrDisplay, LabelValue, Banner
}, },
props: { props: {
@@ -97,30 +94,6 @@ export default {
return this.allPVCs.find( (P) => P.metadata.name === this.value.volumeName ); return this.allPVCs.find( (P) => P.metadata.name === this.value.volumeName );
}, },
storageClasses() {
return this.$store.getters['harvester/all'](STORAGE_CLASS) || [];
},
isShareableCapable() {
const pvcSpec = this.pvcResource?.spec;
if (!pvcSpec) {
return false;
}
const isRWX = (pvcSpec.accessModes || []).includes('ReadWriteMany');
const isBlock = pvcSpec.volumeMode === VOLUME_MODE.BLOCK;
const storageClass = this.storageClasses.find((sc) => sc.name === pvcSpec.storageClassName);
// fail closed: without a resolved StorageClass the provisioner
// requirement cannot be evaluated
if (!storageClass) {
return false;
}
return isRWX && isBlock && storageClass.provisioner !== LONGHORN_DRIVER;
},
volumeOption() { volumeOption() {
return sortBy( return sortBy(
this.allPVCs this.allPVCs
@@ -172,15 +145,6 @@ export default {
this.value.size = pvcResource.spec.resources.requests.storage; this.value.size = pvcResource.spec.resources.requests.storage;
this.value.storageClassName = pvcResource.spec.storageClassName; this.value.storageClassName = pvcResource.spec.storageClassName;
this.value.volumeMode = pvcResource.spec.volumeMode; this.value.volumeMode = pvcResource.spec.volumeMode;
this.value.shareable = false;
// Adopt the volume's default high-performance profile (if any) as a starting point.
const ann = pvcResource.metadata?.annotations || {};
this.value.cache = ann[HCI_ANNOTATIONS.DISK_CACHE_MODE] || '';
this.value.io = ann[HCI_ANNOTATIONS.DISK_IO_MODE] || '';
this.value.dedicatedIOThread = ann[HCI_ANNOTATIONS.DISK_DEDICATED_IOTHREAD] === 'true';
this.update(); this.update();
}, },
@@ -191,13 +155,6 @@ export default {
} }
}, },
isShareableCapable(neu) {
if (!neu && this.value.shareable) {
this.value.shareable = false;
this.update();
}
},
pvcResource: { pvcResource: {
handler(pvc) { handler(pvc) {
if (!this.value.volumeName && pvc?.metadata?.name) { if (!this.value.volumeName && pvc?.metadata?.name) {
@@ -346,26 +303,6 @@ export default {
/> />
</InputOrDisplay> </InputOrDisplay>
</div> </div>
<div
v-if="isShareableCapable"
data-testid="input-hee-shareable"
class="col span-6"
>
<Checkbox
v-model:value="value.shareable"
class="check"
type="checkbox"
label-key="harvester.virtualMachine.volume.shareable.label"
tooltip-key="harvester.virtualMachine.volume.shareable.tip"
:mode="mode"
@update:value="update"
/>
<Banner
v-if="value.shareable"
color="warning"
:label="t('harvester.virtualMachine.volume.shareable.warning')"
/>
</div>
<div <div
v-if="value.volumeBackups" v-if="value.volumeBackups"
class="col span-6" class="col span-6"
@@ -388,11 +325,5 @@ export default {
class="mb-20" class="mb-20"
:label="value.volumeBackups.error.message" :label="value.volumeBackups.error.message"
/> />
<DiskPerformanceOptions
:value="value"
:mode="mode"
@update="update"
/>
</div> </div>
</template> </template>
@@ -15,7 +15,6 @@ import LabelValue from '@shell/components/LabelValue';
import { ucFirst } from '@shell/utils/string'; import { ucFirst } from '@shell/utils/string';
import { GIBIBYTE } from '../../../../utils/unit'; import { GIBIBYTE } from '../../../../utils/unit';
import { EMPTY_IMAGE } from '../../../../utils/vm'; import { EMPTY_IMAGE } from '../../../../utils/vm';
import DiskPerformanceOptions from '../DiskPerformanceOptions';
export default { export default {
name: 'HarvesterEditVMImage', name: 'HarvesterEditVMImage',
@@ -23,7 +22,7 @@ export default {
emits: ['update'], emits: ['update'],
components: { components: {
UnitInput, LabeledInput, LabeledSelect, InputOrDisplay, LabelValue, Banner, DiskPerformanceOptions UnitInput, LabeledInput, LabeledSelect, InputOrDisplay, LabelValue, Banner
}, },
props: { props: {
@@ -483,11 +482,5 @@ export default {
color="error" color="error"
:label="t('harvester.virtualMachine.volume.vmImageVolumeTip', {diskSize: diskSize, imageVirtualSize: imageVirtualSize})" :label="t('harvester.virtualMachine.volume.vmImageVolumeTip', {diskSize: diskSize, imageVirtualSize: imageVirtualSize})"
/> />
<DiskPerformanceOptions
:value="value"
:mode="mode"
@update="update"
/>
</div> </div>
</template> </template>
@@ -9,7 +9,6 @@ import { formatSi, parseSi } from '@shell/utils/units';
import { VOLUME_TYPE, InterfaceOption } from '../../../../config/harvester-map'; import { VOLUME_TYPE, InterfaceOption } from '../../../../config/harvester-map';
import { _VIEW } from '@shell/config/query-params'; import { _VIEW } from '@shell/config/query-params';
import LabelValue from '@shell/components/LabelValue'; import LabelValue from '@shell/components/LabelValue';
import DiskPerformanceOptions from '../DiskPerformanceOptions';
import { ucFirst } from '@shell/utils/string'; import { ucFirst } from '@shell/utils/string';
import { LVM_DRIVER } from '../../../../models/harvester/storage.k8s.io.storageclass'; import { LVM_DRIVER } from '../../../../models/harvester/storage.k8s.io.storageclass';
import { DATA_ENGINE_V2 } from '../../../../models/harvester/persistentvolumeclaim'; import { DATA_ENGINE_V2 } from '../../../../models/harvester/persistentvolumeclaim';
@@ -23,7 +22,7 @@ export default {
emits: ['update'], emits: ['update'],
components: { components: {
InputOrDisplay, Loading, LabeledInput, LabeledSelect, UnitInput, LabelValue, DiskPerformanceOptions InputOrDisplay, Loading, LabeledInput, LabeledSelect, UnitInput, LabelValue
}, },
props: { props: {
@@ -361,11 +360,6 @@ export default {
</InputOrDisplay> </InputOrDisplay>
</div> </div>
</div> </div>
<DiskPerformanceOptions
:value="value"
:mode="mode"
@update="update"
/>
<div class="row mb-20"> <div class="row mb-20">
<div <div
v-if="value.volumeEncryptionFeatureEnabled && isView" v-if="value.volumeEncryptionFeatureEnabled && isView"
@@ -333,7 +333,7 @@ $xml-height: 350px;
min-height: $xml-height; min-height: $xml-height;
font-family: monospace; font-family: monospace;
& .code-mirror .cm-editor { & .code-mirror .CodeMirror {
min-height: $xml-height; min-height: $xml-height;
} }
} }
@@ -93,9 +93,6 @@ export default {
const hostname = this.value.spec.template.spec.hostname || ''; const hostname = this.value.spec.template.spec.hostname || '';
// Display name can contain arbitrary strings. There is no XSS risk because the value is
// rendered via Vue's {{ }} interpolation which auto-escapes HTML; v-html is never used for
// this field. See harvester/harvester#10423 for details.
const customizeDisplayName = !!(this.value.metadata?.annotations?.[HCI_ANNOTATIONS.VM_DISPLAY_NAME]); const customizeDisplayName = !!(this.value.metadata?.annotations?.[HCI_ANNOTATIONS.VM_DISPLAY_NAME]);
return { return {
@@ -487,20 +484,6 @@ export default {
await value.save(); await value.save();
await this.applyHooks(AFTER_SAVE_HOOKS); await this.applyHooks(AFTER_SAVE_HOOKS);
} catch (e) { } catch (e) {
// Reset the generated secret name(s) so a retried create (e.g. after correcting an
// invalid/duplicate VM name) always regenerates them from the current name instead of
// reusing names derived from this failed attempt. Only do this for create: in edit mode
// secretName/sysprep.secretName may reference an existing secret loaded from the VM,
// which must not be discarded. See harvester/harvester#11174.
if (this.isCreate) {
this.secretName = '';
this.secretNamePrefixUsed = '';
if (this.sysprepSecretNamePrefixUsed !== '') {
this.sysprep.secretName = '';
this.sysprepSecretNamePrefixUsed = '';
}
}
this.errors.push(...exceptionToErrorsArray(e)); this.errors.push(...exceptionToErrorsArray(e));
buttonCb(false); buttonCb(false);
} }
@@ -772,9 +755,6 @@ export default {
> >
<Volume <Volume
v-model:value="diskRows" v-model:value="diskRows"
v-model:block-multi-queue="blockMultiQueue"
v-model:io-threads-policy="ioThreadsPolicy"
v-model:io-thread-count="ioThreadCount"
:mode="mode" :mode="mode"
:custom-volume-mode="customVolumeMode" :custom-volume-mode="customVolumeMode"
:namespace="value.metadata.namespace" :namespace="value.metadata.namespace"
@@ -1065,6 +1045,7 @@ export default {
</div> </div>
<CloudConfig <CloudConfig
v-if="!isWindows"
ref="yamlEditor" ref="yamlEditor"
:user-script="userScript" :user-script="userScript"
:mode="mode" :mode="mode"
@@ -63,7 +63,6 @@ export default {
RANCHER_TYPES, RANCHER_TYPES,
fvFormRuleSets: [{ path: 'spec.displayName', rules: ['required'] }], fvFormRuleSets: [{ path: 'spec.displayName', rules: ['required'] }],
canEditPSPBindings: true, canEditPSPBindings: true,
isQuotasValid: true,
}; };
}, },
computed: { computed: {
@@ -191,13 +190,15 @@ export default {
this['membershipUpdate'] = update; this['membershipUpdate'] = update;
}, },
validateQuotas(isValid) { removeQuota(key) {
this.isQuotasValid = isValid; ['resourceQuota', 'namespaceDefaultResourceQuota'].forEach((specProp) => {
}, if (this.value?.spec[specProp]?.limit && this.value?.spec[specProp]?.limit[key]) {
delete this.value?.spec[specProp]?.limit[key];
onQuotasInput({ projectLimit, nsLimit } = {}) { }
this.value.spec.resourceQuota = { ...this.value.spec.resourceQuota, limit: projectLimit }; if (this.value?.spec[specProp]?.usedLimit && this.value?.spec[specProp]?.usedLimit[key]) {
this.value.spec.namespaceDefaultResourceQuota = { ...this.value.spec.namespaceDefaultResourceQuota, limit: nsLimit }; delete this.value?.spec[specProp]?.usedLimit[key];
}
});
} }
}, },
}; };
@@ -211,7 +212,7 @@ export default {
:resource="value" :resource="value"
:subtypes="[]" :subtypes="[]"
:can-yaml="false" :can-yaml="false"
:validation-passed="fvFormIsValid && isQuotasValid" :validation-passed="fvFormIsValid"
@error="e=>errors=e" @error="e=>errors=e"
@finish="save" @finish="save"
@cancel="done" @cancel="done"
@@ -266,11 +267,10 @@ export default {
:weight="9" :weight="9"
> >
<ResourceQuota <ResourceQuota
:value="value" v-model:value="value"
:mode="canEditTabElements" :mode="canEditTabElements"
:types="isStandaloneHarvester ? HARVESTER_TYPES : RANCHER_TYPES" :types="isStandaloneHarvester ? HARVESTER_TYPES : RANCHER_TYPES"
@input="onQuotasInput" @remove="removeQuota"
@validationChanged="validateQuotas"
/> />
</Tab> </Tab>
<Tab <Tab
@@ -283,9 +283,9 @@ export default {
v-model:value.number="vlanID" v-model:value.number="vlanID"
type="number" type="number"
required required
:min="1" :min="2"
:max="4094" :max="4094"
placeholder="e.g. 1 ~ 4094" placeholder="e.g. 2 ~ 4094"
:label="t('harvester.hostNetworkConfig.vlanID.label')" :label="t('harvester.hostNetworkConfig.vlanID.label')"
:mode="mode" :mode="mode"
/> />
+33 -68
View File
@@ -1,11 +1,11 @@
<script> <script>
import PercentageBar from '@shell/components/PercentageBar'; import ConsumptionGauge from '@shell/components/ConsumptionGauge';
import { METRIC, NODE } from '@shell/config/types'; import { METRIC, NODE } from '@shell/config/types';
import { parseSi } from '@shell/utils/units'; import { parseSi } from '@shell/utils/units';
export default { export default {
name: 'HarvesterCpuUsed', name: 'HarvesterCpuUsed',
components: { PercentageBar }, components: { ConsumptionGauge },
props: { props: {
value: { value: {
@@ -74,89 +74,54 @@ export default {
return 0; return 0;
} }
}, },
}
reservedPercentage() {
return this.cpuTotal ? (this.reserved * 100) / this.cpuTotal : 0;
},
usedPercentage() {
return this.cpuTotal ? (this.used * 100) / this.cpuTotal : 0;
},
reservedAmountTemplateValues() {
return {
used: this.numberFormatter(this.reserved || 0),
total: this.numberFormatter(this.cpuTotal || 0),
unit: ` ${ this.cpuUnits }`,
};
},
usedAmountTemplateValues() {
return {
used: this.numberFormatter(this.used || 0),
total: this.numberFormatter(this.cpuTotal || 0),
unit: ` ${ this.cpuUnits }`,
};
},
},
methods: {
numberFormatter(value) {
return Number.isInteger(value) ? value : value.toFixed(2);
},
},
}; };
</script> </script>
<template> <template>
<div> <div>
<div class="consumption-gauge"> <ConsumptionGauge
<div class="numbers"> :capacity="cpuTotal"
<span class="mr-5"> :used="reserved"
:units="cpuUnits"
:resource-name="resourceName"
>
<template #title="{amountTemplateValues, formattedPercentage}">
<span>
{{ t('harvester.formatters.hardwareResourceGauge.reserved') }} {{ t('harvester.formatters.hardwareResourceGauge.reserved') }}
</span> </span>
<span class="precent-data"> <span class="precent-data">
{{ t('node.detail.glance.consumptionGauge.amount', reservedAmountTemplateValues) }} {{ t('node.detail.glance.consumptionGauge.amount', amountTemplateValues) }}
<span class="ml-10 percentage">/&nbsp;{{ formattedPercentage }}
</span>
</span> </span>
</div> </template>
<div class="mt-10"> </ConsumptionGauge>
<PercentageBar
:model-value="reservedPercentage"
show-percentage
/>
</div>
</div>
<div <div
v-if="showUsed" v-if="showUsed"
class="consumption-gauge mt-10" class="mt-10"
> >
<div class="numbers"> <ConsumptionGauge
<span> :capacity="cpuTotal"
{{ t('harvester.formatters.hardwareResourceGauge.used') }} :used="used"
</span> :units="cpuUnits"
<span class="precent-data"> >
{{ t('node.detail.glance.consumptionGauge.amount', usedAmountTemplateValues) }} <template #title="{amountTemplateValues, formattedPercentage}">
</span> <span>
</div> {{ t('harvester.formatters.hardwareResourceGauge.used') }}
<div class="mt-10"> </span>
<PercentageBar <span class="precent-data">
:model-value="usedPercentage" {{ t('node.detail.glance.consumptionGauge.amount', amountTemplateValues) }}
show-percentage <span class="ml-10 percentage">/&nbsp;{{ formattedPercentage }}
/> </span>
</div> </span>
</template>
</ConsumptionGauge>
</div> </div>
</div> </div>
</template> </template>
<style lang="scss" scoped> <style lang="scss" scoped>
.consumption-gauge {
.numbers {
display: flex;
flex-direction: row;
justify-content: space-between;
}
}
.precent-data { .precent-data {
white-space: nowrap; white-space: nowrap;
} }
@@ -36,10 +36,6 @@ export default {
computed: { computed: {
ips() { ips() {
if (this.staticAnnotationIP.length) {
return this.staticAnnotationIP;
}
if (this.vmiIp.length) { if (this.vmiIp.length) {
return [...this.vmiIp, ...this.networkAnnotationIP] return [...this.vmiIp, ...this.networkAnnotationIP]
.filter(Boolean) .filter(Boolean)
@@ -49,24 +45,6 @@ export default {
return this.customAnnotationIP; return this.customAnnotationIP;
}, },
staticAnnotationIP() {
const annotations = this.row?.metadata?.annotations || {};
const staticIpPrefix = `${ HCI_ANNOTATIONS.STATIC_IP }/`;
return Object.entries(annotations)
.filter(([key, value]) => key.startsWith(staticIpPrefix) && !!value)
.map(([key, value]) => {
const nicName = key.slice(staticIpPrefix.length);
const ip = String(value).replace(/\/[\d\D]*/, '');
return {
ip,
name: nicName
};
})
.filter(({ ip }) => isIpv4(ip));
},
customAnnotationIP() { customAnnotationIP() {
const annotationIp = get(this.row, `metadata.annotations."${ HCI_ANNOTATIONS.CUSTOM_IP }"`); const annotationIp = get(this.row, `metadata.annotations."${ HCI_ANNOTATIONS.CUSTOM_IP }"`);
@@ -132,28 +110,16 @@ export default {
</script> </script>
<template> <template>
<div <div v-if="showIP">
v-if="showIP" <span
class="ip-list"
>
<div
v-for="{ ip, name, isCustom } in ips" v-for="{ ip, name, isCustom } in ips"
:key="`${ip}-${name}`" :key="`${ip}-${name}`"
class="ip-item"
> >
<CopyToClipboardText <CopyToClipboardText
v-clean-tooltip="isCustom ? t('harvester.formatters.harvesterIpAddress.customIpTooltip') : name" v-clean-tooltip="isCustom ? t('harvester.formatters.harvesterIpAddress.customIpTooltip') : name"
:text="ip" :text="ip"
:plain="isCustom" :plain="isCustom"
/> />
</div> </span>
</div> </div>
</template> </template>
<style lang="scss" scoped>
.ip-list {
display: flex;
flex-direction: column;
gap: 6px;
}
</style>
@@ -1,11 +1,11 @@
<script> <script>
import PercentageBar from '@shell/components/PercentageBar'; import ConsumptionGauge from '@shell/components/ConsumptionGauge';
import { METRIC, NODE } from '@shell/config/types'; import { METRIC, NODE } from '@shell/config/types';
import { formatSi, exponentNeeded, UNITS, parseSi } from '@shell/utils/units'; import { formatSi, exponentNeeded, UNITS, parseSi } from '@shell/utils/units';
import { UNIT_SUFFIX } from '../utils/unit'; import { UNIT_SUFFIX } from '../utils/unit';
export default { export default {
name: 'HarvesterMemoryUsed', name: 'HarvesterMemoryUsed',
components: { PercentageBar }, components: { ConsumptionGauge },
props: { props: {
value: { value: {
@@ -76,30 +76,6 @@ export default {
return 0; return 0;
} }
}, },
reservedPercentage() {
return this.memoryTotal ? (this.reserved * 100) / this.memoryTotal : 0;
},
usedPercentage() {
return this.memoryTotal ? (this.used * 100) / this.memoryTotal : 0;
},
reservedAmountTemplateValues() {
return {
used: this.memoryFormatter(this.reserved || 0),
total: this.memoryFormatter(this.memoryTotal || 0),
unit: ` ${ this.memoryUnits }`,
};
},
usedAmountTemplateValues() {
return {
used: this.memoryFormatter(this.used || 0),
total: this.memoryFormatter(this.memoryTotal || 0),
unit: ` ${ this.memoryUnits }`,
};
},
}, },
methods: { methods: {
@@ -120,53 +96,50 @@ export default {
<template> <template>
<div> <div>
<div class="consumption-gauge"> <ConsumptionGauge
<div class="numbers"> :capacity="memoryTotal"
<span class="mr-10"> :used="reserved"
:units="memoryUnits"
:number-formatter="memoryFormatter"
:resource-name="resourceName"
>
<template #title="{amountTemplateValues, formattedPercentage}">
<span>
{{ t('harvester.formatters.hardwareResourceGauge.reserved') }} {{ t('harvester.formatters.hardwareResourceGauge.reserved') }}
</span> </span>
<span class="precent-data"> <span class="precent-data">
{{ t('node.detail.glance.consumptionGauge.amount', reservedAmountTemplateValues) }} {{ t('node.detail.glance.consumptionGauge.amount', amountTemplateValues) }}
<span class="ml-10 percentage">/&nbsp;{{ formattedPercentage }}
</span>
</span> </span>
</div> </template>
<div class="mt-10"> </ConsumptionGauge>
<PercentageBar
:model-value="reservedPercentage"
show-percentage
/>
</div>
</div>
<div <div
v-if="showUsed" v-if="showUsed"
class="consumption-gauge mt-10" class="mt-10"
> >
<div class="numbers"> <ConsumptionGauge
<span> :capacity="memoryTotal"
{{ t('harvester.formatters.hardwareResourceGauge.used') }} :used="used"
</span> :units="memoryUnits"
<span class="precent-data"> :number-formatter="memoryFormatter"
{{ t('node.detail.glance.consumptionGauge.amount', usedAmountTemplateValues) }} >
</span> <template #title="{amountTemplateValues, formattedPercentage}">
</div> <span>
<div class="mt-10"> {{ t('harvester.formatters.hardwareResourceGauge.used') }}
<PercentageBar </span>
:model-value="usedPercentage" <span class="precent-data">
show-percentage {{ t('node.detail.glance.consumptionGauge.amount', amountTemplateValues) }}
/> <span class="ml-10 percentage">/&nbsp;{{ formattedPercentage }}
</div> </span>
</span>
</template>
</ConsumptionGauge>
</div> </div>
</div> </div>
</template> </template>
<style lang="scss" scoped> <style lang="scss" scoped>
.consumption-gauge {
.numbers {
display: flex;
flex-direction: row;
justify-content: space-between;
}
}
.precent-data { .precent-data {
white-space: nowrap; white-space: nowrap;
} }
@@ -1,12 +1,12 @@
<script> <script>
import PercentageBar from '@shell/components/PercentageBar'; import ConsumptionGauge from '@shell/components/ConsumptionGauge';
import { LONGHORN } from '@shell/config/types'; import { LONGHORN } from '@shell/config/types';
import { formatSi, exponentNeeded, UNITS } from '@shell/utils/units'; import { formatSi, exponentNeeded, UNITS } from '@shell/utils/units';
import { UNIT_SUFFIX } from '../utils/unit'; import { UNIT_SUFFIX } from '../utils/unit';
export default { export default {
name: 'HarvesterStorageUsed', name: 'HarvesterStorageUsed',
components: { PercentageBar }, components: { ConsumptionGauge },
props: { props: {
value: { value: {
@@ -120,14 +120,6 @@ export default {
unit: this.allocatedUnits, unit: this.allocatedUnits,
}; };
}, },
usedPercentage() {
return this.storageStats.maximum ? (this.storageStats.used * 100) / this.storageStats.maximum : 0;
},
allocatedPercentage() {
return this.storageStats.total ? (this.storageStats.scheduled * 100) / this.storageStats.total : 0;
},
}, },
methods: { methods: {
@@ -152,54 +144,53 @@ export default {
<div> <div>
<div <div
v-if="showAllocated" v-if="showAllocated"
class="consumption-gauge"
> >
<div class="numbers"> <ConsumptionGauge
<span class="mr-10"> :capacity="storageStats.total"
{{ t('harvester.dashboard.hardwareResourceGauge.allocated') }} :used="storageStats.scheduled"
</span> :units="allocatedUnits"
<span class="precent-data"> :number-formatter="formatter"
{{ t('node.detail.glance.consumptionGauge.amount', allocatedAmountTemplateValues) }} :resource-name="resourceName"
</span> >
</div> <template #title="{formattedPercentage}">
<div class="mt-10"> <span>
<PercentageBar {{ t('harvester.dashboard.hardwareResourceGauge.allocated') }}
:model-value="allocatedPercentage" </span>
show-percentage <span class="precent-data">
/> {{ t('node.detail.glance.consumptionGauge.amount', allocatedAmountTemplateValues) }}
</div> <span class="ml-10 percentage">
/&nbsp;{{ formattedPercentage }}
</span>
</span>
</template>
</ConsumptionGauge>
</div> </div>
<div <ConsumptionGauge
class="consumption-gauge" :capacity="storageStats.maximum"
:class="{ 'mt-10': showAllocated }" :used="storageStats.used"
:units="usedUnits"
:number-formatter="formatter"
:resource-name="showAllocated ? '' : resourceName"
:class="{
'mt-10': showAllocated,
}"
> >
<div class="numbers"> <template #title="{formattedPercentage}">
<span> <span>
{{ t('node.detail.glance.consumptionGauge.used') }} {{ t('node.detail.glance.consumptionGauge.used') }}
</span> </span>
<span class="precent-data"> <span class="precent-data">
{{ t('node.detail.glance.consumptionGauge.amount', usedAmountTemplateValues) }} {{ t('node.detail.glance.consumptionGauge.amount', usedAmountTemplateValues) }}
<span class="ml-10 percentage">
/&nbsp;{{ formattedPercentage }}
</span>
</span> </span>
</div> </template>
<div class="mt-10"> </ConsumptionGauge>
<PercentageBar
:model-value="usedPercentage"
show-percentage
/>
</div>
</div>
</div> </div>
</template> </template>
<style lang="scss" scoped> <style lang="scss" scoped>
.consumption-gauge {
.numbers {
display: flex;
flex-direction: row;
justify-content: space-between;
}
}
.precent-data { .precent-data {
white-space: nowrap; white-space: nowrap;
} }
-12
View File
@@ -6,9 +6,6 @@ import harvesterCommonStore from './store/harvester-common';
import harvesterStore from './store/harvester-store'; import harvesterStore from './store/harvester-store';
import customValidators from './validators'; import customValidators from './validators';
import { PRODUCT_NAME } from './config/harvester'; import { PRODUCT_NAME } from './config/harvester';
import {
hostResolvesL10nGlobals, resolveL10nGlobals, standaloneProductName, PRODUCT_NAME_GLOBAL
} from './utils/l10n-globals';
import { defineAsyncComponent } from 'vue'; import { defineAsyncComponent } from 'vue';
import './styles/vue-flow.scss'; import './styles/vue-flow.scss';
@@ -20,15 +17,6 @@ export default function (plugin: IPlugin) {
// Auto-import model, detail, edit from the folders // Auto-import model, detail, edit from the folders
importTypes(plugin); importTypes(plugin);
if (isSingleVirtualCluster) {
// Standalone: the server-flavor setting picks the product name, see config/harvester-cluster
plugin.register('l10n-global', PRODUCT_NAME_GLOBAL, standaloneProductName);
} else if (!hostResolvesL10nGlobals(plugin.environment?.version)) {
// Hosts older than Rancher 2.16 would show `[[Harvester]]` literally, so resolve the tokens here.
// Mutating the module in place also updates the copy that importTypes registered.
resolveL10nGlobals(require('./l10n/en-us.yaml'));
}
// Provide plugin metadata from package.json // Provide plugin metadata from package.json
plugin.metadata = require('./package.json'); plugin.metadata = require('./package.json');
+69 -215
View File
@@ -13,20 +13,11 @@ generic:
basic: Basic basic: Basic
loading: Loading... loading: Loading...
none: None none: None
duration:
infinite: Infinite
1s: 1 second
5s: 5 seconds
10s: 10 seconds
30s: 30 seconds
1m: 1 minute
3m: 3 minutes
5m: 5 minutes
unsupported: unsupported:
serverVersion: 'Current version: <code>{serverVersion}</code>' serverVersion: 'Current version: <code>{serverVersion}</code>'
description: '[[Harvester]] ui only supports [[Harvester]] cluster version greater or equal to 1.3.0.' description: Harvester ui only supports Harvester cluster version greater or equal to 1.3.0.
learnMore: Learn more about [[Harvester]] from the <a target="_blank" href="https://harvesterhci.io/" rel="noopener noreferrer nofollow">[[Harvester]] Web Site</a> or read the <a target="_blank" href="https://docs.harvesterhci.io/" rel="noopener noreferrer nofollow">[[Harvester]] Docs</a> learnMore: Learn more about Harvester from the <a target="_blank" href="https://harvesterhci.io/" rel="noopener noreferrer nofollow">Harvester Web Site</a> or read the <a target="_blank" href="https://docs.harvesterhci.io/" rel="noopener noreferrer nofollow">Harvester Docs</a>
nav: nav:
group: group:
@@ -36,8 +27,7 @@ nav:
Logging: Logging Logging: Logging
'Monitoring and Logging': Monitoring and Logging 'Monitoring and Logging': Monitoring and Logging
vmimport: Virtual Machine Imports vmimport: Virtual Machine Imports
vmMigration: Virtual Machine Migration vmMigration: VM Migration
Configurations: Configurations
resourceTable: resourceTable:
groupBy: groupBy:
@@ -84,19 +74,15 @@ dialog:
harvester: harvester:
branding: branding:
primeLabel: '{vendor}'
primeEmptyLabel: ''
logos: logos:
tip: 'Upload a logo to replace the [[Harvester]] logo in the top-level navigation header. Image height should be 21 pixels with a max width of 200 pixels. Max file size is 20KB. Accepted formats: JPEG, PNG, SVG.' tip: 'Upload a logo to replace the Harvester logo in the top-level navigation header. Image height should be 21 pixels with a max width of 200 pixels. Max file size is 20KB. Accepted formats: JPEG, PNG, SVG.'
favicon: favicon:
tip: 'Upload an icon to replace the [[Harvester]] favicon in the browser tab. Max file size is 20KB' tip: 'Upload an icon to replace the Harvester favicon in the browser tab. Max file size is 20KB'
productLabel: '[[Harvester]]' productLabel: 'Harvester'
modal: modal:
backup: backup:
success: 'Backup { backUpName } has been initiated.' success: 'Backup { backUpName } has been initiated.'
addBackup: Add Backup addBackup: Add Backup
fileSystemFreezeDeadline:
label: 'File System Freeze Deadline'
quota: quota:
editVMQuota: Edit VM Quota editVMQuota: Edit VM Quota
editQuota: Edit Quota editQuota: Edit Quota
@@ -182,7 +168,7 @@ harvester:
delete: Delete delete: Delete
bundle: bundle:
title: Generate a Support Bundle title: Generate a Support Bundle
titleDescription: Collect system-related logs in [[Harvester]] to assist with troubleshooting and support. titleDescription: Collect system-related logs in Harvester to assist with troubleshooting and support.
tip: Each field below specifies an aspect of the support bundle. For detailed explanations, please refer to the <a href="{doc}" target="_blank">documentation</a>. tip: Each field below specifies an aspect of the support bundle. For detailed explanations, please refer to the <a href="{doc}" target="_blank">documentation</a>.
url: Issue URL url: Issue URL
description: Description description: Description
@@ -236,8 +222,6 @@ harvester:
title: Take Virtual Machine Snapshot title: Take Virtual Machine Snapshot
name: Name name: Name
success: 'Take virtual machine Snapshot { name } successfully.' success: 'Take virtual machine Snapshot { name } successfully.'
fileSystemFreezeDeadline:
label: 'File System Freeze Deadline'
restart: restart:
title: Restart Virtual Machine title: Restart Virtual Machine
tip: Restart the virtual machine for configuration changes to take effect. tip: Restart the virtual machine for configuration changes to take effect.
@@ -333,9 +317,8 @@ harvester:
message: Message message: Message
phase: Phase phase: Phase
attachedVM: Attached Virtual Machine attachedVM: Attached Virtual Machine
cpuManager: CPU<br>Manager cpuManager: CPU Manager
diskState: Disk routeConnectivityTooltip: Connectivity between the VM network and the management network, which the Harvester nodes are connected to.
routeConnectivityTooltip: Connectivity between the VM network and the management network, which the [[Harvester]] nodes are connected to.
fingerprint: Fingerprint fingerprint: Fingerprint
value: Value value: Value
actions: Actions actions: Actions
@@ -382,7 +365,7 @@ harvester:
vmMigrationMapSourceProvider: Source Provider vmMigrationMapSourceProvider: Source Provider
vmMigrationMapDestProvider: Destination Provider vmMigrationMapDestProvider: Destination Provider
vmMigrationPlanTargetNs: Target Namespace vmMigrationPlanTargetNs: Target Namespace
vmMigrationPlanVmCount: VM Count vmMigrationPlanVmCount: VMs
vmMigrationMigrationPlan: Plan vmMigrationMigrationPlan: Plan
tab: tab:
volume: Volumes volume: Volumes
@@ -408,7 +391,6 @@ harvester:
network: Network network: Network
model: Model model: Model
macAddress: MAC address macAddress: MAC address
staticIp: Static IP
port: Port port: Port
protocol: Protocol protocol: Protocol
remove: Remove remove: Remove
@@ -490,6 +472,7 @@ harvester:
volume: volume:
upperType: Volume name upperType: Volume name
lowerType: volume name lowerType: volume name
needAtLeastOneBootable: 'At least one bootable volume is required!'
image: image:
ruleTip: 'The URL you have entered ends in an extension that we do not support. We only accept image files that end in .img, .iso, .qcow, .qcow2, .raw.' ruleTip: 'The URL you have entered ends in an extension that we do not support. We only accept image files that end in .img, .iso, .qcow, .qcow2, .raw.'
ruleFileTip: 'The file you have chosen ends in an extension that we do not support. We only accept image files that end in .img, .iso, .qcow, .qcow2, .raw.' ruleFileTip: 'The file you have chosen ends in an extension that we do not support. We only accept image files that end in .img, .iso, .qcow, .qcow2, .raw.'
@@ -500,7 +483,7 @@ harvester:
aclEmptyError: The fields in subnet access control list rule can not be empty. aclEmptyError: The fields in subnet access control list rule can not be empty.
dashboard: dashboard:
label: Dashboard label: Dashboard
header: "[[Harvester]] Cluster: {cluster}" header: "Harvester Cluster: {cluster}"
hardwareResourceGauge: hardwareResourceGauge:
cpu: CPU cpu: CPU
memory: Memory memory: Memory
@@ -643,7 +626,6 @@ harvester:
notification: notification:
success: 'Update host "{name}" storage configurations successfully.' success: 'Update host "{name}" storage configurations successfully.'
error: Host has unready or unschedulable disks. error: Host has unready or unschedulable disks.
mounted: Already Mounted
fileSystem: fileSystem:
info: Current file system is {system}, You can format it manually. info: Current file system is {system}, You can format it manually.
formatting: Disk is formatting, please wait. formatting: Disk is formatting, please wait.
@@ -783,7 +765,6 @@ harvester:
dragTip: Drag and drop volumes, or use the volume's arrows, to change the boot order. dragTip: Drag and drop volumes, or use the volume's arrows, to change the boot order.
volumeTip: The virtual machine only contains a CD-ROM volume. You may want to add additional disk volumes. volumeTip: The virtual machine only contains a CD-ROM volume. You may want to add additional disk volumes.
macTip: "MAC address as seen inside the guest system." macTip: "MAC address as seen inside the guest system."
staticIpTip: "Static IP that will be stored to annotation static-ip.harvesterhci.io/{nic_name}."
volumeUpdate: 'Set volume { name } successfully' volumeUpdate: 'Set volume { name } successfully'
type: Type type: Type
size: Size size: Size
@@ -800,60 +781,6 @@ harvester:
setFirst: Set as root volume setFirst: Set as root volume
saveVolume: Update Volume saveVolume: Update Volume
encryption: Encryption encryption: Encryption
performance:
title: Storage Performance Options
expand: Show high-performance options
collapse: Hide high-performance options
profile:
label: Performance Profile
tip: "\"High Performance\" applies a tuned preset (no host cache, native AIO, a dedicated I/O thread on the virtio bus). Choose \"Custom\" to set each option yourself."
default: Default (Balanced)
highPerformance: High Performance
custom: Custom
highProfileTip: This disk will use the virtio bus with host cache disabled, native AIO and a dedicated I/O thread.
cacheMode:
label: Cache Mode
tip: "How the host caches disk I/O. \"None\" (host cache disabled) is best for high-throughput guests on block storage; \"WriteBack\" favours performance; \"WriteThrough\" favours durability."
default: Default (hypervisor)
none: None (no host cache)
writeback: WriteBack
writethrough: WriteThrough
filesystemWarning: "\"None\" (O_DIRECT) requires storage that supports direct I/O. It is recommended only for Block volume mode; on Filesystem volumes the VM may fail to start."
ioMode:
label: I/O Mode
tip: "How QEMU submits I/O. \"Native\" (Linux AIO) offers the lowest overhead but requires host cache set to \"None\"; \"Threads\" uses a host thread pool."
default: Default (hypervisor)
native: Native (AIO)
threads: Threads
nativeRequiresNoCacheTip: Native I/O mode requires cache mode "None"; it has been set for you.
dedicatedIOThread:
label: Dedicated I/O Thread
tip: Allocate an exclusive libvirt I/O thread to this disk instead of sharing one. Useful for disks with heavy I/O. Enabling this on any disk turns on the VM's I/O threads policy.
busTip: High-performance features work best on the virtio bus.
diskPerformance:
title: High Performance (I/O Threads and Multi-Queue)
description: These settings apply to all volumes in the Virtual Machine and complement the per-volume options above.
expand: Show VM-wide high-performance options
collapse: Hide VM-wide high-performance options
blockMultiQueue:
label: Virtio Block Multi-Queue
tip: Map disk I/O to multiple queues so it is processed across multiple CPUs. Applies to virtio disks and requires a fixed CPU allocation ([[Harvester]] always sets one).
noVirtioTip: Add at least one disk on the virtio bus to enable Block Multi-Queue.
ioThreadsPolicy:
label: I/O Threads Policy
tip: "How libvirt allocates I/O threads. \"Shared\" uses one thread for all disks; \"Auto\" pools threads round-robin (up to ~2x vCPUs); \"Supplemental Pool\" lets you pick a fixed thread count and adds matching CPUs to the pod."
default: "Disabled (default)"
shared: Shared
auto: Auto
supplementalPool: Supplemental Pool
autoEnabledTip: A disk requests a dedicated I/O thread, so the policy is enabled (defaults to "Shared").
ioThreadCount:
label: I/O Thread Count
tip: Number of I/O threads for the supplemental pool. 4-8 is a common range depending on workload.
shareable:
label: Shareable
tip: Allow multiple virtual machines to attach and write to this volume simultaneously.
warning: Multiple virtual machines can write to this volume at the same time. The guest workloads must coordinate access to the shared block device, otherwise concurrent writes will corrupt the data. Workloads that fence through SCSI-3 Persistent Reservations (e.g. Windows Server Failover Clustering) also require persistent reservation support from the storage backend. Host cache and hypervisor disk locking are disabled, and backup or snapshot operations are rejected while the volume is shareable.
vmImageVolumeTip: Disk size ({diskSize}) should greater than selected image virtual size ({imageVirtualSize}) vmImageVolumeTip: Disk size ({diskSize}) should greater than selected image virtual size ({imageVirtualSize})
lockTooltip: lockTooltip:
all: All volumes are encrypted. all: All volumes are encrypted.
@@ -887,13 +814,13 @@ harvester:
title: "Network Data:" title: "Network Data:"
tip: "The network-data configuration allows you to customize the instance's networking interfaces by assigning subnet configuration, virtual device creation (bonds, bridges, VLANs) routes and DNS configuration. <a href='https://cloudinit.readthedocs.io/en/latest/reference/network-config-format-v1.html' target='_blank'>Learn more</a>" tip: "The network-data configuration allows you to customize the instance's networking interfaces by assigning subnet configuration, virtual device creation (bonds, bridges, VLANs) routes and DNS configuration. <a href='https://cloudinit.readthedocs.io/en/latest/reference/network-config-format-v1.html' target='_blank'>Learn more</a>"
sysprep: sysprep:
title: Windows Unattended & Sysprep Configuration title: Windows Sysprep Configuration
description: "Configure Windows automated installation using autounattend.xml. The configuration will be stored in a Kubernetes Secret and mounted as a CD-ROM during installation. <a href='https://docs.microsoft.com/en-us/windows-hardware/manufacture/desktop/automate-windows-setup' target='_blank'>Learn more</a>" description: "Configure Windows automated installation using autounattend.xml. The configuration will be stored in a Kubernetes Secret and mounted as a CD-ROM during installation. <a href='https://docs.microsoft.com/en-us/windows-hardware/manufacture/desktop/automate-windows-setup' target='_blank'>Learn more</a>"
createNew: Create new... createNew: Create new...
createNewTitle: Create Windows Unattended & Sysprep Template createNewTitle: Create Windows Sysprep Template
xmlContent: autounattend.xml content xmlContent: autounattend.xml content
secret: secret:
label: Windows Unattended & Sysprep Template label: Windows Sysprep Template
validation: validation:
invalidXml: Invalid XML syntax invalidXml: Invalid XML syntax
invalidNamespace: Invalid unattend.xml namespace. Expected 'urn:schemas-microsoft-com:unattend' invalidNamespace: Invalid unattend.xml namespace. Expected 'urn:schemas-microsoft-com:unattend'
@@ -931,7 +858,7 @@ harvester:
displayNamePlaceholder: Virtual machine alias name displayNamePlaceholder: Virtual machine alias name
displayName: Display Name displayName: Display Name
filesystem: filesystem:
description: '[[Harvester]] supports filesystem volumes for VM via virtiofs.' description: Harvester supports filesystem volumes for VM via virtiofs.
type: Filesystem Type type: Filesystem Type
volume: Volume volume: Volume
resource: Resource resource: Resource
@@ -1047,8 +974,6 @@ harvester:
createWithDataVolumeTooltip: Create Volume with Kubevirt/Containerized Data Importer way. It can fill accessMode/volumeMode automatically. createWithDataVolumeTooltip: Create Volume with Kubevirt/Containerized Data Importer way. It can fill accessMode/volumeMode automatically.
showAdvanced: Show Advanced Options showAdvanced: Show Advanced Options
hideAdvanced: Hide Advanced Options hideAdvanced: Hide Advanced Options
performance:
pvcTip: These high-performance options are saved as defaults on the volume and applied when it is attached to a virtual machine as a disk.
source: Source source: Source
kind: Kind kind: Kind
sourceOptions: sourceOptions:
@@ -1140,8 +1065,8 @@ harvester:
selectExisting: Select Existing Image selectExisting: Select Existing Image
createRepository: Creating Upgrade Repository createRepository: Creating Upgrade Repository
succeeded: Succeeded succeeded: Succeeded
releaseTip: Please read the upgrade documentation carefully. You can view details on the <a href="{url}" target="_blank">[[Harvester]] Release Notes</a>. releaseTip: Please read the upgrade documentation carefully. You can view details on the <a href="{url}" target="_blank">Harvester Release Notes</a>.
checkReady: I have read and understood the upgrade instructions related to this [[Harvester]] version. checkReady: I have read and understood the upgrade instructions related to this Harvester version.
pending: Pending pending: Pending
upload: upload:
duplicatedFile: The file you are trying to upload already exists. duplicatedFile: The file you are trying to upload already exists.
@@ -1150,15 +1075,13 @@ harvester:
os: OS os: OS
kubernetes: Kubernetes kubernetes: Kubernetes
monitoringChart: Monitoring Chart monitoringChart: Monitoring Chart
harvesterChart: '[[Harvester]] Chart' harvesterChart: Harvester Chart
success: Success success: Success
fail: Fail fail: Fail
ongoing: On-going ongoing: On-going
downloadLog: Download Log downloadLog: Download Log
logStatus: Log Download Status logStatus: Log Download Status
dismissMessage: Dismiss it dismissMessage: Dismiss it
upgradeAvailable: Upgrade Available
upgradeUnavailable: Upgrade Unavailable
upgradeInfo: upgradeInfo:
warning: WARNING warning: WARNING
doc: Read the <a href="{url}" target="_blank">documentation</a> before starting the upgrade process. Ensure that you complete procedures that are relevant to your environment and the version you are upgrading to. doc: Read the <a href="{url}" target="_blank">documentation</a> before starting the upgrade process. Ensure that you complete procedures that are relevant to your environment and the version you are upgrading to.
@@ -1190,7 +1113,7 @@ harvester:
maxFailure: maxFailure:
label: Max Failure label: Max Failure
count: Count count: Count
tooltip: Max number of consecutive failed backups that could be tolerated. If reach this threshold, [[Harvester]] controller will suspend the schedule job. This value should less than retain count tooltip: Max number of consecutive failed backups that could be tolerated. If reach this threshold, Harvester controller will suspend the schedule job. This value should less than retain count
virtualMachine: virtualMachine:
title: Virtual Machine Name title: Virtual Machine Name
placeholder: Select a virtual machine placeholder: Select a virtual machine
@@ -1204,7 +1127,7 @@ harvester:
title: Restore Virtual Machine title: Restore Virtual Machine
refreshInterval: refreshInterval:
label: Refresh Interval label: Refresh Interval
tip: The interval for the backup target to sync data to [[Harvester]] cluster. Set to 0 to disable refresh mechanism. tip: The interval for the backup target to sync data to harvester cluster. Set to 0 to disable refresh mechanism.
backupTargetTip: The endpoint used to access the backupstore. NFS and S3 are supported. backupTargetTip: The endpoint used to access the backupstore. NFS and S3 are supported.
message: message:
noSetting: noSetting:
@@ -1223,7 +1146,7 @@ harvester:
actionLabel: Test connection actionLabel: Test connection
waitingLabel: Testing connection... waitingLabel: Testing connection...
successLabel: Connection tested successLabel: Connection tested
successMessage: '[[Harvester]] can successfully connect to the endpoint {endpoint}' successMessage: 'Harvester can successfully connect to the endpoint {endpoint}'
restore: restore:
backup: Backup backup: Backup
deletePreviousVolumes: Delete Previous Volumes deletePreviousVolumes: Delete Previous Volumes
@@ -1434,7 +1357,7 @@ harvester:
placeholder: Select a provider network placeholder: Select a provider network
networkPolicy: networkPolicy:
label: Policies label: Policies
banner: The network policies must be used for VMs attached to overlay networks. Please read the <a href="{url}" target="_blank">[[Harvester]] documentation</a> on how network policies work. banner: The network policies must be used for VMs attached to overlay networks. Please read the <a href="{url}" target="_blank">harvester document</a> how the network policy works.
network: network:
label: Virtual Machine Networks label: Virtual Machine Networks
tabs: tabs:
@@ -1543,7 +1466,7 @@ harvester:
autoRotateRKE2Certs: autoRotateRKE2Certs:
expiringInHours: Expiring in expiringInHours: Expiring in
httpProxy: httpProxy:
warning: 'WARNING: <br/> If you configure "http-proxy" and "https-proxy", you must also put [[Harvester]] node&apos;s CIDR into "no-proxy", otherwise the [[Harvester]] cluster will be broken.' warning: 'WARNING: <br/> If you configure "http-proxy" and "https-proxy", you must also put Harvester node&apos;s CIDR into "no-proxy", otherwise the Harvester cluster will be broken.'
supportBundleImage: supportBundleImage:
imagePullPolicy: Pull Policy imagePullPolicy: Pull Policy
repo: Repository repo: Repository
@@ -1595,7 +1518,7 @@ harvester:
strategyType: Strategy Type strategyType: Strategy Type
concurrency: Concurrency concurrency: Concurrency
harvesterMonitoring: harvesterMonitoring:
label: '[[Harvester]] Monitoring' label: Harvester Monitoring
section: section:
prometheus: Prometheus prometheus: Prometheus
prometheusNodeExporter: Prometheus Node Exporter prometheusNodeExporter: Prometheus Node Exporter
@@ -1610,10 +1533,10 @@ harvester:
url: URL url: URL
insecureSkipTLSVerify: Insecure Skip TLS Verify insecureSkipTLSVerify: Insecure Skip TLS Verify
tip: tip:
prefix: '[[Harvester]] secures cluster registration via TLS by default. If opt out "Insecure Skip TLS Verify", you must provide custom CA certificates using the' prefix: Harvester secures cluster registration via TLS by default. If opt out "Insecure Skip TLS Verify", you must provide custom CA certificates using the
middle: 'additional-ca' middle: 'additional-ca'
suffix: setting. suffix: setting.
message: To completely unset the imported [[Harvester]] cluster, please also remove it on the Rancher Dashboard UI via the <code> Virtualization Management </code> page. message: To completely unset the imported Harvester cluster, please also remove it on the Rancher Dashboard UI via the <code> Virtualization Management </code> page.
ntpServers: ntpServers:
isNotIPV4: The address you entered is not IPv4 or host. Please enter a valid IPv4 address or a host address. isNotIPV4: The address you entered is not IPv4 or host. Please enter a valid IPv4 address or a host address.
isDuplicate: There are duplicate NTP server configurations. isDuplicate: There are duplicate NTP server configurations.
@@ -1643,19 +1566,19 @@ harvester:
networkData: Network Data networkData: Network Data
support: support:
title: '[[Harvester]] Support' title: Harvester Support
kubeconfig: kubeconfig:
title: Download KubeConfig title: Download KubeConfig
titleDescription: Download kubeconfig for debugging. titleDescription: Download kubeconfig for debugging.
internal: internal:
rancher: rancher:
title: Access Embedded Rancher UI title: Access Embedded Rancher UI
titleDescription: You can only use the embedded Rancher UI for debugging and validation purposes. For more information about how [[Harvester]] integrates with Rancher, see the <a target="_blank" href="{url}" rel="noopener noreferrer nofollow">documentation</a>. titleDescription: You can only use the embedded Rancher UI for debugging and validation purposes. For more information about how Harvester integrates with Rancher, see the <a target="_blank" href="{url}" rel="noopener noreferrer nofollow">documentation</a>.
longhorn: longhorn:
title: Access Embedded Longhorn UI title: Access Embedded Longhorn UI
titleDescription: We only support to use the embedded Longhorn UI for debugging and validation purpose. titleDescription: We only support to use the embedded Longhorn UI for debugging and validation purpose.
community: community:
learnMore: Find out more about [[Harvester]] support learnMore: Find out more about SUSE Harvester support
pricing: Contact us for pricing pricing: Contact us for pricing
namespace: namespace:
@@ -1875,19 +1798,17 @@ harvester:
addons: addons:
descriptions: descriptions:
'harvester-system/vm-import-controller': vm-import-controller is an add-on to help migrate virtual machine workloads from other source clusters to an existing [[Harvester]] cluster. 'harvester-system/vm-import-controller': vm-import-controller is an add-on to help migrate virtual machine workloads from other source clusters to an existing Harvester cluster.
'harvester-system/pcidevices-controller': pcidevices-controller is an add-on to help discover PCI devices for nodes in your cluster and allow users to prepare devices for PCI Passthrough, for use with [[Harvester]] virtual machine and guest clusters. 'harvester-system/pcidevices-controller': pcidevices-controller is an add-on to help discover PCI devices for nodes in your cluster and allow users to prepare devices for PCI Passthrough, for use with Harvester virtual machine and guest clusters.
'cattle-logging-system/rancher-logging': rancher-logging is an add-on to collect versatile logs, events, and audits from the [[Harvester]] cluster and route them to many kinds of servers based on flows. 'cattle-logging-system/rancher-logging': rancher-logging is an add-on to collect versatile logs, events, and audits from the Harvester cluster and route them to many kinds of servers based on flows.
'harvester-system/rancher-vcluster': rancher-vcluster deploys a virtual cluster (vcluster) with Rancher installed. 'harvester-system/rancher-vcluster': rancher-vcluster deploys a virtual cluster (vcluster) with Rancher installed.
'cattle-monitoring-system/rancher-monitoring': rancher-monitoring is an add-on that collects [[Harvester]] cluster and virtual machine metrics and allows you to view the metrics on an embedded dashboard and send alert(s) to remote servers. 'cattle-monitoring-system/rancher-monitoring': rancher-monitoring is an add-on that collects Harvester cluster and virtual machine metrics and allows you to view the metrics on an embedded dashboard and send alert(s) to remote servers.
'vm-import-controller': vm-import-controller is an add-on to help migrate virtual machine workloads from other source clusters to an existing [[Harvester]] cluster. 'vm-import-controller': vm-import-controller is an add-on to help migrate virtual machine workloads from other source clusters to an existing Harvester cluster.
'pcidevices-controller': pcidevices-controller is an add-on to help discover PCI devices for nodes in your cluster and allow users to prepare devices for PCI Passthrough, for use with [[Harvester]] virtual machines and guest clusters. 'pcidevices-controller': pcidevices-controller is an add-on to help discover PCI devices for nodes in your cluster and allow users to prepare devices for PCI Passthrough, for use with Harvester virtual machines and guest clusters.
'nvidia-driver-toolkit': 'nvidia-driver-toolkit is an add-on to enable vGPU devices and assign them to [[Harvester]] virtual machines.' 'nvidia-driver-toolkit': 'nvidia-driver-toolkit is an add-on to enable vGPU devices and assign them to Harvester virtual machines.'
'rancher-logging': rancher-logging is an add-on to collect versatile logs, events, and audits from the [[Harvester]] cluster and route them to many kinds of servers based on flows. 'rancher-logging': rancher-logging is an add-on to collect versatile logs, events, and audits from the Harvester cluster and route them to many kinds of servers based on flows.
'rancher-monitoring': rancher-monitoring is an add-on to collect [[Harvester]] cluster and virtual machine metrics, view them on the embedded dashboard, and send alert(s) to remote servers. 'rancher-monitoring': rancher-monitoring is an add-on to collect Harvester cluster and virtual machine metrics, view them on the embedded dashboard, and send alert(s) to remote servers.
'rancher-vcluster': rancher-vcluster deploys a virtual cluster (vcluster) with Rancher installed. 'rancher-vcluster': rancher-vcluster deploys a virtual cluster (vcluster) with Rancher installed.
'k3k': k3k is an add-on to deploy the k3k controller.
'rancher-k3k': rancher-k3k deploys a k3k virtual cluster with Rancher installed.
'harvester-seeder': harvester-seeder is an add-on that uses IPMI and Redfish to discover hardware information and perform out-of-band operations. 'harvester-seeder': harvester-seeder is an add-on that uses IPMI and Redfish to discover hardware information and perform out-of-band operations.
'harvester-system/harvester-seeder': harvester-seeder is an add-on that uses IPMI and Redfish to discover hardware information and perform out-of-band operations. 'harvester-system/harvester-seeder': harvester-seeder is an add-on that uses IPMI and Redfish to discover hardware information and perform out-of-band operations.
'harvester-csi-driver-lvm': harvester-csi-driver-lvm is an add-on allowing users to create PVC through the LVM with local devices. 'harvester-csi-driver-lvm': harvester-csi-driver-lvm is an add-on allowing users to create PVC through the LVM with local devices.
@@ -1898,7 +1819,6 @@ harvester:
unknown: Unknown unknown: Unknown
identifier: Identifier identifier: Identifier
podNetwork: Pod Network podNetwork: Pod Network
ignored: Ignored
usedBy: "Used by:" usedBy: "Used by:"
vlan: "VLAN {id}" vlan: "VLAN {id}"
vCpu: "{count} vCPU" vCpu: "{count} vCPU"
@@ -1919,7 +1839,7 @@ harvester:
connectionFailed: Connection failed connectionFailed: Connection failed
providerNotReady: Provider not ready providerNotReady: Provider not ready
labels: labels:
dashboard: Migration Overview dashboard: Migrations
provider: Providers provider: Providers
networkMap: Network Maps networkMap: Network Maps
storageMap: Storage Maps storageMap: Storage Maps
@@ -1953,14 +1873,11 @@ harvester:
providerSelect: Provider providerSelect: Provider
createNew: Create new provider createNew: Create new provider
requirementsTitle: Requirements requirementsTitle: Requirements
requirementsText: "To migrate virtual machines from VMware, you will need a vCenter Server running version 6.5 or higher with a user account that has at least read permissions, and the source environment must be network-accessible from [[Harvester]] Node." requirementsText: "To migrate virtual machines from VMware, you will need a vCenter Server running version 6.5 or higher with a user account that has at least read permissions, and the source environment must be network-accessible from Rancher."
name: Name name: Name
urlLabel: vCenter/ESXi URL urlLabel: vCenter/ESXi URL
urlPlaceholder: "https://vcenter.example.com/sdk" urlPlaceholder: "https://vcenter.example.com/sdk"
urlHint: Enter the full URL including https:// urlHint: Enter the full URL including https://
vddkImageLabel: VMware VDDK Image
vddkImagePlaceholder: "[your-private-registry]/vddk-image:latest"
vddkImageTooltip: Specify the VMware VDDK (Virtual Disk Development Kit) Image to accelerate and optimize VMware virtual machine migration.
skipSsl: Skip SSL certificate verification skipSsl: Skip SSL certificate verification
skipSslHint: Not recommended for production environments skipSslHint: Not recommended for production environments
testConnection: testConnection:
@@ -1982,7 +1899,6 @@ harvester:
refreshNow: Refresh now refreshNow: Refresh now
availableVms: Available Virtual Machines availableVms: Available Virtual Machines
selected: selected selected: selected
clearAll: Clear All
saveSelection: Save Selection and Continue saveSelection: Save Selection and Continue
selectAllBanner: selectAllBanner:
pageOnly: "Your current selection includes only VMs currently shown on the page." pageOnly: "Your current selection includes only VMs currently shown on the page."
@@ -2005,8 +1921,8 @@ harvester:
network: Network network: Network
datastore: Datastore datastore: Datastore
dashboard: dashboard:
title: Virtual Machine Migration Overview title: VMware to Harvester Migration
description: "Migrate virtual machines from VMware vSphere to [[Harvester]] using cold migration for data consistency. Create a migration plan to select VMs, map networks and storage, and prepare a migration to [[Harvester]]." description: Migrate virtual machines from VMware vSphere to Harvester using cold migration for data consistency. Create a migration plan to select VMs, map networks and storage, and prepare a migration to Harvester.
createPlan: Create Migration createPlan: Create Migration
tableTitle: Migrations tableTitle: Migrations
columns: columns:
@@ -2014,85 +1930,48 @@ harvester:
plan: Migration Plan plan: Migration Plan
progress: Progress progress: Progress
mappings: Mappings mappings: Mappings
duration: Duration
progress: progress:
failed: Failed failed: Failed
migration: Migration migration: Migration
initializingMigration: Initializing migration initializingMigration: Initializing migration
finishedSuccessfully: Finished Successfully finishedSuccessfully: Finished Successfully
step: "Step {index}" step: "Step {index}"
vmCount: "{count, plural, one {# VM} other {# VMs}}" vmCount: "{count} VMs"
vmId: "id: {id}" vmId: "id: {id}"
checkMigratedVm: Click to check migrated VM details
configureMappings: configureMappings:
title: Set Mappings title: Set Mappings
description: Map VMware networks and datastores to [[Harvester]] and Longhorn target resources description: Map VMware networks and datastores to Harvester and Longhorn target resources
save: Save Mappings and Continue save: Save Mappings and Continue
noTemplate: Start from scratch noTemplate: Start from scratch
removeMap: Remove mapping removeMap: Remove Map
networkMapping: networkMapping:
title: Network Mapping title: Network Mapping
description: Map VMware port groups to [[Harvester]] networks description: Map VMware port groups to Harvester networks
placeholder: Choose a [[Harvester]] network placeholder: Choose a Harvester network
template: Use existing network mapping as template template: Use existing network mapping as template
options: options:
podNetworking: Management Network podNetworking: Pod Networking
ignored: Ignored (No NIC will be created) ignored: Ignored
storageMapping: storageMapping:
title: Storage Mapping title: Storage Mapping
description: Map VMware datastores to [[Harvester]] storage classes description: Map VMware datastores to Harvester storage classes
placeholder: Choose a [[Harvester]] Storage Class placeholder: Choose a Longhorn Storage Volume
template: Use existing storage mapping as template template: Use existing storage mapping as template
storageDefaults:
title: 'Storage defaults — {name}'
description: 'Set the volume mode and access modes applied to every datastore in this storage map that maps to {name}.'
descriptionInherited: 'Applies to every datastore in this storage map that maps to {name}. The provider default for {provider} stays unchanged.'
summary: 'Volume mode: {volumeMode} · Access mode: {accessModes}'
inherited: 'Inherited from provider {provider}'
volumeMode: Volume Mode
accessMode: Access Mode
edit: Edit
cancel: Cancel
apply: Apply
resetToProviderDefault: Reset to Provider Default
applyOverride: Apply Override
reviewMigration: reviewMigration:
title: Review Migration Plan title: Review Migration Plan
description: Confirm your migration settings before starting the transfer of VMs to the target cluster. description: Confirm your migration settings before starting the transfer of VMs to the target cluster.
planName: Name planName: Name
planNamePlaceholder: "e.g. my-migration-plan" planNamePlaceholder: "e.g. my-migration-plan"
planNameProviderConflict: 'The name “{name}” is already used by an existing provider. Please input a different plan name.'
planNamePlanConflict: 'The name “{name}” is already used by an existing migration plan. Please input a different plan name.'
migrationDetails: Migration Details migrationDetails: Migration Details
migrationDetailsDescription: Name this plan and choose the namespace where migrated VMs will be created.
totalVms: Total VMs totalVms: Total VMs
vcpu: vCPU vcpu: vCPU
memory: Memory memory: Memory
storage: Storage storage: Storage
source: Source source: Source
provider: Provider targetNamespace: Target Namespace
targetNamespace: Namespace
targetNamespacePlaceholder: "Select target namespace"
migrationMode: Migration Mode migrationMode: Migration Mode
coldMigration: Cold Migration coldMigration: Cold Migration
coldMigrationDescription: All source VMs will be powered off during migration.
coldMigrationHint: Plan a maintenance window and notify relevant stakeholders before starting.
virtualMachines: Virtual Machines virtualMachines: Virtual Machines
editSelection: Edit selection
noVmSelected: "No VMs selected. Return to "
noVmSelectedLink: "Step 2 to select virtual machines."
columns:
vmName: VM Name
os: Operating System
resources: Resources
powerState: Power State
networkMapping: Network Mapping
storageMapping: Storage Mapping
sourceTarget: "Source \u2192 Target"
actions:
menuLabel: Actions
editMappings: Edit Mappings
removeFromPlan: Remove from Plan
warningTitle: "Cold Migration Warning" warningTitle: "Cold Migration Warning"
warningMessage: "All source VMs will be powered off, and downtime will occur during migration. Plan your maintenance window accordingly and notify relevant stakeholders" warningMessage: "All source VMs will be powered off, and downtime will occur during migration. Plan your maintenance window accordingly and notify relevant stakeholders"
startMigration: Start Migration Plan startMigration: Start Migration Plan
@@ -2106,8 +1985,6 @@ harvester:
start: Start start: Start
restart: Restart restart: Restart
stop: Stop stop: Stop
deleteDialog:
warning: Deleting this migration plan will also delete the following related resources
vmImport: vmImport:
titles: titles:
@@ -2192,14 +2069,6 @@ harvester:
hostname: Hostname hostname: Hostname
rancherVersion: Rancher Version rancherVersion: Rancher Version
password: Bootstrap Password password: Bootstrap Password
rancherK3k:
accessRancher: Access the Rancher Dashboard
hostname: Hostname
version: Rancher Version
password: Bootstrap Password
passwordTooltip: The initial password in Rancher for the first time login.
enable:
title: Enable K3k
switchFailed: "{action} {name} failed!" switchFailed: "{action} {name} failed!"
nvidiaDriverToolkit: nvidiaDriverToolkit:
titles: titles:
@@ -2360,17 +2229,11 @@ harvester:
vGpuDevices: vGPU Devices vGpuDevices: vGPU Devices
showMore: Show More showMore: Show More
parentSriov: Filter By Parent SR-IOV GPU parentSriov: Filter By Parent SR-IOV GPU
noPermission: Please contact your system administrator to add [[Harvester]] add-ons first. noPermission: Please contact your system administrator to add Harvester add-ons first.
goSetting: goSetting:
prefix: The nvidia-driver-toolkit add-on is not enabled, click prefix: The nvidia-driver-toolkit add-on is not enabled, click
middle: here middle: here
suffix: to enable it to manage your SR-IOV GPU devices. suffix: to enable it to manage your SR-IOV GPU devices.
enable:
title: Enable SR-IOV GPU Device
skipMigConfiguration: Use timesliced mode (skip MIG configuration)
note: If unchecked, MIG mode will be attempted by default. If MIG mode is not supported or fails to initialize, it will fall back to timesliced mode. The actual mode depends on whether the GPU supports MIG.
timeslicedBadge: timesliced mode
timesliced: Timesliced
migconfiguration: migconfiguration:
label: vGPU MIG Configurations label: vGPU MIG Configurations
@@ -2396,7 +2259,7 @@ harvester:
vgpu: vgpu:
label: vGPU Devices label: vGPU Devices
noPermission: Please contact system administrator to add [[Harvester]] add-ons first. noPermission: Please contact system administrator to add Harvester add-ons first.
detachWarning: detachWarning:
title: Cannot Disable vGPU title: Cannot Disable vGPU
message: Please detach the device from the VM and save it first before disabling this vGPU device. message: Please detach the device from the VM and save it first before disabling this vGPU device.
@@ -2417,7 +2280,7 @@ harvester:
usb: usb:
label: USB Devices label: USB Devices
noPermission: Please contact system admin to add [[Harvester]] add-ons first noPermission: Please contact system admin to add Harvester add-ons first
goSetting: goSetting:
prefix: The pcidevices-controller add-on is not enabled, click prefix: The pcidevices-controller add-on is not enabled, click
middle: here middle: here
@@ -2478,34 +2341,25 @@ typeDescription:
# Should fit on one line. # Should fit on one line.
# If you link to anything external, it MUST have # If you link to anything external, it MUST have
# target="_blank" rel="noopener noreferrer nofollow" # target="_blank" rel="noopener noreferrer nofollow"
harvester: "Branding allows administrators to globally re-brand the UI by customizing the [[Harvester]] product name, logos and color scheme." harvester: "Branding allows administrators to globally re-brand the UI by customizing the Harvester product name, logos and color scheme."
advancedSettings: advancedSettings:
tags: experimental: 'Experimental features allow users to test and evaluate early-access functionality prior to official supported releases'
modified:
label: Modified
experimental:
label: Experimental
description: 'Experimental: The feature is incomplete but its essential functionality is operational. The feature is not recommended for use in production environments.'
preview:
label: Technical Preview
description: 'Technical Preview: The feature is almost complete and its functionality is not expected to change significantly. Explore the feature extensively before using in production environments.'
descriptions: descriptions:
'harv-vlan': Default Network Interface name of the VLAN network. 'harv-vlan': Default Network Interface name of the VLAN network.
'harv-backup-target': Custom backup target to store virtual machine backups. 'harv-backup-target': Custom backup target to store virtual machine backups.
'branding': Branding allows administrators to globally re-brand the UI by customizing the [[Harvester]] product name, logos, and color scheme. 'branding': Branding allows administrators to globally re-brand the UI by customizing the Harvester product name, logos, and color scheme.
'harv-csi-driver-config': Configure additional information for CSI drivers. 'harv-csi-driver-config': Configure additional information for CSI drivers.
'harv-csi-online-expand-validation': Allow online volume expansion for specific CSI drivers. 'harv-csi-online-expand-validation': Allow online volume expansion for specific CSI drivers.
'harv-containerd-registry': Containerd Registry Configuration to connect private registries. 'harv-containerd-registry': Containerd Registry Configuration to connect private registries.
'harv-log-level': Configure [[Harvester]] server log level. Defaults to Info. 'harv-log-level': Configure Harvester server log level. Defaults to Info.
'harv-server-version': '[[Harvester]] server version.' 'harv-server-version': Harvester server version.
'harv-server-flavor': "Indicates the [[Harvester]] edition: Prime or Community." 'harv-upgrade-checker-enabled': Specifies whether to enable Harvester upgrade check or not. Default is True.
'harv-upgrade-checker-enabled': Specifies whether to enable [[Harvester]] upgrade check or not. Default is True. 'harv-upgrade-checker-url': Default Harvester upgrade check url. Only used when the <code>upgrade-checker-enabled</code> is equal to True.
'harv-upgrade-checker-url': Default [[Harvester]] upgrade check url. Only used when the <code>upgrade-checker-enabled</code> is equal to True. 'harv-ui-source': Configure how to load the UI source. The `External` option is used to load the UI from a ui-index URL, while the `Bundled` option loads the UI from the local Harvester server.
'harv-ui-source': Configure how to load the UI source. The `External` option is used to load the UI from a ui-index URL, while the `Bundled` option loads the UI from the local [[Harvester]] server.
'harv-ui-index': 'HTML index location for the UI.' 'harv-ui-index': 'HTML index location for the UI.'
'harv-cluster-registration-url': Registration URL for multi-cluster management. 'harv-cluster-registration-url': Registration URL for multi-cluster management.
'harv-http-proxy': 'HTTP proxy for [[Harvester]] to access external services.' 'harv-http-proxy': 'HTTP proxy for Harvester to access external services.'
'harv-additional-ca': 'Custom CA root certificates for TLS validation.' 'harv-additional-ca': 'Custom CA root certificates for TLS validation.'
'harv-overcommit-config': 'Resource overcommit configuration.' 'harv-overcommit-config': 'Resource overcommit configuration.'
'harv-support-bundle-timeout': 'Support bundle timeout configuration in minutes, use 0 to disable the timeout.' 'harv-support-bundle-timeout': 'Support bundle timeout configuration in minutes, use 0 to disable the timeout.'
@@ -2517,13 +2371,13 @@ advancedSettings:
'harv-storage-network': 'Longhorn storage-network setting.' 'harv-storage-network': 'Longhorn storage-network setting.'
'harv-rwx-network': 'Configure RWX network behavior for shared or dedicated storage network usage.' 'harv-rwx-network': 'Configure RWX network behavior for shared or dedicated storage network usage.'
'harv-support-bundle-namespaces': Select additional namespaces to include in the support bundle. 'harv-support-bundle-namespaces': Select additional namespaces to include in the support bundle.
'harv-auto-disk-provision-paths': Specify the disks(using glob pattern) that [[Harvester]] will automatically add as virtual machine storage. 'harv-auto-disk-provision-paths': Specify the disks(using glob pattern) that Harvester will automatically add as virtual machine storage.
'harv-support-bundle-image': Support bundle image configuration. Find different versions in <a href="https://hub.docker.com/r/rancher/support-bundle-kit/tags" target="_blank">rancher/support-bundle-kit</a>. 'harv-support-bundle-image': Support bundle image configuration. Find different versions in <a href="https://hub.docker.com/r/rancher/support-bundle-kit/tags" target="_blank">rancher/support-bundle-kit</a>.
'harv-release-download-url': This setting allows you to configure the <code>upgrade release download</code> URL address. [[Harvester]] will get the ISO URL and checksum value from the (<code>$URL</code>/<code>$VERSION</code>/version.yaml) file hosted by the configured URL. 'harv-release-download-url': This setting allows you to configure the <code>upgrade release download</code> URL address. Harvester will get the ISO URL and checksum value from the (<code>$URL</code>/<code>$VERSION</code>/version.yaml) file hosted by the configured URL.
'harv-default-vm-termination-grace-period-seconds': Configure the virtual machine termination grace period for virtual machine stop. 'harv-default-vm-termination-grace-period-seconds': Configure the virtual machine termination grace period for virtual machine stop.
'harv-ntp-servers': Configure NTP server. You can configure multiple IPv4 addresses or host addresses. 'harv-ntp-servers': Configure NTP server. You can configure multiple IPv4 addresses or host addresses.
'harv-auto-rotate-rke2-certs': The certificate rotation mechanism relies on Rancher. [[Harvester]] will automatically update certificates generation to trigger rotation. 'harv-auto-rotate-rke2-certs': The certificate rotation mechanism relies on Rancher. Harvester will automatically update certificates generation to trigger rotation.
'harv-kubeconfig-default-token-ttl-minutes': 'TTL (in minutes) applied on [[Harvester]] administration kubeconfig files. Default is 0, which means to never expire.' 'harv-kubeconfig-default-token-ttl-minutes': 'TTL (in minutes) applied on Harvester administration kubeconfig files. Default is 0, which means to never expire.'
'harv-longhorn-v2-data-engine-enabled': 'Enable the Longhorn V2 data engine. Default is false. <ul><li>Changing this setting will restart RKE2 on all nodes. This will not affect running VM workloads.</li><li>If you see "not enough hugepages-2Mi capacity" errors when enabling this setting, wait a minute for the error to clear. If the error remains, reboot the affected node.</li></ul>' 'harv-longhorn-v2-data-engine-enabled': 'Enable the Longhorn V2 data engine. Default is false. <ul><li>Changing this setting will restart RKE2 on all nodes. This will not affect running VM workloads.</li><li>If you see "not enough hugepages-2Mi capacity" errors when enabling this setting, wait a minute for the error to clear. If the error remains, reboot the affected node.</li></ul>'
'harv-longhorn-v2-data-engine-hugepage-enabled': 'Enable hugepages when using the Longhorn V2 data engine. Default is true. Disabling hugepages reduces memory pressure on low-spec nodes and increases deployment flexibility. However, performance may be lower compared to running with hugepages.' 'harv-longhorn-v2-data-engine-hugepage-enabled': 'Enable hugepages when using the Longhorn V2 data engine. Default is true. Disabling hugepages reduces memory pressure on low-spec nodes and increases deployment flexibility. However, performance may be lower compared to running with hugepages.'
'harv-longhorn-v2-data-engine-memory-size': 'Configure the amount of memory allocated to the SPDK target daemon when using the Longhorn V2 data engine. Default is 2048 MiB.' 'harv-longhorn-v2-data-engine-memory-size': 'Configure the amount of memory allocated to the SPDK target daemon when using the Longhorn V2 data engine. Default is 2048 MiB.'
@@ -86,13 +86,6 @@ export default {
value: 'spec.address', value: 'spec.address',
sort: ['spec.address'] sort: ['spec.address']
}, },
{
name: 'timesliced',
labelKey: 'harvester.sriovgpu.timesliced',
value: 'isTimesliced',
formatter: 'Checked',
align: 'center',
},
{ {
name: 'vfAddresses', name: 'vfAddresses',
label: 'VF Addresses', label: 'VF Addresses',
@@ -53,6 +53,7 @@ export default {
devices() { devices() {
const inStore = this.$store.getters['currentProduct'].inStore; const inStore = this.$store.getters['currentProduct'].inStore;
const data = this.$store.getters[`${ inStore }/all`](HCI.USB_DEVICE) || []; const data = this.$store.getters[`${ inStore }/all`](HCI.USB_DEVICE) || [];
data.forEach((row) => { data.forEach((row) => {
+1 -1
View File
@@ -72,7 +72,7 @@ export default {
/> />
<a <a
v-if="['rancher-vcluster', 'rancher-k3k'].includes(scope.row.metadata.name) && scope.row.spec.enabled" v-if="scope.row.metadata.name === 'rancher-vcluster' && scope.row.spec.enabled"
v-tooltip="t('harvester.addons.rancherVcluster.accessRancher')" v-tooltip="t('harvester.addons.rancherVcluster.accessRancher')"
class="ml-5" class="ml-5"
rel="nofollow noopener noreferrer" rel="nofollow noopener noreferrer"
+4 -13
View File
@@ -84,7 +84,7 @@ export default {
}, },
{ {
...NAME, ...NAME,
width: 150, width: 130,
}, },
{ {
name: 'host-ip', name: 'host-ip',
@@ -136,14 +136,14 @@ export default {
value: 'id', value: 'id',
formatter: 'HarvesterCPUPinning', formatter: 'HarvesterCPUPinning',
formatterOpts: { rows: this.rows }, formatterOpts: { rows: this.rows },
width: 75, width: 150,
align: 'center', align: 'center',
}); });
} }
if (this.hasLonghornSchema) { if (this.hasLonghornSchema) {
out.push({ out.push({
name: 'diskState', name: 'diskState',
labelKey: 'harvester.tableHeaders.diskState', labelKey: 'tableHeaders.diskState',
value: 'diskState', value: 'diskState',
formatter: 'HarvesterDiskState', formatter: 'HarvesterDiskState',
width: 130, width: 130,
@@ -156,6 +156,7 @@ export default {
name: 'console', name: 'console',
label: ' ', label: ' ',
align: 'right', align: 'right',
width: 80,
}); });
return out; return out;
@@ -238,8 +239,6 @@ export default {
v-if="!row.consoleUrl" v-if="!row.consoleUrl"
:href="consoleDocLink" :href="consoleDocLink"
target="_blank" target="_blank"
rel="noopener noreferrer"
class="console-info"
><i class="icon icon-info" /></a> ><i class="icon icon-info" /></a>
</div> </div>
</template> </template>
@@ -250,13 +249,5 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.console-button { .console-button {
display: flex; display: flex;
position: relative;
justify-content: flex-end;
}
.console-info {
position: absolute;
top: -8px;
right: -3px;
} }
</style> </style>
@@ -59,7 +59,7 @@ export default {
const configs = this.$store.getters[`${ inStore }/all`](HCI.VLAN_CONFIG); const configs = this.$store.getters[`${ inStore }/all`](HCI.VLAN_CONFIG);
return configs.filter((config) => config.spec?.clusterNetwork !== 'mgmt'); return configs;
}, },
vlanConfigSchema() { vlanConfigSchema() {
@@ -121,22 +121,6 @@ export default {
return [...this.rows, ...fakeRows]; return [...this.rows, ...fakeRows];
}, },
managementVlanConfigs() {
const inStore = this.$store.getters['currentProduct'].inStore;
const configs = this.$store.getters[`${ inStore }/all`](HCI.VLAN_CONFIG);
return configs
.filter((vc) => vc.spec?.clusterNetwork === 'mgmt')
.map((vc) => ({
id: vc.id,
node: vc.id.replace('mgmt-vlanconfig-', ''),
bondMode: vc.spec?.uplink?.bondOptions?.mode || '-',
interfaces: (vc.spec?.uplink?.nics?.length ? vc.spec.uplink.nics.join(', ') : '-'),
mtu: vc.spec?.uplink?.linkAttributes?.mtu || '-',
}));
},
}, },
methods: { methods: {
@@ -240,29 +224,6 @@ export default {
</button> </button>
</div> </div>
</div> </div>
<div
v-if="group.key === 'mgmt'"
class="mgmt-summary"
>
<div class="mgmt-header">
<div>{{ t('harvester.tableHeaders.vm.node') }}</div>
<div>{{ t('harvester.vlanConfig.uplink.bondOptions.mode.label') }}</div>
<div>{{ t('harvester.vlanConfig.uplink.nics.label') }}</div>
<div>{{ t('harvester.vlanConfig.uplink.linkAttributes.mtu.label') }}</div>
</div>
<div
v-for="config in managementVlanConfigs"
:key="config.id"
class="mgmt-row"
>
<div>{{ config.node }}</div>
<div>{{ config.bondMode }}</div>
<div>{{ config.interfaces }}</div>
<div>{{ config.mtu }}</div>
</div>
</div>
</template> </template>
<template <template
v-for="(clusterNetwork, i) in clusterNetworkWithoutConfigs" v-for="(clusterNetwork, i) in clusterNetworkWithoutConfigs"
@@ -312,21 +273,6 @@ export default {
} }
} }
} }
.mgmt-header,
.mgmt-row {
display: grid;
grid-template-columns: 2fr 2fr 2fr 1fr;
padding: 8px 12px;
}
.mgmt-header {
font-weight: 600;
}
.mgmt-row {
border-top: 1px solid var(--border);
}
</style> </style>
<style lang="scss"> <style lang="scss">
-12
View File
@@ -38,10 +38,6 @@ export const SSH_EXISTING_TYPE = {
export default { export default {
methods: { methods: {
hasCloudConfigComment(userScript) { hasCloudConfigComment(userScript) {
if (typeof userScript === 'string' && /^\s*#cloud-config(\s|$)/.test(userScript)) {
return true;
}
// Check that userData contains: #cloud-config // Check that userData contains: #cloud-config
const userDataDoc = userScript ? YAML.parseDocument(userScript) : YAML.parseDocument({}); const userDataDoc = userScript ? YAML.parseDocument(userScript) : YAML.parseDocument({});
const items = userDataDoc?.contents?.items || []; const items = userDataDoc?.contents?.items || [];
@@ -56,14 +52,6 @@ export default {
exist = true; exist = true;
} }
if (userDataDoc?.contents?.commentBefore === 'cloud-config' || userDataDoc?.contents?.commentBefore?.includes('cloud-config\n')) {
exist = true;
}
if (userDataDoc?.contents?.comment === 'cloud-config' || userDataDoc?.contents?.comment?.includes('cloud-config\n')) {
exist = true;
}
items.map((item) => { items.map((item) => {
const key = item.key; const key = item.key;
Loaded 100 of 138 files, more files were not shown because too many files have changed in this diff. Show more