fix: watch.Filter panic with kooper v2.10 / client-go v0.35

.github/workflows/ci.yaml

@@ -18,7 +18,7 @@ jobs:
         name: Golang Check
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v4
+            - uses: actions/checkout@v6
             - uses: actions/setup-go@v6
               with:
                   go-version-file: go.mod
@@ -32,7 +32,7 @@ jobs:
         name: Unit test
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v4
+            - uses: actions/checkout@v6
             - uses: actions/setup-go@v6
               with:
                   go-version-file: go.mod
@@ -42,7 +42,7 @@ jobs:
         name: govulncheck
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v4
+            - uses: actions/checkout@v6
             - uses: actions/setup-go@v6
               with:
                   go-version-file: go.mod
@@ -56,7 +56,7 @@ jobs:
         if: github.event_name == 'pull_request'
         steps:
             - name: Checkout PR branch
-              uses: actions/checkout@v4
+              uses: actions/checkout@v6
               with:
                   fetch-depth: 0  # Required to access full Git history
 
@@ -182,7 +182,7 @@ jobs:
             matrix:
                 kubernetes: [1.33.11, 1.34.7, 1.35.4]
         steps:
-            - uses: actions/checkout@v4
+            - uses: actions/checkout@v6
             - uses: actions/setup-go@v6
               with:
                   go-version-file: go.mod
@@ -201,12 +201,12 @@ jobs:
         name: Chart testing
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v4
+            - uses: actions/checkout@v6
               with:
                   fetch-depth: 0
 
             - name: Install Helm
-              uses: azure/setup-helm@v4
+              uses: azure/setup-helm@v5
               with:
                   version: v3.12.3
 

.github/workflows/dco.yaml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.actor != 'dependabot[bot]' && github.actor != 'renovate[bot]' }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
 

.github/workflows/helm.yml

@@ -18,10 +18,10 @@ jobs:
     name: Package and push chart to GHCR
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: Install Helm
-        uses: azure/setup-helm@v4
+        uses: azure/setup-helm@v5
         with:
           version: v3.12.3
 

.github/workflows/release.yml

@@ -12,7 +12,7 @@ jobs:
       packages: write
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: Unshallow
         run: git fetch --prune --unshallow
       - name: Setup golang

Makefile

@@ -3,11 +3,8 @@ VERSION ?= v1.3.0-rc0
 # Name of this service/application
 SERVICE_NAME := redis-operator
 
-# Docker image name for this project
-IMAGE_NAME := freshworks/$(SERVICE_NAME)
-
-# Repository url for this project
-REPOSITORY := ghcr.io/$(IMAGE_NAME)
+# Docker image on GHCR
+REPOSITORY := ghcr.io/freshworks-oss/$(SERVICE_NAME)
 
 # Shell to use for running scripts
 SHELL := $(shell which bash)
