use futureporn helm chart instead of kustomize

apps/base/futureporn/ipfs-pod.yaml

@@ -1,22 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: ipfs-pod
-  namespace: default
-  labels:
-    app.kubernetes.io/name: ipfs
-spec:
-  containers:
-    - name: ipfs
-      image: ipfs/kubo
-      ports:
-        - containerPort: 5001
-        - containerPort: 8080
-      volumeMounts:
-        - name: ipfs-pvc
-          mountPath: /data/ipfs
-  restartPolicy: OnFailure
-  volumes:
-    - name: ipfs-pvc
-      persistentVolumeClaim:
-        claimName: ipfs-pvc

apps/base/futureporn/ipfs-pvc.yaml

@@ -1,18 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: ipfs-pvc
-  namespace: default
-  annotations:
-    meta.helm.sh/release-name: fp
-    meta.helm.sh/release-namespace: default
-  labels:
-    app.kubernetes.io/managed-by: {{ .Values.managedBy }}
-spec:
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 40Gi
-  storageClassName: {{ .Values.storageClassName }}
-

apps/base/futureporn/ipfs-service.yaml

@@ -1,23 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: ipfs-service
-  namespace: default
-  annotations:
-    meta.helm.sh/release-name: fp
-    meta.helm.sh/release-namespace: default
-  labels:
-    app.kubernetes.io/managed-by: {{ .Values.managedBy }}
-spec:
-  selector:
-    app.kubernetes.io/name: ipfs
-  ports:
-    - name: gateway
-      protocol: TCP
-      port: 8080
-      targetPort: 8080
-    - name: api
-      protocol: TCP
-      port: 5001
-      targetPort: 5001
-

apps/base/futureporn/kustomization.yaml

@@ -2,4 +2,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: default
 resources:
-  - link2cid.yaml
+  - namespace.yaml
+  - repository.yaml
+  - release.yaml

apps/base/futureporn/link2cid.yaml

@@ -1,110 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: link2cid
-  namespace: default
-spec:
-  selector:
-    app: link2cid
-  ports:
-    - name: http
-      protocol: TCP
-      port: 80
-      targetPort: 3939
-    - name: https
-      protocol: TCP
-      port: 443
-      targetPort: 3939
-
-
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: link2cid
-  namespace: default
-spec:
-  selector:
-    matchLabels:
-      app: link2cid
-  template:
-    metadata:
-      labels:
-        app: link2cid
-    spec:
-      containers:
-      - image: {{ .Values.link2cid.containerName }}
-        resources:
-          requests:
-            memory: "64Mi"
-            cpu: "250m"
-          limits:
-            memory: "128Mi"
-            cpu: "500m"
-        name: link2cid
-        ports:
-        - containerPort: 3939
-        env:
-          - name: IPFS_URL
-            value: http://ipfs-service:5001
-          - name: PORT
-            value: '3939'
-          - name: API_KEY
-            valueFrom:
-              secretKeyRef:
-                name: link2cid
-                key: apiKey
-
-
----
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: link2cid
-  namespace: default
-  annotations:
-    meta.helm.sh/release-name: fp
-    meta.helm.sh/release-namespace: default
-  labels:
-    app.kubernetes.io/managed-by: {{ .Values.managedBy }}
-spec:
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 40Gi
-  storageClassName: {{ .Values.storageClassName }}
-
-
----
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: link2cid-ingress
-  namespace: default
-  annotations:
-    kubernetes.io/ingress.class: "nginx"
-    nginx.ingress.kubernetes.io/ssl-redirect: "true"
-    cert-manager.io/cluster-issuer: "letsencrypt-prod"
-spec:
-  ingressClassName: nginx
-  secretTemplate:
-    annotations:
-      reflector.v1.k8s.emberstack.com/reflection-allowed: "true"
-      reflector.v1.k8s.emberstack.com/reflection-allowed-namespaces: ""
-  tls:
-  - hosts:
-    - link2cid.sbtp.xyz
-    secretName: link2cid-tls
-  rules:
-  - host: link2cid.sbtp.xyz
-    http:
-      paths:
-      - path: /
-        pathType: Prefix
-        backend:
-          service:
-            name: link2cid
-            port:
-              number: 80
-

