update storage config

Signed-off-by: soulseen <zhuxiaoyang1996@gmail.com>
goharbor · Nov 8, 2021 · c9d380d · c9d380d
1 parent 3e675aa
commit c9d380d
Show file tree

Hide file tree

Showing 9 changed files with 54 additions and 135 deletions.
diff --git a/apis/goharbor.io/v1beta1/harbor_types.go b/apis/goharbor.io/v1beta1/harbor_types.go
@@ -507,6 +507,7 @@ const (
 	S3DriverName         = "s3"
 	SwiftDriverName      = "swift"
 	FileSystemDriverName = "filesystem"
+	AzureDriverName      = "azure"
 )
 
 func (r *HarborStorageImageChartStorageSpec) ProviderName() string {
@@ -518,6 +519,10 @@ func (r *HarborStorageImageChartStorageSpec) ProviderName() string {
 		return SwiftDriverName
 	}
 
+	if r.Azure != nil {
+		return AzureDriverName
+	}
+
 	return FileSystemDriverName
 }
 

diff --git a/apis/goharbor.io/v1beta1/registry_types.go b/apis/goharbor.io/v1beta1/registry_types.go
@@ -605,6 +605,7 @@ type RegistryStorageDriverSpec struct {
 	// See: https://docs.docker.com/registry/storage-drivers/swift/
 	Swift *RegistryStorageDriverSwiftSpec `json:"swift,omitempty"`
 
+	// +kubebuilder:validation:Optional
 	Azure *RegistryStorageDriverAzureSpec `json:"azure,omitempty"`
 }
 

diff --git a/config/config/assets/registry-config.yaml.tmpl b/config/config/assets/registry-config.yaml.tmpl
@@ -138,6 +138,13 @@ storage:
     {{- end }}
   {{- end }}
 
+  {{- if .Spec.Storage.Driver.Azure }}
+  azure:
+    accountname: {{ .Spec.Storage.Driver.Azure.AccountName | quote }}
+    container: {{ .Spec.Storage.Driver.Azure.Container | quote }}
+    realm: {{ .Spec.Storage.Driver.Azure.BaseURL | quote }}
+  {{- end }}
+
   {{- if .Spec.Storage.Driver.Swift }}
   swift:
     username: {{ .Spec.Storage.Driver.Swift.Username | quote }}

diff --git a/controllers/goharbor/harbor/storage.go b/controllers/goharbor/harbor/storage.go
@@ -20,6 +20,12 @@ func (r *Reconciler) ChartMuseumStorage(ctx context.Context, harbor *goharborv1.
 		}
 	}
 
+	if harbor.Spec.ImageChartStorage.Azure != nil {
+		return goharborv1.ChartMuseumChartStorageDriverSpec{
+			Azure: harbor.Spec.ImageChartStorage.Azure.ChartMuseum(),
+		}
+	}
+
 	prefix := ""
 	pvc := &harbor.Spec.ImageChartStorage.FileSystem.RegistryPersistentVolume.PersistentVolumeClaimVolumeSource
 
@@ -87,6 +93,12 @@ func (r *Reconciler) RegistryStorage(ctx context.Context, harbor *goharborv1.Har
 		}
 	}
 
+	if harbor.Spec.ImageChartStorage.Azure != nil {
+		return goharborv1.RegistryStorageDriverSpec{
+			Azure: harbor.Spec.ImageChartStorage.Azure.Registry(),
+		}
+	}
+
 	return goharborv1.RegistryStorageDriverSpec{
 		FileSystem: &goharborv1.RegistryStorageDriverFilesystemSpec{
 			VolumeSource: corev1.VolumeSource{

diff --git a/controllers/goharbor/registry/deployments.go b/controllers/goharbor/registry/deployments.go
@@ -361,6 +361,24 @@ func (r *Reconciler) ApplySwiftStorageEnvs(ctx context.Context, registry *goharb
 	return nil
 }
 
+func (r *Reconciler) ApplyAzureStorageEnvs(ctx context.Context, registry *goharborv1.Registry, deploy *appsv1.Deployment) error {
+	regContainer := &deploy.Spec.Template.Spec.Containers[registryContainerIndex]
+
+	regContainer.Env = append(regContainer.Env, corev1.EnvVar{
+		Name: "REGISTRY_STORAGE_AZURE_ACCOUNTKEY",
+		ValueFrom: &corev1.EnvVarSource{
+			SecretKeyRef: &corev1.SecretKeySelector{
+				Key: harbormetav1.SharedSecretKey,
+				LocalObjectReference: corev1.LocalObjectReference{
+					Name: registry.Spec.Storage.Driver.Azure.AccountKeyRef,
+				},
+			},
+		},
+	})
+
+	return nil
+}
+
 func (r *Reconciler) ApplyInMemoryStorageEnvs(ctx context.Context, registry *goharborv1.Registry, deploy *appsv1.Deployment) error {
 	regContainer := &deploy.Spec.Template.Spec.Containers[registryContainerIndex]
 
@@ -383,6 +401,10 @@ func (r *Reconciler) ApplyStorageConfiguration(ctx context.Context, registry *go
 		return r.ApplySwiftStorageEnvs(ctx, registry, deploy)
 	}
 
+	if registry.Spec.Storage.Driver.Azure != nil {
+		return r.ApplyAzureStorageEnvs(ctx, registry, deploy)
+	}
+
 	if registry.Spec.Storage.Driver.FileSystem != nil {
 		return r.ApplyFilesystemStorageEnvs(ctx, registry, deploy)
 	}

diff --git a/manifests/cluster/deployment.yaml b/manifests/cluster/deployment.yaml
diff --git a/manifests/harbor/deployment.yaml b/manifests/harbor/deployment.yaml
diff --git a/manifests/samples/zxy_test.yaml b/manifests/samples/zxy_test.yaml
diff --git a/pkg/cluster/controllers/harbor/harbor.go b/pkg/cluster/controllers/harbor/harbor.go
@@ -157,6 +157,11 @@ func (harbor *Controller) getHarborCR(ctx context.Context, harborcluster *goharb
 			harborcluster.Spec.Storage.Spec.Swift.HarborStorageImageChartStorageSwiftSpec.DeepCopy()
 	}
 
+	if harborcluster.Spec.Storage.Spec.Azure != nil {
+		harborCR.Spec.ImageChartStorage.Azure =
+			harborcluster.Spec.Storage.Spec.Azure.HarborStorageImageChartStorageAzureSpec.DeepCopy()
+	}
+
 	if harborcluster.Spec.Database.Spec.PostgreSQL != nil {
 		harborCR.Spec.Database =
 			harborcluster.Spec.Database.Spec.PostgreSQL.HarborDatabaseSpec.DeepCopy()