Merge branch 'master' into fix-remoteObjRV-log

kobzonega · kobzonega · commit 7da8c77ccaa0 · 2024-09-26T14:15:22.000+07:00
diff --git a/internal/controllers/database/sync.go b/internal/controllers/database/sync.go
@@ -371,6 +371,13 @@ func shouldIgnoreDatabaseChange(database *resources.DatabaseBuilder) resources.I
 			}
 		}
 
+		if sec, ok := oldObj.(*corev1.Secret); ok {
+			// Do not update already existing secret data for encryption
+			if (len(sec.StringData) > 0) || (len(sec.Data) > 0) {
+				return true
+			}
+		}
+
 		if sec, ok := oldObj.(*corev1.Secret); ok {
 			// Do not update already existing secret data for encryption
 			if (len(sec.StringData) > 0) || (len(sec.Data) > 0) {

Original file line number	Diff line number	Diff line change
`@@ -371,6 +371,13 @@ func shouldIgnoreDatabaseChange(database *resources.DatabaseBuilder) resources.I`
`371`	`371`	`}`
`372`	`372`	`}`
`373`	`373`
	`374`	`+ if sec, ok := oldObj.(*corev1.Secret); ok {`
	`375`	`+ // Do not update already existing secret data for encryption`
	`376`	`+ if (len(sec.StringData) > 0) \|\| (len(sec.Data) > 0) {`
	`377`	`+ return true`
	`378`	`+ }`
	`379`	`+ }`
	`380`	`+`
`374`	`381`	`if sec, ok := oldObj.(*corev1.Secret); ok {`
`375`	`382`	`// Do not update already existing secret data for encryption`
`376`	`383`	`if (len(sec.StringData) > 0) \|\| (len(sec.Data) > 0) {`