Tweaked resources
This commit is contained in:
parent
5be3454e15
commit
b0a846fa94
@ -48,6 +48,7 @@ spec:
|
|||||||
tls:
|
tls:
|
||||||
- hosts:
|
- hosts:
|
||||||
- cors-proxy.cluster.fun
|
- cors-proxy.cluster.fun
|
||||||
|
- cors-proxy.marcusnoble.co.uk
|
||||||
secretName: cors-proxy-ingress
|
secretName: cors-proxy-ingress
|
||||||
rules:
|
rules:
|
||||||
- host: cors-proxy.cluster.fun
|
- host: cors-proxy.cluster.fun
|
||||||
@ -60,23 +61,6 @@ spec:
|
|||||||
name: cors-proxy
|
name: cors-proxy
|
||||||
port:
|
port:
|
||||||
number: 80
|
number: 80
|
||||||
|
|
||||||
---
|
|
||||||
apiVersion: networking.k8s.io/v1
|
|
||||||
kind: Ingress
|
|
||||||
metadata:
|
|
||||||
name: cors-proxy-mn
|
|
||||||
namespace: cors-proxy
|
|
||||||
annotations:
|
|
||||||
cert-manager.io/cluster-issuer: letsencrypt
|
|
||||||
nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
|
|
||||||
spec:
|
|
||||||
ingressClassName: nginx
|
|
||||||
tls:
|
|
||||||
- hosts:
|
|
||||||
- cors-proxy.marcusnoble.co.uk
|
|
||||||
secretName: cors-proxy-mn-ingress
|
|
||||||
rules:
|
|
||||||
- host: cors-proxy.marcusnoble.co.uk
|
- host: cors-proxy.marcusnoble.co.uk
|
||||||
http:
|
http:
|
||||||
paths:
|
paths:
|
||||||
|
@ -68,7 +68,7 @@ metadata:
|
|||||||
configmap.reloader.stakater.com/reload: "mastodon-env"
|
configmap.reloader.stakater.com/reload: "mastodon-env"
|
||||||
secret.reloader.stakater.com/reload: "mastodon"
|
secret.reloader.stakater.com/reload: "mastodon"
|
||||||
spec:
|
spec:
|
||||||
replicas: 5
|
replicas: 3
|
||||||
selector:
|
selector:
|
||||||
matchLabels:
|
matchLabels:
|
||||||
app.kubernetes.io/name: mastodon
|
app.kubernetes.io/name: mastodon
|
||||||
@ -222,7 +222,7 @@ metadata:
|
|||||||
configmap.reloader.stakater.com/reload: "mastodon-env"
|
configmap.reloader.stakater.com/reload: "mastodon-env"
|
||||||
secret.reloader.stakater.com/reload: "mastodon"
|
secret.reloader.stakater.com/reload: "mastodon"
|
||||||
spec:
|
spec:
|
||||||
replicas: 4
|
replicas: 3
|
||||||
selector:
|
selector:
|
||||||
matchLabels:
|
matchLabels:
|
||||||
app.kubernetes.io/name: mastodon
|
app.kubernetes.io/name: mastodon
|
||||||
|
@ -92,9 +92,9 @@ spec:
|
|||||||
mountPath: /usr/share/nginx/html/.well-known/matrix
|
mountPath: /usr/share/nginx/html/.well-known/matrix
|
||||||
resources:
|
resources:
|
||||||
limits:
|
limits:
|
||||||
memory: 10Mi
|
memory: 5Mi
|
||||||
requests:
|
requests:
|
||||||
memory: 10Mi
|
memory: 5Mi
|
||||||
volumes:
|
volumes:
|
||||||
- name: well-known
|
- name: well-known
|
||||||
configMap:
|
configMap:
|
||||||
|
@ -69,9 +69,9 @@ spec:
|
|||||||
key: password
|
key: password
|
||||||
resources:
|
resources:
|
||||||
limits:
|
limits:
|
||||||
memory: 200Mi
|
memory: 60Mi
|
||||||
requests:
|
requests:
|
||||||
memory: 200Mi
|
memory: 60Mi
|
||||||
---
|
---
|
||||||
apiVersion: networking.k8s.io/v1
|
apiVersion: networking.k8s.io/v1
|
||||||
kind: Ingress
|
kind: Ingress
|
||||||
|
@ -36,9 +36,9 @@ spec:
|
|||||||
name: web
|
name: web
|
||||||
resources:
|
resources:
|
||||||
limits:
|
limits:
|
||||||
memory: 20Mi
|
memory: 10Mi
|
||||||
requests:
|
requests:
|
||||||
memory: 20Mi
|
memory: 10Mi
|
||||||
---
|
---
|
||||||
apiVersion: networking.k8s.io/v1
|
apiVersion: networking.k8s.io/v1
|
||||||
kind: Ingress
|
kind: Ingress
|
||||||
|
@ -53,6 +53,12 @@ spec:
|
|||||||
port: 4654
|
port: 4654
|
||||||
initialDelaySeconds: 30
|
initialDelaySeconds: 30
|
||||||
timeoutSeconds: 30
|
timeoutSeconds: 30
|
||||||
|
resources:
|
||||||
|
limits:
|
||||||
|
memory: 80Mi
|
||||||
|
requests:
|
||||||
|
memory: 80Mi
|
||||||
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
@ -42,7 +42,7 @@ metadata:
|
|||||||
name: starling
|
name: starling
|
||||||
namespace: starling
|
namespace: starling
|
||||||
spec:
|
spec:
|
||||||
replicas: 2
|
replicas: 1
|
||||||
selector:
|
selector:
|
||||||
matchLabels:
|
matchLabels:
|
||||||
app: starling
|
app: starling
|
||||||
@ -73,6 +73,11 @@ spec:
|
|||||||
ports:
|
ports:
|
||||||
- containerPort: 3000
|
- containerPort: 3000
|
||||||
name: web
|
name: web
|
||||||
|
resources:
|
||||||
|
limits:
|
||||||
|
memory: 50Mi
|
||||||
|
requests:
|
||||||
|
memory: 50Mi
|
||||||
---
|
---
|
||||||
apiVersion: networking.k8s.io/v1
|
apiVersion: networking.k8s.io/v1
|
||||||
kind: Ingress
|
kind: Ingress
|
||||||
|
@ -36,9 +36,9 @@ spec:
|
|||||||
name: web
|
name: web
|
||||||
resources:
|
resources:
|
||||||
limits:
|
limits:
|
||||||
memory: 50Mi
|
memory: 20Mi
|
||||||
requests:
|
requests:
|
||||||
memory: 50Mi
|
memory: 20Mi
|
||||||
---
|
---
|
||||||
apiVersion: networking.k8s.io/v1
|
apiVersion: networking.k8s.io/v1
|
||||||
kind: Ingress
|
kind: Ingress
|
||||||
|
@ -36,7 +36,7 @@ spec:
|
|||||||
name: web
|
name: web
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
memory: 100Mi
|
memory: 50Mi
|
||||||
---
|
---
|
||||||
apiVersion: networking.k8s.io/v1
|
apiVersion: networking.k8s.io/v1
|
||||||
kind: Ingress
|
kind: Ingress
|
||||||
|
@ -47,9 +47,9 @@ spec:
|
|||||||
name: web
|
name: web
|
||||||
resources:
|
resources:
|
||||||
limits:
|
limits:
|
||||||
memory: 250Mi
|
memory: 100Mi
|
||||||
requests:
|
requests:
|
||||||
memory: 250Mi
|
memory: 100Mi
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- name: dotenv
|
- name: dotenv
|
||||||
mountPath: /app/.env
|
mountPath: /app/.env
|
||||||
|
@ -115,6 +115,11 @@ spec:
|
|||||||
ports:
|
ports:
|
||||||
- containerPort: 8080
|
- containerPort: 8080
|
||||||
name: web
|
name: web
|
||||||
|
resources:
|
||||||
|
limits:
|
||||||
|
memory: 50Mi
|
||||||
|
requests:
|
||||||
|
memory: 50Mi
|
||||||
|
|
||||||
---
|
---
|
||||||
apiVersion: networking.k8s.io/v1
|
apiVersion: networking.k8s.io/v1
|
||||||
|
Loading…
Reference in New Issue
Block a user