mirror of
https://github.com/rubenhensen/k8scd.git
synced 2026-09-17 02:12:55 +02:00
Compare commits
10 Commits
5cc2bbc818
...
99c984bf5a
| Author | SHA1 | Date | |
|---|---|---|---|
| 99c984bf5a | |||
| a11309263e | |||
| 379c050bb3 | |||
| 20128bcd73 | |||
| ffe8830b5e | |||
| 8d383d4261 | |||
| 00d46b6bd6 | |||
| cb7cba25d0 | |||
| ff9c2d3cef | |||
| 790d7d6f32 |
@@ -12,14 +12,14 @@ spec:
|
|||||||
project: default
|
project: default
|
||||||
source:
|
source:
|
||||||
repoURL: https://community-charts.github.io/helm-charts
|
repoURL: https://community-charts.github.io/helm-charts
|
||||||
targetRevision: 1.8.7
|
targetRevision: 1.8.9
|
||||||
chart: actualbudget
|
chart: actualbudget
|
||||||
helm:
|
helm:
|
||||||
values: |
|
values: |
|
||||||
# Actual Budget configuration
|
# Actual Budget configuration
|
||||||
|
|
||||||
image:
|
image:
|
||||||
tag: "26.3.0"
|
tag: "26.6.0"
|
||||||
|
|
||||||
# Authentication configuration
|
# Authentication configuration
|
||||||
login:
|
login:
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ spec:
|
|||||||
project: default
|
project: default
|
||||||
source:
|
source:
|
||||||
repoURL: https://charts.jetstack.io
|
repoURL: https://charts.jetstack.io
|
||||||
targetRevision: v1.15.5
|
targetRevision: v1.20.3
|
||||||
chart: cert-manager
|
chart: cert-manager
|
||||||
helm:
|
helm:
|
||||||
parameters:
|
parameters:
|
||||||
|
|||||||
@@ -0,0 +1,21 @@
|
|||||||
|
apiVersion: argoproj.io/v1alpha1
|
||||||
|
kind: Application
|
||||||
|
metadata:
|
||||||
|
name: gitea
|
||||||
|
namespace: argocd
|
||||||
|
finalizers:
|
||||||
|
- resources-finalizer.argocd.argoproj.io
|
||||||
|
spec:
|
||||||
|
project: default
|
||||||
|
source:
|
||||||
|
repoURL: https://github.com/rubenhensen/k8scd.git
|
||||||
|
targetRevision: HEAD
|
||||||
|
path: gitea
|
||||||
|
destination:
|
||||||
|
server: https://kubernetes.default.svc
|
||||||
|
namespace: gitea
|
||||||
|
syncPolicy:
|
||||||
|
syncOptions:
|
||||||
|
- CreateNamespace=true
|
||||||
|
automated:
|
||||||
|
selfHeal: true
|
||||||
@@ -41,6 +41,11 @@ spec:
|
|||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
name: mbgwp-mariadb-credentials
|
name: mbgwp-mariadb-credentials
|
||||||
key: password
|
key: password
|
||||||
|
- name: WF_ENCRYPTION_KEY
|
||||||
|
valueFrom:
|
||||||
|
secretKeyRef:
|
||||||
|
name: wordpress-credentials
|
||||||
|
key: wf-encryption-key
|
||||||
|
|
||||||
# WordPress specific settings
|
# WordPress specific settings
|
||||||
settings:
|
settings:
|
||||||
|
|||||||
@@ -10,51 +10,55 @@ records:
|
|||||||
- name: "phocaslustrum"
|
- name: "phocaslustrum"
|
||||||
expire: 300
|
expire: 300
|
||||||
type: A
|
type: A
|
||||||
content: "62.41.87.114"
|
content: "62.41.86.27"
|
||||||
- name: "ynab"
|
- name: "ynab"
|
||||||
expire: 300
|
expire: 300
|
||||||
type: A
|
type: A
|
||||||
content: "62.41.87.114"
|
content: "46.224.26.65"
|
||||||
- name: "authentik"
|
- name: "authentik"
|
||||||
expire: 300
|
expire: 300
|
||||||
type: A
|
type: A
|
||||||
content: "62.41.87.114"
|
content: "46.224.26.65"
|
||||||
- name: "ldap"
|
- name: "ldap"
|
||||||
expire: 300
|
expire: 300
|
||||||
type: A
|
type: A
|
||||||
content: "62.41.87.114"
|
content: "62.41.86.27"
|
||||||
- name: "argocd"
|
- name: "argocd"
|
||||||
expire: 300
|
expire: 300
|
||||||
type: A
|
type: A
|
||||||
content: "62.41.87.114"
|
content: "46.224.26.65"
|
||||||
- name: "vault"
|
- name: "vault"
|
||||||
expire: 300
|
expire: 300
|
||||||
type: A
|
type: A
|
||||||
content: "62.41.87.114"
|
content: "46.224.26.65"
|
||||||
- name: "rss"
|
- name: "rss"
|
||||||
expire: 300
|
expire: 300
|
||||||
type: A
|
type: A
|
||||||
content: "62.41.87.114"
|
content: "46.224.26.65"
|
||||||
- name: "ha"
|
- name: "ha"
|
||||||
expire: 300
|
expire: 300
|
||||||
type: A
|
type: A
|
||||||
content: "62.41.87.114"
|
content: "46.224.26.65"
|
||||||
- name: "longhorn"
|
- name: "longhorn"
|
||||||
expire: 300
|
expire: 300
|
||||||
type: A
|
type: A
|
||||||
content: "62.41.87.114"
|
content: "46.224.26.65"
|
||||||
- name: "lingo"
|
- name: "lingo"
|
||||||
expire: 300
|
expire: 300
|
||||||
type: A
|
type: A
|
||||||
content: "62.41.87.114"
|
content: "46.224.26.65"
|
||||||
- name: "blog"
|
- name: "blog"
|
||||||
expire: 300
|
expire: 300
|
||||||
type: A
|
type: A
|
||||||
content: "62.41.87.114"
|
content: "46.224.26.65"
|
||||||
- name: "serpbear"
|
- name: "serpbear"
|
||||||
expire: 300
|
expire: 300
|
||||||
type: A
|
type: A
|
||||||
content: "62.41.87.114"
|
content: "46.224.26.65"
|
||||||
|
- name: "git"
|
||||||
|
expire: 300
|
||||||
|
type: A
|
||||||
|
content: "46.224.26.65"
|
||||||
- name: "@"
|
- name: "@"
|
||||||
expire: 300
|
expire: 300
|
||||||
type: MX
|
type: MX
|
||||||
|
|||||||
@@ -0,0 +1,10 @@
|
|||||||
|
apiVersion: v1
|
||||||
|
kind: PersistentVolumeClaim
|
||||||
|
metadata:
|
||||||
|
name: gitea-data
|
||||||
|
spec:
|
||||||
|
accessModes:
|
||||||
|
- ReadWriteOnce
|
||||||
|
resources:
|
||||||
|
requests:
|
||||||
|
storage: 10Gi
|
||||||
@@ -0,0 +1,60 @@
|
|||||||
|
apiVersion: apps/v1
|
||||||
|
kind: Deployment
|
||||||
|
metadata:
|
||||||
|
name: gitea
|
||||||
|
labels:
|
||||||
|
app: gitea
|
||||||
|
spec:
|
||||||
|
replicas: 1
|
||||||
|
strategy:
|
||||||
|
type: Recreate
|
||||||
|
selector:
|
||||||
|
matchLabels:
|
||||||
|
app: gitea
|
||||||
|
template:
|
||||||
|
metadata:
|
||||||
|
labels:
|
||||||
|
app: gitea
|
||||||
|
spec:
|
||||||
|
securityContext:
|
||||||
|
fsGroup: 1000
|
||||||
|
containers:
|
||||||
|
- name: gitea
|
||||||
|
image: gitea/gitea:1
|
||||||
|
env:
|
||||||
|
- name: USER_UID
|
||||||
|
value: "1000"
|
||||||
|
- name: USER_GID
|
||||||
|
value: "1000"
|
||||||
|
- name: TZ
|
||||||
|
value: Europe/Amsterdam
|
||||||
|
- name: GITEA__server__ROOT_URL
|
||||||
|
value: https://git.rubenhensen.nl/
|
||||||
|
- name: GITEA__server__DOMAIN
|
||||||
|
value: git.rubenhensen.nl
|
||||||
|
- name: GITEA__server__PROTOCOL
|
||||||
|
value: http
|
||||||
|
- name: GITEA__server__HTTP_PORT
|
||||||
|
value: "3000"
|
||||||
|
- name: GITEA__server__DISABLE_SSH
|
||||||
|
value: "true"
|
||||||
|
- name: GITEA__database__DB_TYPE
|
||||||
|
value: sqlite3
|
||||||
|
- name: GITEA__database__PATH
|
||||||
|
value: /data/gitea/gitea.db
|
||||||
|
- name: GITEA__security__INSTALL_LOCK
|
||||||
|
value: "true"
|
||||||
|
- name: GITEA__log__MODE
|
||||||
|
value: console
|
||||||
|
ports:
|
||||||
|
- containerPort: 3000
|
||||||
|
name: http
|
||||||
|
protocol: TCP
|
||||||
|
volumeMounts:
|
||||||
|
- mountPath: /data
|
||||||
|
name: data
|
||||||
|
restartPolicy: Always
|
||||||
|
volumes:
|
||||||
|
- name: data
|
||||||
|
persistentVolumeClaim:
|
||||||
|
claimName: gitea-data
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
apiVersion: v1
|
||||||
|
kind: Service
|
||||||
|
metadata:
|
||||||
|
name: gitea
|
||||||
|
labels:
|
||||||
|
app: gitea
|
||||||
|
spec:
|
||||||
|
selector:
|
||||||
|
app: gitea
|
||||||
|
ports:
|
||||||
|
- name: http
|
||||||
|
port: 3000
|
||||||
|
targetPort: 3000
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
apiVersion: networking.k8s.io/v1
|
||||||
|
kind: Ingress
|
||||||
|
metadata:
|
||||||
|
name: gitea-ingress
|
||||||
|
annotations:
|
||||||
|
cert-manager.io/cluster-issuer: prod-cluster-issuer
|
||||||
|
nginx.ingress.kubernetes.io/proxy-body-size: "1g"
|
||||||
|
spec:
|
||||||
|
ingressClassName: nginx
|
||||||
|
rules:
|
||||||
|
- host: git.rubenhensen.nl
|
||||||
|
http:
|
||||||
|
paths:
|
||||||
|
- path: /
|
||||||
|
pathType: Prefix
|
||||||
|
backend:
|
||||||
|
service:
|
||||||
|
name: gitea
|
||||||
|
port:
|
||||||
|
number: 3000
|
||||||
|
tls:
|
||||||
|
- secretName: letsencrypt-prod
|
||||||
|
hosts:
|
||||||
|
- git.rubenhensen.nl
|
||||||
@@ -19,4 +19,8 @@ spec:
|
|||||||
- secretKey: smtp-password
|
- secretKey: smtp-password
|
||||||
remoteRef:
|
remoteRef:
|
||||||
key: kv/mbgwp
|
key: kv/mbgwp
|
||||||
property: smtp-password
|
property: smtp-password
|
||||||
|
- secretKey: wf-encryption-key
|
||||||
|
remoteRef:
|
||||||
|
key: kv/mbgwp
|
||||||
|
property: wf-encryption-key
|
||||||
@@ -1,4 +1,43 @@
|
|||||||
{ config, pkgs, lib, ... }:
|
{ config, pkgs, lib, ... }:
|
||||||
|
let
|
||||||
|
# Public IP of the home network where the k8s cluster ingress lives.
|
||||||
|
# Keep in sync with dns/domains/rubenhensen.nl.yaml.
|
||||||
|
homeIP = "62.41.86.27";
|
||||||
|
|
||||||
|
# Hosts tunneled to the home k8s cluster. Each entry gets:
|
||||||
|
# * an SNI map entry for TCP passthrough on :443
|
||||||
|
# * an HTTP vhost on :80 that reverse-proxies to the cluster
|
||||||
|
# The cluster's nginx-ingress terminates TLS with cert-manager.
|
||||||
|
tunneledHosts = [
|
||||||
|
"rss.rubenhensen.nl"
|
||||||
|
"authentik.rubenhensen.nl"
|
||||||
|
"vault.rubenhensen.nl"
|
||||||
|
"ynab.rubenhensen.nl"
|
||||||
|
"argocd.rubenhensen.nl"
|
||||||
|
"ha.rubenhensen.nl"
|
||||||
|
"longhorn.rubenhensen.nl"
|
||||||
|
"lingo.rubenhensen.nl"
|
||||||
|
"blog.rubenhensen.nl"
|
||||||
|
"serpbear.rubenhensen.nl"
|
||||||
|
"git.rubenhensen.nl"
|
||||||
|
];
|
||||||
|
|
||||||
|
sniMapEntries =
|
||||||
|
lib.concatMapStringsSep "\n"
|
||||||
|
(h: " ${h} ${homeIP}:443;")
|
||||||
|
tunneledHosts;
|
||||||
|
|
||||||
|
tunneledVhosts = lib.listToAttrs (map (h: {
|
||||||
|
name = h;
|
||||||
|
value = {
|
||||||
|
listen = [
|
||||||
|
{ addr = "0.0.0.0"; port = 80; }
|
||||||
|
{ addr = "[::]"; port = 80; }
|
||||||
|
];
|
||||||
|
locations."/".proxyPass = "http://${homeIP}";
|
||||||
|
};
|
||||||
|
}) tunneledHosts);
|
||||||
|
in
|
||||||
{
|
{
|
||||||
# ──────────────────────────────────────────────
|
# ──────────────────────────────────────────────
|
||||||
# Firewall
|
# Firewall
|
||||||
@@ -35,55 +74,67 @@
|
|||||||
"d /var/lib/acme/acme-challenge 0755 acme acme -"
|
"d /var/lib/acme/acme-challenge 0755 acme acme -"
|
||||||
];
|
];
|
||||||
|
|
||||||
# Serve ACME challenges via nginx on port 80
|
# Serve ACME challenges via nginx on port 80.
|
||||||
|
# Also reverse-proxy tunneled hosts to the home k8s cluster, and do
|
||||||
|
# SNI-based TCP passthrough on 443 so the cluster's cert-manager keeps
|
||||||
|
# owning the TLS certificate for those hosts.
|
||||||
services.nginx = {
|
services.nginx = {
|
||||||
enable = true;
|
enable = true;
|
||||||
virtualHosts."mail.rubenhensen.nl" = {
|
recommendedProxySettings = true;
|
||||||
listen = [
|
|
||||||
{ addr = "0.0.0.0"; port = 80; }
|
# SNI passthrough on 443:
|
||||||
{ addr = "[::]"; port = 80; }
|
# - mail.rubenhensen.nl (and anything else) → local stalwart on 8443
|
||||||
];
|
# - tunneled hosts → home cluster ingress on 443
|
||||||
locations."/.well-known/acme-challenge/" = {
|
streamConfig = ''
|
||||||
root = "/var/lib/acme/acme-challenge";
|
map $ssl_preread_server_name $tunnel_upstream {
|
||||||
|
${sniMapEntries}
|
||||||
|
default 127.0.0.1:8443;
|
||||||
|
}
|
||||||
|
|
||||||
|
server {
|
||||||
|
listen 443;
|
||||||
|
listen [::]:443;
|
||||||
|
proxy_pass $tunnel_upstream;
|
||||||
|
ssl_preread on;
|
||||||
|
}
|
||||||
|
'';
|
||||||
|
|
||||||
|
# Port 80: tunneled hosts reverse-proxy to the home cluster so its
|
||||||
|
# nginx-ingress handles HTTP→HTTPS redirects and cert-manager
|
||||||
|
# HTTP-01 ACME challenges. Mail-related hosts serve ACME challenges
|
||||||
|
# locally for stalwart's cert and redirect everything else to HTTPS.
|
||||||
|
virtualHosts = tunneledVhosts // {
|
||||||
|
"mail.rubenhensen.nl" = {
|
||||||
|
listen = [
|
||||||
|
{ addr = "0.0.0.0"; port = 80; }
|
||||||
|
{ addr = "[::]"; port = 80; }
|
||||||
|
];
|
||||||
|
locations."/.well-known/acme-challenge/".root = "/var/lib/acme/acme-challenge";
|
||||||
|
locations."/".return = "301 https://$host$request_uri";
|
||||||
};
|
};
|
||||||
locations."/" = {
|
"autoconfig.rubenhensen.nl" = {
|
||||||
return = "301 https://$host$request_uri";
|
listen = [
|
||||||
|
{ addr = "0.0.0.0"; port = 80; }
|
||||||
|
{ addr = "[::]"; port = 80; }
|
||||||
|
];
|
||||||
|
locations."/.well-known/acme-challenge/".root = "/var/lib/acme/acme-challenge";
|
||||||
|
locations."/".return = "301 https://$host$request_uri";
|
||||||
};
|
};
|
||||||
};
|
"autodiscover.rubenhensen.nl" = {
|
||||||
virtualHosts."autoconfig.rubenhensen.nl" = {
|
listen = [
|
||||||
listen = [
|
{ addr = "0.0.0.0"; port = 80; }
|
||||||
{ addr = "0.0.0.0"; port = 80; }
|
{ addr = "[::]"; port = 80; }
|
||||||
{ addr = "[::]"; port = 80; }
|
];
|
||||||
];
|
locations."/.well-known/acme-challenge/".root = "/var/lib/acme/acme-challenge";
|
||||||
locations."/.well-known/acme-challenge/" = {
|
locations."/".return = "301 https://$host$request_uri";
|
||||||
root = "/var/lib/acme/acme-challenge";
|
|
||||||
};
|
};
|
||||||
locations."/" = {
|
"rubenhensen.nl" = {
|
||||||
return = "301 https://$host$request_uri";
|
listen = [
|
||||||
};
|
{ addr = "0.0.0.0"; port = 80; }
|
||||||
};
|
{ addr = "[::]"; port = 80; }
|
||||||
virtualHosts."autodiscover.rubenhensen.nl" = {
|
];
|
||||||
listen = [
|
locations."/.well-known/acme-challenge/".root = "/var/lib/acme/acme-challenge";
|
||||||
{ addr = "0.0.0.0"; port = 80; }
|
locations."/".return = "301 https://$host$request_uri";
|
||||||
{ addr = "[::]"; port = 80; }
|
|
||||||
];
|
|
||||||
locations."/.well-known/acme-challenge/" = {
|
|
||||||
root = "/var/lib/acme/acme-challenge";
|
|
||||||
};
|
|
||||||
locations."/" = {
|
|
||||||
return = "301 https://$host$request_uri";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
virtualHosts."rubenhensen.nl" = {
|
|
||||||
listen = [
|
|
||||||
{ addr = "0.0.0.0"; port = 80; }
|
|
||||||
{ addr = "[::]"; port = 80; }
|
|
||||||
];
|
|
||||||
locations."/.well-known/acme-challenge/" = {
|
|
||||||
root = "/var/lib/acme/acme-challenge";
|
|
||||||
};
|
|
||||||
locations."/" = {
|
|
||||||
return = "301 https://$host$request_uri";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
@@ -120,7 +171,9 @@
|
|||||||
protocol = "managesieve";
|
protocol = "managesieve";
|
||||||
};
|
};
|
||||||
https = {
|
https = {
|
||||||
bind = "[::]:443";
|
# nginx owns the public :443 and does SNI passthrough to here
|
||||||
|
# for the mail.rubenhensen.nl SNI. Stalwart still terminates TLS.
|
||||||
|
bind = "127.0.0.1:8443";
|
||||||
protocol = "http";
|
protocol = "http";
|
||||||
tls.implicit = true;
|
tls.implicit = true;
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user