Merge branch 'master' into SDKS-7838-cached-flag-sets

splitio · Jan 8, 2024 · e3c41c9 · e3c41c9
2 parents 654fe09 + 26fa89d
commit e3c41c9
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 6 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,3 +1,8 @@
+5.5.1 (Dec 21, 2023)
+- Updated docker images for vulnerability fixes.
+- Updated go-split-commons version.
+- Updated how redis data is displayed in /info/configs.
+
 5.5.0 (Dec 12, 2023)
  - Added support for Flag Sets on Split Proxy and Synchronizer, which enables SDKs to interacting with the flag sets features (more details in our documentation):
     - Updated Proxy endpoints used by SDKs to fetch flags have been updated to handle any SDKs downloading flags in certain flag sets.

diff --git a/docker/Dockerfile.proxy b/docker/Dockerfile.proxy
@@ -1,5 +1,5 @@
 # Build stage
-FROM golang:1.21.3-alpine3.18 AS builder
+FROM golang:1.21.5-alpine3.19 AS builder
 
 ARG EXTRA_BUILD_ARGS
 
@@ -16,7 +16,7 @@ COPY . .
 RUN make clean split-proxy entrypoints EXTRA_BUILD_ARGS="${EXTRA_BUILD_ARGS}"
 
 # Runner stage
-FROM alpine:3.18.4 AS runner
+FROM alpine:3.19.0 AS runner
 
 RUN apk add bash
 

diff --git a/docker/Dockerfile.synchronizer b/docker/Dockerfile.synchronizer
@@ -1,5 +1,5 @@
 # Build stage
-FROM golang:1.21.3-alpine3.18 AS builder
+FROM golang:1.21.5-alpine3.19 AS builder
 
 ARG EXTRA_BUILD_ARGS
 
@@ -16,7 +16,7 @@ COPY . .
 RUN make clean split-sync entrypoints EXTRA_BUILD_ARGS="${EXTRA_BUILD_ARGS}"
 
 # Runner stage
-FROM alpine:3.18.4 AS runner
+FROM alpine:3.19.0 AS runner
 
 RUN apk add bash
 

diff --git a/splitio/commitversion.go b/splitio/commitversion.go
@@ -5,4 +5,4 @@ This file is created automatically, please do not edit
 */
 
 // CommitVersion is the version of the last commit previous to release
-const CommitVersion = "cf3da63"
+const CommitVersion = "5ed4245"
diff --git a/splitio/producer/initialization.go b/splitio/producer/initialization.go
@@ -281,6 +281,7 @@ func Start(logger logging.LoggerInterface, cfg *conf.Main) error {
 
 	cfgForAdmin := *cfg
 	cfgForAdmin.Apikey = logging.ObfuscateAPIKey(cfgForAdmin.Apikey)
+	cfgForAdmin.Storage.Redis.Pass = "xxxxxxxxxxxxxxx"
 	adminServer, err := admin.NewServer(&admin.Options{
 		Host:              cfg.Admin.Host,
 		Port:              int(cfg.Admin.Port),

diff --git a/splitio/version.go b/splitio/version.go
@@ -2,4 +2,4 @@
 package splitio
 
 // Version is the version of this Agent
-const Version = "5.5.0"
+const Version = "5.5.1"