From 5b6d0c9e717da6cd30f4ace1dd2a30cb1d4ea415 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Thu, 21 Dec 2023 10:16:55 -0500 Subject: [PATCH] Big Update - basic webapps - no more cpu limits --- k8s/apps/basic-webapps/Chart.yaml | 6 ++ .../basic-webapps/templates/sts-services.yaml | 100 ++++++++++++++++++ k8s/apps/basic-webapps/values-dev.yaml | 0 k8s/apps/basic-webapps/values-prod.yaml | 0 k8s/apps/basic-webapps/values.yaml | 1 + k8s/apps/frigate/values.yaml | 2 - k8s/apps/ingresses/templates/dummy-pod.yaml | 1 - k8s/apps/nextcloud/values.yaml | 3 - k8s/apps/postfix/templates/postfix.yaml | 1 - k8s/apps/videohosting/values.yaml | 9 +- k8s/argoapps/apps-values/basic-webapp.yaml | 21 ++++ k8s/argoapps/apps-values/ingresses.yaml | 13 +++ k8s/argoapps/templates/argoappset-apps.yaml | 4 + k8s/argoapps/templates/cluster-limits.yaml | 4 +- k8s/argoapps/values.yaml | 9 ++ 15 files changed, 156 insertions(+), 18 deletions(-) create mode 100644 k8s/apps/basic-webapps/Chart.yaml create mode 100644 k8s/apps/basic-webapps/templates/sts-services.yaml create mode 100644 k8s/apps/basic-webapps/values-dev.yaml create mode 100644 k8s/apps/basic-webapps/values-prod.yaml create mode 100644 k8s/apps/basic-webapps/values.yaml create mode 100644 k8s/argoapps/apps-values/basic-webapp.yaml diff --git a/k8s/apps/basic-webapps/Chart.yaml b/k8s/apps/basic-webapps/Chart.yaml new file mode 100644 index 0000000..b82bb8c --- /dev/null +++ b/k8s/apps/basic-webapps/Chart.yaml @@ -0,0 +1,6 @@ +apiVersion: v2 +name: basic-webapps +description: An applications service for homelab +type: application +version: 0.1.0 +dependencies: [] diff --git a/k8s/apps/basic-webapps/templates/sts-services.yaml b/k8s/apps/basic-webapps/templates/sts-services.yaml new file mode 100644 index 0000000..e334113 --- /dev/null +++ b/k8s/apps/basic-webapps/templates/sts-services.yaml @@ -0,0 +1,100 @@ +{{ range $k, $v := .Values.services }} +--- +kind: Service +apiVersion: v1 +metadata: + name: {{ $k }} +spec: + selector: + app: {{ $k }} + type: ClusterIP + ports: + {{ range $portName, $portValue := $v.ports.tcp }} + - port: {{ $portValue }} + targetPort: {{ $portValue }} + name: "{{ $portName }}" + protocol: TCP + {{ end }} + {{- if $v.ports.udp -}} + {{ range $portName, $portValue := $v.ports.udp }} + - port: {{ $portValue }} + targetPort: {{ $portValue }} + name: "{{ $portName }}-udp" + protocol: UDP + {{ end }} + {{- end }} +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{$k}} +spec: + selector: + matchLabels: + app: {{$k}} + replicas: 1 + revisionHistoryLimit: 2 + updateStrategy: + rollingUpdate: + partition: 1 + type: RollingUpdate + template: + metadata: + labels: + app: {{$k}} + spec: + affinity: + nodeAffinity: + preferredDuringSchedulingIgnoredDuringExecution: + - weight: 1 + preference: + matchExpressions: + - key: homelab/capacity + operator: In + values: + {{ $v.capacity | toYaml | nindent 20 }} + containers: + - name: {{$k}} + image: "{{ $v.repo }}:{{ $v.tag }}" + imagePullPolicy: Always + resources: + {{- $v.podResources | toYaml | nindent 12 }} + ports: + {{ range $portName, $portValue := $v.ports.tcp }} + - containerPort: {{ $portValue }} + protocol: TCP + name: "tcp-{{ $portName }}" + {{ end }} + {{- if $v.ports.udp -}} + {{ range $portName, $portValue := $v.ports.udp }} + - containerPort: {{ $portValue }} + protocol: UDP + {{ end }} + {{ end }} + {{- if $v.health.liveness }} + livenessProbe: + httpGet: + path: {{$v.health.liveness}} + port: tcp-web + scheme: HTTP + initialDelaySeconds: 10 + failureThreshold: 10 + timeoutSeconds: 30 + {{ end -}} + {{- if $v.health.readiness }} + readinessProbe: + httpGet: + path: {{$v.health.readiness}} + port: tcp-web + scheme: HTTP + initialDelaySeconds: 10 + failureThreshold: 10 + timeoutSeconds: 30 + {{ end }} + startupProbe: + tcpSocket: + port: tcp-web + initialDelaySeconds: 10 + failureThreshold: 10 + timeoutSeconds: 30 +{{ end }} \ No newline at end of file diff --git a/k8s/apps/basic-webapps/values-dev.yaml b/k8s/apps/basic-webapps/values-dev.yaml new file mode 100644 index 0000000..e69de29 diff --git a/k8s/apps/basic-webapps/values-prod.yaml b/k8s/apps/basic-webapps/values-prod.yaml new file mode 100644 index 0000000..e69de29 diff --git a/k8s/apps/basic-webapps/values.yaml b/k8s/apps/basic-webapps/values.yaml new file mode 100644 index 0000000..8aaccd1 --- /dev/null +++ b/k8s/apps/basic-webapps/values.yaml @@ -0,0 +1 @@ +app: {} \ No newline at end of file diff --git a/k8s/apps/frigate/values.yaml b/k8s/apps/frigate/values.yaml index 4aab4bd..6faf299 100644 --- a/k8s/apps/frigate/values.yaml +++ b/k8s/apps/frigate/values.yaml @@ -33,14 +33,12 @@ resources: cpu: "2" limits: memory: "4Gi" - cpu: "3" go2rtc: requests: memory: "100Mi" cpu: "500m" limits: memory: "500Mi" - cpu: "1" scrypted: homekit: diff --git a/k8s/apps/ingresses/templates/dummy-pod.yaml b/k8s/apps/ingresses/templates/dummy-pod.yaml index 7c553bb..a788fa7 100644 --- a/k8s/apps/ingresses/templates/dummy-pod.yaml +++ b/k8s/apps/ingresses/templates/dummy-pod.yaml @@ -21,7 +21,6 @@ spec: image: nginxdemos/hello resources: limits: - cpu: 1 memory: 1Gi ports: - containerPort: 80 diff --git a/k8s/apps/nextcloud/values.yaml b/k8s/apps/nextcloud/values.yaml index abc36ca..2d68bbf 100644 --- a/k8s/apps/nextcloud/values.yaml +++ b/k8s/apps/nextcloud/values.yaml @@ -17,7 +17,6 @@ nextcloud: memory: "1Gi" ephemeral-storage: "40Ki" limits: - cpu: "1" memory: 5Gi ephemeral-storage: "40Mi" @@ -74,7 +73,6 @@ nextcloud: memory: "1Gi" ephemeral-storage: "20Mi" limits: - cpu: "8" memory: 10Gi ephemeral-storage: "200Mi" @@ -92,6 +90,5 @@ nextcloud: memory: "256Mi" ephemeral-storage: "100Ki" limits: - cpu: "250m" memory: 1Gi ephemeral-storage: "100Mi" \ No newline at end of file diff --git a/k8s/apps/postfix/templates/postfix.yaml b/k8s/apps/postfix/templates/postfix.yaml index 39e52b4..6d6da01 100644 --- a/k8s/apps/postfix/templates/postfix.yaml +++ b/k8s/apps/postfix/templates/postfix.yaml @@ -41,7 +41,6 @@ spec: cpu: "20m" memory: "55M" limits: - cpu: "20m" memory: "55M" env: - name: "SMTP_PASSWORD" diff --git a/k8s/apps/videohosting/values.yaml b/k8s/apps/videohosting/values.yaml index aa71df3..e8f12a1 100644 --- a/k8s/apps/videohosting/values.yaml +++ b/k8s/apps/videohosting/values.yaml @@ -10,10 +10,9 @@ plex: tag: "1.32.7.7621-871adbd44" resources: limits: - cpu: 8 memory: "14Gi" requests: - cpu: 750m + cpu: 1 memory: "4Gi" arrs: @@ -26,7 +25,6 @@ arrs: usePostgres: true podResources: limits: - cpu: 2 memory: "8Gi" requests: cpu: 250m @@ -50,7 +48,6 @@ arrs: usePostgres: true podResources: limits: - cpu: 2 memory: "8Gi" requests: cpu: 250m @@ -74,7 +71,6 @@ arrs: usePostgres: true podResources: limits: - cpu: 2 memory: "8Gi" requests: cpu: 250m @@ -98,7 +94,6 @@ arrs: usePostgres: true podResources: limits: - cpu: 2 memory: "8Gi" requests: cpu: 50m @@ -121,7 +116,6 @@ services: AUTO_UPDATE: "true" podResources: limits: - cpu: 500m memory: "1Gi" requests: cpu: 250m @@ -148,7 +142,6 @@ services: 6881: 6881 podResources: limits: - cpu: 2 memory: "6Gi" requests: cpu: 800m diff --git a/k8s/argoapps/apps-values/basic-webapp.yaml b/k8s/argoapps/apps-values/basic-webapp.yaml new file mode 100644 index 0000000..91fae7f --- /dev/null +++ b/k8s/argoapps/apps-values/basic-webapp.yaml @@ -0,0 +1,21 @@ +app: + quirky: + ingress: + middleware: apps-ingresses-https-redirect + repo: ghcr.io/asosnovsky/quirky + tag: "latest" + podResources: + limits: + memory: "250Mi" + requests: + cpu: 250m + memory: "250Mi" + health: + readiness: "/" + liveness: "/" + ports: + tcp: + web: 80 + capacity: + - med + - low \ No newline at end of file diff --git a/k8s/argoapps/apps-values/ingresses.yaml b/k8s/argoapps/apps-values/ingresses.yaml index 2754c5f..911a741 100644 --- a/k8s/argoapps/apps-values/ingresses.yaml +++ b/k8s/argoapps/apps-values/ingresses.yaml @@ -106,4 +106,17 @@ services: port: {{ $v.ports.tcp.web }} middleware: "apps-ingresses-chain-authentik" group: "Video Hosting" + {{- end }} + # basic-webapp services + {{- range $k, $v := .Values.basic-webapps.apps }} + - prefix: "{{ $k }}.wa" + service: "{{ $k }}" + namespace: "apps-basic-webapps" + port: {{ $v.ports.tcp.web }} + {{ if $.ingress }} + middleware: {{ $.ingress.middleware | default "apps-ingresses-chain-authentik" }} + {{ else }} + middleware: "apps-ingresses-chain-authentik" + {{ end }} + group: "Basic Webapps" {{- end }} \ No newline at end of file diff --git a/k8s/argoapps/templates/argoappset-apps.yaml b/k8s/argoapps/templates/argoappset-apps.yaml index 6ba18f8..fda1e8a 100644 --- a/k8s/argoapps/templates/argoappset-apps.yaml +++ b/k8s/argoapps/templates/argoappset-apps.yaml @@ -44,4 +44,8 @@ spec: destination: server: https://kubernetes.default.svc namespace: {{ $appProps.namespace | default $genNamespace }} + {{ if $appProps.syncPolicy }} + syncPolicy: + {{$appProps.syncPolicy | toYaml | nindent 4 }} + {{ end }} {{ end }} \ No newline at end of file diff --git a/k8s/argoapps/templates/cluster-limits.yaml b/k8s/argoapps/templates/cluster-limits.yaml index 33fe4b3..6021efc 100644 --- a/k8s/argoapps/templates/cluster-limits.yaml +++ b/k8s/argoapps/templates/cluster-limits.yaml @@ -5,9 +5,7 @@ metadata: name: cpu-limit-range spec: limits: - - default: - cpu: 50m - defaultRequest: + - defaultRequest: cpu: 10m type: Container --- diff --git a/k8s/argoapps/values.yaml b/k8s/argoapps/values.yaml index 2d62866..ebcee88 100644 --- a/k8s/argoapps/values.yaml +++ b/k8s/argoapps/values.yaml @@ -40,6 +40,14 @@ videohosting: 6881: 6881 apps: + basic-webapps: + valuesFile: basic-webapp.yaml + syncPolicy: + automated: + selfHeal: true + syncOptions: + - ServerSideApply=true + photos: values: |- immich: @@ -52,6 +60,7 @@ apps: nfs: path: {{ .Values.global.nfs.additionalShares.familyphotos }} server: {{ .Values.global.nfs.server }} + videohosting: values: |- {{ .Values.videohosting | toYaml }}