Merge branch 'dev' into fix-app-groups

toboshii · May 30, 2024 · 05a0968 · 05a0968
2 parents e78f0e7 + bc833bd
commit 05a0968
Show file tree

Hide file tree

Showing 52 changed files with 2,783 additions and 3,709 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,2 +1,2 @@
 # https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners
-* @toboshii
+* @ullbergm
diff --git a/.github/renovate.json5 b/.github/renovate.json5
@@ -8,14 +8,14 @@
     ":enablePreCommit",
     ":automergeDigest",
     ":automergeBranchPush",
-    "github>toboshii/home-ops//.github/renovate/commitMessage.json5",
-    "github>toboshii/home-ops//.github/renovate/labels.json5",
-    "github>toboshii/home-ops//.github/renovate/semanticCommits.json5",
-    "github>toboshii/home-ops//.github/renovate/allowedVersions.json5"
+    "github>ullbergm/home-ops//.github/renovate/commitMessage.json5",
+    "github>ullbergm/home-ops//.github/renovate/labels.json5",
+    "github>ullbergm/home-ops//.github/renovate/semanticCommits.json5",
+    "github>ullbergm/home-ops//.github/renovate/allowedVersions.json5"
   ],
   "platform": "github",
   "username": "chii-bot[bot]",
-  "repositories": ["toboshii/hajimari"],
+  "repositories": ["ullbergm/hajimari"],
   "onboarding": false,
   "requireConfig": false,
   "gitAuthor": "chii-bot <109454249+chii-bot[bot]@users.noreply.github.com>",

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -8,38 +8,38 @@ on:
       - "charts/hajimari/**"
 
 env:
