diff --git a/k8s/charts/ombi/Chart.yaml b/k8s/charts/ombi/Chart.yaml deleted file mode 100644 index 8850afca..00000000 --- a/k8s/charts/ombi/Chart.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: v2 -name: ombi -description: Ombi media request management -type: application -version: 0.1.0 diff --git a/k8s/charts/ombi/templates/deployment.yaml b/k8s/charts/ombi/templates/deployment.yaml deleted file mode 100644 index f52df38c..00000000 --- a/k8s/charts/ombi/templates/deployment.yaml +++ /dev/null @@ -1,79 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: ombi - labels: - app: ombi -spec: - replicas: 1 - strategy: - type: Recreate - selector: - matchLabels: - app: ombi - template: - metadata: - labels: - app: ombi - spec: - automountServiceAccountToken: false - enableServiceLinks: false - terminationGracePeriodSeconds: 30 - securityContext: - fsGroup: 1000 - seccompProfile: - type: RuntimeDefault - tolerations: - - key: node.kubernetes.io/not-ready - operator: Exists - effect: NoExecute - tolerationSeconds: {{ $.Values.global.failover.fastTolerationSeconds | default 60 }} - - key: node.kubernetes.io/unreachable - operator: Exists - effect: NoExecute - tolerationSeconds: {{ $.Values.global.failover.fastTolerationSeconds | default 60 }} - containers: - - name: ombi - image: lscr.io/linuxserver/ombi:latest@sha256:a89d63c66cd139a8515773749237a0a3cb114a62b092abd4fa2df6b144a2613f - imagePullPolicy: IfNotPresent - env: - - name: PUID - value: "1000" - - name: PGID - value: "1000" - - name: TZ - value: "America/New_York" - ports: - - name: http - containerPort: 3579 - resources: - requests: - cpu: 50m - memory: 256Mi - limits: - cpu: "1" - memory: 1Gi - volumeMounts: - - name: data - mountPath: /config - startupProbe: - httpGet: - path: / - port: http - periodSeconds: 10 - failureThreshold: 60 - livenessProbe: - httpGet: - path: / - port: http - periodSeconds: 30 - readinessProbe: - httpGet: - path: / - port: http - periodSeconds: 10 - failureThreshold: 3 - volumes: - - name: data - persistentVolumeClaim: - claimName: ombi-data diff --git a/k8s/charts/ombi/templates/ingress.yaml b/k8s/charts/ombi/templates/ingress.yaml deleted file mode 100644 index acd917f6..00000000 --- a/k8s/charts/ombi/templates/ingress.yaml +++ /dev/null @@ -1,23 +0,0 @@ -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: ombi - labels: - app: ombi -spec: - ingressClassName: traefik - tls: - - hosts: - - "ombi.cute.haus" - secretName: cute-haus-tls - rules: - - host: "ombi.cute.haus" - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: ombi - port: - number: 80 diff --git a/k8s/charts/ombi/templates/pvc.yaml b/k8s/charts/ombi/templates/pvc.yaml deleted file mode 100644 index 5ee8f331..00000000 --- a/k8s/charts/ombi/templates/pvc.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: ombi-data - labels: - app: ombi - annotations: - helm.sh/resource-policy: keep -spec: - accessModes: - - ReadWriteOnce - storageClassName: longhorn - resources: - requests: - storage: 2Gi diff --git a/k8s/charts/ombi/templates/service.yaml b/k8s/charts/ombi/templates/service.yaml deleted file mode 100644 index 8bb2705c..00000000 --- a/k8s/charts/ombi/templates/service.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: ombi - labels: - app: ombi -spec: - type: ClusterIP - selector: - app: ombi - ports: - - name: http - port: 80 - targetPort: 3579 diff --git a/k8s/flux/apps/kustomization.yaml b/k8s/flux/apps/kustomization.yaml index df86e439..3f8a1259 100644 --- a/k8s/flux/apps/kustomization.yaml +++ b/k8s/flux/apps/kustomization.yaml @@ -4,7 +4,6 @@ resources: - error-pages - forward-auth.yaml - navidrome.yaml - - ombi.yaml - pocket-id - uptime-kuma.yaml - vaultwarden.yaml diff --git a/k8s/flux/apps/ombi.yaml b/k8s/flux/apps/ombi.yaml deleted file mode 100644 index 14e26346..00000000 --- a/k8s/flux/apps/ombi.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: helm.toolkit.fluxcd.io/v2 -kind: HelmRelease -metadata: - name: ombi - namespace: flux-system -spec: - interval: 15m - releaseName: ombi - targetNamespace: default - install: { remediation: { retries: 3 } } - upgrade: { remediation: { retries: 3 } } - chart: - spec: - chart: ./k8s/charts/ombi - interval: 15m - reconcileStrategy: Revision - sourceRef: - { kind: GitRepository, name: flux-system, namespace: flux-system } - valuesFrom: - - { kind: ConfigMap, name: cute-haus-global, valuesKey: values.yaml } diff --git a/terraform/cute_haus.tf b/terraform/cute_haus.tf index 7adce1cf..4dba7957 100644 --- a/terraform/cute_haus.tf +++ b/terraform/cute_haus.tf @@ -7,7 +7,6 @@ locals { "kuma.cute.haus" = true "navidrome.cute.haus" = true "nextcloud.cute.haus" = false - "ombi.cute.haus" = true "paperless.cute.haus" = false "photoprism.cute.haus" = false "plex.cute.haus" = false @@ -32,6 +31,11 @@ moved { to = cloudflare_dns_record.cute_haus_pds } +moved { + from = cloudflare_dns_record.cute_haus_a["ombi.cute.haus"] + to = cloudflare_dns_record.cute_haus_ombi +} + resource "cloudflare_dns_record" "cute_haus_a" { for_each = local.cute_haus_ingress zone_id = local.zones.cute_haus @@ -77,6 +81,17 @@ resource "cloudflare_dns_record" "cute_haus_pds" { settings = {} } +resource "cloudflare_dns_record" "cute_haus_ombi" { + zone_id = local.zones.cute_haus + name = "ombi.cute.haus" + type = "A" + content = local.hosts.sunnyshore + proxied = true + ttl = 1 + tags = [] + settings = {} +} + resource "cloudflare_dns_record" "cute_haus_www_cname" { zone_id = local.zones.cute_haus name = "www.cute.haus"