Merge pull request #37 from Madhu-1/fix-console-update

preserve the resourceVersion of the consolePlugin
red-hat-storage · Oct 31, 2023 · ffea2d7 · ffea2d7
2 parents 261ebf3 + 502f8e3
commit ffea2d7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/controllers/clusterversion_controller.go b/controllers/clusterversion_controller.go
@@ -422,7 +422,10 @@ func (c *ClusterVersionReconciler) ensureConsolePlugin() error {
 
 	consolePlugin := console.GetConsolePlugin(c.ConsolePort, c.OperatorNamespace)
 	err = c.createOrUpdate(consolePlugin, func() error {
+		// preserve the resourceVersion of the consolePlugin
+		resourceVersion := consolePlugin.ResourceVersion
 		console.GetConsolePlugin(c.ConsolePort, c.OperatorNamespace).DeepCopyInto(consolePlugin)
+		consolePlugin.ResourceVersion = resourceVersion
 		return nil
 	})
 

diff --git a/controllers/suite_test.go b/controllers/suite_test.go
@@ -22,8 +22,8 @@ import (
 
 	"github.com/red-hat-storage/ocs-client-operator/api/v1alpha1"
 
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
+	. "github.com/onsi/ginkgo" //nolint:revive // ginkgo initialization
+	. "github.com/onsi/gomega" //nolint:revive // gomega initialization
 	"k8s.io/client-go/kubernetes/scheme"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/envtest"