Compare commits
21 Commits
7acf565a84
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f11ad082b2 | ||
|
|
4be6588001 | ||
|
|
e2305d06c0 | ||
|
|
40228d456d | ||
|
|
0a80b23cce | ||
|
|
bf0db283e1 | ||
|
|
e0965b1ede | ||
|
|
5fe79e7530 | ||
|
|
d0769d7fdf | ||
|
|
12f5e95544 | ||
|
|
856f0e470d | ||
|
|
03a9d48a06 | ||
|
|
ea57d44228 | ||
|
|
58e2742991 | ||
|
|
ce6b16a56c | ||
|
|
0e57f7aaba | ||
|
|
a1bb29a232 | ||
|
|
3f888f64f1 | ||
|
|
027ecb42ff | ||
|
|
79f4d6dd89 | ||
|
|
7589233c8b |
@@ -36,12 +36,12 @@ spec:
|
|||||||
|
|
||||||
s3:
|
s3:
|
||||||
enabled: true
|
enabled: true
|
||||||
hostname: minio.minio.svc.cluster.local:9000
|
hostname: mastodon.t0rt1k.tech
|
||||||
endpoint: minio.minio.svc.cluster.local:9000
|
endpoint: http://minio.minio.svc.cluster.local
|
||||||
protocol: http
|
protocol: https
|
||||||
bucket: mastodon
|
bucket: mastodon
|
||||||
existingSecret: mastodon-s3
|
existingSecret: mastodon-s3
|
||||||
overridePathStyle: "true"
|
overridePathStyle: "false"
|
||||||
|
|
||||||
web:
|
web:
|
||||||
resources:
|
resources:
|
||||||
@@ -50,7 +50,7 @@ spec:
|
|||||||
memory: 256Mi
|
memory: 256Mi
|
||||||
limits:
|
limits:
|
||||||
cpu: 500m
|
cpu: 500m
|
||||||
memory: 512Mi
|
memory: 1Gi
|
||||||
|
|
||||||
sidekiq:
|
sidekiq:
|
||||||
workers:
|
workers:
|
||||||
@@ -114,12 +114,12 @@ spec:
|
|||||||
enabled: true
|
enabled: true
|
||||||
hostname: shared-os.opensearch.svc.cluster.local
|
hostname: shared-os.opensearch.svc.cluster.local
|
||||||
port: 9200
|
port: 9200
|
||||||
tls: true
|
tls: false
|
||||||
preset: small_cluster
|
preset: single_node_cluster
|
||||||
existingSecret: mastodon-os
|
username: dummy
|
||||||
|
password: dummy
|
||||||
ingress:
|
ingress:
|
||||||
enabled: true
|
enabled: false
|
||||||
className: traefik
|
className: traefik
|
||||||
annotations:
|
annotations:
|
||||||
cert-manager.io/cluster-issuer: letsencrypt-production
|
cert-manager.io/cluster-issuer: letsencrypt-production
|
||||||
|
|||||||
@@ -42,6 +42,7 @@ spec:
|
|||||||
- "--entryPoints.rtc-udp-roglog.address=:30004/udp"
|
- "--entryPoints.rtc-udp-roglog.address=:30004/udp"
|
||||||
- "--providers.kubernetesingress.ingressclass=traefik"
|
- "--providers.kubernetesingress.ingressclass=traefik"
|
||||||
- "--providers.kubernetesingress.ingressendpoint.publishedservice=traefik/traefik"
|
- "--providers.kubernetesingress.ingressendpoint.publishedservice=traefik/traefik"
|
||||||
|
- "--providers.kubernetesingress.allowexternalnameservices=true"
|
||||||
- "--accesslog=true"
|
- "--accesslog=true"
|
||||||
- "--log.level=INFO"
|
- "--log.level=INFO"
|
||||||
|
|
||||||
|
|||||||
@@ -85,4 +85,15 @@ spec:
|
|||||||
owner: mastodon
|
owner: mastodon
|
||||||
cluster:
|
cluster:
|
||||||
name: shared-pg
|
name: shared-pg
|
||||||
|
---
|
||||||
|
apiVersion: postgresql.cnpg.io/v1
|
||||||
|
kind: Database
|
||||||
|
metadata:
|
||||||
|
name: sandbox
|
||||||
|
namespace: cnpg
|
||||||
|
spec:
|
||||||
|
name: sandbox
|
||||||
|
owner: sandbox
|
||||||
|
cluster:
|
||||||
|
name: shared-pg
|
||||||
|
|
||||||
|
|||||||
40
manifests/mastodon/ingress.yaml
Normal file
40
manifests/mastodon/ingress.yaml
Normal file
@@ -0,0 +1,40 @@
|
|||||||
|
apiVersion: networking.k8s.io/v1
|
||||||
|
kind: Ingress
|
||||||
|
metadata:
|
||||||
|
name: mastodon
|
||||||
|
namespace: mastodon
|
||||||
|
annotations:
|
||||||
|
cert-manager.io/cluster-issuer: letsencrypt-production
|
||||||
|
traefik.ingress.kubernetes.io/router.entrypoints: websecure
|
||||||
|
traefik.ingress.kubernetes.io/router.tls: "true"
|
||||||
|
spec:
|
||||||
|
ingressClassName: traefik
|
||||||
|
tls:
|
||||||
|
- secretName: mastodon-tls
|
||||||
|
hosts:
|
||||||
|
- mastodon.t0rt1k.tech
|
||||||
|
rules:
|
||||||
|
- host: mastodon.t0rt1k.tech
|
||||||
|
http:
|
||||||
|
paths:
|
||||||
|
- path: /mastodon/
|
||||||
|
pathType: Prefix
|
||||||
|
backend:
|
||||||
|
service:
|
||||||
|
name: minio-proxy
|
||||||
|
port:
|
||||||
|
number: 80
|
||||||
|
- path: /api/v1/streaming/
|
||||||
|
pathType: Prefix
|
||||||
|
backend:
|
||||||
|
service:
|
||||||
|
name: mastodon-streaming
|
||||||
|
port:
|
||||||
|
number: 4000
|
||||||
|
- path: /
|
||||||
|
pathType: Prefix
|
||||||
|
backend:
|
||||||
|
service:
|
||||||
|
name: mastodon-web
|
||||||
|
port:
|
||||||
|
number: 3000
|
||||||
@@ -1,15 +1,5 @@
|
|||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: Secret
|
kind: Secret
|
||||||
metadata:
|
|
||||||
name: mastodon-os
|
|
||||||
namespace: mastodon
|
|
||||||
type: Opaque
|
|
||||||
stringData:
|
|
||||||
username: mastodon
|
|
||||||
password: "2&ey0J8c1pHbu%kP"
|
|
||||||
---
|
|
||||||
apiVersion: v1
|
|
||||||
kind: Secret
|
|
||||||
metadata:
|
metadata:
|
||||||
name: os-ca
|
name: os-ca
|
||||||
namespace: mastodon
|
namespace: mastodon
|
||||||
|
|||||||
10
manifests/mastodon/svc-minio.yaml
Normal file
10
manifests/mastodon/svc-minio.yaml
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
apiVersion: v1
|
||||||
|
kind: Service
|
||||||
|
metadata:
|
||||||
|
name: minio-proxy
|
||||||
|
namespace: mastodon
|
||||||
|
spec:
|
||||||
|
type: ExternalName
|
||||||
|
externalName: minio.minio.svc.cluster.local
|
||||||
|
ports:
|
||||||
|
- port: 80
|
||||||
@@ -8,10 +8,8 @@ spec:
|
|||||||
version: "3.7.0"
|
version: "3.7.0"
|
||||||
serviceName: shared-os
|
serviceName: shared-os
|
||||||
setVMMaxMapCount: true
|
setVMMaxMapCount: true
|
||||||
security:
|
additionalConfig:
|
||||||
config:
|
plugins.security.disabled: true
|
||||||
adminCredentialsSecret:
|
|
||||||
name: shared-os-admin-credentials
|
|
||||||
nodePools:
|
nodePools:
|
||||||
- component: nodes
|
- component: nodes
|
||||||
replicas: 3
|
replicas: 3
|
||||||
@@ -34,14 +32,3 @@ spec:
|
|||||||
limits:
|
limits:
|
||||||
cpu: 500m
|
cpu: 500m
|
||||||
memory: 1Gi
|
memory: 1Gi
|
||||||
probes:
|
|
||||||
readiness:
|
|
||||||
command:
|
|
||||||
- /bin/bash
|
|
||||||
- -c
|
|
||||||
- curl -k -u "$(cat /mnt/admin-credentials/username):$(cat /mnt/admin-credentials/password)" --silent --fail 'https://localhost:9200'
|
|
||||||
startup:
|
|
||||||
command:
|
|
||||||
- /bin/bash
|
|
||||||
- -c
|
|
||||||
- curl -k -u "$(cat /mnt/admin-credentials/username):$(cat /mnt/admin-credentials/password)" --silent --fail 'https://localhost:9200'
|
|
||||||
|
|||||||
Reference in New Issue
Block a user