From 356f2a57a7464a3a8eea74729cfcba2726b8e3f8 Mon Sep 17 00:00:00 2001 From: David Landry Date: Fri, 2 Feb 2024 17:00:03 -0500 Subject: [PATCH 1/6] Enable self-healing for homepage --- projects/system/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/system/values.yaml b/projects/system/values.yaml index c0fa485..d9b04b5 100644 --- a/projects/system/values.yaml +++ b/projects/system/values.yaml @@ -11,7 +11,7 @@ app-of-apps: description: Homelab dashboard path: ../apps/gethomepage namespace: homepage - selfHeal: false + selfHeal: true # - name: cert-manager # namespace: cert-manager From 16edd71360dfde444d0b4c070be5a50267deb25c Mon Sep 17 00:00:00 2001 From: David Landry Date: Fri, 2 Feb 2024 17:05:00 -0500 Subject: [PATCH 2/6] add foundryvtt --- apps/foundryvtt/deployment.yaml | 83 +++++++++++++++++++++++++++++++++ projects/games/.helmignore | 23 +++++++++ projects/games/Chart.yaml | 12 +++++ projects/games/values.yaml | 12 +++++ 4 files changed, 130 insertions(+) create mode 100644 apps/foundryvtt/deployment.yaml create mode 100644 projects/games/.helmignore create mode 100644 projects/games/Chart.yaml create mode 100644 projects/games/values.yaml diff --git a/apps/foundryvtt/deployment.yaml b/apps/foundryvtt/deployment.yaml new file mode 100644 index 0000000..341e197 --- /dev/null +++ b/apps/foundryvtt/deployment.yaml @@ -0,0 +1,83 @@ +--- +apiVersion: v1 +kind: Service +metadata: + name: foundryvtt + labels: + app: foundryvtt +spec: + selector: + app: foundryvtt + type: ClusterIP + ports: + - port: 80 + targetPort: 8080 + protocol: TCP + name: http +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: foundryvtt +spec: + selector: + matchLabels: + app: foundryvtt + replicas: 1 + template: + metadata: + labels: + app: foundryvtt + spec: + containers: + - name: foundryvtt + image: pgschk/foundryvtt-containerized:latest + env: + - name: FOUNDRYVTT_DOWNLOAD_URL + value: "https://foundryvtt.s3.amazonaws.com/releases/11.315/FoundryVTT-11.315.zip?AWSAccessKeyId=AKIA2KJE5YZ3BCQQ6DH3&Signature=LSWU%2FeHqgM1duP89XFEi5SG8m%2FU%3D&Expires=1706911775" + ports: + - containerPort: 8080 + volumeMounts: + - name: foundryvtt-data + mountPath: /data/foundryvtt + - name: foundryvtt-install + mountPath: /usr/src/app/foundryvtt + resources: + requests: + cpu: 150m + memory: 500Mi + limits: + cpu: 1000m + memory: 2000Mi + securityContext: + runAsUser: 1000 + volumes: + - name: foundryvtt-data + persistentVolumeClaim: + claimName: foundryvtt-data + - name: foundryvtt-install + persistentVolumeClaim: + claimName: foundryvtt-install +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: foundryvtt-data +spec: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 20Gi +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: foundryvtt-install +spec: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 2Gi + diff --git a/projects/games/.helmignore b/projects/games/.helmignore new file mode 100644 index 0000000..0e8a0eb --- /dev/null +++ b/projects/games/.helmignore @@ -0,0 +1,23 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*.orig +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ diff --git a/projects/games/Chart.yaml b/projects/games/Chart.yaml new file mode 100644 index 0000000..c5d93c2 --- /dev/null +++ b/projects/games/Chart.yaml @@ -0,0 +1,12 @@ +--- +apiVersion: v2 +name: media +type: application +version: 1.0.0 +appVersion: "1.16.1" +description: App-of-apps for self-hosted media applications + +dependencies: + - name: app-of-apps + version: 1.0.2 + repository: file://../../charts/app-of-apps diff --git a/projects/games/values.yaml b/projects/games/values.yaml new file mode 100644 index 0000000..2441c33 --- /dev/null +++ b/projects/games/values.yaml @@ -0,0 +1,12 @@ +--- +app-of-apps: + project: default + destination: + server: https://kubernetes.default.svc + source: + repoURL: https://git.nc.landry.land/davad/argo.git + path: apps + apps: + - name: foundryvtt + namespace: ttrpg + path: foundryvtt From 0316032bb7accd2b110b85483e7634339f51afd1 Mon Sep 17 00:00:00 2001 From: David Landry Date: Fri, 2 Feb 2024 17:13:20 -0500 Subject: [PATCH 3/6] fix(projects): use internal git url --- projects/games/values.yaml | 2 +- projects/media/values.yaml | 2 +- projects/system/values.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/games/values.yaml b/projects/games/values.yaml index 2441c33..16da6ee 100644 --- a/projects/games/values.yaml +++ b/projects/games/values.yaml @@ -4,7 +4,7 @@ app-of-apps: destination: server: https://kubernetes.default.svc source: - repoURL: https://git.nc.landry.land/davad/argo.git + repoURL: ssh://git@gitea-ssh.gitops.svc.cluster.local:2222/davad/argo.git path: apps apps: - name: foundryvtt diff --git a/projects/media/values.yaml b/projects/media/values.yaml index 42ae94f..6e8642e 100644 --- a/projects/media/values.yaml +++ b/projects/media/values.yaml @@ -4,7 +4,7 @@ app-of-apps: destination: server: https://kubernetes.default.svc source: - repoURL: https://git.nc.landry.land/davad/argo.git + repoURL: ssh://git@gitea-ssh.gitops.svc.cluster.local:2222/davad/argo.git path: apps apps: - name: kavita diff --git a/projects/system/values.yaml b/projects/system/values.yaml index d9b04b5..06c41a9 100644 --- a/projects/system/values.yaml +++ b/projects/system/values.yaml @@ -4,7 +4,7 @@ app-of-apps: destination: server: https://kubernetes.default.svc source: - repoURL: https://git.nc.landry.land/davad/argo.git + repoURL: ssh://git@gitea-ssh.gitops.svc.cluster.local:2222/davad/argo.git path: system apps: - name: homepage From 2510d8590cad0a9f73eeb655276d2170e01137f8 Mon Sep 17 00:00:00 2001 From: David Landry Date: Fri, 2 Feb 2024 21:16:50 -0500 Subject: [PATCH 4/6] fix: clean-up merge issue --- projects/games/.helmignore | 23 ----------------------- projects/games/Chart.yaml | 12 ------------ projects/games/values.yaml | 12 ------------ 3 files changed, 47 deletions(-) delete mode 100644 projects/games/.helmignore delete mode 100644 projects/games/Chart.yaml delete mode 100644 projects/games/values.yaml diff --git a/projects/games/.helmignore b/projects/games/.helmignore deleted file mode 100644 index 0e8a0eb..0000000 --- a/projects/games/.helmignore +++ /dev/null @@ -1,23 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*.orig -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ diff --git a/projects/games/Chart.yaml b/projects/games/Chart.yaml deleted file mode 100644 index c5d93c2..0000000 --- a/projects/games/Chart.yaml +++ /dev/null @@ -1,12 +0,0 @@ ---- -apiVersion: v2 -name: media -type: application -version: 1.0.0 -appVersion: "1.16.1" -description: App-of-apps for self-hosted media applications - -dependencies: - - name: app-of-apps - version: 1.0.2 - repository: file://../../charts/app-of-apps diff --git a/projects/games/values.yaml b/projects/games/values.yaml deleted file mode 100644 index 16da6ee..0000000 --- a/projects/games/values.yaml +++ /dev/null @@ -1,12 +0,0 @@ ---- -app-of-apps: - project: default - destination: - server: https://kubernetes.default.svc - source: - repoURL: ssh://git@gitea-ssh.gitops.svc.cluster.local:2222/davad/argo.git - path: apps - apps: - - name: foundryvtt - namespace: ttrpg - path: foundryvtt From 093ee3daea247ca38aade11a1317af88f1214945 Mon Sep 17 00:00:00 2001 From: David Landry Date: Fri, 2 Feb 2024 21:20:31 -0500 Subject: [PATCH 5/6] chore(foundryvtt): refactor to follow kustomize format --- apps/foundryvtt/{ => base}/deployment.yaml | 0 apps/foundryvtt/base/kustomization.yaml | 4 ++++ apps/foundryvtt/overlays/games/config.json | 11 +++++++++++ apps/foundryvtt/overlays/games/kustomization.yaml | 4 ++++ 4 files changed, 19 insertions(+) rename apps/foundryvtt/{ => base}/deployment.yaml (100%) create mode 100644 apps/foundryvtt/base/kustomization.yaml create mode 100644 apps/foundryvtt/overlays/games/config.json create mode 100644 apps/foundryvtt/overlays/games/kustomization.yaml diff --git a/apps/foundryvtt/deployment.yaml b/apps/foundryvtt/base/deployment.yaml similarity index 100% rename from apps/foundryvtt/deployment.yaml rename to apps/foundryvtt/base/deployment.yaml diff --git a/apps/foundryvtt/base/kustomization.yaml b/apps/foundryvtt/base/kustomization.yaml new file mode 100644 index 0000000..9c2d28b --- /dev/null +++ b/apps/foundryvtt/base/kustomization.yaml @@ -0,0 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - deployment.yaml diff --git a/apps/foundryvtt/overlays/games/config.json b/apps/foundryvtt/overlays/games/config.json new file mode 100644 index 0000000..de653d6 --- /dev/null +++ b/apps/foundryvtt/overlays/games/config.json @@ -0,0 +1,11 @@ +{ + "appName": "foundryvtt", + "userGivenName": "foundryvtt", + "destNamespace": "ttrpg", + "destServer": "https://kubernetes.default.svc", + "srcPath": "apps/foundryvtt/overlays/games", + "srcRepoURL": "ssh://git@gitea-ssh.gitops.svc.cluster.local:2222/davad/argo.git", + "srcTargetRevision": "", + "labels": null, + "annotations": null +} diff --git a/apps/foundryvtt/overlays/games/kustomization.yaml b/apps/foundryvtt/overlays/games/kustomization.yaml new file mode 100644 index 0000000..4e4f197 --- /dev/null +++ b/apps/foundryvtt/overlays/games/kustomization.yaml @@ -0,0 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: +- ../../base From c383a82c83475de974d829c8962df84335d4db75 Mon Sep 17 00:00:00 2001 From: David Landry Date: Fri, 2 Feb 2024 21:21:24 -0500 Subject: [PATCH 6/6] chore(foundryvtt): update timed download URL --- apps/foundryvtt/base/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/foundryvtt/base/deployment.yaml b/apps/foundryvtt/base/deployment.yaml index 341e197..feafbd6 100644 --- a/apps/foundryvtt/base/deployment.yaml +++ b/apps/foundryvtt/base/deployment.yaml @@ -34,7 +34,7 @@ spec: image: pgschk/foundryvtt-containerized:latest env: - name: FOUNDRYVTT_DOWNLOAD_URL - value: "https://foundryvtt.s3.amazonaws.com/releases/11.315/FoundryVTT-11.315.zip?AWSAccessKeyId=AKIA2KJE5YZ3BCQQ6DH3&Signature=LSWU%2FeHqgM1duP89XFEi5SG8m%2FU%3D&Expires=1706911775" + value: "https://foundryvtt.s3.amazonaws.com/releases/11.315/FoundryVTT-11.315-Setup.exe?AWSAccessKeyId=AKIA2KJE5YZ3BCQQ6DH3&Signature=HSnWSl09cJvf1aq5lVOQfRgEFOA%3D&Expires=1706927160" ports: - containerPort: 8080 volumeMounts: