Set more realistic resources #32

Merged
allanger merged 3 commits from refs/pull/32/head into main 2023-03-05 17:50:17 +00:00
4 changed files with 63 additions and 29 deletions
Showing only changes of commit 8000bbe048 - Show all commits

View File

@ -41,6 +41,17 @@ releases:
installed: true installed: true
namespace: funkwhale-application namespace: funkwhale-application
createNamespace: false createNamespace: false
- <<: *rook-ceph
installed: true
namespace: rook-ceph
createNamespace: true
- <<: *rook-ceph-cluster
installed: true
namespace: rook-ceph
createNamespace: true
bases: bases:
- ../environments.yaml - ../environments.yaml

View File

@ -0,0 +1,10 @@
cephClusterSpec:
mon:
count: 1
allowMultiplePerNode: false
mgr:
count: 1
allowMultiplePerNode: false
modules:
- name: pg_autoscaler
enabled: true

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
@ -83,18 +83,30 @@ templates:
inherit: inherit:
- template: default-env-values - template: default-env-values
- template: default-env-secrets - template: default-env-secrets
rook-ceph: &rook-ceph
name: rook-ceph
chart: rook-release/rook-ceph
version: v1.11.0
rook-ceph-cluster: &rook-ceph-cluster
name: rook-ceph-cluster
chart: rook-release/rook-ceph-cluster
version: v1.11.0
inherit:
- template: default-env-values
# ---------------------------- # ----------------------------
# -- 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 +123,7 @@ templates:
inherit: inherit:
- template: istio-common - template: istio-common
- template: default-env-values - template: default-env-values
# ---------------------------- # ----------------------------
# -- Applications # -- Applications
# ---------------------------- # ----------------------------
@ -129,7 +141,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 +157,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 +165,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 +185,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

View File

@ -26,3 +26,5 @@ repositories:
url: https://argoproj.github.io/argo-helm url: https://argoproj.github.io/argo-helm
- name: bedag - name: bedag
url: https://bedag.github.io/helm-charts/ url: https://bedag.github.io/helm-charts/
- name: rook-release
url: https://charts.rook.io/release