Skip to content

Commit 2dff7b0

Browse files
authored
upgrade rancher/shell to 3.0.2-rc6 (#206)
Signed-off-by: Andy Lee <[email protected]>
1 parent 54c5d77 commit 2dff7b0

File tree

4 files changed

+11
-37
lines changed

4 files changed

+11
-37
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"node": ">=20.0.0"
77
},
88
"dependencies": {
9-
"@rancher/shell": "3.0.2-rc.3",
9+
"@rancher/shell": "3.0.2-rc.6",
1010
"cache-loader": "^4.1.0",
1111
"color": "4.2.3",
1212
"ip": "2.0.1",

pkg/harvester/components/settings/csi-driver-config.vue

-5
Original file line numberDiff line numberDiff line change
@@ -174,10 +174,6 @@ export default {
174174
return driver === LONGHORN_DRIVER || this.allowEmptySnapshotClassNameFeatureEnabled;
175175
},
176176
177-
isBackupVolumeSnapshotClassNameSelectable(driver) {
178-
return driver === LONGHORN_DRIVER;
179-
},
180-
181177
add() {
182178
this.configArr.push({
183179
key: '',
@@ -247,7 +243,6 @@ export default {
247243
:options="getVolumeSnapshotOptions(driver.key)"
248244
:required="isBackupVolumeSnapshotRequired(driver.key)"
249245
:label="t('harvester.setting.csiDriverConfig.backupVolumeSnapshotClassName')"
250-
@selectable="isBackupVolumeSnapshotClassNameSelectable(driver.key)"
251246
@keydown.native.enter.prevent="()=>{}"
252247
@update:value="update"
253248
/>

pkg/harvester/promptRemove/kubevirt.io.virtualmachine.vue

+1-9
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,12 @@ export default {
1616
return [];
1717
}
1818
},
19-
2019
names: {
2120
type: Array,
2221
default: () => {
2322
return [];
2423
}
2524
},
26-
2725
type: {
2826
type: String,
2927
required: true
@@ -69,12 +67,6 @@ export default {
6967
7068
return out;
7169
},
72-
73-
plusMore() {
74-
const remaining = this.toRemove.length - this.names.length;
75-
76-
return this.t('promptRemove.andOthers', { count: remaining });
77-
},
7870
},
7971
8072
watch: {
@@ -143,7 +135,7 @@ export default {
143135
<div>
144136
<div class="mt-10">
145137
{{ t('promptRemove.attemptingToRemove', {type}) }}
146-
<span v-clean-html="resourceNames(names, plusMore, t)"></span>
138+
<span v-clean-html="resourceNames(names, t)"></span>
147139
148140
<div class="mt-10">
149141
{{ t('harvester.virtualMachine.promptRemove.title') }}

yarn.lock

+9-22
Original file line numberDiff line numberDiff line change
@@ -3200,10 +3200,10 @@
32003200
resolved "https://registry.yarnpkg.com/@rancher/icons/-/icons-2.0.29.tgz#6546d69768c706bebd66bfa73b36aef3d105987a"
32013201
integrity sha512-qBBqfazS9y5VjV7fJDPNXmxd9AP/2uiE05mKFWP41kpbO+tEb62RnUBXCm14XLeScDZQcOuiAKVHMmvCFzF0BA==
32023202

3203-
"@rancher/[email protected].3":
3204-
version "3.0.2-rc.3"
3205-
resolved "https://registry.yarnpkg.com/@rancher/shell/-/shell-3.0.2-rc.3.tgz#745d4970425ba0bddf1a8003ff7f82d408566da8"
3206-
integrity sha512-K5jCaNfyltjCSTQUgzFFntmO5HT1Uu+vM1aJsMCjiwiyrNPBsf0Z3ic9Is6HSvOs9DB+W5j7jvHwouuq0sxUlw==
3203+
"@rancher/[email protected].6":
3204+
version "3.0.2-rc.6"
3205+
resolved "https://registry.yarnpkg.com/@rancher/shell/-/shell-3.0.2-rc.6.tgz#bde65a3da391c4aa0352e2adf8180900a2575000"
3206+
integrity sha512-UpNCv0iZH16nlo+x/4xVisIX20v1JrQC47GUUtXcGDw9pde6HnnBPxpN0cF32r+Kg7F0QRp4Yvjoljmpp1HS7g==
32073207
dependencies:
32083208
"@aws-sdk/client-ec2" "3.658.1"
32093209
"@aws-sdk/client-eks" "3.1.0"
@@ -3258,7 +3258,7 @@
32583258
entities "4.5.0"
32593259
eslint "7.32.0"
32603260
eslint-config-standard "16.0.3"
3261-
eslint-import-resolver-node "0.3.4"
3261+
eslint-import-resolver-node "0.3.9"
32623262
eslint-module-utils "2.6.1"
32633263
eslint-plugin-cypress "2.12.1"
32643264
eslint-plugin-import "2.31.0"
@@ -3279,7 +3279,7 @@
32793279
jest-serializer-vue "2.0.2"
32803280
jexl "2.3.0"
32813281
jquery "3.5.1"
3282-
js-cookie "2.2.1"
3282+
js-cookie "3.0.5"
32833283
js-yaml "4.1.0"
32843284
js-yaml-loader "1.2.2"
32853285
jsdiff "1.1.1"
@@ -6999,7 +6999,7 @@ debounce@^1.2.1:
69996999
resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.2.1.tgz#38881d8f4166a5c5848020c11827b834bcb3e0a5"
70007000
integrity sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==
70017001

7002-
[email protected], debug@^2.6.9:
7002+
70037003
version "2.6.9"
70047004
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
70057005
integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
@@ -7672,15 +7672,7 @@ [email protected]:
76727672
resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-16.0.3.tgz#6c8761e544e96c531ff92642eeb87842b8488516"
76737673
integrity sha512-x4fmJL5hGqNJKGHSjnLdgA6U6h1YW/G2dW9fA+cyVur4SK6lyue8+UgNKWlZtUDTXvgKDD/Oa3GQjmB5kjtVvg==
76747674

7675-
7676-
version "0.3.4"
7677-
resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz#85ffa81942c25012d8231096ddf679c03042c717"
7678-
integrity sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA==
7679-
dependencies:
7680-
debug "^2.6.9"
7681-
resolve "^1.13.1"
7682-
7683-
eslint-import-resolver-node@^0.3.9:
7675+
[email protected], eslint-import-resolver-node@^0.3.9:
76847676
version "0.3.9"
76857677
resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz#d4eaac52b8a2e7c3cd1903eb00f7e053356118ac"
76867678
integrity sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==
@@ -10275,12 +10267,7 @@ js-beautify@^1.14.9, js-beautify@^1.6.12:
1027510267
js-cookie "^3.0.5"
1027610268
nopt "^7.2.0"
1027710269

10278-
10279-
version "2.2.1"
10280-
resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.2.1.tgz#69e106dc5d5806894562902aa5baec3744e9b2b8"
10281-
integrity sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ==
10282-
10283-
js-cookie@^3.0.5:
10270+
[email protected], js-cookie@^3.0.5:
1028410271
version "3.0.5"
1028510272
resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-3.0.5.tgz#0b7e2fd0c01552c58ba86e0841f94dc2557dcdbc"
1028610273
integrity sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw==

0 commit comments

Comments
 (0)