Skip to content

Commit

Permalink
fix: do not overwrite the entrypoint of nats-server-config-reloader (#…
Browse files Browse the repository at this point in the history
…3004)

Signed-off-by: Yulin Li <yulili@microsoft.com>
Co-authored-by: Yulin Li <yulili@microsoft.com>
  • Loading branch information
2 people authored and whynowy committed Jun 13, 2024
1 parent 50fddbe commit a8333d8
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 11 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion controllers/eventbus/installer/jetstream.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"},
Expand Down
11 changes: 8 additions & 3 deletions manifests/base/controller-manager/controller-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
11 changes: 8 additions & 3 deletions manifests/install.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
11 changes: 8 additions & 3 deletions manifests/namespace-install.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit a8333d8

Please sign in to comment.