From fd0bb5106f2226cddf45af24e1dd00bcdfecacef Mon Sep 17 00:00:00 2001 From: Tyler Perkins Date: Sat, 4 May 2024 19:00:28 -0400 Subject: [PATCH] Update freshrss and homarr --- freshrss/freshrss-deployment.yaml | 58 ------------------- freshrss/freshrss-service.yaml | 13 ----- freshrss/sealed-secret.yaml | 17 ------ homarr/homarr-deployment.yaml | 43 ++++++++++++++ homarr/homarr-pvc-config.yaml | 12 ++++ .../homarr-pvc-data.yaml | 6 +- homarr/homarr-pvc-icons.yaml | 12 ++++ homarr/homarr-service.yaml | 12 ++++ homarr/sealed-secret.yaml | 14 +++++ 9 files changed, 96 insertions(+), 91 deletions(-) delete mode 100644 freshrss/freshrss-deployment.yaml delete mode 100644 freshrss/freshrss-service.yaml delete mode 100644 freshrss/sealed-secret.yaml create mode 100644 homarr/homarr-deployment.yaml create mode 100644 homarr/homarr-pvc-config.yaml rename freshrss/freshrss-pvc.yaml => homarr/homarr-pvc-data.yaml (78%) create mode 100644 homarr/homarr-pvc-icons.yaml create mode 100644 homarr/homarr-service.yaml create mode 100644 homarr/sealed-secret.yaml diff --git a/freshrss/freshrss-deployment.yaml b/freshrss/freshrss-deployment.yaml deleted file mode 100644 index f54bc92..0000000 --- a/freshrss/freshrss-deployment.yaml +++ /dev/null @@ -1,58 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: freshrss - namespace: freshrss-ns -spec: - replicas: 1 - selector: - matchLabels: - app: freshrss - template: - metadata: - labels: - app: freshrss - spec: - strategy: - type: Recreate - containers: - - name: freshrss - image: freshrss/freshrss - env: - - name: CRON_MIN - value: "*/10" - - name: OIDC_ENABLED - value: "1" - - name: OIDC_SCOPES - value: "openid profile email" - - name: OIDC_X_FORWARDED_HEADERS - value: "X-Forwarded-Host X-Forwarded-Port X-Forwarded-Proto" - - name: OIDC_PROVIDER_METADATA_URL - valueFrom: - secretKeyRef: - name: freshrss-oidc-config - key: OIDC_PROVIDER_METADATA_URL - - name: OIDC_CLIENT_ID - valueFrom: - secretKeyRef: - name: freshrss-oidc-config - key: OIDC_CLIENT_ID - - name: OIDC_CLIENT_SECRET - valueFrom: - secretKeyRef: - name: freshrss-oidc-config - key: OIDC_CLIENT_SECRET - - name: OIDC_CLIENT_CRYPTO_KEY - valueFrom: - secretKeyRef: - name: freshrss-oidc-config - key: OIDC_CLIENT_CRYPTO_KEY - ports: - - containerPort: 80 - volumeMounts: - - name: freshrss-storage - mountPath: /config - volumes: - - name: freshrss-storage - persistentVolumeClaim: - claimName: freshrss-pvc diff --git a/freshrss/freshrss-service.yaml b/freshrss/freshrss-service.yaml deleted file mode 100644 index d87a6d4..0000000 --- a/freshrss/freshrss-service.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: freshrss-service - namespace: freshrss-ns -spec: - selector: - app: freshrss - ports: - - protocol: TCP - port: 80 - targetPort: 80 - type: LoadBalancer diff --git a/freshrss/sealed-secret.yaml b/freshrss/sealed-secret.yaml deleted file mode 100644 index 11f6f82..0000000 --- a/freshrss/sealed-secret.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: bitnami.com/v1alpha1 -kind: SealedSecret -metadata: - creationTimestamp: null - name: freshrss-oidc-config - namespace: freshrss-ns -spec: - encryptedData: - OIDC_CLIENT_CRYPTO_KEY: AgAXVFKET2896vplk8EB1NtSBahDBSyXjnoRhyD3ZsIKSyoO2dkxRuBA9h6lYikIDnmD31LBE8Onu1KOnsEOg0HFLYls80VEGZhn3Dq9KmLxZvDvSORLMXa0bXD1oDSN1RWeNTcGBFOswkyXgJITpvU0rt8w5g1isr6A+g0JrLV7BG/OHZxy+D7VE6QZfFu+xlz64J0TUn5z6wHxU5asHzmiBdn3mxhMvoYv8KdvNDfpm2hKPvp2sJL7TBrp/GXqm2rT7kaYjGqc7Jm48PyLif3UajUrGpPR0Hjraox7cYkAFebmtepbqFZkoRZpfwY6fxObdlsgmknam9EE4/7ZFc+QJzXm1utTWL6s8v1WidB8ily1Bh6zXFLv2eLw+7q2V/0xxW+WQCV8jNEQaeqO2kA6Ch2lh4OIK4cp5Qgq6XeX6EoccLykO0toFkBNn4UkJ72CCSi5FZJqPNZU7Gu5FihrpGfOvmbLQzVoHNTyuVF7qtOj11EvI1TDgQLc0tu78cdcB2VemgRLMpoffWCr01toW34FwYrt3gOsZUK+WRoT+TAPhzv2mfHd94BMH2DnoLHIkz+VH5qmR0CsTq8dUYCw5M8AjdaTPw38NqUfbvrbJl5+dSRMxQ4Sm/6GEQPLoM7LEAn/mTSwy27EePJKEfZbhfu9xqzKLQB3VsEF/rdl/IVdsk3KMqZZbVY/AlYJIGf1ohdv3gbSssTmPIDHWhEbXMQv+++kbK+rNqxqq2v7ig== - OIDC_CLIENT_ID: AgBs+WyhEc7xDbkrxL0s+/PbNYbA9NQ0cCgiOH3UrufaA6+0l5obAZvITlq7jaDhKdc32NtKzz9bbB/MrLK0UienxiUg28f/ta/H2jpMzljzroxDIgNylZeNG/txrh8/jGnmbs5pKxbX5GsEzXBaSgb0QJ0IdQyit1W1vv/fFFxifCoABczS7VNfiYynJazp2G+Bq1U5EiyZDrjgu37f0h2v9VwBRf25p5W+v1AjSto73jmyTHlmEVPVlaft+4iBDRdDrarHRkgFCFl8mwIcGNWZreVM1/Uzdc5EZ6AU5gVtDMAKiIUT5X2CznseIbhPDSqc9WNwLKEsKWhXlGg17CpvmjG91P6SUXQsNGUJWGfrOeQuKt2mO/C9OhF+H1HuzSMa1NjgA5VRPeT529MY9Gw4gGO5+4ykpLw1BvHisA5Ia7VqieN6RB9VKKIkKr/ITpwjtkiBmuv3oGL+QKAihUwn0Tso8BhyufMM+O6iLnOCesi9dbgI0DeVEof3U3cQNDc/iuhtaesphK6+rNEq7kEfnXAzVoIfbCTvm1d799WYJSYBB6K/OZ9SGwGIoBcxDeEHw1OvBkqE1g807sV/VW1GbRj97xSXtEh7uJcevei2mBwSIICrmI4Yz3OF8IzVzPYjra/8hiIa19WW7SMMN1/oEZXw6G39zUETgKceV2fleIsUOoNQ+UQ92a6Y2UF92UHeIZVKCxE5lT4gcD5QxAChB/XQOE4sB1LceeCb6QBrGitrdBTpU2Yd - OIDC_CLIENT_SECRET: AgBy4M5GzoYXjDQ12DCgbfJ+mLCInGl73lP+NnpzEcccgqrKbPtjL++8GK758irKhtEvi3A5K/FPEjYHltQcrNcDDTZesmXE/Taiawc/s5o1npP9dQoHdFonKJsTFQ/BeOaoRExNTLC3Zz9Ubu2uw2Dd4FU2dk6bHisjk4kDSNPmCAx2VOhxZ8ujc7dr/krTMdNFNCgAPo5v+x6JUsYBzc5s6ZwEs+NninDuXRw+x6wldvCRascdUUZoa7TutWmtUIMsPTszyHcU9inojs40MFodGhCmjufY+XzjjBk3uiVDJZAiyzDozlz5OnKzf0BKJsiMsXxFmHpeotXZwy2ubROQUdyLnKOjTDfI131lhm0FWr2K08rzjiMls1mv1Gyr/CgzJm++fssFxps0V+9IR8sVh/M47qCW9hbfQM6w9AwzpX6Nc1O9MVxSj5CaqW32YYthXGnLYXYyiizSljsSb0onnwnpub6y5v5YiFNKt0o/6MXAkJZtt5JM0adC44KHSQjh/J0XlDcSg4yI3h7ty/E/KaPSmWe6E+C9KNIn+GMoXQeX4h1IluuiemefccRfJWiAiRZO5s8h0SkMizVyrRQYuywOUFOvB4UW1kMjRY2T8P+ziejtg3OHarMY2+fHpMDE1jugym6ctiBU0NgsKhc1xBrC1dHdNVnBkzUos0bP3lanlrRKbo1wqJSsukPxH4iAvKOkSgnDQogg6RhB7/k1eLqNqCHB2iNn04e47jgSguSfgV22jk7gVNiBRIqcY/g8nIWV4LzOetUuYoXpLxPPg03kXPnEqg1OX48z2RJOKKcmv5RzoN0hEKEc4+5DIlfIUh/IMd3gCpDZHdPp59aJ72MyaOzh0Kyq1GhE9c53Jg== - OIDC_PROVIDER_METADATA_URL: AgBayKIOoT5PVqeWexksEMiiW4oytgM54qygSPkUpRbapso56pMzDwUHpdRib6WfIVUODCy3R6UjIXl47mYnSVjjgSz/boMj5aKVntp/1isP2nC+yl2vQlUWOlNAXBSbss5BAych9NiJT7JPn0SqB7id3ByBP/A9hah4bNkXxioiLGZ57h/qYI3hYLP+22ywfdB051tAZx3ytiZhNAIJUmUjjz4dMJOwxI2jCZ2A7d0liF1TpkSjafHZIOnG05S4AfIRWMeIP2+F3Ar8kdNAtH8bpfmzwWcCho4J4O4UTavR1CHaGxteyJAt56dl2+7iSvtdbMI2QKhr4v4fYKG5Kl2BJ8s0/dvrjZ6tRSengBK0ei6CLoXHo/eEc797gXNWD22Mw+OuhKaEAxjuF9VbcNJbF8kgQSniPBsAKe/NH0B66374iUzfJUa0mkoE8RuvJ/DKlREUMn4oZfxuD/lGVLzOopyQ73M+ukhLScUgqThBZITk67iSxK7HxIuV/unr4jSmtLepH1nNEZ335fqEBOpV2pw92S0Fw0YKSr3iXGy4/x8agBiXCfPOMa7/1B6ekk5gHdi3BBL/PS1NPb/q4V2yGgzPq6f8ZKZjQ3Q7VgCf3x4ybg+unAZlFoC/qV5Bfd3vUNcWXnsFLIXcfykme/NrNp+ScuXUVAmb1bWxMhV60Jb0zXcaC0gSMuSbkFvNKX8BaGr1QFUBLTyg4712vpH8N4F3mYfDTGhzD5QGF1njBkpAuZyeOFRtU/SUsfidgDMhivmgnN41hpPxBo9GmD/MXYpZunXszkAhuJit4RMOHg== - template: - metadata: - creationTimestamp: null - name: freshrss-oidc-config - namespace: freshrss-ns diff --git a/homarr/homarr-deployment.yaml b/homarr/homarr-deployment.yaml new file mode 100644 index 0000000..1f76994 --- /dev/null +++ b/homarr/homarr-deployment.yaml @@ -0,0 +1,43 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: homarr + namespace: homarr-ns +spec: + replicas: 1 + selector: + matchLabels: + app: homarr + template: + metadata: + labels: + app: homarr + spec: + containers: + - name: homarr + image: ghcr.io/ajnart/homarr:latest + ports: + - containerPort: 7575 + env: + - name: EDIT_MODE_PASSWORD + valueFrom: + secretKeyRef: + name: homarr-edit-key + key: edit-key + volumeMounts: + - name: homarr-config + mountPath: /app/data/configs + - name: homarr-icons + mountPath: /app/public/icons + - name: homarr-data + mountPath: /data + volumes: + - name: homarr-config + persistentVolumeClaim: + claimName: homarr-config-pvc + - name: homarr-icons + persistentVolumeClaim: + claimName: homarr-icons-pvc + - name: homarr-data + persistentVolumeClaim: + claimName: homarr-data-pvc diff --git a/homarr/homarr-pvc-config.yaml b/homarr/homarr-pvc-config.yaml new file mode 100644 index 0000000..9690f57 --- /dev/null +++ b/homarr/homarr-pvc-config.yaml @@ -0,0 +1,12 @@ +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: homarr-config-pvc + namespace: homarr-ns +spec: + storageClassName: longhorn + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 512Mi diff --git a/freshrss/freshrss-pvc.yaml b/homarr/homarr-pvc-data.yaml similarity index 78% rename from freshrss/freshrss-pvc.yaml rename to homarr/homarr-pvc-data.yaml index d3445ef..e77d554 100644 --- a/freshrss/freshrss-pvc.yaml +++ b/homarr/homarr-pvc-data.yaml @@ -1,12 +1,12 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: - name: freshrss-pvc - namespace: freshrss-ns + name: homarr-data-pvc + namespace: homarr-ns spec: + storageClassName: longhorn accessModes: - ReadWriteOnce - storageClassName: longhorn resources: requests: storage: 1Gi diff --git a/homarr/homarr-pvc-icons.yaml b/homarr/homarr-pvc-icons.yaml new file mode 100644 index 0000000..f6cb304 --- /dev/null +++ b/homarr/homarr-pvc-icons.yaml @@ -0,0 +1,12 @@ +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: homarr-icons-pvc + namespace: homarr-ns +spec: + storageClassName: longhorn + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 1Gi diff --git a/homarr/homarr-service.yaml b/homarr/homarr-service.yaml new file mode 100644 index 0000000..86b3b74 --- /dev/null +++ b/homarr/homarr-service.yaml @@ -0,0 +1,12 @@ +apiVersion: v1 +kind: Service +metadata: + name: homarr-service + namespace: homarr-ns +spec: + type: LoadBalancer + ports: + - port: 80 + targetPort: 7575 + selector: + app: homarr diff --git a/homarr/sealed-secret.yaml b/homarr/sealed-secret.yaml new file mode 100644 index 0000000..27f3df2 --- /dev/null +++ b/homarr/sealed-secret.yaml @@ -0,0 +1,14 @@ +apiVersion: bitnami.com/v1alpha1 +kind: SealedSecret +metadata: + creationTimestamp: null + name: homarr-edit-key + namespace: homarr-ns +spec: + encryptedData: + edit-key: AgBnP6HGyQv63BuvrbO9JWdDu/aS7GadN+6dJ/4uBziMT6HxvBBbunrO5ZROHD1Hl9F3BSQs1GECkzYTQDVd5Hji93L39InCpo3+G0GGg0m6BH8j5WarheWS4837WynOUOfHncCCtXzG9iRqFZAUKE3xYtbNMULXXBiMyY625aonF3Agqz9MAtz4Dv56N5cPE4C4Ck0VPi4POQCP6RezHteCktlBBwpbPAem61mUUx+P+V7hEX3/TItl0j4HOvC6ttbHtVLPUwvHHdBcH/0stKhPben4Hnp7qLZe1A16+RCAbaAYF2TS9JbrQsCwtDq8mkQeAQg1sU0S1092b9OZKk9s1QpGGlKuH7G1iwQcaTpdVIj57QVIOPNoGWuuOiVzWe8hf+b1jITEJNT7VYWmBYcIZjLakYFr8zbkWPlvinkTv0GHo8uBOWsqLF+w3ekYk9HNSJ6dFEBpeMpvllXcbKnggb222otyqJ2Z9Kh2svIBqq2+0VulhFtEfjXFYLOMHqi+ZUz/MkPuREevDQXjwJTBoHD5OaB1OFRo6Kp1jyLogkTnUO/j2qv5DZDkofE0ha4PR9/9olqoYzTfs0IOa2+yUQZJ0OJ5dQbrnxNqbUWjCrVn6xVeCqKrZzsK+96wJVBgiPBzruO0y5ZYreNyW0GdBDS1ubvkkv8eMKbVOM+GTEtC1AburtCwuVYwOxgOJ31zudWmDzqEnrDK1Qp91eyzk4W2J+TRd52fxLQUukq9SA== + template: + metadata: + creationTimestamp: null + name: homarr-edit-key + namespace: homarr-ns