Compare commits

..

3 Commits

Author SHA1 Message Date
38eefd9454 chore(deps): update postgresql docker tag to v16.4.3 2025-01-16 01:02:40 +00:00
71c6161ad3
Update woodpecker 2025-01-15 16:03:42 +01:00
c27a5e1bfd
New ports for xray 2025-01-15 15:43:40 +01:00
10 changed files with 125 additions and 63 deletions

View File

@ -49,14 +49,14 @@ releases:
- template: env-values
- template: env-secrets
- name: vaultwarden
chart: allangers-charts/vaultwarden
version: 2.3.0
namespace: applications
inherit:
- template: default-env-values
- template: default-env-secrets
- template: ext-database
#- name: vaultwarden
# chart: allangers-charts/vaultwarden
# version: 2.3.0
# namespace: applications
# inherit:
# - template: default-env-values
# - template: default-env-secrets
# - template: ext-database
- name: stalwart
chart: allangers-charts/stalwart

View File

@ -22,7 +22,7 @@ releases:
namespace: databases
chart: bitnami/postgresql
condition: postgres16.enabled
version: 16.4.2
version: 16.4.3
inherit:
- template: default-env-values
- template: default-env-secrets
@ -32,7 +32,7 @@ releases:
namespace: databases
chart: bitnami/postgresql
condition: postgres17.enabled
version: 16.4.2
version: 16.4.3
inherit:
- template: default-env-values
- template: default-env-secrets

View File

@ -12,7 +12,7 @@ releases:
- name: woodpecker-ci
chart: woodpecker/woodpecker
namespace: pipelines
version: 2.0.3
version: 2.1.0
inherit:
- template: ext-database
- template: default-env-values

View File

@ -0,0 +1,15 @@
shortcuts:
hostname: links.badhouseplants.net
adminEmail: allanger@badhouseplants.net
ingress:
main:
class: traefik
metadata:
annotations:
kubernetes.io/ingress.class: traefik
traefik.ingress.kubernetes.io/router.entrypoints: web,websecure
kubernetes.io/tls-acme: "true"
kubernetes.io/ingress.allow-http: "false"
kubernetes.io/ingress.global-static-ip-name: ""
cert-manager.io/cluster-issuer: badhouseplants-issuer-http01

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -9,6 +9,13 @@ certificate:
dnsNames:
- xray-public-edge.badhouseplants.net
- 195.201.249.91
workload:
replicas: 1
containers:
server-xray:
ports:
shadowsocks-tcp: tcp
shadowsocks-udp: udp
traefik:
enabled: true
@ -18,6 +25,17 @@ traefik:
match: HostSNI(`*`)
entrypoint: xray-edge
port: 443
- name: server-shadowsocks-public-edge-tcp
service: server-xray-public-edge-shadowsocks-tcp
match: HostSNI(`*`)
entrypoint: ssocks-etcp
port: 8443
udpRoutes:
- name: server-shadowsocks-public-edge-udp
service: server-xray-public-edge-shadowsocks-udp
match: HostSNI(`*`)
entrypoint: ssocks-eudp
port: 8443
shortcuts:
hostname: xray-public-edge.badhouseplants.net
ingress:
@ -33,8 +51,23 @@ extraVolumes:
certs:
secret:
secretName: xray-public-edge.badhouseplants.net
workload:
replicas: 1
service:
shadowsocks-tcp:
enabled: true
type: ClusterIP
ports:
tcp:
port: 8443
targetPort: 8443
protocol: TCP
shadowsocks-udp:
enabled: true
type: ClusterIP
ports:
udp:
port: 8443
targetPort: 8443
protocol: UDP
ext-cilium:
enabled: true
ciliumNetworkPolicies:

View File

@ -17,7 +17,7 @@ traefik:
enabled: true
tcpRoutes:
- name: team-fortress-2
service: team-fortress-2-rcon
service: team-fortress-2-tf2-rcon
match: HostSNI(`*`)
entrypoint: tf2-rcon
port: 27015
@ -25,7 +25,7 @@ traefik:
- name: team-fortress-2
service: team-fortress-2-tf2
match: HostSNI(`*`)
entrypoint: tf2
entrypoint: tf2-main
port: 27015
storage:

View File

@ -107,21 +107,31 @@ ports:
exposedPort: 25565
expose:
default: true
shadowsocks:
port: 8388
protocol: TCP
exposedPort: 8388
expose:
default: true
tf2:
tf2-main:
port: 37015
protocol: UDP
exposedPort: 37015
expose:
default: true
tf2-rcon:
port: 37015
protocol: TCP
exposedPort: 37015
expose:
default: true
ssocks-etcp:
port: 8444
protocol: TCP
exposedPort: 8443
expose:
default: true
ssocks-eudp:
port: 8445
protocol: UDP
exposedPort: 8443
expose:
default: true

View File

@ -30,14 +30,14 @@ consoleIngress:
- secretName: min.e.badhouseplants.net
hosts:
- min.e.badhouseplants.net
rootUser: 'overlord'
rootUser: "overlord"
replicas: 1
mode: standalone
environment:
MINIO_SERVER_URL: "https://s3e.badhouseplants.net"
tls:
enabled: false
certSecret: ''
certSecret: ""
publicCrt: public.crt
privateKey: private.key
persistence:
@ -50,11 +50,11 @@ persistence:
service:
type: ClusterIP
clusterIP: ~
port: '9000'
port: "9000"
consoleService:
type: ClusterIP
clusterIP: ~
port: '9001'
port: "9001"
resources:
requests:
memory: 2Gi
@ -63,6 +63,10 @@ buckets:
policy: none
purge: false
versioning: false
- name: xray-public
policy: download
purge: false
versioning: false
metrics:
serviceMonitor:
enabled: false
@ -72,7 +76,7 @@ policies:
- name: allanger
statements:
- resources:
- 'arn:aws:s3:::*'
- "arn:aws:s3:::*"
actions:
- "s3:*"
- resources: []
@ -84,17 +88,17 @@ policies:
- name: velero
statements:
- resources:
- 'arn:aws:s3:::velero'
- "arn:aws:s3:::velero"
actions:
- "s3:*"
- resources:
- 'arn:aws:s3:::velero/*'
- "arn:aws:s3:::velero/*"
actions:
- "s3:*"
- name: Admins
statements:
- resources:
- 'arn:aws:s3:::*'
- "arn:aws:s3:::*"
actions:
- "s3:*"
- resources: []
@ -106,10 +110,10 @@ policies:
- name: DevOps
statements:
- resources:
- 'arn:aws:s3:::badhouseplants-net'
- "arn:aws:s3:::badhouseplants-net"
actions:
- "s3:*"
- resources:
- 'arn:aws:s3:::badhouseplants-net/*'
- "arn:aws:s3:::badhouseplants-net/*"
actions:
- "s3:*"