Clean up extension creator - add rancher annotations to pkg.package.j…

…son (rancher#12741) Remove annotations from helm chart
aalves08 · Dec 3, 2024 · 5fe5004 · 5fe5004
1 parent 977b7f8
commit 5fe5004
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 48 deletions.
diff --git a/creators/extension/package.json b/creators/extension/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@rancher/create-extension",
   "description": "Rancher UI Extension generator",
-  "version": "3.0.2",
+  "version": "3.0.3",
   "license": "Apache-2.0",
   "author": "SUSE",
   "packageManager": "[email protected]",
   "bin": {
-    "create-extension": "./init"
+    "create-extension": "init"
   },
   "files": [
     "**/*",
@@ -28,4 +28,4 @@
     "path": "^0.12.7",
     "semver": "^7.6.3"
   }
-}
+}
diff --git a/creators/extension/pkg/package.json b/creators/extension/pkg/package.json
@@ -10,31 +10,9 @@
     "**/*.*",
     "init"
   ],
-  "rancher": {
-    "annotations": {
-      "catalog.cattle.io/rancher-version": ">= 2.10.0",
-      "catalog.cattle.io/ui-extensions-version": ">= 3.0.0 < 4.0.0"
-    }
-  },
   "engines": {
     "node": ">=20.0.0"
   },
-  "resolutions": {
-    "d3-color": "3.1.0",
-    "ejs": "3.1.9",
-    "follow-redirects": "1.15.2",
-    "glob": "7.2.3",
-    "glob-parent": "6.0.2",
-    "json5": "2.2.3",
-    "@types/lodash": "4.17.5",
-    "merge": "2.1.1",
-    "node-forge": "1.3.1",
-    "nth-check": "2.1.1",
-    "qs": "6.11.1",
-    "roarr": "7.0.4",
-    "semver": "7.5.4",
-    "@vue/cli-service/html-webpack-plugin": "^5.0.0"
-  },
   "dependencies": {
     "fs-extra": "^10.0.0"
   }

diff --git a/creators/extension/pkg/pkg.package.json b/creators/extension/pkg/pkg.package.json
@@ -3,34 +3,20 @@
   "description": "NAME plugin",
   "version": "0.1.0",
   "private": false,
-  "rancher": true,
+  "rancher": {
+    "annotations": {
+      "catalog.cattle.io/rancher-version": ">= 2.10.0",
+      "catalog.cattle.io/ui-extensions-version": ">= 3.0.0 < 4.0.0"
+    }
+  },
   "scripts": {},
   "engines": {
     "node": ">=16"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "~5.0.0",
     "@vue/cli-service": "~5.0.0",
-    "@vue/cli-plugin-typescript": "~5.0.0",
-    "cache-loader": "^4.1.0",
-    "color": "4.2.3",
-    "ip": "2.0.1",
-    "node-polyfill-webpack-plugin": "^3.0.0"
-  },
-  "resolutions": {
-    "d3-color": "3.1.0",
-    "ejs": "3.1.9",
-    "follow-redirects": "1.15.2",
-    "glob": "7.2.3",
-    "glob-parent": "6.0.2",
-    "json5": "2.2.3",
-    "merge": "2.1.1",
-    "node-forge": "1.3.1",
-    "nth-check": "2.1.1",
-    "qs": "6.11.1",
-    "roarr": "7.0.4",
-    "semver": "7.5.4",
-    "@vue/cli-service/html-webpack-plugin": "^5.0.0"
+    "@vue/cli-plugin-typescript": "~5.0.0"
   },
   "browserslist": [
     "> 1%",

diff --git a/shell/scripts/extension/helm/charts/ui-plugin-server/Chart.yaml b/shell/scripts/extension/helm/charts/ui-plugin-server/Chart.yaml
@@ -1,10 +1,8 @@
 annotations:
   catalog.cattle.io/certified: rancher # Any application we are adding as a helm chart
-  catalog.cattle.io/kube-version: '>= 1.16.0-0'
   catalog.cattle.io/namespace: cattle-ui-plugin-system # Must prefix with cattle- and suffix with -system=
   catalog.cattle.io/os: linux
   catalog.cattle.io/permits-os: linux, windows
-  catalog.cattle.io/rancher-version: '>= 2.7.0-0 < 2.9.0-0'
   catalog.cattle.io/scope: management
   catalog.cattle.io/ui-component: plugins
 apiVersion: v2