Merge pull request #22 from librepod/update-hajimari-to-latest-librep…

…od-version

Update hajimari to Librepod v1.0.0 chart version

charts/hajimari/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: librepod
   repository: https://librepod.github.io/charts
-  version: 0.1.0
-digest: sha256:3c2c489d4624e620d0a5e9040876c708457103f982800c0cd84e1a3adff9cf31
-generated: "2022-06-19T21:16:47.193224063+03:00"
+  version: 1.0.0
+digest: sha256:e4c6927c983bbb7a580735faf5f3068cfcef3e896249b5bcefa9002c6b251551
+generated: "2022-08-14T19:41:59.738967812+03:00"

charts/hajimari/Chart.yaml

@@ -3,7 +3,7 @@ name: hajimari
 description: |
     Hajimari is a beautiful & customizable browser startpage/dashboard with
     Kubernetes application discovery
-version: 0.1.5
+version: 0.2.0
 appVersion: v0.2.0
 kubeVersion: ">=1.16.0-0"
 type: application
@@ -17,5 +17,5 @@ sources:
   - https://github.com/toboshii/hajimari
 dependencies:
   - name: librepod
-    version: 0.1.0
+    version: 1.0.0
     repository: https://librepod.github.io/charts

charts/hajimari/ci/ct-values.yaml

@@ -1,38 +1,37 @@
-hajimari:
-  namespaceSelector:
-    matchNames:
-    - downloads
-    - media
-  customApps:
-  - name: Test
-    url: https://example.com
-    icon: test-tube
-  - name: Example
-    url: https://example.org
-    icon: test-tube
-  groups:
-  - name: Communicate
-    links:
-    - name: Discord
-      url: 'https://discord.com'
-    - name: Gmail
-      url: 'http://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'
-
-ingress:
-  enabled: false
-
 persistence:
-  enabled: false
+  config:
+    storageClassName: local-path
 
-serviceAccount:
-  create: true
+configmap:
+  config:
+    enabled: true
+    data:
+      config.yaml: |
+        namespaceSelector:
+          matchNames:
+          - downloads
+          - media
+        customApps:
+        - name: Test
+          url: "https://example.com"
+          icon: test-tube
+        - name: Example
+          url: "https://example.org"
+          icon: test-tube
+        groups:
+        - name: Communicate
+          links:
+          - name: Discord
+            url: "https://discord.com"
+          - name: Gmail
+            url: "http://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"

charts/hajimari/templates/all.yaml

@@ -0,0 +1 @@
+{{- include "librepod.all" . -}}

charts/hajimari/templates/rbac.yaml

@@ -4,7 +4,7 @@ kind: ClusterRole
 metadata:
   name: {{ template "librepod.names.serviceAccountName" . }}
   labels:
-    {{- include "librepod.names.labels" . | nindent 4 }}
+    {{- include "librepod.labels" . | nindent 4 }}
 rules:
 - apiGroups: ["", "extensions", "networking.k8s.io"]
   resources: ["ingresses", "namespaces"]
@@ -15,7 +15,7 @@ kind: ClusterRoleBinding
 metadata:
   name: {{ template "librepod.names.serviceAccountName" . }}
   labels:
-    {{- include "librepod.names.labels" . | nindent 4 }}
+    {{- include "librepod.labels" . | nindent 4 }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole

charts/hajimari/values.yaml

@@ -1,62 +1,69 @@
-replicaCount: 1
-autoscaling:
-  enabled: false
-
 image:
   repository: ghcr.io/toboshii/hajimari
   pullPolicy: IfNotPresent
-  tag: v0.2.0
+  tag:
+
+persistence:
+  config:
+    enabled: true
+    size: 100Mi
+    name: '{{ include "librepod.names.fullname" . }}-config'
+    mountPath: /config/config.yaml
+    subPath: config.yaml
+    type: configMap
 
-# -- environment variables.
 env:
   TZ: Europe/Moscow
 
-# -- Configures Hajimari settings for this instance.
-hajimari:
-  # -- The name of this instance, this allows running multiple
-  # instances of Hajimari on the same cluster
-  instanceName: null
-  # -- Set to true to show all discovered applications by default.
-  defaultEnable: false
-  # -- Namespace selector to use for discovering applications
-  namespaceSelector:
-    matchNames:
-      - kube-system
-  # -- Override the title of the Hajimari pages
-  title: LibrePod Start Page
-  name: "LibrePod User"
-  # -- Add custom applications to the discovered application list
-  customApps: []
-  # - name: Test
-  #   url: https://example.com
-  #   icon: test-tube
-
-  # -- Set default bookmarks
-  groups: []
-  # - name: Communicate
-  #   links:
-  #   - name: Discord
-  #     url: 'https://discord.com'
-  #   - name: Gmail
-  #     url: 'http://gmail.com'
-  #   - name: Slack
-  #     url: 'https://slack.com/signin'
-
-
-# -- Configures service settings for the chart.
 service:
-  port: 3000
-  targetPort: 3000
+  main:
+    enabled: true
+    ports:
+      http:
+        enabled: true
+        primary: true
+        port: 3000
 
-# -- Configures service account needed for reading k8s ingress objects
+# Configures service account needed for reading k8s ingress objects
 serviceAccount:
   create: true
 
 ingress:
-  enabled: true
-  domain: libre.pod
+  main:
+    enabled: true
+    hosts:
+      - host: libre.pod
 
-# -- Configure persistence settings for the chart under this key.
-persistence:
-  enabled: true
-  size: 100Mi
+configmap:
+  config:
+    enabled: true
+    data:
+      config.yaml: |
+        # The name of this instance, this allows running multiple
+        # instances of Hajimari on the same cluster
+        instanceName: null
+        # Set to true to show all discovered applications by default.
+        defaultEnable: false
+        # Namespace selector to use for discovering applications
+        namespaceSelector:
+          matchNames:
+            - kube-system
+        # Override the title of the Hajimari pages
+        title: LibrePod Start Page
+        name: LibrePod User
+        # Add custom applications to the discovered application list
+        customApps: []
+        # - name: Test
+        #   url: https://example.com
+        #   icon: test-tube
+
+        # Set default bookmarks
+        groups: []
+        # - name: Communicate
+        #   links:
+        #     - name: Discord
+        #       url: 'https://discord.com'
+        #     - name: Gmail
+        #       url: 'http://gmail.com'
+        #     - name: Slack
+        #       url: 'https://slack.com/signin'