Update website-to-remarkable

manifests/blackhole.yaml

@@ -37,10 +37,10 @@ spec:
         resources:
           limits:
             memory: 10Mi
-            cpu: 5m
+
           requests:
             memory: 10Mi
-            cpu: 5m
+
 ---
 apiVersion: extensions/v1beta1
 kind: Ingress

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: 200Mi
-            memory: 100Mi
           requests:
-            cpu: 25m
+            memory: 200Mi
-            memory: 100Mi
 ---
 apiVersion: extensions/v1beta1
 kind: Ingress

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

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

manifests/certmanager_chart.yaml

@@ -22,10 +22,10 @@ spec:
     installCRDs: "true"
     resources:
       requests:
-        cpu: 10m
+
         memory: 32Mi
       limits:
-        cpu: 20m
+
         memory: 64Mi
 
 ---

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

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

manifests/ghost_chart.yaml

@@ -1,76 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: ghost
-  labels:
-    goldilocks.fairwinds.com/enabled: "true"
-
----
-
-apiVersion: helm.fluxcd.io/v1
-kind: HelmRelease
-metadata:
-  name: ghost
-  namespace: ghost
-spec:
-  chart:
-    repository: https://charts.bitnami.com/bitnami
-    name: ghost
-    version: 10.0.2
-  maxHistory: 4
-  values:
-    ghostHost: www.chloehiggins.co.uk
-    ghostUsername: chloe
-    ghostEmail: ghost@chloes.email
-    ghostBlogTitle: "Chloe's Website"
-    service:
-      type: ClusterIP
-    mariadb:
-      master:
-        persistence:
-          enabled: true
-          size: 1Gi
-    persistence:
-      enabled: true
-      size: 1Gi
-    resources:
-      limits:
-        cpu: 25m
-        memory: 100Mi
-      requests:
-        cpu: 25m
-        memory: 100Mi
-
----
-
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
-  name: ghost
-  namespace: ghost
-  annotations:
-    cert-manager.io/cluster-issuer: letsencrypt
-    traefik.ingress.kubernetes.io/frontend-entry-points: http,https
-    traefik.ingress.kubernetes.io/redirect-entry-point: https
-    traefik.ingress.kubernetes.io/redirect-permanent: "true"
-spec:
-  tls:
-  - hosts:
-    - www.chloehiggins.co.uk
-    - chloehiggins.co.uk
-    secretName: ghost-ingress
-  rules:
-  - host: www.chloehiggins.co.uk
-    http:
-      paths:
-      - path: /
-        backend:
-          serviceName: ghost-ghost
-          servicePort: 80
-  - host: chloehiggins.co.uk
-    http:
-      paths:
-      - path: /
-        backend:
-          serviceName: ghost-ghost
-          servicePort: 80

manifests/gitea.yaml

@@ -80,7 +80,7 @@ spec:
         resources:
           requests:
             memory: 400Mi
-            cpu: 10m
+
         volumeMounts:
         - mountPath: /data
           name: git-data

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
+

manifests/kube-janitor.yaml

@@ -93,7 +93,6 @@ spec:
           limits:
             memory: 100Mi
           requests:
-            cpu: 5m
             memory: 100Mi
         securityContext:
           readOnlyRootFilesystem: true

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

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

manifests/nextcloud_chart.yaml

@@ -58,4 +58,4 @@ spec:
     resources:
       requests:
         memory: 500Mi
-        cpu: 50m
+

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

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

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

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

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
@@ -36,6 +34,9 @@ spec:
   - port: 80
     targetPort: 8080
     name: web
+  - port: 8000
+    targetPort: 8000
+    name: noauth
   selector:
     app: website-to-remarkable
 ---
@@ -96,10 +97,8 @@ 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
@@ -113,13 +112,6 @@ spec:
         ports:
         - containerPort: 8000
           name: web
-        resources:
-          limits:
-            cpu: 12m
-            memory: 125Mi
-          requests:
-            cpu: 12m
-            memory: 125Mi
 ---
 apiVersion: extensions/v1beta1
 kind: Ingress