Skip to content

Commit c3502f0

Browse files
teoincontattoteoincontatto
committed
Merge branch '2893-update-quarkus-to-3-15-1' into 'main'
chore: Update Quarkus and dependencies Closes #2893 See merge request ongresinc/stackgres!1684
2 parents 808f42c + 771e28b commit c3502f0

295 files changed

Lines changed: 3128 additions & 4551 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitlab-ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ image: null
22

33
variables:
44
SG_CI_IMAGE_NAME: "ci:1.32"
5-
BUILDER_IMAGE_NAME: "builder:1.9"
5+
BUILDER_IMAGE_NAME: "builder:1.10"
66
SKIP_NATIVE: "false"
77
SKIP_E2E: "false"
88
SKIP_DEPLOY: "false"

‎stackgres-k8s/ci/build/Dockerfile-builder‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
###
99

10-
FROM quay.io/quarkus/ubi-quarkus-mandrel-builder-image:jdk-21.0.4
10+
FROM quay.io/quarkus/ubi-quarkus-mandrel-builder-image:jdk-21.0.7
1111
USER root
1212
RUN microdnf --nodocs install python3-pip jq util-linux findutils && microdnf clean all
1313
RUN pip3 install yamllint yq

‎stackgres-k8s/ci/build/build-functions.sh‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,14 @@ module_image_name() {
3838
echo "${BUILDER_VERSION%.*}"
3939
echo "$SOURCE_IMAGE_NAME"
4040
jq -r ".modules[\"$MODULE\"]" stackgres-k8s/ci/build/target/config.json
41+
eval "cat << EOF
42+
$(jq -r ".modules[\"$MODULE\"].build_env | if . != null then . else {} end
43+
| to_entries
44+
| sort_by(.key)
45+
| map(\"export \" + .key + \"=\\\"\" + .value + \"\\\"\")
46+
| .[]" stackgres-k8s/ci/build/target/config.json)
47+
EOF
48+
"
4149
if [ "$MODULE_DOCKERFILE" != null ]
4250
then
4351
path_hash "$MODULE_DOCKERFILE"
@@ -151,6 +159,7 @@ run_commands_in_container() {
151159
$(
152160
jq -r ".modules[\"$MODULE\"].build_env | if . != null then . else {} end
153161
| to_entries
162+
| sort_by(.key)
154163
| map(\"export \" + .key + \"=\\\"\" + .value + \"\\\"\")
155164
| .[]" stackgres-k8s/ci/build/target/config.json)
156165
EOF
@@ -778,6 +787,7 @@ get_module_hash() {
778787
779788
project_hash() {
780789
git --git-dir "stackgres-k8s/ci/build/target/.git" rev-parse HEAD:
790+
env -0 | sort -z | md5sum
781791
}
782792
783793
path_hash() {

‎stackgres-k8s/ci/build/config.yml‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
.images:
22
ci_image: &ci_image registry.gitlab.com/ongresinc/stackgres/ci:1.31
3-
jdk_build_image: &jdk_build_image registry.gitlab.com/ongresinc/stackgres/builder:1.9
3+
jdk_build_image: &jdk_build_image registry.gitlab.com/ongresinc/stackgres/builder:1.10
44
jdk_runtime_image: &jdk_runtime_image registry.access.redhat.com/ubi9/openjdk-21:1.21-3.1741781261
5-
ubi8_micro_image: &ubi8_micro_image registry.access.redhat.com/ubi8/ubi-micro:8.10-22
6-
ubi9_minimal_image: &ubi9_minimal_image registry.access.redhat.com/ubi9/ubi-minimal:9.5-1742914212
7-
admin_ui_build_image: &admin_ui_build_image registry.access.redhat.com/ubi8/nodejs-20:1-73.1742991506
8-
admin_ui_nginx_image: &admin_ui_nginx_image registry.access.redhat.com/ubi8/nginx-124:1-39.1741813445
9-
pglambda_nodejs_image: &pglambda_nodejs_image registry.access.redhat.com/ubi8/nodejs-18:1-137.1742991061
5+
ubi8_micro_image: &ubi8_micro_image registry.access.redhat.com/ubi8/ubi-micro:8.10-24
6+
ubi9_minimal_image: &ubi9_minimal_image registry.access.redhat.com/ubi9/ubi-minimal:9.5-1747111267
7+
admin_ui_build_image: &admin_ui_build_image registry.access.redhat.com/ubi8/nodejs-20:1-74.1747789194
8+
admin_ui_nginx_image: &admin_ui_nginx_image registry.access.redhat.com/ubi8/nginx-124:1-40
9+
pglambda_nodejs_image: &pglambda_nodejs_image registry.access.redhat.com/ubi8/nodejs-18:1-138.1747789193
1010
platforms:
1111
- linux/x86_64
1212
- linux/aarch64
@@ -68,9 +68,12 @@ modules:
6868
- sh stackgres-k8s/ci/build/redact-version.sh operator-framework
6969
sources:
7070
- stackgres-k8s/src/operator-framework/src/test
71+
build_env:
72+
<<: *mvn_build_env
73+
MAVEN_CLI_TEST_OPTS: '$MAVEN_CLI_TEST_OPTS'
7174
build_commands:
7275
- 'sh stackgres-k8s/ci/build/update-build-pom.sh'
73-
- 'stackgres-k8s/src/mvnw $MAVEN_CLI_OPTS verify -P safer -f "$MODULE_PATH/pom.xml.build"'
76+
- 'stackgres-k8s/src/mvnw $MAVEN_CLI_OPTS $MAVEN_CLI_TEST_OPTS verify -P safer -f "$MODULE_PATH/pom.xml.build"'
7477
artifacts:
7578
- stackgres-k8s/src/operator-framework/target
7679
test-util-java:

‎stackgres-k8s/src/checks/src/main/resources/checks/spotbugs-exclude.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,4 +122,12 @@
122122
<Match>
123123
<Bug pattern="CT_CONSTRUCTOR_THROW"/>
124124
</Match>
125+
126+
<Match>
127+
<Bug pattern="THROWS_METHOD_THROWS_RUNTIMEEXCEPTION" />
128+
</Match>
129+
130+
<Match>
131+
<Bug pattern="THROWS_METHOD_THROWS_CLAUSE_BASIC_EXCEPTION" />
132+
</Match>
125133
</FindBugsFilter>

‎stackgres-k8s/src/cluster-controller/pom.xml‎

Lines changed: 0 additions & 284 deletions
Original file line numberDiff line numberDiff line change
@@ -186,289 +186,5 @@
186186
<quarkus.package.jar.enabled>false</quarkus.package.jar.enabled>
187187
</properties>
188188
</profile>
189-
<profile>
190-
<id>build-image-jvm</id>
191-
<properties>
192-
<docker.removeVolumes>true</docker.removeVolumes>
193-
</properties>
194-
<build>
195-
<plugins>
196-
<plugin>
197-
<groupId>io.fabric8</groupId>
198-
<artifactId>docker-maven-plugin</artifactId>
199-
<version>${docker-maven-plugin.version}</version>
200-
<executions>
201-
<execution>
202-
<id>build-image</id>
203-
<phase>package</phase>
204-
<goals>
205-
<goal>stop</goal>
206-
<goal>build</goal>
207-
<goal>start</goal>
208-
<goal>stop</goal>
209-
</goals>
210-
<configuration>
211-
<containerNamePattern>%a</containerNamePattern>
212-
<images>
213-
<image>
214-
<alias>ongres-jvm-builder</alias>
215-
<name>ongres-jvm-builder</name>
216-
<build>
217-
<cleanup>remove</cleanup>
218-
<from>${docker.image}</from>
219-
<assembly>
220-
<targetDir>/cluster-controller</targetDir>
221-
<inline>
222-
<fileSets>
223-
<fileSet>
224-
<directory>${project.basedir}</directory>
225-
<outputDirectory>/</outputDirectory>
226-
<excludes>
227-
<exclude>target/docker/**</exclude>
228-
</excludes>
229-
</fileSet>
230-
</fileSets>
231-
</inline>
232-
</assembly>
233-
</build>
234-
<run>
235-
<privileged>true</privileged>
236-
<workingDir>/</workingDir>
237-
<entrypoint>
238-
<arg>/bin/sh</arg>
239-
<arg>-ex</arg>
240-
<arg>/cluster-controller/src/main/docker/build-image-jvm.sh</arg>
241-
</entrypoint>
242-
<wait>
243-
<time>300000</time>
244-
<exit>0</exit>
245-
</wait>
246-
<log>
247-
<prefix>image-builder|</prefix>
248-
<date>default</date>
249-
</log>
250-
<env>
251-
<CLUSTER_CONTROLLER_IMAGE_NAME>${env.CLUSTER_CONTROLLER_IMAGE_NAME}</CLUSTER_CONTROLLER_IMAGE_NAME>
252-
<DOCKER_HOST>${env.DOCKER_HOST}</DOCKER_HOST>
253-
</env>
254-
<volumes>
255-
<bind>
256-
<volume>/var/lib/containers</volume>
257-
<volume>/var/run/docker.sock:/var/run/docker.sock</volume>
258-
</bind>
259-
</volumes>
260-
</run>
261-
</image>
262-
</images>
263-
</configuration>
264-
</execution>
265-
</executions>
266-
</plugin>
267-
</plugins>
268-
</build>
269-
</profile>
270-
<profile>
271-
<id>build-image-native</id>
272-
<properties>
273-
<docker.removeVolumes>true</docker.removeVolumes>
274-
</properties>
275-
<build>
276-
<plugins>
277-
<plugin>
278-
<groupId>io.fabric8</groupId>
279-
<artifactId>docker-maven-plugin</artifactId>
280-
<version>${docker-maven-plugin.version}</version>
281-
<executions>
282-
<execution>
283-
<id>build-image</id>
284-
<phase>package</phase>
285-
<goals>
286-
<goal>stop</goal>
287-
<goal>build</goal>
288-
<goal>start</goal>
289-
<goal>stop</goal>
290-
</goals>
291-
<configuration>
292-
<containerNamePattern>%a</containerNamePattern>
293-
<images>
294-
<image>
295-
<alias>cluster-controller-native-builder</alias>
296-
<name>cluster-controller-native-builder</name>
297-
<build>
298-
<cleanup>remove</cleanup>
299-
<from>${docker.image}</from>
300-
<assembly>
301-
<targetDir>/cluster-controller</targetDir>
302-
<inline>
303-
<fileSets>
304-
<fileSet>
305-
<directory>${project.basedir}</directory>
306-
<outputDirectory>/</outputDirectory>
307-
<excludes>
308-
<exclude>target/docker/**</exclude>
309-
</excludes>
310-
</fileSet>
311-
</fileSets>
312-
</inline>
313-
</assembly>
314-
</build>
315-
<run>
316-
<privileged>true</privileged>
317-
<workingDir>/</workingDir>
318-
<entrypoint>
319-
<arg>/bin/sh</arg>
320-
<arg>-ex</arg>
321-
<arg>/cluster-controller/src/main/docker/build-image-native.sh</arg>
322-
</entrypoint>
323-
<wait>
324-
<time>600000</time>
325-
<exit>0</exit>
326-
</wait>
327-
<log>
328-
<prefix>image-builder|</prefix>
329-
<date>default</date>
330-
</log>
331-
<env>
332-
<CLUSTER_CONTROLLER_IMAGE_NAME>${env.CLUSTER_CONTROLLER_IMAGE_NAME}</CLUSTER_CONTROLLER_IMAGE_NAME>
333-
<DOCKER_HOST>${env.DOCKER_HOST}</DOCKER_HOST>
334-
</env>
335-
<volumes>
336-
<bind>
337-
<volume>/var/lib/containers</volume>
338-
<volume>/var/run/docker.sock:/var/run/docker.sock</volume>
339-
</bind>
340-
</volumes>
341-
</run>
342-
</image>
343-
</images>
344-
</configuration>
345-
</execution>
346-
</executions>
347-
</plugin>
348-
</plugins>
349-
</build>
350-
</profile>
351-
<profile>
352-
<id>kind-load-image-jvm</id>
353-
<build>
354-
<plugins>
355-
<plugin>
356-
<groupId>io.fabric8</groupId>
357-
<artifactId>docker-maven-plugin</artifactId>
358-
<version>${docker-maven-plugin.version}</version>
359-
<executions>
360-
<execution>
361-
<id>kind-load-image</id>
362-
<phase>package</phase>
363-
<goals>
364-
<goal>stop</goal>
365-
<goal>start</goal>
366-
<goal>stop</goal>
367-
</goals>
368-
<configuration>
369-
<containerNamePattern>%a</containerNamePattern>
370-
<images>
371-
<image>
372-
<alias>kind-load</alias>
373-
<name>${ci.image}</name>
374-
<run>
375-
<entrypoint>
376-
<arg>/bin/sh</arg>
377-
<arg>-exc</arg>
378-
<arg>
379-
CLUSTER_CONTROLLER_IMAGE_NAME="${CLUSTER_CONTROLLER_IMAGE_NAME:-"stackgres/cluster-controller:main-jvm"}"
380-
CONTAINER_NAME="$(docker inspect -f '{{.Name}}' "$(hostname)"|cut -d '/' -f 2|sed 's/^kind-load/kind/')"
381-
kind load docker-image --name "$CONTAINER_NAME" "$CLUSTER_CONTROLLER_IMAGE_NAME" || true
382-
</arg>
383-
</entrypoint>
384-
<wait>
385-
<time>300000</time>
386-
<exit>0</exit>
387-
</wait>
388-
<log>
389-
<prefix>kind-load|</prefix>
390-
<date>default</date>
391-
</log>
392-
<env>
393-
<CLUSTER_CONTROLLER_IMAGE_NAME>${env.CLUSTER_CONTROLLER_IMAGE_NAME}</CLUSTER_CONTROLLER_IMAGE_NAME>
394-
<DOCKER_HOST>${env.DOCKER_HOST}</DOCKER_HOST>
395-
</env>
396-
<volumes>
397-
<bind>
398-
<volume>/var/run/docker.sock:/var/run/docker.sock</volume>
399-
<volume>/var/lib/docker:/var/lib/docker:ro</volume>
400-
</bind>
401-
</volumes>
402-
</run>
403-
</image>
404-
</images>
405-
</configuration>
406-
</execution>
407-
</executions>
408-
</plugin>
409-
</plugins>
410-
</build>
411-
</profile>
412-
<profile>
413-
<id>kind-load-image-native</id>
414-
<build>
415-
<plugins>
416-
<plugin>
417-
<groupId>io.fabric8</groupId>
418-
<artifactId>docker-maven-plugin</artifactId>
419-
<version>${docker-maven-plugin.version}</version>
420-
<executions>
421-
<execution>
422-
<id>kind-load-image</id>
423-
<phase>package</phase>
424-
<goals>
425-
<goal>stop</goal>
426-
<goal>start</goal>
427-
<goal>stop</goal>
428-
</goals>
429-
<configuration>
430-
<containerNamePattern>%a</containerNamePattern>
431-
<images>
432-
<image>
433-
<alias>kind-load</alias>
434-
<name>${ci.image}</name>
435-
<run>
436-
<entrypoint>
437-
<arg>/bin/sh</arg>
438-
<arg>-exc</arg>
439-
<arg>
440-
CLUSTER_CONTROLLER_IMAGE_NAME="${CLUSTER_CONTROLLER_IMAGE_NAME:-"stackgres/cluster-controller:main"}"
441-
CONTAINER_NAME="$(docker inspect -f '{{.Name}}' "$(hostname)"|cut -d '/' -f 2|sed 's/^kind-load/kind/')"
442-
kind load docker-image --name "$CONTAINER_NAME" "$CLUSTER_CONTROLLER_IMAGE_NAME" || true
443-
</arg>
444-
</entrypoint>
445-
<wait>
446-
<time>300000</time>
447-
<exit>0</exit>
448-
</wait>
449-
<log>
450-
<prefix>kind-load|</prefix>
451-
<date>default</date>
452-
</log>
453-
<env>
454-
<CLUSTER_CONTROLLER_IMAGE_NAME>${env.CLUSTER_CONTROLLER_IMAGE_NAME}</CLUSTER_CONTROLLER_IMAGE_NAME>
455-
<DOCKER_HOST>${env.DOCKER_HOST}</DOCKER_HOST>
456-
</env>
457-
<volumes>
458-
<bind>
459-
<volume>/var/run/docker.sock:/var/run/docker.sock</volume>
460-
<volume>/var/lib/docker:/var/lib/docker:ro</volume>
461-
</bind>
462-
</volumes>
463-
</run>
464-
</image>
465-
</images>
466-
</configuration>
467-
</execution>
468-
</executions>
469-
</plugin>
470-
</plugins>
471-
</build>
472-
</profile>
473189
</profiles>
474190
</project>

0 commit comments

Comments
 (0)