chore: use jvm image for SGStream

teoincontatto · teoincontatto · commit da20d27fa738 · 2024-07-16T14:04:40.000+02:00
diff --git a/.gitlab-ci/deploy.yml b/.gitlab-ci/deploy.yml
@@ -100,6 +100,7 @@ deploy stream jvm image:
   extends: .deploy jvm image
   variables:
     IMAGE_NAME: "stackgres/stream"
+    TARGET_REGISTRIES: "quay.io"
 
 .deploy native image:
   extends: .deploy image
@@ -136,10 +137,11 @@ deploy distributedlogs-controller native image:
   variables:
     IMAGE_NAME: "stackgres/distributedlogs-controller"
 
-deploy stream native image:
+.deploy stream native image:
   extends: .deploy native image
   variables:
     IMAGE_NAME: "stackgres/stream"
+    TARGET_REGISTRIES: "quay.io"
 
 deploy admin-ui image:
   extends: .deploy native image
diff --git a/.gitlab-ci/image-build.yml b/.gitlab-ci/image-build.yml
@@ -160,7 +160,7 @@ build distributedlogs-controller native image amd64:
     LOCK_FILE: stackgres-distributedlogs-controller-build-native-image
     IMAGE_MODULE_NAME: distributedlogs-controller-native-image
 
-build stream native image amd64:
+.build stream native image amd64:
   extends: .build native image amd64
   variables:
     IMAGE_BASE_NAME: stackgres/stream
@@ -285,7 +285,7 @@ build distributedlogs-controller native image arm64:
     LOCK_FILE: stackgres-distributedlogs-controller-build-native-image
     IMAGE_MODULE_NAME: distributedlogs-controller-native-image
 
-build stream native image arm64:
+.build stream native image arm64:
   extends: .build native image arm64
   variables:
     IMAGE_BASE_NAME: stackgres/stream
@@ -383,7 +383,7 @@ build distributedlogs-controller native image multi archs:
   variables:
     IMAGE_BASE_NAME: stackgres/distributedlogs-controller
 
-build stream native image multi archs:
+.build stream native image multi archs:
   extends: .build native image multi archs
   variables:
     IMAGE_BASE_NAME: stackgres/stream
diff --git a/.gitlab-ci/image-release.yml b/.gitlab-ci/image-release.yml
@@ -167,7 +167,7 @@ release distributedlogs-controller native image amd64:
     LOCK_FILE: stackgres-distributedlogs-controller-release-native-release-image
     IMAGE_MODULE_NAME: distributedlogs-controller-native-release-image
 
-release stream native image amd64:
+.release stream native image amd64:
   extends: .release native image amd64
   variables:
     IMAGE_BASE_NAME: stackgres/stream
@@ -300,7 +300,7 @@ release distributedlogs-controller native image arm64:
     LOCK_FILE: stackgres-distributedlogs-controller-release-native-release-image
     IMAGE_MODULE_NAME: distributedlogs-controller-native-release-image
 
-release stream native image arm64:
+.release stream native image arm64:
   extends: .release native image arm64
   variables:
     IMAGE_BASE_NAME: stackgres/stream
@@ -406,7 +406,7 @@ release distributedlogs-controller native image multi archs:
   variables:
     IMAGE_BASE_NAME: stackgres/distributedlogs-controller
 
-release stream native image multi archs:
+.release stream native image multi archs:
   extends: .release native image multi archs
   variables:
     IMAGE_BASE_NAME: stackgres/stream
diff --git a/.gitlab-ci/native-build.yml b/.gitlab-ci/native-build.yml
@@ -80,7 +80,7 @@ build distributedlogs-controller native executable amd64:
     MAVEN_EXTRA_ARGS: "-pl .,common,operator-framework,test-util,distributedlogs-controller"
     MODULE: "distributedlogs-controller-native"
 
-build stream native executable amd64:
+.build stream native executable amd64:
   extends: .build native executable amd64
   variables:
     NATIVE_IMAGE_EXTRA_PREFIX: "-stream"
@@ -135,7 +135,7 @@ build distributedlogs-controller native executable arm64:
     MAVEN_EXTRA_ARGS: "-pl .,common,operator-framework,test-util,distributedlogs-controller"
     MODULE: "distributedlogs-controller-native"
 
-build stream native executable arm64:
+.build stream native executable arm64:
   extends: .build native executable arm64
   variables:
     NATIVE_IMAGE_EXTRA_PREFIX: "-stream"
