Merge pull request #94 from mittwald/fix/projects-without-proxy-cache

Fix/projects without proxy cache
mittwald · Dec 15, 2021 · 1bc81ad · 1bc81ad
2 parents 8ca7c5f + f0d1b10
commit 1bc81ad
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/controllers/registries/instance_controller.go b/controllers/registries/instance_controller.go
@@ -119,6 +119,7 @@ func (r *InstanceReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c
 		if err != nil {
 			return ctrl.Result{}, err
 		}
+		chartSpec.Wait = true
 
 		err = r.installOrUpgradeHelmChart(ctx, chartSpec)
 		if err != nil {

diff --git a/controllers/registries/project_controller.go b/controllers/registries/project_controller.go
@@ -275,15 +275,15 @@ func (r *ProjectReconciler) assertExistingProject(ctx context.Context, harborCli
 	heldRepo, err := harborClient.GetProject(ctx, project.Spec.Name)
 
 	var registry v1alpha2.Registry
-	var registryID int64
+	var registryID *int64
 	if project.Spec.ProxyCache != nil {
 		if err := r.Client.Get(ctx, client.ObjectKey{
 			Namespace: project.Namespace,
 			Name:      project.Spec.ProxyCache.Registry.Name,
 		}, &registry); err != nil {
 			return err
 		}
-		registryID = registry.Status.ID
+		registryID = &registry.Status.ID
 	}
 
 	if errors.Is(err, &clienterrors.ErrProjectNotFound{}) {
@@ -293,7 +293,7 @@ func (r *ProjectReconciler) assertExistingProject(ctx context.Context, harborCli
 			Metadata:     nil,
 			ProjectName:  project.Spec.Name,
 			Public:       nil,
-			RegistryID:   &registryID,
+			RegistryID:   registryID,
 			StorageLimit: &storageLimit,
 		})
 

diff --git a/deploy/helm-chart/harbor-operator/templates/instance/project.yaml b/deploy/helm-chart/harbor-operator/templates/instance/project.yaml
@@ -14,6 +14,11 @@ spec:
   storageLimit: {{ $project.storageLimit }}
 {{- else }}
   storageLimit: -1
+{{- end }}
+{{- if $project.proxyCacheRegistryName }}
+  proxyCache:
+    registry:
+      name: {{ $project.proxyCacheRegistryName }}
 {{- end }}
   metadata:
   {{- with $project.metadata }}

diff --git a/deploy/helm-chart/harbor-operator/values.yaml b/deploy/helm-chart/harbor-operator/values.yaml
@@ -29,9 +29,9 @@ fullnameOverride: {}
 installHarborChartRepo: true
 
 instances: ~
-#  - name: test-registry
+#  - name: test-harbor
 #    type: manual
-#    version: v1.5.3
+#    version: v1.8.0
 #    wait: true
 #    garbageCollection:
 #      cron: "0 * * * *"
@@ -47,6 +47,7 @@ instances: ~
 #    projects:
 #      - name: projects
 #        storageLimit: 10
+#        proxyCacheRegistryName: test-harbor-test-registry # <instanceName>-<registry-name>
 #        metadata:
 #          enableContentTrust: false
 #          autoScan: true