mirror of
https://github.com/harvester/harvester-ui-extension.git
synced 2026-10-05 05:36:05 +08:00
Compare commits
100
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
55918232a6 | ||
|
|
ce2adbdc3b | ||
|
|
ae65037083 | ||
|
|
b4ea7c8f98 | ||
|
|
836b04f222 | ||
|
|
0908c7fc6b | ||
|
|
b34d618c7c | ||
|
|
8945b9f158 | ||
|
|
c5af2b576b | ||
|
|
45872cef3b | ||
|
|
3e5ee422ce | ||
|
|
75202a9e55 | ||
|
|
5f5ce291fb | ||
|
|
a27e38fc81 | ||
|
|
89e1484884 | ||
|
|
eacca055c7 | ||
|
|
56c1738055 | ||
|
|
8f4b335cae | ||
|
|
91232beffc | ||
|
|
09e8946cc3 | ||
|
|
e70c684382 | ||
|
|
1446aac168 | ||
|
|
8e65274b0c | ||
|
|
e5432210b9 | ||
|
|
af52df0ba0 | ||
|
|
e5a1929ac5 | ||
|
|
9de065a5c9 | ||
|
|
cd933bdbf8 | ||
|
|
5fe642a42d | ||
|
|
18c66083ab | ||
|
|
d291a35754 | ||
|
|
5cc8b4c301 | ||
|
|
032700293c | ||
|
|
8cb793e7ad | ||
|
|
2c45b71d1f | ||
|
|
5a301dcf55 | ||
|
|
1a92265d03 | ||
|
|
8f65915bad | ||
|
|
67bb6dfbd5 | ||
|
|
e74428d951 | ||
|
|
629f7df6b9 | ||
|
|
b7119d5c4c | ||
|
|
6fdd1e3954 | ||
|
|
7d0f33f31d | ||
|
|
9ce95daf76 | ||
|
|
ce72232bc3 | ||
|
|
afc0e0f531 | ||
|
|
e941cc9a90 | ||
|
|
9961523d08 | ||
|
|
c4d1018388 | ||
|
|
be64329776 | ||
|
|
35411ed87a | ||
|
|
15eb0f07f7 | ||
|
|
fb78f24fdd | ||
|
|
81ad827829 | ||
|
|
6dd9b33336 | ||
|
|
1f9e9b336b | ||
|
|
c5b4f6cd1e | ||
|
|
4ce35ce075 | ||
|
|
27c26bd782 | ||
|
|
9d698b1230 | ||
|
|
566e79eda5 | ||
|
|
42ddcfc1fe | ||
|
|
ad3decf71f | ||
|
|
8083a41df0 | ||
|
|
46b860260a | ||
|
|
62801b3b13 | ||
|
|
161e3bbd97 | ||
|
|
97e93dba0b | ||
|
|
9a8a709e56 | ||
|
|
d1949641a7 | ||
|
|
9c9f59c939 | ||
|
|
ccc14c7fb9 | ||
|
|
2ba471907e | ||
|
|
5aea476f64 | ||
|
|
519c7d9f1f | ||
|
|
a9c392c13f | ||
|
|
888ec7a50f | ||
|
|
a2486a7d38 | ||
|
|
df3d249923 | ||
|
|
23344e0c07 | ||
|
|
62b80b3cec | ||
|
|
1cf94ee550 | ||
|
|
dfaa9fbe33 | ||
|
|
94b1c24479 | ||
|
|
e0b2b9ec57 | ||
|
|
06b38a0f99 | ||
|
|
4be3634c82 | ||
|
|
de103ff91e | ||
|
|
37a91601c9 | ||
|
|
9794671ccd | ||
|
|
337f9186f1 | ||
|
|
7c187e894d | ||
|
|
c2df13ad73 | ||
|
|
93f027a57c | ||
|
|
da83f04b6c | ||
|
|
a97cb08e3f | ||
|
|
3fdc9f03a3 | ||
|
|
c8a613874a | ||
|
|
2db7ee7397 |
@@ -4,7 +4,8 @@ description: Setup node and install dependencies
|
|||||||
runs:
|
runs:
|
||||||
using: 'composite'
|
using: 'composite'
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/setup-node@v4
|
- name: Setup Nodejs with yarn caching
|
||||||
|
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
|
||||||
with:
|
with:
|
||||||
node-version-file: '.nvmrc'
|
node-version-file: '.nvmrc'
|
||||||
cache: 'yarn'
|
cache: 'yarn'
|
||||||
|
|||||||
@@ -1,6 +0,0 @@
|
|||||||
addAssignees: author
|
|
||||||
addReviewers: true
|
|
||||||
numberOfReviewers: 0
|
|
||||||
reviewers:
|
|
||||||
- a110605
|
|
||||||
- houhoucoop
|
|
||||||
+15
-4
@@ -34,14 +34,25 @@
|
|||||||
{
|
{
|
||||||
"matchUpdateTypes": ["minor"],
|
"matchUpdateTypes": ["minor"],
|
||||||
"groupName": "minor dependencies",
|
"groupName": "minor dependencies",
|
||||||
|
"minimumReleaseAge": "7 days",
|
||||||
"labels": ["minor-update"],
|
"labels": ["minor-update"],
|
||||||
"reviewers": ["a110605", "houhoucoop"]
|
"reviewers": ["a110605", "houhoucoop"]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"matchUpdateTypes": ["patch", "digest"],
|
"matchUpdateTypes": ["patch"],
|
||||||
"automerge": true,
|
"automerge": false,
|
||||||
"groupName": "patch digest dependencies",
|
"minimumReleaseAge": "7 days",
|
||||||
"labels": ["patch-update", "automerge"]
|
"groupName": "patch dependencies",
|
||||||
|
"labels": ["patch-update"],
|
||||||
|
"reviewers": ["a110605", "houhoucoop"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"matchUpdateTypes": ["digest", "pinDigest"],
|
||||||
|
"automerge": false,
|
||||||
|
"groupName": "digest dependencies",
|
||||||
|
"labels": ["digest-update"],
|
||||||
|
"schedule": ["on the first day of the month"],
|
||||||
|
"reviewers": ["a110605", "houhoucoop"]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,39 @@
|
|||||||
|
name: "PR Management Add PR Label Collect Data"
|
||||||
|
|
||||||
|
on:
|
||||||
|
pull_request:
|
||||||
|
types: [opened, reopened, edited]
|
||||||
|
branches:
|
||||||
|
- main
|
||||||
|
- 'release-harvester-v*'
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
collect:
|
||||||
|
if: github.event.pull_request.draft == false
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
actions: write
|
||||||
|
steps:
|
||||||
|
- name: Checkout repository
|
||||||
|
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
|
||||||
|
with:
|
||||||
|
ref: ${{ github.base_ref }}
|
||||||
|
|
||||||
|
- name: Setup Nodejs and yarn install
|
||||||
|
uses: ./.github/actions/setup
|
||||||
|
|
||||||
|
- name: Extract PR label
|
||||||
|
run: |
|
||||||
|
PR_LABEL=$(node ./scripts/extract-release-label.mjs "${{ github.event.pull_request.title }}")
|
||||||
|
echo "PR_LABEL=$PR_LABEL"
|
||||||
|
{
|
||||||
|
echo "PR_NUMBER=${{ github.event.pull_request.number }}"
|
||||||
|
echo "PR_LABEL=$PR_LABEL"
|
||||||
|
} > pr-add-label-data.env
|
||||||
|
|
||||||
|
- name: Upload PR data artifact
|
||||||
|
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
|
||||||
|
with:
|
||||||
|
name: pr-add-label-data
|
||||||
|
path: pr-add-label-data.env
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
name: "PR Management Add PR Label"
|
||||||
|
|
||||||
|
on:
|
||||||
|
workflow_run:
|
||||||
|
workflows:
|
||||||
|
- "PR Management Add PR Label Collect Data"
|
||||||
|
types: [completed]
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
auto-assign-pr-label:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
if: ${{ github.event.workflow_run.conclusion == 'success' }}
|
||||||
|
permissions:
|
||||||
|
actions: read
|
||||||
|
pull-requests: write
|
||||||
|
steps:
|
||||||
|
- name: Download PR data artifact
|
||||||
|
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
|
||||||
|
with:
|
||||||
|
name: pr-add-label-data
|
||||||
|
run-id: ${{ github.event.workflow_run.id }}
|
||||||
|
github-token: ${{ github.token }}
|
||||||
|
|
||||||
|
- name: Load PR data
|
||||||
|
run: |
|
||||||
|
cat pr-add-label-data.env >> $GITHUB_ENV
|
||||||
|
|
||||||
|
- name: Set PR label
|
||||||
|
env:
|
||||||
|
GH_TOKEN: ${{ github.token }}
|
||||||
|
run: |
|
||||||
|
echo "PR_LABEL = $PR_LABEL"
|
||||||
|
gh pr edit "$PR_NUMBER" --repo "${{ github.repository }}" --add-label "$PR_LABEL"
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
name: "PR Management Auto Assign Collect Data"
|
||||||
|
|
||||||
|
on:
|
||||||
|
pull_request:
|
||||||
|
types: [opened, ready_for_review]
|
||||||
|
branches:
|
||||||
|
- main
|
||||||
|
- 'release-harvester-v*'
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
collect:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
actions: write
|
||||||
|
steps:
|
||||||
|
- name: Save PR data to artifact
|
||||||
|
run: |
|
||||||
|
{
|
||||||
|
echo "PR_NUMBER=${{ github.event.pull_request.number }}"
|
||||||
|
echo "PR_AUTHOR=${{ github.event.pull_request.user.login }}"
|
||||||
|
} > pr-auto-assign-data.env
|
||||||
|
|
||||||
|
- name: Upload PR data artifact
|
||||||
|
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
|
||||||
|
with:
|
||||||
|
name: pr-auto-assign-data
|
||||||
|
path: pr-auto-assign-data.env
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
name: "[PR Management] Auto Assign Reviewer & Assignee"
|
|
||||||
|
|
||||||
on:
|
|
||||||
pull_request_target:
|
|
||||||
types: [opened, ready_for_review]
|
|
||||||
|
|
||||||
permissions:
|
|
||||||
pull-requests: write
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
auto-assign:
|
|
||||||
if: github.event.pull_request.draft == false
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: rancher/gh-issue-mgr/auto-assign-action@main
|
|
||||||
with:
|
|
||||||
configuration-path: .github/auto-assign-config.yaml
|
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
name: "PR Management Auto Assign"
|
||||||
|
|
||||||
|
on:
|
||||||
|
workflow_run:
|
||||||
|
workflows:
|
||||||
|
- "PR Management Auto Assign Collect Data"
|
||||||
|
types: [completed]
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
auto-assign:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
if: ${{ github.event.workflow_run.conclusion == 'success' }}
|
||||||
|
env:
|
||||||
|
REVIEWERS: "a110605,houhoucoop"
|
||||||
|
permissions:
|
||||||
|
actions: read
|
||||||
|
pull-requests: write
|
||||||
|
steps:
|
||||||
|
- name: Download PR data artifact
|
||||||
|
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
|
||||||
|
with:
|
||||||
|
name: pr-auto-assign-data
|
||||||
|
run-id: ${{ github.event.workflow_run.id }}
|
||||||
|
github-token: ${{ github.token }}
|
||||||
|
|
||||||
|
- name: Load PR data
|
||||||
|
run: |
|
||||||
|
cat pr-auto-assign-data.env >> $GITHUB_ENV
|
||||||
|
|
||||||
|
- name: Auto assign PR author
|
||||||
|
env:
|
||||||
|
GH_TOKEN: ${{ github.token }}
|
||||||
|
run: |
|
||||||
|
echo "Assigning PR author: $PR_AUTHOR"
|
||||||
|
gh pr edit "$PR_NUMBER" --repo "${{ github.repository }}" --add-assignee "$PR_AUTHOR" --add-reviewer "$REVIEWERS"
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
name: "PR Management Add Labels Collect Data"
|
||||||
|
|
||||||
|
on:
|
||||||
|
pull_request:
|
||||||
|
types: [opened, reopened]
|
||||||
|
branches:
|
||||||
|
- main
|
||||||
|
- 'release-harvester-v*'
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
collect:
|
||||||
|
if: github.event.pull_request.draft == false
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
actions: write
|
||||||
|
steps:
|
||||||
|
- name: Save PR data to artifact
|
||||||
|
run: |
|
||||||
|
{
|
||||||
|
echo "PR_NUMBER=${{ github.event.pull_request.number }}"
|
||||||
|
echo "PR_BASE_REF=${{ github.event.pull_request.base.ref }}"
|
||||||
|
echo "PR_USER_LOGIN=${{ github.event.pull_request.user.login }}"
|
||||||
|
} > pr-backport-label-data.env
|
||||||
|
|
||||||
|
- name: Upload PR data artifact
|
||||||
|
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
|
||||||
|
with:
|
||||||
|
name: pr-backport-label-data
|
||||||
|
path: pr-backport-label-data.env
|
||||||
@@ -1,40 +1,44 @@
|
|||||||
name: "[PR Management] Add Labels"
|
name: "PR Management Add Backport Labels"
|
||||||
|
|
||||||
on:
|
on:
|
||||||
pull_request_target:
|
workflow_run:
|
||||||
types: [opened, reopened]
|
workflows:
|
||||||
branches:
|
- "PR Management Add Labels Collect Data"
|
||||||
- main
|
types: [completed]
|
||||||
- 'release-harvester-v*'
|
|
||||||
|
|
||||||
permissions:
|
|
||||||
pull-requests: write
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
add-require-backport-label:
|
add-require-backport-label:
|
||||||
if: github.event.pull_request.draft == false &&
|
|
||||||
github.event.pull_request.base.ref == 'main'
|
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
if: ${{ github.event.workflow_run.conclusion == 'success' }}
|
||||||
|
permissions:
|
||||||
|
actions: read
|
||||||
|
pull-requests: write
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Download PR data artifact
|
||||||
uses: actions/checkout@v4
|
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
|
||||||
with:
|
with:
|
||||||
ref: ${{ github.base_ref }}
|
name: pr-backport-label-data
|
||||||
|
run-id: ${{ github.event.workflow_run.id }}
|
||||||
|
github-token: ${{ github.token }}
|
||||||
|
|
||||||
- name: Fetch release branches and PR labels
|
- name: Load PR data
|
||||||
id: fetch_info
|
run: |
|
||||||
|
cat pr-backport-label-data.env >> $GITHUB_ENV
|
||||||
|
|
||||||
|
- name: Add require-backport label (main branch PRs)
|
||||||
|
if: env.PR_BASE_REF == 'main'
|
||||||
env:
|
env:
|
||||||
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GH_TOKEN: ${{ github.token }}
|
||||||
run: |
|
run: |
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
repo="${{ github.repository }}"
|
repo="${{ github.repository }}"
|
||||||
pr_number=${{ github.event.pull_request.number }}
|
pr_number="$PR_NUMBER"
|
||||||
|
|
||||||
release_branches=$(gh api "repos/${repo}/branches" --paginate --jq '.[].name' | grep -E '^release-harvester-v[0-9]+\.[0-9]+$' || true)
|
release_branches=$(gh api "repos/${repo}/branches" --paginate --jq '.[].name' | grep -E '^release-harvester-v[0-9]+\.[0-9]+$' || true)
|
||||||
|
|
||||||
if [[ -z "$release_branches" ]]; then
|
if [[ -z "$release_branches" ]]; then
|
||||||
echo "should_label=false" >> "$GITHUB_OUTPUT"
|
echo "No release branches found, skipping."
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -44,51 +48,36 @@ jobs:
|
|||||||
|
|
||||||
tags=$(gh api "repos/${repo}/releases" --paginate --jq '.[].tag_name')
|
tags=$(gh api "repos/${repo}/releases" --paginate --jq '.[].tag_name')
|
||||||
if echo "$tags" | grep -Fxq "$release_tag"; then
|
if echo "$tags" | grep -Fxq "$release_tag"; then
|
||||||
echo "should_label=false" >> "$GITHUB_OUTPUT"
|
echo "Release $release_tag already published, skipping."
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
label="require backport/v${version}"
|
label="require backport/v${version}"
|
||||||
echo "should_label=true" >> "$GITHUB_OUTPUT"
|
|
||||||
echo "backport_label=$label" >> "$GITHUB_OUTPUT"
|
|
||||||
|
|
||||||
pr_labels=$(gh pr view "$pr_number" --repo "$repo" --json labels --jq '.labels[].name' || echo "")
|
pr_labels=$(gh pr view "$pr_number" --repo "$repo" --json labels --jq '.labels[].name' || echo "")
|
||||||
pr_labels_csv=$(echo "$pr_labels" | tr '\n' ',' | sed 's/,$//')
|
|
||||||
echo "pr_labels=$pr_labels_csv" >> "$GITHUB_OUTPUT"
|
|
||||||
|
|
||||||
- name: Add label if needed
|
if echo "$pr_labels" | grep -Fxq "$label"; then
|
||||||
if: steps.fetch_info.outputs.should_label == 'true' && !contains(steps.fetch_info.outputs.pr_labels, steps.fetch_info.outputs.backport_label)
|
echo "Label '$label' already present, skipping."
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Adding label: $label"
|
||||||
|
gh pr edit "$pr_number" --repo "$repo" --add-label "$label"
|
||||||
|
|
||||||
|
- name: Add backport label (release branch PRs opened by Mergify)
|
||||||
|
if: startsWith(env.PR_BASE_REF, 'release-harvester-v')
|
||||||
env:
|
env:
|
||||||
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GH_TOKEN: ${{ github.token }}
|
||||||
run: |
|
run: |
|
||||||
echo "Adding label: ${{ steps.fetch_info.outputs.backport_label }}"
|
set -euo pipefail
|
||||||
gh pr edit ${{ github.event.pull_request.number }} \
|
|
||||||
--repo ${{ github.repository }} \
|
|
||||||
--add-label "${{ steps.fetch_info.outputs.backport_label }}"
|
|
||||||
|
|
||||||
add-backport-label:
|
IS_MERGIFY=$(echo "$PR_USER_LOGIN" | grep -iq 'mergify' && echo true || echo false)
|
||||||
if: github.event.pull_request.draft == false &&
|
|
||||||
startsWith(github.event.pull_request.base.ref, 'release-harvester-v')
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- name: Check conditions for backport label
|
|
||||||
id: check
|
|
||||||
run: |
|
|
||||||
IS_MERGIFY=$(echo '${{ github.event.pull_request.user.login }}' | grep -iq 'mergify' && echo true || echo false)
|
|
||||||
TARGET_BRANCH=${{ github.event.pull_request.base.ref }}
|
|
||||||
|
|
||||||
echo "IS_MERGIFY=$IS_MERGIFY" >> $GITHUB_OUTPUT
|
if [[ "$IS_MERGIFY" != "true" ]]; then
|
||||||
echo "TARGET_BRANCH=$TARGET_BRANCH" >> $GITHUB_OUTPUT
|
echo "PR author is not Mergify, skipping."
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
- name: Add label if needed
|
version="${PR_BASE_REF#release-harvester-v}"
|
||||||
if: steps.check.outputs.IS_MERGIFY == 'true' && startsWith(steps.check.outputs.TARGET_BRANCH, 'release-harvester-v')
|
|
||||||
env:
|
|
||||||
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
run: |
|
|
||||||
TARGET_BRANCH="${{ steps.check.outputs.TARGET_BRANCH }}"
|
|
||||||
version="${TARGET_BRANCH#release-harvester-v}"
|
|
||||||
label="backport/v${version}"
|
label="backport/v${version}"
|
||||||
echo "Adding label $label"
|
echo "Adding label: $label"
|
||||||
gh pr edit ${{ github.event.pull_request.number }} \
|
gh pr edit "$PR_NUMBER" --repo "${{ github.repository }}" --add-label "$label"
|
||||||
--repo ${{ github.repository }} \
|
|
||||||
--add-label "$label"
|
|
||||||
|
|||||||
@@ -0,0 +1,28 @@
|
|||||||
|
name: "PR Management Request Backport via Mergify Collect Data"
|
||||||
|
|
||||||
|
on:
|
||||||
|
pull_request:
|
||||||
|
types: [closed]
|
||||||
|
branches: [main]
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
collect:
|
||||||
|
if: github.event.pull_request.merged == true
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
actions: write
|
||||||
|
steps:
|
||||||
|
- name: Save PR data to artifact
|
||||||
|
run: |
|
||||||
|
labels_json='${{ toJson(github.event.pull_request.labels.*.name) }}'
|
||||||
|
{
|
||||||
|
echo "PR_NUMBER=${{ github.event.pull_request.number }}"
|
||||||
|
echo "PR_LABELS=$(echo "$labels_json" | jq -r '[.[]] | join(",")')"
|
||||||
|
} > pr-backport-request-data.env
|
||||||
|
|
||||||
|
- name: Upload PR data artifact
|
||||||
|
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
|
||||||
|
with:
|
||||||
|
name: pr-backport-request-data
|
||||||
|
path: pr-backport-request-data.env
|
||||||
@@ -1,41 +1,47 @@
|
|||||||
name: "[PR Management] Request Backport via Mergify"
|
name: "PR Management Request Backport via Mergify"
|
||||||
|
|
||||||
on:
|
on:
|
||||||
pull_request_target:
|
workflow_run:
|
||||||
types: [closed]
|
workflows:
|
||||||
branches: [main]
|
- "PR Management Request Backport via Mergify Collect Data"
|
||||||
|
types: [completed]
|
||||||
permissions:
|
|
||||||
pull-requests: write
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
comment-backport:
|
comment-backport:
|
||||||
if: github.event.pull_request.merged == true
|
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
if: ${{ github.event.workflow_run.conclusion == 'success' }}
|
||||||
|
permissions:
|
||||||
|
actions: read
|
||||||
|
pull-requests: write
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Download PR data artifact
|
||||||
uses: actions/checkout@v4
|
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
|
||||||
with:
|
with:
|
||||||
ref: ${{ github.base_ref }}
|
name: pr-backport-request-data
|
||||||
|
run-id: ${{ github.event.workflow_run.id }}
|
||||||
|
github-token: ${{ github.token }}
|
||||||
|
|
||||||
|
- name: Load PR data
|
||||||
|
run: |
|
||||||
|
cat pr-backport-request-data.env >> $GITHUB_ENV
|
||||||
|
|
||||||
- name: Post Mergify backport command
|
- name: Post Mergify backport command
|
||||||
env:
|
env:
|
||||||
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GH_TOKEN: ${{ github.token }}
|
||||||
run: |
|
run: |
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
pr_number=${{ github.event.pull_request.number }}
|
pr_number="$PR_NUMBER"
|
||||||
repo="${{ github.repository }}"
|
repo="${{ github.repository }}"
|
||||||
|
|
||||||
labels_json='${{ toJson(github.event.pull_request.labels.*.name) }}'
|
labels=$(echo "$PR_LABELS" | tr ',' '\n')
|
||||||
labels=$(echo "$labels_json" | jq -r '.[] // empty')
|
|
||||||
|
|
||||||
echo "Labels on PR: $labels"
|
echo "Labels on PR: $labels"
|
||||||
|
|
||||||
matches=$(echo "$labels" | grep -oE '^require backport/v[0-9]+\.[0-9]+$' || true)
|
matches=$(echo "$labels" | grep -oE '^require backport/v[0-9]+\.[0-9]+$' || true)
|
||||||
|
|
||||||
if [[ -z "$matches" ]]; then
|
if [[ -z "$matches" ]]; then
|
||||||
echo "No back‑port labels found — skipping."
|
echo "No back-port labels found — skipping."
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
|
||||||
|
|
||||||
- name: Check package version
|
- name: Check package version
|
||||||
env:
|
env:
|
||||||
|
|||||||
@@ -25,12 +25,12 @@ jobs:
|
|||||||
name: Build & Upload Hosted
|
name: Build & Upload Hosted
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
|
||||||
with:
|
with:
|
||||||
fetch-depth: 1
|
fetch-depth: 1
|
||||||
|
|
||||||
# Note - Cannot use the setup action here as it uses a different yarn install arg
|
# Note - Cannot use the setup action here as it uses a different yarn install arg
|
||||||
- uses: actions/setup-node@v4
|
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
|
||||||
with:
|
with:
|
||||||
node-version-file: '.nvmrc'
|
node-version-file: '.nvmrc'
|
||||||
cache: 'yarn'
|
cache: 'yarn'
|
||||||
@@ -45,19 +45,20 @@ jobs:
|
|||||||
run: ./scripts/build-upload-gate
|
run: ./scripts/build-upload-gate
|
||||||
|
|
||||||
- name: Get gcs auth
|
- name: Get gcs auth
|
||||||
uses: rancher-eio/read-vault-secrets@main
|
uses: rancher-eio/read-vault-secrets@d266f55186f80a893839f6e15662e67388e443e6 # v3
|
||||||
with:
|
with:
|
||||||
secrets: |
|
secrets: |
|
||||||
secret/data/github/repo/${{ github.repository }}/google-auth/harvester/credentials token | GOOGLE_AUTH ;
|
secret/data/github/repo/${{ github.repository }}/google-auth/harvester/credentials token | GOOGLE_AUTH ;
|
||||||
|
|
||||||
- name: Apply gcs auth
|
- name: Apply gcs auth
|
||||||
# https://github.com/google-github-actions/auth
|
# https://github.com/google-github-actions/auth
|
||||||
uses: 'google-github-actions/auth@v2'
|
uses: google-github-actions/auth@c200f3691d83b41bf9bbd8638997a462592937ed # v2
|
||||||
|
|
||||||
with:
|
with:
|
||||||
credentials_json: "${{ env.GOOGLE_AUTH }}"
|
credentials_json: "${{ env.GOOGLE_AUTH }}"
|
||||||
|
|
||||||
- name: Upload build
|
- name: Upload build
|
||||||
uses: 'google-github-actions/upload-cloud-storage@v2'
|
uses: google-github-actions/upload-cloud-storage@c0f6160ff80057923ff50e5e567695cea181ec23 # v2
|
||||||
# https://github.com/google-github-actions/upload-cloud-storage
|
# https://github.com/google-github-actions/upload-cloud-storage
|
||||||
with:
|
with:
|
||||||
path: ${{steps.build-hosted.outputs.BUILD_HOSTED_DIR}}
|
path: ${{steps.build-hosted.outputs.BUILD_HOSTED_DIR}}
|
||||||
@@ -71,12 +72,12 @@ jobs:
|
|||||||
name: Build & Upload Embedded
|
name: Build & Upload Embedded
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
|
||||||
with:
|
with:
|
||||||
fetch-depth: 1
|
fetch-depth: 1
|
||||||
|
|
||||||
# Note - Cannot use the setup action here as it uses a different yarn install arg
|
# Note - Cannot use the setup action here as it uses a different yarn install arg
|
||||||
- uses: actions/setup-node@v4
|
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
|
||||||
with:
|
with:
|
||||||
node-version-file: '.nvmrc'
|
node-version-file: '.nvmrc'
|
||||||
cache: 'yarn'
|
cache: 'yarn'
|
||||||
@@ -89,19 +90,19 @@ jobs:
|
|||||||
DISABLED_EMBED_PKG: https://releases.rancher.com/harvester-ui/plugin/harvester-1.0.3.tar.gz
|
DISABLED_EMBED_PKG: https://releases.rancher.com/harvester-ui/plugin/harvester-1.0.3.tar.gz
|
||||||
|
|
||||||
- name: Get gcs auth
|
- name: Get gcs auth
|
||||||
uses: rancher-eio/read-vault-secrets@main
|
uses: rancher-eio/read-vault-secrets@d266f55186f80a893839f6e15662e67388e443e6 # v3
|
||||||
with:
|
with:
|
||||||
secrets: |
|
secrets: |
|
||||||
secret/data/github/repo/${{ github.repository }}/google-auth/harvester/credentials token | GOOGLE_AUTH ;
|
secret/data/github/repo/${{ github.repository }}/google-auth/harvester/credentials token | GOOGLE_AUTH ;
|
||||||
|
|
||||||
- name: Apply gcs auth
|
- name: Apply gcs auth
|
||||||
# https://github.com/google-github-actions/auth
|
# https://github.com/google-github-actions/auth
|
||||||
uses: 'google-github-actions/auth@v2'
|
uses: google-github-actions/auth@c200f3691d83b41bf9bbd8638997a462592937ed # v2
|
||||||
with:
|
with:
|
||||||
credentials_json: "${{ env.GOOGLE_AUTH }}"
|
credentials_json: "${{ env.GOOGLE_AUTH }}"
|
||||||
|
|
||||||
- name: Upload tar
|
- name: Upload tar
|
||||||
uses: 'google-github-actions/upload-cloud-storage@v2'
|
uses: google-github-actions/upload-cloud-storage@c0f6160ff80057923ff50e5e567695cea181ec23 # v2
|
||||||
with:
|
with:
|
||||||
path: ${{steps.build-embedded.outputs.BUILD_EMBEDED_TGZ}}
|
path: ${{steps.build-embedded.outputs.BUILD_EMBEDED_TGZ}}
|
||||||
destination: releases.rancher.com/harvester-ui/dashboard
|
destination: releases.rancher.com/harvester-ui/dashboard
|
||||||
@@ -114,12 +115,12 @@ jobs:
|
|||||||
name: Build & Upload Plugin
|
name: Build & Upload Plugin
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
|
||||||
with:
|
with:
|
||||||
fetch-depth: 1
|
fetch-depth: 1
|
||||||
|
|
||||||
# Note - Cannot use the setup action here as it uses a different yarn install arg
|
# Note - Cannot use the setup action here as it uses a different yarn install arg
|
||||||
- uses: actions/setup-node@v4
|
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
|
||||||
with:
|
with:
|
||||||
node-version-file: '.nvmrc'
|
node-version-file: '.nvmrc'
|
||||||
cache: 'yarn'
|
cache: 'yarn'
|
||||||
@@ -133,19 +134,19 @@ jobs:
|
|||||||
run: ./scripts/build-upload-gate
|
run: ./scripts/build-upload-gate
|
||||||
|
|
||||||
- name: Get gcs auth
|
- name: Get gcs auth
|
||||||
uses: rancher-eio/read-vault-secrets@main
|
uses: rancher-eio/read-vault-secrets@d266f55186f80a893839f6e15662e67388e443e6 # v3
|
||||||
with:
|
with:
|
||||||
secrets: |
|
secrets: |
|
||||||
secret/data/github/repo/${{ github.repository }}/google-auth/harvester/credentials token | GOOGLE_AUTH ;
|
secret/data/github/repo/${{ github.repository }}/google-auth/harvester/credentials token | GOOGLE_AUTH ;
|
||||||
|
|
||||||
- name: Apply gcs auth
|
- name: Apply gcs auth
|
||||||
# https://github.com/google-github-actions/auth
|
# https://github.com/google-github-actions/auth
|
||||||
uses: 'google-github-actions/auth@v2'
|
uses: google-github-actions/auth@c200f3691d83b41bf9bbd8638997a462592937ed # v2
|
||||||
with:
|
with:
|
||||||
credentials_json: "${{ env.GOOGLE_AUTH }}"
|
credentials_json: "${{ env.GOOGLE_AUTH }}"
|
||||||
|
|
||||||
- name: Upload plugin tar
|
- name: Upload plugin tar
|
||||||
uses: 'google-github-actions/upload-cloud-storage@v2'
|
uses: google-github-actions/upload-cloud-storage@c0f6160ff80057923ff50e5e567695cea181ec23 # v2
|
||||||
with:
|
with:
|
||||||
path: dist-pkg/${{steps.ci-build-pkg.outputs.PKG_TARBALL}}
|
path: dist-pkg/${{steps.ci-build-pkg.outputs.PKG_TARBALL}}
|
||||||
destination: releases.rancher.com/harvester-ui/plugin
|
destination: releases.rancher.com/harvester-ui/plugin
|
||||||
@@ -155,7 +156,7 @@ jobs:
|
|||||||
process_gcloudignore: false
|
process_gcloudignore: false
|
||||||
|
|
||||||
- name: Upload plugin directory
|
- name: Upload plugin directory
|
||||||
uses: 'google-github-actions/upload-cloud-storage@v2'
|
uses: google-github-actions/upload-cloud-storage@c0f6160ff80057923ff50e5e567695cea181ec23 # v2
|
||||||
with:
|
with:
|
||||||
path: dist-pkg/${{steps.ci-build-pkg.outputs.PKG_NAME}}
|
path: dist-pkg/${{steps.ci-build-pkg.outputs.PKG_NAME}}
|
||||||
destination: releases.rancher.com/harvester-ui/plugin/${{steps.ci-build-pkg.outputs.PKG_NAME}}
|
destination: releases.rancher.com/harvester-ui/plugin/${{steps.ci-build-pkg.outputs.PKG_NAME}}
|
||||||
|
|||||||
@@ -27,14 +27,14 @@ jobs:
|
|||||||
build-status: ${{ job.status }}
|
build-status: ${{ job.status }}
|
||||||
steps:
|
steps:
|
||||||
- name: Read Secrets
|
- name: Read Secrets
|
||||||
uses: rancher-eio/read-vault-secrets@main
|
uses: rancher-eio/read-vault-secrets@d266f55186f80a893839f6e15662e67388e443e6 # v3
|
||||||
with:
|
with:
|
||||||
secrets: |
|
secrets: |
|
||||||
secret/data/github/repo/${{ github.repository }}/dockerhub/rancher/credentials username | DOCKER_USERNAME ;
|
secret/data/github/repo/${{ github.repository }}/dockerhub/rancher/credentials username | DOCKER_USERNAME ;
|
||||||
secret/data/github/repo/${{ github.repository }}/dockerhub/rancher/credentials password | DOCKER_PASSWORD ;
|
secret/data/github/repo/${{ github.repository }}/dockerhub/rancher/credentials password | DOCKER_PASSWORD ;
|
||||||
|
|
||||||
- name: Checkout repository (normal flow)
|
- name: Checkout repository (normal flow)
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
|
||||||
|
|
||||||
- name: Enable Corepack
|
- name: Enable Corepack
|
||||||
run: corepack enable
|
run: corepack enable
|
||||||
@@ -45,24 +45,18 @@ jobs:
|
|||||||
git config user.email 'github-actions[bot]@users.noreply.github.com'
|
git config user.email 'github-actions[bot]@users.noreply.github.com'
|
||||||
|
|
||||||
- name: Login to Docker Hub
|
- name: Login to Docker Hub
|
||||||
uses: docker/login-action@v3
|
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3
|
||||||
with:
|
with:
|
||||||
username: ${{ env.DOCKER_USERNAME }}
|
username: ${{ env.DOCKER_USERNAME }}
|
||||||
password: ${{ env.DOCKER_PASSWORD }}
|
password: ${{ env.DOCKER_PASSWORD }}
|
||||||
|
|
||||||
- name: Setup Helm
|
- name: Setup Helm
|
||||||
uses: azure/setup-helm@v3
|
uses: azure/setup-helm@5119fcb9089d432beecbf79bb2c7915207344b78 # v3
|
||||||
with:
|
with:
|
||||||
version: v3.8.0
|
version: v3.8.0
|
||||||
|
|
||||||
- name: Setup Nodejs with yarn caching
|
- name: Setup Nodejs with yarn install
|
||||||
uses: actions/setup-node@v4
|
uses: ./.github/actions/setup
|
||||||
with:
|
|
||||||
node-version: '20'
|
|
||||||
cache: yarn
|
|
||||||
|
|
||||||
- name: Install dependencies
|
|
||||||
run: yarn
|
|
||||||
|
|
||||||
- name: Build and push UI image
|
- name: Build and push UI image
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ jobs:
|
|||||||
target_branch: ${{ steps.get-version.outputs.target_branch }}
|
target_branch: ${{ steps.get-version.outputs.target_branch }}
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
|
||||||
|
|
||||||
- name: Determine target branch
|
- name: Determine target branch
|
||||||
id: get-version
|
id: get-version
|
||||||
@@ -44,7 +44,7 @@ jobs:
|
|||||||
version: ${{ steps.get_version.outputs.version }}
|
version: ${{ steps.get_version.outputs.version }}
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
|
||||||
|
|
||||||
- name: Extract version from package.json
|
- name: Extract version from package.json
|
||||||
id: get_version
|
id: get_version
|
||||||
@@ -62,7 +62,13 @@ jobs:
|
|||||||
contents: write
|
contents: write
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
|
||||||
|
|
||||||
|
- name: Setup Node from .nvmrc
|
||||||
|
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
|
||||||
|
with:
|
||||||
|
node-version-file: '.nvmrc'
|
||||||
|
cache: 'yarn'
|
||||||
|
|
||||||
- name: Setup environment
|
- name: Setup environment
|
||||||
run: |
|
run: |
|
||||||
@@ -70,7 +76,7 @@ jobs:
|
|||||||
yarn install --frozen-lockfile
|
yarn install --frozen-lockfile
|
||||||
|
|
||||||
- name: Setup Helm
|
- name: Setup Helm
|
||||||
uses: azure/setup-helm@v3
|
uses: azure/setup-helm@5119fcb9089d432beecbf79bb2c7915207344b78 # v3
|
||||||
with:
|
with:
|
||||||
version: v3.8.0
|
version: v3.8.0
|
||||||
|
|
||||||
@@ -79,7 +85,7 @@ jobs:
|
|||||||
yarn publish-pkgs -s ${{ github.repository }} -b ${{ needs.setup-target-branch.outputs.target_branch }} -t harvester-${{ needs.extract-version.outputs.version }}
|
yarn publish-pkgs -s ${{ github.repository }} -b ${{ needs.setup-target-branch.outputs.target_branch }} -t harvester-${{ needs.extract-version.outputs.version }}
|
||||||
|
|
||||||
- name: Upload charts artifact
|
- name: Upload charts artifact
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
|
||||||
with:
|
with:
|
||||||
name: charts
|
name: charts
|
||||||
path: tmp
|
path: tmp
|
||||||
@@ -94,7 +100,7 @@ jobs:
|
|||||||
contents: write
|
contents: write
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout release branch
|
- name: Checkout release branch
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
|
||||||
with:
|
with:
|
||||||
ref: '${{ github.ref_name }}'
|
ref: '${{ github.ref_name }}'
|
||||||
|
|
||||||
@@ -105,7 +111,7 @@ jobs:
|
|||||||
echo "LAST_COMMIT=${LAST_COMMIT}" >> $GITHUB_ENV
|
echo "LAST_COMMIT=${LAST_COMMIT}" >> $GITHUB_ENV
|
||||||
|
|
||||||
- name: Checkout target branch
|
- name: Checkout target branch
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
|
||||||
with:
|
with:
|
||||||
ref: '${{ needs.setup-target-branch.outputs.target_branch }}'
|
ref: '${{ needs.setup-target-branch.outputs.target_branch }}'
|
||||||
|
|
||||||
@@ -121,7 +127,7 @@ jobs:
|
|||||||
git config user.email 'github-actions[bot]@users.noreply.github.com'
|
git config user.email 'github-actions[bot]@users.noreply.github.com'
|
||||||
|
|
||||||
- name: Download build artifacts
|
- name: Download build artifacts
|
||||||
uses: actions/download-artifact@v4
|
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
|
||||||
with:
|
with:
|
||||||
name: charts
|
name: charts
|
||||||
|
|
||||||
@@ -132,7 +138,7 @@ jobs:
|
|||||||
git push origin ${{ needs.setup-target-branch.outputs.target_branch }}
|
git push origin ${{ needs.setup-target-branch.outputs.target_branch }}
|
||||||
|
|
||||||
- name: Run Helm chart releaser
|
- name: Run Helm chart releaser
|
||||||
uses: helm/chart-releaser-action@v1.7.0
|
uses: helm/chart-releaser-action@cae68fefc6b5f367a0275617c9f83181ba54714f # v1.7.0
|
||||||
with:
|
with:
|
||||||
charts_dir: ./charts
|
charts_dir: ./charts
|
||||||
env:
|
env:
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ jobs:
|
|||||||
release_tag: ${{ steps.determine_tag.outputs.release_tag }}
|
release_tag: ${{ steps.determine_tag.outputs.release_tag }}
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
|
||||||
|
|
||||||
- name: Determine release tag
|
- name: Determine release tag
|
||||||
id: determine_tag
|
id: determine_tag
|
||||||
@@ -33,7 +33,7 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
|
||||||
- name: Check package version
|
- name: Check package version
|
||||||
env:
|
env:
|
||||||
TAG_VERSION: ${{ github.event.release.tag_name }}
|
TAG_VERSION: ${{ github.event.release.tag_name }}
|
||||||
@@ -43,7 +43,7 @@ jobs:
|
|||||||
needs:
|
needs:
|
||||||
- setup-release-tag
|
- setup-release-tag
|
||||||
- check-version
|
- check-version
|
||||||
uses: rancher/dashboard/.github/workflows/build-extension-charts.yml@master
|
uses: rancher/dashboard/.github/workflows/build-extension-charts.yml@3b26a36bad555e5e2b8634b24823be29732f287c # master
|
||||||
permissions:
|
permissions:
|
||||||
actions: write
|
actions: write
|
||||||
contents: write
|
contents: write
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
|
||||||
- name: Check package version
|
- name: Check package version
|
||||||
env:
|
env:
|
||||||
TAG_VERSION: ${{github.ref_name}}
|
TAG_VERSION: ${{github.ref_name}}
|
||||||
|
|||||||
@@ -15,18 +15,18 @@ jobs:
|
|||||||
timeout-minutes: 30
|
timeout-minutes: 30
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
|
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
|
||||||
|
|
||||||
# The FOSSA token is shared between all repos in Harvester's GH org. It can
|
# The FOSSA token is shared between all repos in Harvester's GH org. It can
|
||||||
# be used directly and there is no need to request specific access to EIO.
|
# be used directly and there is no need to request specific access to EIO.
|
||||||
- name: Read FOSSA token
|
- name: Read FOSSA token
|
||||||
uses: rancher-eio/read-vault-secrets@main
|
uses: rancher-eio/read-vault-secrets@d266f55186f80a893839f6e15662e67388e443e6 # v3
|
||||||
with:
|
with:
|
||||||
secrets: |
|
secrets: |
|
||||||
secret/data/github/org/harvester/fossa/credentials token | FOSSA_API_KEY_PUSH_ONLY
|
secret/data/github/org/harvester/fossa/credentials token | FOSSA_API_KEY_PUSH_ONLY
|
||||||
|
|
||||||
- name: FOSSA scan
|
- name: FOSSA scan
|
||||||
uses: fossas/fossa-action@main
|
uses: fossas/fossa-action@ff70fe9fe17cbd2040648f1c45e8ec4e4884dcf3 # v1.9.0
|
||||||
with:
|
with:
|
||||||
api-key: ${{ env.FOSSA_API_KEY_PUSH_ONLY }}
|
api-key: ${{ env.FOSSA_API_KEY_PUSH_ONLY }}
|
||||||
# Only runs the scan and do not provide/returns any results back to the
|
# Only runs the scan and do not provide/returns any results back to the
|
||||||
|
|||||||
@@ -1,30 +0,0 @@
|
|||||||
name: "[PR Management] Add PR Label"
|
|
||||||
|
|
||||||
on:
|
|
||||||
pull_request_target:
|
|
||||||
types: [opened, reopened, edited]
|
|
||||||
branches:
|
|
||||||
- main
|
|
||||||
- 'release-harvester-v*'
|
|
||||||
|
|
||||||
permissions:
|
|
||||||
pull-requests: write
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
auto-assign-pr-label:
|
|
||||||
if: github.event.pull_request.draft == false
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- name: Checkout repository
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
with:
|
|
||||||
ref: ${{ github.base_ref }}
|
|
||||||
- name: Setup Nodejs and yarn install
|
|
||||||
uses: ./.github/actions/setup
|
|
||||||
- name: Set PR label
|
|
||||||
env:
|
|
||||||
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
run: |
|
|
||||||
PR_LABEL=$(node ./scripts/extract-release-label.mjs "${{ github.event.pull_request.title }}")
|
|
||||||
echo "PR_LABEL = $PR_LABEL"
|
|
||||||
gh pr edit ${{ github.event.pull_request.number }} --repo ${{ github.repository }} --add-label "$PR_LABEL"
|
|
||||||
@@ -16,7 +16,7 @@ jobs:
|
|||||||
lint:
|
lint:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0 # Need full history for commit-lint
|
fetch-depth: 0 # Need full history for commit-lint
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,261 @@
|
|||||||
|
> This `./AGENTS.md` file is generated by running `yarn agents:generate`.
|
||||||
|
|
||||||
|
|
||||||
|
# Project Overview
|
||||||
|
|
||||||
|
The Harvester UI Extension is a Rancher extension that provides the user interface for Harvester within the Rancher Dashboard.
|
||||||
|
|
||||||
|
```
|
||||||
|
Note: This extension is available starting from Rancher 2.10.0. Ensure your Rancher version is 2.10.0 or later to access Harvester integration.
|
||||||
|
```
|
||||||
|
|
||||||
|
# Personas
|
||||||
|
|
||||||
|
## Software Developer
|
||||||
|
|
||||||
|
You are an expert Senior Software Engineer specializing in Vue.js and TypeScript. You have deep knowledge of Kubernetes and the Rancher ecosystem.
|
||||||
|
- **Focus**: Writing clean, maintainable, and performant code.
|
||||||
|
- **Priorities**: Adhering to the project's code style, ensuring type safety, and following best practices for component design.
|
||||||
|
|
||||||
|
|
||||||
|
# Agents
|
||||||
|
|
||||||
|
## Boundaries
|
||||||
|
|
||||||
|
- ✅ **Always:**
|
||||||
|
- Write to `.github`, `docs/`, `pkg/harvester`, `scripts/`.
|
||||||
|
- Make commits in a new branch (for a PR).
|
||||||
|
- Run `yarn lint:fix` before commits.
|
||||||
|
- Use conventional commit format:
|
||||||
|
```
|
||||||
|
<type>:
|
||||||
|
|
||||||
|
<description>
|
||||||
|
```
|
||||||
|
- 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 updating files in `docs/agents.md/`, run `yarn agents:generate` to update root `AGENTS.md`.
|
||||||
|
- ⚠️ **Ask first:**
|
||||||
|
- Adding dependencies
|
||||||
|
- Upgrading dependencies
|
||||||
|
- 🚫 **Never:**
|
||||||
|
- Commit or log secrets, `.env`, `kubeconfig` or any API keys.
|
||||||
|
- Edit `node_modules/`.
|
||||||
|
- Commit directly to `main` (use PRs).
|
||||||
|
- Skip git hooks with `--no-verify` flag.
|
||||||
|
|
||||||
|
## Tools
|
||||||
|
|
||||||
|
### Prerequisites
|
||||||
|
|
||||||
|
- **Node.js**: `>= 24.0.0` (see `.nvmrc` for the pinned version: `24`)
|
||||||
|
- **Package manager**: `yarn` (v1 classic)
|
||||||
|
|
||||||
|
### Common Commands
|
||||||
|
|
||||||
|
| Command | Description |
|
||||||
|
|---------|-------------|
|
||||||
|
| `yarn install --frozen-lockfile` | Install dependencies (CI-safe, no lockfile changes) |
|
||||||
|
| `RANCHER_ENV=harvester API=https://<harvester-ip> yarn dev` | Start development server at `https://127.0.0.1:8005` |
|
||||||
|
| `yarn build-pkg harvester` | Build the Harvester extension package |
|
||||||
|
| `yarn serve-pkgs` | Serve the locally built extension for testing |
|
||||||
|
| `yarn lint` | Run ESLint (zero warnings allowed) |
|
||||||
|
| `yarn lint:fix` | Run ESLint with auto-fix |
|
||||||
|
| `yarn clean` | Clean build artifacts |
|
||||||
|
| `yarn agents:generate` | Regenerate `AGENTS.md` from `docs/agents.md/` sources |
|
||||||
|
|
||||||
|
### Development
|
||||||
|
|
||||||
|
- **Start dev server**:
|
||||||
|
```bash
|
||||||
|
RANCHER_ENV=harvester API=https://your-harvester-ip yarn dev
|
||||||
|
```
|
||||||
|
- `API` should point to a running Harvester cluster (e.g., `https://x.x.x.x`).
|
||||||
|
- The dashboard will be available at `https://127.0.0.1:8005`.
|
||||||
|
|
||||||
|
### Building
|
||||||
|
|
||||||
|
- **Build extension package**:
|
||||||
|
```bash
|
||||||
|
yarn build-pkg harvester
|
||||||
|
```
|
||||||
|
- **Serve locally built extension** (for integration testing with a Rancher instance):
|
||||||
|
```bash
|
||||||
|
yarn serve-pkgs
|
||||||
|
```
|
||||||
|
|
||||||
|
### Linting
|
||||||
|
|
||||||
|
- **Check** (must pass with zero warnings):
|
||||||
|
```bash
|
||||||
|
yarn lint
|
||||||
|
```
|
||||||
|
- **Auto-fix**:
|
||||||
|
```bash
|
||||||
|
yarn lint:fix
|
||||||
|
```
|
||||||
|
- ESLint covers `.js`, `.ts`, and `.vue` files.
|
||||||
|
- Always run `yarn lint:fix` before committing.
|
||||||
|
|
||||||
|
### Commit Conventions
|
||||||
|
|
||||||
|
- Commits are validated by [commitlint](https://commitlint.js.org/) via a Husky `commit-msg` hook.
|
||||||
|
- Follow [Conventional Commits](https://www.conventionalcommits.org/) format (configured in `commitlint.config.js`).
|
||||||
|
|
||||||
|
### Agent Documentation
|
||||||
|
|
||||||
|
- Source files live in `docs/agents.md/` (agents, contributors, personas subdirectories).
|
||||||
|
- After editing any source file, regenerate the root `AGENTS.md`:
|
||||||
|
```bash
|
||||||
|
yarn agents:generate
|
||||||
|
```
|
||||||
|
|
||||||
|
# Contributors Guide
|
||||||
|
|
||||||
|
## Getting Started
|
||||||
|
|
||||||
|
Please see the [Harvester UI Extension README](https://github.com/harvester/harvester-ui-extension).
|
||||||
|
|
||||||
|
To get started, follow the `Development Setup` section.
|
||||||
|
|
||||||
|
## Project Information
|
||||||
|
|
||||||
|
- **Tech Stack:**
|
||||||
|
- `Vue.js`: Framework
|
||||||
|
- `Linting`: ESLint
|
||||||
|
- `CSS`: SCSS should be used
|
||||||
|
- `TypeScript`: Primary language for logic.
|
||||||
|
- **Code Style and Standards:**
|
||||||
|
- `Language`: TypeScript is preferred for new code.
|
||||||
|
- `Vue.js`:
|
||||||
|
- 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.
|
||||||
|
- Place source tag above template above style.
|
||||||
|
- style tag should contain `lang='scss' scoped`.
|
||||||
|
- `Linting`: Follow the ESLint configuration in the root.
|
||||||
|
|
||||||
|
- **File Structure:**
|
||||||
|
- `.github/`: CI/CD workflows and Renovate config.
|
||||||
|
- `docs/`: Documentation source for `AGENTS.md` generation.
|
||||||
|
- `scripts/`: Bash scripts for build, CI and doc generation.
|
||||||
|
- `pkg/harvester/`: Main extension source. Files are named after K8s resource types (e.g., `kubevirt.io.virtualmachine`, `harvesterhci.io.volume`).
|
||||||
|
- `index.ts`: Plugin entry point — registers the product and auto-imports models/detail/edit views.
|
||||||
|
- `types.ts`: `HCI` constant mapping 60+ K8s resource types to string identifiers.
|
||||||
|
- `components/`: Reusable Vue components (VNC/serial console, settings panels, upgrade banners, filters).
|
||||||
|
- `config/`: Constants — settings keys, table column definitions, feature flags, type mappings, doc links.
|
||||||
|
- `detail/`: Read-only detail views per resource type. Complex resources use subdirectories with tabs.
|
||||||
|
- `dialog/`: Modal dialogs for operations (VM clone/migrate/restart, backup/restore, device passthrough, etc.).
|
||||||
|
- `edit/`: Create/edit forms. Complex resources (e.g., VM) split into subcomponents (CpuMemory, Network, Volume, CloudConfig, etc.).
|
||||||
|
- `formatters/`: Table cell formatters — state badges, usage bars, resource references.
|
||||||
|
- `l10n/`: Localization (`en-us.yaml`).
|
||||||
|
- `list/`: List (table) views per resource type, mirroring `detail/` and `edit/` naming.
|
||||||
|
- `mixins/`: Shared Vue mixins — VM helpers (`harvester-vm/`) and disk helpers (`harvester-disk.js`).
|
||||||
|
- `models/`: Model classes extending `SteveModel` with computed properties and actions. Base class: `harvester.js`.
|
||||||
|
- `pages/`: Route-level pages — dashboard, support, console, members, brand, alertmanager.
|
||||||
|
- `promptRemove/`: Custom delete-confirmation dialogs (VM, backup).
|
||||||
|
- `routing/`: Vue Router config — all product routes (CRUD, console, support, upgrade, etc.).
|
||||||
|
- `store/`: Vuex modules — `harvester-common.js` for shared state; `harvester-store/` for VM/resource creation actions with Steve integration.
|
||||||
|
- `styles/`: Global SCSS files.
|
||||||
|
- `utils/`: Helpers — VM volume templates, CPU/memory calc, cron parsing, regex validators, feature flags.
|
||||||
|
- `validators/`: Form validation functions per resource type, pushing i18n error messages.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## Harvester UI Extension Development Guide
|
||||||
|
|
||||||
|
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.
|
||||||
|
|
||||||
|
2. Implementation Steps for New Features
|
||||||
|
To add a feature in a new release, follow these steps:
|
||||||
|
|
||||||
|
Register: Add a unique [Feature Name] to the corresponding release array in the configuration.
|
||||||
|
|
||||||
|
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]');
|
||||||
|
},
|
||||||
|
},
|
||||||
|
```
|
||||||
|
Render: Use the result of the check to conditionally render the UI components.
|
||||||
|
|
||||||
|
|
||||||
|
## E2E Tests (Cypress)
|
||||||
|
|
||||||
|
See https://github.com/harvester/harvester-ui-tests
|
||||||
|
|
||||||
|
## Node Dependencies
|
||||||
|
|
||||||
|
Dependencies are managed via `package.json` and `yarn`
|
||||||
|
|
||||||
|
- To install dependencies use `yarn install`. This will fail if dependencies and versions listed in `package.json` are out of step with the `yarn.lock` file
|
||||||
|
- To add a dependency use `yarn run add:no-lock ...` instead of `yarn add`
|
||||||
|
- To upgrade a dependency use `yarn run upgrade:no-lock ...` instead of `yarn upgrade`
|
||||||
|
|
||||||
|
|
||||||
|
Renovate automatically updates dependencies and opens upgrade PRs after 10:00 AM on Sundays (`Asia/Taipei`).
|
||||||
|
For the Renovate config, see `.github/renovate.json`.
|
||||||
|
|
||||||
|
|
||||||
|
## Milestone guidance
|
||||||
|
|
||||||
|
- All issues must first be resolved in the `main` branch
|
||||||
|
- If backports are needed they can be made via the backport bot
|
||||||
|
- pull requests
|
||||||
|
- comment `@Mergifyio backport <target branch>` e.g. `@Mergifyio backport release-harvester-v1.8`
|
||||||
|
- All backported pull requests must link to a backported issue
|
||||||
|
|
||||||
|
|
||||||
|
## Creating a branch
|
||||||
|
|
||||||
|
### To resolve an issue
|
||||||
|
- Checkout the branch matching the milestone of the issue `git checkout ${targetMilestoneBranch}`. Replace `${targetMilestoneBranch}` with the target milestone of the issue. For example
|
||||||
|
- `main` for the latest unreleased minor version
|
||||||
|
- `release-harvester-v.X` for release minor versions
|
||||||
|
- `release-harvester-v1.6`
|
||||||
|
- `release-harvester-v1.7`
|
||||||
|
- `release-harvester-v1.8`
|
||||||
|
- Ensure you have the latest of that branch `git pull --rebase`
|
||||||
|
- Checkout the branch to commit the changes to `git checkout issue-${issueNumber}`. Replace `${issueNumber}` with the issue number.
|
||||||
|
|
||||||
|
## Creating a commit
|
||||||
|
|
||||||
|
- This project uses commit-lint with [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) to ensure consistent and meaningful commit messages.
|
||||||
|
|
||||||
|
### Commit Message Format
|
||||||
|
All commit messages must follow the conventional commit format:
|
||||||
|
```
|
||||||
|
<type>[optional scope]: <description>
|
||||||
|
|
||||||
|
[optional body]
|
||||||
|
|
||||||
|
[optional footer(s)]
|
||||||
|
```
|
||||||
|
|
||||||
|
### Supported Types
|
||||||
|
- feat: New features
|
||||||
|
- fix: Bug fixes
|
||||||
|
- docs: Documentation changes
|
||||||
|
- style: Code style changes (formatting, missing semicolons, etc.)
|
||||||
|
- refactor: Code refactoring
|
||||||
|
- perf: Performance improvements
|
||||||
|
- test: Adding or updating tests
|
||||||
|
- build: Build system or external dependencies
|
||||||
|
- ci: CI/CD changes
|
||||||
|
- chore: Other changes that don't modify src or test files
|
||||||
|
- revert: Reverts a previous commit
|
||||||
|
- wip: Work in progress
|
||||||
|
- deps: Dependency updates
|
||||||
|
- security: Security fixes
|
||||||
|
|
||||||
|
## Creating a Pull Request
|
||||||
|
|
||||||
|
- Pull requests must come from forks
|
||||||
|
- Description should always have commit supported type prefix. E.g `fix: XXX`, `feat: OOO`
|
||||||
|
- A Pull Request will only be merged once
|
||||||
|
- ALL CI gates have passed
|
||||||
|
- At least one harvester/harvester-ui-extension code owners reviews and approves the PR
|
||||||
|
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
@a110605
|
||||||
|
@houhoucoop
|
||||||
@@ -7,7 +7,7 @@ The Harvester UI Extension is a Rancher extension that provides the user interfa
|
|||||||
|
|
||||||
## Installation
|
## Installation
|
||||||
|
|
||||||
For detailed installation instructions, please refer to the [official Harvester documentation](https://docs.harvesterhci.io/v1.5/rancher/harvester-ui-extension#installation-on-rancher-210).
|
For Harvester UI extension installation instructions, please refer to the page **Rancher Integration** -> **Harvester UI Extension** in [official Harvester documentation](https://docs.harvesterhci.io).
|
||||||
|
|
||||||
|
|
||||||
## Development Setup
|
## Development Setup
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ module.exports = {
|
|||||||
'subject-full-stop': [2, 'never', '.'],
|
'subject-full-stop': [2, 'never', '.'],
|
||||||
'subject-max-length': [0, 'never'],
|
'subject-max-length': [0, 'never'],
|
||||||
'body-leading-blank': [2, 'always'],
|
'body-leading-blank': [2, 'always'],
|
||||||
'body-max-line-length': [2, 'always', 100],
|
'body-max-line-length': [0, 'always', 100],
|
||||||
'footer-leading-blank': [2, 'always'],
|
'footer-leading-blank': [2, 'always'],
|
||||||
'footer-max-line-length': [2, 'always', 100],
|
'footer-max-line-length': [2, 'always', 100],
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -0,0 +1,63 @@
|
|||||||
|
# Agents.md
|
||||||
|
|
||||||
|
This folder contains files used to construct a single root `AGENTS.md`
|
||||||
|
|
||||||
|
We do this because
|
||||||
|
- The single commonality between almost all AI tools is that they look for a root `AGENTS.md`
|
||||||
|
- Having the information in a single place for all AI tools is better than duplicating and maintaining the information in multiple files for each AI tool
|
||||||
|
|
||||||
|
## Process
|
||||||
|
1. Add files to or update files in `./docs/agents.md/agents`, `./docs/agents.md/personas`, `./docs/agents.md/contributors`.
|
||||||
|
2. Each file must
|
||||||
|
- Start markdown headers at the `##` level
|
||||||
|
- End in a new line
|
||||||
|
- Order contents in AGENTS.md by giving an optional number prefix
|
||||||
|
3. Run `yarn agents:generate`.
|
||||||
|
- Take the contents of `./docs/agents.md/template_agents.md`
|
||||||
|
- Insert the contents of the agents, personas and contributors files
|
||||||
|
- Output to `./AGENTS.md`
|
||||||
|
4. Commit all changes, including root `./AGENTS.md` and any files that link to it
|
||||||
|
|
||||||
|
## Guidance
|
||||||
|
|
||||||
|
### Examples
|
||||||
|
|
||||||
|
When referencing code or configuration it's good to include an example
|
||||||
|
|
||||||
|
## Future Tasks
|
||||||
|
- Add real world examples when referencing code
|
||||||
|
- Create a GH workflow to monitor `agents.md` folder files in a PR, if changed run generate script and add new AGENTS.md to PR
|
||||||
|
- Discuss
|
||||||
|
- Three multi AI tool related questions
|
||||||
|
- Questions
|
||||||
|
- how AI specific patterns, like co-pilot instructions, can be expressed in a way to be adopted by or reduce duplication with the root agents.md
|
||||||
|
- how AI tool specific metadata code can be included
|
||||||
|
- multiple agents vs personas approach works
|
||||||
|
- Proposal
|
||||||
|
- Generic information applicable to all AI tools is added to the root `agents.md`
|
||||||
|
- Agent, instruction or other AI specific files or patterns can be used in files specific to that AI tool. They must not contain duplicate information to the root `agents.md`
|
||||||
|
- The root `agents.md` continues to be AI tool agnostic
|
||||||
|
- How can folder specific agents be used
|
||||||
|
- Proposal
|
||||||
|
- `agents.md` are added to folders as long as most LLMs can make use of them and they do not duplicate information in the root `agents.md`
|
||||||
|
|
||||||
|
## Test Prompts
|
||||||
|
|
||||||
|
To validate LLMs are picking up information consider running the following prompts.
|
||||||
|
|
||||||
|
### Information
|
||||||
|
|
||||||
|
Can they provide correct information?
|
||||||
|
|
||||||
|
- `what's this project about?`
|
||||||
|
- `can you tell me the process for fixing a github issue in this repo?`
|
||||||
|
- `what makes a good software developer?`
|
||||||
|
- `what should never be done in this project?`
|
||||||
|
- `what are the folders in this project for?`
|
||||||
|
- `what are the env vars i could use when running e2e tests?`
|
||||||
|
|
||||||
|
### Actions
|
||||||
|
|
||||||
|
Can they use the information in their actions?
|
||||||
|
|
||||||
|
Pending
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
## Boundaries
|
||||||
|
|
||||||
|
- ✅ **Always:**
|
||||||
|
- Write to `.github`, `docs/`, `pkg/harvester`, `scripts/`.
|
||||||
|
- Make commits in a new branch (for a PR).
|
||||||
|
- Run `yarn lint:fix` before commits.
|
||||||
|
- Use conventional commit format:
|
||||||
|
```
|
||||||
|
<type>:
|
||||||
|
|
||||||
|
<description>
|
||||||
|
```
|
||||||
|
- 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 updating files in `docs/agents.md/`, run `yarn agents:generate` to update root `AGENTS.md`.
|
||||||
|
- ⚠️ **Ask first:**
|
||||||
|
- Adding dependencies
|
||||||
|
- Upgrading dependencies
|
||||||
|
- 🚫 **Never:**
|
||||||
|
- Commit or log secrets, `.env`, `kubeconfig` or any API keys.
|
||||||
|
- Edit `node_modules/`.
|
||||||
|
- Commit directly to `main` (use PRs).
|
||||||
|
- Skip git hooks with `--no-verify` flag.
|
||||||
@@ -0,0 +1,65 @@
|
|||||||
|
## Tools
|
||||||
|
|
||||||
|
### Prerequisites
|
||||||
|
|
||||||
|
- **Node.js**: `>= 24.0.0` (see `.nvmrc` for the pinned version: `24`)
|
||||||
|
- **Package manager**: `yarn` (v1 classic)
|
||||||
|
|
||||||
|
### Common Commands
|
||||||
|
|
||||||
|
| Command | Description |
|
||||||
|
|---------|-------------|
|
||||||
|
| `yarn install --frozen-lockfile` | Install dependencies (CI-safe, no lockfile changes) |
|
||||||
|
| `RANCHER_ENV=harvester API=https://<harvester-ip> yarn dev` | Start development server at `https://127.0.0.1:8005` |
|
||||||
|
| `yarn build-pkg harvester` | Build the Harvester extension package |
|
||||||
|
| `yarn serve-pkgs` | Serve the locally built extension for testing |
|
||||||
|
| `yarn lint` | Run ESLint (zero warnings allowed) |
|
||||||
|
| `yarn lint:fix` | Run ESLint with auto-fix |
|
||||||
|
| `yarn clean` | Clean build artifacts |
|
||||||
|
| `yarn agents:generate` | Regenerate `AGENTS.md` from `docs/agents.md/` sources |
|
||||||
|
|
||||||
|
### Development
|
||||||
|
|
||||||
|
- **Start dev server**:
|
||||||
|
```bash
|
||||||
|
RANCHER_ENV=harvester API=https://your-harvester-ip yarn dev
|
||||||
|
```
|
||||||
|
- `API` should point to a running Harvester cluster (e.g., `https://x.x.x.x`).
|
||||||
|
- The dashboard will be available at `https://127.0.0.1:8005`.
|
||||||
|
|
||||||
|
### Building
|
||||||
|
|
||||||
|
- **Build extension package**:
|
||||||
|
```bash
|
||||||
|
yarn build-pkg harvester
|
||||||
|
```
|
||||||
|
- **Serve locally built extension** (for integration testing with a Rancher instance):
|
||||||
|
```bash
|
||||||
|
yarn serve-pkgs
|
||||||
|
```
|
||||||
|
|
||||||
|
### Linting
|
||||||
|
|
||||||
|
- **Check** (must pass with zero warnings):
|
||||||
|
```bash
|
||||||
|
yarn lint
|
||||||
|
```
|
||||||
|
- **Auto-fix**:
|
||||||
|
```bash
|
||||||
|
yarn lint:fix
|
||||||
|
```
|
||||||
|
- ESLint covers `.js`, `.ts`, and `.vue` files.
|
||||||
|
- Always run `yarn lint:fix` before committing.
|
||||||
|
|
||||||
|
### Commit Conventions
|
||||||
|
|
||||||
|
- Commits are validated by [commitlint](https://commitlint.js.org/) via a Husky `commit-msg` hook.
|
||||||
|
- Follow [Conventional Commits](https://www.conventionalcommits.org/) format (configured in `commitlint.config.js`).
|
||||||
|
|
||||||
|
### Agent Documentation
|
||||||
|
|
||||||
|
- Source files live in `docs/agents.md/` (agents, contributors, personas subdirectories).
|
||||||
|
- After editing any source file, regenerate the root `AGENTS.md`:
|
||||||
|
```bash
|
||||||
|
yarn agents:generate
|
||||||
|
```
|
||||||
@@ -0,0 +1,70 @@
|
|||||||
|
## Getting Started
|
||||||
|
|
||||||
|
Please see the [Harvester UI Extension README](https://github.com/harvester/harvester-ui-extension).
|
||||||
|
|
||||||
|
To get started, follow the `Development Setup` section.
|
||||||
|
|
||||||
|
## Project Information
|
||||||
|
|
||||||
|
- **Tech Stack:**
|
||||||
|
- `Vue.js`: Framework
|
||||||
|
- `Linting`: ESLint
|
||||||
|
- `CSS`: SCSS should be used
|
||||||
|
- `TypeScript`: Primary language for logic.
|
||||||
|
- **Code Style and Standards:**
|
||||||
|
- `Language`: TypeScript is preferred for new code.
|
||||||
|
- `Vue.js`:
|
||||||
|
- 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.
|
||||||
|
- Place source tag above template above style.
|
||||||
|
- style tag should contain `lang='scss' scoped`.
|
||||||
|
- `Linting`: Follow the ESLint configuration in the root.
|
||||||
|
|
||||||
|
- **File Structure:**
|
||||||
|
- `.github/`: CI/CD workflows and Renovate config.
|
||||||
|
- `docs/`: Documentation source for `AGENTS.md` generation.
|
||||||
|
- `scripts/`: Bash scripts for build, CI and doc generation.
|
||||||
|
- `pkg/harvester/`: Main extension source. Files are named after K8s resource types (e.g., `kubevirt.io.virtualmachine`, `harvesterhci.io.volume`).
|
||||||
|
- `index.ts`: Plugin entry point — registers the product and auto-imports models/detail/edit views.
|
||||||
|
- `types.ts`: `HCI` constant mapping 60+ K8s resource types to string identifiers.
|
||||||
|
- `components/`: Reusable Vue components (VNC/serial console, settings panels, upgrade banners, filters).
|
||||||
|
- `config/`: Constants — settings keys, table column definitions, feature flags, type mappings, doc links.
|
||||||
|
- `detail/`: Read-only detail views per resource type. Complex resources use subdirectories with tabs.
|
||||||
|
- `dialog/`: Modal dialogs for operations (VM clone/migrate/restart, backup/restore, device passthrough, etc.).
|
||||||
|
- `edit/`: Create/edit forms. Complex resources (e.g., VM) split into subcomponents (CpuMemory, Network, Volume, CloudConfig, etc.).
|
||||||
|
- `formatters/`: Table cell formatters — state badges, usage bars, resource references.
|
||||||
|
- `l10n/`: Localization (`en-us.yaml`).
|
||||||
|
- `list/`: List (table) views per resource type, mirroring `detail/` and `edit/` naming.
|
||||||
|
- `mixins/`: Shared Vue mixins — VM helpers (`harvester-vm/`) and disk helpers (`harvester-disk.js`).
|
||||||
|
- `models/`: Model classes extending `SteveModel` with computed properties and actions. Base class: `harvester.js`.
|
||||||
|
- `pages/`: Route-level pages — dashboard, support, console, members, brand, alertmanager.
|
||||||
|
- `promptRemove/`: Custom delete-confirmation dialogs (VM, backup).
|
||||||
|
- `routing/`: Vue Router config — all product routes (CRUD, console, support, upgrade, etc.).
|
||||||
|
- `store/`: Vuex modules — `harvester-common.js` for shared state; `harvester-store/` for VM/resource creation actions with Steve integration.
|
||||||
|
- `styles/`: Global SCSS files.
|
||||||
|
- `utils/`: Helpers — VM volume templates, CPU/memory calc, cron parsing, regex validators, feature flags.
|
||||||
|
- `validators/`: Form validation functions per resource type, pushing i18n error messages.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## Harvester UI Extension Development Guide
|
||||||
|
|
||||||
|
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.
|
||||||
|
|
||||||
|
2. Implementation Steps for New Features
|
||||||
|
To add a feature in a new release, follow these steps:
|
||||||
|
|
||||||
|
Register: Add a unique [Feature Name] to the corresponding release array in the configuration.
|
||||||
|
|
||||||
|
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]');
|
||||||
|
},
|
||||||
|
},
|
||||||
|
```
|
||||||
|
Render: Use the result of the check to conditionally render the UI components.
|
||||||
|
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
## E2E Tests (Cypress)
|
||||||
|
|
||||||
|
See https://github.com/harvester/harvester-ui-tests
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
## Node Dependencies
|
||||||
|
|
||||||
|
Dependencies are managed via `package.json` and `yarn`
|
||||||
|
|
||||||
|
- To install dependencies use `yarn install`. This will fail if dependencies and versions listed in `package.json` are out of step with the `yarn.lock` file
|
||||||
|
- To add a dependency use `yarn run add:no-lock ...` instead of `yarn add`
|
||||||
|
- To upgrade a dependency use `yarn run upgrade:no-lock ...` instead of `yarn upgrade`
|
||||||
|
|
||||||
|
|
||||||
|
Renovate automatically updates dependencies and opens upgrade PRs after 10:00 AM on Sundays (`Asia/Taipei`).
|
||||||
|
For the Renovate config, see `.github/renovate.json`.
|
||||||
|
|
||||||
@@ -0,0 +1,58 @@
|
|||||||
|
## Milestone guidance
|
||||||
|
|
||||||
|
- All issues must first be resolved in the `main` branch
|
||||||
|
- If backports are needed they can be made via the backport bot
|
||||||
|
- pull requests
|
||||||
|
- comment `@Mergifyio backport <target branch>` e.g. `@Mergifyio backport release-harvester-v1.8`
|
||||||
|
- All backported pull requests must link to a backported issue
|
||||||
|
|
||||||
|
|
||||||
|
## Creating a branch
|
||||||
|
|
||||||
|
### To resolve an issue
|
||||||
|
- Checkout the branch matching the milestone of the issue `git checkout ${targetMilestoneBranch}`. Replace `${targetMilestoneBranch}` with the target milestone of the issue. For example
|
||||||
|
- `main` for the latest unreleased minor version
|
||||||
|
- `release-harvester-v.X` for release minor versions
|
||||||
|
- `release-harvester-v1.6`
|
||||||
|
- `release-harvester-v1.7`
|
||||||
|
- `release-harvester-v1.8`
|
||||||
|
- Ensure you have the latest of that branch `git pull --rebase`
|
||||||
|
- Checkout the branch to commit the changes to `git checkout issue-${issueNumber}`. Replace `${issueNumber}` with the issue number.
|
||||||
|
|
||||||
|
## Creating a commit
|
||||||
|
|
||||||
|
- This project uses commit-lint with [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) to ensure consistent and meaningful commit messages.
|
||||||
|
|
||||||
|
### Commit Message Format
|
||||||
|
All commit messages must follow the conventional commit format:
|
||||||
|
```
|
||||||
|
<type>[optional scope]: <description>
|
||||||
|
|
||||||
|
[optional body]
|
||||||
|
|
||||||
|
[optional footer(s)]
|
||||||
|
```
|
||||||
|
|
||||||
|
### Supported Types
|
||||||
|
- feat: New features
|
||||||
|
- fix: Bug fixes
|
||||||
|
- docs: Documentation changes
|
||||||
|
- style: Code style changes (formatting, missing semicolons, etc.)
|
||||||
|
- refactor: Code refactoring
|
||||||
|
- perf: Performance improvements
|
||||||
|
- test: Adding or updating tests
|
||||||
|
- build: Build system or external dependencies
|
||||||
|
- ci: CI/CD changes
|
||||||
|
- chore: Other changes that don't modify src or test files
|
||||||
|
- revert: Reverts a previous commit
|
||||||
|
- wip: Work in progress
|
||||||
|
- deps: Dependency updates
|
||||||
|
- security: Security fixes
|
||||||
|
|
||||||
|
## Creating a Pull Request
|
||||||
|
|
||||||
|
- Pull requests must come from forks
|
||||||
|
- Description should always have commit supported type prefix. E.g `fix: XXX`, `feat: OOO`
|
||||||
|
- A Pull Request will only be merged once
|
||||||
|
- ALL CI gates have passed
|
||||||
|
- At least one harvester/harvester-ui-extension code owners reviews and approves the PR
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
## Software Developer
|
||||||
|
|
||||||
|
You are an expert Senior Software Engineer specializing in Vue.js and TypeScript. You have deep knowledge of Kubernetes and the Rancher ecosystem.
|
||||||
|
- **Focus**: Writing clean, maintainable, and performant code.
|
||||||
|
- **Priorities**: Adhering to the project's code style, ensuring type safety, and following best practices for component design.
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
> This `./AGENTS.md` file is generated by running `yarn agents:generate`.
|
||||||
|
|
||||||
|
|
||||||
|
# Project Overview
|
||||||
|
|
||||||
|
The Harvester UI Extension is a Rancher extension that provides the user interface for Harvester within the Rancher Dashboard.
|
||||||
|
|
||||||
|
```
|
||||||
|
Note: This extension is available starting from Rancher 2.10.0. Ensure your Rancher version is 2.10.0 or later to access Harvester integration.
|
||||||
|
```
|
||||||
|
|
||||||
|
# Personas
|
||||||
|
|
||||||
|
`<personas>`
|
||||||
|
|
||||||
|
# Agents
|
||||||
|
|
||||||
|
`<agents>`
|
||||||
|
|
||||||
|
# Contributors Guide
|
||||||
|
|
||||||
|
`<contributors>`
|
||||||
+18
-11
@@ -1,36 +1,41 @@
|
|||||||
{
|
{
|
||||||
"name": "harvester-ui-extension",
|
"name": "harvester-ui-extension",
|
||||||
"version": "1.8.0-dev",
|
"version": "1.9.0-dev",
|
||||||
"private": false,
|
"private": false,
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=20.0.0"
|
"node": ">=24.0.0"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@babel/plugin-transform-class-static-block": "7.28.6",
|
"@babel/plugin-transform-class-static-block": "7.28.6",
|
||||||
"@rancher/shell": "3.0.9-rc.1",
|
"@rancher/shell": "3.0.12-rc.3",
|
||||||
|
"@vue-flow/background": "^1.3.0",
|
||||||
|
"@vue-flow/controls": "^1.1.1",
|
||||||
|
"@vue-flow/core": "^1.33.5",
|
||||||
|
"@vue-flow/minimap": "^1.4.0",
|
||||||
"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",
|
||||||
"node-polyfill-webpack-plugin": "^3.0.0",
|
"node-polyfill-webpack-plugin": "^3.0.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": "~20.19.0",
|
"@types/node": "25.9.1",
|
||||||
"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",
|
||||||
"follow-redirects": "1.15.11",
|
"follow-redirects": "1.16.0",
|
||||||
"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.23",
|
"@types/lodash": "4.17.24",
|
||||||
"merge": "2.1.1",
|
"merge": "2.1.1",
|
||||||
"node-forge": "1.3.3",
|
"node-forge": "1.4.0",
|
||||||
"nth-check": "2.1.1",
|
"nth-check": "2.1.1",
|
||||||
"qs": "6.14.1",
|
"qs": "6.15.2",
|
||||||
"roarr": "7.21.4",
|
"roarr": "7.21.5",
|
||||||
"semver": "7.7.3",
|
"semver": "7.8.1",
|
||||||
"@vue/cli-service/html-webpack-plugin": "^5.0.0"
|
"@vue/cli-service/html-webpack-plugin": "^5.0.0"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
@@ -38,12 +43,14 @@
|
|||||||
"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/.bin/eslint --max-warnings 0 --ext .js,.ts,.vue .",
|
"lint": "./node_modules/.bin/eslint --max-warnings 0 --ext .js,.ts,.vue .",
|
||||||
|
"lint:fix": "./node_modules/.bin/eslint --fix --max-warnings 0 --ext .js,.ts,.vue .",
|
||||||
"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"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@commitlint/load": "^19.8.1",
|
"@commitlint/load": "^19.8.1",
|
||||||
|
|||||||
@@ -7,8 +7,7 @@ The Harvester UI Extension is a Rancher extension that provides the user interfa
|
|||||||
|
|
||||||
## Installation
|
## Installation
|
||||||
|
|
||||||
For detailed installation instructions, please refer to the [official Harvester documentation](https://docs.harvesterhci.io/v1.5/rancher/harvester-ui-extension#installation-on-rancher-210).
|
For Harvester UI extension installation instructions, please refer to the page **Rancher Integration** -> **Harvester UI Extension** in [official Harvester documentation](https://docs.harvesterhci.io).
|
||||||
|
|
||||||
|
|
||||||
## Development Setup
|
## Development Setup
|
||||||
|
|
||||||
|
|||||||
@@ -122,7 +122,7 @@ export default {
|
|||||||
return this.$store.getters['currentCluster'].isLocal;
|
return this.$store.getters['currentCluster'].isLocal;
|
||||||
},
|
},
|
||||||
canEditClusterMembers() {
|
canEditClusterMembers() {
|
||||||
return this.normanClusterRTBSchema?.collectionMethods.find((x) => x.toLowerCase() === 'post');
|
return this.schema?.collectionMethods.find((x) => x.toLowerCase() === 'post');
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -58,11 +58,14 @@ export default {
|
|||||||
|
|
||||||
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 }`;
|
||||||
|
|
||||||
window.open(
|
// Defer so v-select can finish closing the dropdown before the popup steals focus
|
||||||
url,
|
this.$nextTick(() => {
|
||||||
'_blank',
|
window.open(
|
||||||
`toolbars=0,width=${ screen.width - 200 },height=${ screen.height - 200 },left=0,top=0,noreferrer`
|
url,
|
||||||
);
|
'_blank',
|
||||||
|
`toolbars=0,width=${ screen.width - 200 },height=${ screen.height - 200 },left=0,top=0,noreferrer`
|
||||||
|
);
|
||||||
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
isEmpty(o) {
|
isEmpty(o) {
|
||||||
|
|||||||
@@ -0,0 +1,196 @@
|
|||||||
|
<script>
|
||||||
|
import { RadioGroup } from '@components/Form/Radio';
|
||||||
|
import LabeledSelect from '@shell/components/form/LabeledSelect';
|
||||||
|
import { NAMESPACE } from '@shell/config/types';
|
||||||
|
import CreateEditView from '@shell/mixins/create-edit-view';
|
||||||
|
|
||||||
|
export default {
|
||||||
|
name: 'HarvesterClusterPodSecurityStandard',
|
||||||
|
|
||||||
|
components: {
|
||||||
|
RadioGroup,
|
||||||
|
LabeledSelect,
|
||||||
|
},
|
||||||
|
|
||||||
|
mixins: [CreateEditView],
|
||||||
|
|
||||||
|
props: {
|
||||||
|
value: {
|
||||||
|
type: Object,
|
||||||
|
default: () => ({}),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
async fetch() {
|
||||||
|
const inStore = this.$store.getters['currentProduct'].inStore;
|
||||||
|
|
||||||
|
await this.$store.dispatch(`${ inStore }/findAll`, { type: NAMESPACE });
|
||||||
|
},
|
||||||
|
|
||||||
|
data() {
|
||||||
|
let enabled = false;
|
||||||
|
let whitelistedNamespaces = [];
|
||||||
|
let privilegedNamespaces = [];
|
||||||
|
let restrictedNamespaces = [];
|
||||||
|
|
||||||
|
try {
|
||||||
|
const parsed = JSON.parse(this.value.value || this.value.default || '{}');
|
||||||
|
|
||||||
|
enabled = !!parsed.enabled;
|
||||||
|
whitelistedNamespaces = parsed.whitelistedNamespacesList ? parsed.whitelistedNamespacesList.split(',') : [];
|
||||||
|
privilegedNamespaces = parsed.privilegedNamespacesList ? parsed.privilegedNamespacesList.split(',') : [];
|
||||||
|
restrictedNamespaces = parsed.restrictedNamespacesList ? parsed.restrictedNamespacesList.split(',') : [];
|
||||||
|
} catch (e) {
|
||||||
|
enabled = false;
|
||||||
|
whitelistedNamespaces = [];
|
||||||
|
privilegedNamespaces = [];
|
||||||
|
restrictedNamespaces = [];
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
enabled,
|
||||||
|
whitelistedNamespaces,
|
||||||
|
privilegedNamespaces,
|
||||||
|
restrictedNamespaces,
|
||||||
|
};
|
||||||
|
},
|
||||||
|
|
||||||
|
computed: {
|
||||||
|
enabledOptions() {
|
||||||
|
return [
|
||||||
|
{ label: this.t('generic.enabled'), value: true },
|
||||||
|
{ label: this.t('generic.disabled'), value: false },
|
||||||
|
];
|
||||||
|
},
|
||||||
|
|
||||||
|
allNamespaces() {
|
||||||
|
const inStore = this.$store.getters['currentProduct'].inStore;
|
||||||
|
|
||||||
|
return this.$store.getters[`${ inStore }/all`](NAMESPACE).filter((ns) => !ns.isSystem).map((ns) => ns.id);
|
||||||
|
},
|
||||||
|
|
||||||
|
whitelistedOptions() {
|
||||||
|
const excluded = new Set([...this.privilegedNamespaces, ...this.restrictedNamespaces]);
|
||||||
|
|
||||||
|
return this.allNamespaces.filter((ns) => !excluded.has(ns));
|
||||||
|
},
|
||||||
|
|
||||||
|
privilegedOptions() {
|
||||||
|
const excluded = new Set([...this.whitelistedNamespaces, ...this.restrictedNamespaces]);
|
||||||
|
|
||||||
|
return this.allNamespaces.filter((ns) => !excluded.has(ns));
|
||||||
|
},
|
||||||
|
|
||||||
|
restrictedOptions() {
|
||||||
|
const excluded = new Set([...this.whitelistedNamespaces, ...this.privilegedNamespaces]);
|
||||||
|
|
||||||
|
return this.allNamespaces.filter((ns) => !excluded.has(ns));
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
methods: {
|
||||||
|
useDefault() {
|
||||||
|
try {
|
||||||
|
const parsed = JSON.parse(this.value.default || '{}');
|
||||||
|
|
||||||
|
this.enabled = !!parsed.enabled;
|
||||||
|
this.whitelistedNamespaces = parsed.whitelistedNamespacesList ? parsed.whitelistedNamespacesList.split(',') : [];
|
||||||
|
this.privilegedNamespaces = parsed.privilegedNamespacesList ? parsed.privilegedNamespacesList.split(',') : [];
|
||||||
|
this.restrictedNamespaces = parsed.restrictedNamespacesList ? parsed.restrictedNamespacesList.split(',') : [];
|
||||||
|
} catch (e) {
|
||||||
|
this.enabled = false;
|
||||||
|
this.whitelistedNamespaces = [];
|
||||||
|
this.privilegedNamespaces = [];
|
||||||
|
this.restrictedNamespaces = [];
|
||||||
|
}
|
||||||
|
this.save();
|
||||||
|
},
|
||||||
|
|
||||||
|
onUpdateEnabled() {
|
||||||
|
if (!this.enabled) {
|
||||||
|
this.whitelistedNamespaces = [];
|
||||||
|
this.privilegedNamespaces = [];
|
||||||
|
this.restrictedNamespaces = [];
|
||||||
|
}
|
||||||
|
this.save();
|
||||||
|
},
|
||||||
|
|
||||||
|
updateWhitelisted(selected) {
|
||||||
|
this.whitelistedNamespaces = selected;
|
||||||
|
this.save();
|
||||||
|
},
|
||||||
|
|
||||||
|
updatePrivileged(selected) {
|
||||||
|
this.privilegedNamespaces = selected;
|
||||||
|
this.save();
|
||||||
|
},
|
||||||
|
|
||||||
|
updateRestricted(selected) {
|
||||||
|
this.restrictedNamespaces = selected;
|
||||||
|
this.save();
|
||||||
|
},
|
||||||
|
|
||||||
|
save() {
|
||||||
|
this.value.value = JSON.stringify({
|
||||||
|
enabled: this.enabled,
|
||||||
|
whitelistedNamespacesList: this.whitelistedNamespaces.join(','),
|
||||||
|
privilegedNamespacesList: this.privilegedNamespaces.join(','),
|
||||||
|
restrictedNamespacesList: this.restrictedNamespaces.join(','),
|
||||||
|
});
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div>
|
||||||
|
<div class="row mb-20">
|
||||||
|
<div class="col span-6">
|
||||||
|
<RadioGroup
|
||||||
|
v-model:value="enabled"
|
||||||
|
name="enabled"
|
||||||
|
:options="enabledOptions"
|
||||||
|
@update:value="onUpdateEnabled"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<template v-if="enabled">
|
||||||
|
<div class="row mb-20">
|
||||||
|
<div class="col span-12">
|
||||||
|
<LabeledSelect
|
||||||
|
v-model:value="whitelistedNamespaces"
|
||||||
|
:label="t('harvester.setting.clusterPodSecurityStandard.whitelistedNamespaces.label')"
|
||||||
|
:options="whitelistedOptions"
|
||||||
|
:multiple="true"
|
||||||
|
:mode="mode"
|
||||||
|
@update:value="updateWhitelisted"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="row mb-20">
|
||||||
|
<div class="col span-12">
|
||||||
|
<LabeledSelect
|
||||||
|
v-model:value="privilegedNamespaces"
|
||||||
|
:label="t('harvester.setting.clusterPodSecurityStandard.privilegedNamespaces.label')"
|
||||||
|
:options="privilegedOptions"
|
||||||
|
:multiple="true"
|
||||||
|
:mode="mode"
|
||||||
|
@update:value="updatePrivileged"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="row mb-20">
|
||||||
|
<div class="col span-12">
|
||||||
|
<LabeledSelect
|
||||||
|
v-model:value="restrictedNamespaces"
|
||||||
|
:label="t('harvester.setting.clusterPodSecurityStandard.restrictedNamespaces.label')"
|
||||||
|
:options="restrictedOptions"
|
||||||
|
:multiple="true"
|
||||||
|
:mode="mode"
|
||||||
|
@update:value="updateRestricted"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
@@ -0,0 +1,123 @@
|
|||||||
|
<script>
|
||||||
|
import MessageLink from '@shell/components/MessageLink';
|
||||||
|
import CreateEditView from '@shell/mixins/create-edit-view';
|
||||||
|
import { LabeledInput } from '@components/Form/LabeledInput';
|
||||||
|
import { HCI_SETTING } from '../../config/settings';
|
||||||
|
import { Checkbox } from '@components/Form/Checkbox';
|
||||||
|
import { Banner } from '@components/Banner';
|
||||||
|
|
||||||
|
export default {
|
||||||
|
name: 'HarvesterEditClusterRegistrationURL',
|
||||||
|
|
||||||
|
components: {
|
||||||
|
LabeledInput, MessageLink, Checkbox, Banner
|
||||||
|
},
|
||||||
|
|
||||||
|
mixins: [CreateEditView],
|
||||||
|
|
||||||
|
data() {
|
||||||
|
let parseDefaultValue = {};
|
||||||
|
|
||||||
|
try {
|
||||||
|
parseDefaultValue = JSON.parse(this.value.value);
|
||||||
|
} catch (error) {
|
||||||
|
parseDefaultValue.url = this.value.value;
|
||||||
|
parseDefaultValue.insecureSkipTLSVerify = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
parseDefaultValue,
|
||||||
|
errors: []
|
||||||
|
};
|
||||||
|
},
|
||||||
|
|
||||||
|
computed: {
|
||||||
|
toCA() {
|
||||||
|
return `${ HCI_SETTING.ADDITIONAL_CA }?mode=edit`;
|
||||||
|
},
|
||||||
|
clusterRegistrationTLSVerifyEnabled() {
|
||||||
|
return this.$store.getters['harvester-common/getFeatureEnabled']('clusterRegistrationTLSVerify');
|
||||||
|
},
|
||||||
|
registrationURL: {
|
||||||
|
get() {
|
||||||
|
return this.clusterRegistrationTLSVerifyEnabled ? this.parseDefaultValue.url : this.parseDefaultValue;
|
||||||
|
},
|
||||||
|
|
||||||
|
set(value) {
|
||||||
|
if (this.clusterRegistrationTLSVerifyEnabled) {
|
||||||
|
this.parseDefaultValue.url = value;
|
||||||
|
} else {
|
||||||
|
this.parseDefaultValue = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
methods: {
|
||||||
|
getDefaultValue() {
|
||||||
|
if (this.clusterRegistrationTLSVerifyEnabled) {
|
||||||
|
return { url: '', insecureSkipTLSVerify: false };
|
||||||
|
} else {
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
updateUrl() {
|
||||||
|
this.update();
|
||||||
|
},
|
||||||
|
|
||||||
|
update() {
|
||||||
|
if (this.clusterRegistrationTLSVerifyEnabled) {
|
||||||
|
this.value['value'] = JSON.stringify(this.parseDefaultValue);
|
||||||
|
} else {
|
||||||
|
this.value['value'] = this.parseDefaultValue;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
useDefault() {
|
||||||
|
this.parseDefaultValue = this.getDefaultValue();
|
||||||
|
},
|
||||||
|
|
||||||
|
updateInsecureSkipTLSVerify(newValue) {
|
||||||
|
const { url = '' } = this.parseDefaultValue;
|
||||||
|
|
||||||
|
this.parseDefaultValue = { url, insecureSkipTLSVerify: newValue };
|
||||||
|
this.update();
|
||||||
|
},
|
||||||
|
}
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div
|
||||||
|
class="row"
|
||||||
|
>
|
||||||
|
<div class="col span-12">
|
||||||
|
<Banner color="info">
|
||||||
|
<MessageLink
|
||||||
|
:to="toCA"
|
||||||
|
target="_blank"
|
||||||
|
prefix-label="harvester.setting.clusterRegistrationUrl.tip.prefix"
|
||||||
|
middle-label="harvester.setting.clusterRegistrationUrl.tip.middle"
|
||||||
|
suffix-label="harvester.setting.clusterRegistrationUrl.tip.suffix"
|
||||||
|
/>
|
||||||
|
</Banner>
|
||||||
|
<LabeledInput
|
||||||
|
v-model:value="registrationURL"
|
||||||
|
class="mb-20"
|
||||||
|
:mode="mode"
|
||||||
|
:label="t('harvester.setting.clusterRegistrationUrl.url')"
|
||||||
|
@update:value="updateUrl"
|
||||||
|
/>
|
||||||
|
<div v-if="clusterRegistrationTLSVerifyEnabled">
|
||||||
|
<Checkbox
|
||||||
|
v-model:value="parseDefaultValue.insecureSkipTLSVerify"
|
||||||
|
class="check mb-5"
|
||||||
|
type="checkbox"
|
||||||
|
:label="t('harvester.setting.clusterRegistrationUrl.insecureSkipTLSVerify')"
|
||||||
|
@update:value="updateInsecureSkipTLSVerify"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
@@ -0,0 +1,104 @@
|
|||||||
|
<script>
|
||||||
|
import UnitInput from '@shell/components/form/UnitInput';
|
||||||
|
import { Banner } from '@components/Banner';
|
||||||
|
|
||||||
|
export default {
|
||||||
|
name: 'HarvesterInstanceManagerResources',
|
||||||
|
|
||||||
|
components: {
|
||||||
|
UnitInput,
|
||||||
|
Banner,
|
||||||
|
},
|
||||||
|
|
||||||
|
props: {
|
||||||
|
value: {
|
||||||
|
type: Object,
|
||||||
|
default: () => ({
|
||||||
|
value: '',
|
||||||
|
default: '{}'
|
||||||
|
})
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
data() {
|
||||||
|
const resources = this.parseJSON(this.value?.value) || this.parseJSON(this.value?.default) || {};
|
||||||
|
|
||||||
|
return {
|
||||||
|
resources,
|
||||||
|
parseError: null,
|
||||||
|
};
|
||||||
|
},
|
||||||
|
|
||||||
|
methods: {
|
||||||
|
parseJSON(string) {
|
||||||
|
try {
|
||||||
|
return JSON.parse(string);
|
||||||
|
} catch (e) {
|
||||||
|
this.parseError = this.t('harvester.setting.instanceManagerResources.parseError', { error: e.message });
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
update() {
|
||||||
|
if (!this.value) return;
|
||||||
|
|
||||||
|
const cpu = { ...this.resources?.cpu };
|
||||||
|
|
||||||
|
if (cpu.v1 !== null && cpu.v1 !== undefined) cpu.v1 = String(cpu.v1);
|
||||||
|
if (cpu.v2 !== null && cpu.v2 !== undefined) cpu.v2 = String(cpu.v2);
|
||||||
|
|
||||||
|
this.value.value = JSON.stringify({ ...this.resources, cpu });
|
||||||
|
},
|
||||||
|
|
||||||
|
useDefault() {
|
||||||
|
if (this.value?.default) {
|
||||||
|
this.resources = this.parseJSON(this.value.default) || {};
|
||||||
|
this.update();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div>
|
||||||
|
<Banner
|
||||||
|
v-if="parseError"
|
||||||
|
color="error"
|
||||||
|
>
|
||||||
|
{{ parseError }}
|
||||||
|
</Banner>
|
||||||
|
|
||||||
|
<div class="row">
|
||||||
|
<div class="col span-12">
|
||||||
|
<UnitInput
|
||||||
|
v-model:value="resources.cpu.v1"
|
||||||
|
:label="t('harvester.setting.instanceManagerResources.v1')"
|
||||||
|
suffix="%"
|
||||||
|
:delay="0"
|
||||||
|
type="number"
|
||||||
|
min="0"
|
||||||
|
max="100"
|
||||||
|
required
|
||||||
|
:mode="mode"
|
||||||
|
class="mb-20"
|
||||||
|
@update:value="update"
|
||||||
|
/>
|
||||||
|
<UnitInput
|
||||||
|
v-model:value="resources.cpu.v2"
|
||||||
|
:label="t('harvester.setting.instanceManagerResources.v2')"
|
||||||
|
suffix="%"
|
||||||
|
:delay="0"
|
||||||
|
type="number"
|
||||||
|
min="0"
|
||||||
|
max="100"
|
||||||
|
required
|
||||||
|
:mode="mode"
|
||||||
|
class="mb-20"
|
||||||
|
@update:value="update"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
@@ -0,0 +1,371 @@
|
|||||||
|
<script>
|
||||||
|
import { LabeledInput } from '@components/Form/LabeledInput';
|
||||||
|
import LabeledSelect from '@shell/components/form/LabeledSelect.vue';
|
||||||
|
import { RadioGroup } from '@components/Form/Radio';
|
||||||
|
import ArrayList from '@shell/components/form/ArrayList';
|
||||||
|
import { isValidCIDR } from '@shell/utils/validators/cidr';
|
||||||
|
import { _EDIT } from '@shell/config/query-params';
|
||||||
|
import { Banner } from '@components/Banner';
|
||||||
|
import { allHash } from '@shell/utils/promise';
|
||||||
|
import { HCI } from '../../types';
|
||||||
|
import { NETWORK_TYPE } from '../../config/types';
|
||||||
|
|
||||||
|
const { L2VLAN, UNTAGGED } = NETWORK_TYPE;
|
||||||
|
const SHARE_STORAGE_NETWORK = 'share-storage-network';
|
||||||
|
const NETWORK = 'network';
|
||||||
|
|
||||||
|
const DEFAULT_DEDICATED_NETWORK = {
|
||||||
|
vlan: '',
|
||||||
|
clusterNetwork: '',
|
||||||
|
range: '',
|
||||||
|
exclude: [],
|
||||||
|
};
|
||||||
|
|
||||||
|
export default {
|
||||||
|
name: 'RwxNetworkSetting',
|
||||||
|
|
||||||
|
components: {
|
||||||
|
RadioGroup,
|
||||||
|
Banner,
|
||||||
|
ArrayList,
|
||||||
|
LabeledInput,
|
||||||
|
LabeledSelect,
|
||||||
|
},
|
||||||
|
|
||||||
|
props: {
|
||||||
|
registerBeforeHook: {
|
||||||
|
type: Function,
|
||||||
|
required: true,
|
||||||
|
},
|
||||||
|
|
||||||
|
mode: {
|
||||||
|
type: String,
|
||||||
|
default: _EDIT,
|
||||||
|
},
|
||||||
|
|
||||||
|
value: {
|
||||||
|
type: Object,
|
||||||
|
default: () => {
|
||||||
|
return {};
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
async fetch() {
|
||||||
|
const inStore = this.$store.getters['currentProduct'].inStore;
|
||||||
|
|
||||||
|
await allHash({
|
||||||
|
clusterNetworks: this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.CLUSTER_NETWORK }),
|
||||||
|
vlanStatus: this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.VLAN_STATUS }),
|
||||||
|
});
|
||||||
|
},
|
||||||
|
|
||||||
|
data() {
|
||||||
|
let enabled = false; // enabled / disabled options
|
||||||
|
let shareStorageNetwork = false; // shareStorageNetwork / dedicatedRwxNetwork options
|
||||||
|
let dedicatedNetwork = { ...DEFAULT_DEDICATED_NETWORK };
|
||||||
|
let networkType = L2VLAN;
|
||||||
|
let exclude = [];
|
||||||
|
|
||||||
|
try {
|
||||||
|
const parsedValue = JSON.parse(this.value.value || this.value.default || '{}');
|
||||||
|
const parsedNetwork = parsedValue?.[NETWORK] || parsedValue || {};
|
||||||
|
|
||||||
|
if (parsedValue && typeof parsedValue === 'object') {
|
||||||
|
shareStorageNetwork = !!parsedValue[SHARE_STORAGE_NETWORK];
|
||||||
|
networkType = 'vlan' in parsedNetwork ? L2VLAN : UNTAGGED;
|
||||||
|
dedicatedNetwork = {
|
||||||
|
vlan: parsedNetwork.vlan || '',
|
||||||
|
clusterNetwork: parsedNetwork.clusterNetwork || '',
|
||||||
|
range: parsedNetwork.range || '',
|
||||||
|
};
|
||||||
|
exclude = parsedNetwork?.exclude?.toString().split(',') || [];
|
||||||
|
enabled = shareStorageNetwork || !!(parsedNetwork.vlan || parsedNetwork.clusterNetwork || parsedNetwork.range);
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
enabled = false;
|
||||||
|
shareStorageNetwork = false;
|
||||||
|
dedicatedNetwork = { ...DEFAULT_DEDICATED_NETWORK };
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
enabled,
|
||||||
|
shareStorageNetwork,
|
||||||
|
dedicatedNetwork,
|
||||||
|
networkType,
|
||||||
|
exclude,
|
||||||
|
defaultAddValue: '',
|
||||||
|
};
|
||||||
|
},
|
||||||
|
|
||||||
|
created() {
|
||||||
|
if (this.registerBeforeHook) {
|
||||||
|
this.registerBeforeHook(this.willSave, 'willSave');
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
computed: {
|
||||||
|
showDedicatedNetworkConfig() {
|
||||||
|
return this.enabled && !this.shareStorageNetwork;
|
||||||
|
},
|
||||||
|
|
||||||
|
showVlan() {
|
||||||
|
return this.networkType === L2VLAN;
|
||||||
|
},
|
||||||
|
|
||||||
|
networkTypes() {
|
||||||
|
return [L2VLAN, UNTAGGED];
|
||||||
|
},
|
||||||
|
|
||||||
|
clusterNetworkOptions() {
|
||||||
|
const inStore = this.$store.getters['currentProduct'].inStore;
|
||||||
|
const clusterNetworks = this.$store.getters[`${ inStore }/all`](HCI.CLUSTER_NETWORK) || [];
|
||||||
|
const clusterNetworksOptions = this.networkType === UNTAGGED ? clusterNetworks.filter((network) => network.id !== 'mgmt') : clusterNetworks;
|
||||||
|
|
||||||
|
return clusterNetworksOptions.map((network) => {
|
||||||
|
const disabled = !network.isReadyForStorageNetwork;
|
||||||
|
|
||||||
|
return {
|
||||||
|
label: disabled ? `${ network.id } (${ this.t('generic.notReady') })` : network.id,
|
||||||
|
value: network.id,
|
||||||
|
disabled,
|
||||||
|
};
|
||||||
|
});
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
methods: {
|
||||||
|
onUpdateEnabled() {
|
||||||
|
if (!this.enabled) {
|
||||||
|
this.shareStorageNetwork = false;
|
||||||
|
this.dedicatedNetwork = { ...DEFAULT_DEDICATED_NETWORK };
|
||||||
|
}
|
||||||
|
|
||||||
|
this.update();
|
||||||
|
},
|
||||||
|
|
||||||
|
onUpdateNetworkType() {
|
||||||
|
if (this.shareStorageNetwork) {
|
||||||
|
this.dedicatedNetwork = { ...DEFAULT_DEDICATED_NETWORK };
|
||||||
|
}
|
||||||
|
|
||||||
|
this.update();
|
||||||
|
},
|
||||||
|
|
||||||
|
onUpdateDedicatedType(neu) {
|
||||||
|
this.dedicatedNetwork.clusterNetwork = '';
|
||||||
|
|
||||||
|
if (neu === L2VLAN) {
|
||||||
|
this.dedicatedNetwork.vlan = '';
|
||||||
|
} else {
|
||||||
|
delete this.dedicatedNetwork.vlan;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.update();
|
||||||
|
},
|
||||||
|
|
||||||
|
inputVlan(neu) {
|
||||||
|
if (neu === '') {
|
||||||
|
this.dedicatedNetwork.vlan = '';
|
||||||
|
this.update();
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const newValue = Number(neu);
|
||||||
|
|
||||||
|
if (newValue > 4094) {
|
||||||
|
this.dedicatedNetwork.vlan = 4094;
|
||||||
|
} else if (newValue < 1) {
|
||||||
|
this.dedicatedNetwork.vlan = 1;
|
||||||
|
} else {
|
||||||
|
this.dedicatedNetwork.vlan = newValue;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.update();
|
||||||
|
},
|
||||||
|
|
||||||
|
useDefault() {
|
||||||
|
this.enabled = false;
|
||||||
|
this.shareStorageNetwork = false;
|
||||||
|
this.dedicatedNetwork = { ...DEFAULT_DEDICATED_NETWORK };
|
||||||
|
this.update();
|
||||||
|
},
|
||||||
|
|
||||||
|
update() {
|
||||||
|
const value = { [SHARE_STORAGE_NETWORK]: false };
|
||||||
|
|
||||||
|
if (this.enabled && this.shareStorageNetwork) {
|
||||||
|
value[SHARE_STORAGE_NETWORK] = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.showDedicatedNetworkConfig) {
|
||||||
|
value[NETWORK] = {};
|
||||||
|
|
||||||
|
if (this.showVlan) {
|
||||||
|
value[NETWORK].vlan = this.dedicatedNetwork.vlan;
|
||||||
|
}
|
||||||
|
|
||||||
|
value[NETWORK].clusterNetwork = this.dedicatedNetwork.clusterNetwork;
|
||||||
|
value[NETWORK].range = this.dedicatedNetwork.range;
|
||||||
|
|
||||||
|
const excludeList = this.exclude.filter((ip) => ip);
|
||||||
|
|
||||||
|
if (Array.isArray(excludeList) && excludeList.length > 0) {
|
||||||
|
value[NETWORK].exclude = excludeList;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
this.value.value = JSON.stringify(value);
|
||||||
|
},
|
||||||
|
|
||||||
|
willSave() {
|
||||||
|
this.update();
|
||||||
|
|
||||||
|
if (!this.showDedicatedNetworkConfig) {
|
||||||
|
return Promise.resolve();
|
||||||
|
}
|
||||||
|
|
||||||
|
const errors = [];
|
||||||
|
|
||||||
|
if (this.showVlan && !this.dedicatedNetwork.vlan) {
|
||||||
|
errors.push(this.t('validation.required', { key: this.t('harvester.setting.storageNetwork.vlan') }, true));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!this.dedicatedNetwork.clusterNetwork) {
|
||||||
|
errors.push(this.t('validation.required', { key: this.t('harvester.setting.storageNetwork.clusterNetwork') }, true));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!this.dedicatedNetwork.range) {
|
||||||
|
errors.push(this.t('validation.required', { key: this.t('harvester.setting.storageNetwork.range.label') }, true));
|
||||||
|
} else if (!isValidCIDR(this.dedicatedNetwork.range)) {
|
||||||
|
errors.push(this.t('harvester.setting.storageNetwork.range.invalid', null, true));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.exclude) {
|
||||||
|
const hasInvalidCIDR = this.exclude.find((cidr) => {
|
||||||
|
return cidr && !isValidCIDR(cidr);
|
||||||
|
});
|
||||||
|
|
||||||
|
if (hasInvalidCIDR) {
|
||||||
|
errors.push(this.t('harvester.setting.storageNetwork.exclude.invalid', null, true));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (errors.length > 0) {
|
||||||
|
return Promise.reject(errors);
|
||||||
|
}
|
||||||
|
|
||||||
|
return Promise.resolve();
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div :class="mode">
|
||||||
|
<Banner color="warning">
|
||||||
|
<t
|
||||||
|
k="harvester.setting.rwxNetwork.warning"
|
||||||
|
:raw="true"
|
||||||
|
/>
|
||||||
|
</Banner>
|
||||||
|
<RadioGroup
|
||||||
|
v-model:value="enabled"
|
||||||
|
class="mb-20"
|
||||||
|
name="rwx-network-enable"
|
||||||
|
:options="[true,false]"
|
||||||
|
:labels="[t('generic.enabled'), t('generic.disabled')]"
|
||||||
|
@update:value="onUpdateEnabled"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<RadioGroup
|
||||||
|
v-if="enabled"
|
||||||
|
v-model:value="shareStorageNetwork"
|
||||||
|
class="mb-20"
|
||||||
|
name="rwx-network-type"
|
||||||
|
:options="[true,false]"
|
||||||
|
:labels="[t('harvester.setting.rwxNetwork.shareStorageNetwork'), t('harvester.setting.rwxNetwork.dedicatedRwxNetwork')]"
|
||||||
|
@update:value="onUpdateNetworkType"
|
||||||
|
/>
|
||||||
|
<Banner
|
||||||
|
v-if="shareStorageNetwork"
|
||||||
|
class="mb-20"
|
||||||
|
color="warning"
|
||||||
|
>
|
||||||
|
<t
|
||||||
|
k="harvester.setting.rwxNetwork.shareStorageNetworkWarning"
|
||||||
|
:raw="true"
|
||||||
|
/>
|
||||||
|
</Banner>
|
||||||
|
<template v-if="showDedicatedNetworkConfig">
|
||||||
|
<LabeledSelect
|
||||||
|
v-model:value="networkType"
|
||||||
|
class="mb-20"
|
||||||
|
:options="networkTypes"
|
||||||
|
:mode="mode"
|
||||||
|
:label="t('harvester.fields.type')"
|
||||||
|
required
|
||||||
|
@update:value="onUpdateDedicatedType"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<LabeledInput
|
||||||
|
v-if="showVlan"
|
||||||
|
v-model:value.number="dedicatedNetwork.vlan"
|
||||||
|
type="number"
|
||||||
|
class="mb-20"
|
||||||
|
:mode="mode"
|
||||||
|
required
|
||||||
|
placeholder="e.g. 1 - 4094"
|
||||||
|
label-key="harvester.setting.storageNetwork.vlan"
|
||||||
|
@update:value="inputVlan"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<LabeledSelect
|
||||||
|
v-model:value="dedicatedNetwork.clusterNetwork"
|
||||||
|
label-key="harvester.setting.storageNetwork.clusterNetwork"
|
||||||
|
class="mb-20"
|
||||||
|
required
|
||||||
|
:options="clusterNetworkOptions"
|
||||||
|
@update:value="update"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<LabeledInput
|
||||||
|
v-model:value="dedicatedNetwork.range"
|
||||||
|
class="mb-5"
|
||||||
|
:mode="mode"
|
||||||
|
required
|
||||||
|
:placeholder="t('harvester.setting.storageNetwork.range.placeholder')"
|
||||||
|
label-key="harvester.setting.storageNetwork.range.label"
|
||||||
|
@update:value="update"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<ArrayList
|
||||||
|
v-model:value="exclude"
|
||||||
|
:show-header="true"
|
||||||
|
:default-add-value="defaultAddValue"
|
||||||
|
:mode="mode"
|
||||||
|
:add-label="t('harvester.setting.storageNetwork.exclude.addIp')"
|
||||||
|
class="mt-20"
|
||||||
|
@update:value="update"
|
||||||
|
>
|
||||||
|
<template #column-headers>
|
||||||
|
<div class="box mb-10">
|
||||||
|
<div class="key">
|
||||||
|
{{ t('harvester.setting.storageNetwork.exclude.label') }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
<template #columns="scope">
|
||||||
|
<div class="key">
|
||||||
|
<input
|
||||||
|
v-model="scope.row.value"
|
||||||
|
:placeholder="t('harvester.setting.storageNetwork.exclude.placeholder')"
|
||||||
|
@update:value="update"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
</ArrayList>
|
||||||
|
</template>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
@@ -69,6 +69,15 @@ export default {
|
|||||||
:mode="mode"
|
:mode="mode"
|
||||||
label-key="harvester.setting.vmForceDeletionPolicy.period"
|
label-key="harvester.setting.vmForceDeletionPolicy.period"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
<LabeledInput
|
||||||
|
v-if="parseDefaultValue.enable"
|
||||||
|
v-model:value.number="parseDefaultValue.vmMigrationTimeout"
|
||||||
|
class="mb-20"
|
||||||
|
type="number"
|
||||||
|
:mode="mode"
|
||||||
|
label-key="harvester.setting.vmForceDeletionPolicy.vmMigrationTimeout"
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -58,7 +58,22 @@ const FEATURE_FLAGS = {
|
|||||||
'resumeUpgradePausedNode',
|
'resumeUpgradePausedNode',
|
||||||
],
|
],
|
||||||
'v1.7.1': [],
|
'v1.7.1': [],
|
||||||
'v1.8.0': []
|
'v1.8.0': [
|
||||||
|
'hotplugCdRom',
|
||||||
|
'supportBundleFileNameSetting',
|
||||||
|
'clusterRegistrationTLSVerify',
|
||||||
|
'vGPUAsPCIDevice',
|
||||||
|
'instanceManagerResourcesSetting',
|
||||||
|
'rwxNetworkSetting',
|
||||||
|
'createPVCWithDataVolume',
|
||||||
|
'clusterPodSecurityStandardSetting',
|
||||||
|
],
|
||||||
|
'v1.8.1': [],
|
||||||
|
'v1.9.0': [
|
||||||
|
'supportFilesystem',
|
||||||
|
'disableResourcePooling',
|
||||||
|
'expandOnlineEncryptedVolume'
|
||||||
|
],
|
||||||
};
|
};
|
||||||
|
|
||||||
const generateFeatureFlags = () => {
|
const generateFeatureFlags = () => {
|
||||||
|
|||||||
@@ -81,7 +81,6 @@ export function init($plugin, store) {
|
|||||||
configureType,
|
configureType,
|
||||||
virtualType,
|
virtualType,
|
||||||
weightGroup,
|
weightGroup,
|
||||||
weightType,
|
|
||||||
} = $plugin.DSL(store, PRODUCT_NAME);
|
} = $plugin.DSL(store, PRODUCT_NAME);
|
||||||
|
|
||||||
const isSingleVirtualCluster = process.env.rancherEnv === PRODUCT_NAME;
|
const isSingleVirtualCluster = process.env.rancherEnv === PRODUCT_NAME;
|
||||||
@@ -168,7 +167,7 @@ export function init($plugin, store) {
|
|||||||
group: 'Root',
|
group: 'Root',
|
||||||
name: HCI.HOST,
|
name: HCI.HOST,
|
||||||
namespaced: true,
|
namespaced: true,
|
||||||
weight: 399,
|
weight: 499,
|
||||||
route: {
|
route: {
|
||||||
name: `${ PRODUCT_NAME }-c-cluster-resource`,
|
name: `${ PRODUCT_NAME }-c-cluster-resource`,
|
||||||
params: { resource: HCI.HOST }
|
params: { resource: HCI.HOST }
|
||||||
@@ -200,7 +199,7 @@ export function init($plugin, store) {
|
|||||||
group: 'root',
|
group: 'root',
|
||||||
name: HCI.VM,
|
name: HCI.VM,
|
||||||
namespaced: true,
|
namespaced: true,
|
||||||
weight: 299,
|
weight: 498,
|
||||||
route: {
|
route: {
|
||||||
name: `${ PRODUCT_NAME }-c-cluster-resource`,
|
name: `${ PRODUCT_NAME }-c-cluster-resource`,
|
||||||
params: { resource: HCI.VM }
|
params: { resource: HCI.VM }
|
||||||
@@ -238,6 +237,7 @@ export function init($plugin, store) {
|
|||||||
labelKey: 'harvester.addons.vmImport.labels.vmimport',
|
labelKey: 'harvester.addons.vmImport.labels.vmimport',
|
||||||
group: 'vmimport',
|
group: 'vmimport',
|
||||||
namespaced: true,
|
namespaced: true,
|
||||||
|
ifHaveType: HCI.VMIMPORT,
|
||||||
route: {
|
route: {
|
||||||
name: `${ PRODUCT_NAME }-c-cluster-resource`,
|
name: `${ PRODUCT_NAME }-c-cluster-resource`,
|
||||||
params: { resource: HCI.VMIMPORT }
|
params: { resource: HCI.VMIMPORT }
|
||||||
@@ -267,6 +267,7 @@ export function init($plugin, store) {
|
|||||||
labelKey: 'harvester.addons.vmImport.labels.vmimportSourceVMWare',
|
labelKey: 'harvester.addons.vmImport.labels.vmimportSourceVMWare',
|
||||||
group: 'vmimport',
|
group: 'vmimport',
|
||||||
namespaced: true,
|
namespaced: true,
|
||||||
|
ifHaveType: HCI.VMIMPORT_SOURCE_V,
|
||||||
route: {
|
route: {
|
||||||
name: `${ PRODUCT_NAME }-c-cluster-resource`,
|
name: `${ PRODUCT_NAME }-c-cluster-resource`,
|
||||||
params: { resource: HCI.VMIMPORT_SOURCE_V }
|
params: { resource: HCI.VMIMPORT_SOURCE_V }
|
||||||
@@ -296,6 +297,7 @@ export function init($plugin, store) {
|
|||||||
labelKey: 'harvester.addons.vmImport.labels.vmimportSourceOpenStack',
|
labelKey: 'harvester.addons.vmImport.labels.vmimportSourceOpenStack',
|
||||||
group: 'vmimport',
|
group: 'vmimport',
|
||||||
namespaced: true,
|
namespaced: true,
|
||||||
|
ifHaveType: HCI.VMIMPORT_SOURCE_O,
|
||||||
route: {
|
route: {
|
||||||
name: `${ PRODUCT_NAME }-c-cluster-resource`,
|
name: `${ PRODUCT_NAME }-c-cluster-resource`,
|
||||||
params: { resource: HCI.VMIMPORT_SOURCE_O }
|
params: { resource: HCI.VMIMPORT_SOURCE_O }
|
||||||
@@ -324,6 +326,7 @@ export function init($plugin, store) {
|
|||||||
labelKey: 'harvester.addons.vmImport.labels.vmimportSourceOVA',
|
labelKey: 'harvester.addons.vmImport.labels.vmimportSourceOVA',
|
||||||
group: 'vmimport',
|
group: 'vmimport',
|
||||||
namespaced: true,
|
namespaced: true,
|
||||||
|
ifHaveType: HCI.VMIMPORT_SOURCE_OVA,
|
||||||
route: {
|
route: {
|
||||||
name: `${ PRODUCT_NAME }-c-cluster-resource`,
|
name: `${ PRODUCT_NAME }-c-cluster-resource`,
|
||||||
params: { resource: HCI.VMIMPORT_SOURCE_OVA }
|
params: { resource: HCI.VMIMPORT_SOURCE_OVA }
|
||||||
@@ -361,7 +364,7 @@ export function init($plugin, store) {
|
|||||||
ifHaveType: PVC,
|
ifHaveType: PVC,
|
||||||
name: HCI.VOLUME,
|
name: HCI.VOLUME,
|
||||||
namespaced: true,
|
namespaced: true,
|
||||||
weight: 199,
|
weight: 497,
|
||||||
route: {
|
route: {
|
||||||
name: `${ PRODUCT_NAME }-c-cluster-resource`,
|
name: `${ PRODUCT_NAME }-c-cluster-resource`,
|
||||||
params: { resource: HCI.VOLUME }
|
params: { resource: HCI.VOLUME }
|
||||||
@@ -387,7 +390,7 @@ export function init($plugin, store) {
|
|||||||
group: 'root',
|
group: 'root',
|
||||||
name: HCI.IMAGE,
|
name: HCI.IMAGE,
|
||||||
namespaced: true,
|
namespaced: true,
|
||||||
weight: 198,
|
weight: 496,
|
||||||
route: {
|
route: {
|
||||||
name: `${ PRODUCT_NAME }-c-cluster-resource`,
|
name: `${ PRODUCT_NAME }-c-cluster-resource`,
|
||||||
params: { resource: HCI.IMAGE }
|
params: { resource: HCI.IMAGE }
|
||||||
@@ -402,7 +405,7 @@ export function init($plugin, store) {
|
|||||||
group: 'root',
|
group: 'root',
|
||||||
namespaced: true,
|
namespaced: true,
|
||||||
name: 'projects-namespaces',
|
name: 'projects-namespaces',
|
||||||
weight: 98,
|
weight: 495,
|
||||||
route: { name: `${ PRODUCT_NAME }-c-cluster-projectsnamespaces` },
|
route: { name: `${ PRODUCT_NAME }-c-cluster-projectsnamespaces` },
|
||||||
exact: true,
|
exact: true,
|
||||||
});
|
});
|
||||||
@@ -414,7 +417,7 @@ export function init($plugin, store) {
|
|||||||
labelKey: 'harvester.namespace.label',
|
labelKey: 'harvester.namespace.label',
|
||||||
name: NAMESPACE,
|
name: NAMESPACE,
|
||||||
namespaced: true,
|
namespaced: true,
|
||||||
weight: 89,
|
weight: 495,
|
||||||
route: {
|
route: {
|
||||||
name: `${ PRODUCT_NAME }-c-cluster-resource`,
|
name: `${ PRODUCT_NAME }-c-cluster-resource`,
|
||||||
params: { resource: NAMESPACE }
|
params: { resource: NAMESPACE }
|
||||||
@@ -485,6 +488,7 @@ export function init($plugin, store) {
|
|||||||
});
|
});
|
||||||
|
|
||||||
virtualType({
|
virtualType({
|
||||||
|
ifHaveType: LOGGING.CLUSTER_FLOW,
|
||||||
labelKey: 'harvester.logging.clusterFlow.label',
|
labelKey: 'harvester.logging.clusterFlow.label',
|
||||||
name: HCI.CLUSTER_FLOW,
|
name: HCI.CLUSTER_FLOW,
|
||||||
namespaced: true,
|
namespaced: true,
|
||||||
@@ -508,6 +512,7 @@ export function init($plugin, store) {
|
|||||||
});
|
});
|
||||||
|
|
||||||
virtualType({
|
virtualType({
|
||||||
|
ifHaveType: LOGGING.CLUSTER_OUTPUT,
|
||||||
labelKey: 'harvester.logging.clusterOutput.label',
|
labelKey: 'harvester.logging.clusterOutput.label',
|
||||||
name: HCI.CLUSTER_OUTPUT,
|
name: HCI.CLUSTER_OUTPUT,
|
||||||
namespaced: true,
|
namespaced: true,
|
||||||
@@ -531,6 +536,7 @@ export function init($plugin, store) {
|
|||||||
});
|
});
|
||||||
|
|
||||||
virtualType({
|
virtualType({
|
||||||
|
ifHaveType: LOGGING.FLOW,
|
||||||
labelKey: 'harvester.logging.flow.label',
|
labelKey: 'harvester.logging.flow.label',
|
||||||
name: HCI.FLOW,
|
name: HCI.FLOW,
|
||||||
namespaced: true,
|
namespaced: true,
|
||||||
@@ -554,6 +560,7 @@ export function init($plugin, store) {
|
|||||||
});
|
});
|
||||||
|
|
||||||
virtualType({
|
virtualType({
|
||||||
|
ifHaveType: LOGGING.OUTPUT,
|
||||||
labelKey: 'harvester.logging.output.label',
|
labelKey: 'harvester.logging.output.label',
|
||||||
name: HCI.OUTPUT,
|
name: HCI.OUTPUT,
|
||||||
namespaced: true,
|
namespaced: true,
|
||||||
@@ -592,9 +599,8 @@ export function init($plugin, store) {
|
|||||||
'backupAndSnapshot'
|
'backupAndSnapshot'
|
||||||
);
|
);
|
||||||
|
|
||||||
weightGroup('networks', 300, true);
|
weightGroup('networks', 494, true);
|
||||||
weightType(NAMESPACE, 299, true);
|
weightGroup('backupAndSnapshot', 493, true);
|
||||||
weightGroup('backupAndSnapshot', 289, true);
|
|
||||||
|
|
||||||
basicType(
|
basicType(
|
||||||
[
|
[
|
||||||
@@ -688,7 +694,7 @@ export function init($plugin, store) {
|
|||||||
},
|
},
|
||||||
resource: NETWORK_ATTACHMENT,
|
resource: NETWORK_ATTACHMENT,
|
||||||
resourceDetail: HCI.NETWORK_ATTACHMENT,
|
resourceDetail: HCI.NETWORK_ATTACHMENT,
|
||||||
resourceEdit: HCI.NETWORK_ATTACHMENT
|
resourceEdit: HCI.NETWORK_ATTACHMENT,
|
||||||
});
|
});
|
||||||
|
|
||||||
virtualType({
|
virtualType({
|
||||||
|
|||||||
@@ -39,6 +39,12 @@ export const VOLUME_TYPE = [{
|
|||||||
value: 'cd-rom'
|
value: 'cd-rom'
|
||||||
}];
|
}];
|
||||||
|
|
||||||
|
export const VOLUME_HOTPLUG_ACTION = {
|
||||||
|
INSERT_CDROM_IMAGE: 'INSERT_CDROM_IMAGE',
|
||||||
|
EJECT_CDROM_IMAGE: 'EJECT_CDROM_IMAGE',
|
||||||
|
DETACH_DISK: 'DETACH_DISK'
|
||||||
|
};
|
||||||
|
|
||||||
export const ACCESS_CREDENTIALS = {
|
export const ACCESS_CREDENTIALS = {
|
||||||
RESET_PWD: 'userPassword',
|
RESET_PWD: 'userPassword',
|
||||||
INJECT_SSH: 'sshPublicKey'
|
INJECT_SSH: 'sshPublicKey'
|
||||||
@@ -82,6 +88,8 @@ export const CSI_SECRETS = {
|
|||||||
CSI_NODE_PUBLISH_SECRET_NAMESPACE: 'csi.storage.k8s.io/node-publish-secret-namespace',
|
CSI_NODE_PUBLISH_SECRET_NAMESPACE: 'csi.storage.k8s.io/node-publish-secret-namespace',
|
||||||
CSI_NODE_STAGE_SECRET_NAME: 'csi.storage.k8s.io/node-stage-secret-name',
|
CSI_NODE_STAGE_SECRET_NAME: 'csi.storage.k8s.io/node-stage-secret-name',
|
||||||
CSI_NODE_STAGE_SECRET_NAMESPACE: 'csi.storage.k8s.io/node-stage-secret-namespace',
|
CSI_NODE_STAGE_SECRET_NAMESPACE: 'csi.storage.k8s.io/node-stage-secret-namespace',
|
||||||
|
CSI_NODE_EXPAND_SECRET_NAME: 'csi.storage.k8s.io/node-expand-secret-name',
|
||||||
|
CSI_NODE_EXPAND_SECRET_NAMESPACE: 'csi.storage.k8s.io/node-expand-secret-namespace'
|
||||||
};
|
};
|
||||||
|
|
||||||
// Some harvester CRD type is not equal to model file name, define the mapping here
|
// Some harvester CRD type is not equal to model file name, define the mapping here
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ export const HCI = {
|
|||||||
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',
|
||||||
|
VM_DISPLAY_NAME: 'harvesterhci.io/vmDisplayName',
|
||||||
VM_RESERVED_MEMORY: 'harvesterhci.io/reservedMemory',
|
VM_RESERVED_MEMORY: 'harvesterhci.io/reservedMemory',
|
||||||
MAINTENANCE_STATUS: 'harvesterhci.io/maintain-status',
|
MAINTENANCE_STATUS: 'harvesterhci.io/maintain-status',
|
||||||
HOST_CUSTOM_NAME: 'harvesterhci.io/host-custom-name',
|
HOST_CUSTOM_NAME: 'harvesterhci.io/host-custom-name',
|
||||||
@@ -28,6 +29,7 @@ export const HCI = {
|
|||||||
NODE_ROLE_CONTROL_PLANE: 'node-role.kubernetes.io/control-plane',
|
NODE_ROLE_CONTROL_PLANE: 'node-role.kubernetes.io/control-plane',
|
||||||
NODE_ROLE_ETCD: 'node-role.harvesterhci.io/witness',
|
NODE_ROLE_ETCD: 'node-role.harvesterhci.io/witness',
|
||||||
PROMOTE_STATUS: 'harvesterhci.io/promote-status',
|
PROMOTE_STATUS: 'harvesterhci.io/promote-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',
|
||||||
IMAGE_NAME: 'harvesterhci.io/image-name',
|
IMAGE_NAME: 'harvesterhci.io/image-name',
|
||||||
@@ -79,4 +81,5 @@ export const HCI = {
|
|||||||
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',
|
||||||
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',
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -16,9 +16,11 @@ export const HCI_SETTING = {
|
|||||||
DEFAULT_STORAGE_CLASS: 'default-storage-class',
|
DEFAULT_STORAGE_CLASS: 'default-storage-class',
|
||||||
SUPPORT_BUNDLE_TIMEOUT: 'support-bundle-timeout',
|
SUPPORT_BUNDLE_TIMEOUT: 'support-bundle-timeout',
|
||||||
SUPPORT_BUNDLE_EXPIRATION: 'support-bundle-expiration',
|
SUPPORT_BUNDLE_EXPIRATION: 'support-bundle-expiration',
|
||||||
|
SUPPORT_BUNDLE_FILE_NAME: 'support-bundle-file-name',
|
||||||
SUPPORT_BUNDLE_IMAGE: 'support-bundle-image',
|
SUPPORT_BUNDLE_IMAGE: 'support-bundle-image',
|
||||||
SUPPORT_BUNDLE_NODE_COLLECTION_TIMEOUT: 'support-bundle-node-collection-timeout',
|
SUPPORT_BUNDLE_NODE_COLLECTION_TIMEOUT: 'support-bundle-node-collection-timeout',
|
||||||
STORAGE_NETWORK: 'storage-network',
|
STORAGE_NETWORK: 'storage-network',
|
||||||
|
RWX_NETWORK: 'rwx-network',
|
||||||
VM_FORCE_RESET_POLICY: 'vm-force-reset-policy',
|
VM_FORCE_RESET_POLICY: 'vm-force-reset-policy',
|
||||||
SSL_CERTIFICATES: 'ssl-certificates',
|
SSL_CERTIFICATES: 'ssl-certificates',
|
||||||
SSL_PARAMETERS: 'ssl-parameters',
|
SSL_PARAMETERS: 'ssl-parameters',
|
||||||
@@ -38,7 +40,9 @@ export const HCI_SETTING = {
|
|||||||
VM_MIGRATION_NETWORK: 'vm-migration-network',
|
VM_MIGRATION_NETWORK: 'vm-migration-network',
|
||||||
RANCHER_CLUSTER: 'rancher-cluster',
|
RANCHER_CLUSTER: 'rancher-cluster',
|
||||||
MAX_HOTPLUG_RATIO: 'max-hotplug-ratio',
|
MAX_HOTPLUG_RATIO: 'max-hotplug-ratio',
|
||||||
KUBEVIRT_MIGRATION: 'kubevirt-migration'
|
KUBEVIRT_MIGRATION: 'kubevirt-migration',
|
||||||
|
INSTANCE_MANAGER_RESOURCES: 'instance-manager-resources',
|
||||||
|
CLUSTER_POD_SECURITY_STANDARD: 'cluster-pod-security-standard'
|
||||||
};
|
};
|
||||||
|
|
||||||
export const HCI_ALLOWED_SETTINGS = {
|
export const HCI_ALLOWED_SETTINGS = {
|
||||||
@@ -71,11 +75,17 @@ export const HCI_ALLOWED_SETTINGS = {
|
|||||||
[HCI_SETTING.OVERCOMMIT_CONFIG]: { kind: 'json', from: 'import' },
|
[HCI_SETTING.OVERCOMMIT_CONFIG]: { kind: 'json', from: 'import' },
|
||||||
[HCI_SETTING.SUPPORT_BUNDLE_TIMEOUT]: { kind: 'number' },
|
[HCI_SETTING.SUPPORT_BUNDLE_TIMEOUT]: { kind: 'number' },
|
||||||
[HCI_SETTING.SUPPORT_BUNDLE_EXPIRATION]: { kind: 'number' },
|
[HCI_SETTING.SUPPORT_BUNDLE_EXPIRATION]: { kind: 'number' },
|
||||||
|
[HCI_SETTING.SUPPORT_BUNDLE_FILE_NAME]: {
|
||||||
|
kind: 'string', canReset: true, featureFlag: 'supportBundleFileNameSetting'
|
||||||
|
},
|
||||||
[HCI_SETTING.SUPPORT_BUNDLE_NODE_COLLECTION_TIMEOUT]: { kind: 'number', featureFlag: 'supportBundleNodeCollectionTimeoutSetting' },
|
[HCI_SETTING.SUPPORT_BUNDLE_NODE_COLLECTION_TIMEOUT]: { kind: 'number', featureFlag: 'supportBundleNodeCollectionTimeoutSetting' },
|
||||||
[HCI_SETTING.SUPPORT_BUNDLE_IMAGE]: { kind: 'json', from: 'import' },
|
[HCI_SETTING.SUPPORT_BUNDLE_IMAGE]: { kind: 'json', from: 'import' },
|
||||||
[HCI_SETTING.STORAGE_NETWORK]: {
|
[HCI_SETTING.STORAGE_NETWORK]: {
|
||||||
kind: 'custom', from: 'import', canReset: true
|
kind: 'custom', from: 'import', canReset: true
|
||||||
},
|
},
|
||||||
|
[HCI_SETTING.RWX_NETWORK]: {
|
||||||
|
kind: 'json', from: 'import', canReset: true, featureFlag: 'rwxNetworkSetting'
|
||||||
|
},
|
||||||
[HCI_SETTING.VM_FORCE_RESET_POLICY]: { kind: 'json', from: 'import' },
|
[HCI_SETTING.VM_FORCE_RESET_POLICY]: { kind: 'json', from: 'import' },
|
||||||
[HCI_SETTING.SSL_CERTIFICATES]: { kind: 'json', from: 'import' },
|
[HCI_SETTING.SSL_CERTIFICATES]: { kind: 'json', from: 'import' },
|
||||||
[HCI_SETTING.SSL_PARAMETERS]: {
|
[HCI_SETTING.SSL_PARAMETERS]: {
|
||||||
@@ -118,12 +128,19 @@ export const HCI_ALLOWED_SETTINGS = {
|
|||||||
},
|
},
|
||||||
[HCI_SETTING.KUBEVIRT_MIGRATION]: {
|
[HCI_SETTING.KUBEVIRT_MIGRATION]: {
|
||||||
kind: 'json', from: 'import', canReset: true, featureFlag: 'kubevirtMigration',
|
kind: 'json', from: 'import', canReset: true, featureFlag: 'kubevirtMigration',
|
||||||
|
},
|
||||||
|
[HCI_SETTING.INSTANCE_MANAGER_RESOURCES]: {
|
||||||
|
kind: 'json', from: 'import', featureFlag: 'instanceManagerResourcesSetting'
|
||||||
|
},
|
||||||
|
[HCI_SETTING.CLUSTER_POD_SECURITY_STANDARD]: {
|
||||||
|
kind: 'json', from: 'import', canReset: true, featureFlag: 'clusterPodSecurityStandardSetting'
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
export const HCI_SINGLE_CLUSTER_ALLOWED_SETTING = {
|
export const HCI_SINGLE_CLUSTER_ALLOWED_SETTING = {
|
||||||
[HCI_SETTING.CLUSTER_REGISTRATION_URL]: {
|
[HCI_SETTING.CLUSTER_REGISTRATION_URL]: {
|
||||||
kind: 'url',
|
kind: 'custom',
|
||||||
|
from: 'import',
|
||||||
canReset: true,
|
canReset: true,
|
||||||
},
|
},
|
||||||
[HCI_SETTING.UI_PL]: {
|
[HCI_SETTING.UI_PL]: {
|
||||||
|
|||||||
@@ -41,3 +41,14 @@ export const VMIMPORT_SOURCE_KINDS = {
|
|||||||
OPENSTACK: 'OpenstackSource',
|
OPENSTACK: 'OpenstackSource',
|
||||||
OVA: 'OvaSource',
|
OVA: 'OvaSource',
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const CDI_POPULATOR_KIND = {
|
||||||
|
VOLUME_IMPORT_SOURCE: 'VolumeImportSource',
|
||||||
|
VOLUME_CLONE_SOURCE: 'VolumeCloneSource',
|
||||||
|
};
|
||||||
|
|
||||||
|
export const FILESYSTEM_SOURCE_TYPE = {
|
||||||
|
CONFIGMAP: 'configmap',
|
||||||
|
SECRET: 'secret',
|
||||||
|
SERVICEACCOUNT: 'serviceaccount',
|
||||||
|
};
|
||||||
|
|||||||
@@ -27,15 +27,11 @@ export default {
|
|||||||
await allHash({
|
await allHash({
|
||||||
vms: this.$store.dispatch('harvester/findAll', { type: HCI.VM }),
|
vms: this.$store.dispatch('harvester/findAll', { type: HCI.VM }),
|
||||||
vmis: this.$store.dispatch('harvester/findAll', { type: HCI.VMI }),
|
vmis: this.$store.dispatch('harvester/findAll', { type: HCI.VMI }),
|
||||||
allClusterNetwork: this.$store.dispatch('harvester/findAll', { type: HCI.CLUSTER_NETWORK }),
|
vmims: this.$store.dispatch('harvester/findAll', { type: HCI.VMIM }),
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
computed: {
|
computed: {
|
||||||
allClusterNetwork() {
|
|
||||||
return this.$store.getters['harvester/all'](HCI.CLUSTER_NETWORK);
|
|
||||||
},
|
|
||||||
|
|
||||||
rows() {
|
rows() {
|
||||||
const vms = this.$store.getters['harvester/all'](HCI.VM);
|
const vms = this.$store.getters['harvester/all'](HCI.VM);
|
||||||
|
|
||||||
@@ -108,7 +104,6 @@ export default {
|
|||||||
<HarvesterVmState
|
<HarvesterVmState
|
||||||
class="vmstate"
|
class="vmstate"
|
||||||
:row="scope.row"
|
:row="scope.row"
|
||||||
:all-cluster-network="allClusterNetwork"
|
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -1,9 +1,12 @@
|
|||||||
<script>
|
<script>
|
||||||
import { mapGetters } from 'vuex';
|
import { mapGetters } from 'vuex';
|
||||||
|
import { Banner } from '@components/Banner';
|
||||||
import { Card } from '@components/Card';
|
import { Card } from '@components/Card';
|
||||||
|
import { Checkbox } from '@components/Form/Checkbox';
|
||||||
import AsyncButton from '@shell/components/AsyncButton';
|
import AsyncButton from '@shell/components/AsyncButton';
|
||||||
import { escapeHtml } from '@shell/utils/string';
|
import { escapeHtml } from '@shell/utils/string';
|
||||||
import { HCI } from '../types';
|
import { HCI } from '../types';
|
||||||
|
import { getHarvesterUserName } from '../utils/auth';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'HarvesterEnablePciPassthrough',
|
name: 'HarvesterEnablePciPassthrough',
|
||||||
@@ -12,7 +15,9 @@ export default {
|
|||||||
|
|
||||||
components: {
|
components: {
|
||||||
AsyncButton,
|
AsyncButton,
|
||||||
|
Banner,
|
||||||
Card,
|
Card,
|
||||||
|
Checkbox,
|
||||||
},
|
},
|
||||||
|
|
||||||
props: {
|
props: {
|
||||||
@@ -23,10 +28,16 @@ export default {
|
|||||||
},
|
},
|
||||||
|
|
||||||
data() {
|
data() {
|
||||||
return {};
|
return { disableResourcePooling: false };
|
||||||
},
|
},
|
||||||
|
|
||||||
computed: { ...mapGetters({ t: 'i18n/t' }) },
|
computed: {
|
||||||
|
...mapGetters({ t: 'i18n/t' }),
|
||||||
|
|
||||||
|
disableResourcePoolingEnabled() {
|
||||||
|
return this.$store.getters['harvester-common/getFeatureEnabled']('disableResourcePooling');
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
methods: {
|
methods: {
|
||||||
close() {
|
close() {
|
||||||
@@ -34,16 +45,7 @@ export default {
|
|||||||
},
|
},
|
||||||
|
|
||||||
async save(buttonCb) {
|
async save(buttonCb) {
|
||||||
// isSingleProduct == this is a standalone Harvester cluster
|
const userName = getHarvesterUserName(this.$store.getters);
|
||||||
const isSingleProduct = this.$store.getters['isSingleProduct'];
|
|
||||||
let userName = 'admin';
|
|
||||||
|
|
||||||
// if this is imported Harvester, there may be users other than 'admin
|
|
||||||
if (!isSingleProduct) {
|
|
||||||
const user = this.$store.getters['auth/v3User'];
|
|
||||||
|
|
||||||
userName = user?.username || user?.id;
|
|
||||||
}
|
|
||||||
|
|
||||||
for (let i = 0; i < this.resources.length; i++) {
|
for (let i = 0; i < this.resources.length; i++) {
|
||||||
const actionResource = this.resources[i];
|
const actionResource = this.resources[i];
|
||||||
@@ -60,9 +62,10 @@ export default {
|
|||||||
}]
|
}]
|
||||||
},
|
},
|
||||||
spec: {
|
spec: {
|
||||||
address: actionResource.status.address,
|
address: actionResource.status.address,
|
||||||
nodeName: actionResource.status.nodeName,
|
nodeName: actionResource.status.nodeName,
|
||||||
userName
|
userName,
|
||||||
|
disableResourcePooling: this.disableResourcePooling,
|
||||||
}
|
}
|
||||||
} );
|
} );
|
||||||
|
|
||||||
@@ -93,7 +96,19 @@ export default {
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<template #body>
|
<template #body>
|
||||||
{{ t('harvester.pci.enablePassthroughWarning') }}
|
<p class="mb-20">
|
||||||
|
{{ t('harvester.pci.enablePassthroughWarning') }}
|
||||||
|
</p>
|
||||||
|
<template v-if="disableResourcePoolingEnabled">
|
||||||
|
<Checkbox
|
||||||
|
v-model:value="disableResourcePooling"
|
||||||
|
label-key="harvester.pci.disableResourcePooling"
|
||||||
|
/>
|
||||||
|
<Banner
|
||||||
|
color="info"
|
||||||
|
:label="t('harvester.pci.disableResourcePoolingDescription')"
|
||||||
|
/>
|
||||||
|
</template>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<template #actions>
|
<template #actions>
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import { Card } from '@components/Card';
|
|||||||
import AsyncButton from '@shell/components/AsyncButton';
|
import AsyncButton from '@shell/components/AsyncButton';
|
||||||
import { escapeHtml } from '@shell/utils/string';
|
import { escapeHtml } from '@shell/utils/string';
|
||||||
import { HCI } from '../types';
|
import { HCI } from '../types';
|
||||||
|
import { getHarvesterUserName } from '../utils/auth';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'HarvesterEnableUSBPassthrough',
|
name: 'HarvesterEnableUSBPassthrough',
|
||||||
@@ -34,16 +35,7 @@ export default {
|
|||||||
},
|
},
|
||||||
|
|
||||||
async save(buttonCb) {
|
async save(buttonCb) {
|
||||||
// isSingleProduct == this is a standalone Harvester cluster
|
const userName = getHarvesterUserName(this.$store.getters);
|
||||||
const isSingleProduct = this.$store.getters['isSingleProduct'];
|
|
||||||
let userName = 'admin';
|
|
||||||
|
|
||||||
// if this is imported Harvester, there may be users other than 'admin
|
|
||||||
if (!isSingleProduct) {
|
|
||||||
const user = this.$store.getters['auth/v3User'];
|
|
||||||
|
|
||||||
userName = user?.username || user?.id;
|
|
||||||
}
|
|
||||||
|
|
||||||
for (let i = 0; i < this.resources.length; i++) {
|
for (let i = 0; i < this.resources.length; i++) {
|
||||||
const actionResource = this.resources[i];
|
const actionResource = this.resources[i];
|
||||||
|
|||||||
@@ -0,0 +1,183 @@
|
|||||||
|
<script>
|
||||||
|
import { mapGetters } from 'vuex';
|
||||||
|
|
||||||
|
import { STORAGE_CLASS } from '@shell/config/types';
|
||||||
|
import { exceptionToErrorsArray } from '@shell/utils/error';
|
||||||
|
import { sortBy } from '@shell/utils/sort';
|
||||||
|
import { isInternalStorageClass } from '../utils/storage-class';
|
||||||
|
|
||||||
|
import { Card } from '@components/Card';
|
||||||
|
import { Banner } from '@components/Banner';
|
||||||
|
import { LabeledInput } from '@components/Form/LabeledInput';
|
||||||
|
import AsyncButton from '@shell/components/AsyncButton';
|
||||||
|
import LabeledSelect from '@shell/components/form/LabeledSelect';
|
||||||
|
|
||||||
|
export default {
|
||||||
|
name: 'HarvesterDataMigrationDialog',
|
||||||
|
|
||||||
|
emits: ['close'],
|
||||||
|
|
||||||
|
components: {
|
||||||
|
AsyncButton, Banner, Card, LabeledInput, LabeledSelect
|
||||||
|
},
|
||||||
|
|
||||||
|
props: {
|
||||||
|
resources: {
|
||||||
|
type: Array,
|
||||||
|
required: true
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
async fetch() {
|
||||||
|
this.storageClasses = await this.$store.dispatch('harvester/findAll', { type: STORAGE_CLASS });
|
||||||
|
},
|
||||||
|
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
targetVolumeName: '',
|
||||||
|
targetStorageClassName: '',
|
||||||
|
errors: [],
|
||||||
|
storageClasses: [],
|
||||||
|
};
|
||||||
|
},
|
||||||
|
|
||||||
|
computed: {
|
||||||
|
...mapGetters({ t: 'i18n/t' }),
|
||||||
|
|
||||||
|
actionResource() {
|
||||||
|
return this.resources[0];
|
||||||
|
},
|
||||||
|
|
||||||
|
storageClassOptions() {
|
||||||
|
return sortBy(
|
||||||
|
this.storageClasses
|
||||||
|
.filter((sc) => !isInternalStorageClass(sc.metadata?.name))
|
||||||
|
.map((sc) => ({
|
||||||
|
label: sc.metadata?.name,
|
||||||
|
value: sc.metadata?.name
|
||||||
|
})),
|
||||||
|
'label'
|
||||||
|
);
|
||||||
|
},
|
||||||
|
|
||||||
|
disableSave() {
|
||||||
|
return !this.targetVolumeName || !this.targetStorageClassName;
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
methods: {
|
||||||
|
close() {
|
||||||
|
this.targetVolumeName = '';
|
||||||
|
this.targetStorageClassName = '';
|
||||||
|
this.errors = [];
|
||||||
|
this.$emit('close');
|
||||||
|
},
|
||||||
|
|
||||||
|
async apply(buttonDone) {
|
||||||
|
if (!this.actionResource) {
|
||||||
|
buttonDone(false);
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!this.targetVolumeName) {
|
||||||
|
const name = this.t('harvester.modal.dataMigration.fields.targetVolumeName.label');
|
||||||
|
|
||||||
|
this['errors'] = [this.t('validation.required', { key: name })];
|
||||||
|
buttonDone(false);
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!this.targetStorageClassName) {
|
||||||
|
const name = this.t('harvester.modal.dataMigration.fields.targetStorageClassName.label');
|
||||||
|
|
||||||
|
this['errors'] = [this.t('validation.required', { key: name })];
|
||||||
|
buttonDone(false);
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
await this.actionResource.doAction('dataMigration', {
|
||||||
|
targetVolumeName: this.targetVolumeName,
|
||||||
|
targetStorageClassName: this.targetStorageClassName
|
||||||
|
}, {}, false);
|
||||||
|
|
||||||
|
buttonDone(true);
|
||||||
|
this.close();
|
||||||
|
} catch (err) {
|
||||||
|
const error = err?.data || err;
|
||||||
|
|
||||||
|
this['errors'] = exceptionToErrorsArray(error);
|
||||||
|
buttonDone(false);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
}
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<Card :show-highlight-border="false">
|
||||||
|
<template #title>
|
||||||
|
{{ t('harvester.modal.dataMigration.title') }}
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<template #body>
|
||||||
|
<LabeledInput
|
||||||
|
v-model:value="targetVolumeName"
|
||||||
|
:label="t('harvester.modal.dataMigration.fields.targetVolumeName.label')"
|
||||||
|
:placeholder="t('harvester.modal.dataMigration.fields.targetVolumeName.placeholder')"
|
||||||
|
class="mb-20"
|
||||||
|
required
|
||||||
|
/>
|
||||||
|
|
||||||
|
<LabeledSelect
|
||||||
|
v-model:value="targetStorageClassName"
|
||||||
|
:label="t('harvester.modal.dataMigration.fields.targetStorageClassName.label')"
|
||||||
|
:placeholder="t('harvester.modal.dataMigration.fields.targetStorageClassName.placeholder')"
|
||||||
|
:options="storageClassOptions"
|
||||||
|
required
|
||||||
|
/>
|
||||||
|
|
||||||
|
<Banner
|
||||||
|
v-for="(err, i) in errors"
|
||||||
|
:key="i"
|
||||||
|
color="error"
|
||||||
|
:label="err"
|
||||||
|
/>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<template
|
||||||
|
#actions
|
||||||
|
class="actions"
|
||||||
|
>
|
||||||
|
<div class="buttons">
|
||||||
|
<button
|
||||||
|
class="btn role-secondary mr-10"
|
||||||
|
@click="close"
|
||||||
|
>
|
||||||
|
{{ t('generic.cancel') }}
|
||||||
|
</button>
|
||||||
|
|
||||||
|
<AsyncButton
|
||||||
|
mode="apply"
|
||||||
|
:disabled="disableSave"
|
||||||
|
@click="apply"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
</Card>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<style lang="scss" scoped>
|
||||||
|
.actions {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.buttons {
|
||||||
|
display: flex;
|
||||||
|
justify-content: flex-end;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -0,0 +1,154 @@
|
|||||||
|
<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 = { image: { repository: 'rancher/harvester-nvidia-driver-toolkit' } };
|
||||||
|
|
||||||
|
export default {
|
||||||
|
name: 'HarvesterEnableNvidiaDriverToolkit',
|
||||||
|
|
||||||
|
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 = { ...DEFAULT_VALUE };
|
||||||
|
}
|
||||||
|
|
||||||
|
return { valuesContentJson };
|
||||||
|
},
|
||||||
|
|
||||||
|
computed: {
|
||||||
|
...mapGetters({ t: 'i18n/t' }),
|
||||||
|
|
||||||
|
buttonDisabled() {
|
||||||
|
const { image, driverLocation } = this.valuesContentJson;
|
||||||
|
|
||||||
|
return !(image?.repository || '').trim() || !(image?.tag || '').trim() || !(driverLocation || '').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.nvidiaDriverToolkit.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.image.repository"
|
||||||
|
:required="true"
|
||||||
|
:label="t('harvester.addons.nvidiaDriverToolkit.image.repository')"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div class="col span-6">
|
||||||
|
<LabeledInput
|
||||||
|
v-model:value="valuesContentJson.image.tag"
|
||||||
|
:required="true"
|
||||||
|
:label="t('harvester.addons.nvidiaDriverToolkit.image.tag')"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="row mb-15">
|
||||||
|
<div class="col span-12">
|
||||||
|
<LabeledInput
|
||||||
|
v-model:value="valuesContentJson.driverLocation"
|
||||||
|
:required="true"
|
||||||
|
:label="t('harvester.addons.nvidiaDriverToolkit.driver.location')"
|
||||||
|
/>
|
||||||
|
</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,6 +5,10 @@ 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';
|
||||||
|
|
||||||
|
const VOLUME = 'volume';
|
||||||
|
const NETWORK = 'network';
|
||||||
|
const CDROM = 'cdrom';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'HarvesterHotUnplug',
|
name: 'HarvesterHotUnplug',
|
||||||
|
|
||||||
@@ -40,19 +44,37 @@ export default {
|
|||||||
},
|
},
|
||||||
|
|
||||||
isVolume() {
|
isVolume() {
|
||||||
return this.modalData.type === 'volume';
|
return this.modalData.type === VOLUME;
|
||||||
},
|
},
|
||||||
|
|
||||||
titleKey() {
|
titleKey() {
|
||||||
return this.isVolume ? 'harvester.virtualMachine.hotUnplug.detachVolume.title' : 'harvester.virtualMachine.hotUnplug.detachNIC.title';
|
const keys = {
|
||||||
|
[VOLUME]: 'harvester.virtualMachine.hotUnplug.detachVolume.title',
|
||||||
|
[CDROM]: 'harvester.virtualMachine.hotUnplug.ejectCdRomVolume.title',
|
||||||
|
[NETWORK]: 'harvester.virtualMachine.hotUnplug.detachNIC.title',
|
||||||
|
};
|
||||||
|
|
||||||
|
return keys[this.modalData.type];
|
||||||
},
|
},
|
||||||
|
|
||||||
actionLabelKey() {
|
actionLabelKey() {
|
||||||
return this.isVolume ? 'harvester.virtualMachine.hotUnplug.detachVolume.actionLabel' : 'harvester.virtualMachine.hotUnplug.detachNIC.actionLabel';
|
const keys = {
|
||||||
|
[VOLUME]: 'harvester.virtualMachine.hotUnplug.detachVolume.actionLabels',
|
||||||
|
[CDROM]: 'harvester.virtualMachine.hotUnplug.ejectCdRomVolume.actionLabels',
|
||||||
|
[NETWORK]: 'harvester.virtualMachine.hotUnplug.detachNIC.actionLabels',
|
||||||
|
};
|
||||||
|
|
||||||
|
return keys[this.modalData.type];
|
||||||
},
|
},
|
||||||
|
|
||||||
successMessageKey() {
|
successMessageKey() {
|
||||||
return this.isVolume ? 'harvester.virtualMachine.hotUnplug.detachVolume.success' : 'harvester.virtualMachine.hotUnplug.detachNIC.success';
|
const keys = {
|
||||||
|
[VOLUME]: 'harvester.virtualMachine.hotUnplug.detachVolume.success',
|
||||||
|
[CDROM]: 'harvester.virtualMachine.hotUnplug.ejectCdRomVolume.success',
|
||||||
|
[NETWORK]: 'harvester.virtualMachine.hotUnplug.detachNIC.success',
|
||||||
|
};
|
||||||
|
|
||||||
|
return keys[this.modalData.type];
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -65,10 +87,12 @@ export default {
|
|||||||
try {
|
try {
|
||||||
let res;
|
let res;
|
||||||
|
|
||||||
if (this.isVolume) {
|
if (this.modalData.type === VOLUME) {
|
||||||
res = await this.actionResource.doAction('removeVolume', { diskName: this.name });
|
res = await this.actionResource.doAction('removeVolume', { diskName: this.name });
|
||||||
} else {
|
} else if (this.modalData.type === NETWORK) {
|
||||||
res = await this.actionResource.doAction('removeNic', { interfaceName: this.name });
|
res = await this.actionResource.doAction('removeNic', { interfaceName: this.name });
|
||||||
|
} else {
|
||||||
|
res = await this.actionResource.doAction('ejectCdRomVolume', { deviceName: this.name });
|
||||||
}
|
}
|
||||||
|
|
||||||
if (res._status === 200 || res._status === 204) {
|
if (res._status === 200 || res._status === 204) {
|
||||||
|
|||||||
@@ -0,0 +1,198 @@
|
|||||||
|
<script>
|
||||||
|
import { exceptionToErrorsArray } from '@shell/utils/error';
|
||||||
|
import { mapState, mapGetters } from 'vuex';
|
||||||
|
import { Card } from '@components/Card';
|
||||||
|
import { Banner } from '@components/Banner';
|
||||||
|
import AsyncButton from '@shell/components/AsyncButton';
|
||||||
|
import { LabeledInput } from '@components/Form/LabeledInput';
|
||||||
|
import LabeledSelect from '@shell/components/form/LabeledSelect';
|
||||||
|
import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations';
|
||||||
|
import { HCI } from '../types';
|
||||||
|
|
||||||
|
export default {
|
||||||
|
name: 'HarvesterInsertCdRomVolume',
|
||||||
|
|
||||||
|
emits: ['close'],
|
||||||
|
|
||||||
|
components: {
|
||||||
|
AsyncButton,
|
||||||
|
Card,
|
||||||
|
LabeledInput,
|
||||||
|
LabeledSelect,
|
||||||
|
Banner
|
||||||
|
},
|
||||||
|
|
||||||
|
props: {
|
||||||
|
resources: {
|
||||||
|
type: Array,
|
||||||
|
required: true
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
async fetch() {
|
||||||
|
try {
|
||||||
|
this.images = await this.$store.dispatch('harvester/findAll', { type: HCI.IMAGE });
|
||||||
|
} catch (err) {
|
||||||
|
this.errors = exceptionToErrorsArray(err);
|
||||||
|
this.images = [];
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
imageName: '',
|
||||||
|
images: [],
|
||||||
|
errors: [],
|
||||||
|
};
|
||||||
|
},
|
||||||
|
|
||||||
|
computed: {
|
||||||
|
...mapState('action-menu', ['modalData']),
|
||||||
|
...mapGetters({ t: 'i18n/t' }),
|
||||||
|
|
||||||
|
actionResource() {
|
||||||
|
return this.resources?.[0];
|
||||||
|
},
|
||||||
|
|
||||||
|
isFormValid() {
|
||||||
|
return this.imageName !== '';
|
||||||
|
},
|
||||||
|
|
||||||
|
deviceName() {
|
||||||
|
return this.modalData.name;
|
||||||
|
},
|
||||||
|
|
||||||
|
imagesOption() {
|
||||||
|
return this.images
|
||||||
|
.filter((image) => {
|
||||||
|
const labels = image.metadata?.labels || {};
|
||||||
|
const type = labels[HCI_ANNOTATIONS.IMAGE_SUFFIX];
|
||||||
|
|
||||||
|
return type === 'iso';
|
||||||
|
})
|
||||||
|
.map((image) => {
|
||||||
|
return ({
|
||||||
|
label: this.imageOptionLabel(image),
|
||||||
|
value: image.id,
|
||||||
|
disabled: image.isImportedImage
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
methods: {
|
||||||
|
close() {
|
||||||
|
this.imageName = '';
|
||||||
|
this.errors = [];
|
||||||
|
this.$emit('close');
|
||||||
|
},
|
||||||
|
|
||||||
|
imageOptionLabel(image) {
|
||||||
|
return `${ image.metadata.namespace }/${ image.spec.displayName }`;
|
||||||
|
},
|
||||||
|
|
||||||
|
async save(buttonCb) {
|
||||||
|
if (!this.actionResource) {
|
||||||
|
buttonCb(false);
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const payload = {
|
||||||
|
deviceName: this.deviceName,
|
||||||
|
imageName: this.imageName
|
||||||
|
};
|
||||||
|
|
||||||
|
try {
|
||||||
|
const res = await this.actionResource.doAction('insertCdRomVolume', payload);
|
||||||
|
|
||||||
|
if ([200, 204].includes(res?._status)) {
|
||||||
|
this.$store.dispatch('growl/success', {
|
||||||
|
title: this.t('generic.notification.title.succeed'),
|
||||||
|
message: this.t('harvester.modal.insertCdRomVolume.success', {
|
||||||
|
deviceName: this.deviceName,
|
||||||
|
imageName: this.imageName,
|
||||||
|
})
|
||||||
|
}, { root: true });
|
||||||
|
|
||||||
|
this.close();
|
||||||
|
buttonCb(true);
|
||||||
|
} else {
|
||||||
|
this.errors = exceptionToErrorsArray(res);
|
||||||
|
buttonCb(false);
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
this.errors = exceptionToErrorsArray(err);
|
||||||
|
buttonCb(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<Card
|
||||||
|
ref="modal"
|
||||||
|
name="modal"
|
||||||
|
:show-highlight-border="false"
|
||||||
|
>
|
||||||
|
<template #title>
|
||||||
|
<h4
|
||||||
|
v-clean-html="t('harvester.modal.insertCdRomVolume.title')"
|
||||||
|
class="text-default-text"
|
||||||
|
/>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<template #body>
|
||||||
|
<LabeledInput
|
||||||
|
v-model:value="deviceName"
|
||||||
|
:label="t('generic.name')"
|
||||||
|
disabled
|
||||||
|
/>
|
||||||
|
<LabeledSelect
|
||||||
|
v-model:value="imageName"
|
||||||
|
class="mt-20"
|
||||||
|
:label="t('harvester.modal.insertCdRomVolume.image')"
|
||||||
|
:options="imagesOption"
|
||||||
|
required
|
||||||
|
/>
|
||||||
|
<Banner
|
||||||
|
v-for="(err, i) in errors"
|
||||||
|
:key="i"
|
||||||
|
:label="err"
|
||||||
|
color="error"
|
||||||
|
/>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<template #actions>
|
||||||
|
<div class="actions">
|
||||||
|
<div class="buttons">
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
class="btn role-secondary mr-10"
|
||||||
|
@click="close"
|
||||||
|
>
|
||||||
|
{{ t('generic.cancel') }}
|
||||||
|
</button>
|
||||||
|
|
||||||
|
<AsyncButton
|
||||||
|
mode="apply"
|
||||||
|
:disabled="!isFormValid"
|
||||||
|
@click="save"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
</Card>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<style lang="scss" scoped>
|
||||||
|
.actions {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
.buttons {
|
||||||
|
display: flex;
|
||||||
|
justify-content: flex-end;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -1,15 +1,12 @@
|
|||||||
<script>
|
<script>
|
||||||
import { mapGetters } from 'vuex';
|
import { mapGetters } from 'vuex';
|
||||||
|
|
||||||
import { NODE } from '@shell/config/types';
|
import { NODE } from '@shell/config/types';
|
||||||
import { exceptionToErrorsArray } from '@shell/utils/error';
|
import { exceptionToErrorsArray } from '@shell/utils/error';
|
||||||
import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations';
|
import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations';
|
||||||
|
|
||||||
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 LabeledSelect from '@shell/components/form/LabeledSelect';
|
import LabeledSelect from '@shell/components/form/LabeledSelect';
|
||||||
import { HCI } from '../types';
|
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
emits: ['close'],
|
emits: ['close'],
|
||||||
@@ -62,28 +59,46 @@ export default {
|
|||||||
return this.resources[0];
|
return this.resources[0];
|
||||||
},
|
},
|
||||||
|
|
||||||
vmi() {
|
anyCpuPinning() {
|
||||||
const inStore = this.$store.getters['currentProduct'].inStore;
|
return this.resources.some((r) => r.isCpuPinning);
|
||||||
const vmiResources = this.$store.getters[`${ inStore }/all`](HCI.VMI);
|
},
|
||||||
const resource = vmiResources.find((VMI) => VMI.id === this.actionResource?.id) || null;
|
|
||||||
|
|
||||||
return resource;
|
vmsByNode() {
|
||||||
|
const groups = {};
|
||||||
|
|
||||||
|
for (const r of this.resources) {
|
||||||
|
const node = r.nodeName || '';
|
||||||
|
const name = r.nameDisplay || r.name || r.id;
|
||||||
|
|
||||||
|
if (!groups[node]) {
|
||||||
|
groups[node] = [];
|
||||||
|
}
|
||||||
|
groups[node].push(name);
|
||||||
|
}
|
||||||
|
|
||||||
|
return Object.entries(groups).map(([node, vms]) => ({ node, vms })).sort((a, b) => a.node.localeCompare(b.node));
|
||||||
},
|
},
|
||||||
|
|
||||||
cpuPinningAlertMessage() {
|
cpuPinningAlertMessage() {
|
||||||
return this.t('harvester.virtualMachine.cpuPinning.migrationMessage');
|
return this.t('harvester.virtualMachine.cpuPinning.migrationMessage');
|
||||||
},
|
},
|
||||||
|
|
||||||
|
allVmsOnTargetNode() {
|
||||||
|
if (!this.nodeName) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return this.resources.every((r) => r.nodeName === this.nodeName);
|
||||||
|
},
|
||||||
|
|
||||||
nodeNameList() {
|
nodeNameList() {
|
||||||
const nodes = this.$store.getters['harvester/all'](NODE);
|
const nodes = this.$store.getters['harvester/all'](NODE);
|
||||||
|
|
||||||
return nodes.filter((n) => {
|
return nodes.filter((n) => {
|
||||||
const isNotSelfNode = !!this.availableNodes.includes(n.id);
|
|
||||||
const isNotWitnessNode = n.isEtcd !== 'true'; // do not allow to migrate to self node and witness node
|
const isNotWitnessNode = n.isEtcd !== 'true'; // do not allow to migrate to self node and witness node
|
||||||
const isCpuPinning = this.actionResource?.isCpuPinning;
|
const matchingCpuManagerConfig = !this.anyCpuPinning || n.isCPUManagerEnabled; // If cpu-pinning is enabled, filter-out non-enabled CPU manager nodes.
|
||||||
const matchingCpuManagerConfig = !isCpuPinning || n.isCPUManagerEnabled; // If cpu-pinning is enabled, filter-out non-enabled CPU manager nodes.
|
|
||||||
|
|
||||||
return isNotSelfNode && isNotWitnessNode && matchingCpuManagerConfig;
|
return isNotWitnessNode && matchingCpuManagerConfig;
|
||||||
}).map((n) => {
|
}).map((n) => {
|
||||||
let label = n?.metadata?.name;
|
let label = n?.metadata?.name;
|
||||||
const value = n?.metadata?.name;
|
const value = n?.metadata?.name;
|
||||||
@@ -126,7 +141,29 @@ export default {
|
|||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
await this.actionResource.doAction('migrate', { nodeName: this.nodeName }, {}, false);
|
// Filter out VMs already running on the selected node
|
||||||
|
const toMigrate = this.resources.filter((r) => r.nodeName !== this.nodeName);
|
||||||
|
|
||||||
|
// await Promise.allSettled(toMigrate.map((r) => r.doAction('migrate', { nodeName: this.nodeName }, {}, false)));
|
||||||
|
// We want to show all migration errors if there are multiple VMs, so we use allSettled here and handle the results accordingly.
|
||||||
|
const results = await Promise.allSettled(toMigrate.map((r) => r.doAction('migrate', { nodeName: this.nodeName }, {}, false)));
|
||||||
|
|
||||||
|
const failedMigrations = results
|
||||||
|
.map((result, index) => ({ resource: toMigrate[index], result }))
|
||||||
|
.filter(({ result }) => result.status === 'rejected');
|
||||||
|
|
||||||
|
if (failedMigrations.length) {
|
||||||
|
this['errors'] = failedMigrations.flatMap(({ resource, result }) => {
|
||||||
|
const vmName = resource?.nameDisplay || resource?.name || resource?.metadata?.name || this.$store.getters['i18n/t']('generic.unknown');
|
||||||
|
const error = result.reason?.data || result.reason;
|
||||||
|
const messages = exceptionToErrorsArray(error);
|
||||||
|
|
||||||
|
return messages.map((message) => `${ vmName }: ${ message }`);
|
||||||
|
});
|
||||||
|
buttonDone(false);
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
buttonDone(true);
|
buttonDone(true);
|
||||||
this.close();
|
this.close();
|
||||||
@@ -146,17 +183,35 @@ export default {
|
|||||||
<template>
|
<template>
|
||||||
<Card :show-highlight-border="false">
|
<Card :show-highlight-border="false">
|
||||||
<template #title>
|
<template #title>
|
||||||
{{ t('harvester.modal.migration.title') }}
|
{{ t('harvester.modal.migration.vmMigrationTitle', { count: resources.length }) }}
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<template #body>
|
<template #body>
|
||||||
<Banner
|
<Banner
|
||||||
v-if="actionResource?.isCpuPinning"
|
v-if="anyCpuPinning"
|
||||||
color="warning"
|
color="warning"
|
||||||
:label="cpuPinningAlertMessage"
|
:label="cpuPinningAlertMessage"
|
||||||
/>
|
/>
|
||||||
|
<p>
|
||||||
|
{{ t('harvester.modal.migration.selectedVMs') }}
|
||||||
|
</p>
|
||||||
|
<ul class="vm-list">
|
||||||
|
<li
|
||||||
|
v-for="group in vmsByNode"
|
||||||
|
:key="group.node"
|
||||||
|
>
|
||||||
|
{{ group.node || t('harvester.modal.migration.unknownNode') }}: {{ group.vms.join(', ') }}
|
||||||
|
<span
|
||||||
|
v-if="nodeName && group.node === nodeName"
|
||||||
|
class="already-on-target"
|
||||||
|
>
|
||||||
|
({{ t('harvester.modal.migration.alreadyOnTarget') }})
|
||||||
|
</span>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
<LabeledSelect
|
<LabeledSelect
|
||||||
v-model:value="nodeName"
|
v-model:value="nodeName"
|
||||||
|
class="mt-15"
|
||||||
:label="t('harvester.modal.migration.fields.nodeName.label')"
|
:label="t('harvester.modal.migration.fields.nodeName.label')"
|
||||||
:placeholder="t('harvester.modal.migration.fields.nodeName.placeholder')"
|
:placeholder="t('harvester.modal.migration.fields.nodeName.placeholder')"
|
||||||
:options="nodeNameList"
|
:options="nodeNameList"
|
||||||
@@ -183,7 +238,7 @@ export default {
|
|||||||
|
|
||||||
<AsyncButton
|
<AsyncButton
|
||||||
mode="apply"
|
mode="apply"
|
||||||
:disabled="!nodeName"
|
:disabled="!nodeName || allVmsOnTargetNode"
|
||||||
@click="apply"
|
@click="apply"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
@@ -201,4 +256,16 @@ export default {
|
|||||||
justify-content: flex-end;
|
justify-content: flex-end;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.already-on-target {
|
||||||
|
color: var(--warning);
|
||||||
|
font-style: italic;
|
||||||
|
}
|
||||||
|
|
||||||
|
.vm-list {
|
||||||
|
list-style: disc;
|
||||||
|
padding-left: 1.5em;
|
||||||
|
margin-bottom: 10px;
|
||||||
|
margin-top: 10px;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -0,0 +1,239 @@
|
|||||||
|
<script>
|
||||||
|
import { mapGetters } from 'vuex';
|
||||||
|
|
||||||
|
import { PVC } from '@shell/config/types';
|
||||||
|
import { exceptionToErrorsArray } from '@shell/utils/error';
|
||||||
|
import { sortBy } from '@shell/utils/sort';
|
||||||
|
import { HCI } from '../types';
|
||||||
|
import { parseVolumeClaimTemplates } from '@pkg/harvester/utils/vm';
|
||||||
|
|
||||||
|
import { Card } from '@components/Card';
|
||||||
|
import { Banner } from '@components/Banner';
|
||||||
|
import AsyncButton from '@shell/components/AsyncButton';
|
||||||
|
import LabeledSelect from '@shell/components/form/LabeledSelect';
|
||||||
|
|
||||||
|
export default {
|
||||||
|
name: 'HarvesterStorageMigrationDialog',
|
||||||
|
|
||||||
|
emits: ['close'],
|
||||||
|
|
||||||
|
components: {
|
||||||
|
AsyncButton, Banner, Card, LabeledSelect
|
||||||
|
},
|
||||||
|
|
||||||
|
props: {
|
||||||
|
resources: {
|
||||||
|
type: Array,
|
||||||
|
required: true
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
async fetch() {
|
||||||
|
this.allPVCs = await this.$store.dispatch('harvester/findAll', { type: PVC });
|
||||||
|
},
|
||||||
|
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
sourceVolume: '',
|
||||||
|
targetVolume: '',
|
||||||
|
errors: [],
|
||||||
|
allPVCs: [],
|
||||||
|
};
|
||||||
|
},
|
||||||
|
|
||||||
|
computed: {
|
||||||
|
...mapGetters({ t: 'i18n/t' }),
|
||||||
|
|
||||||
|
actionResource() {
|
||||||
|
return this.resources[0];
|
||||||
|
},
|
||||||
|
|
||||||
|
sourceVolumeOptions() {
|
||||||
|
const volumes = this.actionResource.spec?.template?.spec?.volumes || [];
|
||||||
|
|
||||||
|
return sortBy(
|
||||||
|
volumes
|
||||||
|
.map((v) => v.persistentVolumeClaim?.claimName)
|
||||||
|
.filter((name) => !!name)
|
||||||
|
.map((name) => ({
|
||||||
|
label: name,
|
||||||
|
value: name
|
||||||
|
})),
|
||||||
|
'label'
|
||||||
|
);
|
||||||
|
},
|
||||||
|
|
||||||
|
namespacePVCs() {
|
||||||
|
return this.allPVCs.filter((pvc) => pvc.metadata.namespace === this.actionResource.metadata.namespace);
|
||||||
|
},
|
||||||
|
|
||||||
|
vmUsedVolumeNames() {
|
||||||
|
const allVMs = this.$store.getters['harvester/all'](HCI.VM) || [];
|
||||||
|
const names = new Set();
|
||||||
|
|
||||||
|
allVMs.forEach((vm) => {
|
||||||
|
// Collect volume names from spec.template.spec.volumes (both PVC and DataVolume references)
|
||||||
|
const volumes = vm.spec?.template?.spec?.volumes || [];
|
||||||
|
|
||||||
|
volumes.forEach((v) => {
|
||||||
|
const name = v.persistentVolumeClaim?.claimName || v.dataVolume?.name;
|
||||||
|
|
||||||
|
if (name) {
|
||||||
|
names.add(`${ vm.metadata.namespace }/${ name }`);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// Collect volume names from volumeClaimTemplates annotation
|
||||||
|
const templates = parseVolumeClaimTemplates(vm);
|
||||||
|
|
||||||
|
templates.forEach((t) => {
|
||||||
|
if (t.metadata?.name) {
|
||||||
|
names.add(`${ vm.metadata.namespace }/${ t.metadata.name }`);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
return names;
|
||||||
|
},
|
||||||
|
|
||||||
|
targetVolumeOptions() {
|
||||||
|
return sortBy(
|
||||||
|
this.namespacePVCs
|
||||||
|
.filter((pvc) => {
|
||||||
|
// Exclude volumes used by any VM (via spec.volumes or volumeClaimTemplates)
|
||||||
|
if (this.vmUsedVolumeNames.has(`${ pvc.metadata.namespace }/${ pvc.metadata.name }`)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
})
|
||||||
|
.map((pvc) => ({
|
||||||
|
label: pvc.metadata.name,
|
||||||
|
value: pvc.metadata.name
|
||||||
|
})),
|
||||||
|
'label'
|
||||||
|
);
|
||||||
|
},
|
||||||
|
|
||||||
|
disableSave() {
|
||||||
|
return !this.sourceVolume || !this.targetVolume;
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
methods: {
|
||||||
|
close() {
|
||||||
|
this.sourceVolume = '';
|
||||||
|
this.targetVolume = '';
|
||||||
|
this.errors = [];
|
||||||
|
this.$emit('close');
|
||||||
|
},
|
||||||
|
|
||||||
|
async apply(buttonDone) {
|
||||||
|
if (!this.actionResource) {
|
||||||
|
buttonDone(false);
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!this.sourceVolume) {
|
||||||
|
const name = this.t('harvester.modal.storageMigration.fields.sourceVolume.label');
|
||||||
|
|
||||||
|
this['errors'] = [this.t('validation.required', { key: name })];
|
||||||
|
buttonDone(false);
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!this.targetVolume) {
|
||||||
|
const name = this.t('harvester.modal.storageMigration.fields.targetVolume.label');
|
||||||
|
|
||||||
|
this['errors'] = [this.t('validation.required', { key: name })];
|
||||||
|
buttonDone(false);
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
await this.actionResource.doAction('storageMigration', {
|
||||||
|
sourceVolume: this.sourceVolume,
|
||||||
|
targetVolume: this.targetVolume
|
||||||
|
}, {}, false);
|
||||||
|
|
||||||
|
buttonDone(true);
|
||||||
|
this.close();
|
||||||
|
} catch (err) {
|
||||||
|
const error = err?.data || err;
|
||||||
|
|
||||||
|
this['errors'] = exceptionToErrorsArray(error);
|
||||||
|
buttonDone(false);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
}
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<Card :show-highlight-border="false">
|
||||||
|
<template #title>
|
||||||
|
{{ t('harvester.modal.storageMigration.title') }}
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<template #body>
|
||||||
|
<LabeledSelect
|
||||||
|
v-model:value="sourceVolume"
|
||||||
|
:label="t('harvester.modal.storageMigration.fields.sourceVolume.label')"
|
||||||
|
:placeholder="t('harvester.modal.storageMigration.fields.sourceVolume.placeholder')"
|
||||||
|
:options="sourceVolumeOptions"
|
||||||
|
class="mb-20"
|
||||||
|
required
|
||||||
|
/>
|
||||||
|
|
||||||
|
<LabeledSelect
|
||||||
|
v-model:value="targetVolume"
|
||||||
|
:label="t('harvester.modal.storageMigration.fields.targetVolume.label')"
|
||||||
|
:placeholder="t('harvester.modal.storageMigration.fields.targetVolume.placeholder')"
|
||||||
|
:options="targetVolumeOptions"
|
||||||
|
required
|
||||||
|
/>
|
||||||
|
|
||||||
|
<Banner
|
||||||
|
v-for="(err, i) in errors"
|
||||||
|
:key="i"
|
||||||
|
color="error"
|
||||||
|
:label="err"
|
||||||
|
/>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<template
|
||||||
|
#actions
|
||||||
|
class="actions"
|
||||||
|
>
|
||||||
|
<div class="buttons">
|
||||||
|
<button
|
||||||
|
class="btn role-secondary mr-10"
|
||||||
|
@click="close"
|
||||||
|
>
|
||||||
|
{{ t('generic.cancel') }}
|
||||||
|
</button>
|
||||||
|
|
||||||
|
<AsyncButton
|
||||||
|
mode="apply"
|
||||||
|
:disabled="disableSave"
|
||||||
|
@click="apply"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
</Card>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<style lang="scss" scoped>
|
||||||
|
.actions {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.buttons {
|
||||||
|
display: flex;
|
||||||
|
justify-content: flex-end;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -71,21 +71,38 @@ export default {
|
|||||||
},
|
},
|
||||||
|
|
||||||
data() {
|
data() {
|
||||||
let provisioner = `${ this.value.provisioner || LONGHORN_DRIVER }`;
|
|
||||||
|
|
||||||
if (provisioner === LONGHORN_DRIVER) {
|
|
||||||
provisioner = `${ provisioner }_${ this.value.provisionerVersion || LONGHORN_VERSION_V1 }`;
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
provisioner,
|
|
||||||
volumeGroupDialog: null,
|
volumeGroupDialog: null,
|
||||||
randomStr: randomStr(10).toLowerCase(),
|
randomStr: randomStr(10).toLowerCase(),
|
||||||
isOpen: false
|
isOpen: false,
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|
||||||
computed: {
|
computed: {
|
||||||
|
provisioner: {
|
||||||
|
get() {
|
||||||
|
let provisioner = `${ this.value?.provisioner || LONGHORN_DRIVER }`;
|
||||||
|
|
||||||
|
if (provisioner === LONGHORN_DRIVER) {
|
||||||
|
provisioner = `${ provisioner }_${ this.value?.provisionerVersion || LONGHORN_VERSION_V1 }`;
|
||||||
|
}
|
||||||
|
|
||||||
|
return provisioner;
|
||||||
|
},
|
||||||
|
set(value) {
|
||||||
|
this.randomStr = randomStr(10).toLowerCase();
|
||||||
|
const [provisioner, provisionerVersion] = (value || '').split('_');
|
||||||
|
|
||||||
|
this.value.provisioner = provisioner;
|
||||||
|
|
||||||
|
if (provisioner === LONGHORN_DRIVER) {
|
||||||
|
this.value.provisionerVersion = provisionerVersion || LONGHORN_VERSION_V1;
|
||||||
|
} else {
|
||||||
|
this.value.provisionerVersion = undefined;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
provisioners() {
|
provisioners() {
|
||||||
const out = [];
|
const out = [];
|
||||||
|
|
||||||
@@ -283,20 +300,6 @@ export default {
|
|||||||
},
|
},
|
||||||
|
|
||||||
watch: {
|
watch: {
|
||||||
provisioner(value) {
|
|
||||||
this.randomStr = randomStr(10).toLowerCase();
|
|
||||||
|
|
||||||
const [provisioner, provisionerVersion] = value?.split('_');
|
|
||||||
|
|
||||||
this.value.provisioner = provisioner;
|
|
||||||
|
|
||||||
if (provisioner === LONGHORN_DRIVER) {
|
|
||||||
this.value.provisionerVersion = provisionerVersion || LONGHORN_VERSION_V1;
|
|
||||||
} else {
|
|
||||||
this.value.provisionerVersion = undefined;
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
'value.lvmVolumeGroup'(neu) {
|
'value.lvmVolumeGroup'(neu) {
|
||||||
if (neu === _NEW) {
|
if (neu === _NEW) {
|
||||||
this.value.lvmVolumeGroup = null;
|
this.value.lvmVolumeGroup = null;
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import FileSelector, { createOnSelected } from '@shell/components/form/FileSelec
|
|||||||
|
|
||||||
import { randomStr } from '@shell/utils/string';
|
import { randomStr } from '@shell/utils/string';
|
||||||
import CreateEditView from '@shell/mixins/create-edit-view';
|
import CreateEditView from '@shell/mixins/create-edit-view';
|
||||||
|
import { getLoginAwareErrors } from '../utils/error';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'HarvesterEditKeypair',
|
name: 'HarvesterEditKeypair',
|
||||||
@@ -63,6 +64,14 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
computed: {
|
||||||
|
normalizedErrors() {
|
||||||
|
const message = this.t('harvester.virtualMachine.genericLoginError');
|
||||||
|
|
||||||
|
return getLoginAwareErrors(this.errors, message);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
methods: { onKeySelected: createOnSelected('publicKey') },
|
methods: { onKeySelected: createOnSelected('publicKey') },
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
@@ -72,10 +81,9 @@ export default {
|
|||||||
:done-route="doneRoute"
|
:done-route="doneRoute"
|
||||||
:resource="value"
|
:resource="value"
|
||||||
:mode="mode"
|
:mode="mode"
|
||||||
:errors="errors"
|
:errors="normalizedErrors"
|
||||||
:apply-hooks="applyHooks"
|
:apply-hooks="applyHooks"
|
||||||
@finish="save"
|
@finish="save"
|
||||||
@error="e=>errors=e"
|
|
||||||
>
|
>
|
||||||
<div class="header mb-20">
|
<div class="header mb-20">
|
||||||
<FileSelector
|
<FileSelector
|
||||||
|
|||||||
@@ -3,8 +3,9 @@ import KeyValue from '@shell/components/form/KeyValue';
|
|||||||
import LabeledSelect from '@shell/components/form/LabeledSelect';
|
import LabeledSelect from '@shell/components/form/LabeledSelect';
|
||||||
import { LabeledInput } from '@components/Form/LabeledInput';
|
import { LabeledInput } from '@components/Form/LabeledInput';
|
||||||
import RadioGroup from '@components/Form/Radio/RadioGroup';
|
import RadioGroup from '@components/Form/Radio/RadioGroup';
|
||||||
|
import Checkbox from '@components/Form/Checkbox/Checkbox';
|
||||||
import { SECRET, LONGHORN } from '@shell/config/types';
|
import { SECRET, LONGHORN } from '@shell/config/types';
|
||||||
import { _CREATE, _VIEW } from '@shell/config/query-params';
|
import { _CREATE, _VIEW, _EDIT } from '@shell/config/query-params';
|
||||||
import { CSI_SECRETS } from '@pkg/harvester/config/harvester-map';
|
import { CSI_SECRETS } from '@pkg/harvester/config/harvester-map';
|
||||||
import { clone } from '@shell/utils/object';
|
import { clone } from '@shell/utils/object';
|
||||||
import { uniq } from '@shell/utils/array';
|
import { uniq } from '@shell/utils/array';
|
||||||
@@ -16,7 +17,9 @@ const {
|
|||||||
CSI_NODE_PUBLISH_SECRET_NAME,
|
CSI_NODE_PUBLISH_SECRET_NAME,
|
||||||
CSI_NODE_PUBLISH_SECRET_NAMESPACE,
|
CSI_NODE_PUBLISH_SECRET_NAMESPACE,
|
||||||
CSI_NODE_STAGE_SECRET_NAME,
|
CSI_NODE_STAGE_SECRET_NAME,
|
||||||
CSI_NODE_STAGE_SECRET_NAMESPACE
|
CSI_NODE_STAGE_SECRET_NAMESPACE,
|
||||||
|
CSI_NODE_EXPAND_SECRET_NAME,
|
||||||
|
CSI_NODE_EXPAND_SECRET_NAMESPACE
|
||||||
} = CSI_SECRETS;
|
} = CSI_SECRETS;
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
@@ -27,6 +30,7 @@ export default {
|
|||||||
LabeledSelect,
|
LabeledSelect,
|
||||||
LabeledInput,
|
LabeledInput,
|
||||||
RadioGroup,
|
RadioGroup,
|
||||||
|
Checkbox,
|
||||||
},
|
},
|
||||||
|
|
||||||
props: {
|
props: {
|
||||||
@@ -57,7 +61,10 @@ export default {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
return { };
|
const hasExpandSecret = !!(this.value.parameters?.[CSI_NODE_EXPAND_SECRET_NAME] && this.value.parameters?.[CSI_NODE_EXPAND_SECRET_NAMESPACE]);
|
||||||
|
const volumeExpansionCheckBoxEnabled = this.realMode === _CREATE ? true : hasExpandSecret;
|
||||||
|
|
||||||
|
return { volumeExpansionCheckBoxEnabled };
|
||||||
},
|
},
|
||||||
|
|
||||||
computed: {
|
computed: {
|
||||||
@@ -98,8 +105,11 @@ export default {
|
|||||||
}, []);
|
}, []);
|
||||||
},
|
},
|
||||||
|
|
||||||
|
isEdit() {
|
||||||
|
return this.realMode === _EDIT;
|
||||||
|
},
|
||||||
isView() {
|
isView() {
|
||||||
return this.mode === _VIEW;
|
return this.realMode === _VIEW;
|
||||||
},
|
},
|
||||||
|
|
||||||
migratableOptions() {
|
migratableOptions() {
|
||||||
@@ -152,6 +162,10 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
enableOnlineExpansionVolumeEncryption() {
|
||||||
|
return this.value.expandOnlineEncryptedVolumeFeatureEnabled;
|
||||||
|
},
|
||||||
|
|
||||||
volumeEncryption: {
|
volumeEncryption: {
|
||||||
set(neu) {
|
set(neu) {
|
||||||
this.value['parameters'] = {
|
this.value['parameters'] = {
|
||||||
@@ -180,6 +194,11 @@ export default {
|
|||||||
set(selectedSecret) {
|
set(selectedSecret) {
|
||||||
const [namespace, name] = selectedSecret.split('/');
|
const [namespace, name] = selectedSecret.split('/');
|
||||||
|
|
||||||
|
const expandSecretParams = (this.enableOnlineExpansionVolumeEncryption && this.volumeExpansionCheckBoxEnabled) ? {
|
||||||
|
[CSI_NODE_EXPAND_SECRET_NAME]: name,
|
||||||
|
[CSI_NODE_EXPAND_SECRET_NAMESPACE]: namespace,
|
||||||
|
} : {};
|
||||||
|
|
||||||
this.value['parameters'] = {
|
this.value['parameters'] = {
|
||||||
...this.value.parameters,
|
...this.value.parameters,
|
||||||
[CSI_PROVISIONER_SECRET_NAME]: name,
|
[CSI_PROVISIONER_SECRET_NAME]: name,
|
||||||
@@ -187,7 +206,8 @@ export default {
|
|||||||
[CSI_NODE_STAGE_SECRET_NAME]: name,
|
[CSI_NODE_STAGE_SECRET_NAME]: name,
|
||||||
[CSI_PROVISIONER_SECRET_NAMESPACE]: namespace,
|
[CSI_PROVISIONER_SECRET_NAMESPACE]: namespace,
|
||||||
[CSI_NODE_PUBLISH_SECRET_NAMESPACE]: namespace,
|
[CSI_NODE_PUBLISH_SECRET_NAMESPACE]: namespace,
|
||||||
[CSI_NODE_STAGE_SECRET_NAMESPACE]: namespace
|
[CSI_NODE_STAGE_SECRET_NAMESPACE]: namespace,
|
||||||
|
...expandSecretParams,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -240,6 +260,32 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
|
watch: {
|
||||||
|
volumeExpansionCheckBoxEnabled(enabled) {
|
||||||
|
const currentSecret = this.secret;
|
||||||
|
|
||||||
|
if (!currentSecret) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const [namespace, name] = currentSecret.split('/');
|
||||||
|
|
||||||
|
if (enabled && this.enableOnlineExpansionVolumeEncryption) {
|
||||||
|
this.value['parameters'] = {
|
||||||
|
...this.value.parameters,
|
||||||
|
[CSI_NODE_EXPAND_SECRET_NAME]: name,
|
||||||
|
[CSI_NODE_EXPAND_SECRET_NAMESPACE]: namespace,
|
||||||
|
};
|
||||||
|
} else {
|
||||||
|
const params = { ...this.value.parameters };
|
||||||
|
|
||||||
|
delete params[CSI_NODE_EXPAND_SECRET_NAME];
|
||||||
|
delete params[CSI_NODE_EXPAND_SECRET_NAMESPACE];
|
||||||
|
this.value['parameters'] = params;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
@@ -337,6 +383,16 @@ export default {
|
|||||||
:mode="mode"
|
:mode="mode"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
<div
|
||||||
|
v-if="enableOnlineExpansionVolumeEncryption"
|
||||||
|
class="col span-6 flex items-center mt-20"
|
||||||
|
>
|
||||||
|
<Checkbox
|
||||||
|
v-model:value="volumeExpansionCheckBoxEnabled"
|
||||||
|
:label="t('harvester.storage.volumeExpansionCheckbox')"
|
||||||
|
:disabled="isEdit || isView"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<KeyValue
|
<KeyValue
|
||||||
|
|||||||
@@ -254,15 +254,24 @@ export default {
|
|||||||
v-if="restoreNewVm"
|
v-if="restoreNewVm"
|
||||||
v-model:value="restoreResource.spec.keepMacAddress"
|
v-model:value="restoreResource.spec.keepMacAddress"
|
||||||
type="checkbox"
|
type="checkbox"
|
||||||
|
class="check mb-20"
|
||||||
:label="t('harvester.backup.restore.keepMacAddress')"
|
:label="t('harvester.backup.restore.keepMacAddress')"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<LabeledSelect
|
<LabeledSelect
|
||||||
v-if="!restoreNewVm"
|
v-if="!restoreNewVm"
|
||||||
v-model:value="deletionPolicy"
|
v-model:value="deletionPolicy"
|
||||||
|
class="mb-20"
|
||||||
:label="t('harvester.backup.restore.deletePreviousVolumes')"
|
:label="t('harvester.backup.restore.deletePreviousVolumes')"
|
||||||
:options="deletionPolicyOption"
|
:options="deletionPolicyOption"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
<Checkbox
|
||||||
|
v-model:value="restoreResource.spec.haltAfterRestore"
|
||||||
|
type="checkbox"
|
||||||
|
class="check mb-20"
|
||||||
|
:label="t('harvester.backup.restore.haltAfterRestore')"
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<Footer
|
<Footer
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import { Checkbox } from '@components/Form/Checkbox';
|
|||||||
import CruResource from '@shell/components/CruResource';
|
import CruResource from '@shell/components/CruResource';
|
||||||
import NameNsDescription from '@shell/components/form/NameNsDescription';
|
import NameNsDescription from '@shell/components/form/NameNsDescription';
|
||||||
import LabeledSelect from '@shell/components/form/LabeledSelect';
|
import LabeledSelect from '@shell/components/form/LabeledSelect';
|
||||||
|
import { set } from '@shell/utils/object';
|
||||||
import { Banner } from '@components/Banner';
|
import { Banner } from '@components/Banner';
|
||||||
import KeyValue from '@shell/components/form/KeyValue';
|
import KeyValue from '@shell/components/form/KeyValue';
|
||||||
import NodeScheduling from '@shell/components/form/NodeScheduling';
|
import NodeScheduling from '@shell/components/form/NodeScheduling';
|
||||||
@@ -22,8 +23,10 @@ import Reserved from './kubevirt.io.virtualmachine/VirtualMachineReserved';
|
|||||||
import Volume from './kubevirt.io.virtualmachine/VirtualMachineVolume';
|
import Volume from './kubevirt.io.virtualmachine/VirtualMachineVolume';
|
||||||
import Network from './kubevirt.io.virtualmachine/VirtualMachineNetwork';
|
import Network from './kubevirt.io.virtualmachine/VirtualMachineNetwork';
|
||||||
import CpuMemory from './kubevirt.io.virtualmachine/VirtualMachineCpuMemory';
|
import CpuMemory from './kubevirt.io.virtualmachine/VirtualMachineCpuMemory';
|
||||||
|
import CpuModel from './kubevirt.io.virtualmachine/VirtualMachineCpuModel';
|
||||||
import CloudConfig from './kubevirt.io.virtualmachine/VirtualMachineCloudConfig';
|
import CloudConfig from './kubevirt.io.virtualmachine/VirtualMachineCloudConfig';
|
||||||
import SSHKey from './kubevirt.io.virtualmachine/VirtualMachineSSHKey';
|
import SSHKey from './kubevirt.io.virtualmachine/VirtualMachineSSHKey';
|
||||||
|
import Filesystem from './kubevirt.io.virtualmachine/VirtualMachineFilesystem';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'HarvesterEditVMTemplate',
|
name: 'HarvesterEditVMTemplate',
|
||||||
@@ -38,6 +41,7 @@ export default {
|
|||||||
Network,
|
Network,
|
||||||
Checkbox,
|
Checkbox,
|
||||||
CpuMemory,
|
CpuMemory,
|
||||||
|
CpuModel,
|
||||||
CruResource,
|
CruResource,
|
||||||
CloudConfig,
|
CloudConfig,
|
||||||
LabeledSelect,
|
LabeledSelect,
|
||||||
@@ -48,6 +52,7 @@ export default {
|
|||||||
UnitInput,
|
UnitInput,
|
||||||
Banner,
|
Banner,
|
||||||
KeyValue,
|
KeyValue,
|
||||||
|
Filesystem,
|
||||||
},
|
},
|
||||||
|
|
||||||
mixins: [CreateEditView, VM_MIXIN],
|
mixins: [CreateEditView, VM_MIXIN],
|
||||||
@@ -70,12 +75,12 @@ export default {
|
|||||||
|
|
||||||
return {
|
return {
|
||||||
templateId,
|
templateId,
|
||||||
templateValue: null,
|
templateValue: null,
|
||||||
templateSpec: null,
|
templateSpec: null,
|
||||||
versionName: '',
|
versionName: '',
|
||||||
description: '',
|
description: '',
|
||||||
defaultVersion: null,
|
defaultVersion: null,
|
||||||
isDefaultVersion: false,
|
isDefaultVersion: false,
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -92,6 +97,10 @@ export default {
|
|||||||
secretNamePrefix() {
|
secretNamePrefix() {
|
||||||
return this.templateValue?.metadata?.name;
|
return this.templateValue?.metadata?.name;
|
||||||
},
|
},
|
||||||
|
|
||||||
|
filesystemEnabled() {
|
||||||
|
return this.$store.getters['harvester-common/getFeatureEnabled']('supportFilesystem');
|
||||||
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
watch: {
|
watch: {
|
||||||
@@ -151,9 +160,22 @@ export default {
|
|||||||
|
|
||||||
mounted() {
|
mounted() {
|
||||||
this.imageId = this.diskRows[0]?.image || '';
|
this.imageId = this.diskRows[0]?.image || '';
|
||||||
|
this['filesystemRows'] = this.getFilesystemRows(this.value.spec.vm);
|
||||||
},
|
},
|
||||||
|
|
||||||
methods: {
|
methods: {
|
||||||
|
updateCpuModel(value) {
|
||||||
|
if (!this.spec?.template?.spec?.domain?.cpu) {
|
||||||
|
set(this.spec, 'template.spec.domain.cpu', {});
|
||||||
|
}
|
||||||
|
|
||||||
|
if (value && value !== '') {
|
||||||
|
set(this.spec.template.spec.domain.cpu, 'model', value);
|
||||||
|
} else {
|
||||||
|
delete this.spec.template.spec.domain.cpu.model;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
async saveVMT(buttonCb) {
|
async saveVMT(buttonCb) {
|
||||||
this.parseVM();
|
this.parseVM();
|
||||||
|
|
||||||
@@ -334,6 +356,19 @@ export default {
|
|||||||
</template>
|
</template>
|
||||||
</Tab>
|
</Tab>
|
||||||
|
|
||||||
|
<Tab
|
||||||
|
v-if="filesystemEnabled"
|
||||||
|
name="filesystem"
|
||||||
|
:label="t('harvester.tab.filesystem')"
|
||||||
|
:weight="-8"
|
||||||
|
>
|
||||||
|
<Filesystem
|
||||||
|
v-model:value="filesystemRows"
|
||||||
|
:mode="mode"
|
||||||
|
:namespace="templateValue.metadata.namespace"
|
||||||
|
/>
|
||||||
|
</Tab>
|
||||||
|
|
||||||
<Tab
|
<Tab
|
||||||
name="labels"
|
name="labels"
|
||||||
:label="t('generic.labels')"
|
:label="t('generic.labels')"
|
||||||
@@ -436,6 +471,17 @@ export default {
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="row mb-20">
|
||||||
|
<div class="col span-6">
|
||||||
|
<CpuModel
|
||||||
|
:value="spec.template.spec.domain.cpu?.model || ''"
|
||||||
|
:mode="mode"
|
||||||
|
@update:value="updateCpuModel"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="row mb-20">
|
<div class="row mb-20">
|
||||||
<a
|
<a
|
||||||
v-if="showAdvanced"
|
v-if="showAdvanced"
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
import Footer from '@shell/components/form/Footer';
|
import Footer from '@shell/components/form/Footer';
|
||||||
import { RadioGroup } from '@components/Form/Radio';
|
import { RadioGroup } from '@components/Form/Radio';
|
||||||
import { LabeledInput } from '@components/Form/LabeledInput';
|
import { LabeledInput } from '@components/Form/LabeledInput';
|
||||||
|
import Checkbox from '@components/Form/Checkbox/Checkbox';
|
||||||
import LabeledSelect from '@shell/components/form/LabeledSelect';
|
import LabeledSelect from '@shell/components/form/LabeledSelect';
|
||||||
import CreateEditView from '@shell/mixins/create-edit-view';
|
import CreateEditView from '@shell/mixins/create-edit-view';
|
||||||
import { allHash } from '@shell/utils/promise';
|
import { allHash } from '@shell/utils/promise';
|
||||||
@@ -32,6 +33,7 @@ const createObject = {
|
|||||||
export default {
|
export default {
|
||||||
name: 'CreateRestore',
|
name: 'CreateRestore',
|
||||||
components: {
|
components: {
|
||||||
|
Checkbox,
|
||||||
Footer,
|
Footer,
|
||||||
RadioGroup,
|
RadioGroup,
|
||||||
LabeledInput,
|
LabeledInput,
|
||||||
@@ -249,9 +251,17 @@ export default {
|
|||||||
<LabeledSelect
|
<LabeledSelect
|
||||||
v-if="!restoreNewVm"
|
v-if="!restoreNewVm"
|
||||||
v-model:value="deletionPolicy"
|
v-model:value="deletionPolicy"
|
||||||
|
class="mb-20"
|
||||||
:label="t('harvester.backup.restore.deletePreviousVolumes')"
|
:label="t('harvester.backup.restore.deletePreviousVolumes')"
|
||||||
:options="deletionPolicyOption"
|
:options="deletionPolicyOption"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
<Checkbox
|
||||||
|
v-model:value="restoreResource.spec.haltAfterRestore"
|
||||||
|
type="checkbox"
|
||||||
|
class="check mb-20"
|
||||||
|
:label="t('harvester.backup.restore.haltAfterRestore')"
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<Footer
|
<Footer
|
||||||
|
|||||||
@@ -9,8 +9,11 @@ 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 { Banner } from '@components/Banner';
|
import { Banner } from '@components/Banner';
|
||||||
|
import { Checkbox } from '@components/Form/Checkbox';
|
||||||
|
import jsyaml from 'js-yaml';
|
||||||
|
import { exceptionToErrorsArray } from '@shell/utils/error';
|
||||||
import { allHash } from '@shell/utils/promise';
|
import { allHash } from '@shell/utils/promise';
|
||||||
import { get } from '@shell/utils/object';
|
import { clone, get } from '@shell/utils/object';
|
||||||
import { STORAGE_CLASS, LONGHORN, PV } from '@shell/config/types';
|
import { STORAGE_CLASS, LONGHORN, PV } from '@shell/config/types';
|
||||||
import { sortBy } from '@shell/utils/sort';
|
import { sortBy } from '@shell/utils/sort';
|
||||||
import { saferDump } from '@shell/utils/create-yaml';
|
import { saferDump } from '@shell/utils/create-yaml';
|
||||||
@@ -33,6 +36,7 @@ export default {
|
|||||||
|
|
||||||
components: {
|
components: {
|
||||||
Banner,
|
Banner,
|
||||||
|
Checkbox,
|
||||||
Tab,
|
Tab,
|
||||||
UnitInput,
|
UnitInput,
|
||||||
CruResource,
|
CruResource,
|
||||||
@@ -90,14 +94,34 @@ export default {
|
|||||||
source,
|
source,
|
||||||
storage,
|
storage,
|
||||||
imageId,
|
imageId,
|
||||||
snapshots: [],
|
showAdvanced: false,
|
||||||
images: [],
|
createWithDataVolume: false,
|
||||||
|
snapshots: [],
|
||||||
|
images: [],
|
||||||
GIBIBYTE
|
GIBIBYTE
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|
||||||
created() {
|
created() {
|
||||||
this.registerBeforeHook(this.willSave, 'willSave');
|
this.registerBeforeHook(this.willSave, 'willSave');
|
||||||
|
|
||||||
|
if (this.mode === _CREATE) {
|
||||||
|
const originalSaveYaml = this.value.saveYaml?.bind(this.value);
|
||||||
|
|
||||||
|
this.value.saveYaml = async(yaml) => {
|
||||||
|
if (this.createWithDataVolume && this.isBlank) {
|
||||||
|
const parsed = jsyaml.load(yaml);
|
||||||
|
const dvObj = { ...parsed, type: 'cdi.kubevirt.io.datavolume' };
|
||||||
|
const dataVolume = await this.$store.dispatch('harvester/create', dvObj);
|
||||||
|
|
||||||
|
await dataVolume.save();
|
||||||
|
|
||||||
|
return dataVolume;
|
||||||
|
}
|
||||||
|
|
||||||
|
return originalSaveYaml(yaml);
|
||||||
|
};
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
computed: {
|
computed: {
|
||||||
@@ -135,6 +159,10 @@ export default {
|
|||||||
return Object.values(VOLUME_MODE);
|
return Object.values(VOLUME_MODE);
|
||||||
},
|
},
|
||||||
|
|
||||||
|
accessModeOptions() {
|
||||||
|
return ['ReadWriteOnce', 'ReadWriteMany', 'ReadOnlyMany'];
|
||||||
|
},
|
||||||
|
|
||||||
imageOption() {
|
imageOption() {
|
||||||
return sortBy(
|
return sortBy(
|
||||||
this.images
|
this.images
|
||||||
@@ -275,6 +303,10 @@ export default {
|
|||||||
return this.$store.getters['harvester-common/getFeatureEnabled']('lhV2VolExpansion');
|
return this.$store.getters['harvester-common/getFeatureEnabled']('lhV2VolExpansion');
|
||||||
},
|
},
|
||||||
|
|
||||||
|
isCreatePVCWithDataVolumeFeatureEnabled() {
|
||||||
|
return this.$store.getters['harvester-common/getFeatureEnabled']('createPVCWithDataVolume');
|
||||||
|
},
|
||||||
|
|
||||||
isResizeDisabled() {
|
isResizeDisabled() {
|
||||||
return (
|
return (
|
||||||
!this.isLHV2VolExpansionFeatureEnabled &&
|
!this.isLHV2VolExpansionFeatureEnabled &&
|
||||||
@@ -341,6 +373,58 @@ export default {
|
|||||||
|
|
||||||
return readWriteOnce ? ['ReadWriteOnce'] : ['ReadWriteMany'];
|
return readWriteOnce ? ['ReadWriteOnce'] : ['ReadWriteMany'];
|
||||||
},
|
},
|
||||||
|
buildDataVolumeObj() {
|
||||||
|
const storage = {
|
||||||
|
storageClassName: this.value.spec.storageClassName,
|
||||||
|
resources: { requests: { storage: this.storage } },
|
||||||
|
};
|
||||||
|
|
||||||
|
if (this.showAdvanced && this.value.spec.accessModes?.length > 0) {
|
||||||
|
storage.accessModes = this.value.spec.accessModes;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.showAdvanced && this.value.spec.volumeMode) {
|
||||||
|
storage.volumeMode = this.value.spec.volumeMode;
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
type: 'cdi.kubevirt.io.datavolume',
|
||||||
|
apiVersion: 'cdi.kubevirt.io/v1beta1',
|
||||||
|
kind: 'DataVolume',
|
||||||
|
metadata: {
|
||||||
|
name: this.value.metadata.name,
|
||||||
|
namespace: this.value.metadata.namespace,
|
||||||
|
annotations: this.value.metadata.annotations || {},
|
||||||
|
labels: this.value.metadata.labels || {},
|
||||||
|
},
|
||||||
|
spec: {
|
||||||
|
source: { blank: {} },
|
||||||
|
storage,
|
||||||
|
}
|
||||||
|
};
|
||||||
|
},
|
||||||
|
|
||||||
|
async save(buttonDone) {
|
||||||
|
if (this.isCreate && this.isBlank && this.createWithDataVolume) {
|
||||||
|
try {
|
||||||
|
this.update();
|
||||||
|
const dvObj = this.buildDataVolumeObj();
|
||||||
|
const dataVolume = await this.$store.dispatch('harvester/create', dvObj);
|
||||||
|
|
||||||
|
await dataVolume.save();
|
||||||
|
buttonDone(true);
|
||||||
|
this.done();
|
||||||
|
} catch (err) {
|
||||||
|
const error = err?.data || err;
|
||||||
|
|
||||||
|
this['errors'] = exceptionToErrorsArray(error);
|
||||||
|
buttonDone(false);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
await CreateEditView.methods.save.call(this, buttonDone);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
willSave() {
|
willSave() {
|
||||||
this.update();
|
this.update();
|
||||||
},
|
},
|
||||||
@@ -383,9 +467,17 @@ export default {
|
|||||||
this.update();
|
this.update();
|
||||||
},
|
},
|
||||||
generateYaml() {
|
generateYaml() {
|
||||||
const out = saferDump(this.value);
|
this.update();
|
||||||
|
|
||||||
return out;
|
if (this.isCreate && this.isBlank && this.createWithDataVolume) {
|
||||||
|
return saferDump(this.buildDataVolumeObj());
|
||||||
|
}
|
||||||
|
|
||||||
|
const plain = clone(this.value);
|
||||||
|
|
||||||
|
delete plain.saveYaml;
|
||||||
|
|
||||||
|
return saferDump(plain);
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -458,18 +550,6 @@ export default {
|
|||||||
@update:value="update"
|
@update:value="update"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<LabeledSelect
|
|
||||||
v-if="showVolumeMode"
|
|
||||||
v-model:value="value.spec.volumeMode"
|
|
||||||
:label="t('harvester.volume.volumeMode')"
|
|
||||||
:options="volumeModeOptions"
|
|
||||||
required
|
|
||||||
:disabled="!isCreate"
|
|
||||||
:mode="mode"
|
|
||||||
class="mb-20"
|
|
||||||
@update:value="update"
|
|
||||||
/>
|
|
||||||
|
|
||||||
<UnitInput
|
<UnitInput
|
||||||
v-model:value="storage"
|
v-model:value="storage"
|
||||||
:label="t('harvester.volume.size')"
|
:label="t('harvester.volume.size')"
|
||||||
@@ -490,6 +570,44 @@ export default {
|
|||||||
>
|
>
|
||||||
<span>{{ t('harvester.volume.longhorn.disableResize') }}</span>
|
<span>{{ t('harvester.volume.longhorn.disableResize') }}</span>
|
||||||
</Banner>
|
</Banner>
|
||||||
|
|
||||||
|
<div class="row mb-20">
|
||||||
|
<Checkbox
|
||||||
|
v-if="isCreate && isBlank && isCreatePVCWithDataVolumeFeatureEnabled"
|
||||||
|
v-model:value="createWithDataVolume"
|
||||||
|
:label="t('harvester.volume.createWithDataVolume')"
|
||||||
|
tooltip-key="harvester.volume.createWithDataVolumeTooltip"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<a
|
||||||
|
v-if="isCreate && isCreatePVCWithDataVolumeFeatureEnabled"
|
||||||
|
role="button"
|
||||||
|
class="hand"
|
||||||
|
@click="showAdvanced = !showAdvanced"
|
||||||
|
>
|
||||||
|
{{ showAdvanced ? t('harvester.volume.hideAdvanced') : t('harvester.volume.showAdvanced') }}
|
||||||
|
</a>
|
||||||
|
|
||||||
|
<LabeledSelect
|
||||||
|
v-if="showAdvanced"
|
||||||
|
v-model:value="value.spec.accessModes"
|
||||||
|
:label="t('harvester.volume.accessModes')"
|
||||||
|
:options="accessModeOptions"
|
||||||
|
:multiple="true"
|
||||||
|
:mode="mode"
|
||||||
|
class="mb-20 mt-20"
|
||||||
|
@update:value="update"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<LabeledSelect
|
||||||
|
v-if="showAdvanced"
|
||||||
|
v-model:value="value.spec.volumeMode"
|
||||||
|
:label="t('harvester.volume.volumeMode')"
|
||||||
|
:options="volumeModeOptions"
|
||||||
|
:mode="mode"
|
||||||
|
class="mb-20"
|
||||||
|
@update:value="update"
|
||||||
|
/>
|
||||||
</Tab>
|
</Tab>
|
||||||
<Tab
|
<Tab
|
||||||
v-if="!isCreate"
|
v-if="!isCreate"
|
||||||
|
|||||||
@@ -43,18 +43,20 @@ export default {
|
|||||||
created() {
|
created() {
|
||||||
const vpc = this.$route.query.vpc || '';
|
const vpc = this.$route.query.vpc || '';
|
||||||
const enableDHCP = this.value?.spec?.enableDHCP || false;
|
const enableDHCP = this.value?.spec?.enableDHCP || false;
|
||||||
|
const natOutgoing = this.value?.spec?.natOutgoing || false;
|
||||||
|
|
||||||
set(this.value.spec, 'enableDHCP', enableDHCP);
|
set(this.value.spec, 'enableDHCP', enableDHCP);
|
||||||
set(this.value, 'spec', this.value.spec || {
|
set(this.value, 'spec', this.value.spec || {
|
||||||
cidrBlock: '',
|
cidrBlock: '',
|
||||||
protocol: NETWORK_PROTOCOL.IPv4,
|
protocol: NETWORK_PROTOCOL.IPv4,
|
||||||
provider: '',
|
provider: '',
|
||||||
vpc,
|
vpc,
|
||||||
gatewayIP: '',
|
gateway: '',
|
||||||
excludeIps: [],
|
excludeIps: [],
|
||||||
private: false,
|
private: false,
|
||||||
enableDHCP,
|
enableDHCP,
|
||||||
acls: []
|
natOutgoing,
|
||||||
|
acls: []
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -129,6 +131,10 @@ export default {
|
|||||||
label: n.id,
|
label: n.id,
|
||||||
value: n.id,
|
value: n.id,
|
||||||
}));
|
}));
|
||||||
|
},
|
||||||
|
natOutgoingDisabled() {
|
||||||
|
// Disable the NAT Outgoing option when the subnet belongs to the ovn-cluster VPC and its name is join or ovn-default.
|
||||||
|
return this.value?.spec?.vpc === 'ovn-cluster' && ['join', 'ovn-default'].includes(this.value?.metadata?.name);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -304,6 +310,20 @@ export default {
|
|||||||
</Banner>
|
</Banner>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="row mt-20">
|
||||||
|
<div class="col span-6">
|
||||||
|
<RadioGroup
|
||||||
|
v-model:value="value.spec.natOutgoing"
|
||||||
|
name="enableExternalConnectivity"
|
||||||
|
:disabled="natOutgoingDisabled"
|
||||||
|
:options="[true, false]"
|
||||||
|
:label="t('harvester.subnet.externalConnectivity.label')"
|
||||||
|
:labels="[t('generic.enabled'), t('generic.disabled')]"
|
||||||
|
:mode="mode"
|
||||||
|
:tooltip="t('harvester.subnet.externalConnectivity.tooltip')"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<div class="row mt-20">
|
<div class="row mt-20">
|
||||||
<div class="col span-6">
|
<div class="col span-6">
|
||||||
<RadioGroup
|
<RadioGroup
|
||||||
|
|||||||
@@ -0,0 +1,133 @@
|
|||||||
|
<script>
|
||||||
|
import YAML from 'yaml';
|
||||||
|
import LabeledSelect from '@shell/components/form/LabeledSelect';
|
||||||
|
import { CONFIG_MAP } from '@shell/config/types';
|
||||||
|
import { Banner } from '@components/Banner';
|
||||||
|
|
||||||
|
const CPU_MODEL_CONFIG_MAP_ID = 'harvester-system/node-cpu-model-configuration';
|
||||||
|
|
||||||
|
export default {
|
||||||
|
name: 'HarvesterCpuModel',
|
||||||
|
|
||||||
|
emits: ['update:value'],
|
||||||
|
|
||||||
|
components: {
|
||||||
|
LabeledSelect,
|
||||||
|
Banner
|
||||||
|
},
|
||||||
|
|
||||||
|
props: {
|
||||||
|
value: {
|
||||||
|
type: String,
|
||||||
|
default: ''
|
||||||
|
},
|
||||||
|
mode: {
|
||||||
|
type: String,
|
||||||
|
default: 'create',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
async fetch() {
|
||||||
|
const inStore = this.$store.getters['currentProduct'].inStore;
|
||||||
|
|
||||||
|
try {
|
||||||
|
await this.$store.dispatch(`${ inStore }/find`, { type: CONFIG_MAP, id: CPU_MODEL_CONFIG_MAP_ID });
|
||||||
|
this.fetchError = null;
|
||||||
|
} catch (e) {
|
||||||
|
this.fetchError = this.t('harvester.virtualMachine.cpuModel.fetchError', { error: e.message || e });
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
data() {
|
||||||
|
return { fetchError: null };
|
||||||
|
},
|
||||||
|
|
||||||
|
computed: {
|
||||||
|
localValue: {
|
||||||
|
get() {
|
||||||
|
return this.value ?? '';
|
||||||
|
},
|
||||||
|
set(val) {
|
||||||
|
this.$emit('update:value', val ?? '');
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
cpuModelConfigMap() {
|
||||||
|
const inStore = this.$store.getters['currentProduct'].inStore;
|
||||||
|
|
||||||
|
return this.$store.getters[`${ inStore }/byId`](
|
||||||
|
CONFIG_MAP,
|
||||||
|
CPU_MODEL_CONFIG_MAP_ID
|
||||||
|
);
|
||||||
|
},
|
||||||
|
|
||||||
|
cpuModelOptions() {
|
||||||
|
if (!this.cpuModelConfigMap?.data?.cpuModels) {
|
||||||
|
return [{ label: this.t('generic.default'), value: '' }];
|
||||||
|
}
|
||||||
|
|
||||||
|
let cpuModelsData;
|
||||||
|
|
||||||
|
try {
|
||||||
|
cpuModelsData = YAML.parse(this.cpuModelConfigMap.data?.cpuModels || '');
|
||||||
|
} catch (e) {
|
||||||
|
return [{ label: this.t('generic.default'), value: '' }];
|
||||||
|
}
|
||||||
|
|
||||||
|
const options = [];
|
||||||
|
|
||||||
|
options.push({
|
||||||
|
label: this.t('generic.default'),
|
||||||
|
value: ''
|
||||||
|
});
|
||||||
|
|
||||||
|
// Add global models (host-model, host-passthrough)
|
||||||
|
const globalModels = cpuModelsData.globalModels || [];
|
||||||
|
|
||||||
|
globalModels.forEach((modelName) => {
|
||||||
|
options.push({
|
||||||
|
label: modelName,
|
||||||
|
value: modelName
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
// Add regular models with node count
|
||||||
|
const modelEntries = Object.entries(cpuModelsData.models || {});
|
||||||
|
|
||||||
|
// Sort models alphabetically for consistent display
|
||||||
|
modelEntries.sort((a, b) => a[0].localeCompare(b[0]));
|
||||||
|
|
||||||
|
modelEntries.forEach(([modelName, modelInfo]) => {
|
||||||
|
const readyCount = modelInfo.readyCount || 0;
|
||||||
|
const label = this.t('harvester.virtualMachine.cpuModel.optionLabel', { modelName, count: readyCount });
|
||||||
|
|
||||||
|
options.push({
|
||||||
|
label,
|
||||||
|
value: modelName
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
return options;
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div>
|
||||||
|
<Banner
|
||||||
|
v-if="fetchError"
|
||||||
|
color="error"
|
||||||
|
class="mb-20"
|
||||||
|
>
|
||||||
|
{{ fetchError }}
|
||||||
|
</Banner>
|
||||||
|
<LabeledSelect
|
||||||
|
v-model:value="localValue"
|
||||||
|
:label="t('harvester.virtualMachine.cpuModel.label')"
|
||||||
|
:options="cpuModelOptions"
|
||||||
|
:mode="mode"
|
||||||
|
:disabled="!!fetchError"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
@@ -0,0 +1,310 @@
|
|||||||
|
<script>
|
||||||
|
import { mapGetters } from 'vuex';
|
||||||
|
import { Banner } from '@components/Banner';
|
||||||
|
import LabeledSelect from '@shell/components/form/LabeledSelect';
|
||||||
|
import { LabeledInput } from '@components/Form/LabeledInput';
|
||||||
|
import { CONFIG_MAP, SECRET, SERVICE_ACCOUNT } from '@shell/config/types';
|
||||||
|
import { _VIEW } from '@shell/config/query-params';
|
||||||
|
import CopyToClipboard from '@shell/components/CopyToClipboard';
|
||||||
|
import MessageLink from '@shell/components/MessageLink';
|
||||||
|
import { FILESYSTEM_SOURCE_TYPE } from '@pkg/harvester/config/types';
|
||||||
|
|
||||||
|
const MAX_FILESYSTEMS = 3;
|
||||||
|
|
||||||
|
const { CONFIGMAP: FS_TYPE_CONFIGMAP, SECRET: FS_TYPE_SECRET, SERVICEACCOUNT: FS_TYPE_SERVICEACCOUNT } = FILESYSTEM_SOURCE_TYPE;
|
||||||
|
|
||||||
|
const DEFAULT_VOLUME_NAMES = {
|
||||||
|
[FS_TYPE_CONFIGMAP]: 'appconfigfs',
|
||||||
|
[FS_TYPE_SECRET]: 'appsecretfs',
|
||||||
|
[FS_TYPE_SERVICEACCOUNT]: 'appserviceaccountfs',
|
||||||
|
};
|
||||||
|
|
||||||
|
const FS_TYPE_OPTIONS = [
|
||||||
|
{ label: 'ConfigMap', value: FS_TYPE_CONFIGMAP },
|
||||||
|
{ label: 'Secret', value: FS_TYPE_SECRET },
|
||||||
|
{ label: 'ServiceAccount', value: FS_TYPE_SERVICEACCOUNT },
|
||||||
|
];
|
||||||
|
|
||||||
|
function emptyRow() {
|
||||||
|
return {
|
||||||
|
fsType: FS_TYPE_CONFIGMAP,
|
||||||
|
volumeName: DEFAULT_VOLUME_NAMES[FS_TYPE_CONFIGMAP],
|
||||||
|
resourceName: '',
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export default {
|
||||||
|
name: 'VirtualMachineFilesystem',
|
||||||
|
|
||||||
|
emits: ['update:value'],
|
||||||
|
|
||||||
|
components: {
|
||||||
|
Banner,
|
||||||
|
LabeledSelect,
|
||||||
|
LabeledInput,
|
||||||
|
CopyToClipboard,
|
||||||
|
MessageLink,
|
||||||
|
},
|
||||||
|
|
||||||
|
props: {
|
||||||
|
mode: {
|
||||||
|
type: String,
|
||||||
|
default: 'create',
|
||||||
|
},
|
||||||
|
namespace: {
|
||||||
|
type: String,
|
||||||
|
default: '',
|
||||||
|
},
|
||||||
|
value: {
|
||||||
|
type: Array,
|
||||||
|
default: () => [],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
data() {
|
||||||
|
return { rows: this.value.length > 0 ? this.value.map((r) => ({ ...r })) : [emptyRow()] };
|
||||||
|
},
|
||||||
|
|
||||||
|
watch: {
|
||||||
|
value(newVal) {
|
||||||
|
if (newVal) {
|
||||||
|
const incoming = JSON.stringify(newVal);
|
||||||
|
const current = JSON.stringify(this.rows);
|
||||||
|
|
||||||
|
if (incoming !== current) {
|
||||||
|
this.rows = newVal.map((r) => ({ ...r }));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
rows: {
|
||||||
|
deep: true,
|
||||||
|
handler(val) {
|
||||||
|
this.$emit('update:value', val.map((r) => ({ ...r })));
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
computed: {
|
||||||
|
...mapGetters({ t: 'i18n/t' }),
|
||||||
|
|
||||||
|
inStore() {
|
||||||
|
return this.$store.getters['currentProduct'].inStore;
|
||||||
|
},
|
||||||
|
|
||||||
|
configMaps() {
|
||||||
|
return this.$store.getters[`${ this.inStore }/all`](CONFIG_MAP)
|
||||||
|
.filter((cm) => !this.namespace || cm.metadata.namespace === this.namespace)
|
||||||
|
.map((cm) => ({ label: cm.metadata.name, value: cm.metadata.name }));
|
||||||
|
},
|
||||||
|
|
||||||
|
secrets() {
|
||||||
|
return this.$store.getters[`${ this.inStore }/all`](SECRET)
|
||||||
|
.filter((s) => !this.namespace || s.metadata.namespace === this.namespace)
|
||||||
|
.map((s) => ({ label: s.metadata.name, value: s.metadata.name }));
|
||||||
|
},
|
||||||
|
|
||||||
|
serviceAccounts() {
|
||||||
|
return this.$store.getters[`${ this.inStore }/all`](SERVICE_ACCOUNT)
|
||||||
|
.filter((sa) => !this.namespace || sa.metadata.namespace === this.namespace)
|
||||||
|
.map((sa) => ({ label: sa.metadata.name, value: sa.metadata.name }));
|
||||||
|
},
|
||||||
|
|
||||||
|
canAddRow() {
|
||||||
|
return this.rows.length < MAX_FILESYSTEMS;
|
||||||
|
},
|
||||||
|
|
||||||
|
isView() {
|
||||||
|
return this.mode === _VIEW;
|
||||||
|
},
|
||||||
|
|
||||||
|
completedRows() {
|
||||||
|
return this.rows.filter((r) => r.fsType && r.volumeName && r.resourceName);
|
||||||
|
},
|
||||||
|
|
||||||
|
allMountCommands() {
|
||||||
|
return this.completedRows.map((r) => this.mountCommands(r)).join('\n');
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
methods: {
|
||||||
|
fsTypeOptions(currentIndex) {
|
||||||
|
const usedTypes = this.rows
|
||||||
|
.filter((_, i) => i !== currentIndex)
|
||||||
|
.map((r) => r.fsType);
|
||||||
|
|
||||||
|
return FS_TYPE_OPTIONS.filter((opt) => !usedTypes.includes(opt.value));
|
||||||
|
},
|
||||||
|
|
||||||
|
resourceOptions(fsType) {
|
||||||
|
if (fsType === FS_TYPE_CONFIGMAP) return this.configMaps;
|
||||||
|
if (fsType === FS_TYPE_SECRET) return this.secrets;
|
||||||
|
if (fsType === FS_TYPE_SERVICEACCOUNT) return this.serviceAccounts;
|
||||||
|
|
||||||
|
return [];
|
||||||
|
},
|
||||||
|
|
||||||
|
onFsTypeChange(row, newType) {
|
||||||
|
row.fsType = newType;
|
||||||
|
row.volumeName = DEFAULT_VOLUME_NAMES[newType] || '';
|
||||||
|
row.resourceName = '';
|
||||||
|
},
|
||||||
|
|
||||||
|
addRow() {
|
||||||
|
if (this.canAddRow) {
|
||||||
|
const usedTypes = this.rows.map((r) => r.fsType);
|
||||||
|
const nextType = FS_TYPE_OPTIONS.find((opt) => !usedTypes.includes(opt.value))?.value || FS_TYPE_CONFIGMAP;
|
||||||
|
|
||||||
|
this.rows.push({
|
||||||
|
fsType: nextType,
|
||||||
|
volumeName: DEFAULT_VOLUME_NAMES[nextType] || '',
|
||||||
|
resourceName: '',
|
||||||
|
});
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
removeRow(index) {
|
||||||
|
this.rows.splice(index, 1);
|
||||||
|
},
|
||||||
|
|
||||||
|
mountCommands(row) {
|
||||||
|
const vol = row.volumeName || '<volume-name>';
|
||||||
|
|
||||||
|
return `- mkdir -p /mnt/${ vol }\n- mount -t virtiofs ${ vol } /mnt/${ vol }`;
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div class="vm-filesystem">
|
||||||
|
<p class="mb-20">
|
||||||
|
{{ t('harvester.virtualMachine.filesystem.description') }}
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<div
|
||||||
|
v-for="(row, index) in rows"
|
||||||
|
:key="index"
|
||||||
|
class="filesystem-row mb-15"
|
||||||
|
>
|
||||||
|
<div class="row">
|
||||||
|
<div class="col span-3">
|
||||||
|
<LabeledSelect
|
||||||
|
:value="row.fsType"
|
||||||
|
:label="t('harvester.virtualMachine.filesystem.type')"
|
||||||
|
:options="fsTypeOptions(index)"
|
||||||
|
:mode="mode"
|
||||||
|
required
|
||||||
|
@update:value="onFsTypeChange(row, $event)"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="col span-3">
|
||||||
|
<LabeledInput
|
||||||
|
v-model:value="row.volumeName"
|
||||||
|
:label="t('harvester.virtualMachine.filesystem.volume')"
|
||||||
|
:mode="mode"
|
||||||
|
required
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="col span-5">
|
||||||
|
<LabeledSelect
|
||||||
|
v-model:value="row.resourceName"
|
||||||
|
:label="t('harvester.virtualMachine.filesystem.resource')"
|
||||||
|
:options="resourceOptions(row.fsType)"
|
||||||
|
:mode="mode"
|
||||||
|
required
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div
|
||||||
|
v-if="!isView"
|
||||||
|
class="col span-1 remove-col"
|
||||||
|
>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
class="btn role-link remove-btn"
|
||||||
|
@click="removeRow(index)"
|
||||||
|
>
|
||||||
|
{{ t('generic.remove') }}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<Banner
|
||||||
|
v-if="completedRows.length > 0"
|
||||||
|
color="warning"
|
||||||
|
class="mt-10"
|
||||||
|
>
|
||||||
|
<div>
|
||||||
|
<MessageLink
|
||||||
|
:to="{ hash: '#advanced' }"
|
||||||
|
prefix-label="harvester.virtualMachine.filesystem.mountBannerHint"
|
||||||
|
middle-label="harvester.virtualMachine.filesystem.mountBannerHintLink"
|
||||||
|
suffix-label="harvester.virtualMachine.filesystem.mountBannerHintSuffix"
|
||||||
|
/>
|
||||||
|
<div class="pre-wrapper mt-10">
|
||||||
|
<pre class="mt-5 mb-0">{{ allMountCommands }}</pre>
|
||||||
|
<CopyToClipboard
|
||||||
|
:text="allMountCommands"
|
||||||
|
:show-label="false"
|
||||||
|
class="icon-btn"
|
||||||
|
action-color="bg-transparent"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</Banner>
|
||||||
|
|
||||||
|
<button
|
||||||
|
v-if="!isView && canAddRow"
|
||||||
|
type="button"
|
||||||
|
class="btn role-tertiary add"
|
||||||
|
@click="addRow"
|
||||||
|
>
|
||||||
|
{{ t('harvester.virtualMachine.filesystem.add') }}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<style lang="scss" scoped>
|
||||||
|
.vm-filesystem {
|
||||||
|
padding: 10px 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.filesystem-row {
|
||||||
|
border-bottom: 1px solid var(--border);
|
||||||
|
padding-bottom: 15px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.remove-col {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.remove-btn {
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.pre-wrapper {
|
||||||
|
position: relative;
|
||||||
|
|
||||||
|
pre {
|
||||||
|
padding-right: 36px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.icon-btn {
|
||||||
|
position: absolute;
|
||||||
|
top: 0px;
|
||||||
|
right: 5px;
|
||||||
|
padding: 2px 4px;
|
||||||
|
line-height: 1;
|
||||||
|
|
||||||
|
&:active {
|
||||||
|
background-color: var(--success) !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
+60
-22
@@ -31,6 +31,7 @@ export default {
|
|||||||
const _hash = {
|
const _hash = {
|
||||||
pciclaims: this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.PCI_CLAIM }),
|
pciclaims: this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.PCI_CLAIM }),
|
||||||
sriovs: this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.SR_IOV }),
|
sriovs: this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.SR_IOV }),
|
||||||
|
srigpuovs: this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.SR_IOVGPU_DEVICE }),
|
||||||
};
|
};
|
||||||
|
|
||||||
await allHash(_hash);
|
await allHash(_hash);
|
||||||
@@ -106,19 +107,32 @@ export default {
|
|||||||
},
|
},
|
||||||
|
|
||||||
computed: {
|
computed: {
|
||||||
parentSriovOptions() {
|
allSriovs() {
|
||||||
const inStore = this.$store.getters['currentProduct'].inStore;
|
const inStore = this.$store.getters['currentProduct'].inStore;
|
||||||
const allSriovs = this.$store.getters[`${ inStore }/all`](HCI.SR_IOV) || [];
|
|
||||||
|
|
||||||
return allSriovs.map((sriov) => {
|
return this.$store.getters[`${ inStore }/all`](HCI.SR_IOV) || [];
|
||||||
return sriov.id;
|
},
|
||||||
});
|
allSriovGPUs() {
|
||||||
|
const inStore = this.$store.getters['currentProduct'].inStore;
|
||||||
|
|
||||||
|
return this.$store.getters[`${ inStore }/all`](HCI.SR_IOVGPU_DEVICE) || [];
|
||||||
|
},
|
||||||
|
parentSriovOptions() {
|
||||||
|
return this.allSriovs.map((sriov) => sriov.id);
|
||||||
|
},
|
||||||
|
parentSriovGPUOptions() {
|
||||||
|
return this.allSriovGPUs.map((sriovgpu) => sriovgpu.id);
|
||||||
},
|
},
|
||||||
parentSriovLabel() {
|
parentSriovLabel() {
|
||||||
return HCI_ANNOTATIONS.PARENT_SRIOV;
|
return HCI_ANNOTATIONS.PARENT_SRIOV;
|
||||||
}
|
},
|
||||||
|
parentSriovGPULabel() {
|
||||||
|
return HCI_ANNOTATIONS.PARENT_SRIOV_GPU;
|
||||||
|
},
|
||||||
|
vGPUAsPCIDeviceEnabled() {
|
||||||
|
return this.$store.getters['harvester-common/getFeatureEnabled']('vGPUAsPCIDevice');
|
||||||
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
methods: {
|
methods: {
|
||||||
enableGroup(rows = []) {
|
enableGroup(rows = []) {
|
||||||
const row = rows[0];
|
const row = rows[0];
|
||||||
@@ -138,6 +152,10 @@ export default {
|
|||||||
return !rows.find((device) => !device.passthroughClaim);
|
return !rows.find((device) => !device.passthroughClaim);
|
||||||
},
|
},
|
||||||
|
|
||||||
|
canManageGroup(rows = []) {
|
||||||
|
return rows.length > 0 && rows.every((row) => row.canUpdate === true);
|
||||||
|
},
|
||||||
|
|
||||||
changeRows(filterRows, parentSriov) {
|
changeRows(filterRows, parentSriov) {
|
||||||
this['filterRows'] = filterRows;
|
this['filterRows'] = filterRows;
|
||||||
this['parentSriov'] = parentSriov;
|
this['parentSriov'] = parentSriov;
|
||||||
@@ -171,22 +189,27 @@ export default {
|
|||||||
v-trim-whitespace
|
v-trim-whitespace
|
||||||
class="group-tab"
|
class="group-tab"
|
||||||
>
|
>
|
||||||
<button
|
<div
|
||||||
v-if="groupIsAllEnabled(group.rows)"
|
v-if="canManageGroup(group.rows)"
|
||||||
type="button"
|
class="group-actions"
|
||||||
class="btn btn-sm role-secondary mr-5"
|
|
||||||
@click="e=>{disableGroup(group.rows); e.target.blur()}"
|
|
||||||
>
|
>
|
||||||
{{ t('harvester.pci.disableGroup') }}
|
<button
|
||||||
</button>
|
v-if="groupIsAllEnabled(group.rows)"
|
||||||
<button
|
type="button"
|
||||||
v-else
|
class="btn btn-sm role-secondary mr-5"
|
||||||
type="button"
|
@click="e=>{disableGroup(group.rows); e.target.blur()}"
|
||||||
class="btn btn-sm role-secondary mr-5"
|
>
|
||||||
@click="e=>{enableGroup(group.rows); e.target.blur()}"
|
{{ t('harvester.pci.disableGroup') }}
|
||||||
>
|
</button>
|
||||||
{{ t('harvester.pci.enableGroup') }}
|
<button
|
||||||
</button>
|
v-else
|
||||||
|
type="button"
|
||||||
|
class="btn btn-sm role-secondary mr-5"
|
||||||
|
@click="e=>{enableGroup(group.rows); e.target.blur()}"
|
||||||
|
>
|
||||||
|
{{ t('harvester.pci.enableGroup') }}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
<span v-clean-html="group.key" />
|
<span v-clean-html="group.key" />
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
@@ -206,6 +229,21 @@ export default {
|
|||||||
:rows="rows"
|
:rows="rows"
|
||||||
@change-rows="changeRows"
|
@change-rows="changeRows"
|
||||||
/>
|
/>
|
||||||
|
<FilterBySriov
|
||||||
|
v-if="vGPUAsPCIDeviceEnabled"
|
||||||
|
ref="filterByParentSRIOVGPU"
|
||||||
|
:parent-sriov-options="parentSriovGPUOptions"
|
||||||
|
:parent-sriov-label="parentSriovGPULabel"
|
||||||
|
:label="t('harvester.sriov.parentSriovGPU')"
|
||||||
|
:rows="rows"
|
||||||
|
@change-rows="changeRows"
|
||||||
|
/>
|
||||||
</template>
|
</template>
|
||||||
</ResourceTable>
|
</ResourceTable>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
<style lang="scss" scoped>
|
||||||
|
.group-actions {
|
||||||
|
display: inline;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import { set } from '@shell/utils/object';
|
|||||||
import { HCI } from '../../../types';
|
import { HCI } from '../../../types';
|
||||||
import DeviceList from './DeviceList';
|
import DeviceList from './DeviceList';
|
||||||
import CompatibilityMatrix from '../CompatibilityMatrix';
|
import CompatibilityMatrix from '../CompatibilityMatrix';
|
||||||
|
import MessageLink from '@shell/components/MessageLink';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'VirtualMachinePCIDevices',
|
name: 'VirtualMachinePCIDevices',
|
||||||
@@ -15,7 +16,8 @@ export default {
|
|||||||
LabeledSelect,
|
LabeledSelect,
|
||||||
DeviceList,
|
DeviceList,
|
||||||
CompatibilityMatrix,
|
CompatibilityMatrix,
|
||||||
Banner
|
Banner,
|
||||||
|
MessageLink
|
||||||
},
|
},
|
||||||
props: {
|
props: {
|
||||||
mode: {
|
mode: {
|
||||||
@@ -50,31 +52,21 @@ export default {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const selectedDevices = [];
|
const selectedDevices = [];
|
||||||
const oldFormatDevices = [];
|
|
||||||
|
|
||||||
const vmDevices = this.value?.domain?.devices?.hostDevices || [];
|
const vmDevices = this.value?.domain?.devices?.hostDevices || [];
|
||||||
const otherDevices = this.otherDevices(vmDevices).map(({ name }) => name);
|
|
||||||
const vmDeviceNames = vmDevices.map(({ name }) => name);
|
const vmDeviceNames = vmDevices.map(({ name }) => name);
|
||||||
|
|
||||||
this.pciDevices.forEach((row) => {
|
this.pciDevices.forEach((row) => {
|
||||||
row.allowDisable = !vmDeviceNames.includes(row.metadata.name);
|
row.allowDisable = !vmDeviceNames.includes(row.metadata.name);
|
||||||
});
|
});
|
||||||
|
|
||||||
vmDevices.forEach(({ name, deviceName }) => {
|
vmDevices.forEach(({ name }) => {
|
||||||
const checkName = (deviceName || '').split('/')?.[1];
|
if (this.enabledDevices.find((device) => device?.metadata?.name === name)) {
|
||||||
|
|
||||||
if (checkName && name.includes(checkName) && !otherDevices.includes(name)) {
|
|
||||||
oldFormatDevices.push(name);
|
|
||||||
} else if (this.enabledDevices.find((device) => device?.metadata?.name === name)) {
|
|
||||||
selectedDevices.push(name);
|
selectedDevices.push(name);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
if (oldFormatDevices.length > 0) {
|
this.selectedDevices = selectedDevices;
|
||||||
this.oldFormatDevices = oldFormatDevices;
|
|
||||||
} else {
|
|
||||||
this.selectedDevices = selectedDevices;
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
|
|
||||||
data() {
|
data() {
|
||||||
@@ -85,7 +77,6 @@ export default {
|
|||||||
selectedDevices: [],
|
selectedDevices: [],
|
||||||
pciDeviceSchema: this.$store.getters['harvester/schemaFor'](HCI.PCI_DEVICE),
|
pciDeviceSchema: this.$store.getters['harvester/schemaFor'](HCI.PCI_DEVICE),
|
||||||
showMatrix: false,
|
showMatrix: false,
|
||||||
oldFormatDevices: [],
|
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -138,6 +129,13 @@ export default {
|
|||||||
return inUse;
|
return inUse;
|
||||||
},
|
},
|
||||||
|
|
||||||
|
toVGpuDevicesPage() {
|
||||||
|
return {
|
||||||
|
name: 'harvester-c-cluster-resource',
|
||||||
|
params: { cluster: this.$store.getters['clusterId'], resource: HCI.VGPU_DEVICE },
|
||||||
|
};
|
||||||
|
},
|
||||||
|
|
||||||
devicesByNode() {
|
devicesByNode() {
|
||||||
return this.enabledDevices?.reduce((acc, device) => {
|
return this.enabledDevices?.reduce((acc, device) => {
|
||||||
const nodeName = device.status?.nodeName;
|
const nodeName = device.status?.nodeName;
|
||||||
@@ -190,11 +188,6 @@ export default {
|
|||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
oldFormatDevicesHTML() {
|
|
||||||
return this.oldFormatDevices.map((device) => {
|
|
||||||
return `<li>${ device }</li>`;
|
|
||||||
}).join('');
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
|
|
||||||
methods: {
|
methods: {
|
||||||
@@ -218,96 +211,89 @@ export default {
|
|||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div>
|
<div>
|
||||||
<div
|
<div class="row">
|
||||||
v-if="oldFormatDevices.length > 0"
|
|
||||||
class="row"
|
|
||||||
>
|
|
||||||
<div class="col span-12">
|
<div class="col span-12">
|
||||||
<Banner color="warning">
|
<Banner color="info">
|
||||||
<p v-clean-html="t('harvester.pci.oldFormatDevices.help', {oldFormatDevicesHTML}, true)" />
|
<MessageLink
|
||||||
|
:to="toVGpuDevicesPage"
|
||||||
|
prefix-label="harvester.pci.howToUseDeviceInVMCreation.prefix"
|
||||||
|
middle-label="harvester.pci.howToUseDeviceInVMCreation.middle"
|
||||||
|
suffix-label="harvester.pci.howToUseDeviceInVMCreation.suffix"
|
||||||
|
/>
|
||||||
|
</Banner>
|
||||||
|
<Banner
|
||||||
|
v-if="selectedDevices.length > 0"
|
||||||
|
color="info"
|
||||||
|
>
|
||||||
|
<t k="harvester.pci.deviceInTheSameHost" />
|
||||||
</Banner>
|
</Banner>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div v-else>
|
<template v-if="enabledDevices.length">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col span-12">
|
<div class="col span-6">
|
||||||
<Banner color="info">
|
<LabeledSelect
|
||||||
<t k="harvester.pci.howToUseDevice" />
|
v-model:value="selectedDevices"
|
||||||
</Banner>
|
label="Available PCI Devices"
|
||||||
<Banner
|
searchable
|
||||||
v-if="selectedDevices.length > 0"
|
multiple
|
||||||
color="info"
|
taggable
|
||||||
|
:options="deviceOpts"
|
||||||
|
:mode="mode"
|
||||||
>
|
>
|
||||||
<t k="harvester.pci.deviceInTheSameHost" />
|
<template #option="option">
|
||||||
</Banner>
|
<span>{{ option.value }} <span class="text-label">({{ option.displayLabel }})</span></span>
|
||||||
|
</template>
|
||||||
|
</LabeledSelect>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<template v-if="enabledDevices.length">
|
<div
|
||||||
<div class="row">
|
v-if="compatibleNodes.length && selectedDevices.length"
|
||||||
<div class="col span-6">
|
class="row"
|
||||||
<LabeledSelect
|
>
|
||||||
v-model:value="selectedDevices"
|
<div class="col span-12 text-muted">
|
||||||
label="Available PCI Devices"
|
Compatible hosts:
|
||||||
searchable
|
<!-- eslint-disable-next-line vue/no-parsing-error -->
|
||||||
multiple
|
<span
|
||||||
taggable
|
v-for="(node, idx) in compatibleNodes"
|
||||||
:options="deviceOpts"
|
:key="idx"
|
||||||
:mode="mode"
|
>{{ node }}{{ idx < compatibleNodes.length-1 ? ', ' : '' }}</span>
|
||||||
>
|
|
||||||
<template #option="option">
|
|
||||||
<span>{{ option.value }} <span class="text-label">({{ option.displayLabel }})</span></span>
|
|
||||||
</template>
|
|
||||||
</LabeledSelect>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
<div
|
</div>
|
||||||
v-if="compatibleNodes.length && selectedDevices.length"
|
<div
|
||||||
class="row"
|
v-else-if="selectedDevices.length"
|
||||||
>
|
class="text-error"
|
||||||
<div class="col span-12 text-muted">
|
>
|
||||||
Compatible hosts:
|
{{ t('harvester.pci.impossibleSelection') }}
|
||||||
<!-- eslint-disable-next-line vue/no-parsing-error -->
|
</div>
|
||||||
<span
|
<button
|
||||||
v-for="(node, idx) in compatibleNodes"
|
type="button"
|
||||||
:key="idx"
|
class="btn btn-sm role-link pl-0"
|
||||||
>{{ node }}{{ idx < compatibleNodes.length-1 ? ', ' : '' }}</span>
|
@click="e=>{showMatrix = !showMatrix; e.target.blur()}"
|
||||||
</div>
|
>
|
||||||
</div>
|
{{ showMatrix ? t('harvester.pci.hideCompatibility') : t('harvester.pci.showCompatibility') }}
|
||||||
<div
|
</button>
|
||||||
v-else-if="selectedDevices.length"
|
<div
|
||||||
class="text-error"
|
v-if="showMatrix"
|
||||||
>
|
class="row mt-20"
|
||||||
{{ t('harvester.pci.impossibleSelection') }}
|
>
|
||||||
</div>
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
class="btn btn-sm role-link pl-0"
|
|
||||||
@click="e=>{showMatrix = !showMatrix; e.target.blur()}"
|
|
||||||
>
|
|
||||||
{{ showMatrix ? t('harvester.pci.hideCompatibility') : t('harvester.pci.showCompatibility') }}
|
|
||||||
</button>
|
|
||||||
<div
|
|
||||||
v-if="showMatrix"
|
|
||||||
class="row mt-20"
|
|
||||||
>
|
|
||||||
<div class="col span-12">
|
|
||||||
<CompatibilityMatrix
|
|
||||||
:enabled-devices="enabledDevices"
|
|
||||||
:devices-by-node="devicesByNode"
|
|
||||||
:devices-in-use="devicesInUse"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
<div class="row mt-20">
|
|
||||||
<div class="col span-12">
|
<div class="col span-12">
|
||||||
<DeviceList
|
<CompatibilityMatrix
|
||||||
:schema="pciDeviceSchema"
|
:enabled-devices="enabledDevices"
|
||||||
:devices="pciDevices"
|
:devices-by-node="devicesByNode"
|
||||||
@submit.prevent
|
:devices-in-use="devicesInUse"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</template>
|
||||||
|
<div class="row mt-20">
|
||||||
|
<div class="col span-12">
|
||||||
|
<DeviceList
|
||||||
|
:schema="pciDeviceSchema"
|
||||||
|
:devices="pciDevices"
|
||||||
|
@submit.prevent
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ import { _VIEW } from '@shell/config/query-params';
|
|||||||
|
|
||||||
import { NAMESPACE } from '@shell/config/types';
|
import { NAMESPACE } from '@shell/config/types';
|
||||||
import { HCI } from '../../types';
|
import { HCI } from '../../types';
|
||||||
|
import { getLoginAwareErrors } from '../../utils/error';
|
||||||
|
|
||||||
const _NEW = '_NEW';
|
const _NEW = '_NEW';
|
||||||
|
|
||||||
@@ -214,7 +215,9 @@ export default {
|
|||||||
buttonCb(true);
|
buttonCb(true);
|
||||||
this.cancel();
|
this.cancel();
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
this.errors = [err.message];
|
const message = this.t('harvester.virtualMachine.genericLoginError');
|
||||||
|
|
||||||
|
this.errors = getLoginAwareErrors(err, message);
|
||||||
buttonCb(false);
|
buttonCb(false);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
+37
-15
@@ -64,6 +64,12 @@ export default {
|
|||||||
value: 'status.productID',
|
value: 'status.productID',
|
||||||
sort: ['status.productID', 'status.vendorID']
|
sort: ['status.productID', 'status.vendorID']
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
name: 'classType',
|
||||||
|
labelKey: 'harvester.usb.classType',
|
||||||
|
value: 'status.classType',
|
||||||
|
sort: ['status.classType']
|
||||||
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
if (!isSingleProduct) {
|
if (!isSingleProduct) {
|
||||||
@@ -107,6 +113,11 @@ export default {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
|
canManageGroup(rows = []) {
|
||||||
|
return rows.every((row) => row.canUpdate === true);
|
||||||
|
},
|
||||||
|
|
||||||
groupIsAllEnabled(rows = []) {
|
groupIsAllEnabled(rows = []) {
|
||||||
return !rows.find((device) => !device.passthroughClaim);
|
return !rows.find((device) => !device.passthroughClaim);
|
||||||
},
|
},
|
||||||
@@ -147,22 +158,27 @@ export default {
|
|||||||
v-trim-whitespace
|
v-trim-whitespace
|
||||||
class="group-tab"
|
class="group-tab"
|
||||||
>
|
>
|
||||||
<button
|
<div
|
||||||
v-if="groupIsAllEnabled(group.rows)"
|
v-if="canManageGroup(group.rows)"
|
||||||
type="button"
|
class="group-actions"
|
||||||
class="btn btn-sm role-secondary mr-5"
|
|
||||||
@click="e=>{disableGroup(group.rows); e.target.blur()}"
|
|
||||||
>
|
>
|
||||||
{{ t('harvester.usb.disableGroup') }}
|
<button
|
||||||
</button>
|
v-if="groupIsAllEnabled(group.rows)"
|
||||||
<button
|
type="button"
|
||||||
v-else
|
class="btn btn-sm role-secondary mr-5"
|
||||||
type="button"
|
@click="e=>{disableGroup(group.rows); e.target.blur()}"
|
||||||
class="btn btn-sm role-secondary mr-5"
|
>
|
||||||
@click="e=>{enableGroup(group.rows); e.target.blur()}"
|
{{ t('harvester.usb.disableGroup') }}
|
||||||
>
|
</button>
|
||||||
{{ t('harvester.usb.enableGroup') }}
|
<button
|
||||||
</button>
|
v-else
|
||||||
|
type="button"
|
||||||
|
class="btn btn-sm role-secondary mr-5"
|
||||||
|
@click="e=>{enableGroup(group.rows); e.target.blur()}"
|
||||||
|
>
|
||||||
|
{{ t('harvester.usb.enableGroup') }}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
<span v-clean-html="group.key" />
|
<span v-clean-html="group.key" />
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
@@ -175,3 +191,9 @@ export default {
|
|||||||
</template>
|
</template>
|
||||||
</ResourceTable>
|
</ResourceTable>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
<style lang="scss" scoped>
|
||||||
|
.group-actions {
|
||||||
|
display: inline;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|||||||
@@ -13,11 +13,12 @@ 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 { SOURCE_TYPE } from '../../../config/harvester-map';
|
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';
|
||||||
import { OFF } from '../../../models/kubevirt.io.virtualmachine';
|
import { OFF } from '../../../models/kubevirt.io.virtualmachine';
|
||||||
|
import { EMPTY_IMAGE } from '../../../utils/vm';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
emits: ['update:value'],
|
emits: ['update:value'],
|
||||||
@@ -117,6 +118,10 @@ export default {
|
|||||||
return this.mode === _CREATE;
|
return this.mode === _CREATE;
|
||||||
},
|
},
|
||||||
|
|
||||||
|
isHotplugCdRomFeatureEnabled() {
|
||||||
|
return this.$store.getters['harvester-common/getFeatureEnabled']('hotplugCdRom');
|
||||||
|
},
|
||||||
|
|
||||||
defaultStorageClass() {
|
defaultStorageClass() {
|
||||||
const defaultStorage = this.$store.getters['harvester/all'](STORAGE_CLASS).find((sc) => sc.isDefault);
|
const defaultStorage = this.$store.getters['harvester/all'](STORAGE_CLASS).find((sc) => sc.isDefault);
|
||||||
|
|
||||||
@@ -146,7 +151,7 @@ export default {
|
|||||||
value: {
|
value: {
|
||||||
handler(neu) {
|
handler(neu) {
|
||||||
const rows = clone(neu).map((V) => {
|
const rows = clone(neu).map((V) => {
|
||||||
if (!this.isCreate && V.source !== SOURCE_TYPE.CONTAINER && !V.newCreateId) {
|
if (!this.isCreate && V.source !== SOURCE_TYPE.CONTAINER && !V.newCreateId && V.image !== EMPTY_IMAGE) {
|
||||||
V.to = {
|
V.to = {
|
||||||
name: `${ HARVESTER_PRODUCT }-c-cluster-resource-namespace-id`,
|
name: `${ HARVESTER_PRODUCT }-c-cluster-resource-namespace-id`,
|
||||||
params: {
|
params: {
|
||||||
@@ -217,8 +222,48 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
unplugVolume(volume) {
|
canDoVolumeHotplugAction(volume) {
|
||||||
this.vm.unplugVolume(volume.name);
|
if (!this.isHotplugCdRomFeatureEnabled && volume.type === 'cd-rom') {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (volume.hotpluggable) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return volume.type === 'cd-rom' && volume.bus === 'sata' && volume.image === EMPTY_IMAGE;
|
||||||
|
},
|
||||||
|
|
||||||
|
getVolumeHotplugAction(volume) {
|
||||||
|
if (volume.type === 'cd-rom' && volume.bus === 'sata') {
|
||||||
|
if (volume.image === EMPTY_IMAGE) {
|
||||||
|
return VOLUME_HOTPLUG_ACTION.INSERT_CDROM_IMAGE;
|
||||||
|
}
|
||||||
|
|
||||||
|
return VOLUME_HOTPLUG_ACTION.EJECT_CDROM_IMAGE;
|
||||||
|
}
|
||||||
|
|
||||||
|
return VOLUME_HOTPLUG_ACTION.DETACH_DISK;
|
||||||
|
},
|
||||||
|
|
||||||
|
getVolumeHotplugActionLabel(volume) {
|
||||||
|
const labels = {
|
||||||
|
[VOLUME_HOTPLUG_ACTION.DETACH_DISK]: 'harvester.virtualMachine.hotUnplug.detachVolume.actionLabel',
|
||||||
|
[VOLUME_HOTPLUG_ACTION.INSERT_CDROM_IMAGE]: 'harvester.modal.insertCdRomVolume.actionLabel',
|
||||||
|
[VOLUME_HOTPLUG_ACTION.EJECT_CDROM_IMAGE]: 'harvester.virtualMachine.hotUnplug.ejectCdRomVolume.actionLabel',
|
||||||
|
};
|
||||||
|
|
||||||
|
return labels[this.getVolumeHotplugAction(volume)];
|
||||||
|
},
|
||||||
|
|
||||||
|
hotplugVolume(volume) {
|
||||||
|
const calls = {
|
||||||
|
[VOLUME_HOTPLUG_ACTION.DETACH_DISK]: () => this.vm.unplugVolume(volume.name),
|
||||||
|
[VOLUME_HOTPLUG_ACTION.INSERT_CDROM_IMAGE]: () => this.vm.insertCdRomVolume(volume.name),
|
||||||
|
[VOLUME_HOTPLUG_ACTION.EJECT_CDROM_IMAGE]: () => this.vm.ejectCdRomVolume(volume.name),
|
||||||
|
};
|
||||||
|
|
||||||
|
return calls[this.getVolumeHotplugAction(volume)]();
|
||||||
},
|
},
|
||||||
|
|
||||||
componentFor(type) {
|
componentFor(type) {
|
||||||
@@ -346,12 +391,12 @@ export default {
|
|||||||
<i class="icon icon-x" />
|
<i class="icon icon-x" />
|
||||||
</button>
|
</button>
|
||||||
<button
|
<button
|
||||||
v-if="volume.hotpluggable && isView"
|
v-if="canDoVolumeHotplugAction(volume) && isView"
|
||||||
type="button"
|
type="button"
|
||||||
class="role-link btn btn-sm remove"
|
class="role-link btn btn-sm remove"
|
||||||
@click="unplugVolume(volume)"
|
@click="hotplugVolume(volume)"
|
||||||
>
|
>
|
||||||
{{ t('harvester.virtualMachine.hotUnplug.detachVolume.actionLabel') }}
|
{{ t(getVolumeHotplugActionLabel(volume)) }}
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
@@ -430,7 +475,6 @@ export default {
|
|||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
class="btn btn-sm bg-primary mr-15 mb-10"
|
class="btn btn-sm bg-primary mr-15 mb-10"
|
||||||
:disabled="rows.length === 0"
|
|
||||||
@click="addVolume(SOURCE_TYPE.NEW)"
|
@click="addVolume(SOURCE_TYPE.NEW)"
|
||||||
>
|
>
|
||||||
{{ t('harvester.virtualMachine.volume.addVolume') }}
|
{{ t('harvester.virtualMachine.volume.addVolume') }}
|
||||||
|
|||||||
+77
-5
@@ -14,6 +14,7 @@ import { _VIEW } from '@shell/config/query-params';
|
|||||||
import LabelValue from '@shell/components/LabelValue';
|
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';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'HarvesterEditVMImage',
|
name: 'HarvesterEditVMImage',
|
||||||
@@ -96,8 +97,20 @@ export default {
|
|||||||
return this.mode === _VIEW;
|
return this.mode === _VIEW;
|
||||||
},
|
},
|
||||||
|
|
||||||
|
isExistingCdrom() {
|
||||||
|
return this.value.type === 'cd-rom' && !this.value.newCreateId;
|
||||||
|
},
|
||||||
|
|
||||||
|
isEmptyImage() {
|
||||||
|
return this.value.image === EMPTY_IMAGE;
|
||||||
|
},
|
||||||
|
|
||||||
|
isHotplugCdRomFeatureEnabled() {
|
||||||
|
return this.$store.getters['harvester-common/getFeatureEnabled']('hotplugCdRom');
|
||||||
|
},
|
||||||
|
|
||||||
imagesOption() {
|
imagesOption() {
|
||||||
return this.images
|
const images = this.images
|
||||||
.filter((image) => {
|
.filter((image) => {
|
||||||
if (!image.isReady) return false;
|
if (!image.isReady) return false;
|
||||||
|
|
||||||
@@ -114,6 +127,19 @@ export default {
|
|||||||
value: image.id,
|
value: image.id,
|
||||||
disabled: image.isImportedImage
|
disabled: image.isImportedImage
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
const options = [];
|
||||||
|
|
||||||
|
if (this.isHotplugCdRomFeatureEnabled) {
|
||||||
|
options.push({
|
||||||
|
label: this.t('harvester.virtualMachine.volume.emptyImage'),
|
||||||
|
value: EMPTY_IMAGE,
|
||||||
|
disabled: false
|
||||||
|
});
|
||||||
|
}
|
||||||
|
options.push(...images);
|
||||||
|
|
||||||
|
return options;
|
||||||
},
|
},
|
||||||
|
|
||||||
imageName() {
|
imageName() {
|
||||||
@@ -179,6 +205,7 @@ export default {
|
|||||||
'value.type'(neu) {
|
'value.type'(neu) {
|
||||||
if (neu === 'cd-rom') {
|
if (neu === 'cd-rom') {
|
||||||
this.value['bus'] = 'sata';
|
this.value['bus'] = 'sata';
|
||||||
|
this.updateHotpluggable();
|
||||||
this.update();
|
this.update();
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -221,12 +248,48 @@ export default {
|
|||||||
|
|
||||||
return label;
|
return label;
|
||||||
},
|
},
|
||||||
|
|
||||||
update() {
|
update() {
|
||||||
this.value.hasDiskError = this.showDiskTooSmallError;
|
this.value.hasDiskError = this.showDiskTooSmallError;
|
||||||
this.$emit('update');
|
this.$emit('update');
|
||||||
},
|
},
|
||||||
|
|
||||||
|
updateHotpluggable() {
|
||||||
|
if (this.value.type !== 'cd-rom') {
|
||||||
|
this.value['hotpluggable'] = false;
|
||||||
|
} else {
|
||||||
|
this.value['hotpluggable'] = (this.value.bus === 'sata');
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
onTypeChange() {
|
||||||
|
if (this.value.image === EMPTY_IMAGE && this.value.type !== 'cd-rom') {
|
||||||
|
this.value['image'] = '';
|
||||||
|
}
|
||||||
|
|
||||||
|
this.updateHotpluggable();
|
||||||
|
this.update();
|
||||||
|
},
|
||||||
|
|
||||||
|
onBusChange() {
|
||||||
|
if (this.value.image === EMPTY_IMAGE && this.value.bus !== 'sata') {
|
||||||
|
this.value['image'] = '';
|
||||||
|
}
|
||||||
|
|
||||||
|
this.updateHotpluggable();
|
||||||
|
this.update();
|
||||||
|
},
|
||||||
|
|
||||||
onImageChange() {
|
onImageChange() {
|
||||||
|
if (this.value.image === EMPTY_IMAGE) {
|
||||||
|
this.value['type'] = 'cd-rom';
|
||||||
|
this.value['bus'] = 'sata';
|
||||||
|
this.value['size'] = `0${ GIBIBYTE }`;
|
||||||
|
this.update();
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
const imageResource = this.$store.getters['harvester/all'](HCI.IMAGE)?.find( (I) => this.value.image === I.id);
|
const imageResource = this.$store.getters['harvester/all'](HCI.IMAGE)?.find( (I) => this.value.image === I.id);
|
||||||
const isIsoImage = /iso$/i.test(imageResource?.imageSuffix);
|
const isIsoImage = /iso$/i.test(imageResource?.imageSuffix);
|
||||||
const imageSize = Math.max(imageResource?.status?.size, imageResource?.status?.virtualSize);
|
const imageSize = Math.max(imageResource?.status?.size, imageResource?.status?.virtualSize);
|
||||||
@@ -239,6 +302,8 @@ export default {
|
|||||||
this.value['bus'] = 'virtio';
|
this.value['bus'] = 'virtio';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
this.updateHotpluggable();
|
||||||
|
|
||||||
if (imageSize) {
|
if (imageSize) {
|
||||||
let imageSizeGiB = Math.ceil(imageSize / 1024 / 1024 / 1024);
|
let imageSizeGiB = Math.ceil(imageSize / 1024 / 1024 / 1024);
|
||||||
|
|
||||||
@@ -256,6 +321,10 @@ export default {
|
|||||||
},
|
},
|
||||||
|
|
||||||
checkImageExists(imageId) {
|
checkImageExists(imageId) {
|
||||||
|
if (imageId === EMPTY_IMAGE) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (!!imageId && this.imagesOption.length > 0 && !findBy(this.imagesOption, 'value', imageId)) {
|
if (!!imageId && this.imagesOption.length > 0 && !findBy(this.imagesOption, 'value', imageId)) {
|
||||||
this.$store.dispatch('growl/error', {
|
this.$store.dispatch('growl/error', {
|
||||||
title: this.$store.getters['i18n/t']('harvester.vmTemplate.tips.notExistImage.title', { name: imageId }),
|
title: this.$store.getters['i18n/t']('harvester.vmTemplate.tips.notExistImage.title', { name: imageId }),
|
||||||
@@ -283,6 +352,7 @@ export default {
|
|||||||
>
|
>
|
||||||
<LabeledInput
|
<LabeledInput
|
||||||
v-model:value="value.name"
|
v-model:value="value.name"
|
||||||
|
:disabled="!isCreate && isExistingCdrom"
|
||||||
:label="t('harvester.fields.name')"
|
:label="t('harvester.fields.name')"
|
||||||
required
|
required
|
||||||
:mode="mode"
|
:mode="mode"
|
||||||
@@ -302,10 +372,11 @@ export default {
|
|||||||
>
|
>
|
||||||
<LabeledSelect
|
<LabeledSelect
|
||||||
v-model:value="value.type"
|
v-model:value="value.type"
|
||||||
|
:disabled="!isCreate && isExistingCdrom"
|
||||||
:label="t('harvester.fields.type')"
|
:label="t('harvester.fields.type')"
|
||||||
:options="VOLUME_TYPE"
|
:options="VOLUME_TYPE"
|
||||||
:mode="mode"
|
:mode="mode"
|
||||||
@update:value="update"
|
@update:value="onTypeChange"
|
||||||
/>
|
/>
|
||||||
</InputOrDisplay>
|
</InputOrDisplay>
|
||||||
</div>
|
</div>
|
||||||
@@ -323,7 +394,7 @@ export default {
|
|||||||
>
|
>
|
||||||
<LabeledSelect
|
<LabeledSelect
|
||||||
v-model:value="value.image"
|
v-model:value="value.image"
|
||||||
:disabled="idx === 0 && !isCreate && !value.newCreateId && isVirtualType"
|
:disabled="(idx === 0 || isExistingCdrom) && (!isCreate && !value.newCreateId && isVirtualType)"
|
||||||
:label="t('harvester.fields.image')"
|
:label="t('harvester.fields.image')"
|
||||||
:options="imagesOption"
|
:options="imagesOption"
|
||||||
:mode="mode"
|
:mode="mode"
|
||||||
@@ -351,7 +422,7 @@ export default {
|
|||||||
:label="t('harvester.fields.size')"
|
:label="t('harvester.fields.size')"
|
||||||
:mode="mode"
|
:mode="mode"
|
||||||
:required="validateRequired"
|
:required="validateRequired"
|
||||||
:disabled="isResizeDisabled"
|
:disabled="isResizeDisabled || isEmptyImage || (!isCreate && isExistingCdrom)"
|
||||||
:suffix="GIBIBYTE"
|
:suffix="GIBIBYTE"
|
||||||
@update:value="update"
|
@update:value="update"
|
||||||
/>
|
/>
|
||||||
@@ -374,7 +445,8 @@ export default {
|
|||||||
:label="t('harvester.virtualMachine.volume.bus')"
|
:label="t('harvester.virtualMachine.volume.bus')"
|
||||||
:mode="mode"
|
:mode="mode"
|
||||||
:options="InterfaceOption"
|
:options="InterfaceOption"
|
||||||
@update:value="update"
|
:disabled="!isCreate && isExistingCdrom"
|
||||||
|
@update:value="onBusChange"
|
||||||
/>
|
/>
|
||||||
</InputOrDisplay>
|
</InputOrDisplay>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
import { isEqual } from 'lodash';
|
import { isEqual } from 'lodash';
|
||||||
import { mapGetters } from 'vuex';
|
import { mapGetters } from 'vuex';
|
||||||
import Tabbed from '@shell/components/Tabbed';
|
import Tabbed from '@shell/components/Tabbed';
|
||||||
import { clone } from '@shell/utils/object';
|
import { clone, set } from '@shell/utils/object';
|
||||||
import Tab from '@shell/components/Tabbed/Tab';
|
import Tab from '@shell/components/Tabbed/Tab';
|
||||||
import { Checkbox } from '@components/Form/Checkbox';
|
import { Checkbox } from '@components/Form/Checkbox';
|
||||||
import CruResource from '@shell/components/CruResource';
|
import CruResource from '@shell/components/CruResource';
|
||||||
@@ -32,10 +32,12 @@ import PciDevices from './VirtualMachinePciDevices/index';
|
|||||||
import AccessCredentials from './VirtualMachineAccessCredentials';
|
import AccessCredentials from './VirtualMachineAccessCredentials';
|
||||||
import CloudConfig from './VirtualMachineCloudConfig';
|
import CloudConfig from './VirtualMachineCloudConfig';
|
||||||
import CpuMemory from './VirtualMachineCpuMemory';
|
import CpuMemory from './VirtualMachineCpuMemory';
|
||||||
|
import CpuModel from './VirtualMachineCpuModel';
|
||||||
import Network from './VirtualMachineNetwork';
|
import Network from './VirtualMachineNetwork';
|
||||||
import Volume from './VirtualMachineVolume';
|
import Volume from './VirtualMachineVolume';
|
||||||
import SSHKey from './VirtualMachineSSHKey';
|
import SSHKey from './VirtualMachineSSHKey';
|
||||||
import Reserved from './VirtualMachineReserved';
|
import Reserved from './VirtualMachineReserved';
|
||||||
|
import Filesystem from './VirtualMachineFilesystem';
|
||||||
import { Banner } from '@components/Banner';
|
import { Banner } from '@components/Banner';
|
||||||
import MessageLink from '@shell/components/MessageLink';
|
import MessageLink from '@shell/components/MessageLink';
|
||||||
|
|
||||||
@@ -57,6 +59,7 @@ export default {
|
|||||||
SSHKey,
|
SSHKey,
|
||||||
Network,
|
Network,
|
||||||
CpuMemory,
|
CpuMemory,
|
||||||
|
CpuModel,
|
||||||
CloudConfig,
|
CloudConfig,
|
||||||
NodeScheduling,
|
NodeScheduling,
|
||||||
PodAffinity,
|
PodAffinity,
|
||||||
@@ -70,6 +73,7 @@ export default {
|
|||||||
Banner,
|
Banner,
|
||||||
MessageLink,
|
MessageLink,
|
||||||
UsbDevices,
|
UsbDevices,
|
||||||
|
Filesystem,
|
||||||
},
|
},
|
||||||
|
|
||||||
mixins: [CreateEditView, VM_MIXIN],
|
mixins: [CreateEditView, VM_MIXIN],
|
||||||
@@ -89,22 +93,36 @@ export default {
|
|||||||
|
|
||||||
const hostname = this.value.spec.template.spec.hostname || '';
|
const hostname = this.value.spec.template.spec.hostname || '';
|
||||||
|
|
||||||
|
const customizeDisplayName = !!(this.value.metadata?.annotations?.[HCI_ANNOTATIONS.VM_DISPLAY_NAME]);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
cloneVM,
|
cloneVM,
|
||||||
count: 2,
|
count: 2,
|
||||||
templateId: '',
|
templateId: '',
|
||||||
templateVersionId: '',
|
templateVersionId: '',
|
||||||
namePrefix: '',
|
namePrefix: '',
|
||||||
isSingle: true,
|
isSingle: true,
|
||||||
isOpen: false,
|
isOpen: false,
|
||||||
hostname,
|
hostname,
|
||||||
isRestartImmediately,
|
isRestartImmediately,
|
||||||
|
customizeDisplayName,
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|
||||||
computed: {
|
computed: {
|
||||||
...mapGetters({ t: 'i18n/t' }),
|
...mapGetters({ t: 'i18n/t' }),
|
||||||
|
|
||||||
|
// VM display name is stored as an annotation; bind a dedicated input to it
|
||||||
|
// so we don't have to mutate metadata.name (which would break the k8s PUT).
|
||||||
|
displayName: {
|
||||||
|
get() {
|
||||||
|
return this.value.metadata?.annotations?.[HCI_ANNOTATIONS.VM_DISPLAY_NAME] || '';
|
||||||
|
},
|
||||||
|
set(val) {
|
||||||
|
this.value.setAnnotation(HCI_ANNOTATIONS.VM_DISPLAY_NAME, val);
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
to() {
|
to() {
|
||||||
return {
|
return {
|
||||||
name: 'harvester-c-cluster-resource',
|
name: 'harvester-c-cluster-resource',
|
||||||
@@ -209,9 +227,16 @@ export default {
|
|||||||
|
|
||||||
return false;
|
return false;
|
||||||
},
|
},
|
||||||
|
|
||||||
|
vGPUAsPCIDeviceEnabled() {
|
||||||
|
return this.$store.getters['harvester-common/getFeatureEnabled']('vGPUAsPCIDevice');
|
||||||
|
},
|
||||||
usbPassthroughEnabled() {
|
usbPassthroughEnabled() {
|
||||||
return this.$store.getters['harvester-common/getFeatureEnabled']('usbPassthrough');
|
return this.$store.getters['harvester-common/getFeatureEnabled']('usbPassthrough');
|
||||||
},
|
},
|
||||||
|
filesystemEnabled() {
|
||||||
|
return this.$store.getters['harvester-common/getFeatureEnabled']('supportFilesystem');
|
||||||
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
watch: {
|
watch: {
|
||||||
@@ -283,6 +308,12 @@ export default {
|
|||||||
this.getInitConfig({ value: this.value, init: this.isCreate });
|
this.getInitConfig({ value: this.value, init: this.isCreate });
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
customizeDisplayName(neu) {
|
||||||
|
if (!neu) {
|
||||||
|
this.value.setAnnotation(HCI_ANNOTATIONS.VM_DISPLAY_NAME, '');
|
||||||
|
}
|
||||||
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
created() {
|
created() {
|
||||||
@@ -315,6 +346,7 @@ export default {
|
|||||||
const diskRows = this.getDiskRows(this.value);
|
const diskRows = this.getDiskRows(this.value);
|
||||||
|
|
||||||
this['diskRows'] = diskRows;
|
this['diskRows'] = diskRows;
|
||||||
|
this['filesystemRows'] = this.getFilesystemRows(this.value);
|
||||||
const templateId = this.$route.query.templateId;
|
const templateId = this.$route.query.templateId;
|
||||||
const templateVersionId = this.$route.query.versionId;
|
const templateVersionId = this.$route.query.versionId;
|
||||||
|
|
||||||
@@ -538,6 +570,18 @@ export default {
|
|||||||
|
|
||||||
return out;
|
return out;
|
||||||
},
|
},
|
||||||
|
|
||||||
|
updateCpuModel(value) {
|
||||||
|
if (!this.spec?.template?.spec?.domain?.cpu) {
|
||||||
|
set(this.spec, 'template.spec.domain.cpu', {});
|
||||||
|
}
|
||||||
|
|
||||||
|
if (value && value !== '') {
|
||||||
|
set(this.spec.template.spec.domain.cpu, 'model', value);
|
||||||
|
} else {
|
||||||
|
delete this.spec.template.spec.domain.cpu.model;
|
||||||
|
}
|
||||||
|
},
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
@@ -592,6 +636,33 @@ export default {
|
|||||||
</template>
|
</template>
|
||||||
</NameNsDescription>
|
</NameNsDescription>
|
||||||
|
|
||||||
|
<div v-if="isSingle">
|
||||||
|
<div class="row mb-20">
|
||||||
|
<div class="col span-12">
|
||||||
|
<Checkbox
|
||||||
|
v-model:value="customizeDisplayName"
|
||||||
|
class="check"
|
||||||
|
type="checkbox"
|
||||||
|
:label="t('harvester.virtualMachine.input.customizeDisplayName')"
|
||||||
|
:mode="mode"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
v-if="customizeDisplayName"
|
||||||
|
class="row mb-20"
|
||||||
|
>
|
||||||
|
<div class="col span-6">
|
||||||
|
<LabeledInput
|
||||||
|
v-model:value="displayName"
|
||||||
|
:mode="mode"
|
||||||
|
:label="t('harvester.virtualMachine.input.displayName')"
|
||||||
|
:placeholder="t('harvester.virtualMachine.input.displayNamePlaceholder')"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<Checkbox
|
<Checkbox
|
||||||
v-if="isCreate"
|
v-if="isCreate"
|
||||||
v-model:value="useTemplate"
|
v-model:value="useTemplate"
|
||||||
@@ -726,7 +797,7 @@ export default {
|
|||||||
</Tab>
|
</Tab>
|
||||||
|
|
||||||
<Tab
|
<Tab
|
||||||
v-if="enabledSriovgpu"
|
v-if="enabledSriovgpu && !vGPUAsPCIDeviceEnabled"
|
||||||
:label="t('harvester.tab.vGpuDevices')"
|
:label="t('harvester.tab.vGpuDevices')"
|
||||||
name="vGpuDevices"
|
name="vGpuDevices"
|
||||||
:weight="-6"
|
:weight="-6"
|
||||||
@@ -765,10 +836,23 @@ export default {
|
|||||||
/>
|
/>
|
||||||
</Tab>
|
</Tab>
|
||||||
|
|
||||||
|
<Tab
|
||||||
|
v-if="filesystemEnabled"
|
||||||
|
name="filesystem"
|
||||||
|
:label="t('harvester.tab.filesystem')"
|
||||||
|
:weight="-9"
|
||||||
|
>
|
||||||
|
<Filesystem
|
||||||
|
v-model:value="filesystemRows"
|
||||||
|
:mode="mode"
|
||||||
|
:namespace="value.metadata.namespace"
|
||||||
|
/>
|
||||||
|
</Tab>
|
||||||
|
|
||||||
<Tab
|
<Tab
|
||||||
name="labels"
|
name="labels"
|
||||||
:label="t('generic.labels')"
|
:label="t('generic.labels')"
|
||||||
:weight="-9"
|
:weight="-10"
|
||||||
>
|
>
|
||||||
<Banner color="info">
|
<Banner color="info">
|
||||||
<t k="harvester.virtualMachine.labels.banner" />
|
<t k="harvester.virtualMachine.labels.banner" />
|
||||||
@@ -787,7 +871,7 @@ export default {
|
|||||||
<Tab
|
<Tab
|
||||||
name="instanceLabel"
|
name="instanceLabel"
|
||||||
:label="t('harvester.tab.instanceLabel')"
|
:label="t('harvester.tab.instanceLabel')"
|
||||||
:weight="-10"
|
:weight="-11"
|
||||||
>
|
>
|
||||||
<Banner color="info">
|
<Banner color="info">
|
||||||
<t k="harvester.virtualMachine.instanceLabels.banner" />
|
<t k="harvester.virtualMachine.instanceLabels.banner" />
|
||||||
@@ -808,7 +892,7 @@ export default {
|
|||||||
<Tab
|
<Tab
|
||||||
name="annotations"
|
name="annotations"
|
||||||
:label="t('harvester.tab.annotations')"
|
:label="t('harvester.tab.annotations')"
|
||||||
:weight="-11"
|
:weight="-12"
|
||||||
>
|
>
|
||||||
<Banner color="info">
|
<Banner color="info">
|
||||||
<t k="harvester.virtualMachine.annotations.banner" />
|
<t k="harvester.virtualMachine.annotations.banner" />
|
||||||
@@ -829,7 +913,7 @@ export default {
|
|||||||
<Tab
|
<Tab
|
||||||
name="advanced"
|
name="advanced"
|
||||||
:label="t('harvester.tab.advanced')"
|
:label="t('harvester.tab.advanced')"
|
||||||
:weight="-12"
|
:weight="-13"
|
||||||
>
|
>
|
||||||
<div class="row mb-20">
|
<div class="row mb-20">
|
||||||
<div class="col span-6">
|
<div class="col span-6">
|
||||||
@@ -870,6 +954,16 @@ export default {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="row mb-20">
|
||||||
|
<div class="col span-6">
|
||||||
|
<CpuModel
|
||||||
|
v-model:value="cpuModel"
|
||||||
|
:mode="mode"
|
||||||
|
@update:value="updateCpuModel"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="row mb-20">
|
<div class="row mb-20">
|
||||||
<a
|
<a
|
||||||
v-if="showAdvanced"
|
v-if="showAdvanced"
|
||||||
|
|||||||
@@ -306,11 +306,11 @@ export default {
|
|||||||
:weight="1"
|
:weight="1"
|
||||||
>
|
>
|
||||||
<div class="row mb-20">
|
<div class="row mb-20">
|
||||||
<div class="col span-6">
|
<div class="col span-12">
|
||||||
<UnitInput
|
<UnitInput
|
||||||
v-model:value="value.spec.httpTimeoutSeconds"
|
v-model:value="value.spec.httpTimeoutSeconds"
|
||||||
:label="t('harvester.addons.vmImport.ova.fields.httpTimeout')"
|
:label="t('harvester.addons.vmImport.ova.fields.httpTimeout')"
|
||||||
placeholder="Default: 600"
|
:placeholder="t('harvester.addons.vmImport.ova.placeholders.httpTimeout')"
|
||||||
suffix="Seconds"
|
suffix="Seconds"
|
||||||
:mode="mode"
|
:mode="mode"
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
<script>
|
<script>
|
||||||
import { NORMAN } from '@shell/config/types';
|
import { NORMAN } from '@shell/config/types';
|
||||||
import { HCI } from '../types';
|
import { HCI } from '../types';
|
||||||
|
import { getHarvesterUser } from '../utils/auth';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
props: {
|
props: {
|
||||||
@@ -25,7 +26,7 @@ export default {
|
|||||||
},
|
},
|
||||||
|
|
||||||
data() {
|
data() {
|
||||||
const user = this.$store.getters['auth/v3User'];
|
const user = getHarvesterUser(this.$store.getters);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
harvesterSettings: [],
|
harvesterSettings: [],
|
||||||
|
|||||||
@@ -20,12 +20,7 @@ export default {
|
|||||||
|
|
||||||
computed: {
|
computed: {
|
||||||
vmiResource() {
|
vmiResource() {
|
||||||
const vmiList = this.$store.getters['harvester/all'](HCI.VMI) || [];
|
return this.$store.getters['harvester/byId'](HCI.VMI, this.vmResource?.id) || null;
|
||||||
const vmi = vmiList.find( (VMI) => {
|
|
||||||
return VMI?.metadata?.ownerReferences?.[0]?.uid === this.vmResource?.metadata?.uid;
|
|
||||||
});
|
|
||||||
|
|
||||||
return vmi;
|
|
||||||
},
|
},
|
||||||
migrationState() {
|
migrationState() {
|
||||||
return this.vmiResource?.migrationState?.status || '';
|
return this.vmiResource?.migrationState?.status || '';
|
||||||
|
|||||||
@@ -14,20 +14,6 @@ export default {
|
|||||||
type: Object,
|
type: Object,
|
||||||
required: true
|
required: true
|
||||||
},
|
},
|
||||||
|
|
||||||
allNodeNetwork: {
|
|
||||||
type: Array,
|
|
||||||
default: () => {
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
allClusterNetwork: {
|
|
||||||
type: Array,
|
|
||||||
default: () => {
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
|
|
||||||
data() {
|
data() {
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ 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 { defineAsyncComponent } from 'vue';
|
import { defineAsyncComponent } from 'vue';
|
||||||
|
import './styles/vue-flow.scss';
|
||||||
|
|
||||||
// Init the package
|
// Init the package
|
||||||
export default function (plugin: IPlugin) {
|
export default function (plugin: IPlugin) {
|
||||||
|
|||||||
+156
-24
@@ -123,9 +123,31 @@ harvester:
|
|||||||
namespace: Namespace
|
namespace: Namespace
|
||||||
message:
|
message:
|
||||||
success: 'Image { name } created successfully.'
|
success: 'Image { name } created successfully.'
|
||||||
|
storageMigration:
|
||||||
|
title: Storage Migration
|
||||||
|
fields:
|
||||||
|
sourceVolume:
|
||||||
|
label: Source Volume
|
||||||
|
placeholder: Select a source volume
|
||||||
|
targetVolume:
|
||||||
|
label: Target Volume
|
||||||
|
placeholder: Select a target volume
|
||||||
|
dataMigration:
|
||||||
|
title: Data Migration
|
||||||
|
fields:
|
||||||
|
targetVolumeName:
|
||||||
|
label: Target Volume Name
|
||||||
|
placeholder: Enter a target volume name
|
||||||
|
targetStorageClassName:
|
||||||
|
label: Target Storage Class
|
||||||
|
placeholder: Select a storage class
|
||||||
migration:
|
migration:
|
||||||
failedMessage: Latest migration failed!
|
failedMessage: Latest migration failed!
|
||||||
title: Migration
|
title: Migration
|
||||||
|
vmMigrationTitle: '{count, plural, one {Migrating # VM} other {Migrating # VMs}}'
|
||||||
|
selectedVMs: "The following virtual machine(s) will be migrated to the target node"
|
||||||
|
unknownNode: (unknown node)
|
||||||
|
alreadyOnTarget: Already on Target
|
||||||
fields:
|
fields:
|
||||||
nodeName:
|
nodeName:
|
||||||
label: Target Node
|
label: Target Node
|
||||||
@@ -164,6 +186,11 @@ harvester:
|
|||||||
vmNetwork: Virtual Machine Network
|
vmNetwork: Virtual Machine Network
|
||||||
macAddress: MAC Address
|
macAddress: MAC Address
|
||||||
macAddressTooltip: If left blank, the MAC address will be automatically generated.
|
macAddressTooltip: If left blank, the MAC address will be automatically generated.
|
||||||
|
insertCdRomVolume:
|
||||||
|
success: '{ imageName } is inserted into device { deviceName }.'
|
||||||
|
title: Insert Image
|
||||||
|
image: Image
|
||||||
|
actionLabel: Insert Image
|
||||||
cpuMemoryHotplug:
|
cpuMemoryHotplug:
|
||||||
success: 'CPU and Memory are updated to the virtual machine { vm }.'
|
success: 'CPU and Memory are updated to the virtual machine { vm }.'
|
||||||
title: Edit CPU and Memory
|
title: Edit CPU and Memory
|
||||||
@@ -196,6 +223,9 @@ harvester:
|
|||||||
info: Info
|
info: Info
|
||||||
warning: Warning
|
warning: Warning
|
||||||
error: Error
|
error: Error
|
||||||
|
restartRequired:
|
||||||
|
title: '{count} {count, plural, =1 {Virtual Machine is} other {Virtual Machines are}} Pending Restart'
|
||||||
|
message: 'Please restart { vmNames } to apply updated configurations'
|
||||||
action:
|
action:
|
||||||
createVM: Create Virtual Machine
|
createVM: Create Virtual Machine
|
||||||
start: Start
|
start: Start
|
||||||
@@ -222,8 +252,12 @@ harvester:
|
|||||||
suspendSchedule: Suspend
|
suspendSchedule: Suspend
|
||||||
restoreExistingVM: Replace Existing
|
restoreExistingVM: Replace Existing
|
||||||
migrate: Migrate
|
migrate: Migrate
|
||||||
|
vmMigrate: Virtual Machine Migration
|
||||||
cpuAndMemoryHotplug: Edit CPU and Memory
|
cpuAndMemoryHotplug: Edit CPU and Memory
|
||||||
abortMigration: Abort Migration
|
abortMigration: Abort Migration
|
||||||
|
storageMigration: Storage Migration
|
||||||
|
cancelStorageMigration: Cancel Storage Migration
|
||||||
|
dataMigration: Data Migration
|
||||||
createTemplate: Generate Template
|
createTemplate: Generate Template
|
||||||
enableMaintenance: Enable Maintenance Mode
|
enableMaintenance: Enable Maintenance Mode
|
||||||
disableMaintenance: Disable Maintenance Mode
|
disableMaintenance: Disable Maintenance Mode
|
||||||
@@ -269,6 +303,7 @@ harvester:
|
|||||||
phase: Phase
|
phase: Phase
|
||||||
attachedVM: Attached Virtual Machine
|
attachedVM: Attached Virtual Machine
|
||||||
cpuManager: CPU Manager
|
cpuManager: CPU Manager
|
||||||
|
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
|
||||||
@@ -320,6 +355,7 @@ harvester:
|
|||||||
snapshots: Snapshots
|
snapshots: Snapshots
|
||||||
instanceLabel: Instance Labels
|
instanceLabel: Instance Labels
|
||||||
annotations: Annotations
|
annotations: Annotations
|
||||||
|
filesystem: Filesystem Volume
|
||||||
fields:
|
fields:
|
||||||
version: Version
|
version: Version
|
||||||
name: Name
|
name: Name
|
||||||
@@ -347,23 +383,15 @@ harvester:
|
|||||||
available: Available Devices
|
available: Available Devices
|
||||||
compatibleNodes: Compatible Nodes
|
compatibleNodes: Compatible Nodes
|
||||||
impossibleSelection: 'There are no hosts with all of the selected devices.'
|
impossibleSelection: 'There are no hosts with all of the selected devices.'
|
||||||
howToUseDevice: 'Use the table below to enable PCI passthrough on each device you want to use in this virtual machine.'
|
howToUseDeviceInVMCreation:
|
||||||
|
prefix: 'Use the table below to enable PCI passthrough on each device you want to use in this virtual machine. <br>For vGPU devices, please enable them on the'
|
||||||
|
middle: vGPU Devices
|
||||||
|
suffix: page first.
|
||||||
|
howToUseDevice:
|
||||||
|
prefix: 'Select the device in the table to enable PCI passthrough. <br>For vGPU devices, please enable them on the'
|
||||||
|
middle: vGPU Devices
|
||||||
|
suffix: page.
|
||||||
deviceInTheSameHost: 'You can only select devices on the same host.'
|
deviceInTheSameHost: 'You can only select devices on the same host.'
|
||||||
oldFormatDevices:
|
|
||||||
help: |-
|
|
||||||
<p>
|
|
||||||
The following PCI devices are using the old naming convention and need to be updated in the YAML file:
|
|
||||||
</p>
|
|
||||||
<ul>
|
|
||||||
{oldFormatDevicesHTML}
|
|
||||||
</ul>
|
|
||||||
<p>
|
|
||||||
Please use the following instructions to update the virtual machine:
|
|
||||||
</p>
|
|
||||||
<ol>
|
|
||||||
<li>Stop the virtual machine, edit the virtual machine YAML, and remove the <Code>hostDevices</Code> section, and save virtual machine the changes to the YAML file.</li>
|
|
||||||
<li>Edit the virtual machine, and add the already enabled PCI Device from the list of available PCIDevices, and save and start VM.</li>
|
|
||||||
</ol>
|
|
||||||
showCompatibility: Show device compatibility matrix
|
showCompatibility: Show device compatibility matrix
|
||||||
hideCompatibility: Hide device compatibility matrix
|
hideCompatibility: Hide device compatibility matrix
|
||||||
claimError: Error enabling passthrough on {name}
|
claimError: Error enabling passthrough on {name}
|
||||||
@@ -381,6 +409,8 @@ harvester:
|
|||||||
suffix: to enable the add-on to successfully manage your PCI devices.
|
suffix: to enable the add-on to successfully manage your PCI devices.
|
||||||
noPCIPermission: Please contact your system administrator to enable the PCI devices first.
|
noPCIPermission: Please contact your system administrator to enable the PCI devices first.
|
||||||
enablePassthroughWarning: Please be careful not to use host-owned PCI devices (e.g., management and VLAN NICs). Incorrect device allocation may cause damage to your cluster, including node failure.
|
enablePassthroughWarning: Please be careful not to use host-owned PCI devices (e.g., management and VLAN NICs). Incorrect device allocation may cause damage to your cluster, including node failure.
|
||||||
|
disableResourcePooling: Disable Resource Pooling
|
||||||
|
disableResourcePoolingDescription: Assigns this device a unique resource name so it can be pinned to a specific VM, instead of sharing the pool with other identical devices.
|
||||||
|
|
||||||
devices:
|
devices:
|
||||||
matrixHostName: Host Name
|
matrixHostName: Host Name
|
||||||
@@ -417,7 +447,7 @@ harvester:
|
|||||||
volume:
|
volume:
|
||||||
upperType: Volume name
|
upperType: Volume name
|
||||||
lowerType: volume name
|
lowerType: volume name
|
||||||
needImageOrExisting: 'At least an image volume or an existing root-disk volume is required!'
|
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.'
|
||||||
@@ -613,6 +643,10 @@ harvester:
|
|||||||
virtualMachine:
|
virtualMachine:
|
||||||
label: Virtual Machines
|
label: Virtual Machines
|
||||||
osType: OS Type
|
osType: OS Type
|
||||||
|
cpuModel:
|
||||||
|
label: CPU Model
|
||||||
|
fetchError: 'Failed to load CPU model configuration: {error}'
|
||||||
|
optionLabel: "{modelName} ({count} {count, plural, one {node} other {nodes}})"
|
||||||
hotplug:
|
hotplug:
|
||||||
title: Enable CPU and memory hotplug
|
title: Enable CPU and memory hotplug
|
||||||
tooltip: The default maximum CPU and maximum memory are {hotPlugTimes} times based on CPU and memory.
|
tooltip: The default maximum CPU and maximum memory are {hotPlugTimes} times based on CPU and memory.
|
||||||
@@ -623,6 +657,10 @@ harvester:
|
|||||||
title: 'Are you sure that you want to detach volume {name}?'
|
title: 'Are you sure that you want to detach volume {name}?'
|
||||||
actionLabel: Detach Volume
|
actionLabel: Detach Volume
|
||||||
success: 'Volume { name } is detached successfully.'
|
success: 'Volume { name } is detached successfully.'
|
||||||
|
ejectCdRomVolume:
|
||||||
|
title: 'Are you sure that you want to eject image from device {name}?'
|
||||||
|
actionLabel: Eject Image
|
||||||
|
success: 'Image from device { name } is ejected successfully.'
|
||||||
detachNIC:
|
detachNIC:
|
||||||
title: 'Are you sure that you want to detach network interface {name}?'
|
title: 'Are you sure that you want to detach network interface {name}?'
|
||||||
actionLabel: Detach Network Interface
|
actionLabel: Detach Network Interface
|
||||||
@@ -682,6 +720,7 @@ harvester:
|
|||||||
other {Start}
|
other {Start}
|
||||||
} Now
|
} Now
|
||||||
createSSHKey: Create a New...
|
createSSHKey: Create a New...
|
||||||
|
genericLoginError: Authentication failed. Please re-log in and try again.
|
||||||
installAgent: Install guest agent
|
installAgent: Install guest agent
|
||||||
enableUsb: Enable USB Tablet
|
enableUsb: Enable USB Tablet
|
||||||
advancedOptions:
|
advancedOptions:
|
||||||
@@ -729,6 +768,7 @@ harvester:
|
|||||||
unmount:
|
unmount:
|
||||||
title: Are you sure?
|
title: Are you sure?
|
||||||
message: Are you sure you want to unmount this volume?
|
message: Are you sure you want to unmount this volume?
|
||||||
|
emptyImage: No media
|
||||||
network:
|
network:
|
||||||
title: Network
|
title: Network
|
||||||
addNetwork: Add Network
|
addNetwork: Add Network
|
||||||
@@ -778,6 +818,18 @@ harvester:
|
|||||||
username: Username
|
username: Username
|
||||||
password: Password
|
password: Password
|
||||||
reservedMemory: Reserved Memory
|
reservedMemory: Reserved Memory
|
||||||
|
customizeDisplayName: Customize virtual machine display name
|
||||||
|
displayNamePlaceholder: Virtual machine alias name
|
||||||
|
displayName: Display Name
|
||||||
|
filesystem:
|
||||||
|
description: Harvester supports filesystem volumes for VM via virtiofs.
|
||||||
|
type: Filesystem Type
|
||||||
|
volume: Volume
|
||||||
|
resource: Resource
|
||||||
|
add: Add
|
||||||
|
mountBannerHint: "Please update the mount path (e.g. /mnt/appconfigfs) to your preferred location, then add the corresponding commands to the"
|
||||||
|
mountBannerHintLink: "runcmd"
|
||||||
|
mountBannerHintSuffix: "in Advanced tab User Data."
|
||||||
machineTypeTip: 'Specify a processor architecture to emulate. To see a list of supported architectures, run: qemu-system-x86_64 -cpu ?'
|
machineTypeTip: 'Specify a processor architecture to emulate. To see a list of supported architectures, run: qemu-system-x86_64 -cpu ?'
|
||||||
detail:
|
detail:
|
||||||
tabs:
|
tabs:
|
||||||
@@ -881,6 +933,11 @@ harvester:
|
|||||||
conditions: Conditions
|
conditions: Conditions
|
||||||
size: Size
|
size: Size
|
||||||
volumeMode: Volume Mode
|
volumeMode: Volume Mode
|
||||||
|
accessModes: Access Modes
|
||||||
|
createWithDataVolume: Create with DataVolume
|
||||||
|
createWithDataVolumeTooltip: Create Volume with Kubevirt/Containerized Data Importer way. It can fill accessMode/volumeMode automatically.
|
||||||
|
showAdvanced: Show Advanced Options
|
||||||
|
hideAdvanced: Hide Advanced Options
|
||||||
source: Source
|
source: Source
|
||||||
kind: Kind
|
kind: Kind
|
||||||
sourceOptions:
|
sourceOptions:
|
||||||
@@ -1061,6 +1118,7 @@ harvester:
|
|||||||
replaceExisting: Replace existing
|
replaceExisting: Replace existing
|
||||||
virtualMachineName: Virtual Machine Name
|
virtualMachineName: Virtual Machine Name
|
||||||
keepMacAddress: Keep MAC Address
|
keepMacAddress: Keep MAC Address
|
||||||
|
haltAfterRestore: Keep powered off after restore
|
||||||
matchTarget: The current backup target does not match the existing one.
|
matchTarget: The current backup target does not match the existing one.
|
||||||
progress:
|
progress:
|
||||||
details: Volume details
|
details: Volume details
|
||||||
@@ -1098,6 +1156,9 @@ harvester:
|
|||||||
placeholder: key1=value1, key2=value2
|
placeholder: key1=value1, key2=value2
|
||||||
dhcpOptionBanner: DHCP options is a key/value string concatenate with comma. For more detail, please refer to <a href="https://kubeovn.github.io/docs/v1.13.x/en/kubevirt/dhcp/" target="_blank">KubOVN document</a>
|
dhcpOptionBanner: DHCP options is a key/value string concatenate with comma. For more detail, please refer to <a href="https://kubeovn.github.io/docs/v1.13.x/en/kubevirt/dhcp/" target="_blank">KubOVN document</a>
|
||||||
tooltip: Enable DHCP server for this subnet. When enabled, VMs can automatically obtain IP addresses from this subnet.
|
tooltip: Enable DHCP server for this subnet. When enabled, VMs can automatically obtain IP addresses from this subnet.
|
||||||
|
externalConnectivity:
|
||||||
|
label: NAT Outgoing
|
||||||
|
tooltip: Enable NAT for VMs using this subnet to access external networks.
|
||||||
private:
|
private:
|
||||||
label: Private Subnet
|
label: Private Subnet
|
||||||
tooltip: Enable network isolation for this Subnet. When enabled, VMs can only communicate within this subnet, even if other subnets exist under the same VPC.
|
tooltip: Enable network isolation for this Subnet. When enabled, VMs can only communicate within this subnet, even if other subnets exist under the same VPC.
|
||||||
@@ -1129,6 +1190,25 @@ harvester:
|
|||||||
banner: The supported field in ACL match can refer to <a href="https://kubeovn.github.io/docs/v1.14.x/en/guide/subnet/#subnet-acl" target="_blank">KubeOvn Subnet ACL document</a>
|
banner: The supported field in ACL match can refer to <a href="https://kubeovn.github.io/docs/v1.14.x/en/guide/subnet/#subnet-acl" target="_blank">KubeOvn Subnet ACL document</a>
|
||||||
|
|
||||||
vpc:
|
vpc:
|
||||||
|
viewTopology: Topology
|
||||||
|
topology:
|
||||||
|
loading: Loading topology...
|
||||||
|
empty: No resources found
|
||||||
|
visibility:
|
||||||
|
vpc: VPC
|
||||||
|
subnets: Subnets
|
||||||
|
overlayNetworks: Overlay Networks
|
||||||
|
vms: VMs
|
||||||
|
labels:
|
||||||
|
cidr: CIDR
|
||||||
|
provider: Provider
|
||||||
|
type: Type
|
||||||
|
clusterNetwork: Cluster Network
|
||||||
|
network: Network
|
||||||
|
subnet: Subnet
|
||||||
|
ip: IP
|
||||||
|
mac: MAC
|
||||||
|
peering: Peering
|
||||||
noAddonEnabled:
|
noAddonEnabled:
|
||||||
prefix: The kubeovn-operator add-on is not enabled, click
|
prefix: The kubeovn-operator add-on is not enabled, click
|
||||||
middle: here
|
middle: here
|
||||||
@@ -1216,6 +1296,13 @@ harvester:
|
|||||||
rancherCluster:
|
rancherCluster:
|
||||||
kubeConfig: Rancher KubeConfig
|
kubeConfig: Rancher KubeConfig
|
||||||
removeUpstreamClusterWhenNamespaceIsDeleted: Remove Upstream Cluster When Namespace Is Deleted
|
removeUpstreamClusterWhenNamespaceIsDeleted: Remove Upstream Cluster When Namespace Is Deleted
|
||||||
|
clusterPodSecurityStandard:
|
||||||
|
whitelistedNamespaces:
|
||||||
|
label: 'Whitelisted Namespaces'
|
||||||
|
privilegedNamespaces:
|
||||||
|
label: 'Privileged Namespaces'
|
||||||
|
restrictedNamespaces:
|
||||||
|
label: 'Restricted Namespaces'
|
||||||
storageNetwork:
|
storageNetwork:
|
||||||
range:
|
range:
|
||||||
placeholder: e.g. 172.16.0.0/24
|
placeholder: e.g. 172.16.0.0/24
|
||||||
@@ -1230,8 +1317,14 @@ harvester:
|
|||||||
addIp: Add Exclude IP
|
addIp: Add Exclude IP
|
||||||
warning: 'WARNING: <br/> Any change to storage-network requires shutting down all virtual machines before applying this setting. <br/> Users have to ensure the cluster network is configured and VLAN Configuration will cover all nodes and ensure the network connectivity is working and expected in all nodes.'
|
warning: 'WARNING: <br/> Any change to storage-network requires shutting down all virtual machines before applying this setting. <br/> Users have to ensure the cluster network is configured and VLAN Configuration will cover all nodes and ensure the network connectivity is working and expected in all nodes.'
|
||||||
tip: 'Specify an IP range in the IPv4 CIDR format. <code>Number of IPs Required = Number of Nodes * 2 + Number of Disks * 2 + Number of Images to Download/Upload </code>. For more information about storage network settings, see the <a href="{url}" target="_blank">documentation</a>.'
|
tip: 'Specify an IP range in the IPv4 CIDR format. <code>Number of IPs Required = Number of Nodes * 2 + Number of Disks * 2 + Number of Images to Download/Upload </code>. For more information about storage network settings, see the <a href="{url}" target="_blank">documentation</a>.'
|
||||||
|
rwxNetwork:
|
||||||
|
warning: 'WARNING: <br/> Any change to rwx-network requires longhorn RWX volumes detached before applying this setting.<br/>Users have to ensure the cluster network is configured and VLAN Configuration will cover all nodes and ensure the network connectivity is working and expected in all nodes.'
|
||||||
|
shareStorageNetwork: Share Storage Network
|
||||||
|
dedicatedRwxNetwork: Dedicated RWX Network
|
||||||
|
shareStorageNetworkWarning: The rwx-network is governed by storage-network, and changes here won't take effect until share-storage-network is set to false.
|
||||||
vmForceDeletionPolicy:
|
vmForceDeletionPolicy:
|
||||||
period: Period
|
period: Period
|
||||||
|
vmMigrationTimeout: VM Migration Timeout
|
||||||
vmMigrationNetwork:
|
vmMigrationNetwork:
|
||||||
parseError: "Failed to parse existing configuration."
|
parseError: "Failed to parse existing configuration."
|
||||||
fetchError: "Failed to load required network resources: {error}. Please refresh the page or try again later."
|
fetchError: "Failed to load required network resources: {error}. Please refresh the page or try again later."
|
||||||
@@ -1314,10 +1407,20 @@ harvester:
|
|||||||
retention: How long to retain metrics
|
retention: How long to retain metrics
|
||||||
retentionSize: Maximum size of metrics
|
retentionSize: Maximum size of metrics
|
||||||
clusterRegistrationUrl:
|
clusterRegistrationUrl:
|
||||||
|
url: URL
|
||||||
|
insecureSkipTLSVerify: Insecure Skip TLS Verify
|
||||||
|
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
|
||||||
|
middle: 'additional-ca'
|
||||||
|
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.
|
||||||
|
instanceManagerResources:
|
||||||
|
parseError: "Failed to parse configuration: {error}"
|
||||||
|
v1: "V1 Data Engine"
|
||||||
|
v2: "V2 Data Engine"
|
||||||
kubevirtMigration:
|
kubevirtMigration:
|
||||||
parseError: "Failed to parse configuration: {error}"
|
parseError: "Failed to parse configuration: {error}"
|
||||||
parallelMigrationsPerCluster: "Parallel Migrations Per Cluster"
|
parallelMigrationsPerCluster: "Parallel Migrations Per Cluster"
|
||||||
@@ -1423,6 +1526,7 @@ harvester:
|
|||||||
vmSnapshot:
|
vmSnapshot:
|
||||||
label: Virtual Machine Snapshots
|
label: Virtual Machine Snapshots
|
||||||
createText: Restore Snapshot
|
createText: Restore Snapshot
|
||||||
|
title: Restore Virtual Machine
|
||||||
snapshot: Snapshot
|
snapshot: Snapshot
|
||||||
|
|
||||||
storage:
|
storage:
|
||||||
@@ -1430,6 +1534,7 @@ harvester:
|
|||||||
useDefault: Use the default storage
|
useDefault: Use the default storage
|
||||||
volumeEncryption: Volume Encryption
|
volumeEncryption: Volume Encryption
|
||||||
secret: Secret
|
secret: Secret
|
||||||
|
volumeExpansionCheckbox: Enable Expansion
|
||||||
migratable:
|
migratable:
|
||||||
label: Migratable
|
label: Migratable
|
||||||
numberOfReplicas:
|
numberOfReplicas:
|
||||||
@@ -1657,10 +1762,11 @@ harvester:
|
|||||||
datacenter: The exact name of the Datacenter object in vCenter
|
datacenter: The exact name of the Datacenter object in vCenter
|
||||||
ova:
|
ova:
|
||||||
fields:
|
fields:
|
||||||
url: OVA URL
|
url: URL
|
||||||
httpTimeout: HTTP Timeout
|
httpTimeout: HTTP Timeout
|
||||||
placeholders:
|
placeholders:
|
||||||
url: "e.g. https://download.example.com/images/my-vm.ova"
|
url: "e.g. https://download.example.com/images/my-vm.ova"
|
||||||
|
httpTimeout: "Default: 600"
|
||||||
|
|
||||||
rancherVcluster:
|
rancherVcluster:
|
||||||
accessRancher: Access the Rancher Dashboard
|
accessRancher: Access the Rancher Dashboard
|
||||||
@@ -1678,6 +1784,8 @@ harvester:
|
|||||||
repository: Image Repository
|
repository: Image Repository
|
||||||
driver:
|
driver:
|
||||||
location: Driver Location
|
location: Driver Location
|
||||||
|
enable:
|
||||||
|
title: Enable NVIDIA Driver Toolkit
|
||||||
parsingSpecError:
|
parsingSpecError:
|
||||||
The field 'spec.valuesContent' has invalid format.
|
The field 'spec.valuesContent' has invalid format.
|
||||||
usbController:
|
usbController:
|
||||||
@@ -1788,7 +1896,8 @@ harvester:
|
|||||||
numVFs: Number Of Virtual Functions
|
numVFs: Number Of Virtual Functions
|
||||||
vfAddresses: Virtual Functions Addresses
|
vfAddresses: Virtual Functions Addresses
|
||||||
showMore: Show More
|
showMore: Show More
|
||||||
parentSriov: Filter By Parent SR-IOV
|
parentSriov: Filter By Parent SR-IOV Netork Device
|
||||||
|
parentSriovGPU: Filter By Parent SR-IOV GPU Device
|
||||||
|
|
||||||
sriovgpu:
|
sriovgpu:
|
||||||
label: SR-IOV GPU Devices
|
label: SR-IOV GPU Devices
|
||||||
@@ -1806,6 +1915,8 @@ harvester:
|
|||||||
|
|
||||||
migconfiguration:
|
migconfiguration:
|
||||||
label: vGPU MIG Configurations
|
label: vGPU MIG Configurations
|
||||||
|
status:
|
||||||
|
outOfSync: Out of Sync
|
||||||
infoBanner: To configure the MIG configuration, please disable it first and re-enable after editing the configuration.
|
infoBanner: To configure the MIG configuration, please disable it first and re-enable after editing the configuration.
|
||||||
profileSpec: Profile Specs
|
profileSpec: Profile Specs
|
||||||
profileStatus: Profile Status
|
profileStatus: Profile Status
|
||||||
@@ -1868,6 +1979,7 @@ harvester:
|
|||||||
title: Cannot Disable Passthrough
|
title: Cannot Disable Passthrough
|
||||||
message: Please detach the device from the VM and save it first before disabling passthrough.
|
message: Please detach the device from the VM and save it first before disabling passthrough.
|
||||||
enablePassthroughWarning: 'Please re-enable the USB device if the device path changes in the following situations:<br/> 1) Re-plugging the USB device.<br/> 2) Rebooting the node.<br/><br/>An incorrect device path may cause passthrough to fail.'
|
enablePassthroughWarning: 'Please re-enable the USB device if the device path changes in the following situations:<br/> 1) Re-plugging the USB device.<br/> 2) Rebooting the node.<br/><br/>An incorrect device path may cause passthrough to fail.'
|
||||||
|
classType: Class Type
|
||||||
|
|
||||||
harvesterVlanConfigMigrateDialog:
|
harvesterVlanConfigMigrateDialog:
|
||||||
targetClusterNetwork:
|
targetClusterNetwork:
|
||||||
@@ -1929,11 +2041,13 @@ advancedSettings:
|
|||||||
'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.'
|
||||||
|
'harv-support-bundle-file-name': 'Support bundle file name configuration.'
|
||||||
'harv-support-bundle-expiration': 'Support bundle expiration configuration in minutes.'
|
'harv-support-bundle-expiration': 'Support bundle expiration configuration in minutes.'
|
||||||
'harv-support-bundle-node-collection-timeout': 'Support bundle node collection timeout configuration in minutes.'
|
'harv-support-bundle-node-collection-timeout': 'Support bundle node collection timeout configuration in minutes.'
|
||||||
'harv-vm-force-reset-policy': Configuration for the force-reset action when a virtual machine is stuck on a node that is down.
|
'harv-vm-force-reset-policy': Configuration for the force-reset action when a virtual machine is stuck on a node that is down.
|
||||||
'harv-ssl-parameters': Custom SSL Parameters for TLS validation.
|
'harv-ssl-parameters': Custom SSL Parameters for TLS validation.
|
||||||
'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-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>.
|
||||||
@@ -1949,6 +2063,8 @@ advancedSettings:
|
|||||||
'harv-rancher-cluster': 'Configure Rancher cluster integration settings for guest cluster management.'
|
'harv-rancher-cluster': 'Configure Rancher cluster integration settings for guest cluster management.'
|
||||||
'harv-max-hotplug-ratio': 'The ratio for kubevirt to limit the maximum CPU and memory that can be hotplugged to a VM. The value could be an integer between 1 and 20, default to 4.'
|
'harv-max-hotplug-ratio': 'The ratio for kubevirt to limit the maximum CPU and memory that can be hotplugged to a VM. The value could be an integer between 1 and 20, default to 4.'
|
||||||
'harv-kubevirt-migration': 'Configure cluster-wide KubeVirt live migration parameters.'
|
'harv-kubevirt-migration': 'Configure cluster-wide KubeVirt live migration parameters.'
|
||||||
|
'harv-instance-manager-resources': 'Configure resource percentage reservations for Longhorn instance manager V1 and V2. Valid instance manager CPU range between 0 - 40.'
|
||||||
|
'harv-cluster-pod-security-standard': 'Enforce Kubernetes Pod Security Standards (PSS) at the cluster level.'
|
||||||
|
|
||||||
typeLabel:
|
typeLabel:
|
||||||
kubevirt.io.virtualmachine: |-
|
kubevirt.io.virtualmachine: |-
|
||||||
@@ -2071,11 +2187,7 @@ typeLabel:
|
|||||||
one { PCI Device }
|
one { PCI Device }
|
||||||
other { PCI Devices }
|
other { PCI Devices }
|
||||||
}
|
}
|
||||||
persistentvolumeclaim: |-
|
|
||||||
{count, plural,
|
|
||||||
one { Volume }
|
|
||||||
other { Volumes }
|
|
||||||
}
|
|
||||||
network.harvesterhci.io.clusternetwork: |-
|
network.harvesterhci.io.clusternetwork: |-
|
||||||
{count, plural,
|
{count, plural,
|
||||||
one { Cluster Network }
|
one { Cluster Network }
|
||||||
@@ -2130,3 +2242,23 @@ typeLabel:
|
|||||||
one { IP Pool }
|
one { IP Pool }
|
||||||
other { IP Pools }
|
other { IP Pools }
|
||||||
}
|
}
|
||||||
|
migration.harvesterhci.io.openstacksource: |-
|
||||||
|
{count, plural,
|
||||||
|
one { OpenStack Source }
|
||||||
|
other { OpenStack Sources }
|
||||||
|
}
|
||||||
|
migration.harvesterhci.io.vmwaresource: |-
|
||||||
|
{count, plural,
|
||||||
|
one { VMware Source }
|
||||||
|
other { VMware Sources }
|
||||||
|
}
|
||||||
|
migration.harvesterhci.io.ovasource: |-
|
||||||
|
{count, plural,
|
||||||
|
one { OVA Source }
|
||||||
|
other { OVA Sources }
|
||||||
|
}
|
||||||
|
migration.harvesterhci.io.virtualmachineimport: |-
|
||||||
|
{count, plural,
|
||||||
|
one { Virtual Machine Import }
|
||||||
|
other { Virtual Machine Imports }
|
||||||
|
}
|
||||||
|
|||||||
@@ -60,6 +60,17 @@ export default {
|
|||||||
return schema;
|
return schema;
|
||||||
},
|
},
|
||||||
|
|
||||||
|
toVGpuDevicesPage() {
|
||||||
|
return {
|
||||||
|
name: 'harvester-c-cluster-resource',
|
||||||
|
params: { cluster: this.$store.getters['clusterId'], resource: HCI.VGPU_DEVICE },
|
||||||
|
};
|
||||||
|
},
|
||||||
|
|
||||||
|
vGPUAsPCIDeviceEnabled() {
|
||||||
|
return this.$store.getters['harvester-common/getFeatureEnabled']('vGPUAsPCIDevice');
|
||||||
|
},
|
||||||
|
|
||||||
rows() {
|
rows() {
|
||||||
const inStore = this.$store.getters['currentProduct'].inStore;
|
const inStore = this.$store.getters['currentProduct'].inStore;
|
||||||
const rows = this.$store.getters[`${ inStore }/all`](HCI.PCI_DEVICE);
|
const rows = this.$store.getters[`${ inStore }/all`](HCI.PCI_DEVICE);
|
||||||
@@ -85,11 +96,23 @@ export default {
|
|||||||
{{ t('harvester.pci.noPCIPermission') }}
|
{{ t('harvester.pci.noPCIPermission') }}
|
||||||
</Banner>
|
</Banner>
|
||||||
</div>
|
</div>
|
||||||
<DeviceList
|
<div v-else-if="hasSchema && enabledPCI">
|
||||||
v-else-if="hasSchema && enabledPCI"
|
<Banner
|
||||||
:devices="rows"
|
v-if="vGPUAsPCIDeviceEnabled"
|
||||||
:schema="schema"
|
color="info"
|
||||||
/>
|
>
|
||||||
|
<MessageLink
|
||||||
|
:to="toVGpuDevicesPage"
|
||||||
|
prefix-label="harvester.pci.howToUseDevice.prefix"
|
||||||
|
middle-label="harvester.pci.howToUseDevice.middle"
|
||||||
|
suffix-label="harvester.pci.howToUseDevice.suffix"
|
||||||
|
/>
|
||||||
|
</Banner>
|
||||||
|
<DeviceList
|
||||||
|
:devices="rows"
|
||||||
|
:schema="schema"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
<div v-else>
|
<div v-else>
|
||||||
<Banner color="warning">
|
<Banner color="warning">
|
||||||
<MessageLink
|
<MessageLink
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ import { Banner } from '@components/Banner';
|
|||||||
import Loading from '@shell/components/Loading';
|
import Loading from '@shell/components/Loading';
|
||||||
import ResourceTable from '@shell/components/ResourceTable';
|
import ResourceTable from '@shell/components/ResourceTable';
|
||||||
import BadgeState from '@shell/components/formatter/BadgeStateFormatter';
|
import BadgeState from '@shell/components/formatter/BadgeStateFormatter';
|
||||||
|
|
||||||
import { NAME, AGE, NAMESPACE, STATE } from '@shell/config/table-headers';
|
import { NAME, AGE, NAMESPACE, STATE } from '@shell/config/table-headers';
|
||||||
import { NETWORK_ATTACHMENT, SCHEMA } from '@shell/config/types';
|
import { NETWORK_ATTACHMENT, SCHEMA } from '@shell/config/types';
|
||||||
import { allHash } from '@shell/utils/promise';
|
import { allHash } from '@shell/utils/promise';
|
||||||
@@ -113,6 +112,7 @@ export default {
|
|||||||
value: 'connectivity',
|
value: 'connectivity',
|
||||||
labelKey: 'tableHeaders.routeConnectivity',
|
labelKey: 'tableHeaders.routeConnectivity',
|
||||||
formatter: 'NetworkRouteConnectivity',
|
formatter: 'NetworkRouteConnectivity',
|
||||||
|
tooltip: 'harvester.tableHeaders.routeConnectivityTooltip',
|
||||||
formatterOpts: { arbitrary: true },
|
formatterOpts: { arbitrary: true },
|
||||||
width: 130,
|
width: 130,
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -70,8 +70,13 @@ export default {
|
|||||||
return schema;
|
return schema;
|
||||||
},
|
},
|
||||||
filterRows() {
|
filterRows() {
|
||||||
// we only show the non golden image PVCs in the list
|
return this.rows.filter((pvc) => {
|
||||||
return this.rows.filter((pvc) => !pvc?.isGoldenImageVolume);
|
if (pvc?.isGoldenImageVolume || pvc?.isCDIPopulatorVolume) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
});
|
||||||
},
|
},
|
||||||
headers() {
|
headers() {
|
||||||
return [
|
return [
|
||||||
|
|||||||
@@ -155,6 +155,15 @@ export default {
|
|||||||
return location;
|
return location;
|
||||||
},
|
},
|
||||||
|
|
||||||
|
viewTopology(group) {
|
||||||
|
const vpc = group.key;
|
||||||
|
const resource = this.$store.getters[`harvester/byId`](HCI.VPC, vpc);
|
||||||
|
|
||||||
|
if (resource && resource.goToDetail) {
|
||||||
|
resource.goToDetail();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
showVpcAction(event, group) {
|
showVpcAction(event, group) {
|
||||||
const vpc = group.key;
|
const vpc = group.key;
|
||||||
|
|
||||||
@@ -218,6 +227,14 @@ export default {
|
|||||||
>
|
>
|
||||||
{{ t('harvester.vpc.createSubnet') }}
|
{{ t('harvester.vpc.createSubnet') }}
|
||||||
</router-link>
|
</router-link>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
class="btn btn-sm role-secondary mr-5"
|
||||||
|
@click="viewTopology(group)"
|
||||||
|
>
|
||||||
|
<i class="icon icon-globe mr-5" />
|
||||||
|
{{ t('harvester.vpc.viewTopology') }}
|
||||||
|
</button>
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
class="btn btn-sm role-multi-action actions mr-10"
|
class="btn btn-sm role-multi-action actions mr-10"
|
||||||
|
|||||||
@@ -12,11 +12,18 @@ import { HCI } from '../types';
|
|||||||
import HarvesterVmState from '../formatters/HarvesterVmState';
|
import HarvesterVmState from '../formatters/HarvesterVmState';
|
||||||
import ConsoleBar from '../components/VMConsoleBar';
|
import ConsoleBar from '../components/VMConsoleBar';
|
||||||
|
|
||||||
|
const ENCRYPTED_VOLUME_TOOLTIP_KEYS = {
|
||||||
|
all: 'harvester.virtualMachine.volume.lockTooltip.all',
|
||||||
|
partial: 'harvester.virtualMachine.volume.lockTooltip.partial',
|
||||||
|
};
|
||||||
|
|
||||||
export const VM_HEADERS = [
|
export const VM_HEADERS = [
|
||||||
STATE,
|
STATE,
|
||||||
{
|
{
|
||||||
...NAME,
|
...NAME,
|
||||||
width: 350,
|
width: 350,
|
||||||
|
value: 'nameDisplay',
|
||||||
|
sort: ['nameDisplay'],
|
||||||
},
|
},
|
||||||
NAMESPACE,
|
NAMESPACE,
|
||||||
{
|
{
|
||||||
@@ -93,28 +100,17 @@ export default {
|
|||||||
this.hasNode = true;
|
this.hasNode = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.$store.getters[`${ inStore }/schemaFor`](HCI.NODE_NETWORK)) {
|
|
||||||
_hash.nodeNetworks = this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.NODE_NETWORK });
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.$store.getters[`${ inStore }/schemaFor`](HCI.CLUSTER_NETWORK)) {
|
|
||||||
_hash.clusterNetworks = this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.CLUSTER_NETWORK });
|
|
||||||
}
|
|
||||||
|
|
||||||
const hash = await allHash(_hash);
|
const hash = await allHash(_hash);
|
||||||
|
|
||||||
this.allVMs = hash.vms;
|
this.allVMs = hash.vms;
|
||||||
this.allNodeNetworks = hash.nodeNetworks || [];
|
|
||||||
this.allClusterNetworks = hash.clusterNetworks || [];
|
|
||||||
},
|
},
|
||||||
|
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
hasNode: false,
|
hasNode: false,
|
||||||
allVMs: [],
|
allVMs: [],
|
||||||
allVMIs: [],
|
allVMIs: [],
|
||||||
allNodeNetworks: [],
|
restartNotificationDisplayed: false,
|
||||||
allClusterNetworks: [],
|
|
||||||
HCI
|
HCI
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
@@ -162,6 +158,12 @@ export default {
|
|||||||
*/
|
*/
|
||||||
hasBackUpRestoreInProgress() {
|
hasBackUpRestoreInProgress() {
|
||||||
return !!this.rows.find((r) => r.restoreResource && !r.restoreResource.fromSnapshot && !r.restoreResource.isComplete);
|
return !!this.rows.find((r) => r.restoreResource && !r.restoreResource.fromSnapshot && !r.restoreResource.isComplete);
|
||||||
|
},
|
||||||
|
|
||||||
|
vmRestartRequiredNames() {
|
||||||
|
return this.allVMs
|
||||||
|
.filter((vm) => vm.isRestartRequired)
|
||||||
|
.map((vm) => vm.metadata.name);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -174,17 +176,41 @@ export default {
|
|||||||
this['allVMIs'] = vmis;
|
this['allVMIs'] = vmis;
|
||||||
},
|
},
|
||||||
|
|
||||||
methods: {
|
beforeUnmount() {
|
||||||
lockIconTooltipMessage(row) {
|
// clear restart message before component unmount
|
||||||
const message = '';
|
this.$store.dispatch('growl/clear');
|
||||||
|
},
|
||||||
|
|
||||||
if (row.encryptedVolumeType === 'all') {
|
watch: {
|
||||||
return this.t('harvester.virtualMachine.volume.lockTooltip.all');
|
vmRestartRequiredNames(vmNames) {
|
||||||
} else if (row.encryptedVolumeType === 'partial') {
|
const count = vmNames.length;
|
||||||
return this.t('harvester.virtualMachine.volume.lockTooltip.partial');
|
|
||||||
|
if (count === 0 && this.restartNotificationDisplayed) {
|
||||||
|
this.restartNotificationDisplayed = false;
|
||||||
|
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
return message;
|
if (count > 0) {
|
||||||
|
// clear old notification before showing new one
|
||||||
|
if (this.restartNotificationDisplayed) {
|
||||||
|
this.$store.dispatch('growl/clear');
|
||||||
|
}
|
||||||
|
|
||||||
|
this.$store.dispatch('growl/warning', {
|
||||||
|
title: this.t('harvester.notification.restartRequired.title', { count }),
|
||||||
|
message: this.t('harvester.notification.restartRequired.message', { vmNames: vmNames.join(', ') }),
|
||||||
|
timeout: 10000,
|
||||||
|
}, { root: true });
|
||||||
|
this.restartNotificationDisplayed = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
lockIconTooltipMessage(row) {
|
||||||
|
const key = ENCRYPTED_VOLUME_TOOLTIP_KEYS[row.encryptedVolumeType];
|
||||||
|
|
||||||
|
return key ? this.t(key) : '';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -210,8 +236,6 @@ export default {
|
|||||||
<HarvesterVmState
|
<HarvesterVmState
|
||||||
class="vmstate"
|
class="vmstate"
|
||||||
:row="scope.row"
|
:row="scope.row"
|
||||||
:all-node-network="allNodeNetworks"
|
|
||||||
:all-cluster-network="allClusterNetworks"
|
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
@@ -222,16 +246,16 @@ export default {
|
|||||||
v-if="scope.row.type !== HCI.VMI"
|
v-if="scope.row.type !== HCI.VMI"
|
||||||
:to="scope.row.detailLocation"
|
:to="scope.row.detailLocation"
|
||||||
>
|
>
|
||||||
{{ scope.row.metadata.name }}
|
{{ scope.row.nameDisplay }}
|
||||||
<i
|
<i
|
||||||
v-if="lockIconTooltipMessage(scope.row)"
|
v-if="scope.row.encryptedVolumeType !== 'none'"
|
||||||
v-tooltip="lockIconTooltipMessage(scope.row)"
|
v-tooltip="lockIconTooltipMessage(scope.row)"
|
||||||
class="icon icon-lock"
|
class="icon icon-lock"
|
||||||
:class="{'green-icon': scope.row.encryptedVolumeType === 'all', 'yellow-icon': scope.row.encryptedVolumeType === 'partial'}"
|
:class="{'green-icon': scope.row.encryptedVolumeType === 'all', 'yellow-icon': scope.row.encryptedVolumeType === 'partial'}"
|
||||||
/>
|
/>
|
||||||
</router-link>
|
</router-link>
|
||||||
<span v-else>
|
<span v-else>
|
||||||
{{ scope.row.metadata.name }}
|
{{ scope.row.nameDisplay }}
|
||||||
</span>
|
</span>
|
||||||
<ConsoleBar
|
<ConsoleBar
|
||||||
:resource-type="scope.row"
|
:resource-type="scope.row"
|
||||||
@@ -243,6 +267,12 @@ export default {
|
|||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
<style lang="scss">
|
||||||
|
.growl-container {
|
||||||
|
z-index: 56 !important; // set to be lower than the vm action menu (z-index: 57)
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
.state {
|
.state {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|||||||
@@ -0,0 +1,60 @@
|
|||||||
|
<script>
|
||||||
|
import ResourceTable from '@shell/components/ResourceTable';
|
||||||
|
import Loading from '@shell/components/Loading';
|
||||||
|
import { SCHEMA } from '@shell/config/types';
|
||||||
|
import { HCI } from '../types';
|
||||||
|
|
||||||
|
const schema = {
|
||||||
|
id: HCI.VMIMPORT_SOURCE_OVA,
|
||||||
|
type: SCHEMA,
|
||||||
|
attributes: {
|
||||||
|
kind: HCI.VMIMPORT_SOURCE_OVA,
|
||||||
|
namespaced: true
|
||||||
|
},
|
||||||
|
metadata: { name: HCI.VMIMPORT_SOURCE_OVA },
|
||||||
|
};
|
||||||
|
|
||||||
|
export default {
|
||||||
|
name: 'HarvesterVMImportSourceOVA',
|
||||||
|
components: { ResourceTable, Loading },
|
||||||
|
inheritAttrs: false,
|
||||||
|
|
||||||
|
async fetch() {
|
||||||
|
const inStore = this.$store.getters['currentProduct'].inStore;
|
||||||
|
|
||||||
|
this.rows = await this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.VMIMPORT_SOURCE_OVA });
|
||||||
|
|
||||||
|
const configSchema = this.$store.getters[`${ inStore }/schemaFor`](HCI.VMIMPORT_SOURCE_OVA);
|
||||||
|
|
||||||
|
if (!configSchema?.collectionMethods.find((x) => x.toLowerCase() === 'post')) {
|
||||||
|
this.$store.dispatch('type-map/configureType', { match: HCI.VMIMPORT_SOURCE_OVA, isCreatable: false });
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
data() {
|
||||||
|
return { rows: [] };
|
||||||
|
},
|
||||||
|
|
||||||
|
computed: {
|
||||||
|
schema() {
|
||||||
|
return schema;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
typeDisplay() {
|
||||||
|
return this.$store.getters['type-map/labelFor'](schema, 99);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<Loading v-if="$fetchState.pending" />
|
||||||
|
<ResourceTable
|
||||||
|
v-else
|
||||||
|
v-bind="$attrs"
|
||||||
|
:groupable="true"
|
||||||
|
:schema="schema"
|
||||||
|
:rows="rows"
|
||||||
|
key-field="_key"
|
||||||
|
/>
|
||||||
|
</template>
|
||||||
@@ -12,7 +12,7 @@ import { base64Decode } from '@shell/utils/crypto';
|
|||||||
import { formatSi, parseSi } from '@shell/utils/units';
|
import { formatSi, parseSi } from '@shell/utils/units';
|
||||||
import { _CLONE, _CREATE, _VIEW } from '@shell/config/query-params';
|
import { _CLONE, _CREATE, _VIEW } from '@shell/config/query-params';
|
||||||
import {
|
import {
|
||||||
PV, PVC, STORAGE_CLASS, NODE, SECRET, CONFIG_MAP, NETWORK_ATTACHMENT, NAMESPACE, LONGHORN
|
PV, PVC, STORAGE_CLASS, NODE, SECRET, CONFIG_MAP, SERVICE_ACCOUNT, NETWORK_ATTACHMENT, NAMESPACE, LONGHORN
|
||||||
} from '@shell/config/types';
|
} from '@shell/config/types';
|
||||||
import { HOSTNAME } from '@shell/config/labels-annotations';
|
import { HOSTNAME } from '@shell/config/labels-annotations';
|
||||||
import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations';
|
import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations';
|
||||||
@@ -22,10 +22,10 @@ import {
|
|||||||
} from '../../config/harvester-map';
|
} from '../../config/harvester-map';
|
||||||
import { HCI_SETTING } from '../../config/settings';
|
import { HCI_SETTING } from '../../config/settings';
|
||||||
import { HCI } from '../../types';
|
import { HCI } from '../../types';
|
||||||
import { parseVolumeClaimTemplates } from '../../utils/vm';
|
import { parseVolumeClaimTemplates, EMPTY_IMAGE } from '../../utils/vm';
|
||||||
import impl, { QGA_JSON, USB_TABLET } from './impl';
|
import impl, { QGA_JSON, USB_TABLET } from './impl';
|
||||||
import { GIBIBYTE } from '../../utils/unit';
|
import { GIBIBYTE } from '../../utils/unit';
|
||||||
import { VOLUME_MODE } from '@pkg/harvester/config/types';
|
import { VOLUME_MODE, FILESYSTEM_SOURCE_TYPE } from '@pkg/harvester/config/types';
|
||||||
|
|
||||||
const LONGHORN_V2_DATA_ENGINE = 'longhorn-system/v2-data-engine';
|
const LONGHORN_V2_DATA_ENGINE = 'longhorn-system/v2-data-engine';
|
||||||
|
|
||||||
@@ -102,6 +102,8 @@ export default {
|
|||||||
vmims: this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.VMIM }),
|
vmims: this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.VMIM }),
|
||||||
vms: this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.VM }),
|
vms: this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.VM }),
|
||||||
secrets: this.$store.dispatch(`${ inStore }/findAll`, { type: SECRET }),
|
secrets: this.$store.dispatch(`${ inStore }/findAll`, { type: SECRET }),
|
||||||
|
configMaps: this.$store.dispatch(`${ inStore }/findAll`, { type: CONFIG_MAP }),
|
||||||
|
serviceAccounts: this.$store.dispatch(`${ inStore }/findAll`, { type: SERVICE_ACCOUNT }),
|
||||||
addons: this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.ADD_ONS }),
|
addons: this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.ADD_ONS }),
|
||||||
longhornV2Engine: this.$store.dispatch(`${ inStore }/find`, { type: LONGHORN.SETTINGS, id: LONGHORN_V2_DATA_ENGINE }),
|
longhornV2Engine: this.$store.dispatch(`${ inStore }/find`, { type: LONGHORN.SETTINGS, id: LONGHORN_V2_DATA_ENGINE }),
|
||||||
};
|
};
|
||||||
@@ -156,6 +158,7 @@ export default {
|
|||||||
imageId: '',
|
imageId: '',
|
||||||
diskRows: [],
|
diskRows: [],
|
||||||
networkRows: [],
|
networkRows: [],
|
||||||
|
filesystemRows: [],
|
||||||
machineType: '',
|
machineType: '',
|
||||||
machineTypes: [],
|
machineTypes: [],
|
||||||
secretName: '',
|
secretName: '',
|
||||||
@@ -182,6 +185,7 @@ export default {
|
|||||||
immutableMode: this.realMode === _CREATE ? _CREATE : _VIEW,
|
immutableMode: this.realMode === _CREATE ? _CREATE : _VIEW,
|
||||||
terminationGracePeriodSeconds: '',
|
terminationGracePeriodSeconds: '',
|
||||||
cpuPinning: false,
|
cpuPinning: false,
|
||||||
|
cpuModel: '',
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -394,6 +398,7 @@ export default {
|
|||||||
const efiPersistentStateEnabled = this.isEFIPersistentStateEnabled(spec);
|
const efiPersistentStateEnabled = this.isEFIPersistentStateEnabled(spec);
|
||||||
const secureBoot = this.isSecureBoot(spec);
|
const secureBoot = this.isSecureBoot(spec);
|
||||||
const cpuPinning = this.isCpuPinning(spec);
|
const cpuPinning = this.isCpuPinning(spec);
|
||||||
|
const cpuModel = spec.template.spec.domain.cpu?.model || '';
|
||||||
|
|
||||||
const secretRef = this.getSecret(spec);
|
const secretRef = this.getSecret(spec);
|
||||||
const accessCredentials = this.getAccessCredentials(spec);
|
const accessCredentials = this.getAccessCredentials(spec);
|
||||||
@@ -431,12 +436,14 @@ export default {
|
|||||||
this['tpmPersistentStateEnabled'] = tpmPersistentStateEnabled;
|
this['tpmPersistentStateEnabled'] = tpmPersistentStateEnabled;
|
||||||
this['secureBoot'] = secureBoot;
|
this['secureBoot'] = secureBoot;
|
||||||
this['cpuPinning'] = cpuPinning;
|
this['cpuPinning'] = cpuPinning;
|
||||||
|
this['cpuModel'] = cpuModel;
|
||||||
|
|
||||||
this['hasCreateVolumes'] = hasCreateVolumes;
|
this['hasCreateVolumes'] = hasCreateVolumes;
|
||||||
this['networkRows'] = networkRows;
|
this['networkRows'] = networkRows;
|
||||||
this['imageId'] = imageId;
|
this['imageId'] = imageId;
|
||||||
|
|
||||||
this['diskRows'] = diskRows;
|
this['diskRows'] = diskRows;
|
||||||
|
this['filesystemRows'] = this.getFilesystemRows(vm);
|
||||||
|
|
||||||
this.refreshYamlEditor();
|
this.refreshYamlEditor();
|
||||||
},
|
},
|
||||||
@@ -508,12 +515,15 @@ export default {
|
|||||||
|
|
||||||
const type = DISK?.cdrom ? CD_ROM : DISK?.disk ? HARD_DISK : '';
|
const type = DISK?.cdrom ? CD_ROM : DISK?.disk ? HARD_DISK : '';
|
||||||
|
|
||||||
if (volume?.containerDisk) { // SOURCE_TYPE.CONTAINER
|
if (type === CD_ROM && volume === undefined) {
|
||||||
|
// Empty CD_ROM
|
||||||
|
source = SOURCE_TYPE.IMAGE;
|
||||||
|
image = EMPTY_IMAGE;
|
||||||
|
size = `0${ GIBIBYTE }`;
|
||||||
|
} else if (volume.containerDisk) { // SOURCE_TYPE.CONTAINER
|
||||||
source = SOURCE_TYPE.CONTAINER;
|
source = SOURCE_TYPE.CONTAINER;
|
||||||
container = volume.containerDisk.image;
|
container = volume.containerDisk.image;
|
||||||
}
|
} else if (volume.persistentVolumeClaim && volume.persistentVolumeClaim?.claimName) {
|
||||||
|
|
||||||
if (volume.persistentVolumeClaim && volume.persistentVolumeClaim?.claimName) {
|
|
||||||
volumeName = volume.persistentVolumeClaim.claimName;
|
volumeName = volume.persistentVolumeClaim.claimName;
|
||||||
const DVT = _volumeClaimTemplates.find( (T) => T.metadata.name === volumeName);
|
const DVT = _volumeClaimTemplates.find( (T) => T.metadata.name === volumeName);
|
||||||
|
|
||||||
@@ -635,6 +645,80 @@ export default {
|
|||||||
this.parseAccessCredentials();
|
this.parseAccessCredentials();
|
||||||
this.parseNetworkRows(this.networkRows);
|
this.parseNetworkRows(this.networkRows);
|
||||||
this.parseDiskRows(this.diskRows);
|
this.parseDiskRows(this.diskRows);
|
||||||
|
this.parseFilesystemRows();
|
||||||
|
},
|
||||||
|
|
||||||
|
getFilesystemRows(vm) {
|
||||||
|
const _filesystems = vm.spec.template.spec.domain.devices?.filesystems || [];
|
||||||
|
const _volumes = vm.spec.template.spec.volumes || [];
|
||||||
|
|
||||||
|
return _filesystems.map((fs) => {
|
||||||
|
const volume = _volumes.find((v) => v.name === fs.name);
|
||||||
|
let fsType = FILESYSTEM_SOURCE_TYPE.CONFIGMAP;
|
||||||
|
let resourceName = '';
|
||||||
|
|
||||||
|
if (volume?.configMap) {
|
||||||
|
fsType = FILESYSTEM_SOURCE_TYPE.CONFIGMAP;
|
||||||
|
resourceName = volume.configMap.name;
|
||||||
|
} else if (volume?.secret) {
|
||||||
|
fsType = FILESYSTEM_SOURCE_TYPE.SECRET;
|
||||||
|
resourceName = volume.secret.secretName;
|
||||||
|
} else if (volume?.serviceAccount) {
|
||||||
|
fsType = FILESYSTEM_SOURCE_TYPE.SERVICEACCOUNT;
|
||||||
|
resourceName = volume.serviceAccount.serviceAccountName;
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
fsType,
|
||||||
|
volumeName: fs.name,
|
||||||
|
resourceName,
|
||||||
|
};
|
||||||
|
});
|
||||||
|
},
|
||||||
|
|
||||||
|
parseFilesystemRows() {
|
||||||
|
const completedRows = this.filesystemRows.filter(
|
||||||
|
(r) => r.fsType && r.volumeName && r.resourceName
|
||||||
|
);
|
||||||
|
|
||||||
|
const filesystems = completedRows.map((r) => ({
|
||||||
|
name: r.volumeName,
|
||||||
|
virtiofs: {},
|
||||||
|
}));
|
||||||
|
|
||||||
|
const fsVolumes = completedRows.map((r) => {
|
||||||
|
if (r.fsType === FILESYSTEM_SOURCE_TYPE.CONFIGMAP) {
|
||||||
|
return {
|
||||||
|
name: r.volumeName,
|
||||||
|
configMap: { name: r.resourceName },
|
||||||
|
};
|
||||||
|
} else if (r.fsType === FILESYSTEM_SOURCE_TYPE.SECRET) {
|
||||||
|
return {
|
||||||
|
name: r.volumeName,
|
||||||
|
secret: { secretName: r.resourceName },
|
||||||
|
};
|
||||||
|
} else if (r.fsType === FILESYSTEM_SOURCE_TYPE.SERVICEACCOUNT) {
|
||||||
|
return {
|
||||||
|
name: r.volumeName,
|
||||||
|
serviceAccount: { serviceAccountName: r.resourceName },
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}).filter(Boolean);
|
||||||
|
|
||||||
|
if (filesystems.length > 0) {
|
||||||
|
this.spec.template.spec.domain.devices['filesystems'] = filesystems;
|
||||||
|
} else {
|
||||||
|
delete this.spec.template.spec.domain.devices['filesystems'];
|
||||||
|
}
|
||||||
|
|
||||||
|
if (fsVolumes.length > 0) {
|
||||||
|
if (!this.spec.template.spec.volumes) {
|
||||||
|
this.spec.template.spec['volumes'] = [];
|
||||||
|
}
|
||||||
|
this.spec.template.spec.volumes.push(...fsVolumes);
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
parseOther() {
|
parseOther() {
|
||||||
@@ -701,25 +785,41 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
needVolumeRelatedInfo(R) {
|
||||||
|
// return [needVolume, needVolumeClaimTemplate]
|
||||||
|
if (R.source === SOURCE_TYPE.CONTAINER) {
|
||||||
|
return [true, false];
|
||||||
|
}
|
||||||
|
|
||||||
|
if (R.source === SOURCE_TYPE.IMAGE && R.image === EMPTY_IMAGE) {
|
||||||
|
return [false, false];
|
||||||
|
}
|
||||||
|
|
||||||
|
return [true, true];
|
||||||
|
},
|
||||||
|
|
||||||
parseDiskRows(disk) {
|
parseDiskRows(disk) {
|
||||||
const disks = [];
|
const disks = [];
|
||||||
const volumes = [];
|
const volumes = [];
|
||||||
const diskNameLabels = [];
|
|
||||||
const volumeClaimTemplates = [];
|
const volumeClaimTemplates = [];
|
||||||
|
|
||||||
disk.forEach( (R, index) => {
|
disk.forEach( (R, index) => {
|
||||||
const prefixName = this.value.metadata?.name || '';
|
|
||||||
const dataVolumeName = this.parseDataVolumeName(R, prefixName);
|
|
||||||
|
|
||||||
const _disk = this.parseDisk(R, index);
|
const _disk = this.parseDisk(R, index);
|
||||||
const _volume = this.parseVolume(R, dataVolumeName);
|
|
||||||
const _dataVolumeTemplate = this.parseVolumeClaimTemplate(R, dataVolumeName);
|
|
||||||
|
|
||||||
disks.push(_disk);
|
disks.push(_disk);
|
||||||
volumes.push(_volume);
|
|
||||||
diskNameLabels.push(dataVolumeName);
|
|
||||||
|
|
||||||
if (R.source !== SOURCE_TYPE.CONTAINER) {
|
const prefixName = this.value.metadata?.name || '';
|
||||||
|
const dataVolumeName = this.parseDataVolumeName(R, prefixName);
|
||||||
|
const [needVolume, needVolumeClaimTemplate] = this.needVolumeRelatedInfo(R);
|
||||||
|
|
||||||
|
if (needVolume) {
|
||||||
|
const _volume = this.parseVolume(R, dataVolumeName);
|
||||||
|
|
||||||
|
volumes.push(_volume);
|
||||||
|
}
|
||||||
|
if (needVolumeClaimTemplate) {
|
||||||
|
const _dataVolumeTemplate = this.parseVolumeClaimTemplate(R, dataVolumeName);
|
||||||
|
|
||||||
volumeClaimTemplates.push(_dataVolumeTemplate);
|
volumeClaimTemplates.push(_dataVolumeTemplate);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -885,14 +985,22 @@ export default {
|
|||||||
const specInterfaces = this.spec?.template?.spec?.domain?.devices?.interfaces;
|
const specInterfaces = this.spec?.template?.spec?.domain?.devices?.interfaces;
|
||||||
const mergedInterfaces = this.mergeInterfaceList(specInterfaces, interfaces);
|
const mergedInterfaces = this.mergeInterfaceList(specInterfaces, interfaces);
|
||||||
|
|
||||||
|
const devices = {
|
||||||
|
...this.spec.template.spec.domain.devices,
|
||||||
|
interfaces: mergedInterfaces,
|
||||||
|
};
|
||||||
|
|
||||||
|
if (this.isEdit && networkRow.length === 0) {
|
||||||
|
devices.autoattachPodInterface = false;
|
||||||
|
} else {
|
||||||
|
delete devices.autoattachPodInterface;
|
||||||
|
}
|
||||||
|
|
||||||
const spec = {
|
const spec = {
|
||||||
...this.spec.template.spec,
|
...this.spec.template.spec,
|
||||||
domain: {
|
domain: {
|
||||||
...this.spec.template.spec.domain,
|
...this.spec.template.spec.domain,
|
||||||
devices: {
|
devices,
|
||||||
...this.spec.template.spec.domain.devices,
|
|
||||||
interfaces: mergedInterfaces,
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
networks
|
networks
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ import HarvesterResource from './harvester';
|
|||||||
export default class MIGCONFIGURATION extends HarvesterResource {
|
export default class MIGCONFIGURATION extends HarvesterResource {
|
||||||
get _availableActions() {
|
get _availableActions() {
|
||||||
let out = super._availableActions;
|
let out = super._availableActions;
|
||||||
|
const canUpdate = !!this.linkFor('update');
|
||||||
|
|
||||||
out = out.map((action) => {
|
out = out.map((action) => {
|
||||||
if (action.action === 'showConfiguration') {
|
if (action.action === 'showConfiguration') {
|
||||||
@@ -26,13 +27,13 @@ export default class MIGCONFIGURATION extends HarvesterResource {
|
|||||||
out.push(
|
out.push(
|
||||||
{
|
{
|
||||||
action: 'enableConfig',
|
action: 'enableConfig',
|
||||||
enabled: !this.isEnabled,
|
enabled: !this.isEnabled && canUpdate,
|
||||||
icon: 'icon icon-fw icon-dot',
|
icon: 'icon icon-fw icon-dot',
|
||||||
label: 'Enable',
|
label: 'Enable',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
action: 'disableConfig',
|
action: 'disableConfig',
|
||||||
enabled: this.isEnabled,
|
enabled: this.isEnabled && canUpdate,
|
||||||
icon: 'icon icon-fw icon-dot-open',
|
icon: 'icon icon-fw icon-dot-open',
|
||||||
label: 'Disable',
|
label: 'Disable',
|
||||||
},
|
},
|
||||||
@@ -62,13 +63,27 @@ export default class MIGCONFIGURATION extends HarvesterResource {
|
|||||||
}
|
}
|
||||||
|
|
||||||
get stateDisplay() {
|
get stateDisplay() {
|
||||||
|
if (this.configStatus === 'out-of-sync') {
|
||||||
|
return this.t('harvester.migconfiguration.status.outOfSync');
|
||||||
|
}
|
||||||
|
|
||||||
return this.actualState;
|
return this.actualState;
|
||||||
}
|
}
|
||||||
|
|
||||||
get stateColor() {
|
get stateDescription() {
|
||||||
const state = this.actualState;
|
if (this.status?.message) {
|
||||||
|
return this.status.message;
|
||||||
|
}
|
||||||
|
|
||||||
return colorForState(state);
|
return super.stateDescription;
|
||||||
|
}
|
||||||
|
|
||||||
|
get stateColor() {
|
||||||
|
if (this.configStatus === 'out-of-sync') {
|
||||||
|
return 'text-warning';
|
||||||
|
}
|
||||||
|
|
||||||
|
return colorForState(this.actualState);
|
||||||
}
|
}
|
||||||
|
|
||||||
get isEnabled() {
|
get isEnabled() {
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
import SteveModel from '@shell/plugins/steve/steve-class';
|
import SteveModel from '@shell/plugins/steve/steve-class';
|
||||||
import { escapeHtml } from '@shell/utils/string';
|
import { escapeHtml } from '@shell/utils/string';
|
||||||
import { HCI } from '../types';
|
import { HCI } from '../types';
|
||||||
|
import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations';
|
||||||
|
import { getHarvesterUserName } from '../utils/auth';
|
||||||
|
|
||||||
const STATUS_DISPLAY = {
|
const STATUS_DISPLAY = {
|
||||||
enabled: {
|
enabled: {
|
||||||
@@ -32,7 +34,7 @@ export default class PCIDevice extends SteveModel {
|
|||||||
out.push(
|
out.push(
|
||||||
{
|
{
|
||||||
action: 'enablePassthroughBulk',
|
action: 'enablePassthroughBulk',
|
||||||
enabled: !this.isEnabling,
|
enabled: !this.isEnabling && !this.isvGPUDevice && this.canUpdate,
|
||||||
icon: 'icon icon-fw icon-dot',
|
icon: 'icon icon-fw icon-dot',
|
||||||
label: 'Enable Passthrough',
|
label: 'Enable Passthrough',
|
||||||
bulkable: true,
|
bulkable: true,
|
||||||
@@ -41,7 +43,7 @@ export default class PCIDevice extends SteveModel {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
action: 'disablePassthrough',
|
action: 'disablePassthrough',
|
||||||
enabled: this.isEnabling && this.claimedByMe,
|
enabled: this.isEnabling && this.claimedByMe && !this.isvGPUDevice && this.canUpdate,
|
||||||
icon: 'icon icon-fw icon-dot-open',
|
icon: 'icon icon-fw icon-dot-open',
|
||||||
label: 'Disable Passthrough',
|
label: 'Disable Passthrough',
|
||||||
bulkable: true,
|
bulkable: true,
|
||||||
@@ -52,6 +54,18 @@ export default class PCIDevice extends SteveModel {
|
|||||||
return out;
|
return out;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
get canUpdate() {
|
||||||
|
return !!this.linkFor('update');
|
||||||
|
}
|
||||||
|
|
||||||
|
get isvGPUDevice() {
|
||||||
|
if (!this.vGPUAsPCIDeviceFeatureEnabled) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return !!this.metadata?.labels?.[HCI_ANNOTATIONS.PARENT_SRIOV_GPU];
|
||||||
|
}
|
||||||
|
|
||||||
get canYaml() {
|
get canYaml() {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@@ -87,15 +101,8 @@ export default class PCIDevice extends SteveModel {
|
|||||||
if (!this.passthroughClaim) {
|
if (!this.passthroughClaim) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
const isSingleProduct = this.$rootGetters['isSingleProduct'];
|
|
||||||
let userName = 'admin';
|
|
||||||
|
|
||||||
// if this is imported Harvester, there may be users other than admin
|
const userName = getHarvesterUserName(this.$rootGetters);
|
||||||
if (!isSingleProduct) {
|
|
||||||
const user = this.$rootGetters['auth/v3User'];
|
|
||||||
|
|
||||||
userName = user?.username || user?.id;
|
|
||||||
}
|
|
||||||
|
|
||||||
return this.claimedBy === userName;
|
return this.claimedBy === userName;
|
||||||
}
|
}
|
||||||
@@ -176,6 +183,10 @@ export default class PCIDevice extends SteveModel {
|
|||||||
return this.status?.description;
|
return this.status?.description;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
get vGPUAsPCIDeviceFeatureEnabled() {
|
||||||
|
return this.$rootGetters['harvester-common/getFeatureEnabled']('vGPUAsPCIDevice');
|
||||||
|
}
|
||||||
|
|
||||||
showDetachWarning() {
|
showDetachWarning() {
|
||||||
this.$dispatch('growl/warning', {
|
this.$dispatch('growl/warning', {
|
||||||
title: this.$rootGetters['i18n/t']('harvester.pci.detachWarning.title'),
|
title: this.$rootGetters['i18n/t']('harvester.pci.detachWarning.title'),
|
||||||
|
|||||||
@@ -16,13 +16,13 @@ export default class SRIOVDevice extends SteveModel {
|
|||||||
out.push(
|
out.push(
|
||||||
{
|
{
|
||||||
action: 'enableDevice',
|
action: 'enableDevice',
|
||||||
enabled: !this.isEnabled,
|
enabled: !this.isEnabled && this.canUpdate,
|
||||||
icon: 'icon icon-fw icon-dot',
|
icon: 'icon icon-fw icon-dot',
|
||||||
label: 'Enable',
|
label: 'Enable',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
action: 'disableDevice',
|
action: 'disableDevice',
|
||||||
enabled: this.isEnabled,
|
enabled: this.isEnabled && this.canUpdate,
|
||||||
icon: 'icon icon-fw icon-dot-open',
|
icon: 'icon icon-fw icon-dot-open',
|
||||||
label: 'Disable',
|
label: 'Disable',
|
||||||
},
|
},
|
||||||
@@ -31,6 +31,10 @@ export default class SRIOVDevice extends SteveModel {
|
|||||||
return out;
|
return out;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
get canUpdate() {
|
||||||
|
return !!this.linkFor('update');
|
||||||
|
}
|
||||||
|
|
||||||
get canYaml() {
|
get canYaml() {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import SteveModel from '@shell/plugins/steve/steve-class';
|
import SteveModel from '@shell/plugins/steve/steve-class';
|
||||||
import { escapeHtml } from '@shell/utils/string';
|
import { escapeHtml } from '@shell/utils/string';
|
||||||
import { HCI } from '../types';
|
import { HCI } from '../types';
|
||||||
|
import { getHarvesterUserName } from '../utils/auth';
|
||||||
|
|
||||||
const STATUS_DISPLAY = {
|
const STATUS_DISPLAY = {
|
||||||
enabled: {
|
enabled: {
|
||||||
@@ -32,7 +33,7 @@ export default class USBDevice extends SteveModel {
|
|||||||
out.push(
|
out.push(
|
||||||
{
|
{
|
||||||
action: 'enablePassthroughBulk',
|
action: 'enablePassthroughBulk',
|
||||||
enabled: !this.passthroughClaim && !this.status.enabled,
|
enabled: !this.passthroughClaim && !this.status.enabled && this.canUpdate,
|
||||||
icon: 'icon icon-fw icon-dot',
|
icon: 'icon icon-fw icon-dot',
|
||||||
label: 'Enable Passthrough',
|
label: 'Enable Passthrough',
|
||||||
bulkable: true,
|
bulkable: true,
|
||||||
@@ -41,7 +42,7 @@ export default class USBDevice extends SteveModel {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
action: 'disablePassthrough',
|
action: 'disablePassthrough',
|
||||||
enabled: this.status.enabled,
|
enabled: this.status.enabled && this.canUpdate,
|
||||||
icon: 'icon icon-fw icon-dot-open',
|
icon: 'icon icon-fw icon-dot-open',
|
||||||
label: 'Disable Passthrough',
|
label: 'Disable Passthrough',
|
||||||
bulkable: true,
|
bulkable: true,
|
||||||
@@ -52,6 +53,10 @@ export default class USBDevice extends SteveModel {
|
|||||||
return out;
|
return out;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
get canUpdate() {
|
||||||
|
return !!this.linkFor('update');
|
||||||
|
}
|
||||||
|
|
||||||
get canYaml() {
|
get canYaml() {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@@ -87,15 +92,8 @@ export default class USBDevice extends SteveModel {
|
|||||||
if (!this.passthroughClaim) {
|
if (!this.passthroughClaim) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
const isSingleProduct = this.$rootGetters['isSingleProduct'];
|
|
||||||
let userName = 'admin';
|
|
||||||
|
|
||||||
// if this is imported Harvester, there may be users other than admin
|
const userName = getHarvesterUserName(this.$rootGetters);
|
||||||
if (!isSingleProduct) {
|
|
||||||
const user = this.$rootGetters['auth/v3User'];
|
|
||||||
|
|
||||||
userName = user?.username || user?.id;
|
|
||||||
}
|
|
||||||
|
|
||||||
return this.claimedBy === userName;
|
return this.claimedBy === userName;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,17 +27,18 @@ const STATUS_DISPLAY = {
|
|||||||
export default class VGpuDevice extends SteveModel {
|
export default class VGpuDevice extends SteveModel {
|
||||||
get _availableActions() {
|
get _availableActions() {
|
||||||
const out = super._availableActions;
|
const out = super._availableActions;
|
||||||
|
const canUpdate = !!this.linkFor('update');
|
||||||
|
|
||||||
out.push(
|
out.push(
|
||||||
{
|
{
|
||||||
action: 'enableVGpu',
|
action: 'enableVGpu',
|
||||||
enabled: !this.isEnabled,
|
enabled: !this.isEnabled && canUpdate,
|
||||||
icon: 'icon icon-fw icon-dot',
|
icon: 'icon icon-fw icon-dot',
|
||||||
label: 'Enable',
|
label: 'Enable',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
action: 'disableVGpu',
|
action: 'disableVGpu',
|
||||||
enabled: this.isEnabled,
|
enabled: this.isEnabled && canUpdate,
|
||||||
icon: 'icon icon-fw icon-dot-open',
|
icon: 'icon icon-fw icon-dot-open',
|
||||||
label: 'Disable',
|
label: 'Disable',
|
||||||
bulkable: true,
|
bulkable: true,
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ const OBSCURE_NAMESPACE_PREFIX = [
|
|||||||
|
|
||||||
export default class HciNamespace extends namespace {
|
export default class HciNamespace extends namespace {
|
||||||
get _availableActions() {
|
get _availableActions() {
|
||||||
const out = super._availableActions;
|
let out = super._availableActions;
|
||||||
const remove = out.findIndex((a) => a.action === 'promptRemove');
|
const remove = out.findIndex((a) => a.action === 'promptRemove');
|
||||||
|
|
||||||
const promptRemove = {
|
const promptRemove = {
|
||||||
@@ -53,6 +53,16 @@ export default class HciNamespace extends namespace {
|
|||||||
insertAt(out, out.length - 1, promptRemove);
|
insertAt(out, out.length - 1, promptRemove);
|
||||||
insertAt(out, out.length - 5, editQuotaAction);
|
insertAt(out, out.length - 5, editQuotaAction);
|
||||||
|
|
||||||
|
const canUpdate = !!this.linkFor('update');
|
||||||
|
|
||||||
|
out = out.map((action) => {
|
||||||
|
if (['move'].includes(action.action)) {
|
||||||
|
return { ...action, enabled: action.enabled && canUpdate };
|
||||||
|
}
|
||||||
|
|
||||||
|
return action;
|
||||||
|
});
|
||||||
|
|
||||||
return out;
|
return out;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -536,8 +536,7 @@ export default class HciNode extends HarvesterResource {
|
|||||||
get isStopped() {
|
get isStopped() {
|
||||||
const inventory = this.inventory || {};
|
const inventory = this.inventory || {};
|
||||||
|
|
||||||
return inventory.spec?.powerActionRequested === 'shutdown' &&
|
return inventory.status?.machinePowerState === 'off';
|
||||||
inventory.status?.powerAction?.actionStatus === 'complete';
|
|
||||||
}
|
}
|
||||||
|
|
||||||
get isStopping() {
|
get isStopping() {
|
||||||
@@ -553,8 +552,7 @@ export default class HciNode extends HarvesterResource {
|
|||||||
get isStarted() {
|
get isStarted() {
|
||||||
const inventory = this.inventory || {};
|
const inventory = this.inventory || {};
|
||||||
|
|
||||||
return inventory.spec?.powerActionRequested === 'poweron' &&
|
return inventory.status?.machinePowerState === 'on';
|
||||||
inventory.status?.powerAction?.actionStatus === 'complete';
|
|
||||||
}
|
}
|
||||||
|
|
||||||
get isStarting() {
|
get isStarting() {
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user