-  REGISTRY_IMAGE: ghcr.io/toboshii/hajimari
+  REGISTRY_IMAGE: ghcr.io/ullbergm/hajimari
 
 jobs:
   build:
     runs-on: ubuntu-20.04
     if: "!contains(github.event.head_commit.message, '[ci-skip]')"
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Prepare
         id: prep
         run: |
           echo ::set-output name=version::${GITHUB_REF##*/}-$(git rev-parse --short HEAD)
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
         with:
           platforms: all
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
         with:
           install: true
           version: latest
           driver-opts: image=moby/buildkit:master
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build and Push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
         with:
           context: .
           file: ./Dockerfile

diff --git a/.github/workflows/lint-test-chart.yaml b/.github/workflows/lint-test-chart.yaml
@@ -10,17 +10,17 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
       - name: Set up Helm
-        uses: azure/setup-helm@v1
+        uses: azure/setup-helm@v3
         with:
           version: v3.6.3
 
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: 3.7
 
@@ -39,7 +39,7 @@ jobs:
         run: ct lint
 
       - name: Create Kind cluster
-        uses: helm/kind-action@v1.4.0
+        uses: helm/kind-action@v1.5.0
         with:
           wait: 120s
         if: steps.list-changed.outputs.changed == 'true'

diff --git a/.github/workflows/release-chart.yaml b/.github/workflows/release-chart.yaml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
@@ -22,12 +22,12 @@ jobs:
           git config user.email "[email protected]"
 
       - name: Install Helm
-        uses: azure/setup-helm@v1
+        uses: azure/setup-helm@v3
         with:
           version: v3.6.3
 
       - name: Run chart-releaser
-        uses: helm/chart-releaser-action@v1.4.1
+        uses: helm/chart-releaser-action@v1.5.0
         env:
           CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
           CR_RELEASE_NAME_TEMPLATE: "hajimari-helm-chart-{{ .Version }}"
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -7,41 +7,41 @@ on:
       - published
 
 env:
-  REGISTRY_IMAGE: ghcr.io/toboshii/hajimari
+  REGISTRY_IMAGE: ghcr.io/ullbergm/hajimari
 
 jobs:
   build:
     runs-on: ubuntu-20.04
     if: "!contains(github.event.head_commit.message, '[ci-skip]')"
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Prepare
         id: prep
         run: |
           echo ::set-output name=version::${GITHUB_REF##*/}
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
         with:
           platforms: all
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
         with:
           install: true
           version: latest
           driver-opts: image=moby/buildkit:master
       - name: Login to GitHub Container Registry
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build and Push
         if: github.event_name != 'pull_request'
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
         with:
           context: .
           file: ./Dockerfile

diff --git a/.github/workflows/schedule-link-checker.yaml b/.github/workflows/schedule-link-checker.yaml
@@ -20,7 +20,7 @@ jobs:
           app_id: "${{ secrets.BOT_APP_ID }}"
           private_key: "${{ secrets.BOT_APP_PRIVATE_KEY }}"
       - name: Link Checker
-        uses: lycheeverse/lychee-action@v1.5.1
+        uses: lycheeverse/lychee-action@v1.6.1
         id: lychee
         env:
           GITHUB_TOKEN: "${{ steps.generate-token.outputs.token }}"

diff --git a/.github/workflows/schedule-renovate.yaml b/.github/workflows/schedule-renovate.yaml
@@ -44,7 +44,7 @@ jobs:
           echo "DRY_RUN=${{ github.event.inputs.dryRun || env.DRY_RUN }}" >> "${GITHUB_ENV}"
           echo "LOG_LEVEL=${{ github.event.inputs.logLevel || env.LOG_LEVEL }}" >> "${GITHUB_ENV}"
       - name: Renovate
-        uses: renovatebot/github-action@v32.229.0
+        uses: renovatebot/github-action@v36.0.2
         with:
           configurationFile: "${{ env.RENOVATE_CONFIG_FILE }}"
           token: "x-access-token:${{ steps.generate-token.outputs.token }}"
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.io/node:16.17-alpine AS build-frontend
+FROM docker.io/node:22.2-alpine AS build-frontend
 
 WORKDIR /build
 
@@ -10,7 +10,7 @@ RUN npm install
 
 RUN npm run build
 
-FROM docker.io/golang:1.19.2-alpine as build
+FROM docker.io/golang:1.22.3-alpine as build
 
 ARG TARGETPLATFORM
 ENV TARGETPLATFORM=${TARGETPLATFORM:-linux/amd64}
@@ -37,7 +37,7 @@ RUN \
     && \
     chmod +x hajimari
 
-FROM docker.io/alpine:3.16
+FROM docker.io/alpine:3.19
 
 RUN \
     apk add --no-cache \
@@ -54,4 +54,4 @@ USER hajimari:hajimari
 ENTRYPOINT [ "/sbin/tini", "--" ]
 CMD [ "hajimari" ]
 
-LABEL org.opencontainers.image.source https://github.com/toboshii/hajimari
+LABEL org.opencontainers.image.source https://github.com/ullbergm/hajimari
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ _...The beginning of a pleasant experience_
 
 [![Discord](https://img.shields.io/discord/879246010977779753?style=for-the-badge&label=discord&logo=discord&logoColor=white)](https://discord.gg/HWGZSWJsA8)
 [![Go](https://img.shields.io/badge/go-v1.19-brightgreen?style=for-the-badge&logo=go&logoColor=white)](https://go.dev/)
-[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/toboshii/hajimari/ci?label=CI&logo=githubactions&style=for-the-badge)](https://github.com/toboshii/hajimari/actions/workflows/ci.yaml)
+[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/ullbergm/hajimari/ci?label=CI&logo=githubactions&style=for-the-badge)](https://github.com/ullbergm/hajimari/actions/workflows/ci.yaml)
 
 ---
 
@@ -24,7 +24,7 @@ Hajimari is a simplistically beautiful startpage designed to be the entrypoint f
 ## Features
 
 - Web and app search with customizable search providers
-- Dynamically list apps discovered from Kubernetes ingresses
+- Dynamically list apps discovered from Kubernetes Ingresses or Custom Resources
 - Display replica status for ingress endpoints
 - Support for non-Kubernetes apps via custom apps config
 - Customizable list of bookmarks
@@ -69,7 +69,7 @@ Hajimari will need access to a kubeconfig file for a service account with [acces
 
 ### Ingresses
 
-Hajimari looks for specific annotations on ingresses.
+Hajimari looks for specific annotations on [Ingresses](https://kubernetes.io/docs/concepts/services-networking/ingress/).
 
 - Add the following annotations to your ingresses in order for it to be discovered by Hajimari:
 
@@ -111,6 +111,24 @@ Hajimari supports the following configuration options that can be modified by ei
 |      customApps       |                      A list of custom apps to add to the discovered apps                       |                 []                 | \[\][AppGroup](#appgroup)             |
 |    globalBookmarks    |                                A list of bookmark groups to add                                |                 []                 | \[\][BookmarkGroup](#bookmarkgroup)   |
 
+### HajimariApp objects
+
+It also possible to define Apps via Kubernetes [Custom Resources](https://kubernetes.io/docs/concepts/extend-kubernetes/api-extension/custom-resources/) for those using Istio's [Virtual Services](https://istio.io/latest/docs/reference/config/networking/virtual-service/), Traefik's [IngressRoutes](https://doc.traefik.io/traefik/routing/providers/kubernetes-crd/) or other solutions, which does not reply on native Ingress objects:
+
+```yaml
+apiVersion: hajimari.io/v1alpha1
+kind: Application
+metadata:
+  name: hajimari-issues
+spec:
+  name: Hajimari Issues
+  group: info
+  icon: simple-icons:github
+  url: https://github.com/ullbergm/hajimari/issues
+  info: Submit issue to this project
+  targetBlank: true
+```
+
 #### NamespaceSelector
 
 It is a selector for selecting namespaces either selecting all namespaces or a list of namespaces, or filtering namespaces through labels.

diff --git a/charts/hajimari/Chart.yaml b/charts/hajimari/Chart.yaml
@@ -10,13 +10,13 @@ keywords:
 - hajimari
 - startpage
 - dashboard
-home: https://github.com/toboshii/hajimari/tree/master/charts/hajimari
-icon: https://raw.githubusercontent.com/toboshii/hajimari/main/assets/logo.png
+home: https://github.com/ullbergm/hajimari/tree/master/charts/hajimari
+icon: https://raw.githubusercontent.com/ullbergm/hajimari/main/assets/logo.png
 sources:
-- https://github.com/toboshii/hajimari
+- https://github.com/ullbergm/hajimari
 maintainers:
-- name: toboshii
-  email: toboshii@users.noreply.github.com
+- name: ullbergm
+  email: ullbergm@users.noreply.github.com
 dependencies:
 - name: common
   version: 0.2.2

diff --git a/charts/hajimari/README.md b/charts/hajimari/README.md
@@ -5,13 +5,13 @@
 Hajimari is a beautiful & customizable browser startpage/dashboard with
 Kubernetes application discovery
 
-**Homepage:** <https://github.com/toboshii/hajimari/tree/master/charts/hajimari>
+**Homepage:** <https://github.com/ullbergm/hajimari/tree/master/charts/hajimari>
 
 ## Maintainers
 
 | Name | Email | Url |
 | ---- | ------ | --- |
-| toboshii | <toboshii@users.noreply.github.com> |  |
+| ullbergm | <ullbergm@users.noreply.github.com> |  |
 
 ## Example values to get started
 
@@ -163,7 +163,7 @@ persistence:
 
 ## Source Code
 
-* <https://github.com/toboshii/hajimari>
+* <https://github.com/ullbergm/hajimari>
 
 ## Requirements
 
@@ -188,7 +188,7 @@ Kubernetes: `>=1.16.0-0`
 | hajimari.namespaceSelector | object | `{"matchNames":["media"]}` | Namespace selector to use for discovering applications |
 | hajimari.title | string | `nil` | Override the title of the Hajimari pages |
 | image.pullPolicy | string | `"IfNotPresent"` | image pull policy |
-| image.repository | string | `"ghcr.io/toboshii/hajimari"` | image repository |
+| image.repository | string | `"ghcr.io/ullbergm/hajimari"` | image repository |
 | image.tag | string | `"v0.3.1"` | image tag |
 | ingress.main | object | See values.yaml | Enable and configure ingress settings for the chart under this key. |
 | persistence | object | See values.yaml | Configure persistence settings for the chart under this key. |

diff --git a/charts/hajimari/templates/app-sample.yaml b/charts/hajimari/templates/app-sample.yaml
@@ -0,0 +1,15 @@
+{{- if .Values.createCRAppSample }}
+
+apiVersion: hajimari.io/v1alpha1
+kind: Application
+metadata:
+  name: hajimari-issues
+spec:
+  name: Hajimari Issues
+  group: info
+  icon: simple-icons:github
+  url: https://github.com/ullbergm/hajimari/issues
+  info: Submit issue to this project
+  targetBlank: true
+
+{{- end }}
diff --git a/charts/hajimari/templates/common.yaml b/charts/hajimari/templates/common.yaml
@@ -10,5 +10,6 @@ volumeSpec:
     name: {{ include "common.names.fullname" . }}-settings
 {{- end -}}
 {{- $_ := set .Values.persistence "hajimari-settings" (include "hajimari.settingsVolume" . | fromYaml) -}}
+{{- $_ := set .Values.podAnnotations "checksum/config" (.Values.hajimari | toYaml | sha256sum) -}}
 
-{{ include "common.all" . }}
+{{ include "common.all" . }}