From abf45c902e9d54487703cdf21c79f748a6548112 Mon Sep 17 00:00:00 2001
From: Dmitriy Esin <dmitriy.esin@rtlabs.ru>
Date: Fri, 19 Jan 2024 14:29:14 +0300
Subject: [PATCH 1/4] fix: fixed issue mentioned in
 https://github.com/spotahome/redis-operator/pull/631

---
 .../crds/databases.spotahome.com_redisfailovers.yaml     | 7 ++++---
 charts/redisoperator/values.yaml                         | 9 ++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)
 rename charts/redisoperator/{ => templates}/crds/databases.spotahome.com_redisfailovers.yaml (99%)

diff --git a/charts/redisoperator/crds/databases.spotahome.com_redisfailovers.yaml b/charts/redisoperator/templates/crds/databases.spotahome.com_redisfailovers.yaml
similarity index 99%
rename from charts/redisoperator/crds/databases.spotahome.com_redisfailovers.yaml
rename to charts/redisoperator/templates/crds/databases.spotahome.com_redisfailovers.yaml
index cc8ee11e8..1eb19dfc6 100644
--- a/charts/redisoperator/crds/databases.spotahome.com_redisfailovers.yaml
+++ b/charts/redisoperator/templates/crds/databases.spotahome.com_redisfailovers.yaml
@@ -1,13 +1,13 @@
-
+{{- if .Values.crds.install }}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
+    controller-gen.kubebuilder.io/version: (devel)
     {{- with .Values.crds.annotations }}
-    {{- toYaml . | nindent 4 }}
+      {{- toYaml . | nindent 4 }}
     {{- end }}
-    controller-gen.kubebuilder.io/version: (devel)
   creationTimestamp: null
   name: redisfailovers.databases.spotahome.com
 spec:
@@ -12399,3 +12399,4 @@ status:
     plural: ""
   conditions: []
   storedVersions: []
+{{- end }}
diff --git a/charts/redisoperator/values.yaml b/charts/redisoperator/values.yaml
index 0460a54e1..6dad1f0dd 100644
--- a/charts/redisoperator/values.yaml
+++ b/charts/redisoperator/values.yaml
@@ -89,10 +89,9 @@ affinity: {}
 
 # CRDs configuration
 crds:
-  # -- Additional CRDs annotations
-  annotations: {}
-    # argocd.argoproj.io/sync-options: Replace=true
-    # strategy.spinnaker.io/replace: 'true'
+  install: true
+  annotations:
+    argocd.argoproj.io/sync-options: "Replace=true"
+    strategy.spinnaker.io/replace: "true"
 
 priorityClassName: ""
-

From b89205bdd25ba442e8a2737cfe2e75eb135239c3 Mon Sep 17 00:00:00 2001
From: Dmitriy Esin <dmitriy.esin@rtlabs.ru>
Date: Tue, 27 Aug 2024 19:41:29 +0300
Subject: [PATCH 2/4] feat: crd installs by default additional annotations
 optional

---
 .../crds/databases.spotahome.com_redisfailovers.yaml       | 5 +++--
 charts/redisoperator/values.yaml                           | 7 +++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/charts/redisoperator/templates/crds/databases.spotahome.com_redisfailovers.yaml b/charts/redisoperator/templates/crds/databases.spotahome.com_redisfailovers.yaml
index 1eb19dfc6..aac5c5557 100644
--- a/charts/redisoperator/templates/crds/databases.spotahome.com_redisfailovers.yaml
+++ b/charts/redisoperator/templates/crds/databases.spotahome.com_redisfailovers.yaml
@@ -1,13 +1,15 @@
-{{- if .Values.crds.install }}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: (devel)
+    {{- if .Values.crds.annotations }}
+    "helm.sh/resource-policy": keep
     {{- with .Values.crds.annotations }}
       {{- toYaml . | nindent 4 }}
     {{- end }}
+    {{- end }}
   creationTimestamp: null
   name: redisfailovers.databases.spotahome.com
 spec:
@@ -12399,4 +12401,3 @@ status:
     plural: ""
   conditions: []
   storedVersions: []
-{{- end }}
diff --git a/charts/redisoperator/values.yaml b/charts/redisoperator/values.yaml
index 6dad1f0dd..cc370e1be 100644
--- a/charts/redisoperator/values.yaml
+++ b/charts/redisoperator/values.yaml
@@ -89,9 +89,8 @@ affinity: {}
 
 # CRDs configuration
 crds:
-  install: true
-  annotations:
-    argocd.argoproj.io/sync-options: "Replace=true"
-    strategy.spinnaker.io/replace: "true"
+  annotations: []
+    # argocd.argoproj.io/sync-options: "Replace=true"
+    # strategy.spinnaker.io/replace: "true"
 
 priorityClassName: ""

From 4648dc84eed532133ac440626856beb914e17dfb Mon Sep 17 00:00:00 2001
From: Dmitriy Esin <dmitriy.esin@rtlabs.ru>
Date: Tue, 27 Aug 2024 19:44:59 +0300
Subject: [PATCH 3/4] fix: fixed type

---
 charts/redisoperator/values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/redisoperator/values.yaml b/charts/redisoperator/values.yaml
index cc370e1be..37597fafa 100644
--- a/charts/redisoperator/values.yaml
+++ b/charts/redisoperator/values.yaml
@@ -89,7 +89,7 @@ affinity: {}
 
 # CRDs configuration
 crds:
-  annotations: []
+  annotations: {}
     # argocd.argoproj.io/sync-options: "Replace=true"
     # strategy.spinnaker.io/replace: "true"
 

From 65d804abf328a370e7a9a639861e639326cf2011 Mon Sep 17 00:00:00 2001
From: Dmitriy Esin <dmitriy.esin@rtlabs.ru>
Date: Tue, 27 Aug 2024 19:47:13 +0300
Subject: [PATCH 4/4] add comment to understad parameter

---
 charts/redisoperator/values.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/charts/redisoperator/values.yaml b/charts/redisoperator/values.yaml
index 37597fafa..4acc89947 100644
--- a/charts/redisoperator/values.yaml
+++ b/charts/redisoperator/values.yaml
@@ -89,6 +89,7 @@ affinity: {}
 
 # CRDs configuration
 crds:
+  # -- Additional CRDs annotations
   annotations: {}
     # argocd.argoproj.io/sync-options: "Replace=true"
     # strategy.spinnaker.io/replace: "true"