fix(crd) remove useless EncryptionKeyRef

Signed-off-by: Ziming Zhang <zziming@vmware.com>
goharbor · Apr 28, 2021 · 6a67475 · 6a67475
1 parent e5e4d2f
commit 6a67475
Show file tree

Hide file tree

Showing 15 changed files with 0 additions and 51 deletions.
diff --git a/apis/goharbor.io/v1alpha3/harbor_types.go b/apis/goharbor.io/v1alpha3/harbor_types.go
@@ -188,11 +188,6 @@ type HarborSpec struct {
 	// +kubebuilder:validation:Pattern="[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*"
 	HarborAdminPasswordRef string `json:"harborAdminPasswordRef"`
 
-	// +kubebuilder:validation:Required
-	// +kubebuilder:validation:Pattern="[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*"
-	// The secret key used for encryption.
-	EncryptionKeyRef string `json:"encryptionKeyRef"`
-
 	// +kubebuilder:validation:Optional
 	// +kubebuilder:default="RollingUpdate"
 	UpdateStrategyType appsv1.DeploymentStrategyType `json:"updateStrategyType,omitempty"`

diff --git a/config/kustomizeconfig/harbor.yaml b/config/kustomizeconfig/harbor.yaml
@@ -15,9 +15,6 @@ nameReference:
   - kind: Harbor
     group: goharbor.io
     path: spec/database/passwordRef
-  - kind: Harbor
-    group: goharbor.io
-    path: spec/encryptionKeyRef
   - kind: Harbor
     group: goharbor.io
     path: spec/expose/core/tls/certificateRef

diff --git a/config/kustomizeconfig/harborcluster.yaml b/config/kustomizeconfig/harborcluster.yaml
@@ -15,9 +15,6 @@ nameReference:
   - kind: HarborCluster
     group: goharbor.io
     path: spec/database/passwordRef
-  - kind: HarborCluster
-    group: goharbor.io
-    path: spec/encryptionKeyRef
   - kind: HarborCluster
     group: goharbor.io
     path: spec/expose/core/tls/certificateRef

diff --git a/config/samples/harbor/goharbor_v1alpha3_harbor.yaml b/config/samples/harbor/goharbor_v1alpha3_harbor.yaml
@@ -11,7 +11,6 @@ spec:
         host: core.harbor.domain
       tls:
         certificateRef: sample-public-certificate
-  encryptionKeyRef: core-database-encryption
   internalTLS:
     enabled: true
   portal: {}

diff --git a/config/samples/harborcluster/goharbor_v1alpha3_harborcluster.yaml b/config/samples/harborcluster/goharbor_v1alpha3_harborcluster.yaml
@@ -30,7 +30,6 @@ spec:
         host: notary.harbor.domain
       tls:
         certificateRef: sample-public-certificate
-  encryptionKeyRef: core-database-encryption
   internalTLS:
     enabled: true
   portal: {}

diff --git a/controllers/goharbor/harbor_test.go b/controllers/goharbor/harbor_test.go
@@ -146,7 +146,6 @@ func setupValidHarbor(ctx context.Context, ns string) (Resource, client.ObjectKe
 		Spec: goharborv1.HarborSpec{
 			ExternalURL:            publicURL.String(),
 			HarborAdminPasswordRef: adminSecretName,
-			EncryptionKeyRef:       "encryption-key",
 			Version:                harborversion.Default(),
 			ImageChartStorage: &goharborv1.HarborStorageImageChartStorageSpec{
 				FileSystem: &goharborv1.HarborStorageImageChartStorageFileSystemSpec{

diff --git a/docs/CRD/custom-resource-definition.md b/docs/CRD/custom-resource-definition.md
@@ -99,17 +99,6 @@ spec:
   # ... Skipped fields
 ```
 
-`encryptionKeyRef`(required): the secret key used for encryption.
-
-```yaml
-spec:
-  # ... Skipped fields
-
-  encryptionKeyRef: "myEncryption" # Required
-
-  # ... Skipped fields
-```
-
 `updateStrategyType`(optional): the update strategy.
 
 ```yaml

diff --git a/docs/tutorial.md b/docs/tutorial.md
@@ -137,7 +137,6 @@ spec:
         host: notary.10.10.10.100.xip.io
       tls:
         certificateRef: sample-public-certificate
-  encryptionKeyRef: core-database-encryption
   internalTLS:
     enabled: true
   portal: {}

diff --git a/manifests/cluster/deployment.yaml b/manifests/cluster/deployment.yaml
@@ -2496,10 +2496,6 @@ spec:
                 required:
                 - hosts
                 type: object
-              encryptionKeyRef:
-                description: The secret key used for encryption.
-                pattern: '[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*'
-                type: string
               exporter:
                 properties:
                   cache:
@@ -4021,7 +4017,6 @@ spec:
                 description: The version of the harbor, eg 2.1.2
                 type: string
             required:
-            - encryptionKeyRef
             - expose
             - externalURL
             - harborAdminPasswordRef
@@ -4408,10 +4403,6 @@ spec:
                 required:
                 - hosts
                 type: object
-              encryptionKeyRef:
-                description: The secret key used for encryption.
-                pattern: '[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*'
-                type: string
               exporter:
                 properties:
                   cache:
@@ -5522,7 +5513,6 @@ spec:
                 description: The version of the harbor, eg 2.1.2
                 type: string
             required:
-            - encryptionKeyRef
             - expose
             - externalURL
             - harborAdminPasswordRef

diff --git a/manifests/harbor/deployment.yaml b/manifests/harbor/deployment.yaml
@@ -2496,10 +2496,6 @@ spec:
                 required:
                 - hosts
                 type: object
-              encryptionKeyRef:
-                description: The secret key used for encryption.
-                pattern: '[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*'
-                type: string
               exporter:
                 properties:
                   cache:
@@ -4021,7 +4017,6 @@ spec:
                 description: The version of the harbor, eg 2.1.2
                 type: string
             required:
-            - encryptionKeyRef
             - expose
             - externalURL
             - harborAdminPasswordRef
@@ -4408,10 +4403,6 @@ spec:
                 required:
                 - hosts
                 type: object
-              encryptionKeyRef:
-                description: The secret key used for encryption.
-                pattern: '[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*'
-                type: string
               exporter:
                 properties:
                   cache:
@@ -5522,7 +5513,6 @@ spec:
                 description: The version of the harbor, eg 2.1.2
                 type: string
             required:
-            - encryptionKeyRef
             - expose
             - externalURL
             - harborAdminPasswordRef

diff --git a/manifests/samples/harbor_core_fs.yaml b/manifests/samples/harbor_core_fs.yaml
@@ -79,7 +79,6 @@ spec:
         host: core.harbor.domain
       tls:
         certificateRef: sample-public-certificate
-  encryptionKeyRef: core-database-encryption
   internalTLS:
     enabled: true
   portal: {}

diff --git a/manifests/samples/harbor_core_minio.yaml b/manifests/samples/harbor_core_minio.yaml
@@ -78,7 +78,6 @@ spec:
         host: core.harbor.domain
       tls:
         certificateRef: sample-public-certificate
-  encryptionKeyRef: core-database-encryption
   internalTLS:
     enabled: true
   portal: {}

diff --git a/manifests/samples/harbor_full_fs.yaml b/manifests/samples/harbor_full_fs.yaml
@@ -130,7 +130,6 @@ spec:
         claimName: sample-harbor-trivy-reports
       cachePersistentVolume:
         claimName: sample-harbor-trivy-cache
-  encryptionKeyRef: core-database-encryption
   internalTLS:
     enabled: true
   portal: {}

diff --git a/manifests/samples/harbor_full_minio.yaml b/manifests/samples/harbor_full_minio.yaml
@@ -83,7 +83,6 @@ spec:
         host: notary.harbor.domain
       tls:
         certificateRef: sample-public-certificate
-  encryptionKeyRef: core-database-encryption
   internalTLS:
     enabled: true
   portal: {}

diff --git a/manifests/samples/harborcluster_standard_stack_external.yaml b/manifests/samples/harborcluster_standard_stack_external.yaml
@@ -126,7 +126,6 @@ spec:
     passwordRef: harbor-database-password
     sslMode: disable
     username: postgres
-  encryptionKeyRef: core-database-encryption-dddh7f9gfg
   expose:
     core:
       ingress: