diff --git a/flux2/apps/monitoring/kube-prometheus-stack-values-configmap.yaml b/flux2/apps/monitoring/kube-prometheus-stack-values-configmap.yaml index 76902ec391ab4ede80c4cd89eb98e16699008b76..a1095fc15dff900c8ffc357968ad1628c3a95a18 100644 --- a/flux2/apps/monitoring/kube-prometheus-stack-values-configmap.yaml +++ b/flux2/apps/monitoring/kube-prometheus-stack-values-configmap.yaml @@ -115,7 +115,7 @@ data: cpu: 1 memory: 1.5Gi requests: - cpu: 500m + cpu: 300m memory: 1Gi ingress: @@ -241,7 +241,7 @@ data: cpu: 400m memory: 256Mi requests: - cpu: 200m + cpu: 100m memory: 128Mi # priorityClassName: high-priority @@ -251,7 +251,7 @@ data: cpu: 800m memory: 64Mi requests: - cpu: 200m + cpu: 100m memory: 32Mi # priorityClassName: high-priority diff --git a/flux2/apps/monitoring/loki-values-configmap.yaml b/flux2/apps/monitoring/loki-values-configmap.yaml index d8de4b0e38817842b8024c14f7b62e4d77518283..2708d647cb180d26b472e38c02dc0197bfd69008 100644 --- a/flux2/apps/monitoring/loki-values-configmap.yaml +++ b/flux2/apps/monitoring/loki-values-configmap.yaml @@ -11,7 +11,7 @@ data: cpu: 800m memory: 768Mi requests: - cpu: 400m + cpu: 300m memory: 512Mi persistence: enabled: true diff --git a/flux2/apps/nextcloud/nextcloud-values-configmap.yaml b/flux2/apps/nextcloud/nextcloud-values-configmap.yaml index d69e271292501e836632f6db7867ce13bcdc11c4..0b31c99a037173e54c426a6b5a8422d07ce30f5b 100644 --- a/flux2/apps/nextcloud/nextcloud-values-configmap.yaml +++ b/flux2/apps/nextcloud/nextcloud-values-configmap.yaml @@ -21,6 +21,14 @@ data: password: "${outgoing_mail_smtp_password}" authtype: "${outgoing_mail_smtp_authtype}" + # Cronjob by default requests the same as nextcloud app, but that's not + # necessary + cronjob: + resources: + requests: + cpu: 100m + memory: 128Mi + ingress: enabled: true annotations: diff --git a/flux2/apps/wekan/wekan-values-configmap.yaml b/flux2/apps/wekan/wekan-values-configmap.yaml index 97fc8a8c5cd095eb87447e506680737e857b5da3..b0d92a8a48c5bfdc53c0e5087a63ee7d45e64143 100644 --- a/flux2/apps/wekan/wekan-values-configmap.yaml +++ b/flux2/apps/wekan/wekan-values-configmap.yaml @@ -111,5 +111,5 @@ data: cpu: 1 memory: 1024Mi requests: - cpu: 512m + cpu: 400m memory: 768Mi diff --git a/install/overrides/oas-nextcloud-override.yaml b/install/overrides/oas-nextcloud-override.yaml index f78aefe495fbc86542ddb5a5fe35ff5d9c4e0516..72c1313a5fa63a8cb3848df396c55efdd90204a9 100644 --- a/install/overrides/oas-nextcloud-override.yaml +++ b/install/overrides/oas-nextcloud-override.yaml @@ -12,6 +12,7 @@ data: onlyoffice: unauthorizedStorage: true httpsHstsEnabled: false - cronjob: - # Set curl to accept insecure connections when acme staging is used - curlInsecure: true + nextcloud: + cronjob: + # Set curl to accept insecure connections when acme staging is used + curlInsecure: true