diff --git a/cmd/tke-installer/app/installer/images/images.go b/cmd/tke-installer/app/installer/images/images.go index 7caba2f7df..ddb36c2fa0 100644 --- a/cmd/tke-installer/app/installer/images/images.go +++ b/cmd/tke-installer/app/installer/images/images.go @@ -93,7 +93,7 @@ var Version = version.Get().GitVersion var exComponents = ExComponents{ Registry: containerregistry.Image{Name: "registry", Tag: "2.7.1"}, Busybox: containerregistry.Image{Name: "busybox", Tag: "1.31.1"}, - InfluxDB: containerregistry.Image{Name: "influxdb", Tag: "1.7.9"}, + InfluxDB: containerregistry.Image{Name: "influxdb", Tag: "1.8.10"}, Thanos: containerregistry.Image{Name: "thanos", Tag: "v0.15.0"}, Kubectl: containerregistry.Image{Name: "kubectl", Tag: "1.22.7"}, diff --git a/cmd/tke-installer/app/installer/manifests/charts/influxdb/Chart.yaml b/cmd/tke-installer/app/installer/manifests/charts/influxdb/Chart.yaml index f78ff7aac0..d2f097bac8 100644 --- a/cmd/tke-installer/app/installer/manifests/charts/influxdb/Chart.yaml +++ b/cmd/tke-installer/app/installer/manifests/charts/influxdb/Chart.yaml @@ -15,10 +15,10 @@ 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.1.0 +version: 0.1.1 # 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 # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.16.0" +appVersion: "1.8.10" diff --git a/cmd/tke-installer/app/installer/manifests/charts/influxdb/templates/influxdb.yaml b/cmd/tke-installer/app/installer/manifests/charts/influxdb/templates/influxdb.yaml index ecb3b948af..47955fa6d1 100644 --- a/cmd/tke-installer/app/installer/manifests/charts/influxdb/templates/influxdb.yaml +++ b/cmd/tke-installer/app/installer/manifests/charts/influxdb/templates/influxdb.yaml @@ -18,7 +18,14 @@ spec: app: influxdb spec: containers: - - name: influxdb + - env: + - name: GODEGUB + value: madvdontneed=1 + {{- if .Values.resources }} + - name: GOMAXPROCS + value: {{ .Values.resources.limits.cpu| quote }} + {{- end }} + name: influxdb image: {{ .Values.image }} livenessProbe: tcpSocket: @@ -30,6 +37,9 @@ spec: port: 8086 initialDelaySeconds: 1 periodSeconds: 10 + {{- if .Values.resources }} + resources: {{ toYaml .Values.resources | nindent 10 }} + {{- end }} volumeMounts: - name: data mountPath: /var/lib/influxdb diff --git a/cmd/tke-installer/app/installer/manifests/charts/influxdb/values.yaml b/cmd/tke-installer/app/installer/manifests/charts/influxdb/values.yaml index 75c7bf46b4..0aeee39a4e 100644 --- a/cmd/tke-installer/app/installer/manifests/charts/influxdb/values.yaml +++ b/cmd/tke-installer/app/installer/manifests/charts/influxdb/values.yaml @@ -10,3 +10,11 @@ cephFSStorageClassName: nfs: nfsPVCName: nfsStorageClassName: + +resources: + limits: + cpu: 4 + memory: 4Gi + requests: + cpu: 50m + memory: 128Mi diff --git a/pkg/monitor/controller/prometheus/controller.go b/pkg/monitor/controller/prometheus/controller.go index 8c1fe99597..d04e780e43 100755 --- a/pkg/monitor/controller/prometheus/controller.go +++ b/pkg/monitor/controller/prometheus/controller.go @@ -1281,9 +1281,9 @@ func createPrometheusCRD(components images.Components, prometheus *v1.Prometheus } rw.QueueConfig = &monitoringv1.QueueConfig{ Capacity: 10000, - MinShards: 1000, - MaxShards: 1000, - MaxSamplesPerSend: 1000, + MinShards: 1, + MaxShards: 24, + MaxSamplesPerSend: 500, BatchSendDeadline: "30s", } }