Merge branch 'main' into add-budget-app

gandazgul · Apr 14, 2024 · f98e0b9 · f98e0b9
2 parents b175c26 + 3c0dcce
commit f98e0b9
Show file tree

Hide file tree

Showing 60 changed files with 810 additions and 273 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 # Injellij
 .idea/workspace.xml
 .idea/aws.xml
+.idea/copilot/
 
 # docker
 containers/sshd/users.conf

diff --git a/.idea/k8s-infrastructure.iml b/.idea/k8s-infrastructure.iml
diff --git a/.idea/kubernetes-settings.xml b/.idea/kubernetes-settings.xml
diff --git a/apps/Bitwarden.yaml b/apps/Bitwarden.yaml
@@ -30,7 +30,7 @@ spec:
       ADMIN_TOKEN: ${BITWARDEN_ADMIN_TOKEN}
       INVITATIONS_ALLOWED: true
       SHOW_PASSWORD_HINT: false
-      DOMAIN: https://p.${CLUSTER_DOMAIN_NAME}
+      DOMAIN: https://${BITWARDEN_SUBDOMAIN}.${CLUSTER_DOMAIN_NAME}
       SMTP_HOST: smtp.gmail.com
       SMTP_PORT: 587
       SMTP_FROM: ${EMAIL}

diff --git a/apps/Lidarr.yaml b/apps/Lidarr.yaml
@@ -1,13 +1,4 @@
 ---
-apiVersion: source.toolkit.fluxcd.io/v1beta1
-kind: HelmRepository
-metadata:
-  name: geek-cookbook
-  namespace: kube-system
-spec:
-  interval: 1h0m0s
-  url: https://geek-cookbook.github.io/charts/
----
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:

diff --git a/apps/Mealie.yaml b/apps/Mealie.yaml
@@ -0,0 +1,23 @@
+---
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: mealie
+  namespace: default
+spec:
+  interval: 5m
+  path: ./apps/mealie/base/
+  prune: true
+  sourceRef:
+    kind: GitRepository
+    name: k8s-infrastructure
+    namespace: kube-system
+  healthChecks:
+    - apiVersion: apps/v1
+      kind: Deployment
+      name: mealie
+      namespace: default
+  postBuild:
+    substituteFrom:
+      - kind: Secret
+        name: secrets
diff --git a/apps/Ollama.yaml b/apps/Ollama.yaml
@@ -0,0 +1,54 @@
+---
+apiVersion: source.toolkit.fluxcd.io/v1beta2
+kind: HelmRepository
+metadata:
+  name: ollama
+  namespace: kube-system
+spec:
+  interval: 1h0m0s
+  url: "https://otwld.github.io/ollama-helm"
+
+---
+apiVersion: helm.toolkit.fluxcd.io/v2beta1
+kind: HelmRelease
+metadata:
+  name: ollama
+  namespace: default
+spec:
+  interval: 5m
+  chart:
+    spec:
+      chart: ollama
+      version: 0.20.0
+      sourceRef:
+        kind: HelmRepository
+        name: ollama
+        namespace: kube-system
+      interval: 5m
+  values:
+    image:
+      pullPolicy: Always
+    ollama:
+      models:
+        - llama2
+        - llama2-uncensored
+    ingress:
+      enabled: true
+      hosts:
+        - host: ai.${CLUSTER_DOMAIN_NAME}
+          paths:
+            - path: /
+              pathType: Prefix
+      tls:
+        - hosts:
+            - ai.${CLUSTER_DOMAIN_NAME}
+          secretName: internal-ingress-cert
+      annotations:
+        kubernetes.io/ingress.class: "nginx"
+        forecastle.stakater.com/appName: "ollama"
+        forecastle.stakater.com/expose: "true"
+        forecastle.stakater.com/icon: "https://ollama.com/public/ollama.png"
+    persistentVolume:
+      enabled: true
+      existingClaim: yasr-volume
+      subPath: configs/ollama
diff --git a/apps/OpenAIWhisper.yaml b/apps/OpenAIWhisper.yaml
@@ -0,0 +1,30 @@
+apiVersion: source.toolkit.fluxcd.io/v1beta1
+kind: HelmRepository
+metadata:
+  name: truecharts
+  namespace: kube-system
+spec:
+  interval: 1m
+  url: "https://charts.truecharts.org"
+---
+apiVersion: helm.toolkit.fluxcd.io/v2beta1
+kind: HelmRelease
+metadata:
+  name: wyoming-whisper
+  namespace: default
+spec:
+  interval: 5m
+  chart:
+    spec:
+      chart: wyoming-whisper
+      version: "5.0.0"
+      sourceRef:
+        kind: HelmRepository
+        name: truecharts
+        namespace: kube-system
+  #https://github.com/truecharts/charts/blob/master/charts/stable/wyoming-whisper/values.yaml
+  values: 
+    key1: value1
+    key2:
+      subkey1: value2
+      subkey2: value3
diff --git a/apps/OpenWebUI.yaml b/apps/OpenWebUI.yaml
@@ -0,0 +1,23 @@
+---
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: open-webui
+  namespace: default
+spec:
+  interval: 5m
+  path: ./apps/open-webui/${CLUSTER_NAME}
+  prune: true
+  sourceRef:
+    kind: GitRepository
+    name: k8s-infrastructure
+    namespace: kube-system
+  healthChecks:
+    - apiVersion: apps/v1
+      kind: Deployment
+      name: open-webui
+      namespace: default
+  postBuild:
+    substituteFrom:
+      - kind: Secret
+        name: secrets
diff --git a/apps/Skooner.yaml b/apps/Skooner.yaml
@@ -3,18 +3,20 @@ apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   name: skooner
-  namespace: kube-system
+  namespace: default
 spec:
