feat: allow to override SGInstanceProfile, SGPostgresConfig and SGPoolingConfig

Author: teoincontatto

stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterConfigurations.java

@@ -13,6 +13,8 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.quarkus.runtime.annotations.RegisterForReflection;
 import io.stackgres.common.StackGresUtil;
+import io.stackgres.common.crd.sgpgconfig.StackGresPostgresConfigSpec;
+import io.stackgres.common.crd.sgpooling.StackGresPoolingConfigSpec;
 import io.stackgres.common.validation.FieldReference;
 import io.stackgres.common.validation.FieldReference.ReferencedField;
 import io.sundr.builder.annotations.Buildable;
@@ -31,6 +33,10 @@ public class StackGresClusterConfigurations {
 
   private String sgPoolingConfig;
 
+  private StackGresPostgresConfigSpec postgres;
+
+  private StackGresPoolingConfigSpec pooling;
+
   @Valid
   private List<StackGresClusterBackupConfiguration> backups;
 
@@ -76,6 +82,22 @@ public void setSgPoolingConfig(String sgPoolingConfig) {
     this.sgPoolingConfig = sgPoolingConfig;
   }
 
+  public StackGresPostgresConfigSpec getPostgres() {
+    return postgres;
+  }
+
+  public void setPostgres(StackGresPostgresConfigSpec postgres) {
+    this.postgres = postgres;
+  }
+
+  public StackGresPoolingConfigSpec getPooling() {
+    return pooling;
+  }
+
+  public void setPooling(StackGresPoolingConfigSpec pooling) {
+    this.pooling = pooling;
+  }
+
   public List<StackGresClusterBackupConfiguration> getBackups() {
     return backups;
   }
@@ -127,8 +149,8 @@ public void setPostgresExporter(StackGresClusterPostgresExporter postgresExporte
 
   @Override
   public int hashCode() {
-    return Objects.hash(backups, binding, credentials, observability, patroni, postgresExporter,
-        sgPoolingConfig, sgPostgresConfig);
+    return Objects.hash(backups, binding, credentials, observability, patroni, pooling, postgres,
+        postgresExporter, sgPoolingConfig, sgPostgresConfig);
   }
 
   @Override
@@ -143,7 +165,8 @@ public boolean equals(Object obj) {
     return Objects.equals(backups, other.backups) && Objects.equals(binding, other.binding)
         && Objects.equals(credentials, other.credentials)
         && Objects.equals(observability, other.observability)
-        && Objects.equals(patroni, other.patroni)
+        && Objects.equals(patroni, other.patroni) && Objects.equals(pooling, other.pooling)
+        && Objects.equals(postgres, other.postgres)
         && Objects.equals(postgresExporter, other.postgresExporter)
         && Objects.equals(sgPoolingConfig, other.sgPoolingConfig)
         && Objects.equals(sgPostgresConfig, other.sgPostgresConfig);

stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterResources.java

@@ -5,10 +5,12 @@
 
 package io.stackgres.common.crd.sgcluster;
 
+import java.util.Map;
 import java.util.Objects;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
+import io.fabric8.kubernetes.api.model.ResourceRequirements;
 import io.quarkus.runtime.annotations.RegisterForReflection;
 import io.stackgres.common.StackGresUtil;
 import io.sundr.builder.annotations.Buildable;
@@ -21,12 +23,32 @@
     builderPackage = "io.fabric8.kubernetes.api.builder")
 public class StackGresClusterResources {
 
+  private Map<String, ResourceRequirements> containers;
+
+  private Map<String, ResourceRequirements> initContainers;
+
   private Boolean enableClusterLimitsRequirements;
 
   private Boolean disableResourcesRequestsSplitFromTotal;
 
   private Boolean failWhenTotalIsHigher;
 
+  public Map<String, ResourceRequirements> getContainers() {
+    return containers;
+  }
+
+  public void setContainers(Map<String, ResourceRequirements> containers) {
+    this.containers = containers;
+  }
+
+  public Map<String, ResourceRequirements> getInitContainers() {
+    return initContainers;
+  }
+
+  public void setInitContainers(Map<String, ResourceRequirements> initContainers) {
+    this.initContainers = initContainers;
+  }
+
   public Boolean getEnableClusterLimitsRequirements() {
     return enableClusterLimitsRequirements;
   }
@@ -54,8 +76,8 @@ public void setFailWhenTotalIsHigher(Boolean failWhenTotalIsHigher) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(disableResourcesRequestsSplitFromTotal, enableClusterLimitsRequirements,
-        failWhenTotalIsHigher);
+    return Objects.hash(containers, disableResourcesRequestsSplitFromTotal,
+        enableClusterLimitsRequirements, failWhenTotalIsHigher, initContainers);
   }
 
   @Override
@@ -67,10 +89,12 @@ public boolean equals(Object obj) {
       return false;
     }
     StackGresClusterResources other = (StackGresClusterResources) obj;
-    return Objects.equals(disableResourcesRequestsSplitFromTotal,
-        other.disableResourcesRequestsSplitFromTotal)
+    return Objects.equals(containers, other.containers)
+        && Objects.equals(disableResourcesRequestsSplitFromTotal,
+            other.disableResourcesRequestsSplitFromTotal)
         && Objects.equals(enableClusterLimitsRequirements, other.enableClusterLimitsRequirements)
-        && Objects.equals(failWhenTotalIsHigher, other.failWhenTotalIsHigher);
+        && Objects.equals(failWhenTotalIsHigher, other.failWhenTotalIsHigher)
+        && Objects.equals(initContainers, other.initContainers);
   }
 
   @Override

stackgres-k8s/src/common/src/main/resources/crds/SGCluster.yaml

@@ -842,6 +842,15 @@ spec:
                     type: object
                     description: Pod custom resources configuration.
                     properties:
+                      containers:
+                        type: object
+                        description: Resources configuration to be merged with the specified container on top of SGInstanceProfile referenced by `sgInstanceProfile` field if specified.
+                        additionalProperties: &resources #!jq_placeholder .definitions["io.k8s.api.core.v1.Container"].properties.resources
+                          {"description":"ResourceRequirements describes the compute resource requirements.","properties":{"claims":{"description":"Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container.\n\nThis is an alpha field and requires enabling the DynamicResourceAllocation feature gate.\n\nThis field is immutable. It can only be set for containers.","items":{"description":"ResourceClaim references one entry in PodSpec.ResourceClaims.","properties":{"name":{"description":"Name must match the name of one entry in pod.spec.resourceClaims of the Pod where this field is used. It makes that resource available inside a container.","type":"string"},"request":{"description":"Request is the name chosen for a request in the referenced claim. If empty, everything from the claim is made available, otherwise only the result of this request.","type":"string"}},"required":["name"],"type":"object"},"type":"array"},"limits":{"additionalProperties":{"description":"Quantity is a fixed-point representation of a number. It provides convenient marshaling/unmarshaling in JSON and YAML, in addition to String() and AsInt64() accessors.\n\nThe serialization format is:\n\n``` <quantity>        ::= <signedNumber><suffix>\n\n\t(Note that <suffix> may be empty, from the \"\" case in <decimalSI>.)\n\n<digit>           ::= 0 | 1 | ... | 9 <digits>          ::= <digit> | <digit><digits> <number>          ::= <digits> | <digits>.<digits> | <digits>. | .<digits> <sign>            ::= \"+\" | \"-\" <signedNumber>    ::= <number> | <sign><number> <suffix>          ::= <binarySI> | <decimalExponent> | <decimalSI> <binarySI>        ::= Ki | Mi | Gi | Ti | Pi | Ei\n\n\t(International System of units; See: http://physics.nist.gov/cuu/Units/binary.html)\n\n<decimalSI>       ::= m | \"\" | k | M | G | T | P | E\n\n\t(Note that 1024 = 1Ki but 1000 = 1k; I didn't choose the capitalization.)\n\n<decimalExponent> ::= \"e\" <signedNumber> | \"E\" <signedNumber> ```\n\nNo matter which of the three exponent forms is used, no quantity may represent a number greater than 2^63-1 in magnitude, nor may it have more than 3 decimal places. Numbers larger or more precise will be capped or rounded up. (E.g.: 0.1m will rounded up to 1m.) This may be extended in the future if we require larger or smaller quantities.\n\nWhen a Quantity is parsed from a string, it will remember the type of suffix it had, and will use the same type again when it is serialized.\n\nBefore serializing, Quantity will be put in \"canonical form\". This means that Exponent/suffix will be adjusted up or down (with a corresponding increase or decrease in Mantissa) such that:\n\n- No precision is lost - No fractional digits will be emitted - The exponent (or suffix) is as large as possible.\n\nThe sign will be omitted unless the number is negative.\n\nExamples:\n\n- 1.5 will be serialized as \"1500m\" - 1.5Gi will be serialized as \"1536Mi\"\n\nNote that the quantity will NEVER be internally represented by a floating point number. That is the whole point of this exercise.\n\nNon-canonical values will still parse as long as they are well formed, but will be re-emitted in their canonical form. (So always use canonical form, or don't diff.)\n\nThis format is intended to make it difficult to use these numbers without writing some sort of special handling code in the hopes that that will cause implementors to also use a fixed point implementation.","type":"string"},"description":"Limits describes the maximum amount of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/","type":"object"},"requests":{"additionalProperties":{"description":"Quantity is a fixed-point representation of a number. It provides convenient marshaling/unmarshaling in JSON and YAML, in addition to String() and AsInt64() accessors.\n\nThe serialization format is:\n\n``` <quantity>        ::= <signedNumber><suffix>\n\n\t(Note that <suffix> may be empty, from the \"\" case in <decimalSI>.)\n\n<digit>           ::= 0 | 1 | ... | 9 <digits>          ::= <digit> | <digit><digits> <number>          ::= <digits> | <digits>.<digits> | <digits>. | .<digits> <sign>            ::= \"+\" | \"-\" <signedNumber>    ::= <number> | <sign><number> <suffix>          ::= <binarySI> | <decimalExponent> | <decimalSI> <binarySI>        ::= Ki | Mi | Gi | Ti | Pi | Ei\n\n\t(International System of units; See: http://physics.nist.gov/cuu/Units/binary.html)\n\n<decimalSI>       ::= m | \"\" | k | M | G | T | P | E\n\n\t(Note that 1024 = 1Ki but 1000 = 1k; I didn't choose the capitalization.)\n\n<decimalExponent> ::= \"e\" <signedNumber> | \"E\" <signedNumber> ```\n\nNo matter which of the three exponent forms is used, no quantity may represent a number greater than 2^63-1 in magnitude, nor may it have more than 3 decimal places. Numbers larger or more precise will be capped or rounded up. (E.g.: 0.1m will rounded up to 1m.) This may be extended in the future if we require larger or smaller quantities.\n\nWhen a Quantity is parsed from a string, it will remember the type of suffix it had, and will use the same type again when it is serialized.\n\nBefore serializing, Quantity will be put in \"canonical form\". This means that Exponent/suffix will be adjusted up or down (with a corresponding increase or decrease in Mantissa) such that:\n\n- No precision is lost - No fractional digits will be emitted - The exponent (or suffix) is as large as possible.\n\nThe sign will be omitted unless the number is negative.\n\nExamples:\n\n- 1.5 will be serialized as \"1500m\" - 1.5Gi will be serialized as \"1536Mi\"\n\nNote that the quantity will NEVER be internally represented by a floating point number. That is the whole point of this exercise.\n\nNon-canonical values will still parse as long as they are well formed, but will be re-emitted in their canonical form. (So always use canonical form, or don't diff.)\n\nThis format is intended to make it difficult to use these numbers without writing some sort of special handling code in the hopes that that will cause implementors to also use a fixed point implementation.","type":"string"},"description":"Requests describes the minimum amount of compute resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/","type":"object"}},"type":"object"}
+                      initContainers:
+                        type: object
+                        description: Resources configuration to be merged with the specified init container on top of SGInstanceProfile referenced by `sgInstanceProfile` field if specified.
+                        additionalProperties: *resources
                       enableClusterLimitsRequirements:
                         type: boolean
                         description: |
@@ -1080,6 +1089,56 @@ spec:
                       If not set, a default configuration will be used. Disabling connection pooling altogether is possible if the disableConnectionPooling property of the pods object is set to true.
 
                       **Changing this field may require a restart.**
+                  postgres:
+                    type: object
+                    description: Section for postgres configuration.
+                    properties:
+                      postgresql.conf:
+                        type: object
+                        additionalProperties:
+                          type: string
+                        description: |
+                          The `postgresql.conf` parameters that overwrite those specified in the referenced [SGPostgresConfig](https://stackgres.io/doc/latest/reference/crd/sgpgconfig).
+    
+                          **Changing this field may require a restart.**
+                  pooling:
+                    type: object
+                    properties:
+                      pgBouncer:
+                        type: object
+                        properties:
+                          pgbouncer.ini:
+                            type: object
+                            description: |
+                              The `pgbouncer.ini` parameters that overwrite those specified in the referenced [SGPoolingConfig](https://stackgres.io/doc/latest/reference/crd/sgpoolconfig).
+
+                              **Changing this field may require a restart.**
+                            properties:
+                              pgbouncer:
+                                type: object
+                                additionalProperties: true
+                                description: |
+                                  The `pgbouncer.ini` (Section [pgbouncer]) parameters the configuration contains, represented as an object where the keys are valid names for the `pgbouncer.ini` configuration file parameters.
+
+                                  Check [pgbouncer configuration](https://www.pgbouncer.org/config.html#generic-settings) for more information about supported parameters
+                              databases:
+                                type: object
+                                additionalProperties:
+                                  type: object
+                                  additionalProperties: true
+                                description: |
+                                  The `pgbouncer.ini` (Section [databases]) parameters the configuration contains, represented as an object where the keys are valid names for the `pgbouncer.ini` configuration file parameters.
+
+                                  Check [pgbouncer configuration](https://www.pgbouncer.org/config.html#section-databases) for more information about supported parameters.
+                              users:
+                                type: object
+                                additionalProperties:
+                                  type: object
+                                  additionalProperties: true
+                                description: |
+                                  The `pgbouncer.ini` (Section [users]) parameters the configuration contains, represented as an object where the keys are valid names for the `pgbouncer.ini` configuration file parameters.
+
+                                  Check [pgbouncer configuration](https://www.pgbouncer.org/config.html#section-users) for more information about supported parameters.
                   postgresExporter:
                     type: object
                     description: Section to configure the [postgres_exporter](https://github.com/prometheus-community/postgres_exporter) component.