Update cozystack-dashboard to show workload status (#562)
 <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit ## Release Notes - **New Features** - Updated dashboard to use latest version of components - Simplified package repository management interface - **Changes** - Removed specific version references in configuration - Updated image tags and digests to latest versions - Modified documentation links to point to CozyStack resources - **Removed Features** - Eliminated package repository management functionality from dashboard <!-- end of auto-generated comment: release notes by coderabbit.ai -->
@@ -76,7 +76,7 @@ data:
|
||||
"kubeappsNamespace": {{ .Release.Namespace | quote }},
|
||||
"helmGlobalNamespace": {{ include "kubeapps.helmGlobalPackagingNamespace" . | quote }},
|
||||
"carvelGlobalNamespace": {{ .Values.kubeappsapis.pluginConfig.kappController.packages.v1alpha1.globalPackagingNamespace | quote }},
|
||||
"appVersion": "v0.21.1",
|
||||
"appVersion": "latest",
|
||||
"authProxyEnabled": {{ .Values.authProxy.enabled }},
|
||||
"oauthLoginURI": {{ .Values.authProxy.oauthLoginURI | quote }},
|
||||
"oauthLogoutURI": {{ .Values.authProxy.oauthLogoutURI | quote }},
|
||||
|
||||
|
Before Width: | Height: | Size: 7.4 KiB |
@@ -1,13 +0,0 @@
|
||||
diff --git a/dashboard/src/components/AppList/AppListGrid.tsx b/dashboard/src/components/AppList/AppListGrid.tsx
|
||||
index d3261e459..dee6a50c1 100644
|
||||
--- a/dashboard/src/components/AppList/AppListGrid.tsx
|
||||
+++ b/dashboard/src/components/AppList/AppListGrid.tsx
|
||||
@@ -42,7 +42,7 @@ function AppListGrid(props: IAppListProps) {
|
||||
Start browsing your <Link to={url.app.catalog(cluster, namespace)}>favourite apps</Link>{" "}
|
||||
or check the{" "}
|
||||
<a
|
||||
- href={`https://github.com/vmware-tanzu/kubeapps/blob/${appVersion}/site/content/docs/latest/tutorials/getting-started.md`}
|
||||
+ href={"https://cozystack.io/docs/"}
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
>
|
||||
|
Before Width: | Height: | Size: 5.2 KiB |
|
Before Width: | Height: | Size: 5.1 KiB |
|
Before Width: | Height: | Size: 7.2 KiB |
|
Before Width: | Height: | Size: 7.0 KiB |
|
Before Width: | Height: | Size: 6.8 KiB |
|
Before Width: | Height: | Size: 6.9 KiB |
|
Before Width: | Height: | Size: 9.0 KiB |
|
Before Width: | Height: | Size: 7.3 KiB |
@@ -1,34 +0,0 @@
|
||||
diff --git a/dashboard/src/shared/url.ts b/dashboard/src/shared/url.ts
|
||||
index 7918652b0..64c3435af 100644
|
||||
--- a/dashboard/src/shared/url.ts
|
||||
+++ b/dashboard/src/shared/url.ts
|
||||
@@ -36,7 +36,7 @@ export const app = {
|
||||
return `${app.apps.list(
|
||||
pkgCluster,
|
||||
pkgNamespace,
|
||||
- )}/${pkgPluginName}/${pkgPluginVersion}/${pkgId}`;
|
||||
+ )}/${pkgPluginName}/${pkgPluginVersion}/${encodeURIComponent(pkgId)}`;
|
||||
},
|
||||
upgrade: (ref: InstalledPackageReference) => `${app.apps.get(ref)}/upgrade`,
|
||||
upgradeTo: (ref: InstalledPackageReference, version?: string) =>
|
||||
diff --git a/dashboard/src/components/DeploymentForm/DeploymentForm.tsx b/dashboard/src/components/DeploymentForm/DeploymentForm.tsx
|
||||
index 7ccb77b5d..589f72b65 100644
|
||||
--- a/dashboard/src/components/DeploymentForm/DeploymentForm.tsx
|
||||
+++ b/dashboard/src/components/DeploymentForm/DeploymentForm.tsx
|
||||
@@ -144,13 +144,15 @@ export default function DeploymentForm() {
|
||||
);
|
||||
setDeploying(false);
|
||||
if (deployed) {
|
||||
+ const chartParts = packageId?.split("/") || [];
|
||||
+ const kind = chartParts[chartParts.length - 1];
|
||||
push(
|
||||
// Redirect to the installed package, note that the cluster/ns are the ones passed
|
||||
// in the URL, not the ones from the package.
|
||||
url.app.apps.get({
|
||||
context: { cluster: targetCluster, namespace: targetNamespace },
|
||||
plugin: pluginObj,
|
||||
- identifier: releaseName,
|
||||
+ identifier: `${kind}%2F${releaseName}`,
|
||||
} as AvailablePackageReference),
|
||||
);
|
||||
}
|
||||
@@ -1,66 +0,0 @@
|
||||
diff --git a/dashboard/src/components/Catalog/Catalog.tsx b/dashboard/src/components/Catalog/Catalog.tsx
|
||||
index 5f2d2a1c5..093cb598d 100644
|
||||
--- a/dashboard/src/components/Catalog/Catalog.tsx
|
||||
+++ b/dashboard/src/components/Catalog/Catalog.tsx
|
||||
@@ -15,7 +15,6 @@ import qs from "qs";
|
||||
import React, { useEffect } from "react";
|
||||
import { useDispatch, useSelector } from "react-redux";
|
||||
import * as ReactRouter from "react-router-dom";
|
||||
-import { Link } from "react-router-dom";
|
||||
import { IClusterServiceVersion, IStoreState } from "shared/types";
|
||||
import { app } from "shared/url";
|
||||
import { escapeRegExp, getPluginPackageName } from "shared/utils";
|
||||
@@ -85,7 +84,6 @@ export default function Catalog() {
|
||||
operators,
|
||||
repos: { reposSummaries: repos },
|
||||
config: {
|
||||
- appVersion,
|
||||
kubeappsCluster,
|
||||
helmGlobalNamespace,
|
||||
carvelGlobalNamespace,
|
||||
@@ -420,24 +418,6 @@ export default function Catalog() {
|
||||
<div className="empty-catalog">
|
||||
<CdsIcon shape="bundle" />
|
||||
<p>The current catalog is empty.</p>
|
||||
- <p>
|
||||
- Manage your Package Repositories in Kubeapps by visiting the Package repositories
|
||||
- configuration page.
|
||||
- </p>
|
||||
- <Link to={app.config.pkgrepositories(cluster || "", namespace || "")}>
|
||||
- <CdsButton>Manage Package Repositories</CdsButton>
|
||||
- </Link>
|
||||
- <p>
|
||||
- For help managing other packaging formats, such as Flux or Carvel, please refer to the{" "}
|
||||
- <a
|
||||
- target="_blank"
|
||||
- rel="noopener noreferrer"
|
||||
- href={`https://github.com/vmware-tanzu/kubeapps/tree/${appVersion}/site/content/docs/latest`}
|
||||
- >
|
||||
- Kubeapps documentation
|
||||
- </a>
|
||||
- .
|
||||
- </p>
|
||||
</div>
|
||||
) : (
|
||||
<Row>
|
||||
diff --git a/dashboard/src/components/Header/Menu.tsx b/dashboard/src/components/Header/Menu.tsx
|
||||
index c8ec1da8c..e59f90190 100644
|
||||
--- a/dashboard/src/components/Header/Menu.tsx
|
||||
+++ b/dashboard/src/components/Header/Menu.tsx
|
||||
@@ -78,16 +78,6 @@ function Menu({ clusters, appVersion, logout }: IContextSelectorProps) {
|
||||
<div className="dropdown-menu dropdown-configuration-menu" role="menu" hidden={!open}>
|
||||
<div>
|
||||
<label className="dropdown-menu-padding dropdown-menu-label">Administration</label>
|
||||
- <Link
|
||||
- to={app.config.pkgrepositories(clusters.currentCluster, namespaceSelected)}
|
||||
- className="dropdown-menu-link"
|
||||
- onClick={toggleOpen}
|
||||
- >
|
||||
- <div className="dropdown-menu-item" role="menuitem">
|
||||
- <CdsIcon solid={true} size="md" shape="library" />{" "}
|
||||
- <span>Package Repositories</span>
|
||||
- </div>
|
||||
- </Link>
|
||||
<div className="dropdown-divider" role="separator" />
|
||||
{featureFlags?.operators && (
|
||||
<Link
|
||||
@@ -1,49 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<svg
|
||||
width="933.33301"
|
||||
height="933.33301"
|
||||
viewBox="0 0 700 700"
|
||||
preserveAspectRatio="xMidYMid meet"
|
||||
version="1.1"
|
||||
id="svg826"
|
||||
sodipodi:docname="safari-pinned-tab.svg"
|
||||
inkscape:version="1.1.1 (c3084ef, 2021-09-22)"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:svg="http://www.w3.org/2000/svg">
|
||||
<defs
|
||||
id="defs830" />
|
||||
<sodipodi:namedview
|
||||
id="namedview828"
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1.0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:pageopacity="0.0"
|
||||
inkscape:pagecheckerboard="0"
|
||||
showgrid="false"
|
||||
inkscape:zoom="0.77035741"
|
||||
inkscape:cx="436.81023"
|
||||
inkscape:cy="541.95623"
|
||||
inkscape:window-width="1720"
|
||||
inkscape:window-height="1387"
|
||||
inkscape:window-x="1720"
|
||||
inkscape:window-y="25"
|
||||
inkscape:window-maximized="0"
|
||||
inkscape:current-layer="svg826" />
|
||||
<rect
|
||||
style="fill:#000000;stroke-width:6.33749"
|
||||
id="rect938"
|
||||
width="700"
|
||||
height="700"
|
||||
x="0"
|
||||
y="-1.7763568e-15" />
|
||||
<path
|
||||
fill-rule="evenodd"
|
||||
clip-rule="evenodd"
|
||||
d="m 170.27273,142.84005 c 0,-13.12938 10.41078,-23.77292 23.25562,-23.77292 h 325.57872 c 12.8449,0 23.25558,10.64354 23.25558,23.77292 v 0 c 0,13.12957 -10.41068,23.77302 -23.25558,23.77302 H 193.52835 c -12.84484,0 -23.25562,-10.64345 -23.25562,-23.77302 z m 0,427.91341 c 0,-13.12903 10.41078,-23.77297 23.25562,-23.77297 h 325.57872 c 12.8449,0 23.25558,10.64394 23.25558,23.77297 v 0 c 0,13.12982 -10.41068,23.77298 -23.25558,23.77298 H 193.52835 c -12.84484,0 -23.25562,-10.64316 -23.25562,-23.77298 z M 542.36265,356.79661 c 0,-13.12902 -10.41068,-23.77296 -23.25558,-23.77296 H 193.52835 c -12.84484,0 -23.25562,10.64394 -23.25562,23.77296 v 0 c 0,13.12982 10.41078,23.77298 23.25562,23.77298 h 325.57872 c 12.8449,0 23.25558,-10.64316 23.25558,-23.77298 z"
|
||||
fill="#ffffff"
|
||||
id="path840"
|
||||
style="stroke-width:7.83755" />
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 2.1 KiB |
@@ -4,7 +4,7 @@
|
||||
# syntax = docker/dockerfile:1
|
||||
|
||||
FROM alpine as source
|
||||
ARG COMMIT_REF=e146cf8660c58a4f585611ab3cbce62ebfa4c5a3
|
||||
ARG COMMIT_REF=215c323b0754c8f7328819df9a253e0e507eccb4
|
||||
RUN apk add --no-cache patch
|
||||
WORKDIR /source
|
||||
RUN wget -O- https://github.com/aenix-io/kubeapps/archive/${COMMIT_REF}.tar.gz | tar xzf - --strip-components=1
|
||||
|
||||
@@ -40,14 +40,14 @@ kubeapps:
|
||||
image:
|
||||
registry: ghcr.io/aenix-io/cozystack
|
||||
repository: dashboard
|
||||
tag: v0.21.1
|
||||
digest: "sha256:fa9b6238da1dfaa15ec1c20c041103d6e07b5194cc54cf3cf4872f758ceaa085"
|
||||
tag: latest
|
||||
digest: "sha256:cdf9d93a9733ce6f59d467a03a34bb66177eb4b42715fcf81f84705b150d9dad"
|
||||
kubeappsapis:
|
||||
image:
|
||||
registry: ghcr.io/aenix-io/cozystack
|
||||
repository: kubeapps-apis
|
||||
tag: v0.21.1
|
||||
digest: "sha256:3ad47a120ae2bd83e1242430e17616a6500d627a7a6cef94095b9e6c1a9e85a8"
|
||||
tag: latest
|
||||
digest: "sha256:4842d2e0c4067b73414f815419ae8c83ddb56c287cc45e1648cb700da3842770"
|
||||
pluginConfig:
|
||||
flux:
|
||||
packages:
|
||||
|
||||