Skip to content

Commit deb4dff

Browse files
committed
feat(redis-operator): migrate from archived spotahome to freshworks-oss fork
spotahome/redis-operator was archived 2026-06-11 (read-only). Switch the operator to the actively-maintained freshworks-oss/redis-operator fork, which keeps the same RedisFailover CRD and API group (databases.spotahome.com) and adds a native Valkey engine (spec.engine: Redis|Valkey) — so managed Redis is unaffected and managed Valkey no longer needs a Redis-compat shim image. - re-vendor the chart from oci://ghcr.io/freshworks-oss/charts/redis-operator - build the operator image from freshworks-oss v3.3.5 source - re-target the label/annotation-preservation patch onto the freshworks module The operator image is built out-of-band (make -C packages/system/redis-operator image) and its digest pinned in values.yaml; a maintainer must rebuild and pin before merge (tag is a placeholder here). Assisted-By: Claude <[email protected]> Signed-off-by: Andrei Kvapil <[email protected]>
1 parent 64097dc commit deb4dff

8 files changed

Lines changed: 8572 additions & 5638 deletions

File tree

‎packages/system/redis-operator/Makefile‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,7 @@ include ../../../hack/package.mk
77

88
update:
99
rm -rf charts
10-
helm repo add redis-operator https://spotahome.github.io/redis-operator
11-
helm repo update redis-operator
12-
helm pull redis-operator/redis-operator --untar --untardir charts
13-
sed -i '/{{/d' charts/redis-operator/crds/databases.spotahome.com_redisfailovers.yaml
10+
helm pull oci://ghcr.io/freshworks-oss/charts/redis-operator --version $(patsubst v%,%,$(REDIS_OPERATOR_TAG)) --untar --untardir charts
1411

1512
image:
1613
docker buildx build images/redis-operator \

‎packages/system/redis-operator/charts/redis-operator/Chart.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ annotations:
22
category: Redis Operator
33
apiVersion: v1
44
appVersion: 1.3.0
5-
description: A Helm chart for the Spotahome Redis Operator
6-
home: https://github.com/spotahome/redis-operator
5+
description: A Helm chart for the Redis Operator
6+
home: https://github.com/freshworks/redis-operator
77
keywords:
88
- golang
99
- operator
1010
- cluster
1111
kubeVersion: '>=1.21.0-0'
1212
name: redis-operator
1313
sources:
14-
- https://github.com/spotahome/redis-operator
15-
version: 3.3.0
14+
- https://github.com/freshworks/redis-operator
15+
version: 3.3.5

‎packages/system/redis-operator/charts/redis-operator/crds/databases.spotahome.com_redisfailovers.yaml‎

Lines changed: 8546 additions & 5616 deletions
Large diffs are not rendered by default.

‎packages/system/redis-operator/charts/redis-operator/templates/deployment.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@ spec:
4646
- {{ quote .Values.image.cli_args }}
4747
{{- end }}
4848
imagePullPolicy: {{ .Values.image.pullPolicy }}
49+
{{- if .Values.extraEnvVars }}
50+
env:
51+
{{- toYaml .Values.extraEnvVars | nindent 10 }}
52+
{{- end }}
4953
ports:
5054
- name: metrics
5155
containerPort: {{ .Values.container.port }}

‎packages/system/redis-operator/charts/redis-operator/values.yaml‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
# Name of the image repository to pull the container image from.
66
image:
7-
repository: quay.io/spotahome/redis-operator
7+
repository: ghcr.io/freshworks-oss/redis-operator
88
pullPolicy: IfNotPresent
99
tag: v1.3.0
1010
cli_args: ""
@@ -27,6 +27,9 @@ replicas: 1
2727
# A name in place of the chart name for `app:` labels.
2828
nameOverride: ""
2929

30+
labels: {}
31+
# app: redis
32+
3033
# A name to substitute for the full names of resources.
3134
fullnameOverride: ""
3235

@@ -50,6 +53,13 @@ service:
5053
container:
5154
port: 9710
5255

56+
# Extra environment variables to add to the operator container, using the
57+
# native Kubernetes EnvVar schema, e.g.:
58+
# extraEnvVars:
59+
# - name: FOO
60+
# value: bar
61+
extraEnvVars: []
62+
5363
# Container [security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container).
5464
# See the [API reference](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#security-context-1) for details.
5565
securityContext:
@@ -87,12 +97,5 @@ tolerations: []
8797

8898
affinity: {}
8999

90-
# CRDs configuration
91-
crds:
92-
# -- Additional CRDs annotations
93-
annotations: {}
94-
# argocd.argoproj.io/sync-options: Replace=true
95-
# strategy.spinnaker.io/replace: 'true'
96-
97100
priorityClassName: ""
98101

‎packages/system/redis-operator/images/redis-operator/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
FROM golang:1.26@sha256:079e59808d2d252516e27e3f3a9c003740dee7f75e55aa71528766d52bcfc16a AS builder
22

3-
ARG VERSION=v1.3.0-rc1
3+
ARG VERSION=v3.3.5
44

55
ARG TARGETOS
66
ARG TARGETARCH
77

88
WORKDIR /workspace
99

10-
RUN curl -sSL https://github.com/spotahome/redis-operator/archive/refs/tags/${VERSION}.tar.gz | tar -xzvf- --strip=1
10+
RUN curl -sSL https://github.com/freshworks-oss/redis-operator/archive/refs/tags/${VERSION}.tar.gz | tar -xzvf- --strip=1
1111

1212
COPY patches /patches
1313
RUN git apply /patches/*.diff

‎packages/system/redis-operator/images/redis-operator/patches/labels.diff‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ index 712cc4c0..e84afc92 100644
44
+++ b/service/k8s/service.go
55
@@ -10,6 +10,7 @@ import (
66

7-
"github.com/spotahome/redis-operator/log"
8-
"github.com/spotahome/redis-operator/metrics"
9-
+ "github.com/spotahome/redis-operator/operator/redisfailover/util"
7+
"github.com/freshworks/redis-operator/log"
8+
"github.com/freshworks/redis-operator/metrics"
9+
+ "github.com/freshworks/redis-operator/operator/redisfailover/util"
1010
)
1111

1212
// Service the ServiceAccount service that knows how to interact with k8s to manage them
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
redis-operator:
22
image:
33
repository: ghcr.io/cozystack/cozystack/redis-operator
4-
tag: v1.3.0-rc1@sha256:a4012e6a1b5daaedb57cc27edfdbff52124de4164b5ec0ee53c5ce5710ef4c25
4+
tag: v3.3.5

0 commit comments

Comments
 (0)