diff --git a/adguardhome/k8s/ingress.yaml b/adguardhome/k8s/ingress.yaml index 4a58389..0d17aa2 100644 --- a/adguardhome/k8s/ingress.yaml +++ b/adguardhome/k8s/ingress.yaml @@ -64,3 +64,17 @@ spec: - name: adguard-service port: 3000 tls: {} +--- +apiVersion: traefik.io/v1alpha1 +kind: IngressRouteTCP +metadata: + name: adguard-dot + namespace: adguard +spec: + entryPoints: + - dot + routes: + - match: HostSNI(`*`) + services: + - name: adguard-service + port: 853 diff --git a/gitea/k8s/config.yaml b/gitea/k8s/config.yaml index 8bde82d..5f4f39e 100644 --- a/gitea/k8s/config.yaml +++ b/gitea/k8s/config.yaml @@ -4,9 +4,9 @@ metadata: name: gitea-config namespace: gitea data: - GITEA__server__DOMAIN: "gitea.gigaforust.internal" - GITEA__server__ROOT_URL: "https://gitea.gigaforust.internal" - GITEA__server__SSH_DOMAIN: "gitssh.gigaforust.internal" + GITEA__server__DOMAIN: "gitea.forust.xyz" + GITEA__server__ROOT_URL: "https://gitea.forust.xyz" + GITEA__server__SSH_DOMAIN: "gitssh.forust.xyz" GITEA__server__SSH_PORT: "2221" GITEA__database__DB_TYPE: "postgres" @@ -14,7 +14,7 @@ data: GITEA__database__NAME: "gitea" GITEA__security__REVERSE_PROXY_LIMIT: "1" GITEA__security__REVERSE_PROXY_TRUSTED_PROXIES: "*" - + GITEA__mailer__ENABLED: "false" USER_UID: "1000" - USER_GID: "1000" \ No newline at end of file + USER_GID: "1000" diff --git a/gitea/k8s/gitea.yaml b/gitea/k8s/gitea.yaml index d870d46..40ea25b 100644 --- a/gitea/k8s/gitea.yaml +++ b/gitea/k8s/gitea.yaml @@ -7,12 +7,12 @@ spec: selector: app: gitea ports: - - port: 3000 - name: http - targetPort: 3000 - - port: 2221 - name: ssh - targetPort: 2221 + - port: 3000 + name: http + targetPort: 3000 + - port: 2221 + name: ssh + targetPort: 22 --- apiVersion: apps/v1 kind: Deployment @@ -30,32 +30,32 @@ spec: app: gitea spec: containers: - - name: gitea - image: docker.gitea.com/gitea:1.26 - envFrom: - - configMapRef: - name: gitea-config - - secretRef: - name: gitea-secrets - ports: - - containerPort: 3000 - name: http - - containerPort: 2221 - name: ssh - volumeMounts: - - name: gitea-data - mountPath: /data - resources: - requests: - memory: "512Mi" - cpu: "500m" - limits: - memory: "1.5Gi" - cpu: "1500m" + - name: gitea + image: docker.gitea.com/gitea:1.26 + envFrom: + - configMapRef: + name: gitea-config + - secretRef: + name: gitea-secrets + ports: + - containerPort: 3000 + name: http + - containerPort: 2221 + name: ssh + volumeMounts: + - name: gitea-data + mountPath: /data + resources: + requests: + memory: "512Mi" + cpu: "500m" + limits: + memory: "1.5Gi" + cpu: "1500m" volumes: - - name: gitea-data - persistentVolumeClaim: - claimName: gitea-pvc + - name: gitea-data + persistentVolumeClaim: + claimName: gitea-pvc --- apiVersion: v1 kind: PersistentVolumeClaim @@ -64,7 +64,7 @@ metadata: namespace: gitea spec: accessModes: - - ReadWriteOnce + - ReadWriteOnce resources: requests: storage: 5Gi diff --git a/gitea/k8s/ingressroute.yaml b/gitea/k8s/ingressroute.yaml index 6393769..9b71804 100644 --- a/gitea/k8s/ingressroute.yaml +++ b/gitea/k8s/ingressroute.yaml @@ -7,11 +7,11 @@ spec: entryPoints: - websecure routes: - - match: Host(`gitea.forust.xyz`) - kind: Rule - services: - - name: gitea-service - port: 3000 + - match: Host(`gitea.forust.xyz`) + kind: Rule + services: + - name: gitea-service + port: 3000 tls: certResolver: letsencrypt --- @@ -24,11 +24,11 @@ spec: entryPoints: - websecure routes: - - match: Host(`gitea.workstation.internal`) - kind: Rule - services: - - name: gitea-service - port: 3000 + - match: Host(`gitea.workstation.internal`) + kind: Rule + services: + - name: gitea-service + port: 3000 tls: secretName: local-tls --- @@ -41,11 +41,11 @@ spec: entryPoints: - websecure routes: - - match: Host(`gitea.gigaforust.internal`) - kind: Rule - services: - - name: gitea-service - port: 3000 + - match: Host(`gitea.gigaforust.internal`) + kind: Rule + services: + - name: gitea-service + port: 3000 tls: secretName: local-tls --- @@ -58,11 +58,11 @@ spec: entryPoints: - websecure routes: - - match: Host(`gcr.forust.xyz`) && PathPrefix(`/v2`) - kind: Rule - services: - - name: gitea-service - port: 3000 + - match: Host(`gcr.forust.xyz`) && PathPrefix(`/v2`) + kind: Rule + services: + - name: gitea-service + port: 3000 tls: certResolver: letsencrypt --- @@ -75,7 +75,7 @@ spec: entryPoints: - ssh routes: - - match: HostSNI(`*`) - services: - - name: gitea-service - port: 2221 + - match: HostSNI(`*`) + services: + - name: gitea-service + port: 2221 diff --git a/traefik/k8s/traefik-values.yaml b/traefik/k8s/traefik-values.yaml index 86a17b1..e783f55 100644 --- a/traefik/k8s/traefik-values.yaml +++ b/traefik/k8s/traefik-values.yaml @@ -56,6 +56,16 @@ ports: enabled: true ssh: port: 2221 + exposedPort: 2221 + protocol: TCP + expose: + default: true + dot: + port: 853 + exposedPort: 853 + protocol: TCP + expose: + default: true ingressRoute: dashboard: