Replace freshrss with miniflux

2022-12-30 18:29:23 +00:00 · 2022-12-30 18:29:23 +00:00 · c89ad00c28
commit c89ad00c28
parent e100d2a826
5 changed files with 192 additions and 109 deletions
--- a/external-services/freshrss.yaml
+++ b/external-services/freshrss.yaml
@ -1,109 +0,0 @@
---
-apiVersion: v1
-kind: Service
-metadata:
-  name: freshrss
-  namespace: external-services
-spec:
-  type: ClusterIP
-  ports:
-    - name: http
-      port: 80
-...
---
-apiVersion: discovery.k8s.io/v1
-kind: EndpointSlice
-metadata:
-  name: freshrss
-  namespace: external-services
-  labels:
-    kubernetes.io/service-name: freshrss
-addressType: IPv4
-ports:
-  - name: http
-    appProtocol: http
-    protocol: TCP
-    port: 21046
-endpoints:
-  - addresses:
-    - "192.168.0.12"
-    conditions:
-      ready: true
-...
---
-apiVersion: cert-manager.io/v1
-kind: Certificate
-metadata:
-  name: freshrss-cert
-  namespace: istio-system
-spec:
-  secretName: freshrss-cert
-  commonName: rss.minhas.io
-  dnsNames:
-    - rss.minhas.io
-  issuerRef:
-    name: letsencrypt-prod
-    kind: ClusterIssuer
-    group: cert-manager.io
-...
---
-apiVersion: networking.istio.io/v1beta1
-kind: Gateway
-metadata:
-  name: freshrss-gateway
-  namespace: external-services
-spec:
-  selector:
-    istio: ingressgateway
-  servers:
-  - port:
-      number: 443
-      name: https
-      protocol: HTTPS
-    tls:
-      mode: SIMPLE
-      credentialName: freshrss-cert
-    hosts:
-    - rss.minhas.io
-...
---
-apiVersion: networking.istio.io/v1beta1
-kind: ServiceEntry
-metadata:
-  name: freshrss
-  namespace: external-services
-spec:
-  hosts:
-  - rss.minhas.io
-  addresses:
-  -  0.0.0.0/0
-  ports:
-  - number: 21046
-    name: freshrss
-    protocol: HTTP
-  location: MESH_EXTERNAL
-  resolution: STATIC
-  endpoints:
-    - address: 192.168.0.12
-...
---
-apiVersion: networking.istio.io/v1beta1
-kind: VirtualService
-metadata:
-  name: freshrss-gateway
-  namespace: external-services
-spec:
-  hosts:
-  - rss.minhas.io
-  gateways:
-  - freshrss-gateway
-  http:
-  - match:
-    - uri:
-        prefix: /
-    route:
-    - destination:
-        port:
-          number: 80
-        host: freshrss
-...
--- a/helm/apps/miniflux/external-secrets.yaml
+++ b/helm/apps/miniflux/external-secrets.yaml
@ -0,0 +1,63 @@
+---
+apiVersion: v1
+kind: Secret
+type: kubernetes.io/service-account-token
+metadata:
+  name: serviceaccounttoken
+  namespace: miniflux
+  annotations:
+    kubernetes.io/service-account.name: "miniflux"
+...
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: miniflux-tokenreview-binding
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: system:auth-delegator
+subjects:
+- kind: ServiceAccount
+  name: miniflux
+  namespace: miniflux
+...
+---
+apiVersion: external-secrets.io/v1beta1
+kind: SecretStore
+metadata:
+  name: miniflux
+  namespace: miniflux
+spec:
+  provider:
+    vault:
+      server: "https://vault.service.masked.name:8200"
+      path: "kv"
+      version: "v2"
+      caBundle: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUROVENDQWgyZ0F3SUJBZ0lVWXA4eG81dDJsSkZQM1NpRDFmSmlyZ0dVUUowd0RRWUpLb1pJaHZjTkFRRUwKQlFBd0ZqRVVNQklHQTFVRUF4TUxiV0Z6YTJWa0xtNWhiV1V3SGhjTk1qQXdPREk1TVRreU16RXlXaGNOTXpBdwpPREkzTVRreU16UXlXakFXTVJRd0VnWURWUVFERXd0dFlYTnJaV1F1Ym1GdFpUQ0NBU0l3RFFZSktvWklodmNOCkFRRUJCUUFEZ2dFUEFEQ0NBUW9DZ2dFQkFNSTdvUitLSHZ2em5mbmFBWERNTzVxcFNUQ0FZQ3lmakZFb2hZSmYKbE9jbkxPTlhiM2Y2c1A1ZDFlbHRMK1VUcTBSVlU1VVAwYU5XN2hxRFRhNDFNUncwSkNEdEI2OHlLZFlxMmhaZgo5N2dBK2xqM01FSlU2UlRBS0xyZzc1R1JoL0FiTkVJZ3d2UHVIS1c2aE1idHdPeU05REZVLy9XM3hwdXNhbFh5ClJNRnpBSGZTRGo5Y2krVXlnVXQ5SElOV2QvU21NR0cvOFBnaGFSaGZFNDR3UkZNcVllemVsaUl0MkpJczQzQlYKN0hxRzBPZXY5V1BlWG1pYVpVWUtRZXRIaVFxUjE0TXhpdjFJR3pDbXd3Tis5YjR0WnRaVGE1OG9NNWRQWGZiYgpsckVMUUU1T3NQYU50TXRFUjNNZ3hvdkROM1ZTQ0dIL08vR3lhRVdWYW5ZNVVGOENBd0VBQWFON01Ia3dEZ1lEClZSMFBBUUgvQkFRREFnRUdNQThHQTFVZEV3RUIvd1FGTUFNQkFmOHdIUVlEVlIwT0JCWUVGQlk4alczZkRWVXAKVVJ0MXByaG1ETWprVmlrZ01COEdBMVVkSXdRWU1CYUFGQlk4alczZkRWVXBVUnQxcHJobURNamtWaWtnTUJZRwpBMVVkRVFRUE1BMkNDMjFoYzJ0bFpDNXVZVzFsTUEwR0NTcUdTSWIzRFFFQkN3VUFBNElCQVFBV1F6NGQzUXpFClc4TkdBMTZaUGFtbFZ1Yk9MQjVEdFp6MnFyU3JuM0RlT2JMSURTaEluVjNxdFJsRHg5SFlKTFRDQTc1S2V0MEoKTlRzeU1jVHkydHhkNEk4aGdkRjMwWEplRWNpTjl3WjBtS0VlUC9ZS0R3ZThWMlh3V3E0WFlrRGVjaGxXSHBabwpQZldjb0xwckt3VlVJNEh6YXFrTm13Y21NVUk0eEFzQytTTGUxbXJlYnNlS200OW9Pd2RRcy9vUFZMSyswbkVwClJ2RDBhT3ZvaElMSWEvMlp0S2N6dmhCL0wzZm81cGc5RXgvMEpEQmRESEllZE1hYkQzcW44SWRzZStQNURmd2EKSnUyQ3R5YituMVRUUHhSRE14czJjRmJBNWlycisyQVJKZDhqdEdTKzFmeXhvZ2pPV1MxUlI1MjNGK3FJUzNzdQpLaWJHZWwrZ0ZQcHEKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQotLS0tLUJFR0lOIENFUlRJRklDQVRFLS0tLS0KTUlJRDB6Q0NBcnVnQXdJQkFnSVVNNTJ1aFhTZVRDaW0xcG16dWNtL2NuSWdOcDh3RFFZSktvWklodmNOQVFFTApCUUF3RmpFVU1CSUdBMVVFQXhNTGJXRnphMlZrTG01aGJXVXdIaGNOTWpBd09ESTVNVGt5TnpBd1doY05NalV3Ck9ESTRNVGt5TnpNd1dqQXRNU3N3S1FZRFZRUURFeUp0WVhOclpXUXVibUZ0WlNCSmJuUmxjbTFsWkdsaGRHVWcKUVhWMGFHOXlhWFI1TUlJQklqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FROEFNSUlCQ2dLQ0FRRUE4THVHbytBcwpJQ1lXZEpqQkNZMHNuRi9YK2pGMXRkY3JRek5pUktFU0ViNWRzRGl5OTc5YnVnQ2JsUFFEUStnNVdHcVhYNHBqClV5WlpFM1p3aE91ZklTbEdLMG93MWFNanFTK3BGbFE4NUtSRC9qVXRMUFJVSnVRRittMll3SWQvTWc2L0I3UWsKZDE2NnVKa054UytNR1pDaTJPWVhlb2l2bk9ZN1EwS2ovMHZJYmM1VnQza0NSVmcybGpMU1Fob0JkKzg1QUhNUgpqZVJqWk1lWUVZRjJIVFZ3cmc0RHJDL3IwME1WdERjTnFzNitNN1laL3J6bnk3M0d2ZkpXZldvQjFDNHBpWmxnCmZ2VWNTREw1SEFoaml1NWNTZUlSN0RUdVZ4N3Q0UG9LNkFxVWtQeWdEdHExWmFMeWJYVDdYNmQwNzJkUjVBWE8KbldGTFBhYUdKOTc5aXdJREFRQUJvNElCQURDQi9UQU9CZ05WSFE4QkFmOEVCQU1DQVFZd0R3WURWUjBUQVFILwpCQVV3QXdFQi96QWRCZ05WSFE0RUZnUVVJa2hWWUJhSzlDY3ZYRzhGTTJqS1ZaMTZvWkF3SHdZRFZSMGpCQmd3CkZvQVVGanlOYmQ4TlZTbFJHM1dtdUdZTXlPUldLU0F3VVFZSUt3WUJCUVVIQVFFRVJUQkRNRUVHQ0NzR0FRVUYKQnpBQ2hqVm9kSFJ3T2k4dmRtRjFiSFF1WTI5c2RXMWlhV0V1YldGemEyVmtMbTVoYldVNk9ESXdNQzkyTVM5dwphMmxmY205dmRDOWpZVEJIQmdOVkhSOEVRREErTUR5Z09xQTRoalpvZEhSd09pOHZkbUYxYkhRdVkyOXNkVzFpCmFXRXViV0Z6YTJWa0xtNWhiV1U2T0RJd01DOTJNUzl3YTJsZmNtOXZkQzlqY213d0RRWUpLb1pJaHZjTkFRRUwKQlFBRGdnRUJBSzZITWdSK2hwd2paQ21mNU5zekRTSHI3ZFlLWlhQNExyY0hQV3M5NG5MTTMzVVo1NzJ1YkdIcwpkS2pSdzhZRDBjbmNyc3lwc1ltRWdSNTdVK0RIa3lzMzk0d2tiN1VPd3kxWnZkNUlJUlhkUDBjRHlsejBRenFNCkFQblFZTitpc21rb2xqaGs5ZXkwUWJvM0NtUGpNK1VRY0F4dVpRdEE0TStyaUMxK2prdWRlMXVZTDBzekM2WTkKNEtldGZ2Yk5rZWRTYVY1eUphUktDQmhSY0M0L0dqcEJHL29kUS81QWZCUEFGalpxaGNJSldCclZZYlRRVkM3OQpoTUExaXdXSlBtVDlMc2pNU1VmeEZUUHp4Um5OWFFpS0Z6NWtUMk9pUzFucWg4YU9jeVU5WUM5Mjhwa2lmTkpWCktva3VEZXpKRk03aWUzZCtFY0JrMVY5bEh3T1dkdG89Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
+      auth:
+        kubernetes:
+          mountPath: "k8s-teapot"
+          role: "miniflux"
+          secretRef:
+            name: "serviceaccounttoken"
+...
+---
+apiVersion: external-secrets.io/v1beta1
+kind: ExternalSecret
+metadata:
+  name: miniflux
+  namespace: miniflux
+spec:
+  secretStoreRef:
+    name: miniflux
+    kind: SecretStore
+  data:
+  - secretKey: miniflux_admin_pw
+    remoteRef:
+      key: miniflux
+      property: miniflux_admin_pw
+  - secretKey: miniflux_db_url
+    remoteRef:
+      key: miniflux
+      property: miniflux_db_url
--- a/helm/apps/miniflux/install.sh
+++ b/helm/apps/miniflux/install.sh
@ -0,0 +1,39 @@
+#!/bin/bash
+
+CHART_VERSION=0.1.7
+NAMESPACE=miniflux
+VAULT_AUTH_NAMESPACE="k8s-teapot"
+
+kubectl create ns ${NAMESPACE}
+kubectl create serviceaccount -n ${NAMESPACE} miniflux
+kubectl apply -n ${NAMESPACE} -f external-secrets.yaml
+
+helm repo add gabe565 https://charts.gabe565.com
+helm repo update
+
+helm upgrade --install \
+	miniflux \
+	gabe565/miniflux \
+	-f values.yaml \
+	-n ${NAMESPACE} \
+	--version ${CHART_VERSION} \
+	--cleanup-on-fail
+
+HOST_IP=$(ip addr show eth0 | grep -Po 'inet \K[\d.]+')
+TOKEN="$(kubectl get secret serviceaccounttoken -n miniflux -o go-template='{{ .data.token }}' | base64 -d)"                   
+
+cat << EOH > miniflux.hcl
+path "kv/data/miniflux" {
+  capabilities = ["read"]
+}
+EOH
+vault policy write miniflux miniflux.hcl
+rm miniflux.hcl
+
+vault write auth/${VAULT_AUTH_NAMESPACE}/role/miniflux \
+    bound_service_account_names=miniflux \
+    bound_service_account_namespaces=miniflux \
+    policies=miniflux \
+    ttl=24h
+
+vault write auth/${VAULT_AUTH_NAMESPACE}/login role=miniflux jwt=${TOKEN} iss=https://${HOST_IP}:6443
--- a/helm/apps/miniflux/istio-ingress.yaml
+++ b/helm/apps/miniflux/istio-ingress.yaml
@ -0,0 +1,60 @@
+---
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  name: miniflux-cert
+  namespace: istio-system
+spec:
+  secretName: miniflux-cert
+  commonName: miniflux.minhas.io
+  dnsNames:
+    - miniflux.minhas.io
+    - rss.minhas.io
+  issuerRef:
+    name: letsencrypt-prod
+    kind: ClusterIssuer
+    group: cert-manager.io
+...
+---
+apiVersion: networking.istio.io/v1beta1
+kind: Gateway
+metadata:
+  name: miniflux-gateway
+  namespace: miniflux
+spec:
+  selector:
+    istio: ingressgateway
+  servers:
+  - port:
+      number: 443
+      name: https
+      protocol: HTTPS
+    tls:
+      mode: SIMPLE
+      credentialName: miniflux-cert
+    hosts:
+    - miniflux.minhas.io
+    - rss.minhas.io
+...
+---
+apiVersion: networking.istio.io/v1beta1
+kind: VirtualService
+metadata:
+  name: miniflux
+  namespace: miniflux
+spec:
+  hosts:
+  - miniflux.minhas.io
+  - rss.minhas.io
+  gateways:
+  - miniflux-gateway
+  http:
+  - match:
+    - uri:
+        prefix: /
+    route:
+    - destination:
+        port:
+          number: 80
+        host: miniflux
+...
--- a/helm/apps/miniflux/values.yaml
+++ b/helm/apps/miniflux/values.yaml
@ -0,0 +1,30 @@
+env:
+  - name: BASE_URL
+    value: https://rss.minhas.io
+  - name: LISTEN_ADDR
+    value: 0.0.0.0:80
+  - name: RUN_MIGRATIONS
+    value: 1
+  - name: CREATE_ADMIN
+    value: 1
+  - name: ADMIN_USERNAME
+    value: admin
+  - name: DATABASE_URL 
+    valueFrom:
+      secretKeyRef:
+        name: miniflux
+        key: miniflux_db_url
+  - name: ADMIN_PASSWORD
+    valueFrom:
+      secretKeyRef:
+        name: miniflux
+        key: miniflux_admin_pw
+
+service:
+  main:
+    ports:
+      http:
+        port: 80
+
+postgresql:
+  enabled: false