diff --git a/badhouseplants/helmfile.yaml b/badhouseplants/helmfile.yaml index 11f4e86..8186903 100644 --- a/badhouseplants/helmfile.yaml +++ b/badhouseplants/helmfile.yaml @@ -31,7 +31,7 @@ releases: installed: true namespace: minecraft-application createNamespace: false - + - <<: *gitea installed: true namespace: gitea-service diff --git a/badhouseplants/values/values.funkwhale.yaml b/badhouseplants/values/values.funkwhale.yaml index e6a36db..08bdbd6 100644 --- a/badhouseplants/values/values.funkwhale.yaml +++ b/badhouseplants/values/values.funkwhale.yaml @@ -1,5 +1,6 @@ +--- replicaCount: 1 -worker: +worker: replicaCount: 1 celery: beat: @@ -21,4 +22,8 @@ s3: enabled: false ingress: enabled: false - +postgresql: + primary: + resources: + requests: + cpu: 50m diff --git a/badhouseplants/values/values.gitea.yaml b/badhouseplants/values/values.gitea.yaml index 4d299a6..6c6cf87 100644 --- a/badhouseplants/values/values.gitea.yaml +++ b/badhouseplants/values/values.gitea.yaml @@ -1,3 +1,4 @@ +--- ns: enabled: true name: gitea-service @@ -39,7 +40,7 @@ resources: cpu: 300m memory: 512Mi requests: - cpu: 100m + cpu: 50m memory: 128Mi persistence: @@ -54,9 +55,11 @@ memcached: enabled: true service: port: 11211 - + resources: + requests: + cpu: 10mi postgresql: - auth: + auth: postgresPassword: check enabled: true global: @@ -64,6 +67,9 @@ postgresql: servicePort: 5432 persistence: size: 10Gi + resources: + requests: + cpu: 50m ingress: enabled: false diff --git a/releases.yaml b/releases.yaml index 3b7b52f..eaff832 100644 --- a/releases.yaml +++ b/releases.yaml @@ -4,37 +4,37 @@ templates: # -- Hooks # --------------------------- crd-management-hook: - hooks: + hooks: - events: ["preapply"] showlogs: true command: "sh" - args: - - -c + args: + - -c - "helm show crds {{ .Release.Chart }} --version {{ .Release.Version }}| kubectl apply -f -" - events: ["prepare"] showlogs: true command: "sh" - args: - - -c + args: + - -c - "helm show crds {{ .Release.Chart }} --version {{ .Release.Version }} | kubectl diff -f - || true" - events: ["postuninstall"] showlogs: true command: "sh" - args: - - -c + args: + - -c - "helm show crds {{ .Release.Chart }} --version {{ .Release.Version }} | kubectl delete -f -" # ---------------------------- # -- Configs # ---------------------------- - default-common-values: - values: - - "{{ requiredEnv \"PWD\" }}/commmon/values.{{ .Release.Name }}.yaml" - default-env-values: - values: - - "{{ requiredEnv \"PWD\" }}/{{ .Environment.Name }}/values/values.{{ .Release.Name }}.yaml" + default-common-values: + values: + - '{{ requiredEnv "PWD" }}/commmon/values.{{ .Release.Name }}.yaml' + default-env-values: + values: + - '{{ requiredEnv "PWD" }}/{{ .Environment.Name }}/values/values.{{ .Release.Name }}.yaml' default-env-secrets: - secrets: - - "{{ requiredEnv \"PWD\" }}/{{ .Environment.Name }}/values/secrets.{{ .Release.Name }}.yaml" + secrets: + - '{{ requiredEnv "PWD" }}/{{ .Environment.Name }}/values/secrets.{{ .Release.Name }}.yaml' # ---------------------------- # -- Extensions # ---------------------------- @@ -44,12 +44,12 @@ templates: version: 2.0.0 alias: istio namespace: - dependencies: + dependencies: - chart: bedag/raw version: 2.0.0 alias: ns values: - - "{{ requiredEnv \"PWD\" }}/common/values.ns.yaml" + - '{{ requiredEnv "PWD" }}/common/values.ns.yaml' # ---------------------------- # -- Releases # ---------------------------- @@ -66,7 +66,7 @@ templates: name: cert-manager chart: jetstack/cert-manager version: 1.10.1 - set: + set: - name: installCRDs value: true longhorn: &longhorn @@ -87,14 +87,14 @@ templates: # -- Istio # ---------------------------- istio-common: - labels: + labels: bundle: istio version: 1.16.1 - + istio-base: &istio-base name: istio-base chart: istio/base - inherit: + inherit: - template: crd-management-hook - template: istio-common @@ -111,7 +111,7 @@ templates: inherit: - template: istio-common - template: default-env-values - + # ---------------------------- # -- Applications # ---------------------------- @@ -129,7 +129,7 @@ templates: inherit: - template: default-env-values - template: default-env-secrets - + drone-runner-kube: &drone-runner-kube name: drone-runner-kube chart: drone/drone-runner-kube @@ -145,7 +145,7 @@ templates: inherit: - template: default-env-values - template: default-env-secrets - + minio: &minio name: minio chart: minio/minio @@ -153,19 +153,19 @@ templates: inherit: - template: default-env-values - template: default-env-secrets - + minecraft: &minecraft name: minecraft chart: minecraft-server-charts/minecraft version: 4.4.0 inherit: - template: default-env-values - + gitea: &gitea name: gitea chart: gitea/gitea version: 7.0.2 - inherit: + inherit: - template: default-env-values - template: default-env-secrets @@ -173,7 +173,6 @@ templates: name: funkwhale chart: ananace-charts/funkwhale version: 1.0.0 - inherit: + inherit: - template: default-env-values - template: default-env-secrets -