Merge branch 'master' into patch-1

stakater · Dec 4, 2024 · 2dc2d77 · 2dc2d77
2 parents 85b12b9 + 4ded85c
commit 2dc2d77
Show file tree

Hide file tree

Showing 15 changed files with 55 additions and 57 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,10 +1,10 @@
-FROM node:20 as build-deps
+FROM node:20 AS build-deps
 WORKDIR /usr/src/app
 COPY ./frontend ./
 RUN yarn install --network-timeout 1000000 && yarn build
 
 # Build the manager binary
-FROM --platform=${BUILDPLATFORM} golang:1.23 as builder
+FROM --platform=${BUILDPLATFORM} golang:1.23 AS builder
 
 ARG TARGETOS
 ARG TARGETARCH

diff --git a/README.md b/README.md
@@ -111,12 +111,11 @@ Modify the `namespaceSelector` key in the Forecastle ConfigMap to list the names
 
 ### Helm Charts
 
-If you have Helm configured on your Kubernetes cluster, deploy Forecastle using the Helm chart. The chart is located [here.](./deployments/kubernetes/chart/forecastle)
+You can use Helm to deploy Forecastle. Head over to the [values.yaml](./deployments/kubernetes/chart/forecastle/values.yaml) to find configuration options.
 
-Adjust the configuration in values.yaml if required and run the following command:
-
-```bash
-helm install forecastle ./deployments/kubernetes/chart/forecastle
+```shell
+helm repo add stakater-charts https://stakater.github.io/stakater-charts/
+helm install forecastle stakater-charts/forecastle
 ```
 
 ### Configuration

diff --git a/build/package/Dockerfile.build b/build/package/Dockerfile.build
@@ -1,4 +1,4 @@
-FROM node:20.11.0 as build-deps
+FROM node:20.11.0 AS build-deps
 WORKDIR /usr/src/app
 COPY ./frontend ./
 RUN yarn install && yarn build
@@ -36,4 +36,4 @@ COPY build/package/Dockerfile.run /
 
 # Running this image produces a tarball suitable to be piped into another
 # Docker build command.
-CMD tar -cf - -C / Dockerfile.run Forecastle
+CMD tar -cf - -C / Dockerfile.run Forecastle
diff --git a/deployments/kubernetes/chart/forecastle/Chart.yaml b/deployments/kubernetes/chart/forecastle/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 name: forecastle
 description: forecastle chart that runs on kubernetes
 icon: https://github.com/stakater/Forecastle/raw/master/assets/web/forecastle-round-100px.png
-version: v1.0.146
+version: v1.0.150
 keywords:
   - forecastle
   - kubernetes

diff --git a/deployments/kubernetes/chart/forecastle/values.yaml b/deployments/kubernetes/chart/forecastle/values.yaml
@@ -2,11 +2,11 @@ forecastle:
   labels:
     group: com.stakater.platform
     provider: stakater
-    version: v1.0.146
+    version: v1.0.150
   namespace: default
   image:
     name: stakater/forecastle
-    tag: v1.0.146
+    tag: v1.0.150
   deployment:
     replicas: 1
     revisionHistoryLimit: 2

diff --git a/deployments/kubernetes/forecastle.yaml b/deployments/kubernetes/forecastle.yaml
@@ -90,8 +90,8 @@ metadata:
     app: forecastle
     group: com.stakater.platform
     provider: stakater
-    version: "v1.0.146"
-    chart: "forecastle-v1.0.146"
+    version: "v1.0.150"
+    chart: "forecastle-v1.0.150"
     release: "forecastle"
     heritage: "Helm"
   name: forecastle
@@ -107,8 +107,8 @@ metadata:
     app: forecastle
     group: com.stakater.platform
     provider: stakater
-    version: "v1.0.146"
-    chart: "forecastle-v1.0.146"
+    version: "v1.0.150"
+    chart: "forecastle-v1.0.150"
     release: "forecastle"
     heritage: "Helm"
 data:
@@ -133,8 +133,8 @@ metadata:
     app: forecastle
     group: com.stakater.platform
     provider: stakater
-    version: "v1.0.146"
-    chart: "forecastle-v1.0.146"
+    version: "v1.0.150"
+    chart: "forecastle-v1.0.150"
     release: "forecastle"
     heritage: "Helm"
 rules:
@@ -166,8 +166,8 @@ metadata:
     app: forecastle
     group: com.stakater.platform
     provider: stakater
-    version: "v1.0.146"
-    chart: "forecastle-v1.0.146"
+    version: "v1.0.150"
+    chart: "forecastle-v1.0.150"
     release: "forecastle"
     heritage: "Helm"
 roleRef:
@@ -187,8 +187,8 @@ metadata:
     app: forecastle
     group: com.stakater.platform
     provider: stakater
-    version: "v1.0.146"
-    chart: "forecastle-v1.0.146"
+    version: "v1.0.150"
+    chart: "forecastle-v1.0.150"
     release: "forecastle"
     heritage: "Helm"
     expose: "true"
@@ -213,8 +213,8 @@ metadata:
     app: forecastle
     group: com.stakater.platform
     provider: stakater
-    version: "v1.0.146"
-    chart: "forecastle-v1.0.146"
+    version: "v1.0.150"
+    chart: "forecastle-v1.0.150"
     release: "forecastle"
     heritage: "Helm"
   name: forecastle
@@ -234,7 +234,7 @@ spec:
         group: com.stakater.platform
         provider: stakater
       annotations:
-        checksum/api-config: 5668ba935c9e33ea1ec5f0ce5cbcd35651e1e7cf696d40d5b40945862ca45960
+        checksum/api-config: ead4a8670c833348a7068c7150052fae5da24439b85ee01d9ef831e48cbc413a
     spec:
       containers:
       - securityContext:
@@ -244,7 +244,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-        image: "stakater/forecastle:v1.0.146"
+        image: "stakater/forecastle:v1.0.150"
         name: forecastle
         volumeMounts:
         - name: forecastle-config
@@ -265,8 +265,8 @@ metadata:
     app: forecastle
     group: com.stakater.platform
     provider: stakater
-    version: "v1.0.146"
-    chart: "forecastle-v1.0.146"
+    version: "v1.0.150"
+    chart: "forecastle-v1.0.150"
     release: "forecastle"
     heritage: "Helm"
 spec:

diff --git a/deployments/kubernetes/manifests/configmap.yaml b/deployments/kubernetes/manifests/configmap.yaml
@@ -9,8 +9,8 @@ metadata:
     app: forecastle
     group: com.stakater.platform
     provider: stakater
-    version: "v1.0.146"
-    chart: "forecastle-v1.0.146"
+    version: "v1.0.150"
+    chart: "forecastle-v1.0.150"
     release: "forecastle"
     heritage: "Helm"
 data:

diff --git a/deployments/kubernetes/manifests/deployment.yaml b/deployments/kubernetes/manifests/deployment.yaml
@@ -7,8 +7,8 @@ metadata:
     app: forecastle
     group: com.stakater.platform
     provider: stakater
-    version: "v1.0.146"
-    chart: "forecastle-v1.0.146"
+    version: "v1.0.150"
+    chart: "forecastle-v1.0.150"
     release: "forecastle"
     heritage: "Helm"
   name: forecastle
@@ -28,7 +28,7 @@ spec:
         group: com.stakater.platform
         provider: stakater
       annotations:
-        checksum/api-config: 5668ba935c9e33ea1ec5f0ce5cbcd35651e1e7cf696d40d5b40945862ca45960
+        checksum/api-config: ead4a8670c833348a7068c7150052fae5da24439b85ee01d9ef831e48cbc413a
     spec:
       containers:
       - securityContext:
@@ -38,7 +38,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-        image: "stakater/forecastle:v1.0.146"
+        image: "stakater/forecastle:v1.0.150"
         name: forecastle
         volumeMounts:
         - name: forecastle-config

diff --git a/deployments/kubernetes/manifests/rbac.yaml b/deployments/kubernetes/manifests/rbac.yaml
@@ -7,8 +7,8 @@ metadata:
     app: forecastle
     group: com.stakater.platform
     provider: stakater
-    version: "v1.0.146"
-    chart: "forecastle-v1.0.146"
+    version: "v1.0.150"
+    chart: "forecastle-v1.0.150"
     release: "forecastle"
     heritage: "Helm"
   name: forecastle
@@ -23,8 +23,8 @@ metadata:
     app: forecastle
     group: com.stakater.platform
     provider: stakater
-    version: "v1.0.146"
-    chart: "forecastle-v1.0.146"
+    version: "v1.0.150"
+    chart: "forecastle-v1.0.150"
     release: "forecastle"
     heritage: "Helm"
 rules:
@@ -56,8 +56,8 @@ metadata:
     app: forecastle
     group: com.stakater.platform
     provider: stakater
-    version: "v1.0.146"
-    chart: "forecastle-v1.0.146"
+    version: "v1.0.150"
+    chart: "forecastle-v1.0.150"
     release: "forecastle"
     heritage: "Helm"
 roleRef:

diff --git a/deployments/kubernetes/manifests/route.yaml b/deployments/kubernetes/manifests/route.yaml
@@ -9,8 +9,8 @@ metadata:
     app: forecastle
     group: com.stakater.platform
     provider: stakater
-    version: "v1.0.146"
-    chart: "forecastle-v1.0.146"
+    version: "v1.0.150"
+    chart: "forecastle-v1.0.150"
     release: "forecastle"
     heritage: "Helm"
 spec:

diff --git a/deployments/kubernetes/manifests/service.yaml b/deployments/kubernetes/manifests/service.yaml
@@ -7,8 +7,8 @@ metadata:
     app: forecastle
     group: com.stakater.platform
     provider: stakater
-    version: "v1.0.146"
-    chart: "forecastle-v1.0.146"
+    version: "v1.0.150"
+    chart: "forecastle-v1.0.150"
     release: "forecastle"
     heritage: "Helm"
     expose: "true"

diff --git a/frontend/src/components/AppCard/AppCard.js b/frontend/src/components/AppCard/AppCard.js
@@ -14,22 +14,17 @@ const AppCard = ({ card }) => {
     SetIsDetailsExpanded(!isDetailsExpanded);
   };
 
-  const handleOpenAppLink = url => {
-    window.open(url, "_blank");
-  };
-
   return (
     <Card>
       <AppCardHeader
         name={card.name}
         url={card.url}
-        onOpenAppLink={() => handleOpenAppLink(card.url)}
       />
 
       <AppCardContent
         name={card.name}
         icon={card.icon}
-        onOpenAppLink={() => handleOpenAppLink(card.url)}
+        url={card.url}
       />
 
       <AppCardFooter

diff --git a/frontend/src/components/AppCardContent/AppCardContent.js b/frontend/src/components/AppCardContent/AppCardContent.js
@@ -14,11 +14,11 @@ const useStyles = makeStyles(theme => ({
   }
 }));
 
-const AppCardContent = ({ icon, name, onOpenAppLink }) => {
+const AppCardContent = ({ icon, name, url }) => {
   const classes = useStyles();
 
   return (
-    <CardActionArea onClick={onOpenAppLink}>
+    <CardActionArea href={url} target="_blank">
       <Grid className={classes.mediaWrapper}>
         <CardMedia className={classes.media} image={icon} title={name} />
       </Grid>
@@ -29,7 +29,7 @@ const AppCardContent = ({ icon, name, onOpenAppLink }) => {
 AppCardContent.propTypes = {
   icon: PropTypes.string.isRequired,
   name: PropTypes.string.isRequired,
-  onOpenAppLink: PropTypes.func.isRequired
+  url: PropTypes.string.isRequired
 };
 
 export default AppCardContent;
diff --git a/frontend/src/components/AppCardHeader/AppCardHeader.js b/frontend/src/components/AppCardHeader/AppCardHeader.js
@@ -17,7 +17,7 @@ const useStyles = makeStyles(theme => ({
     right: "0.5rem"
   }
 }));
-const AppCardHeader = ({ name, url, onOpenAppLink }) => {
+const AppCardHeader = ({ name, url }) => {
   const classes = useStyles();
 
   return (
@@ -53,7 +53,6 @@ const AppCardHeader = ({ name, url, onOpenAppLink }) => {
 AppCardHeader.propTypes = {
   name: PropTypes.string.isRequired,
   url: PropTypes.string.isRequired,
-  onOpenAppLink: PropTypes.func.isRequired
 };
 
 export default AppCardHeader;
diff --git a/frontend/src/components/SearchAppBar/SearchAppBar.js b/frontend/src/components/SearchAppBar/SearchAppBar.js
@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useEffect } from "react";
 import PropTypes from "prop-types";
 import { AppBar, Toolbar, Typography, InputBase } from "@material-ui/core";
 import { connect } from "react-redux";
@@ -63,6 +63,11 @@ const useStyles = makeStyles(theme => ({
 const SearchAppBar = ({ config, query, setQuery }) => {
   const classes = useStyles();
 
+  const title = config.title || "Forecastle - Stakater"
+  useEffect(() => {
+    document.title = title;
+  }, [title]);
+
   const handleSearchInput = e => {
     setQuery(e.target.value);
   };
@@ -78,7 +83,7 @@ const SearchAppBar = ({ config, query, setQuery }) => {
       >
         <Toolbar>
           <Typography className={classes.title} variant="h6" noWrap>
-            {config.title || "Forecastle - Stakater"}
+            {title}
           </Typography>
           <div className={classes.search}>
             <div className={classes.searchIcon}>