Skip to content

Commit 3d2c6ef

Browse files
authored
Upgrade nats to 2.9.x version with new on-disk storage and patch security vulnerabilties (#2242)
1 parent d6fd753 commit 3d2c6ef

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

k8s/cloud_deps/base/nats/statefulset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ spec:
158158
containers:
159159
- name: pl-nats
160160
# yamllint disable-line rule:line-length
161-
image: gcr.io/pixie-oss/pixie-prod/vizier-deps/nats:2.9.19-scratch@sha256:5de59286eb54ead4d4a9279846098d4097b9c17a3c0588182398a7250cde1af9
161+
image: ghcr.io/pixie-io/nats:2.9.25-scratch@sha256:869605f46ad21b76be1998e89345640671dbe46714105cf67676ddb0b78d3b85
162162
ports:
163163
- containerPort: 4222
164164
name: client

k8s/vizier_deps/base/nats/nats_statefulset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ spec:
111111
containers:
112112
- name: pl-nats
113113
# yamllint disable-line rule:line-length
114-
image: gcr.io/pixie-oss/pixie-prod/vizier-deps/nats:2.9.19-scratch@sha256:5de59286eb54ead4d4a9279846098d4097b9c17a3c0588182398a7250cde1af9
114+
image: ghcr.io/pixie-io/nats:2.9.25-scratch@sha256:869605f46ad21b76be1998e89345640671dbe46714105cf67676ddb0b78d3b85
115115
ports:
116116
- containerPort: 4222
117117
name: client

tools/docker/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ LINUX_HEADERS_ARM64_MERGED_FILE := $(LINUX_HEADER_BUILD_DIR)/linux-headers-merge
116116
LINUX_HEADERS_GS_PATH := gs://pixie-dev-public/linux-headers/$(LINUX_HEADERS_REV)
117117

118118
## NATS image parameters.
119-
NATS_IMAGE_VERSION := 2.9.19
119+
NATS_IMAGE_VERSION := 2.9.25
120120
nats_image_tag := "ghcr.io/pixie-io/nats:$(NATS_IMAGE_VERSION)-scratch"
121121

122122
## Copybara image parameters.

tools/docker/nats_image/Dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,16 @@ RUN apk add git
2929

3030
RUN git clone --depth 1 https://github.com/nats-io/nats-server.git
3131
WORKDIR /src/nats-server
32-
RUN git checkout $NATS_VERSION
32+
RUN git fetch --tags && git checkout $NATS_VERSION
3333

3434
ARG GO111MODULE=on
3535
ARG CGO_ENABLED=0
3636

3737
RUN go mod download
38+
# TODO(ddelnano): Remove once NATS server is updated to have
39+
# vulnerability free upstream deps
40+
RUN go get golang.org/x/[email protected]
41+
RUN go get github.com/nats-io/[email protected]
3842
RUN go build -trimpath -ldflags "-X github.com/nats-io/nats-server/v2/server.gitCommit=$(git rev-parse --short HEAD)" -o ./nats-server
3943

4044
FROM scratch

0 commit comments

Comments
 (0)