Skip to content

Commit a3637d0

Browse files
jorsoljorsol
committed
Merge branch 'rename-apiweb-restapi' into 'main'
refactor: Rename api-web to restapi See merge request ongresinc/stackgres!1597
2 parents 1c4b195 + 86646eb commit a3637d0

587 files changed

Lines changed: 181 additions & 315 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.

‎.gitignore‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ doc/content/en/06-crd-reference/*/_index.md
148148
# Node exclusions
149149
node_modules/
150150
package-lock.json
151-
stackgres-k8s/src/api-web/src/main/resources/META-INF/resources/stackgres
151+
stackgres-k8s/src/restapi/src/main/resources/META-INF/resources/stackgres
152152
.env
153153
cypress.env.json
154154
videos/
@@ -158,7 +158,7 @@ videos/
158158

159159
# Built project info
160160
doc/themes/sg-doc/static/sg-swagger.yaml
161-
stackgres-k8s/src/api-web/swagger-merged.yaml
161+
stackgres-k8s/src/restapi/swagger-merged.yaml
162162

163163
# Dockerignore is generated by stackgres-k8s/ci/build scripts
164164
.dockerignore

‎.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.26"
5-
BUILDER_IMAGE_NAME: "builder:1.8"
5+
BUILDER_IMAGE_NAME: "builder:1.9"
66
SKIP_NATIVE: "false"
77
SKIP_E2E: "false"
88
SKIP_DEPLOY: "false"

‎.gitlab-ci/build.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
--extract operator-framework-java-test:'stackgres-k8s/src/operator-framework/target/surefire-reports/TEST-*.xml' \
1212
--extract common-java-test:'stackgres-k8s/src/common/target/surefire-reports/TEST-*.xml' \
1313
--extract operator-java-test:'stackgres-k8s/src/operator/target/surefire-reports/TEST-*.xml' \
14-
--extract restapi-java-test:'stackgres-k8s/src/api-web/target/surefire-reports/TEST-*.xml' \
14+
--extract restapi-java-test:'stackgres-k8s/src/restapi/target/surefire-reports/TEST-*.xml' \
1515
--extract jobs-java-test:'stackgres-k8s/src/jobs/target/surefire-reports/TEST-*.xml' \
1616
--extract cluster-controller-java-test:'stackgres-k8s/src/cluster-controller/target/surefire-reports/TEST-*.xml' \
1717
--extract distributedlogs-controller-java-test:'stackgres-k8s/src/distributedlogs-controller/target/surefire-reports/TEST-*.xml' \
1818
--extract stream-java-test:'stackgres-k8s/src/stream/target/surefire-reports/TEST-*.xml' \
19-
--extract restapi-java:'stackgres-k8s/src/api-web/target/swagger*' \
19+
--extract restapi-java:'stackgres-k8s/src/restapi/target/swagger*' \
2020
parent-java \
2121
operator-framework-java operator-framework-java-test \
2222
test-util-java \
@@ -48,7 +48,7 @@
4848
- stackgres-k8s/src/*/target/surefire-reports/TEST-*.xml
4949
paths:
5050
- stackgres-k8s/ci/build/target/*
51-
- stackgres-k8s/src/api-web/target/swagger*
51+
- stackgres-k8s/src/restapi/target/swagger*
5252
- stackgres-k8s/ci/build/target
5353

5454
build amd64:

‎.gitlab-ci/native-build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ build restapi native executable amd64:
5656
extends: .build native executable amd64
5757
variables:
5858
NATIVE_IMAGE_EXTRA_PREFIX: "-restapi"
59-
MAVEN_EXTRA_ARGS: "-pl .,common,operator-framework,test-util,api-web"
59+
MAVEN_EXTRA_ARGS: "-pl .,common,operator-framework,test-util,restapi"
6060
MODULE: "restapi-native"
6161

6262
build jobs native executable amd64:
@@ -111,7 +111,7 @@ build restapi native executable arm64:
111111
extends: .build native executable arm64
112112
variables:
113113
NATIVE_IMAGE_EXTRA_PREFIX: "-restapi"
114-
MAVEN_EXTRA_ARGS: "-pl .,common,operator-framework,test-util,api-web"
114+
MAVEN_EXTRA_ARGS: "-pl .,common,operator-framework,test-util,restapi"
115115
MODULE: "restapi-native"
116116

117117
build jobs native executable arm64:

‎.gitlab-ci/test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ swagger validations:
4242
- build amd64
4343
script:
4444
- |
45-
yajsv -s stackgres-k8s/src/api-web/src/main/swagger/schema.json stackgres-k8s/src/api-web/target/swagger-merged.json
45+
yajsv -s stackgres-k8s/src/restapi/src/main/swagger/schema.json stackgres-k8s/src/restapi/target/swagger-merged.json
4646
retry:
4747
max: 2
4848
when: [ unknown_failure, api_failure, stuck_or_timeout_failure, runner_system_failure, runner_unsupported,

‎doc/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ You can build the doc in the following way:
1313
# pre-requisites
1414
cd stackgres-k8s/src
1515
./mvnw clean package -DskipTests
16-
sh api-web/src/main/swagger/build.sh
16+
sh restapi/src/main/swagger/build.sh
1717
cd -
1818

1919
doc/build.sh

‎doc/build.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@ cp "$(dirname "$0")/../stackgres-k8s/install/helm/stackgres-operator/Chart.yaml"
1414
STACKGRES_VERSION="${STACKGRES_VERSION:-$(sh stackgres-k8s/ci/build/version.sh)}"
1515
echo "current_version: \"$STACKGRES_VERSION\"" > "$(dirname "$0")/data/versions.yml"
1616

17-
if [ ! -f "$(dirname "$0")/../stackgres-k8s/src/api-web/target/swagger-merged.yaml" ]
17+
if [ ! -f "$(dirname "$0")/../stackgres-k8s/src/restapi/target/swagger-merged.yaml" ]
1818
then
1919
echo "Please build Stackgres operator and swagger first:"
2020
echo
2121
echo "cd stackgres-k8s/src"
2222
echo "./mvnw clean package -DskipTests"
23-
echo "sh api-web/src/main/swagger/build.sh"
23+
echo "sh restapi/src/main/swagger/build.sh"
2424
echo
2525
exit 1
2626
fi
27-
cp "$(dirname "$0")/../stackgres-k8s/src/api-web/target/swagger-merged.yaml" "$(dirname "$0")/themes/sg-doc/static/sg-swagger.yaml"
27+
cp "$(dirname "$0")/../stackgres-k8s/src/restapi/target/swagger-merged.yaml" "$(dirname "$0")/themes/sg-doc/static/sg-swagger.yaml"
2828

2929
mkdir -p "$(dirname "$0")/generated"
3030
CRD_PATH="$(dirname "$0")/../stackgres-k8s/src/common/src/main/resources/crds"

‎doc/content/en/07-developer-documentation/04-running-stackgres-outside-of-k8s/_index.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ helm install stackgres-operator stackgres-k8s/install/helm/stackgres-operator \
103103
--set-string cert.key="$(base64 -w0 stackgres-k8s/src/operator/src/test/resources/certs/server-key.pem)"
104104
```
105105

106-
This will install StackGres excluding the StackGres REST API (api-web).
106+
This will install StackGres excluding the StackGres REST API (restapi).
107107
The `stackgres-restapi` service will not point to a pod but instead to `172.17.0.1:8443` (served by the local Java process or dev mode we're about to start):
108108

109109
```
@@ -128,7 +128,7 @@ First build the project (see the [Building StackGres]({{% relref "07-developer-d
128128
```
129129
cd stackgres-k8s/src/
130130
./mvnw clean install -DskipTests
131-
cd api-web/
131+
cd restapi/
132132
java \
133133
-Dquarkus.http.ssl.certificate.files=$(pwd)/../operator/src/test/resources/certs/server.crt \
134134
-Dquarkus.http.ssl.certificate.key-files=$(pwd)/../operator/src/test/resources/certs/server-key.pem \
@@ -161,7 +161,7 @@ We then query the SGclusters using the REST API.
161161
Of course, you can use Quarkus' dev mode for the REST API as well:
162162

163163
```
164-
cd stackgres-k8s/src/api-web/
164+
cd stackgres-k8s/src/restapi/
165165
mvn \
166166
-Dquarkus.http.ssl.certificate.files=$(pwd)/../operator/src/test/resources/certs/server.crt \
167167
-Dquarkus.http.ssl.certificate.key-files=$(pwd)/../operator/src/test/resources/certs/server-key.pem \

‎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.3
10+
FROM quay.io/quarkus/ubi-quarkus-mandrel-builder-image:jdk-21.0.4
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/config.yml‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
.images:
22
ci_image: &ci_image registry.gitlab.com/ongresinc/stackgres/ci:1.26
3-
jdk_build_image: &jdk_build_image registry.gitlab.com/ongresinc/stackgres/builder:1.8
4-
jdk_runtime_image: &jdk_runtime_image registry.access.redhat.com/ubi9/openjdk-21:1.20-2.1719294783
3+
jdk_build_image: &jdk_build_image registry.gitlab.com/ongresinc/stackgres/builder:1.9
4+
jdk_runtime_image: &jdk_runtime_image registry.access.redhat.com/ubi9/openjdk-21:1.20-2.1721752936
55
ubi8_micro_image: &ubi8_micro_image registry.access.redhat.com/ubi8-micro:8.10-9
6-
ubi9_minimal_image: &ubi9_minimal_image registry.access.redhat.com/ubi9-minimal:9.4-1134
7-
admin_ui_build_image: &admin_ui_build_image registry.access.redhat.com/ubi8/nodejs-18:1-114.1720405264
6+
ubi9_minimal_image: &ubi9_minimal_image registry.access.redhat.com/ubi9-minimal:9.4-1194
7+
admin_ui_build_image: &admin_ui_build_image registry.access.redhat.com/ubi8/nodejs-20:1-50.1720405266
88
admin_ui_nginx_image: &admin_ui_nginx_image registry.access.redhat.com/ubi8/nginx-124:1-16
99
platforms:
1010
- linux/x86_64
@@ -118,27 +118,27 @@ modules:
118118
- stackgres-k8s/src/operator/target
119119
restapi-java:
120120
<<: *operator-framework-java
121-
path: stackgres-k8s/src/api-web/.
121+
path: stackgres-k8s/src/restapi/.
122122
filtered_sources:
123-
- sh stackgres-k8s/ci/build/redact-version.sh api-web
123+
- sh stackgres-k8s/ci/build/redact-version.sh restapi
124124
sources:
125-
- stackgres-k8s/src/api-web/src/main/java
126-
- stackgres-k8s/src/api-web/src/main/resources
127-
- stackgres-k8s/src/api-web/src/main/swagger
125+
- stackgres-k8s/src/restapi/src/main/java
126+
- stackgres-k8s/src/restapi/src/main/resources
127+
- stackgres-k8s/src/restapi/src/main/swagger
128128
post_build_commands:
129-
- 'sh $SHELL_XTRACE stackgres-k8s/src/api-web/src/main/swagger/build.sh'
129+
- 'sh $SHELL_XTRACE stackgres-k8s/src/restapi/src/main/swagger/build.sh'
130130
artifacts:
131-
- stackgres-k8s/src/api-web/target
131+
- stackgres-k8s/src/restapi/target
132132
- .m2/repository/io/stackgres/stackgres-restapi
133133
restapi-java-test:
134134
<<: *operator-framework-java-test
135-
path: stackgres-k8s/src/api-web/.
135+
path: stackgres-k8s/src/restapi/.
136136
filtered_sources:
137-
- sh stackgres-k8s/ci/build/redact-version.sh api-web
137+
- sh stackgres-k8s/ci/build/redact-version.sh restapi
138138
sources:
139-
- stackgres-k8s/src/api-web/src/test
139+
- stackgres-k8s/src/restapi/src/test
140140
artifacts:
141-
- stackgres-k8s/src/api-web/target
141+
- stackgres-k8s/src/restapi/target
142142
jobs-java:
143143
<<: *operator-framework-java
144144
path: stackgres-k8s/src/jobs/.
@@ -263,9 +263,9 @@ modules:
263263
- stackgres-k8s/src/operator/target/stackgres-operator-runner
264264
restapi-native:
265265
<<: *native
266-
path: stackgres-k8s/src/api-web
266+
path: stackgres-k8s/src/restapi
267267
artifacts:
268-
- stackgres-k8s/src/api-web/target/stackgres-restapi-runner
268+
- stackgres-k8s/src/restapi/target/stackgres-restapi-runner
269269
jobs-native:
270270
<<: *native
271271
path: stackgres-k8s/src/jobs
@@ -304,17 +304,17 @@ modules:
304304
2: stackgres-k8s/src/operator/target/quarkus-app
305305
restapi-jvm-image: &restapi-jvm-image
306306
<<: *operator-jvm-image
307-
path: stackgres-k8s/src/api-web
307+
path: stackgres-k8s/src/restapi
308308
dockerfile:
309309
<<: *jvm-image-dockerfile
310-
path: stackgres-k8s/src/api-web/src/main/docker/Dockerfile.jvm
310+
path: stackgres-k8s/src/restapi/src/main/docker/Dockerfile.jvm
311311
args:
312312
<<: *jvm-image-args
313-
STACKGRES_VERSION: $(sh stackgres-k8s/ci/build/version.sh api-web)
313+
STACKGRES_VERSION: $(sh stackgres-k8s/ci/build/version.sh restapi)
314314
artifacts: &restapi-jvm-image-artifacts
315-
0: stackgres-k8s/src/api-web/src/main/docker/LICENCE
316-
1: stackgres-k8s/src/api-web/src/main/docker/stackgres-restapi.jvm.sh
317-
2: stackgres-k8s/src/api-web/target/quarkus-app
315+
0: stackgres-k8s/src/restapi/src/main/docker/LICENCE
316+
1: stackgres-k8s/src/restapi/src/main/docker/stackgres-restapi.jvm.sh
317+
2: stackgres-k8s/src/restapi/target/quarkus-app
318318
jobs-jvm-image: &jobs-jvm-image
319319
<<: *operator-jvm-image
320320
path: stackgres-k8s/src/jobs
@@ -400,17 +400,17 @@ modules:
400400
2: stackgres-k8s/src/operator/src/main/docker/stackgres-operator.native.sh
401401
restapi-native-image: &restapi-native-image
402402
<<: *operator-native-image
403-
path: stackgres-k8s/src/api-web
403+
path: stackgres-k8s/src/restapi
404404
dockerfile:
405405
<<: *native-image-dockerfile
406-
path: stackgres-k8s/src/api-web/src/main/docker/Dockerfile.native
406+
path: stackgres-k8s/src/restapi/src/main/docker/Dockerfile.native
407407
args:
408408
<<: *native-image-args
409-
STACKGRES_VERSION: $(sh stackgres-k8s/ci/build/version.sh api-web)
409+
STACKGRES_VERSION: $(sh stackgres-k8s/ci/build/version.sh restapi)
410410
artifacts: &restapi-native-image-artifacts
411-
0: stackgres-k8s/src/api-web/src/main/docker/LICENCE
412-
1: stackgres-k8s/src/api-web/target/stackgres-restapi-runner
413-
2: stackgres-k8s/src/api-web/src/main/docker/stackgres-restapi.native.sh
411+
0: stackgres-k8s/src/restapi/src/main/docker/LICENCE
412+
1: stackgres-k8s/src/restapi/target/stackgres-restapi-runner
413+
2: stackgres-k8s/src/restapi/src/main/docker/stackgres-restapi.native.sh
414414
jobs-native-image: &jobs-native-image
415415
<<: *operator-native-image
416416
path: stackgres-k8s/src/jobs
@@ -644,7 +644,7 @@ modules:
644644
type: native-release-image
645645
artifacts:
646646
<<: *restapi-native-image-artifacts
647-
999: stackgres-k8s/src/api-web/pom.xml
647+
999: stackgres-k8s/src/restapi/pom.xml
648648
jobs-native-release-image:
649649
<<: *jobs-native-image
650650
type: native-release-image

0 commit comments

Comments
 (0)