Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Case-insensitive comparison when merging ingress annotations and custom apps #91

Closed
wants to merge 16 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners
* @toboshii
* @ullbergm
10 changes: 5 additions & 5 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -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>",
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
- "charts/hajimari/**"

env:
REGISTRY_IMAGE: ghcr.io/toboshii/hajimari
REGISTRY_IMAGE: ghcr.io/ullbergm/hajimari

jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
- published

env:
REGISTRY_IMAGE: ghcr.io/toboshii/hajimari
REGISTRY_IMAGE: ghcr.io/ullbergm/hajimari

jobs:
build:
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker.io/node:16.20-alpine AS build-frontend
FROM docker.io/node:22.2-alpine AS build-frontend

WORKDIR /build

Expand All @@ -10,7 +10,7 @@ RUN npm install

RUN npm run build

FROM docker.io/golang:1.20.2-alpine as build
FROM docker.io/golang:1.22.3-alpine as build

ARG TARGETPLATFORM
ENV TARGETPLATFORM=${TARGETPLATFORM:-linux/amd64}
Expand All @@ -37,7 +37,7 @@ RUN \
&& \
chmod +x hajimari

FROM docker.io/alpine:3.17
FROM docker.io/alpine:3.19

RUN \
apk add --no-cache \
Expand All @@ -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
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

---

Expand Down Expand Up @@ -124,7 +124,7 @@ spec:
name: Hajimari Issues
group: info
icon: simple-icons:github
url: https://github.com/toboshii/hajimari/issues
url: https://github.com/ullbergm/hajimari/issues
info: Submit issue to this project
targetBlank: true
```
Expand Down
10 changes: 5 additions & 5 deletions charts/hajimari/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions charts/hajimari/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -163,7 +163,7 @@ persistence:

## Source Code

* <https://github.com/toboshii/hajimari>
* <https://github.com/ullbergm/hajimari>

## Requirements

Expand All @@ -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. |
Expand Down
2 changes: 1 addition & 1 deletion charts/hajimari/templates/app-sample.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spec:
name: Hajimari Issues
group: info
icon: simple-icons:github
url: https://github.com/toboshii/hajimari/issues
url: https://github.com/ullbergm/hajimari/issues
info: Submit issue to this project
targetBlank: true

Expand Down
3 changes: 2 additions & 1 deletion charts/hajimari/templates/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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" . }}
4 changes: 2 additions & 2 deletions charts/hajimari/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@

image:
# -- image repository
repository: ghcr.io/toboshii/hajimari
repository: ghcr.io/ullbergm/hajimari
# -- image pull policy
pullPolicy: IfNotPresent
# -- image tag
tag: v0.3.1
tag: latest

# -- environment variables.
# @default -- See below
Expand Down
6 changes: 3 additions & 3 deletions cmd/hajimari/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (

"github.com/fsnotify/fsnotify"
"github.com/spf13/viper"
"github.com/toboshii/hajimari/internal/config"
"github.com/toboshii/hajimari/internal/handlers"
"github.com/toboshii/hajimari/internal/log"
"github.com/ullbergm/hajimari/internal/config"
"github.com/ullbergm/hajimari/internal/handlers"
"github.com/ullbergm/hajimari/internal/log"
)

var (
Expand Down
2 changes: 0 additions & 2 deletions frontend/frontend.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,4 @@ import (
)

// Embed the build directory from the frontend.
//
//go:embed all:build
var BuildFs embed.FS