diff --git a/charts/kubezero-mq/README.md b/charts/kubezero-mq/README.md index b865581a..c00c6a47 100644 --- a/charts/kubezero-mq/README.md +++ b/charts/kubezero-mq/README.md @@ -1,6 +1,6 @@ # kubezero-mq -![Version: 0.3.11](https://img.shields.io/badge/Version-0.3.11-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) +![Version: 0.3.12](https://img.shields.io/badge/Version-0.3.12-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) KubeZero umbrella chart for MQ systems like NATS, RabbitMQ @@ -20,7 +20,7 @@ Kubernetes: `>= 1.26.0` |------------|------|---------| | https://cdn.zero-downtime.net/charts/ | kubezero-lib | 0.2.1 | | https://charts.bitnami.com/bitnami | rabbitmq | 14.7.0 | -| https://nats-io.github.io/k8s/helm/charts/ | nats | 1.3.3 | +| https://nats-io.github.io/k8s/helm/charts/ | nats | 1.3.7 | ## Values @@ -32,6 +32,8 @@ Kubernetes: `>= 1.26.0` | nats.istio.gateway | string | `"istio-ingress/private-ingressgateway"` | | | nats.mqtt.enabled | bool | `false` | | | nats.natsBox.enabled | bool | `false` | | +| nats.podTemplate.topologySpreadConstraints."kubernetes.io/hostname".maxSkew | int | `1` | | +| nats.podTemplate.topologySpreadConstraints."kubernetes.io/hostname".whenUnsatisfiable | string | `"DoNotSchedule"` | | | nats.promExporter.enabled | bool | `false` | | | nats.promExporter.podMonitor.enabled | bool | `false` | | | rabbitmq.auth.existingErlangSecret | string | `"rabbitmq"` | | diff --git a/charts/kubezero-mq/dashboards-nats.yaml b/charts/kubezero-mq/dashboards-nats.yaml index a02ec1f9..50399128 100644 --- a/charts/kubezero-mq/dashboards-nats.yaml +++ b/charts/kubezero-mq/dashboards-nats.yaml @@ -1,7 +1,7 @@ configmap: grafana-dashboards-nats -condition: '.Values.nats.exporter.serviceMonitor.enabled' +condition: '.Values.nats.promExporter.podMonitor.enabled' gzip: true -# folder: +# folder: dashboards: - name: nats url: https://grafana.com/api/dashboards/13707/revisions/1/download diff --git a/charts/kubezero/templates/network.yaml b/charts/kubezero/templates/network.yaml index a18418ea..92d38bc6 100644 --- a/charts/kubezero/templates/network.yaml +++ b/charts/kubezero/templates/network.yaml @@ -1,13 +1,4 @@ {{- define "network-values" }} -multus: - enabled: false - clusterNetwork: "cilium" - -# {{- if eq .Values.global.platform "aws" }} -# image: -# pullPolicy: Never -# {{- end }} - cilium: k8sServiceHost: {{ .Values.global.apiServerUrl }} @@ -20,7 +11,7 @@ cilium: cluster: name: {{ .Values.global.clusterName }} - {{- with .Values.network.cilium.cluster.id }} + {{- with ((.Values.network.cilium).cluster).id }} ipam: operator: clusterPoolIPv4PodCIDRList: diff --git a/charts/kubezero/values.yaml b/charts/kubezero/values.yaml index 92e6f383..a2287317 100644 --- a/charts/kubezero/values.yaml +++ b/charts/kubezero/values.yaml @@ -35,7 +35,7 @@ network: retain: true targetRevision: 0.5.9 cilium: - cluster: {} + enabled: true cert-manager: enabled: false