diff --git a/deploy/base/kustomization.yaml b/deploy/base/kustomization.yaml index 2d3fef8..edd07ee 100644 --- a/deploy/base/kustomization.yaml +++ b/deploy/base/kustomization.yaml @@ -71,9 +71,6 @@ resources: - statefulset-synapse.yaml - svc-synapse.yaml -- statefulset-radicale.yaml -- svc-radicale.yaml - - deploy-solar-toolkit-gateway.yaml - svc-solar-toolkit-gateway.yaml diff --git a/deploy/prod-ovh/cert-ingress-tls.yaml b/deploy/prod-ovh/cert-ingress-tls.yaml index 64e7790..c7de970 100644 --- a/deploy/prod-ovh/cert-ingress-tls.yaml +++ b/deploy/prod-ovh/cert-ingress-tls.yaml @@ -16,5 +16,4 @@ spec: - git.netflux.io - grafana.netflux.io - netflux.io - - caldav-k3s.netflux.io - caldav.netflux.io diff --git a/deploy/prod-ovh/ingress.yaml b/deploy/prod-ovh/ingress.yaml index 6dbe80f..1e0478a 100644 --- a/deploy/prod-ovh/ingress.yaml +++ b/deploy/prod-ovh/ingress.yaml @@ -22,7 +22,7 @@ spec: name: netflux-homepage port: name: http - - host: grafana-k3s.netflux.io + - host: grafana.netflux.io http: paths: - path: / @@ -42,8 +42,20 @@ spec: name: gitea port: name: http + - host: caldav.netflux.io + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: radicale + port: + name: caldav tls: - hosts: - k3s.netflux.io - - grafana-k3s.netflux.io + - grafana.netflux.io + - git.netflux.io + - caldav.netflux.io secretName: prod-ingress-tls diff --git a/deploy/prod-ovh/kustomization.yaml b/deploy/prod-ovh/kustomization.yaml index 91b3649..19ad58d 100644 --- a/deploy/prod-ovh/kustomization.yaml +++ b/deploy/prod-ovh/kustomization.yaml @@ -36,6 +36,8 @@ resources: - svc-gitea.yaml - ingress-route-gitea-ssh.yaml +- statefulset-radicale.yaml +- svc-radicale.yaml configMapGenerator: - name: gitea-scripts @@ -69,6 +71,13 @@ configMapGenerator: - datasources.yaml=secrets/grafana-datasources.yaml - contactpoints.yaml=resources/grafana-contactpoints.yaml - rules.yaml=resources/grafana-rules.yaml +- name: radicale-config + files: + - config.toml=secrets/radicale-config.toml + - users=secrets/radicale-users + options: + labels: + app: radicale secretGenerator: - name: prometheus-credentials diff --git a/deploy/base/statefulset-radicale.yaml b/deploy/prod-ovh/statefulset-radicale.yaml similarity index 98% rename from deploy/base/statefulset-radicale.yaml rename to deploy/prod-ovh/statefulset-radicale.yaml index 9791f0a..3e671b6 100644 --- a/deploy/base/statefulset-radicale.yaml +++ b/deploy/prod-ovh/statefulset-radicale.yaml @@ -85,4 +85,4 @@ spec: - ReadWriteOnce resources: requests: - storage: 1Gi + storage: 2Gi diff --git a/deploy/base/svc-radicale.yaml b/deploy/prod-ovh/svc-radicale.yaml similarity index 100% rename from deploy/base/svc-radicale.yaml rename to deploy/prod-ovh/svc-radicale.yaml diff --git a/deploy/prod/kustomization.yaml b/deploy/prod/kustomization.yaml index 7d35b63..a60e83d 100644 --- a/deploy/prod/kustomization.yaml +++ b/deploy/prod/kustomization.yaml @@ -52,13 +52,6 @@ configMapGenerator: options: labels: app: drone -- name: radicale-config - files: - - config.toml=secrets/radicale-config.toml - - users=secrets/radicale-users - options: - labels: - app: radicale secretGenerator: - name: prometheus-credentials files: