From 499b5205bddf0a921918554f3093639d04f70453 Mon Sep 17 00:00:00 2001
From: xeruf <27jf@pm.me>
Date: Mon, 18 Jul 2022 12:40:14 +0100
Subject: [PATCH] apps: move gitea from dev to code and fix vikunja ingress
paths
---
basic/apps/{dev => code}/gitea-data-pvc.yaml | 0
basic/apps/{dev => code}/gitea-oauth-client.yaml | 2 +-
basic/apps/{dev => code}/gitea-postgres-pvc.yaml | 0
basic/apps/{dev => code}/gitea-release.yaml | 0
basic/apps/{dev => code}/gitea-values-configmap.yaml | 7 +++----
basic/apps/{dev => code}/kustomization.yaml | 0
basic/apps/do/vikunja-values-configmap.yaml | 12 +++++++++++-
7 files changed, 15 insertions(+), 6 deletions(-)
rename basic/apps/{dev => code}/gitea-data-pvc.yaml (100%)
rename basic/apps/{dev => code}/gitea-oauth-client.yaml (90%)
rename basic/apps/{dev => code}/gitea-postgres-pvc.yaml (100%)
rename basic/apps/{dev => code}/gitea-release.yaml (100%)
rename basic/apps/{dev => code}/gitea-values-configmap.yaml (84%)
rename basic/apps/{dev => code}/kustomization.yaml (100%)
diff --git a/basic/apps/dev/gitea-data-pvc.yaml b/basic/apps/code/gitea-data-pvc.yaml
similarity index 100%
rename from basic/apps/dev/gitea-data-pvc.yaml
rename to basic/apps/code/gitea-data-pvc.yaml
diff --git a/basic/apps/dev/gitea-oauth-client.yaml b/basic/apps/code/gitea-oauth-client.yaml
similarity index 90%
rename from basic/apps/dev/gitea-oauth-client.yaml
rename to basic/apps/code/gitea-oauth-client.yaml
index 13e453e..945dc52 100644
--- a/basic/apps/dev/gitea-oauth-client.yaml
+++ b/basic/apps/code/gitea-oauth-client.yaml
@@ -17,5 +17,5 @@ spec:
scope: "openid profile email stackspin_roles"
secretName: stackspin-gitea-oauth-variables
redirectUris:
- - https://dev.${domain}/user/oauth2/Stackspin/callback
+ - https://code.${domain}/user/oauth2/Stackspin/callback
tokenEndpointAuthMethod: client_secret_post
diff --git a/basic/apps/dev/gitea-postgres-pvc.yaml b/basic/apps/code/gitea-postgres-pvc.yaml
similarity index 100%
rename from basic/apps/dev/gitea-postgres-pvc.yaml
rename to basic/apps/code/gitea-postgres-pvc.yaml
diff --git a/basic/apps/dev/gitea-release.yaml b/basic/apps/code/gitea-release.yaml
similarity index 100%
rename from basic/apps/dev/gitea-release.yaml
rename to basic/apps/code/gitea-release.yaml
diff --git a/basic/apps/dev/gitea-values-configmap.yaml b/basic/apps/code/gitea-values-configmap.yaml
similarity index 84%
rename from basic/apps/dev/gitea-values-configmap.yaml
rename to basic/apps/code/gitea-values-configmap.yaml
index 2afb230..def1be9 100644
--- a/basic/apps/dev/gitea-values-configmap.yaml
+++ b/basic/apps/code/gitea-values-configmap.yaml
@@ -10,15 +10,14 @@ data:
annotations:
kubernetes.io/tls-acme: "true"
hosts:
- - host: "dev.${domain}"
+ - host: "code.${domain}"
paths:
- path: /
pathType: Prefix
tls:
- secretName: gitea-tls
hosts:
- - "dev.${domain}"
- - "tmpdev.${domain}"
+ - "code.${domain}"
gitea:
oauth:
- name: Stackspin
@@ -28,7 +27,7 @@ data:
autoDiscoverUrl: "https://sso.${domain}/.well-known/openid-configuration"
config:
server:
- ROOT_URL: "https://dev.${domain}"
+ ROOT_URL: "https://code.${domain}"
persistence:
enabled: true
existingClaim: gitea-data
diff --git a/basic/apps/dev/kustomization.yaml b/basic/apps/code/kustomization.yaml
similarity index 100%
rename from basic/apps/dev/kustomization.yaml
rename to basic/apps/code/kustomization.yaml
diff --git a/basic/apps/do/vikunja-values-configmap.yaml b/basic/apps/do/vikunja-values-configmap.yaml
index 49e5ec6..6f789c2 100644
--- a/basic/apps/do/vikunja-values-configmap.yaml
+++ b/basic/apps/do/vikunja-values-configmap.yaml
@@ -46,8 +46,18 @@ data:
kubernetes.io/tls-acme: "true"
hosts:
- host: "do.${domain}"
+ # Helm template rather than repitition? See https://github.com/k8s-at-home/library-charts/blob/4d09a8ddbdf11c278101b74b36720b5f7c17cd71/charts/stable/common/values.yaml#L342
+ paths:
+ - path: /
+ pathType: Prefix
- host: "du.${domain}"
+ paths:
+ - path: /
+ pathType: Prefix
- host: "tasks.${domain}"
+ paths:
+ - path: /
+ pathType: Prefix
tls:
- secretName: vikunja-tls
hosts:
@@ -55,7 +65,7 @@ data:
- "du.${domain}"
- "tasks.${domain}"
caddy:
- # TODO is caddy needed at all
+ # TODO is caddy needed at all?
noTls: true
postgresql:
enabled: true
--
GitLab