Set more realistic requests (#32)

Reviewed-on: https://git.badhouseplants.net/badhouseplants/k8s-cluster-config/pulls/32
This commit is contained in:
Nikolai Rodionov 2023-03-05 17:50:13 +00:00
parent b03661222a
commit bbefd9ce54
4 changed files with 45 additions and 35 deletions

View File

@ -31,7 +31,7 @@ releases:
installed: true installed: true
namespace: minecraft-application namespace: minecraft-application
createNamespace: false createNamespace: false
- <<: *gitea - <<: *gitea
installed: true installed: true
namespace: gitea-service namespace: gitea-service

View File

@ -1,5 +1,6 @@
---
replicaCount: 1 replicaCount: 1
worker: worker:
replicaCount: 1 replicaCount: 1
celery: celery:
beat: beat:
@ -21,4 +22,8 @@ s3:
enabled: false enabled: false
ingress: ingress:
enabled: false enabled: false
postgresql:
primary:
resources:
requests:
cpu: 50m

View File

@ -1,3 +1,4 @@
---
ns: ns:
enabled: true enabled: true
name: gitea-service name: gitea-service
@ -39,7 +40,7 @@ resources:
cpu: 300m cpu: 300m
memory: 512Mi memory: 512Mi
requests: requests:
cpu: 100m cpu: 50m
memory: 128Mi memory: 128Mi
persistence: persistence:
@ -54,9 +55,11 @@ memcached:
enabled: true enabled: true
service: service:
port: 11211 port: 11211
resources:
requests:
cpu: 10mi
postgresql: postgresql:
auth: auth:
postgresPassword: check postgresPassword: check
enabled: true enabled: true
global: global:
@ -64,6 +67,9 @@ postgresql:
servicePort: 5432 servicePort: 5432
persistence: persistence:
size: 10Gi size: 10Gi
resources:
requests:
cpu: 50m
ingress: ingress:
enabled: false enabled: false

View File

@ -4,37 +4,37 @@ templates:
# -- Hooks # -- Hooks
# --------------------------- # ---------------------------
crd-management-hook: crd-management-hook:
hooks: hooks:
- events: ["preapply"] - events: ["preapply"]
showlogs: true showlogs: true
command: "sh" command: "sh"
args: args:
- -c - -c
- "helm show crds {{ .Release.Chart }} --version {{ .Release.Version }}| kubectl apply -f -" - "helm show crds {{ .Release.Chart }} --version {{ .Release.Version }}| kubectl apply -f -"
- events: ["prepare"] - events: ["prepare"]
showlogs: true showlogs: true
command: "sh" command: "sh"
args: args:
- -c - -c
- "helm show crds {{ .Release.Chart }} --version {{ .Release.Version }} | kubectl diff -f - || true" - "helm show crds {{ .Release.Chart }} --version {{ .Release.Version }} | kubectl diff -f - || true"
- events: ["postuninstall"] - events: ["postuninstall"]
showlogs: true showlogs: true
command: "sh" command: "sh"
args: args:
- -c - -c
- "helm show crds {{ .Release.Chart }} --version {{ .Release.Version }} | kubectl delete -f -" - "helm show crds {{ .Release.Chart }} --version {{ .Release.Version }} | kubectl delete -f -"
# ---------------------------- # ----------------------------
# -- Configs # -- Configs
# ---------------------------- # ----------------------------
default-common-values: default-common-values:
values: values:
- "{{ requiredEnv \"PWD\" }}/commmon/values.{{ .Release.Name }}.yaml" - '{{ requiredEnv "PWD" }}/commmon/values.{{ .Release.Name }}.yaml'
default-env-values: default-env-values:
values: values:
- "{{ requiredEnv \"PWD\" }}/{{ .Environment.Name }}/values/values.{{ .Release.Name }}.yaml" - '{{ requiredEnv "PWD" }}/{{ .Environment.Name }}/values/values.{{ .Release.Name }}.yaml'
default-env-secrets: default-env-secrets:
secrets: secrets:
- "{{ requiredEnv \"PWD\" }}/{{ .Environment.Name }}/values/secrets.{{ .Release.Name }}.yaml" - '{{ requiredEnv "PWD" }}/{{ .Environment.Name }}/values/secrets.{{ .Release.Name }}.yaml'
# ---------------------------- # ----------------------------
# -- Extensions # -- Extensions
# ---------------------------- # ----------------------------
@ -44,12 +44,12 @@ templates:
version: 2.0.0 version: 2.0.0
alias: istio alias: istio
namespace: namespace:
dependencies: dependencies:
- chart: bedag/raw - chart: bedag/raw
version: 2.0.0 version: 2.0.0
alias: ns alias: ns
values: values:
- "{{ requiredEnv \"PWD\" }}/common/values.ns.yaml" - '{{ requiredEnv "PWD" }}/common/values.ns.yaml'
# ---------------------------- # ----------------------------
# -- Releases # -- Releases
# ---------------------------- # ----------------------------
@ -66,7 +66,7 @@ templates:
name: cert-manager name: cert-manager
chart: jetstack/cert-manager chart: jetstack/cert-manager
version: 1.10.1 version: 1.10.1
set: set:
- name: installCRDs - name: installCRDs
value: true value: true
longhorn: &longhorn longhorn: &longhorn
@ -87,14 +87,14 @@ templates:
# -- Istio # -- Istio
# ---------------------------- # ----------------------------
istio-common: istio-common:
labels: labels:
bundle: istio bundle: istio
version: 1.16.1 version: 1.16.1
istio-base: &istio-base istio-base: &istio-base
name: istio-base name: istio-base
chart: istio/base chart: istio/base
inherit: inherit:
- template: crd-management-hook - template: crd-management-hook
- template: istio-common - template: istio-common
@ -111,7 +111,7 @@ templates:
inherit: inherit:
- template: istio-common - template: istio-common
- template: default-env-values - template: default-env-values
# ---------------------------- # ----------------------------
# -- Applications # -- Applications
# ---------------------------- # ----------------------------
@ -129,7 +129,7 @@ templates:
inherit: inherit:
- template: default-env-values - template: default-env-values
- template: default-env-secrets - template: default-env-secrets
drone-runner-kube: &drone-runner-kube drone-runner-kube: &drone-runner-kube
name: drone-runner-kube name: drone-runner-kube
chart: drone/drone-runner-kube chart: drone/drone-runner-kube
@ -145,7 +145,7 @@ templates:
inherit: inherit:
- template: default-env-values - template: default-env-values
- template: default-env-secrets - template: default-env-secrets
minio: &minio minio: &minio
name: minio name: minio
chart: minio/minio chart: minio/minio
@ -153,19 +153,19 @@ templates:
inherit: inherit:
- template: default-env-values - template: default-env-values
- template: default-env-secrets - template: default-env-secrets
minecraft: &minecraft minecraft: &minecraft
name: minecraft name: minecraft
chart: minecraft-server-charts/minecraft chart: minecraft-server-charts/minecraft
version: 4.4.0 version: 4.4.0
inherit: inherit:
- template: default-env-values - template: default-env-values
gitea: &gitea gitea: &gitea
name: gitea name: gitea
chart: gitea/gitea chart: gitea/gitea
version: 7.0.2 version: 7.0.2
inherit: inherit:
- template: default-env-values - template: default-env-values
- template: default-env-secrets - template: default-env-secrets
@ -173,7 +173,6 @@ templates:
name: funkwhale name: funkwhale
chart: ananace-charts/funkwhale chart: ananace-charts/funkwhale
version: 1.0.0 version: 1.0.0
inherit: inherit:
- template: default-env-values - template: default-env-values
- template: default-env-secrets - template: default-env-secrets