-  dependsOn:
-    - name: sealed-secret
-  interval: 10m0s
+  interval: 10m
   path: ./apps/skooner/
-  targetNamespace: default
   prune: true
   sourceRef:
     kind: GitRepository
     name: k8s-infrastructure
     namespace: kube-system
+  healthChecks:
+    - apiVersion: apps/v1
+      kind: Deployment
+      name: skooner
+      namespace: default
   postBuild:
     substituteFrom:
       - kind: Secret

diff --git a/apps/Tdarr.yaml b/apps/Tdarr.yaml
@@ -0,0 +1,23 @@
+---
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: tdarr
+  namespace: default
+spec:
+  interval: 5m
+  path: ./apps/tdarr/base/
+  prune: true
+  sourceRef:
+    kind: GitRepository
+    name: k8s-infrastructure
+    namespace: kube-system
+  healthChecks:
+    - apiVersion: apps/v1
+      kind: Deployment
+      name: tdarr
+      namespace: default
+  postBuild:
+    substituteFrom:
+      - kind: Secret
+        name: secrets
diff --git a/apps/Transmission.yaml b/apps/Transmission.yaml
@@ -0,0 +1,23 @@
+---
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: transmission
+  namespace: default
+spec:
+  interval: 5m
+  path: ./apps/transmission/base/
+  prune: true
+  sourceRef:
+    kind: GitRepository
+    name: k8s-infrastructure
+    namespace: kube-system
+  healthChecks:
+    - apiVersion: apps/v1
+      kind: Deployment
+      name: transmission
+      namespace: default
+  postBuild:
+    substituteFrom:
+      - kind: Secret
+        name: secrets
diff --git a/apps/mealie/base/deployment.yaml b/apps/mealie/base/deployment.yaml
@@ -3,6 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: mealie
+  namespace: default
   labels:
     app.kubernetes.io/name: mealie
 spec:
@@ -16,53 +17,9 @@ spec:
       labels:
         app.kubernetes.io/name: mealie
     spec:
-      volumes:
-      - name: yasr-volume
-        persistentVolumeClaim:
-          claimName: yasr-volume
-      - name: tz-config
-        hostPath:
-          path: /etc/localtime
-      dnsPolicy: ClusterFirst
-      dnsConfig: {}
       containers:
-      # frontend ---------------------------------------------------------
-      - name: frontend
-        image: hkotel/mealie:frontend-v1.0.0beta-5
-        imagePullPolicy: Always
-        env:
-        - name: TZ
-          value: ${CLUSTER_TIME_ZONE}
-        - name: API_URL
-          value: "http://127.0.0.1:9000"
-        livenessProbe:
-          httpGet:
-            scheme: HTTP
-            path: /
-            port: 3001
-          initialDelaySeconds: 30
-          timeoutSeconds: 10
-        resources:
-          requests:
-            cpu: 100m
-            memory: 250Mi
-          limits:
-            cpu: 500m
-            memory: 500Mi
-        volumeMounts:
-          - mountPath: /etc/localtime
-            name: tz-config
-            readOnly: true
-          - mountPath: /app/data
-            name: yasr-volume
-            subPath: configs/mealie
-        ports:
-          - name: fe-http
-            containerPort: 3001
-            protocol: TCP
-      # api ----------------------------------------------------------
-      - name: api
-        image: hkotel/mealie:api-v1.0.0beta-5
+      - name: mealie
+        image: ghcr.io/mealie-recipes/mealie:latest
         imagePullPolicy: Always
         env:
         - name: PUID
@@ -87,10 +44,14 @@ spec:
           value: ${EMAIL}
         - name: SMTP_PASSWORD
           value: ${SMTP_PASSWORD}
+        ports:
+          - name: http
+            containerPort: 9000
+            protocol: TCP
         livenessProbe:
           httpGet:
             scheme: HTTP
-            path: /api/app/about
+            path: /
             port: 9000
           initialDelaySeconds: 30
           timeoutSeconds: 10
@@ -102,13 +63,16 @@ spec:
             cpu: 500m
             memory: 500Mi
         volumeMounts:
-        - mountPath: /app/data
-          name: yasr-volume
-          subPath: configs/mealie
-        - mountPath: /etc/localtime
-          name: tz-config
-          readOnly: true
-        ports:
-        - name: api-http
-          containerPort: 9000
-          protocol: TCP
+          - name: tz-config
+            mountPath: /etc/localtime
+            readOnly: true
+          - name: yasr-volume
+            mountPath: /app/data
+            subPath: configs/mealie
+      volumes:
+        - name: yasr-volume
+          persistentVolumeClaim:
+            claimName: yasr-volume
+        - name: tz-config
+          hostPath:
+            path: /etc/localtime