Merge branch '2936-support-patroni-4' into 'main'

Support for Patroni 4 and refactor SGDistributedLogs to use SGCluster

Closes #2936 and #1190

See merge request ongresinc/stackgres!1626

Author: teoincontatto

.gitlab-ci/build.yml

@@ -14,7 +14,6 @@
         --extract restapi-java-test:'stackgres-k8s/src/restapi/target/surefire-reports/TEST-*.xml' \
         --extract jobs-java-test:'stackgres-k8s/src/jobs/target/surefire-reports/TEST-*.xml' \
         --extract cluster-controller-java-test:'stackgres-k8s/src/cluster-controller/target/surefire-reports/TEST-*.xml' \
-        --extract distributedlogs-controller-java-test:'stackgres-k8s/src/distributedlogs-controller/target/surefire-reports/TEST-*.xml' \
         --extract stream-java-test:'stackgres-k8s/src/stream/target/surefire-reports/TEST-*.xml' \
         --extract restapi-java:'stackgres-k8s/src/restapi/target/swagger*' \
         parent-java \
@@ -25,7 +24,6 @@
         restapi-java restapi-java-test \
         jobs-java jobs-java-test \
         cluster-controller-java cluster-controller-java-test \
-        distributedlogs-controller-java distributedlogs-controller-java-test \
         stream-java stream-java-test
       cp stackgres-k8s/ci/build/target/junit-build.hashes.xml."$(cat stackgres-k8s/ci/build/target/build_hash)" stackgres-k8s/ci/build/target/junit-build.hashes.xml
   retry:

.gitlab-ci/deploy.yml

@@ -91,11 +91,6 @@ deploy cluster-controller jvm image:
   variables:
     IMAGE_NAME: "stackgres/cluster-controller"
 
-deploy distributedlogs-controller jvm image:
-  extends: .deploy jvm image
-  variables:
-    IMAGE_NAME: "stackgres/distributedlogs-controller"
-
 deploy stream jvm image:
   extends: .deploy jvm image
   variables:
@@ -132,11 +127,6 @@ deploy cluster-controller native image:
   variables:
     IMAGE_NAME: "stackgres/cluster-controller"
 
-deploy distributedlogs-controller native image:
-  extends: .deploy native image
-  variables:
-    IMAGE_NAME: "stackgres/distributedlogs-controller"
-
 .deploy stream native image:
   extends: .deploy native image
   variables:

.gitlab-ci/image-build.yml

@@ -111,13 +111,6 @@ build cluster-controller jvm image amd64:
     LOCK_FILE: stackgres-cluster-controller-build-jvm-image
     IMAGE_MODULE_NAME: cluster-controller-jvm-image
 
-build distributedlogs-controller jvm image amd64:
-  extends: .build jvm image amd64
-  variables:
-    IMAGE_BASE_NAME: stackgres/distributedlogs-controller
-    LOCK_FILE: stackgres-distributedlogs-controller-build-jvm-image
-    IMAGE_MODULE_NAME: distributedlogs-controller-jvm-image
-
 build stream jvm image amd64:
   extends: .build jvm image amd64
   variables:
@@ -153,13 +146,6 @@ build cluster-controller native image amd64:
     LOCK_FILE: stackgres-cluster-controller-build-native-image
     IMAGE_MODULE_NAME: cluster-controller-native-image
 
-build distributedlogs-controller native image amd64:
-  extends: .build native image amd64
-  variables:
-    IMAGE_BASE_NAME: stackgres/distributedlogs-controller
-    LOCK_FILE: stackgres-distributedlogs-controller-build-native-image
-    IMAGE_MODULE_NAME: distributedlogs-controller-native-image
-
 .build stream native image amd64:
   extends: .build native image amd64
   variables:
@@ -236,13 +222,6 @@ build cluster-controller jvm image arm64:
     LOCK_FILE: stackgres-cluster-controller-build-jvm-image
     IMAGE_MODULE_NAME: cluster-controller-jvm-image
 
-build distributedlogs-controller jvm image arm64:
-  extends: .build jvm image arm64
-  variables:
-    IMAGE_BASE_NAME: stackgres/distributedlogs-controller
-    LOCK_FILE: stackgres-distributedlogs-controller-build-jvm-image
-    IMAGE_MODULE_NAME: distributedlogs-controller-jvm-image
-
 build stream jvm image arm64:
   extends: .build jvm image arm64
   variables:
