From 43c8b7b61eadd2164408eca27cdaf1bba023c0bb Mon Sep 17 00:00:00 2001 From: Marcus Noble Date: Fri, 5 Jun 2020 22:17:50 +0100 Subject: [PATCH] Updated a bunch of resources Added Goldilocks to keep an eye on suggested improvements --- manifests/blog.yaml | 9 +++++++++ manifests/buzzers.yaml | 9 +++++++++ manifests/cctv.yaml | 9 +++++++++ manifests/dashboard.yaml | 9 +++++++++ manifests/downloads.yaml | 9 +++++++++ manifests/ghost_chart.yaml | 9 +++++++++ manifests/goldilocks_chart.yaml | 22 ++++++++++++++++++++++ manifests/linx-server.yaml | 2 ++ manifests/loki_chart.yaml | 2 ++ manifests/nodered.yaml | 2 ++ manifests/qr.yaml | 9 +++++++++ manifests/rss.yaml | 9 +++++++++ manifests/twitter-profile-pic.yaml | 9 +++++++++ manifests/website-to-remarkable.yaml | 16 ++++++++++++++++ 14 files changed, 125 insertions(+) create mode 100644 manifests/goldilocks_chart.yaml diff --git a/manifests/blog.yaml b/manifests/blog.yaml index 48a6892..b1d6cf4 100644 --- a/manifests/blog.yaml +++ b/manifests/blog.yaml @@ -2,6 +2,8 @@ apiVersion: v1 kind: Namespace metadata: name: blog + labels: + goldilocks.fairwinds.com/enabled: "true" --- apiVersion: v1 kind: Service @@ -39,6 +41,13 @@ spec: ports: - containerPort: 8000 name: web + resources: + limits: + cpu: 25m + memory: 250Mi + requests: + cpu: 25m + memory: 250Mi --- apiVersion: extensions/v1beta1 kind: Ingress diff --git a/manifests/buzzers.yaml b/manifests/buzzers.yaml index 8773813..dc8ef80 100644 --- a/manifests/buzzers.yaml +++ b/manifests/buzzers.yaml @@ -2,6 +2,8 @@ apiVersion: v1 kind: Namespace metadata: name: buzzers + labels: + goldilocks.fairwinds.com/enabled: "true" --- apiVersion: v1 kind: Service @@ -39,6 +41,13 @@ spec: ports: - containerPort: 80 name: web + resources: + limits: + cpu: 25m + memory: 283Mi + requests: + cpu: 25m + memory: 283Mi --- apiVersion: extensions/v1beta1 kind: Ingress diff --git a/manifests/cctv.yaml b/manifests/cctv.yaml index 0985b88..1cbba3f 100644 --- a/manifests/cctv.yaml +++ b/manifests/cctv.yaml @@ -2,6 +2,8 @@ apiVersion: v1 kind: Namespace metadata: name: cctv + labels: + goldilocks.fairwinds.com/enabled: "true" --- apiVersion: v1 kind: Secret @@ -64,6 +66,13 @@ spec: ports: - containerPort: 8080 protocol: TCP + resources: + limits: + cpu: 25m + memory: 250Mi + requests: + cpu: 25m + memory: 250Mi --- apiVersion: v1 kind: Service diff --git a/manifests/dashboard.yaml b/manifests/dashboard.yaml index 5e5ff78..9479715 100644 --- a/manifests/dashboard.yaml +++ b/manifests/dashboard.yaml @@ -2,6 +2,8 @@ apiVersion: v1 kind: Namespace metadata: name: dashboard + labels: + goldilocks.fairwinds.com/enabled: "true" --- apiVersion: v1 kind: Secret @@ -54,6 +56,13 @@ spec: ports: - containerPort: 80 name: web + resources: + limits: + cpu: 25m + memory: 250Mi + requests: + cpu: 25m + memory: 250Mi --- apiVersion: extensions/v1beta1 kind: Ingress diff --git a/manifests/downloads.yaml b/manifests/downloads.yaml index d0e0c3e..ad58b26 100644 --- a/manifests/downloads.yaml +++ b/manifests/downloads.yaml @@ -2,6 +2,8 @@ apiVersion: v1 kind: Namespace metadata: name: downloads + labels: + goldilocks.fairwinds.com/enabled: "true" --- apiVersion: v1 kind: Secret @@ -64,6 +66,13 @@ spec: ports: - containerPort: 8080 protocol: TCP + resources: + limits: + cpu: 25m + memory: 250Mi + requests: + cpu: 25m + memory: 250Mi --- apiVersion: v1 kind: Service diff --git a/manifests/ghost_chart.yaml b/manifests/ghost_chart.yaml index 8a67090..c52196d 100644 --- a/manifests/ghost_chart.yaml +++ b/manifests/ghost_chart.yaml @@ -2,6 +2,8 @@ apiVersion: v1 kind: Namespace metadata: name: ghost + labels: + goldilocks.fairwinds.com/enabled: "true" --- @@ -31,6 +33,13 @@ spec: persistence: enabled: true size: 1Gi + resources: + limits: + cpu: 25m + memory: 250Mi + requests: + cpu: 25m + memory: 250Mi --- diff --git a/manifests/goldilocks_chart.yaml b/manifests/goldilocks_chart.yaml new file mode 100644 index 0000000..9e57e7a --- /dev/null +++ b/manifests/goldilocks_chart.yaml @@ -0,0 +1,22 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: goldilocks + labels: + goldilocks.fairwinds.com/enabled: "true" + +--- + +apiVersion: helm.fluxcd.io/v1 +kind: HelmRelease +metadata: + name: goldilocks + namespace: goldilocks +spec: + chart: + repository: https://charts.fairwinds.com/stable + name: goldilocks + version: 2.3.1 + maxHistory: 4 + values: + installVPA: true diff --git a/manifests/linx-server.yaml b/manifests/linx-server.yaml index b51458f..f6840ad 100644 --- a/manifests/linx-server.yaml +++ b/manifests/linx-server.yaml @@ -2,6 +2,8 @@ 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 4cb144c..71c8939 100644 --- a/manifests/loki_chart.yaml +++ b/manifests/loki_chart.yaml @@ -2,6 +2,8 @@ apiVersion: v1 kind: Namespace metadata: name: logging + labels: + goldilocks.fairwinds.com/enabled: "true" --- apiVersion: v1 kind: Secret diff --git a/manifests/nodered.yaml b/manifests/nodered.yaml index ca0497e..0110c54 100644 --- a/manifests/nodered.yaml +++ b/manifests/nodered.yaml @@ -2,6 +2,8 @@ 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 a612d4a..01ecea1 100644 --- a/manifests/qr.yaml +++ b/manifests/qr.yaml @@ -2,6 +2,8 @@ apiVersion: v1 kind: Namespace metadata: name: qr + labels: + goldilocks.fairwinds.com/enabled: "true" --- apiVersion: v1 kind: Service @@ -39,6 +41,13 @@ spec: ports: - containerPort: 8080 name: web + resources: + limits: + cpu: 25m + memory: 250Mi + requests: + cpu: 25m + memory: 250Mi --- apiVersion: extensions/v1beta1 kind: Ingress diff --git a/manifests/rss.yaml b/manifests/rss.yaml index 93b45b3..dfe686f 100644 --- a/manifests/rss.yaml +++ b/manifests/rss.yaml @@ -2,6 +2,8 @@ apiVersion: v1 kind: Namespace metadata: name: rss + labels: + goldilocks.fairwinds.com/enabled: "true" --- kind: PersistentVolumeClaim apiVersion: v1 @@ -65,6 +67,13 @@ spec: ports: - containerPort: 8080 name: web + resources: + limits: + cpu: 25m + memory: 308Mi + requests: + cpu: 25m + memory: 308Mi volumeMounts: - mountPath: /data name: storage diff --git a/manifests/twitter-profile-pic.yaml b/manifests/twitter-profile-pic.yaml index 08fd248..dcfa270 100644 --- a/manifests/twitter-profile-pic.yaml +++ b/manifests/twitter-profile-pic.yaml @@ -2,6 +2,8 @@ apiVersion: v1 kind: Namespace metadata: name: twitter-profile-pic + labels: + goldilocks.fairwinds.com/enabled: "true" --- apiVersion: v1 kind: Service @@ -39,6 +41,13 @@ spec: ports: - containerPort: 9090 name: web + resources: + limits: + cpu: 25m + memory: 250Mi + requests: + cpu: 25m + memory: 250Mi --- apiVersion: extensions/v1beta1 kind: Ingress diff --git a/manifests/website-to-remarkable.yaml b/manifests/website-to-remarkable.yaml index 1bcd23a..7b69a64 100644 --- a/manifests/website-to-remarkable.yaml +++ b/manifests/website-to-remarkable.yaml @@ -2,6 +2,8 @@ apiVersion: v1 kind: Namespace metadata: name: website-to-remarkable + labels: + goldilocks.fairwinds.com/enabled: "true" --- apiVersion: v1 kind: Secret @@ -92,6 +94,13 @@ spec: ports: - containerPort: 8080 protocol: TCP + resources: + limits: + cpu: 12m + memory: 125Mi + requests: + cpu: 12m + memory: 125Mi - name: web image: docker.cluster.fun/averagemarcus/website-to-remarkable:latest imagePullPolicy: Always @@ -104,6 +113,13 @@ spec: ports: - containerPort: 8000 name: web + resources: + limits: + cpu: 12m + memory: 125Mi + requests: + cpu: 12m + memory: 125Mi --- apiVersion: extensions/v1beta1 kind: Ingress