diff --git a/flux2/apps/monitoring/eventrouter-values-configmap.yaml b/flux2/apps/monitoring/eventrouter-values-configmap.yaml
index fa7d5eb712ca6608cf8e7684b88f6db44038c487..8515f01f495268135ad86876dc9616185a69a993 100644
--- a/flux2/apps/monitoring/eventrouter-values-configmap.yaml
+++ b/flux2/apps/monitoring/eventrouter-values-configmap.yaml
@@ -10,7 +10,6 @@ data:
resources:
limits:
memory: 400Mi
- cpu: 400m
requests:
memory: 200Mi
cpu: 200m
diff --git a/flux2/apps/monitoring/kube-prometheus-stack-values-configmap.yaml b/flux2/apps/monitoring/kube-prometheus-stack-values-configmap.yaml
index a193f67ad1d3fa8d26dcf932aef816d4a918bfe6..c42b4d42cfa013c1182ff35b29d14a107bc5caba 100644
--- a/flux2/apps/monitoring/kube-prometheus-stack-values-configmap.yaml
+++ b/flux2/apps/monitoring/kube-prometheus-stack-values-configmap.yaml
@@ -98,7 +98,6 @@ data:
storage: 1Gi
# resources:
# limits:
- # cpu: 500m
# memory: 64Mi
# requests:
# cpu: 25m
@@ -108,6 +107,7 @@ data:
prometheus:
# https://github.com/prometheus-community/helm-charts/tree/main/charts/prometheus
+ # https://github.com/prometheus-community/helm-charts/blob/main/charts/kube-prometheus-stack/values.yaml#L2101
prometheusSpec:
# Use these settings to debug prometheus queries
# logLevel: debug
@@ -122,13 +122,6 @@ data:
resources:
requests:
storage: 10Gi
- resources:
- limits:
- cpu: 1
- memory: 1.5Gi
- requests:
- cpu: 300m
- memory: 1Gi
# Discover ALL custom serviceMonitors, podMonitors and prometheusrules,
# not only those with particular release labels set by
# kube-prometheus-stack
@@ -136,6 +129,13 @@ data:
serviceMonitorSelectorNilUsesHelmValues: false
ruleSelectorNilUsesHelmValues: false
podMonitorSelectorNilUsesHelmValues: false
+ server:
+ resources:
+ limits:
+ memory: 1.5Gi
+ requests:
+ cpu: 300m
+ memory: 1Gi
ingress:
enabled: true
@@ -253,7 +253,6 @@ data:
resources:
limits:
- cpu: 400m
memory: 256Mi
requests:
cpu: 200m
@@ -262,7 +261,6 @@ data:
# sidecar:
# resources:
# limits:
- # cpu: 100m
# memory: 128Mi
# requests:
# cpu: 5m
@@ -271,7 +269,6 @@ data:
prometheusOperator:
resources:
limits:
- cpu: 400m
memory: 256Mi
requests:
cpu: 100m
@@ -281,7 +278,6 @@ data:
prometheus-node-exporter:
resources:
limits:
- cpu: 800m
memory: 64Mi
requests:
cpu: 100m
@@ -291,7 +287,6 @@ data:
kube-state-metrics:
resources:
limits:
- cpu: 200m
memory: 128Mi
requests:
cpu: 100m
diff --git a/flux2/apps/monitoring/loki-values-configmap.yaml b/flux2/apps/monitoring/loki-values-configmap.yaml
index 3aa384a119cb3c46d15738a99b7509f4e7ed2925..b1351d90e68a24945c1fc0a8fb02c766aaa4be31 100644
--- a/flux2/apps/monitoring/loki-values-configmap.yaml
+++ b/flux2/apps/monitoring/loki-values-configmap.yaml
@@ -9,7 +9,6 @@ data:
# https://github.com/grafana/helm-charts/blob/main/charts/loki/values.yaml
resources:
limits:
- cpu: 800m
memory: 1024Mi
requests:
cpu: 300m
diff --git a/flux2/apps/monitoring/promtail-values-configmap.yaml b/flux2/apps/monitoring/promtail-values-configmap.yaml
index d32575cf5f1ab400642d730570fdfbc3dd6e3fe2..184f2b9143c3ed14619a6976c2483e3dc24d2e0c 100644
--- a/flux2/apps/monitoring/promtail-values-configmap.yaml
+++ b/flux2/apps/monitoring/promtail-values-configmap.yaml
@@ -11,7 +11,6 @@ data:
fsInotifyMaxUserInstances: 512
resources:
limits:
- cpu: 400m
memory: 384Mi
requests:
cpu: 200m
diff --git a/flux2/apps/nextcloud/nextcloud-values-configmap.yaml b/flux2/apps/nextcloud/nextcloud-values-configmap.yaml
index dea8b024c850ffd53326176951430baf94356c4e..cbfa22852c1854b1e9ce2e1dfa369dbdb1b17a32 100644
--- a/flux2/apps/nextcloud/nextcloud-values-configmap.yaml
+++ b/flux2/apps/nextcloud/nextcloud-values-configmap.yaml
@@ -73,7 +73,6 @@ data:
resources:
limits:
- cpu: 700m
memory: 1024Mi
requests:
cpu: 200m
@@ -96,7 +95,6 @@ data:
existingClaim: "nextcloud-mariadb"
resources:
limits:
- cpu: 200m
memory: 512Mi
requests:
cpu: 100m
@@ -124,7 +122,6 @@ data:
onlyoffice:
resources:
limits:
- cpu: 800m
memory: 2Gi
requests:
cpu: 200m
@@ -163,7 +160,6 @@ data:
enabled: false
resources:
limits:
- cpu: "4"
memory: 512Mi
requests:
cpu: 200m
@@ -179,7 +175,6 @@ data:
enabled: false
resources:
limits:
- cpu: 100m
memory: 64Mi
requests:
cpu: 50m
diff --git a/flux2/apps/wekan/wekan-values-configmap.yaml b/flux2/apps/wekan/wekan-values-configmap.yaml
index 1e86cf40eb843b37c2099b39f612024fa2404003..34e55430d56c5c47b1075c169bf0406ffd351c3f 100644
--- a/flux2/apps/wekan/wekan-values-configmap.yaml
+++ b/flux2/apps/wekan/wekan-values-configmap.yaml
@@ -84,6 +84,15 @@ data:
stackspin.net/backupSet: "wekan"
# https://docs.bitnami.com/kubernetes/infrastructure/mongodb/
# https://github.com/bitnami/charts/tree/master/bitnami/mongodb#parameters
+ resources:
+ requests:
+ memory: 256Mi
+ cpu: 300m
+ limits:
+ # Needs to get set to null, otherwise the default from the chart
+ # values.yaml is used
+ cpu: null
+ memory: 384Mi
mongodb:
enabled: true
architecture: standalone
@@ -113,7 +122,6 @@ data:
existingClaim: "wekan"
resources:
limits:
- cpu: 1
memory: 1024Mi
requests:
cpu: 400m
diff --git a/flux2/apps/wordpress/wordpress-values-configmap.yaml b/flux2/apps/wordpress/wordpress-values-configmap.yaml
index a8d5bf81a27ada10177090de5f79b04cc9c97d85..26a04a8dfef58e6c61865e409dc016f143920664 100644
--- a/flux2/apps/wordpress/wordpress-values-configmap.yaml
+++ b/flux2/apps/wordpress/wordpress-values-configmap.yaml
@@ -76,7 +76,6 @@ data:
backup.velero.io/backup-volumes: "data"
resources:
limits:
- cpu: 200m
memory: 512Mi
requests:
cpu: 100m
@@ -84,11 +83,8 @@ data:
commonLabels:
stackspin.net/backupSet: "wordpress"
- # It's advisable to set resource limits to prevent your K8s cluster from
- # crashing
resources:
limits:
- cpu: "4"
memory: 512Mi
requests:
cpu: 100m
diff --git a/flux2/apps/zulip/zulip-values-configmap.yaml b/flux2/apps/zulip/zulip-values-configmap.yaml
index 1224cc3f8b8e0662c856cb493b666206dae1a88a..be1e64e25555e9d6caa578d73e095de3d6b02df3 100644
--- a/flux2/apps/zulip/zulip-values-configmap.yaml
+++ b/flux2/apps/zulip/zulip-values-configmap.yaml
@@ -34,7 +34,6 @@ data:
backup.velero.io/backup-volumes: "zulip-persistent-storage"
resources:
limits:
- cpu: "4"
memory: 2.5Gi
requests:
cpu: 400m
@@ -79,7 +78,6 @@ data:
memcachedPassword: "${memcached_password}"
resources:
limits:
- cpu: 200m
memory: 256Mi
requests:
cpu: 100m
@@ -91,7 +89,6 @@ data:
erlangCookie: "${rabbitmq_erlang_cookie}"
resources:
limits:
- cpu: "4"
memory: 1Gi
requests:
cpu: 200m
@@ -105,7 +102,6 @@ data:
master:
resources:
limits:
- cpu: 200m
memory: 64Mi
requests:
cpu: 100m
@@ -123,7 +119,6 @@ data:
postgresqlPassword: "${postgresql_password}"
resources:
limits:
- cpu: 400m
memory: 256Mi
requests:
cpu: 200m
diff --git a/flux2/core/base/cert-manager/cert-manager-values-configmap.yaml b/flux2/core/base/cert-manager/cert-manager-values-configmap.yaml
index d825673bbb8df59f586c2ea409f272c6bfe7a9b1..2812c571537869954addd613fe08bee35e4c3324 100644
--- a/flux2/core/base/cert-manager/cert-manager-values-configmap.yaml
+++ b/flux2/core/base/cert-manager/cert-manager-values-configmap.yaml
@@ -13,7 +13,6 @@ data:
cpu: 200m
memory: 256Mi
limits:
- cpu: 400m
memory: 512Mi
cainjector:
resources:
@@ -21,7 +20,6 @@ data:
cpu: 200m
memory: 384Mi
limits:
- cpu: 400m
memory: 768Mi
webhook:
resources:
@@ -29,6 +27,5 @@ data:
cpu: 100m
memory: 40Mi
limits:
- cpu: 200m
memory: 80Mi
installCRDs: true
diff --git a/flux2/core/base/dashboard/dashboard-values-configmap.yaml b/flux2/core/base/dashboard/dashboard-values-configmap.yaml
index d6231aa402be57bf3a4f4096957cbf7c26c596e4..29c99d22a996240fb1439ad65594d20aea8aeff9 100644
--- a/flux2/core/base/dashboard/dashboard-values-configmap.yaml
+++ b/flux2/core/base/dashboard/dashboard-values-configmap.yaml
@@ -11,7 +11,6 @@ data:
host: dashboard.${domain}
resources:
limits:
- cpu: 20m
memory: 32Mi
requests:
cpu: 10m
@@ -34,7 +33,6 @@ data:
tokenUrl: "https://sso.${domain}/oauth2/token"
resources:
limits:
- cpu: 200m
memory: 512Mi
requests:
cpu: 100m
diff --git a/flux2/core/base/local-path-provisioner/local-path-provisioner-values-configmap.yaml b/flux2/core/base/local-path-provisioner/local-path-provisioner-values-configmap.yaml
index 9691d967aa088137353d03b0d7aaebae3de88304..94b01d0dc1c9d4865640a4c08a1eafcad7c818cc 100644
--- a/flux2/core/base/local-path-provisioner/local-path-provisioner-values-configmap.yaml
+++ b/flux2/core/base/local-path-provisioner/local-path-provisioner-values-configmap.yaml
@@ -24,5 +24,4 @@ data:
cpu: 200m
memory: 20Mi
limits:
- cpu: 400m
memory: 40Mi
diff --git a/flux2/core/base/nginx/nginx-values-configmap.yaml b/flux2/core/base/nginx/nginx-values-configmap.yaml
index aa6b99b726f574933827a1064e79fba7a2e86e5f..f9235220fe900c5f7d00d32ba6641941d75be957 100644
--- a/flux2/core/base/nginx/nginx-values-configmap.yaml
+++ b/flux2/core/base/nginx/nginx-values-configmap.yaml
@@ -19,7 +19,6 @@ data:
whitelist-source-range: '0.0.0.0/0'
resources:
limits:
- cpu: 200m
memory: 1Gi
requests:
cpu: 100m
diff --git a/install/flux-patches/helm-controller.yaml b/install/flux-patches/helm-controller.yaml
index fed0d1e60f4b4439b980ddf0946f273f48954156..c41bb06d6668ab80cb23ea52a4dfe25cac81c4fe 100644
--- a/install/flux-patches/helm-controller.yaml
+++ b/install/flux-patches/helm-controller.yaml
@@ -7,7 +7,7 @@ spec:
- "--concurrent=3"
resources:
limits:
- cpu: "1"
+ cpu: null
memory: 2048Mi
requests:
cpu: 100m
diff --git a/install/flux-patches/kustomize-controller.yaml b/install/flux-patches/kustomize-controller.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..41a6a40860d4770422ebbded4ab579c62a275f46
--- /dev/null
+++ b/install/flux-patches/kustomize-controller.yaml
@@ -0,0 +1,12 @@
+spec:
+ template:
+ spec:
+ containers:
+ - name: manager
+ resources:
+ limits:
+ cpu: null
+ memory: 1024Mi
+ requests:
+ cpu: 100m
+ memory: 64Mi
diff --git a/install/flux-patches/source-controller.yaml b/install/flux-patches/source-controller.yaml
index 87d0f58c69514208769d588c4e73a2d3b336a925..e46b8d04b5503691f0674e5464425998a57d3d44 100644
--- a/install/flux-patches/source-controller.yaml
+++ b/install/flux-patches/source-controller.yaml
@@ -5,7 +5,7 @@ spec:
- name: manager
resources:
limits:
- cpu: "1"
+ cpu: null
memory: 1536Mi
requests:
cpu: 100m
diff --git a/install/install-stackspin.sh b/install/install-stackspin.sh
index dacde30341b765b95a5a631193ca631e50a5d04e..44387b22542285d9d4c608420fcc759c61fe007b 100755
--- a/install/install-stackspin.sh
+++ b/install/install-stackspin.sh
@@ -27,6 +27,11 @@ kubectl patch deployment \
source-controller \
--patch-file "$(dirname "$0")/flux-patches/source-controller.yaml"
+kubectl patch deployment \
+ -n flux-system \
+ kustomize-controller \
+ --patch-file "$(dirname "$0")/flux-patches/kustomize-controller.yaml"
+
# get current git branch name
branch=${CI_COMMIT_REF_NAME:-}
[ -z "$branch" ] && branch=$(git rev-parse --abbrev-ref HEAD)
diff --git a/test/taiko/apps.js b/test/taiko/apps.js
index 1a26ad20cdb120ab9151f53da20c61eb5032855e..b89f6d248414bdaded545dc4f5d079d3847ae9b5 100644
--- a/test/taiko/apps.js
+++ b/test/taiko/apps.js
@@ -139,7 +139,7 @@
// Couldn't select "Manage dashboards" from the sidebar menu easily,
// so we just go there
await goto(grafanaUrl + '/dashboards')
- await click(link('Nodes'))
+ await click(link('CoreDNS'))
await('CPU Usage')
// Explore Loki log messages