From 16bc828a0d7d2e2dc8a9bf42a6abef122929e6a2 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Tue, 15 Sep 2020 11:15:55 +0100 Subject: [PATCH 1/3] Introduce resources for at least the argocd controller --- charts/kubezero-argo-cd/Chart.yaml | 2 +- charts/kubezero-argo-cd/README.md | 5 ++++- charts/kubezero-argo-cd/values.yaml | 7 +++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/charts/kubezero-argo-cd/Chart.yaml b/charts/kubezero-argo-cd/Chart.yaml index 11b0e7d..36aac26 100644 --- a/charts/kubezero-argo-cd/Chart.yaml +++ b/charts/kubezero-argo-cd/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 description: KubeZero ArgoCD Helm chart to install ArgoCD itself and the KubeZero ArgoCD Application name: kubezero-argo-cd -version: 0.5.0 +version: 0.5.1 home: https://kubezero.com icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png keywords: diff --git a/charts/kubezero-argo-cd/README.md b/charts/kubezero-argo-cd/README.md index b54cbf1..0c49f57 100644 --- a/charts/kubezero-argo-cd/README.md +++ b/charts/kubezero-argo-cd/README.md @@ -2,7 +2,7 @@ kubezero-argo-cd ================ KubeZero ArgoCD Helm chart to install ArgoCD itself and the KubeZero ArgoCD Application -Current chart version is `0.5.0` +Current chart version is `0.5.1` Source code can be found [here](https://kubezero.com) @@ -25,6 +25,9 @@ Source code can be found [here](https://kubezero.com) | argo-cd.controller.metrics.serviceMonitor.enabled | bool | `true` | | | argo-cd.controller.metrics.serviceMonitor.namespace | string | `"monitoring"` | | | argo-cd.controller.nodeSelector."node-role.kubernetes.io/master" | string | `""` | | +| argo-cd.controller.resources.limits.memory | string | `"512Mi"` | | +| argo-cd.controller.resources.requests.cpu | string | `"100m"` | | +| argo-cd.controller.resources.requests.memory | string | `"192Mi"` | | | argo-cd.controller.tolerations[0].effect | string | `"NoSchedule"` | | | argo-cd.controller.tolerations[0].key | string | `"node-role.kubernetes.io/master"` | | | argo-cd.dex.enabled | bool | `false` | | diff --git a/charts/kubezero-argo-cd/values.yaml b/charts/kubezero-argo-cd/values.yaml index be0f389..d990cc0 100644 --- a/charts/kubezero-argo-cd/values.yaml +++ b/charts/kubezero-argo-cd/values.yaml @@ -49,6 +49,13 @@ argo-cd: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule + resources: + limits: + # cpu: 500m + memory: 512Mi + requests: + cpu: 100m + memory: 192Mi repoServer: metrics: -- 2.40.1 From ddb51294c93744f7e51beb49f19060698681cf1f Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Tue, 15 Sep 2020 11:48:07 +0100 Subject: [PATCH 2/3] Another argocd resource tweak --- charts/kubezero-argo-cd/Chart.yaml | 2 +- charts/kubezero-argo-cd/values.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/kubezero-argo-cd/Chart.yaml b/charts/kubezero-argo-cd/Chart.yaml index 36aac26..72eb752 100644 --- a/charts/kubezero-argo-cd/Chart.yaml +++ b/charts/kubezero-argo-cd/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 description: KubeZero ArgoCD Helm chart to install ArgoCD itself and the KubeZero ArgoCD Application name: kubezero-argo-cd -version: 0.5.1 +version: 0.5.2 home: https://kubezero.com icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png keywords: diff --git a/charts/kubezero-argo-cd/values.yaml b/charts/kubezero-argo-cd/values.yaml index d990cc0..75388a1 100644 --- a/charts/kubezero-argo-cd/values.yaml +++ b/charts/kubezero-argo-cd/values.yaml @@ -52,10 +52,10 @@ argo-cd: resources: limits: # cpu: 500m - memory: 512Mi + memory: 1536Mi requests: cpu: 100m - memory: 192Mi + memory: 256Mi repoServer: metrics: -- 2.40.1 From d3c8c92f9ae5c98738f0e655d0902050cb4db6dc Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Wed, 16 Sep 2020 16:50:48 +0100 Subject: [PATCH 3/3] Set global meshpolicy to prevent upgrade to http2 by default --- charts/kubezero-istio/Chart.yaml | 2 +- charts/kubezero-istio/templates/istio.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/charts/kubezero-istio/Chart.yaml b/charts/kubezero-istio/Chart.yaml index 27ff228..fa81092 100644 --- a/charts/kubezero-istio/Chart.yaml +++ b/charts/kubezero-istio/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: kubezero-istio description: KubeZero Umbrella Chart for Istio type: application -version: 0.3.0 +version: 0.3.1 appVersion: 1.7.1 home: https://kubezero.com icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png diff --git a/charts/kubezero-istio/templates/istio.yaml b/charts/kubezero-istio/templates/istio.yaml index 0e4a554..12281fd 100644 --- a/charts/kubezero-istio/templates/istio.yaml +++ b/charts/kubezero-istio/templates/istio.yaml @@ -90,6 +90,7 @@ spec: meshConfig: accessLogFile: /dev/stdout accessLogEncoding: 'JSON' + h2UpgradePolicy: 'DO_NOT_UPGRADE' values: gateways: istio-ingressgateway: -- 2.40.1