diff --git a/stackgres-k8s/e2e/spec/operator-demo b/stackgres-k8s/e2e/spec/operator-demo
@@ -34,6 +34,7 @@ test_yamls() {
 
   echo "Mocking stackgres-operator-demo.yml"
   OPERATOR_IMAGE_VERSION_LN="$(( $(grep -n 'name: OPERATOR_IMAGE_VERSION$' "${STACKGRES_YAMLS}/stackgres-operator-demo.yml" | cut -d : -f 1) + 1))"
+  OPERATOR_JVM_IMAGE_VERSION_LN="$(( $(grep -n 'name: OPERATOR_JVM_IMAGE_VERSION$' "${STACKGRES_YAMLS}/stackgres-operator-demo.yml" | cut -d : -f 1) + 1))"
   OPERATOR_IMAGE_TAG_LN="$(( $(grep -n 'name: stackgres/operator$' "${STACKGRES_YAMLS}/stackgres-operator-demo.yml" | cut -d : -f 1) + 2))"
   RESTAPI_IMAGE_TAG_LN="$(( $(grep -n 'name: stackgres/restapi$' "${STACKGRES_YAMLS}/stackgres-operator-demo.yml" | cut -d : -f 1) + 2))"
   JOBS_IMAGE_TAG_LN="$(( $(grep -n 'name: stackgres/jobs$' "${STACKGRES_YAMLS}/stackgres-operator-demo.yml" | cut -d : -f 1) + 2))"
@@ -44,6 +45,7 @@ test_yamls() {
     | sed "/name: SGCONFIG_NAMESPACE$/{\$!{N;s/name: SGCONFIG_NAMESPACE\n\( *\)value: stackgres$/name: SGCONFIG_NAMESPACE\n\1value: $OPERATOR_NAMESPACE/;ty;P;D;:y}}" \
     | sed "s|image: \"\([^/]\+/\)\?stackgres/operator:.*\"$|image: '$OPERATOR_IMAGE_NAME'|" \
     | sed "${OPERATOR_IMAGE_VERSION_LN}s/value: .*$/value: '$IMAGE_TAG'/" \
+    | sed "${OPERATOR_JVM_IMAGE_VERSION_LN}s/value: .*$/value: '${IMAGE_TAG%-jvm}-jvm'/" \
     | sed "s|imagePullPolicy:.*[a-zA-Z].*$|imagePullPolicy: $E2E_OPERATOR_PULL_POLICY|" \
     | sed "${OPERATOR_IMAGE_TAG_LN}s/tag: .*$/tag: '$IMAGE_TAG'/" \
     | sed "${RESTAPI_IMAGE_TAG_LN}s/tag: .*$/tag: '$IMAGE_TAG'/" \
@@ -66,6 +68,7 @@ test_yamls() {
   grep -qF "namespace: $OPERATOR_NAMESPACE" "${LOG_PATH}/stackgres-operator-demo.yml"
   grep -qF "value: $OPERATOR_NAMESPACE" "${LOG_PATH}/stackgres-operator-demo.yml"
   grep -qF "value: '$IMAGE_TAG'" "${LOG_PATH}/stackgres-operator-demo.yml"
+  grep -qF "value: '${IMAGE_TAG%-jvm}-jvm'" "${LOG_PATH}/stackgres-operator-demo.yml"
   grep -qF "imagePullPolicy: $E2E_OPERATOR_PULL_POLICY" "${LOG_PATH}/stackgres-operator-demo.yml"
   if [ "$IMAGE_TAG" != "$ADMINUI_IMAGE_TAG" ]
   then
diff --git a/stackgres-k8s/e2e/utils/operator b/stackgres-k8s/e2e/utils/operator
@@ -4,7 +4,8 @@
 # shellcheck disable=SC2164
 
 export IMAGE_TAG="${IMAGE_TAG:-main-jvm}"
-export ADMINUI_IMAGE_TAG="${IMAGE_TAG%-jvm}"
+export NATIVE_IMAGE_TAG="${IMAGE_TAG%-jvm}"
+export ADMINUI_IMAGE_TAG="$NATIVE_IMAGE_TAG"
 export OPERATOR_PUBLIC_REGISTRY="${OPERATOR_PUBLIC_REGISTRY:-quay.io}"
 export OPERATOR_PUBLIC_REGISTRY_PATH="${OPERATOR_PUBLIC_REGISTRY_PATH:-/stackgres}"
 export COMPONENT_PUBLIC_REGISTRY="${COMPONENT_PUBLIC_REGISTRY:-quay.io}"
@@ -14,7 +15,7 @@ export RESTAPI_IMAGE_NAME="${OPERATOR_PUBLIC_REGISTRY}${OPERATOR_PUBLIC_REGISTRY
 export JOBS_IMAGE_NAME="${OPERATOR_PUBLIC_REGISTRY}${OPERATOR_PUBLIC_REGISTRY_PATH}/jobs:$IMAGE_TAG"
 export CLUSTER_CONTROLLER_IMAGE_NAME="${OPERATOR_PUBLIC_REGISTRY}${OPERATOR_PUBLIC_REGISTRY_PATH}/cluster-controller:$IMAGE_TAG"
 export DISTRIBUTEDLOGS_CONTROLLER_IMAGE_NAME="${OPERATOR_PUBLIC_REGISTRY}${OPERATOR_PUBLIC_REGISTRY_PATH}/distributedlogs-controller:$IMAGE_TAG"
-export STREAM_IMAGE_NAME="${OPERATOR_PUBLIC_REGISTRY}${OPERATOR_PUBLIC_REGISTRY_PATH}/stream:$IMAGE_TAG"
+export STREAM_IMAGE_NAME="${OPERATOR_PUBLIC_REGISTRY}${OPERATOR_PUBLIC_REGISTRY_PATH}/stream:${NATIVE_IMAGE_TAG}-jvm"
 export ADMINUI_IMAGE_NAME="${OPERATOR_PUBLIC_REGISTRY}${OPERATOR_PUBLIC_REGISTRY_PATH}/admin-ui:$ADMINUI_IMAGE_TAG"
 
 export STACKGRES_PATH="${STACKGRES_PATH:-$E2E_PATH/..}"
@@ -986,7 +987,7 @@ get_operator_images() {
   echo "${JOBS_IMAGE_NAME%:*}:$TAG"
   echo "${CLUSTER_CONTROLLER_IMAGE_NAME%:*}:$TAG"
   echo "${DISTRIBUTEDLOGS_CONTROLLER_IMAGE_NAME%:*}:$TAG"
-  echo "${STREAM_IMAGE_NAME%:*}:$TAG"
+  echo "${STREAM_IMAGE_NAME%:*}:${NATIVE_TAG}-jvm"
   echo "${ADMINUI_IMAGE_NAME%:*}:$NATIVE_TAG"
 }
 
@@ -1007,8 +1008,8 @@ get_operator_images_pre_1_0_0_alpha2() {
   echo "${OPERATOR_IMAGE_NAME%:*}:$VERSION"
   echo "${RESTAPI_IMAGE_NAME%:*}:$VERSION"
   echo "${JOBS_IMAGE_NAME%:*}:$VERSION"
+  echo "${CLUSTER_CONTROLLER_IMAGE_NAME%:*}:$VERSION"
   echo "${DISTRIBUTEDLOGS_CONTROLLER_IMAGE_NAME%:*}:$VERSION"
-  echo "${STREAM_IMAGE_NAME%:*}:$VERSION"
   echo "${ADMINUI_IMAGE_NAME%:*}:$VERSION"
 }
 
diff --git a/stackgres-k8s/install/helm/stackgres-operator/templates/initialize-operator.yaml b/stackgres-k8s/install/helm/stackgres-operator/templates/initialize-operator.yaml
@@ -64,6 +64,8 @@ spec:
                 fieldPath: metadata.namespace
           - name: OPERATOR_IMAGE_VERSION
             value: "{{ .Values.operator.image.tag }}"
+          - name: OPERATOR_JVM_IMAGE_VERSION
+            value: "{{ .Values.operator.image.tag }}{{ if not (hasSuffix .Values.operator.image.tag "-jvm") }}-jvm{{ end }}"
           - name: DISABLE_RECONCILIATION
             value: "true"
           - name: INSTALL_CRDS
diff --git a/stackgres-k8s/install/helm/stackgres-operator/templates/operator-deployment.yaml b/stackgres-k8s/install/helm/stackgres-operator/templates/operator-deployment.yaml
@@ -69,6 +69,8 @@ spec:
                 fieldPath: metadata.namespace
           - name: OPERATOR_IMAGE_VERSION
             value: "{{ .Values.operator.image.tag }}"
+          - name: OPERATOR_JVM_IMAGE_VERSION
+            value: "{{ .Values.operator.image.tag }}{{ if not (hasSuffix .Values.operator.image.tag "-jvm") }}-jvm{{ end }}"
           - name: DISABLE_RECONCILIATION
             value: "false"
           - name: INSTALL_CRDS
diff --git a/stackgres-k8s/install/operator-sdk/stackgres-operator/config/operator/operator.template.yaml b/stackgres-k8s/install/operator-sdk/stackgres-operator/config/operator/operator.template.yaml
@@ -101,6 +101,8 @@ fi
                 fieldPath: metadata.namespace
           - name: OPERATOR_IMAGE_VERSION
             value: "${VERSION}"
+          - name: OPERATOR_JVM_IMAGE_VERSION
+            value: "${VERSION%-jvm}-jvm"
           - name: OPERATOR_SERVICE_ACCOUNT
             valueFrom:
               fieldRef:
diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/StackGresModules.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/StackGresModules.java
@@ -20,7 +20,7 @@ public enum StackGresModules {
       "%1$s/stackgres/distributedlogs-controller:%2$s"),
   STREAM("stream",
       StackGresProperty.SG_IMAGE_STREAM,
-      StackGresProperty.OPERATOR_IMAGE_VERSION,
+      StackGresProperty.OPERATOR_JVM_IMAGE_VERSION,
       "%1$s/stackgres/stream:%2$s");
 
   final String name;
diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/StackGresProperty.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/StackGresProperty.java
@@ -11,6 +11,7 @@ public enum StackGresProperty implements StackGresPropertyReader {
 
   OPERATOR_VERSION("stackgres.operatorVersion"),
   OPERATOR_IMAGE_VERSION("stackgres.operatorImageVersion"),
+  OPERATOR_JVM_IMAGE_VERSION("stackgres.operatorJvmImageVersion"),
   DOCUMENTATION_URI("stackgres.documentation.uri"),
   DOCUMENTATION_ERRORS_PATH("stackgres.documentation.errorsPath"),
   SG_CONTAINER_REGISTRY("stackgres.containerRegistry"),
diff --git a/stackgres-k8s/src/common/src/main/resources/stackgres.properties b/stackgres-k8s/src/common/src/main/resources/stackgres.properties
@@ -10,6 +10,7 @@ stackgres.prometheus.allowAutobind=${stackgres.prometheus.allowAutobind}
 stackgres.containerRegistry=${stackgres.containerRegistry}
 stackgres.operatorVersion=${stackgres.operatorVersion}
 stackgres.operatorImageVersion=${stackgres.operatorImageVersion}
+stackgres.operatorJvmImageVersion=${stackgres.operatorJvmImageVersion}
 stackgres.group=${stackgres.group}
 stackgres.crd.version=${stackgres.crd.version}
 stackgres.documentation.uri=${stackgres.documentation.uri}
diff --git a/stackgres-k8s/src/distributedlogs-controller/src/main/resources/stackgres.properties b/stackgres-k8s/src/distributedlogs-controller/src/main/resources/stackgres.properties
@@ -7,6 +7,7 @@
 stackgres.containerRegistry=${stackgres.containerRegistry}
 stackgres.operatorVersion=${stackgres.operatorVersion}
 stackgres.operatorImageVersion=${stackgres.operatorImageVersion}
+stackgres.operatorJvmImageVersion=${stackgres.operatorJvmImageVersion}
 stackgres.containerBuild=${stackgres.containerBuild}
 stackgres.group=${stackgres.group}
 stackgres.crd.version=${stackgres.crd.version}
diff --git a/stackgres-k8s/src/operator/src/main/resources/stackgres.properties b/stackgres-k8s/src/operator/src/main/resources/stackgres.properties
@@ -10,6 +10,7 @@ stackgres.operatorIP=${stackgres.operatorIP}
 stackgres.containerRegistry=${stackgres.containerRegistry}
 stackgres.operatorVersion=${stackgres.operatorVersion}
 stackgres.operatorImageVersion=${stackgres.operatorImageVersion}
+stackgres.operatorJvmImageVersion=${stackgres.operatorJvmImageVersion}
 stackgres.group=${stackgres.group}
 stackgres.crd.version=${stackgres.crd.version}
 stackgres.prometheus.allowAutobind=${stackgres.prometheus.allowAutobind}
diff --git a/stackgres-k8s/src/pom.xml b/stackgres-k8s/src/pom.xml
@@ -54,6 +54,7 @@
     <stackgres.operatorCertificateSecretName>stackgres-operator-certs</stackgres.operatorCertificateSecretName>
     <stackgres.jobNamespace>stackgres</stackgres.jobNamespace>
     <stackgres.operatorImageVersion>main-jvm</stackgres.operatorImageVersion>
+    <stackgres.operatorJvmImageVersion>main-jvm</stackgres.operatorJvmImageVersion>
     <stackgres.operatorIP>localhost</stackgres.operatorIP>
     <stackgres.operatorVersion>${project.version}</stackgres.operatorVersion>
     <stackgres.documentation.uri>https://stackgres.io/doc/</stackgres.documentation.uri>