apps/base/futureporn/namespace.yaml

@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: futureporn

apps/base/futureporn/release.yaml

@@ -0,0 +1,19 @@
+apiVersion: helm.toolkit.fluxcd.io/v2beta2
+kind: HelmRelease
+metadata:
+  name: futureporn
+  namespace: futureporn
+spec:
+  releaseName: futureporn
+  chart:
+    spec:
+      chart: futureporn
+      sourceRef:
+        kind: GitRepository
+        name: futureporn
+  interval: 1m
+  install:
+    remediation:
+      retries: 3
+  values:
+    adminEmail: cj@futureporn.net

apps/base/futureporn/repository.yaml

@@ -0,0 +1,15 @@
+apiVersion: source.toolkit.fluxcd.io/v1
+kind: GitRepository
+metadata:
+  name: futureporn
+  namespace: futureporn
+spec:
+  interval: 1m
+  url: https://gitea.futureporn.net/futureporn/fp.git
+  ref:
+    branch: main
+  ignore: |
+    # exclude all
+    /*
+    # include charts directory
+    !/charts/

apps/base/futureporn/values-dev.yaml

@@ -1,12 +0,0 @@
-# storageClassName: csi-hostpath-sc # used by minikube
-storageClassName: standard # used by Kind
-link2cid:
-  containerName: fp/link2cid
-next:
-  containerName: fp/next
-strapi:
-  containerName: fp/strapi
-  port: 1337
-  url: http://localhost:1337
-managedBy: Dildo
-adminEmail: cj@futureporn.net

apps/base/futureporn/values-prod.yaml

@@ -1,14 +0,0 @@
-storageClassName: vultr-block-storage-hdd
-link2cid:
-  containerName: gitea.futureporn.net/futureporn/link2cid:latest
-next:
-  containerName: sjc.vultrcr.com/fpcontainers/next
-strapi:
-  containerName: sjc.vultrcr.com/fpcontainers/strapi
-  port: 1337
-  url: https://portal.futureporn.net
-managedBy: Helm
-adminEmail: cj@futureporn.net
-extraArgs: 
-  - --dns01-recursive-nameservers-only
-  - --dns01-recursive-nameservers=8.8.8.8:53,1.1.1.1:53

apps/base/futureporn/windmill-ingress.yaml

@@ -1,28 +0,0 @@
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: windmill-ingress
-  namespace: default
-  annotations:
-    cert-manager.io/cluster-issuer: "letsencrypt-staging"
-    nginx.ingress.kubernetes.io/ssl-passthrough: "true"
-    # If you encounter a redirect loop or are getting a 307 response code
-    # then you need to force the nginx ingress to connect to the backend using HTTPS.
-    nginx.ingress.kubernetes.io/backend-protocol: "HTTPS"
-spec:
-  ingressClassName: nginx
-  rules:
-  - host: windmill2.sbtp.xyz
-    http:
-      paths:
-      - path: /
-        pathType: Prefix
-        backend:
-          service:
-            name: windmmill-app
-            port:
-              name: https
-  tls:
-  - hosts:
-    - windmill2.sbtp.xyz
-    secretName: windmill-tls

apps/production/futureporn-values.yaml

@@ -1,3 +1,14 @@
+
+apiVersion: helm.toolkit.fluxcd.io/v2beta2
+kind: HelmRelease
+metadata:
+  name: futureporn
+  namespace: futureporn
+spec:
+  chart:
+    spec:
+      version: ">=1.0.0"
+  values:
     storageClassName: vultr-block-storage-hdd
     link2cid:
       containerName: gitea.futureporn.net/futureporn/link2cid:latest
@@ -8,7 +19,6 @@ strapi:
       port: 1337
       url: https://portal.futureporn.net
     managedBy: Helm
-adminEmail: cj@futureporn.net
     extraArgs: 
       - --dns01-recursive-nameservers-only
       - --dns01-recursive-nameservers=8.8.8.8:53,1.1.1.1:53