diff --git a/manifests/cors-proxy/cors-proxy.yaml b/manifests/cors-proxy/cors-proxy.yaml index 9abcf59..2214b1f 100644 --- a/manifests/cors-proxy/cors-proxy.yaml +++ b/manifests/cors-proxy/cors-proxy.yaml @@ -48,6 +48,7 @@ spec: tls: - hosts: - cors-proxy.cluster.fun + - cors-proxy.marcusnoble.co.uk secretName: cors-proxy-ingress rules: - host: cors-proxy.cluster.fun @@ -60,23 +61,6 @@ spec: name: cors-proxy port: 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 http: paths: diff --git a/manifests/mastodon/mastodon.yaml b/manifests/mastodon/mastodon.yaml index 06923f6..850e423 100644 --- a/manifests/mastodon/mastodon.yaml +++ b/manifests/mastodon/mastodon.yaml @@ -68,7 +68,7 @@ metadata: configmap.reloader.stakater.com/reload: "mastodon-env" secret.reloader.stakater.com/reload: "mastodon" spec: - replicas: 5 + replicas: 3 selector: matchLabels: app.kubernetes.io/name: mastodon @@ -222,7 +222,7 @@ metadata: configmap.reloader.stakater.com/reload: "mastodon-env" secret.reloader.stakater.com/reload: "mastodon" spec: - replicas: 4 + replicas: 3 selector: matchLabels: app.kubernetes.io/name: mastodon diff --git a/manifests/matrix_chart/matrix_chart.yaml b/manifests/matrix_chart/matrix_chart.yaml index 1d84932..7bf26b5 100644 --- a/manifests/matrix_chart/matrix_chart.yaml +++ b/manifests/matrix_chart/matrix_chart.yaml @@ -92,9 +92,9 @@ spec: mountPath: /usr/share/nginx/html/.well-known/matrix resources: limits: - memory: 10Mi + memory: 5Mi requests: - memory: 10Mi + memory: 5Mi volumes: - name: well-known configMap: diff --git a/manifests/paradoxfox/paradoxfox.yaml b/manifests/paradoxfox/paradoxfox.yaml index 42a45bf..bf089db 100644 --- a/manifests/paradoxfox/paradoxfox.yaml +++ b/manifests/paradoxfox/paradoxfox.yaml @@ -69,9 +69,9 @@ spec: key: password resources: limits: - memory: 200Mi + memory: 60Mi requests: - memory: 200Mi + memory: 60Mi --- apiVersion: networking.k8s.io/v1 kind: Ingress diff --git a/manifests/qr/qr.yaml b/manifests/qr/qr.yaml index e969546..d372839 100644 --- a/manifests/qr/qr.yaml +++ b/manifests/qr/qr.yaml @@ -36,9 +36,9 @@ spec: name: web resources: limits: - memory: 20Mi + memory: 10Mi requests: - memory: 20Mi + memory: 10Mi --- apiVersion: networking.k8s.io/v1 kind: Ingress diff --git a/manifests/skooner/manifest.yaml b/manifests/skooner/manifest.yaml index 4a0c828..1df50ec 100644 --- a/manifests/skooner/manifest.yaml +++ b/manifests/skooner/manifest.yaml @@ -53,6 +53,12 @@ spec: port: 4654 initialDelaySeconds: 30 timeoutSeconds: 30 + resources: + limits: + memory: 80Mi + requests: + memory: 80Mi + --- diff --git a/manifests/starling/starling.yaml b/manifests/starling/starling.yaml index 7ee8440..3a199ea 100644 --- a/manifests/starling/starling.yaml +++ b/manifests/starling/starling.yaml @@ -42,7 +42,7 @@ metadata: name: starling namespace: starling spec: - replicas: 2 + replicas: 1 selector: matchLabels: app: starling @@ -73,6 +73,11 @@ spec: ports: - containerPort: 3000 name: web + resources: + limits: + memory: 50Mi + requests: + memory: 50Mi --- apiVersion: networking.k8s.io/v1 kind: Ingress diff --git a/manifests/talks/talks.yaml b/manifests/talks/talks.yaml index e3b30ab..dc7d024 100644 --- a/manifests/talks/talks.yaml +++ b/manifests/talks/talks.yaml @@ -36,9 +36,9 @@ spec: name: web resources: limits: - memory: 50Mi + memory: 20Mi requests: - memory: 50Mi + memory: 20Mi --- apiVersion: networking.k8s.io/v1 kind: Ingress diff --git a/manifests/text-to-dxf/text-to-dxf.yaml b/manifests/text-to-dxf/text-to-dxf.yaml index d6cbb3f..84a5bd3 100644 --- a/manifests/text-to-dxf/text-to-dxf.yaml +++ b/manifests/text-to-dxf/text-to-dxf.yaml @@ -36,7 +36,7 @@ spec: name: web resources: requests: - memory: 100Mi + memory: 50Mi --- apiVersion: networking.k8s.io/v1 kind: Ingress diff --git a/manifests/twitter-profile-pic/twitter-profile-pic.yaml b/manifests/twitter-profile-pic/twitter-profile-pic.yaml index 8d19f59..832e9b1 100644 --- a/manifests/twitter-profile-pic/twitter-profile-pic.yaml +++ b/manifests/twitter-profile-pic/twitter-profile-pic.yaml @@ -47,9 +47,9 @@ spec: name: web resources: limits: - memory: 250Mi + memory: 100Mi requests: - memory: 250Mi + memory: 100Mi volumeMounts: - name: dotenv mountPath: /app/.env diff --git a/manifests/twitter-to-airtable/twitter-to-airtable.yaml b/manifests/twitter-to-airtable/twitter-to-airtable.yaml index bbc8c4a..55aaec6 100644 --- a/manifests/twitter-to-airtable/twitter-to-airtable.yaml +++ b/manifests/twitter-to-airtable/twitter-to-airtable.yaml @@ -115,6 +115,11 @@ spec: ports: - containerPort: 8080 name: web + resources: + limits: + memory: 50Mi + requests: + memory: 50Mi --- apiVersion: networking.k8s.io/v1