From 2989136aa2961dc54a5c78e4599d56538faf374b Mon Sep 17 00:00:00 2001
From: Andrew Pantuso <apantuso@redhat.com>
Date: Mon, 24 Apr 2023 13:56:31 -0400
Subject: [PATCH] fix: allow channel updates to pass validation webhooks

---
 internal/webhooks/validate.go     | 4 ++++
 internal/webhooks/webhook_test.go | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/internal/webhooks/validate.go b/internal/webhooks/validate.go
index 0bf699ab9..d2f4f6927 100644
--- a/internal/webhooks/validate.go
+++ b/internal/webhooks/validate.go
@@ -117,12 +117,14 @@ func validateAddonImmutability(addon, oldAddon *addonsv1alpha1.Addon) error {
 		oldSpecInstall.OLMAllNamespaces.Config = nil
 		oldSpecInstall.OLMAllNamespaces.PullSecretName = ""
 		oldSpecInstall.OLMAllNamespaces.AdditionalCatalogSources = nil
+		oldSpecInstall.OLMAllNamespaces.Channel = ""
 	}
 	if oldSpecInstall.OLMOwnNamespace != nil {
 		oldSpecInstall.OLMOwnNamespace.CatalogSourceImage = ""
 		oldSpecInstall.OLMOwnNamespace.Config = nil
 		oldSpecInstall.OLMOwnNamespace.PullSecretName = ""
 		oldSpecInstall.OLMOwnNamespace.AdditionalCatalogSources = nil
+		oldSpecInstall.OLMOwnNamespace.Channel = ""
 	}
 
 	specInstall := addon.Spec.Install.DeepCopy()
@@ -131,12 +133,14 @@ func validateAddonImmutability(addon, oldAddon *addonsv1alpha1.Addon) error {
 		specInstall.OLMAllNamespaces.Config = nil
 		specInstall.OLMAllNamespaces.PullSecretName = ""
 		specInstall.OLMAllNamespaces.AdditionalCatalogSources = nil
+		specInstall.OLMAllNamespaces.Channel = ""
 	}
 	if specInstall.OLMOwnNamespace != nil {
 		specInstall.OLMOwnNamespace.CatalogSourceImage = ""
 		specInstall.OLMOwnNamespace.Config = nil
 		specInstall.OLMOwnNamespace.PullSecretName = ""
 		specInstall.OLMOwnNamespace.AdditionalCatalogSources = nil
+		specInstall.OLMOwnNamespace.Channel = ""
 	}
 
 	// Do semantic DeepEqual instead of reflect.DeepEqual
diff --git a/internal/webhooks/webhook_test.go b/internal/webhooks/webhook_test.go
index 171c59722..f8535d179 100644
--- a/internal/webhooks/webhook_test.go
+++ b/internal/webhooks/webhook_test.go
@@ -147,7 +147,7 @@ func TestValidateAddonInstallImmutability(t *testing.T) {
 					},
 				},
 			}, addonName),
-			expectedErr: errInstallImmutable,
+			expectedErr: nil,
 		},
 		{
 			baseAddon: baseAddon,