diff --git a/manifests/blackhole.yaml b/manifests/blackhole.yaml index f219066..01dd7e4 100644 --- a/manifests/blackhole.yaml +++ b/manifests/blackhole.yaml @@ -37,10 +37,10 @@ spec: resources: limits: memory: 10Mi - cpu: 5m + requests: memory: 10Mi - cpu: 5m + --- apiVersion: extensions/v1beta1 kind: Ingress diff --git a/manifests/blog.yaml b/manifests/blog.yaml index 524ea1d..e110e18 100644 --- a/manifests/blog.yaml +++ b/manifests/blog.yaml @@ -2,8 +2,6 @@ apiVersion: v1 kind: Namespace metadata: name: blog - labels: - goldilocks.fairwinds.com/enabled: "true" --- apiVersion: v1 kind: Service @@ -43,11 +41,9 @@ spec: name: web resources: limits: - cpu: 25m - memory: 100Mi + memory: 200Mi requests: - cpu: 25m - memory: 100Mi + memory: 200Mi --- apiVersion: extensions/v1beta1 kind: Ingress diff --git a/manifests/buzzers.yaml b/manifests/buzzers.yaml index dc8ef80..d95169d 100644 --- a/manifests/buzzers.yaml +++ b/manifests/buzzers.yaml @@ -2,8 +2,6 @@ apiVersion: v1 kind: Namespace metadata: name: buzzers - labels: - goldilocks.fairwinds.com/enabled: "true" --- apiVersion: v1 kind: Service @@ -43,10 +41,8 @@ spec: name: web resources: limits: - cpu: 25m memory: 283Mi requests: - cpu: 25m memory: 283Mi --- apiVersion: extensions/v1beta1 diff --git a/manifests/cctv.yaml b/manifests/cctv.yaml index b4a24ec..13c2207 100644 --- a/manifests/cctv.yaml +++ b/manifests/cctv.yaml @@ -2,8 +2,6 @@ apiVersion: v1 kind: Namespace metadata: name: cctv - labels: - goldilocks.fairwinds.com/enabled: "true" --- apiVersion: v1 kind: Secret @@ -68,10 +66,8 @@ spec: protocol: TCP resources: limits: - cpu: 25m memory: 50Mi requests: - cpu: 25m memory: 50Mi --- apiVersion: v1 diff --git a/manifests/certmanager_chart.yaml b/manifests/certmanager_chart.yaml index d5bbbd5..0b25891 100644 --- a/manifests/certmanager_chart.yaml +++ b/manifests/certmanager_chart.yaml @@ -22,10 +22,10 @@ spec: installCRDs: "true" resources: requests: - cpu: 10m + memory: 32Mi limits: - cpu: 20m + memory: 64Mi --- diff --git a/manifests/dashboard.yaml b/manifests/dashboard.yaml index 3bac068..cc37934 100644 --- a/manifests/dashboard.yaml +++ b/manifests/dashboard.yaml @@ -2,8 +2,6 @@ apiVersion: v1 kind: Namespace metadata: name: dashboard - labels: - goldilocks.fairwinds.com/enabled: "true" --- apiVersion: v1 kind: Secret @@ -58,10 +56,8 @@ spec: name: web resources: limits: - cpu: 25m memory: 50Mi requests: - cpu: 25m memory: 50Mi --- apiVersion: extensions/v1beta1 diff --git a/manifests/downloads.yaml b/manifests/downloads.yaml index ad58b26..8c01faa 100644 --- a/manifests/downloads.yaml +++ b/manifests/downloads.yaml @@ -2,8 +2,6 @@ apiVersion: v1 kind: Namespace metadata: name: downloads - labels: - goldilocks.fairwinds.com/enabled: "true" --- apiVersion: v1 kind: Secret @@ -68,10 +66,8 @@ spec: protocol: TCP resources: limits: - cpu: 25m memory: 250Mi requests: - cpu: 25m memory: 250Mi --- apiVersion: v1 diff --git a/manifests/ghost_chart.yaml b/manifests/ghost_chart.yaml index 0acf63a..59f0871 100644 --- a/manifests/ghost_chart.yaml +++ b/manifests/ghost_chart.yaml @@ -2,8 +2,6 @@ apiVersion: v1 kind: Namespace metadata: name: ghost - labels: - goldilocks.fairwinds.com/enabled: "true" --- @@ -35,11 +33,9 @@ spec: size: 1Gi resources: limits: - cpu: 25m - memory: 100Mi + memory: 250Mi requests: - cpu: 25m - memory: 100Mi + memory: 250Mi --- diff --git a/manifests/gitea.yaml b/manifests/gitea.yaml index f2245d5..c76a193 100644 --- a/manifests/gitea.yaml +++ b/manifests/gitea.yaml @@ -80,7 +80,7 @@ spec: resources: requests: memory: 400Mi - cpu: 10m + volumeMounts: - mountPath: /data name: git-data diff --git a/manifests/harbor_chart.yaml b/manifests/harbor_chart.yaml index 15f59bb..fefa0c6 100644 --- a/manifests/harbor_chart.yaml +++ b/manifests/harbor_chart.yaml @@ -37,25 +37,25 @@ spec: resources: requests: memory: 64Mi - cpu: 10m + core: resources: requests: memory: 64Mi - cpu: 10m + jobservice: resources: requests: memory: 64Mi - cpu: 10m + registry: registry: resources: requests: memory: 64Mi - cpu: 10m + controller: resources: requests: memory: 64Mi - cpu: 10m + diff --git a/manifests/kube-janitor.yaml b/manifests/kube-janitor.yaml index 90bcbcd..2dfdf84 100644 --- a/manifests/kube-janitor.yaml +++ b/manifests/kube-janitor.yaml @@ -93,7 +93,6 @@ spec: limits: memory: 100Mi requests: - cpu: 5m memory: 100Mi securityContext: readOnlyRootFilesystem: true diff --git a/manifests/linx-server.yaml b/manifests/linx-server.yaml index f6840ad..b51458f 100644 --- a/manifests/linx-server.yaml +++ b/manifests/linx-server.yaml @@ -2,8 +2,6 @@ apiVersion: v1 kind: Namespace metadata: name: linx-server - labels: - goldilocks.fairwinds.com/enabled: "true" --- apiVersion: v1 kind: ConfigMap diff --git a/manifests/loki_chart.yaml b/manifests/loki_chart.yaml index 71c8939..4cb144c 100644 --- a/manifests/loki_chart.yaml +++ b/manifests/loki_chart.yaml @@ -2,8 +2,6 @@ apiVersion: v1 kind: Namespace metadata: name: logging - labels: - goldilocks.fairwinds.com/enabled: "true" --- apiVersion: v1 kind: Secret diff --git a/manifests/nextcloud_chart.yaml b/manifests/nextcloud_chart.yaml index 2bac030..22514a9 100644 --- a/manifests/nextcloud_chart.yaml +++ b/manifests/nextcloud_chart.yaml @@ -58,4 +58,4 @@ spec: resources: requests: memory: 500Mi - cpu: 50m + diff --git a/manifests/nodered.yaml b/manifests/nodered.yaml index 0110c54..ca0497e 100644 --- a/manifests/nodered.yaml +++ b/manifests/nodered.yaml @@ -2,8 +2,6 @@ apiVersion: v1 kind: Namespace metadata: name: node-red - labels: - goldilocks.fairwinds.com/enabled: "true" --- apiVersion: v1 kind: Secret diff --git a/manifests/qr.yaml b/manifests/qr.yaml index 06f2226..a24477f 100644 --- a/manifests/qr.yaml +++ b/manifests/qr.yaml @@ -2,8 +2,6 @@ apiVersion: v1 kind: Namespace metadata: name: qr - labels: - goldilocks.fairwinds.com/enabled: "true" --- apiVersion: v1 kind: Service @@ -43,10 +41,8 @@ spec: name: web resources: limits: - cpu: 25m memory: 100Mi requests: - cpu: 25m memory: 100Mi --- apiVersion: extensions/v1beta1 diff --git a/manifests/rss.yaml b/manifests/rss.yaml index dfe686f..0e02953 100644 --- a/manifests/rss.yaml +++ b/manifests/rss.yaml @@ -2,8 +2,6 @@ apiVersion: v1 kind: Namespace metadata: name: rss - labels: - goldilocks.fairwinds.com/enabled: "true" --- kind: PersistentVolumeClaim apiVersion: v1 @@ -69,10 +67,8 @@ spec: name: web resources: limits: - cpu: 25m memory: 308Mi requests: - cpu: 25m memory: 308Mi volumeMounts: - mountPath: /data diff --git a/manifests/twitter-profile-pic.yaml b/manifests/twitter-profile-pic.yaml index dcfa270..95992f5 100644 --- a/manifests/twitter-profile-pic.yaml +++ b/manifests/twitter-profile-pic.yaml @@ -2,8 +2,6 @@ apiVersion: v1 kind: Namespace metadata: name: twitter-profile-pic - labels: - goldilocks.fairwinds.com/enabled: "true" --- apiVersion: v1 kind: Service @@ -43,10 +41,8 @@ spec: name: web resources: limits: - cpu: 25m memory: 250Mi requests: - cpu: 25m memory: 250Mi --- apiVersion: extensions/v1beta1 diff --git a/manifests/website-to-remarkable.yaml b/manifests/website-to-remarkable.yaml index 7b69a64..5aaed17 100644 --- a/manifests/website-to-remarkable.yaml +++ b/manifests/website-to-remarkable.yaml @@ -2,8 +2,6 @@ apiVersion: v1 kind: Namespace metadata: name: website-to-remarkable - labels: - goldilocks.fairwinds.com/enabled: "true" --- apiVersion: v1 kind: Secret @@ -96,10 +94,10 @@ spec: protocol: TCP resources: limits: - cpu: 12m + memory: 125Mi requests: - cpu: 12m + memory: 125Mi - name: web image: docker.cluster.fun/averagemarcus/website-to-remarkable:latest @@ -115,10 +113,8 @@ spec: name: web resources: limits: - cpu: 12m memory: 125Mi requests: - cpu: 12m memory: 125Mi --- apiVersion: extensions/v1beta1