Merge pull request #343 from Ajpantuso/apantuso/fix_permit_channel_up…

…dates [MTSRE-847] fix: allow channel updates to pass validation webhooks
openshift · Apr 24, 2023 · 9e53ac8 · 9e53ac8
2 parents e1b983b + 2989136
commit 9e53ac8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -147,7 +147,7 @@ func TestValidateAddonInstallImmutability(t *testing.T) {
 					},
 				},
 			}, addonName),
-			expectedErr: errInstallImmutable,
+			expectedErr: nil,
 		},
 		{
 			baseAddon: baseAddon,