@@ -278,13 +257,6 @@ build cluster-controller native image arm64:
     LOCK_FILE: stackgres-cluster-controller-build-native-image
     IMAGE_MODULE_NAME: cluster-controller-native-image
 
-build distributedlogs-controller native image arm64:
-  extends: .build native image arm64
-  variables:
-    IMAGE_BASE_NAME: stackgres/distributedlogs-controller
-    LOCK_FILE: stackgres-distributedlogs-controller-build-native-image
-    IMAGE_MODULE_NAME: distributedlogs-controller-native-image
-
 .build stream native image arm64:
   extends: .build native image arm64
   variables:
@@ -348,11 +320,6 @@ build cluster-controller jvm image multi archs:
   variables:
     IMAGE_BASE_NAME: stackgres/cluster-controller
 
-build distributedlogs-controller jvm image multi archs:
-  extends: .build jvm image multi archs
-  variables:
-    IMAGE_BASE_NAME: stackgres/distributedlogs-controller
-
 build stream jvm image multi archs:
   extends: .build jvm image multi archs
   variables:
@@ -378,11 +345,6 @@ build cluster-controller native image multi archs:
   variables:
     IMAGE_BASE_NAME: stackgres/cluster-controller
 
-build distributedlogs-controller native image multi archs:
-  extends: .build native image multi archs
-  variables:
-    IMAGE_BASE_NAME: stackgres/distributedlogs-controller
-
 .build stream native image multi archs:
   extends: .build native image multi archs
   variables:

.gitlab-ci/image-release.yml

@@ -118,13 +118,6 @@ release cluster-controller jvm image amd64:
     LOCK_FILE: stackgres-cluster-controller-release-jvm-release-image
     IMAGE_MODULE_NAME: cluster-controller-jvm-release-image
 
-release distributedlogs-controller jvm image amd64:
-  extends: .release jvm image amd64
-  variables:
-    IMAGE_BASE_NAME: stackgres/distributedlogs-controller
-    LOCK_FILE: stackgres-distributedlogs-controller-release-jvm-release-image
-    IMAGE_MODULE_NAME: distributedlogs-controller-jvm-release-image
-
 release stream jvm image amd64:
   extends: .release jvm image amd64
   variables:
@@ -160,13 +153,6 @@ release cluster-controller native image amd64:
     LOCK_FILE: stackgres-cluster-controller-release-native-release-image
     IMAGE_MODULE_NAME: cluster-controller-native-release-image
 
-release distributedlogs-controller native image amd64:
-  extends: .release native image amd64
-  variables:
-    IMAGE_BASE_NAME: stackgres/distributedlogs-controller
-    LOCK_FILE: stackgres-distributedlogs-controller-release-native-release-image
-    IMAGE_MODULE_NAME: distributedlogs-controller-native-release-image
-
 .release stream native image amd64:
   extends: .release native image amd64
   variables:
@@ -251,13 +237,6 @@ release cluster-controller jvm image arm64:
     LOCK_FILE: stackgres-cluster-controller-release-jvm-release-image
     IMAGE_MODULE_NAME: cluster-controller-jvm-release-image
 
-release distributedlogs-controller jvm image arm64:
-  extends: .release jvm image arm64
-  variables:
-    IMAGE_BASE_NAME: stackgres/distributedlogs-controller
-    LOCK_FILE: stackgres-distributedlogs-controller-release-jvm-release-image
-    IMAGE_MODULE_NAME: distributedlogs-controller-jvm-release-image
-
 release stream jvm image arm64:
   extends: .release jvm image arm64
   variables:
@@ -293,13 +272,6 @@ release cluster-controller native image arm64:
     LOCK_FILE: stackgres-cluster-controller-release-native-release-image
     IMAGE_MODULE_NAME: cluster-controller-native-release-image
 
-release distributedlogs-controller native image arm64:
-  extends: .release native image arm64
-  variables:
-    IMAGE_BASE_NAME: stackgres/distributedlogs-controller
-    LOCK_FILE: stackgres-distributedlogs-controller-release-native-release-image
-    IMAGE_MODULE_NAME: distributedlogs-controller-native-release-image
-
 .release stream native image arm64:
   extends: .release native image arm64
   variables:
