From a28d33a205c3e245d497e46360d47d1d2a90fa7f Mon Sep 17 00:00:00 2001 From: yu-croco Date: Sat, 22 Jun 2024 20:14:18 +0900 Subject: [PATCH] chore(argo-events): refactor Signed-off-by: yu-croco --- charts/argo-events/README.md | 46 +--------------- .../argo-events-controller/config.yaml | 47 +++++++++++++++- charts/argo-events/values.yaml | 54 +++---------------- 3 files changed, 53 insertions(+), 94 deletions(-) diff --git a/charts/argo-events/README.md b/charts/argo-events/README.md index 5d2c036b..d04f763b 100644 --- a/charts/argo-events/README.md +++ b/charts/argo-events/README.md @@ -65,51 +65,7 @@ done | configs.jetstream.streamConfig.maxBytes | string | `"1GB"` | | | configs.jetstream.streamConfig.maxMsgs | int | `1000000` | Maximum number of messages before expiring oldest message | | configs.jetstream.streamConfig.replicas | int | `3` | Number of replicas, defaults to 3 and requires minimal 3 | -| configs.jetstream.versions[0].configReloaderImage | string | `"natsio/nats-server-config-reloader:0.14.0"` | | -| configs.jetstream.versions[0].metricsExporterImage | string | `"natsio/prometheus-nats-exporter:0.14.0"` | | -| configs.jetstream.versions[0].natsImage | string | `"nats:2.10.10"` | | -| configs.jetstream.versions[0].startCommand | string | `"/nats-server"` | | -| configs.jetstream.versions[0].version | string | `"latest"` | | -| configs.jetstream.versions[1].configReloaderImage | string | `"natsio/nats-server-config-reloader:0.7.0"` | | -| configs.jetstream.versions[1].metricsExporterImage | string | `"natsio/prometheus-nats-exporter:0.9.1"` | | -| configs.jetstream.versions[1].natsImage | string | `"nats:2.8.1"` | | -| configs.jetstream.versions[1].startCommand | string | `"/nats-server"` | | -| configs.jetstream.versions[1].version | string | `"2.8.1"` | | -| configs.jetstream.versions[2].configReloaderImage | string | `"natsio/nats-server-config-reloader:0.7.0"` | | -| configs.jetstream.versions[2].metricsExporterImage | string | `"natsio/prometheus-nats-exporter:0.9.1"` | | -| configs.jetstream.versions[2].natsImage | string | `"nats:2.8.1-alpine"` | | -| configs.jetstream.versions[2].startCommand | string | `"nats-server"` | | -| configs.jetstream.versions[2].version | string | `"2.8.1-alpine"` | | -| configs.jetstream.versions[3].configReloaderImage | string | `"natsio/nats-server-config-reloader:0.7.0"` | | -| configs.jetstream.versions[3].metricsExporterImage | string | `"natsio/prometheus-nats-exporter:0.9.1"` | | -| configs.jetstream.versions[3].natsImage | string | `"nats:2.8.2"` | | -| configs.jetstream.versions[3].startCommand | string | `"/nats-server"` | | -| configs.jetstream.versions[3].version | string | `"2.8.2"` | | -| configs.jetstream.versions[4].configReloaderImage | string | `"natsio/nats-server-config-reloader:0.7.0"` | | -| configs.jetstream.versions[4].metricsExporterImage | string | `"natsio/prometheus-nats-exporter:0.9.1"` | | -| configs.jetstream.versions[4].natsImage | string | `"nats:2.8.2-alpine"` | | -| configs.jetstream.versions[4].startCommand | string | `"nats-server"` | | -| configs.jetstream.versions[4].version | string | `"2.8.2-alpine"` | | -| configs.jetstream.versions[5].configReloaderImage | string | `"natsio/nats-server-config-reloader:0.7.0"` | | -| configs.jetstream.versions[5].metricsExporterImage | string | `"natsio/prometheus-nats-exporter:0.9.1"` | | -| configs.jetstream.versions[5].natsImage | string | `"nats:2.9.1"` | | -| configs.jetstream.versions[5].startCommand | string | `"/nats-server"` | | -| configs.jetstream.versions[5].version | string | `"2.9.1"` | | -| configs.jetstream.versions[6].configReloaderImage | string | `"natsio/nats-server-config-reloader:0.7.0"` | | -| configs.jetstream.versions[6].metricsExporterImage | string | `"natsio/prometheus-nats-exporter:0.9.1"` | | -| configs.jetstream.versions[6].natsImage | string | `"nats:2.9.12"` | | -| configs.jetstream.versions[6].startCommand | string | `"/nats-server"` | | -| configs.jetstream.versions[6].version | string | `"2.9.12"` | | -| configs.jetstream.versions[7].configReloaderImage | string | `"natsio/nats-server-config-reloader:0.7.0"` | | -| configs.jetstream.versions[7].metricsExporterImage | string | `"natsio/prometheus-nats-exporter:0.9.1"` | | -| configs.jetstream.versions[7].natsImage | string | `"nats:2.9.16"` | | -| configs.jetstream.versions[7].startCommand | string | `"/nats-server"` | | -| configs.jetstream.versions[7].version | string | `"2.9.16"` | | -| configs.jetstream.versions[8].configReloaderImage | string | `"natsio/nats-server-config-reloader:0.14.0"` | | -| configs.jetstream.versions[8].metricsExporterImage | string | `"natsio/prometheus-nats-exporter:0.14.0"` | | -| configs.jetstream.versions[8].natsImage | string | `"nats:2.10.10"` | | -| configs.jetstream.versions[8].startCommand | string | `"/nats-server"` | | -| configs.jetstream.versions[8].version | string | `"2.10.10"` | | +| configs.jetstream.versions | list | `[]` | Additional Supported versions of JetStream eventbus | | configs.nats.versions | list | See [values.yaml] | Supported versions of NATS event bus | | crds.annotations | object | `{}` | Annotations to be added to all CRDs | | crds.install | bool | `true` | Install and upgrade CRDs | diff --git a/charts/argo-events/templates/argo-events-controller/config.yaml b/charts/argo-events/templates/argo-events-controller/config.yaml index 119c10f5..1c5b817c 100644 --- a/charts/argo-events/templates/argo-events-controller/config.yaml +++ b/charts/argo-events/templates/argo-events-controller/config.yaml @@ -17,7 +17,6 @@ data: metricsExporterImage: {{ .metricsExporterImage }} {{- end }} {{- end }} - {{- if .Values.configs.jetstream.versions }} jetstream: # Default JetStream settings, could be overridden by EventBus JetStream specs settings: | @@ -33,6 +32,51 @@ data: replicas: {{ .Values.configs.jetstream.streamConfig.replicas }} duplicates: {{ .Values.configs.jetstream.streamConfig.duplicates }} versions: + - version: latest + natsImage: nats:2.10.10 + metricsExporterImage: natsio/prometheus-nats-exporter:0.14.0 + configReloaderImage: natsio/nats-server-config-reloader:0.14.0 + startCommand: /nats-server + - version: 2.8.1 + natsImage: nats:2.8.1 + metricsExporterImage: natsio/prometheus-nats-exporter:0.9.1 + configReloaderImage: natsio/nats-server-config-reloader:0.7.0 + startCommand: /nats-server + - version: 2.8.1-alpine + natsImage: nats:2.8.1-alpine + metricsExporterImage: natsio/prometheus-nats-exporter:0.9.1 + configReloaderImage: natsio/nats-server-config-reloader:0.7.0 + startCommand: nats-server + - version: 2.8.2 + natsImage: nats:2.8.2 + metricsExporterImage: natsio/prometheus-nats-exporter:0.9.1 + configReloaderImage: natsio/nats-server-config-reloader:0.7.0 + startCommand: /nats-server + - version: 2.8.2-alpine + natsImage: nats:2.8.2-alpine + metricsExporterImage: natsio/prometheus-nats-exporter:0.9.1 + configReloaderImage: natsio/nats-server-config-reloader:0.7.0 + startCommand: nats-server + - version: 2.9.1 + natsImage: nats:2.9.1 + metricsExporterImage: natsio/prometheus-nats-exporter:0.9.1 + configReloaderImage: natsio/nats-server-config-reloader:0.7.0 + startCommand: /nats-server + - version: 2.9.12 + natsImage: nats:2.9.12 + metricsExporterImage: natsio/prometheus-nats-exporter:0.9.1 + configReloaderImage: natsio/nats-server-config-reloader:0.7.0 + startCommand: /nats-server + - version: 2.9.16 + natsImage: nats:2.9.16 + metricsExporterImage: natsio/prometheus-nats-exporter:0.9.1 + configReloaderImage: natsio/nats-server-config-reloader:0.7.0 + startCommand: /nats-server + - version: 2.10.10 + natsImage: nats:2.10.10 + metricsExporterImage: natsio/prometheus-nats-exporter:0.14.0 + configReloaderImage: natsio/nats-server-config-reloader:0.14.0 + startCommand: /nats-server {{- range .Values.configs.jetstream.versions }} - version: {{ .version }} natsImage: {{ .natsImage }} @@ -40,4 +84,3 @@ data: configReloaderImage: {{ .configReloaderImage }} startCommand: {{ .startCommand }} {{- end }} - {{- end }} diff --git a/charts/argo-events/values.yaml b/charts/argo-events/values.yaml index 9a5af102..693a34a3 100644 --- a/charts/argo-events/values.yaml +++ b/charts/argo-events/values.yaml @@ -94,53 +94,13 @@ configs: replicas: 3 # -- Not documented at the moment duplicates: 300s - # Supported versions of JetStream eventbus - versions: - - version: latest - natsImage: nats:2.10.10 - metricsExporterImage: natsio/prometheus-nats-exporter:0.14.0 - configReloaderImage: natsio/nats-server-config-reloader:0.14.0 - startCommand: /nats-server - - version: 2.8.1 - natsImage: nats:2.8.1 - metricsExporterImage: natsio/prometheus-nats-exporter:0.9.1 - configReloaderImage: natsio/nats-server-config-reloader:0.7.0 - startCommand: /nats-server - - version: 2.8.1-alpine - natsImage: nats:2.8.1-alpine - metricsExporterImage: natsio/prometheus-nats-exporter:0.9.1 - configReloaderImage: natsio/nats-server-config-reloader:0.7.0 - startCommand: nats-server - - version: 2.8.2 - natsImage: nats:2.8.2 - metricsExporterImage: natsio/prometheus-nats-exporter:0.9.1 - configReloaderImage: natsio/nats-server-config-reloader:0.7.0 - startCommand: /nats-server - - version: 2.8.2-alpine - natsImage: nats:2.8.2-alpine - metricsExporterImage: natsio/prometheus-nats-exporter:0.9.1 - configReloaderImage: natsio/nats-server-config-reloader:0.7.0 - startCommand: nats-server - - version: 2.9.1 - natsImage: nats:2.9.1 - metricsExporterImage: natsio/prometheus-nats-exporter:0.9.1 - configReloaderImage: natsio/nats-server-config-reloader:0.7.0 - startCommand: /nats-server - - version: 2.9.12 - natsImage: nats:2.9.12 - metricsExporterImage: natsio/prometheus-nats-exporter:0.9.1 - configReloaderImage: natsio/nats-server-config-reloader:0.7.0 - startCommand: /nats-server - - version: 2.9.16 - natsImage: nats:2.9.16 - metricsExporterImage: natsio/prometheus-nats-exporter:0.9.1 - configReloaderImage: natsio/nats-server-config-reloader:0.7.0 - startCommand: /nats-server - - version: 2.10.10 - natsImage: nats:2.10.10 - metricsExporterImage: natsio/prometheus-nats-exporter:0.14.0 - configReloaderImage: natsio/nats-server-config-reloader:0.14.0 - startCommand: /nats-server + # -- Additional Supported versions of JetStream eventbus + versions: [] + # - version: latest + # natsImage: nats:2.10.10 + # metricsExporterImage: natsio/prometheus-nats-exporter:0.14.0 + # configReloaderImage: natsio/nats-server-config-reloader:0.14.0 + # startCommand: /nats-server # -- Array of extra K8s manifests to deploy ## Note: Supports use of custom Helm templates