ITEP-67065 harbor-docker-oci registry add project (#36)

Author: SeanCondon

VERSION

@@ -1 +1 @@
-0.3.6-dev
+0.3.6

deploy/charts/app-orch-tenant-controller/Chart.yaml

@@ -5,8 +5,8 @@
 apiVersion: v2
 description: Tenant Controller
 name: app-orch-tenant-controller
-version: 0.3.5
+version: 0.3.6
 annotations:
   revision: ""
   created: ""
-appVersion: "0.3.5"
+appVersion: "0.3.6"

internal/plugins/catalog-provisioner.go

@@ -177,7 +177,7 @@ func (p *CatalogProvisionerPlugin) CreateEvent(ctx context.Context, event Event,
 		Description: `Harbor OCI docker images registry`,
 		Type:        "IMAGE",
 		ProjectUUID: event.UUID,
-		RootURL:     p.config.HarborServerExternal + "/",
+		RootURL:     ociRegistry + "/" + harborProjectName,
 		Username:    username,
 		Cacerts:     cacerts,
 		AuthToken:   token,

internal/plugins/catalog-provisioner_test.go

@@ -46,8 +46,9 @@ func (s *PluginsTestSuite) TestCatalogProvisionerPluginCreate() {
 	s.NoError(err, "Cannot initialize plugins")
 
 	err = Dispatch(ctx, Event{
-		EventType: "create",
-		UUID:      "default",
+		EventType:    "create",
+		UUID:         "default",
+		Organization: "test-org",
 	}, nil)
 	s.NoError(err, "Cannot dispatch create event")
 
@@ -62,6 +63,8 @@ func (s *PluginsTestSuite) TestCatalogProvisionerPluginCreate() {
 	s.Equal("token", mockCatalog.registries["harbor-helm-oci"].AuthToken)
 	s.Equal("user", mockCatalog.registries["harbor-docker-oci"].Username)
 	s.Equal("user", mockCatalog.registries["harbor-helm-oci"].Username)
+	s.Equal("/catalog-apps-test-org-", mockCatalog.registries["harbor-docker-oci"].RootURL)
+	s.Equal("/catalog-apps-test-org-", mockCatalog.registries["harbor-helm-oci"].RootURL)
 	s.Equal("use-dynamic-cacert", mockCatalog.registries["harbor-docker-oci"].Cacerts)
 	s.Equal("use-dynamic-cacert", mockCatalog.registries["harbor-helm-oci"].Cacerts)
 

internal/southbound/harbor.go

@@ -41,11 +41,6 @@ func NewK8s(namespace string) (K8s, error) {
 var K8sFactory = NewK8s
 
 func HarborProjectName(org string, displayName string) string {
-	// Begin hack - Remove this once the integration pipeline can handle Harbor projects named after the projectID
-	if displayName == "default" && org == "" {
-		return "catalog-apps"
-	}
-	// End hack
 	return fmt.Sprintf(`catalog-apps-%s-%s`, org, displayName)
 }