@@ -18,10 +15,7 @@ CONTAINER_ENGINE ?= $(shell command -v podman 2>/dev/null || command -v docker 2
 # Non-empty when CONTAINER_ENGINE points at Podman (path may be .../bin/podman).
 IS_PODMAN := $(findstring podman,$(CONTAINER_ENGINE))
 
-# Get the main unix group for the user running make (to be used by docker-compose later)
-GID := $(shell id -g)
-
-# Get the unix user id for the user running make (to be used by docker-compose later)
+# Get the main unix user id for the user running make (used by docker run -u)
 UID := $(shell id -u)
 
 # Commit hash from git
@@ -42,7 +36,6 @@ ifneq ($(shell git status --porcelain),)
 endif
 
 
-PROJECT_PACKAGE := github.com/freshworks/redis-operator
 CODEGEN_IMAGE := ghcr.io/slok/kube-code-generator:v0.7.0
 PORT := 9710
 

charts/redisoperator/Chart.yaml

@@ -4,7 +4,7 @@ appVersion: 1.3.0
 apiVersion: v1
 description: A Helm chart for the Redis Operator
 name: redis-operator
-version: 3.3.3
+version: 3.3.4
 home: https://github.com/freshworks/redis-operator
 keywords:
   - "golang"

charts/redisoperator/values.yaml

@@ -4,7 +4,7 @@
 
 # Name of the image repository to pull the container image from.
 image:
-  repository: ghcr.io/freshworks/redis-operator
+  repository: ghcr.io/freshworks-oss/redis-operator
   pullPolicy: IfNotPresent
   tag: v1.3.0
   cli_args: ""

docs/release-process-internals.md

@@ -10,7 +10,7 @@ For **step-by-step “what do I do for a new release?”** (operator-only vs CRD
 
 | Workflow | File | Trigger (summary) | What it does |
 |----------|------|---------------------|--------------|
-| **Create a release** | [.github/workflows/release.yml](../.github/workflows/release.yml) | `release: types: [published]` | On a **published** GitHub Release, checks out the tag, runs `make image-release` and pushes **multi-arch operator images** to `ghcr.io` (see [Makefile](../Makefile) `image-release`, `REPOSITORY` / `IMAGE_NAME`). **Does not** create tags; you create the tag and Release. |
+| **Create a release** | [.github/workflows/release.yml](../.github/workflows/release.yml) | `release: types: [published]` | On a **published** GitHub Release, checks out the tag, runs `make image-release` and pushes **multi-arch operator images** to `ghcr.io` (see [Makefile](../Makefile) `image-release` and `REPOSITORY`). **Does not** create tags; you create the tag and Release. |
 | **Release Charts** | [.github/workflows/helm.yml](../.github/workflows/helm.yml) | **Push to `master`** with paths under `charts/**` only (not the workflow file alone) | `helm package` for `charts/redisoperator`, `helm registry login` to GHCR, `helm push` to `oci://ghcr.io/<repository_owner>/charts`. Chart **version** is whatever is in [Chart.yaml](charts/redisoperator/Chart.yaml) at that commit. |
 | **CI** (incl. version check) | [.github/workflows/ci.yaml](../.github/workflows/ci.yaml) | **Pull requests** to `master` (and push per file) | Lint, unit tests, optional integration, Helm `lint`/`template`, and **if the CRD manifest file changed**, **version-check** enforces a bump to [Chart.yaml](charts/redisoperator/Chart.yaml) `version` vs the base branch. |
 | **Release Drafter** | [.github/workflows/draft_release.yml](../.github/workflows/draft_release.yml) + [.github/release-drafter.yml](../.github/release-drafter.yml) | Pushes to `main` / `master` | Updates a **draft** release body from merged PRs and labels. Does **not** change repo versions or push images. |

go.mod

@@ -6,59 +6,68 @@ require (
 	github.com/go-redis/redis/v8 v8.11.5
 	github.com/prometheus/client_golang v1.23.2
 	github.com/sirupsen/logrus v1.9.4
-	github.com/spotahome/kooper/v2 v2.5.0
+	github.com/spotahome/kooper/v2 v2.10.0
 	github.com/stretchr/testify v1.11.1
-	k8s.io/api v0.33.2
+	k8s.io/api v0.35.0
 	k8s.io/apiextensions-apiserver v0.28.4
-	k8s.io/apimachinery v0.33.2
-	k8s.io/client-go v0.33.2
+	k8s.io/apimachinery v0.35.0
+	k8s.io/client-go v0.35.0
 )
 
 require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
-	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
-	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
-	github.com/go-logr/logr v1.4.2 // indirect
-	github.com/go-openapi/jsonpointer v0.21.0 // indirect
-	github.com/go-openapi/jsonreference v0.20.2 // indirect
-	github.com/go-openapi/swag v0.23.0 // indirect
+	github.com/emicklei/go-restful/v3 v3.13.0 // indirect
+	github.com/fxamacker/cbor/v2 v2.9.0 // indirect
+	github.com/go-logr/logr v1.4.3 // indirect
+	github.com/go-openapi/jsonpointer v0.22.4 // indirect
+	github.com/go-openapi/jsonreference v0.21.4 // indirect
+	github.com/go-openapi/swag v0.25.4 // indirect
+	github.com/go-openapi/swag/cmdutils v0.25.4 // indirect
+	github.com/go-openapi/swag/conv v0.25.4 // indirect
+	github.com/go-openapi/swag/fileutils v0.25.4 // indirect
+	github.com/go-openapi/swag/jsonname v0.25.4 // indirect
+	github.com/go-openapi/swag/jsonutils v0.25.4 // indirect
+	github.com/go-openapi/swag/loading v0.25.4 // indirect
+	github.com/go-openapi/swag/mangling v0.25.4 // indirect
+	github.com/go-openapi/swag/netutils v0.25.4 // indirect
+	github.com/go-openapi/swag/stringutils v0.25.4 // indirect
+	github.com/go-openapi/swag/typeutils v0.25.4 // indirect
+	github.com/go-openapi/swag/yamlutils v0.25.4 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/google/gnostic-models v0.6.9 // indirect
+	github.com/google/gnostic-models v0.7.1 // indirect
 	github.com/google/go-cmp v0.7.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/pkg/errors v0.9.1 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/prometheus/client_model v0.6.2 // indirect
-	github.com/prometheus/common v0.66.1 // indirect
-	github.com/prometheus/procfs v0.16.1 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/stretchr/objx v0.5.2 // indirect
+	github.com/prometheus/common v0.67.4 // indirect
+	github.com/prometheus/procfs v0.19.2 // indirect
+	github.com/spf13/pflag v1.0.10 // indirect
+	github.com/stretchr/objx v0.5.3 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
-	go.yaml.in/yaml/v2 v2.4.2 // indirect
+	go.yaml.in/yaml/v2 v2.4.3 // indirect
+	go.yaml.in/yaml/v3 v3.0.4 // indirect
 	golang.org/x/net v0.53.0 // indirect
-	golang.org/x/oauth2 v0.30.0 // indirect
+	golang.org/x/oauth2 v0.34.0 // indirect
 	golang.org/x/sys v0.43.0 // indirect
 	golang.org/x/term v0.42.0 // indirect
 	golang.org/x/text v0.36.0 // indirect
-	golang.org/x/time v0.9.0 // indirect
-	google.golang.org/protobuf v1.36.8 // indirect
-	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
+	golang.org/x/time v0.14.0 // indirect
+	google.golang.org/protobuf v1.36.11 // indirect
+	gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/klog/v2 v2.130.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
-	k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
-	sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
+	k8s.io/kube-openapi v0.0.0-20251125145642-4e65d59e963e // indirect
+	k8s.io/utils v0.0.0-20251220205832-9d40a56c1308 // indirect
+	sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
 	sigs.k8s.io/randfill v1.0.0 // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
-	sigs.k8s.io/yaml v1.4.0 // indirect
+	sigs.k8s.io/structured-merge-diff/v6 v6.3.1 // indirect
+	sigs.k8s.io/yaml v1.6.0 // indirect
 )