From 46b3a334d0e1caabaa0b650b8c55b11ab08f9b86 Mon Sep 17 00:00:00 2001 From: David Landry Date: Wed, 8 May 2024 00:45:14 -0400 Subject: [PATCH] chore(dashboard): update resources based on current docs https://gethomepage.dev/latest/installation/k8s --- apps/gethomepage/base/configmap.yaml | 65 +++++++++++++------ apps/gethomepage/base/deployment.yaml | 64 +++++++----------- apps/gethomepage/base/ingress.yaml | 8 ++- apps/gethomepage/base/rbac.yaml | 17 ----- apps/gethomepage/base/sa.yaml | 17 +---- apps/gethomepage/base/service.yaml | 5 -- .../overlays/system/kustomization.yaml | 8 +++ 7 files changed, 81 insertions(+), 103 deletions(-) diff --git a/apps/gethomepage/base/configmap.yaml b/apps/gethomepage/base/configmap.yaml index 3c4720a..cf4e900 100644 --- a/apps/gethomepage/base/configmap.yaml +++ b/apps/gethomepage/base/configmap.yaml @@ -1,29 +1,42 @@ ---- apiVersion: v1 kind: ConfigMap metadata: name: homepage labels: app.kubernetes.io/name: homepage - app.kubernetes.io/instance: homepage - app.kubernetes.io/version: "v0.6.10" - data: bookmarks.yaml: | - Developer: - Github: - abbr: GH href: https://github.com/ - docker.yaml: "" + kubernetes.yaml: | mode: cluster + services.yaml: | - layout: - Files: - Media: - Games: - Manage Homelab: - Manage Media: + # layout: + # Files: + # Media: + # Games: + # Manage Homelab: + # Manage Media: + + - My First Group: + - My First Service: + href: http://localhost/ + description: Homepage is awesome + + - My Second Group: + - My Second Service: + href: http://localhost/ + description: Homepage is the best + + - My Third Group: + - My Third Service: + href: http://localhost/ + description: Homepage is 😎 + settings.yaml: | layout: Games: @@ -37,25 +50,37 @@ data: Media: columns: 4 style: row + + custom.css: "" + + custom.js: "" + widgets.yaml: | - datetime: - format: - dateStyle: long - hour12: true - timeStyle: short - text_size: xl + format: + dateStyle: long + hour12: true + timeStyle: short + text_size: xl + - kubernetes: cluster: - cpu: true - label: cluster - memory: true show: true + cpu: true + memory: true showLabel: true + label: "cluster" nodes: + show: true cpu: true memory: true - show: true showLabel: true + - resources: + backend: resources + expanded: true + cpu: true + memory: true - search: provider: duckduckgo target: _blank + docker.yaml: "" diff --git a/apps/gethomepage/base/deployment.yaml b/apps/gethomepage/base/deployment.yaml index 524b81f..aaf3094 100644 --- a/apps/gethomepage/base/deployment.yaml +++ b/apps/gethomepage/base/deployment.yaml @@ -1,12 +1,9 @@ ---- apiVersion: apps/v1 kind: Deployment metadata: name: homepage labels: - app.kubernetes.io/instance: homepage app.kubernetes.io/name: homepage - app.kubernetes.io/version: v0.6.10 spec: revisionHistoryLimit: 3 replicas: 1 @@ -15,12 +12,10 @@ spec: selector: matchLabels: app.kubernetes.io/name: homepage - app.kubernetes.io/instance: homepage template: metadata: labels: app.kubernetes.io/name: homepage - app.kubernetes.io/instance: homepage spec: serviceAccountName: homepage automountServiceAccountToken: true @@ -28,54 +23,39 @@ spec: enableServiceLinks: true containers: - name: homepage - image: "ghcr.io/benphelps/homepage:v0.6.10" - imagePullPolicy: + image: "ghcr.io/gethomepage/homepage:latest" + imagePullPolicy: Always ports: - name: http containerPort: 3000 protocol: TCP volumeMounts: - - name: homepage-config + - mountPath: /app/config/custom.js + name: homepage-config + subPath: custom.js + - mountPath: /app/config/custom.css + name: homepage-config + subPath: custom.css + - mountPath: /app/config/bookmarks.yaml + name: homepage-config subPath: bookmarks.yaml - mountPath: /app/config/bookmarks.yaml - - name: homepage-config + - mountPath: /app/config/docker.yaml + name: homepage-config subPath: docker.yaml - mountPath: /app/config/docker.yaml - - name: homepage-config + - mountPath: /app/config/kubernetes.yaml + name: homepage-config subPath: kubernetes.yaml - mountPath: /app/config/kubernetes.yaml - - name: homepage-config + - mountPath: /app/config/services.yaml + name: homepage-config subPath: services.yaml - mountPath: /app/config/services.yaml - - name: homepage-config + - mountPath: /app/config/settings.yaml + name: homepage-config subPath: settings.yaml - mountPath: /app/config/settings.yaml - - name: homepage-config + - mountPath: /app/config/widgets.yaml + name: homepage-config subPath: widgets.yaml - mountPath: /app/config/widgets.yaml - - name: logs - mountPath: /app/config/logs - livenessProbe: - failureThreshold: 3 - initialDelaySeconds: 0 - periodSeconds: 10 - tcpSocket: - port: 3000 - timeoutSeconds: 1 - readinessProbe: - failureThreshold: 3 - initialDelaySeconds: 0 - periodSeconds: 10 - tcpSocket: - port: 3000 - timeoutSeconds: 1 - startupProbe: - failureThreshold: 30 - initialDelaySeconds: 0 - periodSeconds: 5 - tcpSocket: - port: 3000 - timeoutSeconds: 1 + - mountPath: /app/config/logs + name: logs volumes: - name: homepage-config configMap: diff --git a/apps/gethomepage/base/ingress.yaml b/apps/gethomepage/base/ingress.yaml index 8899953..9ca3006 100644 --- a/apps/gethomepage/base/ingress.yaml +++ b/apps/gethomepage/base/ingress.yaml @@ -1,14 +1,16 @@ ---- apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: homepage labels: - app.kubernetes.io/instance: homepage app.kubernetes.io/name: homepage - app.kubernetes.io/version: v0.6.10 annotations: cert-manager.io/cluster-issuer: letsencrypt-issuer + gethomepage.dev/description: Dynamically Detected Homepage + gethomepage.dev/enabled: "true" + gethomepage.dev/group: Cluster Management + gethomepage.dev/icon: homepage.png + gethomepage.dev/name: Homepage spec: tls: - hosts: diff --git a/apps/gethomepage/base/rbac.yaml b/apps/gethomepage/base/rbac.yaml index cb5c979..55d0dfc 100644 --- a/apps/gethomepage/base/rbac.yaml +++ b/apps/gethomepage/base/rbac.yaml @@ -1,13 +1,9 @@ ---- -# Source: gethomepage/charts/homepage/templates/rbac.yaml apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: name: homepage labels: - app.kubernetes.io/instance: homepage app.kubernetes.io/name: homepage - app.kubernetes.io/version: v0.6.10 rules: - apiGroups: - "" @@ -28,7 +24,6 @@ rules: - list - apiGroups: - traefik.containo.us - - traefik.io resources: - ingressroutes verbs: @@ -42,27 +37,15 @@ rules: verbs: - get - list - - apiGroups: - - apiextensions.k8s.io - resources: - - customresourcedefinitions/status - verbs: - - get --- -# Source: gethomepage/charts/homepage/templates/rbac.yaml apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: name: homepage labels: - app.kubernetes.io/instance: homepage app.kubernetes.io/name: homepage - app.kubernetes.io/version: v0.6.10 roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole name: homepage subjects: - - kind: ServiceAccount - name: homepage - namespace: argocd diff --git a/apps/gethomepage/base/sa.yaml b/apps/gethomepage/base/sa.yaml index 4d2f616..87f25e9 100644 --- a/apps/gethomepage/base/sa.yaml +++ b/apps/gethomepage/base/sa.yaml @@ -1,23 +1,8 @@ ---- apiVersion: v1 kind: ServiceAccount metadata: name: homepage labels: - app.kubernetes.io/instance: homepage app.kubernetes.io/name: homepage - app.kubernetes.io/version: v0.6.10 secrets: - - name: homepage-sa-token ---- -apiVersion: v1 -kind: Secret -type: kubernetes.io/service-account-token -metadata: - name: homepage-sa-token - labels: - app.kubernetes.io/instance: homepage - app.kubernetes.io/name: homepage - app.kubernetes.io/version: v0.6.10 - annotations: - kubernetes.io/service-account.name: homepage + - name: homepage diff --git a/apps/gethomepage/base/service.yaml b/apps/gethomepage/base/service.yaml index 87dff27..5a92639 100644 --- a/apps/gethomepage/base/service.yaml +++ b/apps/gethomepage/base/service.yaml @@ -1,13 +1,9 @@ ---- apiVersion: v1 kind: Service metadata: name: homepage labels: - app.kubernetes.io/service: homepage - app.kubernetes.io/instance: homepage app.kubernetes.io/name: homepage - app.kubernetes.io/version: v0.6.10 annotations: spec: type: ClusterIP @@ -17,5 +13,4 @@ spec: protocol: TCP name: http selector: - app.kubernetes.io/instance: homepage app.kubernetes.io/name: homepage diff --git a/apps/gethomepage/overlays/system/kustomization.yaml b/apps/gethomepage/overlays/system/kustomization.yaml index ae6881d..9d3b48b 100644 --- a/apps/gethomepage/overlays/system/kustomization.yaml +++ b/apps/gethomepage/overlays/system/kustomization.yaml @@ -6,3 +6,11 @@ resources: images: - name: ghcr.io/benphelps/homepage newTag: v0.8.13 + +patches: + - path: ./rbac-patch.yaml + target: + group: rbac.authorization.k8s.io + kind: ClusterRoleBinding + name: homepage + version: v1