fix(database,redis): fix harbor

Signed-off-by: cndoit18 <cndoit18@outlook.com>

apis/goharbor.io/v1alpha3/harborcluster_conversion.go

@@ -91,10 +91,10 @@ func Convert_v1alpha3_HarborSpec_To_v1beta1_HarborSpec(src *HarborSpec, dst *v1b
 
 	Convert_v1alpha3_HarborExposeSpec_To_v1beta1_HarborExposeSpec(&src.Expose, &dst.Expose)
 
-	Convert_v1alpha3_HarborComponentSpec_To_v1beta1_HarborComponentSpec(&src.HarborComponentsSpec, &dst.HarborComponentsSpec)
+	Convert_v1alpha3_HarborComponentSpec_To_v1beta1_EmbeddedHarborComponentsSpec(&src.HarborComponentsSpec, &dst.EmbeddedHarborComponentsSpec)
 }
 
-func Convert_v1alpha3_HarborComponentSpec_To_v1beta1_HarborComponentSpec(src *HarborComponentsSpec, dst *v1beta1.HarborComponentsSpec) { // nolint
+func Convert_v1alpha3_HarborComponentSpec_To_v1beta1_EmbeddedHarborComponentsSpec(src *HarborComponentsSpec, dst *v1beta1.EmbeddedHarborComponentsSpec) { // nolint
 	Convert_v1alpha3_CoreComponentSpec_To_v1beta1_CoreComponentSpec(&src.Core, &dst.Core)
 
 	Convert_v1alpha3_RegistryComponentSpec_To_v1beta1_RegistryComponentSpec(&src.Registry, &dst.Registry)
@@ -561,10 +561,10 @@ func Convert_v1beta1_EmbeddedHarborSpec_To_v1alpha3_HarborSpec(src *v1beta1.Embe
 
 	Convert_v1beta1_HarborExposeSpec_To_v1alpha3_HarborExposeSpec(&src.Expose, &dst.Expose)
 
-	Convert_v1beta1_HarborComponentSpec_To_v1alpha3_HarborComponentSpec(&src.HarborComponentsSpec, &dst.HarborComponentsSpec)
+	Convert_v1beta1_EmbeddedHarborComponentsSpec_To_v1alpha3_HarborComponentSpec(&src.EmbeddedHarborComponentsSpec, &dst.HarborComponentsSpec)
 }
 
-func Convert_v1beta1_HarborComponentSpec_To_v1alpha3_HarborComponentSpec(src *v1beta1.HarborComponentsSpec, dst *HarborComponentsSpec) { // nolint
+func Convert_v1beta1_EmbeddedHarborComponentsSpec_To_v1alpha3_HarborComponentSpec(src *v1beta1.EmbeddedHarborComponentsSpec, dst *HarborComponentsSpec) { // nolint
 	Convert_v1beta1_CoreComponentSpec_To_v1alpha3_CoreComponentSpec(&src.Core, &dst.Core)
 
 	Convert_v1beta1_RegistryComponentSpec_To_v1alpha3_RegistryComponentSpec(&src.Registry, &dst.Registry)

apis/goharbor.io/v1beta1/harbor_types.go

@@ -176,10 +176,8 @@ type HarborSpec struct {
 	// +kubebuilder:validation:Optional
 	InternalTLS HarborInternalTLSSpec `json:"internalTLS"`
 
-	// Skip OpenAPI schema validation
-	// Use validating webhook to do verification (field required)
-	// +kubebuilder:validation:Optional
-	ImageChartStorage *HarborStorageImageChartStorageSpec `json:"imageChartStorage,omitempty"`
+	// +kubebuilder:validation:Required
+	ImageChartStorage *HarborStorageImageChartStorageSpec `json:"imageChartStorage"`
 
 	// +kubebuilder:validation:Optional
 	// +kubebuilder:default="info"
@@ -281,15 +279,10 @@ type HarborComponentsSpec struct {
 	// +kubebuilder:validation:Optional
 	Notary *NotaryComponentSpec `json:"notary,omitempty"`
 
-	// Skip OpenAPI schema validation
-	// Use validating webhook to do verification (field required)
-	// +kubebuilder:validation:Optional
-	Redis *ExternalRedisSpec `json:"redis,omitempty"`
+	// +kubebuilder:validation:Required
+	Redis *ExternalRedisSpec `json:"redis"`
 
-	// Skip OpenAPI schema validation
-	// Use validating webhook to do verification (field required)
-	// +kubebuilder:validation:Optional
-	Database *HarborDatabaseSpec `json:"database,omitempty"`
+	Database *HarborDatabaseSpec `json:"database"`
 }
 
 type HarborDatabaseSpec struct {

apis/goharbor.io/v1beta1/harborcluster_types.go

@@ -33,7 +33,7 @@ type HarborClusterSpec struct {
 	// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
 
-	EmbeddedHarborSpec `json:"harbor"`
+	EmbeddedHarborSpec `json:",inline"`
 
 	// Cache configuration for in-cluster cache services
 	// +kubebuilder:validation:Required
@@ -49,7 +49,7 @@ type HarborClusterSpec struct {
 }
 
 type EmbeddedHarborSpec struct {
-	HarborComponentsSpec `json:",inline"`
+	EmbeddedHarborComponentsSpec `json:",inline"`
 
 	ImageSource *ImageSourceSpec `json:"imageSource,omitempty"`
 

controllers/goharbor/harbor/manifests/jobservice/default.yaml

@@ -8,3 +8,6 @@ spec:
     host: 127.0.0.1
     port: 3306
   version: 2.2.1
+  database:
+    hosts:
+      - host: 127.0.0.1

controllers/goharbor/harbor/manifests/jobservice/repository-and-tag-suffix-not-empty.yaml

@@ -11,3 +11,6 @@ spec:
     host: 127.0.0.1
     port: 3306
   version: 2.2.1
+  database:
+    hosts:
+      - host: 127.0.0.1

controllers/goharbor/harbor/manifests/jobservice/repository-not-empty.yaml

@@ -10,3 +10,6 @@ spec:
     host: 127.0.0.1
     port: 3306
   version: 2.2.1
+  database:
+    hosts:
+      - host: 127.0.0.1

controllers/goharbor/harbor/manifests/jobservice/tag-suffix-not-empty.yaml

@@ -10,3 +10,6 @@ spec:
     host: 127.0.0.1
     port: 3306
   version: 2.2.1
+  database:
+    hosts:
+      - host: 127.0.0.1

controllers/goharbor/harbor/manifests/jobservice/version-and-repository-not-empty.yaml

@@ -10,3 +10,6 @@ spec:
   redis:
     host: 127.0.0.1
     port: 3306
+  database:
+    hosts:
+      - host: 127.0.0.1

controllers/goharbor/harbor/manifests/jobservice/version-not-empty.yaml

@@ -8,3 +8,6 @@ spec:
   redis:
     host: 127.0.0.1
     port: 3306
+  database:
+    hosts:
+      - host: 127.0.0.1

controllers/goharbor/harbor/manifests/trivy/default.yaml

@@ -8,3 +8,6 @@ spec:
   redis:
     host: 127.0.0.1
     port: 3306
+  database:
+    hosts:
+      - host: 127.0.0.1

controllers/goharbor/harbor/manifests/trivy/expose-core-with-tls.yaml

@@ -12,3 +12,6 @@ spec:
   redis:
     host: 127.0.0.1
     port: 3306
+  database:
+    hosts:
+      - host: 127.0.0.1

controllers/goharbor/harbor/manifests/trivy/github-token.yaml

@@ -9,3 +9,6 @@ spec:
   redis:
     host: 127.0.0.1
     port: 3306
+  database:
+    hosts:
+      - host: 127.0.0.1