diff --git a/packages/core/installer/values.yaml b/packages/core/installer/values.yaml index c3b3f641..65d539ad 100644 --- a/packages/core/installer/values.yaml +++ b/packages/core/installer/values.yaml @@ -1,2 +1,2 @@ cozystack: - image: ghcr.io/cozystack/cozystack/installer:v0.28.0@sha256:71ae2037ca44d49bbcf8be56c127ee92f2486089a8ea1cdd6508af49705956ac + image: kklinch0/installer:0.27.39@sha256:9f62b963a79fcd5774af28e248c74082a0fe5f7c443e18648101da01d36cf715 diff --git a/packages/extra/etcd/Chart.yaml b/packages/extra/etcd/Chart.yaml index 75f070fc..30da9487 100644 --- a/packages/extra/etcd/Chart.yaml +++ b/packages/extra/etcd/Chart.yaml @@ -3,4 +3,4 @@ name: etcd description: Storage for Kubernetes clusters icon: /logos/etcd.svg type: application -version: 2.6.1 +version: 2.7.0 diff --git a/packages/extra/etcd/templates/etcd-cluster.yaml b/packages/extra/etcd/templates/etcd-cluster.yaml index a31520fa..a44ff0ca 100644 --- a/packages/extra/etcd/templates/etcd-cluster.yaml +++ b/packages/extra/etcd/templates/etcd-cluster.yaml @@ -46,6 +46,9 @@ spec: - name: metrics containerPort: 2381 protocol: TCP + {{- with .Values.resources }} + resources: {{- toYaml . | nindent 10 }} + {{- end }} topologySpreadConstraints: - maxSkew: 1 topologyKey: "kubernetes.io/hostname" diff --git a/packages/extra/etcd/values.yaml b/packages/extra/etcd/values.yaml index 459acc11..7a6a89e5 100644 --- a/packages/extra/etcd/values.yaml +++ b/packages/extra/etcd/values.yaml @@ -7,3 +7,12 @@ size: 4Gi storageClass: "" replicas: 3 + +## @param resources Resources +resources: + limits: + cpu: 1000m + memory: 1Gi + requests: + cpu: 100m + memory: 512Mi diff --git a/packages/extra/monitoring/templates/alerta/alerta-db.yaml b/packages/extra/monitoring/templates/alerta/alerta-db.yaml index 5f6b3293..dbbffb5b 100644 --- a/packages/extra/monitoring/templates/alerta/alerta-db.yaml +++ b/packages/extra/monitoring/templates/alerta/alerta-db.yaml @@ -17,6 +17,13 @@ spec: {{- with .Values.alerta.storageClassName }} storageClass: {{ . }} {{- end }} + resources: + limits: + cpu: 1024m + memory: 2048Mi + requests: + cpu: 100m + memory: 512Mi monitoring: enablePodMonitor: true diff --git a/packages/extra/monitoring/templates/alerta/alerta.yaml b/packages/extra/monitoring/templates/alerta/alerta.yaml index 9513afdc..35d580c1 100644 --- a/packages/extra/monitoring/templates/alerta/alerta.yaml +++ b/packages/extra/monitoring/templates/alerta/alerta.yaml @@ -77,6 +77,7 @@ spec: - name: alerta image: "alerta/alerta-web:9.0.4" imagePullPolicy: IfNotPresent + resources: {{- toYaml .Values.alerta.resources | nindent 12 }} env: - name: ADMIN_USERS valueFrom: diff --git a/packages/extra/monitoring/templates/grafana/db.yaml b/packages/extra/monitoring/templates/grafana/db.yaml index f8a7a9fb..6f8a9281 100644 --- a/packages/extra/monitoring/templates/grafana/db.yaml +++ b/packages/extra/monitoring/templates/grafana/db.yaml @@ -15,7 +15,13 @@ spec: {{- end }} monitoring: enablePodMonitor: true - + resources: + limits: + cpu: 1024m + memory: 2048Mi + requests: + cpu: 100m + memory: 512Mi inheritedMetadata: labels: policy.cozystack.io/allow-to-apiserver: "true" diff --git a/packages/extra/monitoring/templates/grafana/grafana.yaml b/packages/extra/monitoring/templates/grafana/grafana.yaml index a0174255..2397fd10 100644 --- a/packages/extra/monitoring/templates/grafana/grafana.yaml +++ b/packages/extra/monitoring/templates/grafana/grafana.yaml @@ -38,6 +38,7 @@ spec: spec: containers: - name: grafana + resources: {{- toYaml .Values.grafana.resources | nindent 16 }} image: "{{ $.Files.Get "images/grafana.tag" | trim }}" securityContext: allowPrivilegeEscalation: false diff --git a/packages/extra/monitoring/values.yaml b/packages/extra/monitoring/values.yaml index 5af50d67..1d9a174b 100644 --- a/packages/extra/monitoring/values.yaml +++ b/packages/extra/monitoring/values.yaml @@ -61,7 +61,13 @@ logsStorages: alerta: storage: 10Gi storageClassName: "" - + resources: + limits: + cpu: 1024m + memory: 1Gi + requests: + cpu: 100m + memory: 256Mi alerts: ## @param alerta.alerts.telegram.token telegram token for your bot ## @param alerta.alerts.telegram.chatID specify multiple ID's separated by comma. Get yours in https://t.me/chatid_echo_bot @@ -82,3 +88,10 @@ alerta: grafana: db: size: 10Gi + resources: + limits: + cpu: 1024m + memory: 1Gi + requests: + cpu: 100m + memory: 256Mi diff --git a/packages/extra/seaweedfs/Chart.yaml b/packages/extra/seaweedfs/Chart.yaml index 185ebc9c..39114925 100644 --- a/packages/extra/seaweedfs/Chart.yaml +++ b/packages/extra/seaweedfs/Chart.yaml @@ -16,7 +16,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.3.0 +version: 0.4.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/packages/extra/seaweedfs/templates/seaweedfs.yaml b/packages/extra/seaweedfs/templates/seaweedfs.yaml index 5ab911b5..b9846aa1 100644 --- a/packages/extra/seaweedfs/templates/seaweedfs.yaml +++ b/packages/extra/seaweedfs/templates/seaweedfs.yaml @@ -20,16 +20,27 @@ spec: values: global: serviceAccountName: "{{ .Release.Namespace }}-seaweedfs" - seaweedfs: - + master: + resources: + requests: + cpu: "100m" + memory: "128Mi" + limits: + cpu: "500m" + memory: "512Mi" volume: replicas: {{ .Values.replicas }} - + resources: + requests: + cpu: "100m" + memory: "128Mi" + limits: + cpu: "500m" + memory: "512Mi" # TODO: workaround for non-working online resize podAnnotations: volume-size: "{{ .Values.size }}" - dataDirs: - name: data1 type: "persistentVolumeClaim" @@ -38,11 +49,16 @@ spec: storageClass: {{ . }} {{- end }} maxVolumes: 0 - filer: s3: domainName: {{ .Values.host | default (printf "s3.%s" $host) }} - + resources: + requests: + cpu: "100m" + memory: "128Mi" + limits: + cpu: "500m" + memory: "512Mi" s3: ingress: className: {{ $ingress }} @@ -56,10 +72,16 @@ spec: - hosts: - {{ .Values.host | default (printf "s3.%s" $host) }} secretName: {{ .Release.Name }}-s3-ingress-tls - cosi: driverName: "{{ .Release.Namespace }}.seaweedfs.objectstorage.k8s.io" bucketClassName: "{{ .Release.Namespace }}" + resources: + requests: + cpu: "100m" + memory: "128Mi" + limits: + cpu: "500m" + memory: "512Mi" --- apiVersion: cozystack.io/v1alpha1 kind: WorkloadMonitor diff --git a/packages/extra/seaweedfs/templates/vpa.yaml b/packages/extra/seaweedfs/templates/vpa.yaml new file mode 100644 index 00000000..c3c2d3f8 --- /dev/null +++ b/packages/extra/seaweedfs/templates/vpa.yaml @@ -0,0 +1,66 @@ +apiVersion: autoscaling.k8s.io/v1 +kind: VerticalPodAutoscaler +metadata: + name: {{ .Release.Name }}-filer +spec: + targetRef: + apiVersion: apps/v1 + kind: StatefulSet + name: {{ .Release.Name }}-filer + updatePolicy: + updateMode: Auto + resourcePolicy: + containerPolicies: + - containerName: seaweedfs + minAllowed: + cpu: 250m + memory: 256Mi + maxAllowed: + cpu: 1024m + memory: 2048Mi + +--- + +apiVersion: autoscaling.k8s.io/v1 +kind: VerticalPodAutoscaler +metadata: + name: {{ .Release.Name }}-master +spec: + targetRef: + apiVersion: apps/v1 + kind: StatefulSet + name: {{ .Release.Name }}-master + updatePolicy: + updateMode: Auto + resourcePolicy: + containerPolicies: + - containerName: seaweedfs + minAllowed: + cpu: 250m + memory: 256Mi + maxAllowed: + cpu: 1024m + memory: 2048Mi + +--- + +apiVersion: autoscaling.k8s.io/v1 +kind: VerticalPodAutoscaler +metadata: + name: {{ .Release.Name }}-volume +spec: + targetRef: + apiVersion: apps/v1 + kind: StatefulSet + name: {{ .Release.Name }}-volume + updatePolicy: + updateMode: Auto + resourcePolicy: + containerPolicies: + - containerName: seaweedfs + minAllowed: + cpu: 250m + memory: 256Mi + maxAllowed: + cpu: 1024m + memory: 2048Mi diff --git a/packages/extra/versions_map b/packages/extra/versions_map index 92f6a42c..f190ebcb 100644 --- a/packages/extra/versions_map +++ b/packages/extra/versions_map @@ -8,7 +8,8 @@ etcd 2.3.0 b908400d etcd 2.4.0 cb7b8158 etcd 2.5.0 861e6c46 etcd 2.6.0 a7425b0 -etcd 2.6.1 HEAD +etcd 2.6.1 063439ac +etcd 2.7.0 HEAD info 1.0.0 HEAD ingress 1.0.0 f642698 ingress 1.1.0 838bee5d @@ -36,4 +37,5 @@ monitoring 1.9.1 HEAD seaweedfs 0.1.0 5ca8823 seaweedfs 0.2.0 9e33dc0 seaweedfs 0.2.1 249bf35 -seaweedfs 0.3.0 HEAD +seaweedfs 0.3.0 0e728870 +seaweedfs 0.4.0 HEAD diff --git a/packages/system/ingress-nginx/values.yaml b/packages/system/ingress-nginx/values.yaml index 8ed5b271..607838b5 100644 --- a/packages/system/ingress-nginx/values.yaml +++ b/packages/system/ingress-nginx/values.yaml @@ -20,6 +20,13 @@ ingress-nginx: args: - --server.telemetry-address=0.0.0.0:9090 - --server.exporter-address=0.0.0.0:9091 + resources: + limits: + cpu: 100m + memory: 90Mi + requests: + cpu: 100m + memory: 90Mi service: #type: NodePort # ClusterIP externalTrafficPolicy: "Local" @@ -40,8 +47,21 @@ ingress-nginx: upstream-keepalive-timeout: "60" upstream-keepalive-connections: "320" ssl-session-tickets: "true" - + resources: + limits: + cpu: 1024m + memory: 2048Mi + requests: + cpu: 100m + memory: 90Mi defaultBackend: ## enabled: true + resources: + limits: + cpu: 10m + memory: 20Mi + requests: + cpu: 10m + memory: 20Mi diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/cosi-deployment.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/cosi-deployment.yaml index 15e5fa6d..5c5c7e30 100644 --- a/packages/system/seaweedfs/charts/seaweedfs/templates/cosi-deployment.yaml +++ b/packages/system/seaweedfs/charts/seaweedfs/templates/cosi-deployment.yaml @@ -140,6 +140,10 @@ spec: mountPath: /usr/local/share/ca-certificates/client/ {{- end }} {{ tpl .Values.cosi.extraVolumeMounts . | nindent 12 | trim }} + {{- with .Values.cosi.resources }} + resources: + {{- toYaml . | nindent 12 }} + {{- end }} - name: seaweedfs-cosi-sidecar image: "{{ .Values.cosi.sidecar.image }}" imagePullPolicy: {{ default "IfNotPresent" .Values.global.imagePullPolicy }} diff --git a/packages/system/seaweedfs/templates/database.yaml b/packages/system/seaweedfs/templates/database.yaml index e952ff97..892a3ac3 100644 --- a/packages/system/seaweedfs/templates/database.yaml +++ b/packages/system/seaweedfs/templates/database.yaml @@ -10,7 +10,13 @@ spec: monitoring: enablePodMonitor: true - + resources: + limits: + cpu: 1024m + memory: 2048Mi + requests: + cpu: 100m + memory: 512Mi inheritedMetadata: labels: policy.cozystack.io/allow-to-apiserver: "true" diff --git a/packages/system/seaweedfs/values.yaml b/packages/system/seaweedfs/values.yaml index 056e9bb7..f7e3c5d9 100644 --- a/packages/system/seaweedfs/values.yaml +++ b/packages/system/seaweedfs/values.yaml @@ -6,7 +6,6 @@ global: WEED_CLUSTER_SW_FILER: "seaweedfs-filer-client:8888" seaweedfs: - master: replicas: 3 volumeSizeLimitMB: 100