diff --git a/charts/kubezero-aws-ebs-csi-driver/templates/storage-class.yaml b/charts/kubezero-aws-ebs-csi-driver/templates/storage-class.yaml index f03138e8..094d43a1 100644 --- a/charts/kubezero-aws-ebs-csi-driver/templates/storage-class.yaml +++ b/charts/kubezero-aws-ebs-csi-driver/templates/storage-class.yaml @@ -4,6 +4,22 @@ apiVersion: storage.k8s.io/v1 metadata: name: ebs-sc-gp2-xfs labels: +{{ include "kubezero-lib.labels" . | indent 4 }} +provisioner: ebs.csi.aws.com +volumeBindingMode: WaitForFirstConsumer +parameters: + csi.storage.k8s.io/fstype: xfs + type: gp2 + encrypted: "true" +{{- if index .Values "aws-ebs-csi-driver" "enableVolumeResizing" }} +allowVolumeExpansion: true +{{- end }} +--- +kind: StorageClass +apiVersion: storage.k8s.io/v1 +metadata: + name: ebs-sc-gp3-xfs + labels: {{ include "kubezero-lib.labels" . | indent 4 }} {{- if .Values.StorageClass.default }} annotations: @@ -13,7 +29,7 @@ provisioner: ebs.csi.aws.com volumeBindingMode: WaitForFirstConsumer parameters: csi.storage.k8s.io/fstype: xfs - type: gp2 + type: gp3 encrypted: "true" {{- if index .Values "aws-ebs-csi-driver" "enableVolumeResizing" }} allowVolumeExpansion: true diff --git a/charts/kubezero-metrics/Chart.yaml b/charts/kubezero-metrics/Chart.yaml index 89174c55..f70476fc 100644 --- a/charts/kubezero-metrics/Chart.yaml +++ b/charts/kubezero-metrics/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: kubezero-metrics description: KubeZero Umbrella Chart for prometheus-operator type: application -version: 0.3.1 +version: 0.3.2 home: https://kubezero.com icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png keywords: @@ -16,10 +16,10 @@ dependencies: version: ">= 0.1.3" repository: https://zero-down-time.github.io/kubezero/ - name: kube-prometheus-stack - version: 12.3.0 + version: 12.8.0 repository: https://prometheus-community.github.io/helm-charts - name: prometheus-adapter - version: 2.7.1 + version: 2.10.1 repository: https://prometheus-community.github.io/helm-charts condition: prometheus-adapter.enabled kubeVersion: ">= 1.16.0" diff --git a/charts/kubezero-metrics/values.yaml b/charts/kubezero-metrics/values.yaml index 515ea69c..bf162203 100644 --- a/charts/kubezero-metrics/values.yaml +++ b/charts/kubezero-metrics/values.yaml @@ -87,6 +87,7 @@ kube-prometheus-stack: retention: 8d portName: http-prometheus logFormat: json + # externalUrl: resources: requests: