Merge pull request #220 from ashishmax31/naming-changes-for-olm-objs

catalogsource object and subscription object name change
openshift · Jun 20, 2022 · f495c08 · f495c08
2 parents 67aa7d5 + 0ae3965
commit f495c08
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 15 deletions.
diff --git a/integration/addon_test.go b/integration/addon_test.go
@@ -14,6 +14,7 @@ import (
 
 	addonsv1alpha1 "github.com/openshift/addon-operator/apis/addons/v1alpha1"
 	"github.com/openshift/addon-operator/integration"
+	addonUtil "github.com/openshift/addon-operator/internal/controllers/addon"
 )
 
 func (s *integrationTestSuite) TestAddon() {
@@ -119,7 +120,7 @@ func (s *integrationTestSuite) TestAddon() {
 	s.Run("catalogsource exists", func() {
 		currentCatalogSource := &operatorsv1alpha1.CatalogSource{}
 		err := integration.Client.Get(ctx, client.ObjectKey{
-			Name:      addon.Name,
+			Name:      addonUtil.CatalogSourceName(addon),
 			Namespace: addon.Spec.Install.OLMOwnNamespace.Namespace,
 		}, currentCatalogSource)
 		s.Assert().NoError(err, "could not get CatalogSource %s", addon.Name)
@@ -133,7 +134,7 @@ func (s *integrationTestSuite) TestAddon() {
 		{
 			err := integration.Client.Get(ctx, client.ObjectKey{
 				Namespace: addon.Spec.Install.OLMOwnNamespace.Namespace,
-				Name:      addon.Name,
+				Name:      addonUtil.SubscriptionName(addon),
 			}, subscription)
 			s.Require().NoError(err)
 
@@ -164,7 +165,7 @@ func (s *integrationTestSuite) TestAddon() {
 
 		err := integration.Client.Get(ctx, client.ObjectKey{
 			Namespace: addon.Spec.Install.OLMOwnNamespace.Namespace,
-			Name:      addon.Name,
+			Name:      addonUtil.SubscriptionName(addon),
 		}, subscription)
 		s.Require().NoError(err)
 		envObjectsPresent := subscription.Spec.Config.Env
@@ -187,7 +188,7 @@ func (s *integrationTestSuite) TestAddon() {
 		// assert that CatalogSource is gone
 		currentCatalogSource := &operatorsv1alpha1.CatalogSource{}
 		err = integration.Client.Get(ctx, client.ObjectKey{
-			Name:      addon.Name,
+			Name:      addonUtil.CatalogSourceName(addon),
 			Namespace: addon.Spec.Install.OLMOwnNamespace.Namespace,
 		}, currentCatalogSource)
 		s.Assert().True(k8sApiErrors.IsNotFound(err), "CatalogSource not deleted: %s", currentCatalogSource.Name)
@@ -232,9 +233,9 @@ func (s *integrationTestSuite) TestAddonWithAdditionalCatalogSrc() {
 		s.Assert().NoError(err, "could not get CatalogSource %s", addon.Name)
 		s.Assert().Equal(3, len(catalogSourceList.Items))
 		expectedImages := map[string]string{
-			"test-1":   referenceAddonCatalogSourceImageWorking,
-			"test-2":   referenceAddonCatalogSourceImageWorking,
-			addon.Name: referenceAddonCatalogSourceImageWorking,
+			"test-1":                           referenceAddonCatalogSourceImageWorking,
+			"test-2":                           referenceAddonCatalogSourceImageWorking,
+			addonUtil.CatalogSourceName(addon): referenceAddonCatalogSourceImageWorking,
 		}
 		for _, ctlgSrc := range catalogSourceList.Items {
 			s.Assert().Equal(expectedImages[ctlgSrc.Name], ctlgSrc.Spec.Image)

diff --git a/integration/broken_subscription_test.go b/integration/broken_subscription_test.go
@@ -13,6 +13,7 @@ import (
 
 	addonsv1alpha1 "github.com/openshift/addon-operator/apis/addons/v1alpha1"
 	"github.com/openshift/addon-operator/integration"
+	addonUtil "github.com/openshift/addon-operator/internal/controllers/addon"
 )
 
 // This test deploys a version of our addon where InstallPlan and
@@ -55,7 +56,7 @@ func (s *integrationTestSuite) TestAddon_BrokenSubscription() {
 		subscription := &operatorsv1alpha1.Subscription{}
 		err := integration.Client.Get(ctx, client.ObjectKey{
 			Namespace: addon.Spec.Install.OLMOwnNamespace.Namespace,
-			Name:      addon.Name,
+			Name:      addonUtil.SubscriptionName(addon),
 		}, subscription)
 		s.Require().NoError(err)
 
@@ -73,7 +74,7 @@ func (s *integrationTestSuite) TestAddon_BrokenSubscription() {
 		// assert that CatalogSource is gone
 		currentCatalogSource := &operatorsv1alpha1.CatalogSource{}
 		err = integration.Client.Get(ctx, types.NamespacedName{
-			Name:      addon.Name,
+			Name:      addonUtil.CatalogSourceName(addon),
 			Namespace: addon.Spec.Install.OLMOwnNamespace.Namespace,
 		}, currentCatalogSource)
 		s.Assert().True(k8sApiErrors.IsNotFound(err), "CatalogSource not deleted: %s", currentCatalogSource.Name)

diff --git a/integration/fixtures_test.go b/integration/fixtures_test.go
@@ -220,7 +220,7 @@ func namespace_TestResourceAdoption() *corev1.Namespace {
 func catalogsource_TestResourceAdoption() *operatorsv1alpha1.CatalogSource {
 	return &operatorsv1alpha1.CatalogSource{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      referenceAddonName,
+			Name:      fmt.Sprintf("addon-%s-catalog", referenceAddonName),
 			Namespace: referenceAddonNamespace,
 		},
 		Spec: operatorsv1alpha1.CatalogSourceSpec{
@@ -247,7 +247,7 @@ func operatorgroup_TestResourceAdoption() *operatorsv1.OperatorGroup {
 func subscription_TestResourceAdoption() *operatorsv1alpha1.Subscription {
 	return &operatorsv1alpha1.Subscription{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      referenceAddonName,
+			Name:      fmt.Sprintf("addon-%s", referenceAddonName),
 			Namespace: referenceAddonNamespace},
 		Spec: &operatorsv1alpha1.SubscriptionSpec{
 			CatalogSource:          referenceAddonName,

diff --git a/integration/resource_adoption_test.go b/integration/resource_adoption_test.go
@@ -16,6 +16,7 @@ import (
 	addonsv1alpha1 "github.com/openshift/addon-operator/apis/addons/v1alpha1"
 	"github.com/openshift/addon-operator/integration"
 	"github.com/openshift/addon-operator/internal/controllers"
+	addonUtil "github.com/openshift/addon-operator/internal/controllers/addon"
 )
 
 func (s *integrationTestSuite) TestResourceAdoption() {
@@ -107,7 +108,7 @@ func (s *integrationTestSuite) TestResourceAdoption() {
 		{
 			observedSubscription := &operatorsv1alpha1.Subscription{
 				ObjectMeta: metav1.ObjectMeta{
-					Name:      referenceAddonName,
+					Name:      addonUtil.SubscriptionName(addon),
 					Namespace: referenceAddonNamespace,
 				},
 			}
@@ -142,7 +143,7 @@ func (s *integrationTestSuite) TestResourceAdoption() {
 		{
 			observedCS := &operatorsv1alpha1.CatalogSource{
 				ObjectMeta: metav1.ObjectMeta{
-					Name:      referenceAddonName,
+					Name:      addonUtil.CatalogSourceName(addon),
 					Namespace: referenceAddonNamespace,
 				},
 			}

diff --git a/internal/controllers/addon/phase_ensure_catalogsource.go b/internal/controllers/addon/phase_ensure_catalogsource.go
@@ -33,7 +33,7 @@ func (r *olmReconciler) ensureCatalogSource(
 
 	catalogSource := &operatorsv1alpha1.CatalogSource{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      addon.Name,
+			Name:      CatalogSourceName(addon),
 			Namespace: commonConfig.Namespace,
 		},
 		Spec: operatorsv1alpha1.CatalogSourceSpec{

diff --git a/internal/controllers/addon/phase_ensure_subscription.go b/internal/controllers/addon/phase_ensure_subscription.go
@@ -41,7 +41,7 @@ func (r *olmReconciler) ensureSubscription(
 	subscriptionConfigObject := createSubscriptionConfigObject(commonInstallOptions)
 	desiredSubscription := &operatorsv1alpha1.Subscription{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      addon.Name,
+			Name:      SubscriptionName(addon),
 			Namespace: commonInstallOptions.Namespace,
 		},
 		Spec: &operatorsv1alpha1.SubscriptionSpec{

diff --git a/internal/controllers/addon/utils.go b/internal/controllers/addon/utils.go
@@ -342,5 +342,13 @@ func getCatalogSourceNetworkPolicyName(addon *addonsv1alpha1.Addon) string {
 	return fmt.Sprintf("addon-%s-catalogs", addon.Name)
 }
 
+func CatalogSourceName(addon *addonsv1alpha1.Addon) string {
+	return fmt.Sprintf("addon-%s-catalog", addon.Name)
+}
+
+func SubscriptionName(addon *addonsv1alpha1.Addon) string {
+	return fmt.Sprintf("addon-%s", addon.Name)
+}
+
 func corev1ProtocolPtr(proto corev1.Protocol) *corev1.Protocol   { return &proto }
 func intOrStringPtr(iors intstr.IntOrString) *intstr.IntOrString { return &iors }