From a8333d8fec9df6741ad09d0a9e80caf2622b7e39 Mon Sep 17 00:00:00 2001 From: Yulin Li Date: Mon, 19 Feb 2024 14:48:29 +0800 Subject: [PATCH] fix: do not overwrite the entrypoint of nats-server-config-reloader (#3004) Signed-off-by: Yulin Li Co-authored-by: Yulin Li --- Makefile | 2 +- controllers/eventbus/installer/jetstream.go | 2 +- .../base/controller-manager/controller-config.yaml | 11 ++++++++--- manifests/install.yaml | 11 ++++++++--- manifests/namespace-install.yaml | 11 ++++++++--- 5 files changed, 26 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 21e62f9a35..af5fcd023c 100644 --- a/Makefile +++ b/Makefile @@ -151,7 +151,7 @@ docs/assets/diagram.png: go-diagrams/diagram.dot .PHONY: start start: image kubectl apply -f test/manifests/argo-events-ns.yaml - kubectl kustomize test/manifests | sed 's@quay.io/argoproj/@$(IMAGE_NAMESPACE)/@' | sed 's/:$(BASE_VERSION)/:$(VERSION)/' | kubectl -n argo-events apply -l app.kubernetes.io/part-of=argo-events --prune=false --force -f - + kubectl kustomize test/manifests | sed 's@quay.io/argoproj/@$(IMAGE_NAMESPACE)/@' | sed 's/argo-events:$(BASE_VERSION)/argo-events:$(VERSION)/' | kubectl -n argo-events apply -l app.kubernetes.io/part-of=argo-events --prune=false --force -f - kubectl -n argo-events wait --for=condition=Ready --timeout 60s pod --all $(GOPATH)/bin/golangci-lint: diff --git a/controllers/eventbus/installer/jetstream.go b/controllers/eventbus/installer/jetstream.go index 034c9c0d62..5df15d528e 100644 --- a/controllers/eventbus/installer/jetstream.go +++ b/controllers/eventbus/installer/jetstream.go @@ -401,7 +401,7 @@ func (r *jetStreamInstaller) buildStatefulSetSpec(jsVersion *controllers.JetStre Image: jsVersion.ConfigReloaderImage, ImagePullPolicy: reloaderContainerPullPolicy, SecurityContext: reloaderContainerSecurityContext, - Command: []string{"nats-server-config-reloader", "-pid", "/var/run/nats/nats.pid", "-config", "/etc/nats-config/nats-js.conf"}, + Args: []string{"-pid", "/var/run/nats/nats.pid", "-config", "/etc/nats-config/nats-js.conf"}, VolumeMounts: []corev1.VolumeMount{ {Name: "config-volume", MountPath: "/etc/nats-config"}, {Name: "pid", MountPath: "/var/run/nats"}, diff --git a/manifests/base/controller-manager/controller-config.yaml b/manifests/base/controller-manager/controller-config.yaml index 0074375142..119648be15 100644 --- a/manifests/base/controller-manager/controller-config.yaml +++ b/manifests/base/controller-manager/controller-config.yaml @@ -28,9 +28,9 @@ data: duplicates: 300s versions: - version: latest - natsImage: nats:2.9.16 - metricsExporterImage: natsio/prometheus-nats-exporter:0.9.1 - configReloaderImage: natsio/nats-server-config-reloader:0.7.0 + 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 @@ -67,3 +67,8 @@ data: 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 diff --git a/manifests/install.yaml b/manifests/install.yaml index 23c6050fa1..e190eeef79 100644 --- a/manifests/install.yaml +++ b/manifests/install.yaml @@ -332,9 +332,9 @@ data: duplicates: 300s versions: - version: latest - natsImage: nats:2.9.16 - metricsExporterImage: natsio/prometheus-nats-exporter:0.9.1 - configReloaderImage: natsio/nats-server-config-reloader:0.7.0 + 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 @@ -371,6 +371,11 @@ data: 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 kind: ConfigMap metadata: name: argo-events-controller-config diff --git a/manifests/namespace-install.yaml b/manifests/namespace-install.yaml index f0045fd9b5..b1bacbdfe9 100644 --- a/manifests/namespace-install.yaml +++ b/manifests/namespace-install.yaml @@ -252,9 +252,9 @@ data: duplicates: 300s versions: - version: latest - natsImage: nats:2.9.16 - metricsExporterImage: natsio/prometheus-nats-exporter:0.9.1 - configReloaderImage: natsio/nats-server-config-reloader:0.7.0 + 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 @@ -291,6 +291,11 @@ data: 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 kind: ConfigMap metadata: name: argo-events-controller-config