K8SPG-701: Make spec.extensions.image optional (#1002)

egegunes · hors · web-flow · commit 22d4b4891215 · 2025-01-09T10:59:55.000+03:00
Co-authored-by: Viacheslav Sarzhan &lt;slava.sarzhan@percona.com&gt;
diff --git a/build/crd/percona/generated/pgv2.percona.com_perconapgclusters.yaml b/build/crd/percona/generated/pgv2.percona.com_perconapgclusters.yaml
@@ -8171,8 +8171,6 @@ spec:
                         - azure
                         type: string
                     type: object
-                required:
-                - image
                 type: object
               image:
                 description: The image name to use for PostgreSQL containers.
diff --git a/config/crd/bases/pgv2.percona.com_perconapgclusters.yaml b/config/crd/bases/pgv2.percona.com_perconapgclusters.yaml
@@ -8577,8 +8577,6 @@ spec:
                         - azure
                         type: string
                     type: object
-                required:
-                - image
                 type: object
               image:
                 description: The image name to use for PostgreSQL containers.
diff --git a/deploy/bundle.yaml b/deploy/bundle.yaml
@@ -8870,8 +8870,6 @@ spec:
                         - azure
                         type: string
                     type: object
-                required:
-                - image
                 type: object
               image:
                 description: The image name to use for PostgreSQL containers.
diff --git a/deploy/crd.yaml b/deploy/crd.yaml
@@ -8870,8 +8870,6 @@ spec:
                         - azure
                         type: string
                     type: object
-                required:
-                - image
                 type: object
               image:
                 description: The image name to use for PostgreSQL containers.
diff --git a/deploy/cw-bundle.yaml b/deploy/cw-bundle.yaml
@@ -8870,8 +8870,6 @@ spec:
                         - azure
                         type: string
                     type: object
-                required:
-                - image
                 type: object
               image:
                 description: The image name to use for PostgreSQL containers.
diff --git a/percona/controller/pgcluster/controller.go b/percona/controller/pgcluster/controller.go
@@ -553,6 +553,10 @@ func (r *PGClusterReconciler) reconcileCustomExtensions(ctx context.Context, cr
 		return nil
 	}
 
+	if len(cr.Spec.Extensions.Image) == 0 && len(cr.Spec.Extensions.Custom) > 0 {
+		return errors.New("you need to set spec.extensions.image to install custom extensions")
+	}
+
 	extensionKeys := make([]string, 0)
 	extensionNames := make([]string, 0)
 
diff --git a/pkg/apis/pgv2.percona.com/v2/perconapgcluster_types.go b/pkg/apis/pgv2.percona.com/v2/perconapgcluster_types.go
@@ -584,8 +584,7 @@ type BuiltInExtensionsSpec struct {
 }
 
 type ExtensionsSpec struct {
-	// +kubebuilder:validation:Required
-	Image           string                      `json:"image"`
+	Image           string                      `json:"image,omitempty"`
 	ImagePullPolicy corev1.PullPolicy           `json:"imagePullPolicy,omitempty"`
 	Storage         CustomExtensionsStorageSpec `json:"storage,omitempty"`
 	BuiltIn         BuiltInExtensionsSpec       `json:"builtin,omitempty"`

Original file line number	Diff line number	Diff line change
`@@ -553,6 +553,10 @@ func (r *PGClusterReconciler) reconcileCustomExtensions(ctx context.Context, cr`
`553`	`553`	`return nil`
`554`	`554`	`}`
`555`	`555`
	`556`	`+ if len(cr.Spec.Extensions.Image) == 0 && len(cr.Spec.Extensions.Custom) > 0 {`
	`557`	`+ return errors.New("you need to set spec.extensions.image to install custom extensions")`
	`558`	`+ }`
	`559`	`+`
`556`	`560`	`extensionKeys := make([]string, 0)`
`557`	`561`	`extensionNames := make([]string, 0)`
`558`	`562`
Original file line number	Diff line number	Diff line change
`@@ -584,8 +584,7 @@ type BuiltInExtensionsSpec struct {`
`584`	`584`	`}`
`585`	`585`
`586`	`586`	`type ExtensionsSpec struct {`
`587`		`- // +kubebuilder:validation:Required`
`588`		- Image string `json:"image"`
	`587`	+ Image string `json:"image,omitempty"`
`589`	`588`	ImagePullPolicy corev1.PullPolicy `json:"imagePullPolicy,omitempty"`
`590`	`589`	Storage CustomExtensionsStorageSpec `json:"storage,omitempty"`
`591`	`590`	BuiltIn BuiltInExtensionsSpec `json:"builtin,omitempty"`