@@ -371,11 +343,6 @@ release cluster-controller jvm image multi archs:
   variables:
     IMAGE_BASE_NAME: stackgres/cluster-controller
 
-release distributedlogs-controller jvm image multi archs:
-  extends: .release jvm image multi archs
-  variables:
-    IMAGE_BASE_NAME: stackgres/distributedlogs-controller
-
 release stream jvm image multi archs:
   extends: .release jvm image multi archs
   variables:
@@ -401,11 +368,6 @@ release cluster-controller native image multi archs:
   variables:
     IMAGE_BASE_NAME: stackgres/cluster-controller
 
-release distributedlogs-controller native image multi archs:
-  extends: .release native image multi archs
-  variables:
-    IMAGE_BASE_NAME: stackgres/distributedlogs-controller
-
 .release stream native image multi archs:
   extends: .release native image multi archs
   variables:

.gitlab-ci/native-build.yml

@@ -73,13 +73,6 @@ build cluster-controller native executable amd64:
     MAVEN_EXTRA_ARGS: "-pl .,common,operator-framework,test-util,cluster-controller"
     MODULE: "cluster-controller-native"
 
-build distributedlogs-controller native executable amd64:
-  extends: .build native executable amd64
-  variables:
-    NATIVE_IMAGE_EXTRA_PREFIX: "-distributedlogs-controller"
-    MAVEN_EXTRA_ARGS: "-pl .,common,operator-framework,test-util,distributedlogs-controller"
-    MODULE: "distributedlogs-controller-native"
-
 .build stream native executable amd64:
   extends: .build native executable amd64
   variables:
@@ -128,13 +121,6 @@ build cluster-controller native executable arm64:
     MAVEN_EXTRA_ARGS: "-pl .,common,operator-framework,test-util,cluster-controller"
     MODULE: "cluster-controller-native"
 
-build distributedlogs-controller native executable arm64:
-  extends: .build native executable arm64
-  variables:
-    NATIVE_IMAGE_EXTRA_PREFIX: "-distributedlogs-controller"
-    MAVEN_EXTRA_ARGS: "-pl .,common,operator-framework,test-util,distributedlogs-controller"
-    MODULE: "distributedlogs-controller-native"
-
 .build stream native executable arm64:
   extends: .build native executable arm64
   variables:

doc/content/en/04-administration-guide/04-configuration/02-instance-profile/_index.md

@@ -72,9 +72,6 @@ spec:
     dbops.set-dbops-result:
       cpu: "1"
       memory: 256Mi
-    distributedlogs-controller:
-      cpu: 250m
-      memory: 512Mi
     envoy:
       cpu: "1"
       memory: 64Mi
@@ -137,9 +134,6 @@ spec:
       dbops.set-dbops-result:
         cpu: "1"
         memory: 256Mi
-      distributedlogs-controller:
-        cpu: 250m
-        memory: 512Mi
       envoy:
         cpu: "1"
         memory: 64Mi

doc/content/en/07-developer-documentation/07-debug/_index.md

@@ -23,7 +23,6 @@ Here is a list of categories for each StackGres component:
 | operator                     | io.stackgres.operator                     |
 | restapi controller           | io.stackgres.apiweb                       |
 | cluster controller           | io.stackgres.cluster-controller           |
-| distributedlogs controller   | io.stackgres.distributedlogs-controller   |
 | patroni                      | io.stackgres.patroni                      |
 | wal-g                        | io.stackgres.wal-g                        |
 | envoy                        | io.stackgres.envoy                        |

stackgres-k8s/ci/build/README.md

@@ -12,7 +12,7 @@ This tool allows to build a hierarchy of modules, where each module depends on
 
 > EXAMPLE: If I just make a change in the `operator` module (let's say rename a variable) then
 >  `stackgres-parent`, `operator-framework`, `common`, `restapi`, `admin-ui`, `jobs`,
->  `cluster-controller` and `distributedlogs-controller` and all their respective dependencies
+>  `cluster-controller` and all their respective dependencies
 >  (the `java-image`, `native` and `native-image` module types) will not be rebuilt, only the
 >  `operator`, `operator-java-image`, `operator-native` and `operator-native-image` modules will be
 >  rebuilt.