Merge pull request #1316 from percona/K8SPG-624-use-bool

Author: hors

build/crd/percona/generated/pgv2.percona.com_perconapgclusters.yaml

@@ -10303,11 +10303,11 @@ spec:
                       bucket:
                         type: string
                       disableSSL:
-                        type: string
+                        type: boolean
                       endpoint:
                         type: string
                       forcePathStyle:
-                        type: string
+                        type: boolean
                       region:
                         type: string
                       secret:

config/crd/bases/pgv2.percona.com_perconapgclusters.yaml

@@ -10708,11 +10708,11 @@ spec:
                       bucket:
                         type: string
                       disableSSL:
-                        type: string
+                        type: boolean
                       endpoint:
                         type: string
                       forcePathStyle:
-                        type: string
+                        type: boolean
                       region:
                         type: string
                       secret:

deploy/bundle.yaml

@@ -11005,11 +11005,11 @@ spec:
                       bucket:
                         type: string
                       disableSSL:
-                        type: string
+                        type: boolean
                       endpoint:
                         type: string
                       forcePathStyle:
-                        type: string
+                        type: boolean
                       region:
                         type: string
                       secret:

deploy/crd.yaml

@@ -11005,11 +11005,11 @@ spec:
                       bucket:
                         type: string
                       disableSSL:
-                        type: string
+                        type: boolean
                       endpoint:
                         type: string
                       forcePathStyle:
-                        type: string
+                        type: boolean
                       region:
                         type: string
                       secret:

deploy/cw-bundle.yaml

@@ -11005,11 +11005,11 @@ spec:
                       bucket:
                         type: string
                       disableSSL:
-                        type: string
+                        type: boolean
                       endpoint:
                         type: string
                       forcePathStyle:
-                        type: string
+                        type: boolean
                       region:
                         type: string
                       secret:

e2e-tests/functions

@@ -292,7 +292,7 @@ get_cr() {
 			yq eval -i '
 				.spec.extensions.image = "'$IMAGE'" |
 				.spec.extensions.imagePullPolicy = "Always" |
-				.spec.extensions.storage = {"type": "s3", "bucket": "operator-testing", "region": "us-east-1", "endpoint": "http://minio-service:9000", "forcePathStyle": "true", "disableSSL": "true", "secret": {"name": "minio-secret"}}
+				.spec.extensions.storage = {"type": "s3", "bucket": "operator-testing", "region": "us-east-1", "endpoint": "http://minio-service:9000", "forcePathStyle": true, "disableSSL": true, "secret": {"name": "minio-secret"}}
 			    ' $TEMP_DIR/cr.yaml
 			;;
 	esac

percona/extensions/containers.go

@@ -106,17 +106,17 @@ func InstallerContainer(cr *pgv2.PerconaPGCluster, postgresVersion int, spec *pg
 	if cr.CompareVersion("2.8.0") >= 0 {
 		// Check whether the configuration exists so that existing e2e tests
 		// that do not set these values are not affected.
-		if spec.Storage.DisableSSL != "" {
+		if spec.Storage.DisableSSL {
 			container.Env = append(container.Env, corev1.EnvVar{
 				Name:  "STORAGE_DISABLE_SSL",
-				Value: spec.Storage.DisableSSL,
+				Value: strconv.FormatBool(spec.Storage.DisableSSL),
 			})
 		}
 
-		if spec.Storage.ForcePathStyle != "" {
+		if spec.Storage.ForcePathStyle {
 			container.Env = append(container.Env, corev1.EnvVar{
 				Name:  "STORAGE_FORCE_PATH_STYLE",
-				Value: spec.Storage.ForcePathStyle,
+				Value: strconv.FormatBool(spec.Storage.ForcePathStyle),
 			})
 		}
 	}

pkg/apis/pgv2.percona.com/v2/perconapgcluster_types.go

@@ -659,8 +659,8 @@ type CustomExtensionsStorageSpec struct {
 	Bucket         string                   `json:"bucket,omitempty"`
 	Region         string                   `json:"region,omitempty"`
 	Endpoint       string                   `json:"endpoint,omitempty"`
-	ForcePathStyle string                   `json:"forcePathStyle,omitempty"`
-	DisableSSL     string                   `json:"disableSSL,omitempty"`
+	ForcePathStyle bool                     `json:"forcePathStyle,omitempty"`
+	DisableSSL     bool                     `json:"disableSSL,omitempty"`
 	Secret         *corev1.SecretProjection `json:"secret,omitempty"`
 }