From 201e8eca43ad9458e8e2fa03815340cdac13c379 Mon Sep 17 00:00:00 2001 From: Devin Buhl Date: Tue, 24 Aug 2021 09:24:29 -0400 Subject: [PATCH] feat: replace homer with hajimari --- .../{homer => hajimari}/config-pvc.yaml | 2 +- .../apps/default/hajimari/helm-release.yaml | 120 ++++++++++++++++++ .../{homer => hajimari}/kustomization.yaml | 0 cluster/apps/default/homer/helm-release.yaml | 40 ------ cluster/apps/default/kustomization.yaml | 2 +- .../charts/helm/bitnami-charts.yaml | 4 +- .../charts/helm/hajimari-charts.yaml | 10 ++ .../charts/helm/ingress-nginx-charts.yaml | 4 +- .../charts/helm/jetstack-charts.yaml | 4 +- .../charts/helm/k8s-at-home-charts.yaml | 4 +- .../charts/helm/kustomization.yaml | 1 + .../charts/helm/metallb-charts.yaml | 4 +- 12 files changed, 143 insertions(+), 52 deletions(-) rename cluster/apps/default/{homer => hajimari}/config-pvc.yaml (88%) create mode 100644 cluster/apps/default/hajimari/helm-release.yaml rename cluster/apps/default/{homer => hajimari}/kustomization.yaml (100%) delete mode 100644 cluster/apps/default/homer/helm-release.yaml create mode 100644 cluster/base/flux-system/charts/helm/hajimari-charts.yaml diff --git a/cluster/apps/default/homer/config-pvc.yaml b/cluster/apps/default/hajimari/config-pvc.yaml similarity index 88% rename from cluster/apps/default/homer/config-pvc.yaml rename to cluster/apps/default/hajimari/config-pvc.yaml index d3c87293..f3fa9a67 100644 --- a/cluster/apps/default/homer/config-pvc.yaml +++ b/cluster/apps/default/hajimari/config-pvc.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: - name: homer-config + name: hajimari-config spec: accessModes: - ReadWriteOnce diff --git a/cluster/apps/default/hajimari/helm-release.yaml b/cluster/apps/default/hajimari/helm-release.yaml new file mode 100644 index 00000000..ac54ff9f --- /dev/null +++ b/cluster/apps/default/hajimari/helm-release.yaml @@ -0,0 +1,120 @@ +--- +apiVersion: helm.toolkit.fluxcd.io/v2beta1 +kind: HelmRelease +metadata: + name: hajimari + namespace: default +spec: + interval: 5m + chart: + spec: + # renovate: registryUrl=https://hajimari.io + chart: hajimari + version: 1.1.1 + sourceRef: + kind: HelmRepository + name: hajimari-charts + namespace: flux-system + interval: 5m + values: + image: + repository: ghcr.io/toboshii/hajimari + tag: v0.1.0 + hajimari: + defaultEnable: false + namespaceSelector: + matchNames: + - default + name: "you" + customApps: + - name: Some External Cluster Service + url: http://192.168.1.100:5000 + icon: test-tube + groups: + - name: Communicate + links: + - name: Discord + url: "https://discord.com" + - name: Gmail + url: "https://gmail.com" + - name: Slack + url: "https://slack.com/signin" + - name: Cloud + links: + - name: Box + url: "https://box.com" + - name: Dropbox + url: "https://dropbox.com" + - name: Drive + url: "https://drive.google.com" + - name: Design + links: + - name: Awwwards + url: "https://awwwards.com" + - name: Dribbble + url: "https://dribbble.com" + - name: Muz.li + url: "https://medium.muz.li/" + - name: Dev + links: + - name: Codepen + url: "https://codepen.io/" + - name: Devdocs + url: "https://devdocs.io" + - name: Devhints + url: "https://devhints.io" + - name: Lifestyle + links: + - name: Design Milk + url: "https://design-milk.com/category/interior-design/" + - name: Dwell + url: "https://www.dwell.com/" + - name: Freshome + url: "https://www.mymove.com/freshome/" + - name: Media + links: + - name: Spotify + url: "http://browse.spotify.com" + - name: Trakt + url: "http://trakt.tv" + - name: YouTube + url: "https://youtube.com/feed/subscriptions" + - name: Reading + links: + - name: Instapaper + url: "https://www.instapaper.com/u" + - name: Medium + url: "http://medium.com" + - name: Reddit + url: "http://reddit.com" + - name: Tech + links: + - name: Hacker News + url: "https://news.ycombinator.com/" + - name: The Verge + url: "https://theverge.com/" + - name: MIT Technology Review + url: "https://www.technologyreview.com/" + ingress: + main: + enabled: true + annotations: + kubernetes.io/ingress.class: "nginx" + hajimari.io/enable: "true" + hajimari.io/icon: "weather-sunset" + hosts: + - host: "hajimari.${SECRET_DOMAIN}" + paths: + - path: / + pathType: Prefix + tls: + - hosts: + - "hajimari.${SECRET_DOMAIN}" + persistence: + data: + enabled: true + existingClaim: hajimari-config-v1 + resources: + requests: + cpu: 100m + memory: 128M diff --git a/cluster/apps/default/homer/kustomization.yaml b/cluster/apps/default/hajimari/kustomization.yaml similarity index 100% rename from cluster/apps/default/homer/kustomization.yaml rename to cluster/apps/default/hajimari/kustomization.yaml diff --git a/cluster/apps/default/homer/helm-release.yaml b/cluster/apps/default/homer/helm-release.yaml deleted file mode 100644 index 108019ad..00000000 --- a/cluster/apps/default/homer/helm-release.yaml +++ /dev/null @@ -1,40 +0,0 @@ ---- -apiVersion: helm.toolkit.fluxcd.io/v2beta1 -kind: HelmRelease -metadata: - name: homer - namespace: default -spec: - interval: 5m - chart: - spec: - # renovate: registryUrl=https://k8s-at-home.com/charts/ - chart: homer - version: 6.0.0 - sourceRef: - kind: HelmRepository - name: k8s-at-home-charts - namespace: flux-system - values: - image: - repository: b4bz/homer - tag: 21.07.1 - pullPolicy: IfNotPresent - ingress: - main: - enabled: true - annotations: - kubernetes.io/ingress.class: "nginx" - hosts: - - host: "homer.${SECRET_DOMAIN}" - paths: - - path: / - pathType: Prefix - tls: - - hosts: - - "homer.${SECRET_DOMAIN}" - persistence: - config: - enabled: true - existingClaim: homer-config - mountPath: /www/assets diff --git a/cluster/apps/default/kustomization.yaml b/cluster/apps/default/kustomization.yaml index 7ade7d26..9a6ff19a 100644 --- a/cluster/apps/default/kustomization.yaml +++ b/cluster/apps/default/kustomization.yaml @@ -1,4 +1,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - homer + - hajimari diff --git a/cluster/base/flux-system/charts/helm/bitnami-charts.yaml b/cluster/base/flux-system/charts/helm/bitnami-charts.yaml index 96055d4b..f1995a67 100644 --- a/cluster/base/flux-system/charts/helm/bitnami-charts.yaml +++ b/cluster/base/flux-system/charts/helm/bitnami-charts.yaml @@ -5,6 +5,6 @@ metadata: name: bitnami-charts namespace: flux-system spec: - interval: 30m + interval: 1h url: https://charts.bitnami.com/bitnami - timeout: 2m + timeout: 3m diff --git a/cluster/base/flux-system/charts/helm/hajimari-charts.yaml b/cluster/base/flux-system/charts/helm/hajimari-charts.yaml new file mode 100644 index 00000000..81d452bc --- /dev/null +++ b/cluster/base/flux-system/charts/helm/hajimari-charts.yaml @@ -0,0 +1,10 @@ +--- +apiVersion: source.toolkit.fluxcd.io/v1beta1 +kind: HelmRepository +metadata: + name: hajimari-charts + namespace: flux-system +spec: + interval: 1h + url: https://hajimari.io + timeout: 3m diff --git a/cluster/base/flux-system/charts/helm/ingress-nginx-charts.yaml b/cluster/base/flux-system/charts/helm/ingress-nginx-charts.yaml index cdfe4dd9..eb15f749 100644 --- a/cluster/base/flux-system/charts/helm/ingress-nginx-charts.yaml +++ b/cluster/base/flux-system/charts/helm/ingress-nginx-charts.yaml @@ -5,6 +5,6 @@ metadata: name: ingress-nginx-charts namespace: flux-system spec: - interval: 30m + interval: 1h url: https://kubernetes.github.io/ingress-nginx - timeout: 2m + timeout: 3m diff --git a/cluster/base/flux-system/charts/helm/jetstack-charts.yaml b/cluster/base/flux-system/charts/helm/jetstack-charts.yaml index 61864b0f..f0ab55f3 100644 --- a/cluster/base/flux-system/charts/helm/jetstack-charts.yaml +++ b/cluster/base/flux-system/charts/helm/jetstack-charts.yaml @@ -5,6 +5,6 @@ metadata: name: jetstack-charts namespace: flux-system spec: - interval: 30m + interval: 1h url: https://charts.jetstack.io/ - timeout: 2m + timeout: 3m diff --git a/cluster/base/flux-system/charts/helm/k8s-at-home-charts.yaml b/cluster/base/flux-system/charts/helm/k8s-at-home-charts.yaml index 1947205b..0509f2e5 100644 --- a/cluster/base/flux-system/charts/helm/k8s-at-home-charts.yaml +++ b/cluster/base/flux-system/charts/helm/k8s-at-home-charts.yaml @@ -5,6 +5,6 @@ metadata: name: k8s-at-home-charts namespace: flux-system spec: - interval: 30m + interval: 1h url: https://k8s-at-home.com/charts/ - timeout: 2m + timeout: 3m diff --git a/cluster/base/flux-system/charts/helm/kustomization.yaml b/cluster/base/flux-system/charts/helm/kustomization.yaml index a48c9d82..4b4ad2e2 100644 --- a/cluster/base/flux-system/charts/helm/kustomization.yaml +++ b/cluster/base/flux-system/charts/helm/kustomization.yaml @@ -2,6 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - bitnami-charts.yaml + - hajimari-charts.yaml - ingress-nginx-charts.yaml - jetstack-charts.yaml - k8s-at-home-charts.yaml diff --git a/cluster/base/flux-system/charts/helm/metallb-charts.yaml b/cluster/base/flux-system/charts/helm/metallb-charts.yaml index 88774e70..62606e30 100644 --- a/cluster/base/flux-system/charts/helm/metallb-charts.yaml +++ b/cluster/base/flux-system/charts/helm/metallb-charts.yaml @@ -5,6 +5,6 @@ metadata: name: metallb-charts namespace: flux-system spec: - interval: 30m + interval: 1h url: https://metallb.github.io/metallb - timeout: 2m + timeout: 3m