Skip to content

Commit a513670

Browse files
teoincontattoteoincontatto
committed
Merge branch 'add-version-1.19' into 'main'
Add version 1.19 Closes #3046, #853, #3065, #3061, #3079, #3066, and #3032 See merge request ongresinc/stackgres!1699
2 parents fd8dc99 + ad9184e commit a513670

718 files changed

Lines changed: 15104 additions & 19650 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/build.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
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' \
1414
--extract restapi-java-test:'stackgres-k8s/src/restapi/target/surefire-reports/TEST-*.xml' \
15-
--extract jobs-java-test:'stackgres-k8s/src/jobs/target/surefire-reports/TEST-*.xml' \
1615
--extract cluster-controller-java-test:'stackgres-k8s/src/cluster-controller/target/surefire-reports/TEST-*.xml' \
1716
--extract stream-java-test:'stackgres-k8s/src/stream/target/surefire-reports/TEST-*.xml' \
1817
--extract restapi-java:'stackgres-k8s/src/restapi/target/swagger*' \
@@ -22,7 +21,6 @@
2221
common-java common-java-test \
2322
operator-java operator-java-test \
2423
restapi-java restapi-java-test \
25-
jobs-java jobs-java-test \
2624
cluster-controller-java cluster-controller-java-test \
2725
stream-java stream-java-test
2826
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

‎.gitlab-ci/deploy.yml‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,6 @@ deploy restapi jvm image:
8484
variables:
8585
IMAGE_NAME: "stackgres/restapi"
8686

87-
deploy jobs jvm image:
88-
extends: .deploy jvm image
89-
variables:
90-
IMAGE_NAME: "stackgres/jobs"
91-
9287
deploy cluster-controller jvm image:
9388
extends: .deploy jvm image
9489
variables:
@@ -123,11 +118,6 @@ deploy restapi native image:
123118
variables:
124119
IMAGE_NAME: "stackgres/restapi"
125120

126-
deploy job native image:
127-
extends: .deploy native image
128-
variables:
129-
IMAGE_NAME: "stackgres/jobs"
130-
131121
deploy cluster-controller native image:
132122
extends: .deploy native image
133123
variables:

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

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -102,13 +102,6 @@ build restapi jvm image amd64:
102102
LOCK_FILE: stackgres-restapi-build-jvm-image
103103
IMAGE_MODULE_NAME: restapi-jvm-image
104104

105-
build jobs jvm image amd64:
106-
extends: .build jvm image amd64
107-
variables:
108-
IMAGE_BASE_NAME: stackgres/jobs
109-
LOCK_FILE: stackgres-jobs-build-jvm-image
110-
IMAGE_MODULE_NAME: jobs-jvm-image
111-
112105
build cluster-controller jvm image amd64:
113106
extends: .build jvm image amd64
114107
variables:
@@ -137,13 +130,6 @@ build restapi native image amd64:
137130
LOCK_FILE: stackgres-restapi-build-native-image
138131
IMAGE_MODULE_NAME: restapi-native-image
139132

140-
build jobs native image amd64:
141-
extends: .build native image amd64
142-
variables:
143-
IMAGE_BASE_NAME: stackgres/jobs
144-
LOCK_FILE: stackgres-jobs-build-native-image
145-
IMAGE_MODULE_NAME: jobs-native-image
146-
147133
build cluster-controller native image amd64:
148134
extends: .build native image amd64
149135
variables:
@@ -219,13 +205,6 @@ build restapi jvm image arm64:
219205
LOCK_FILE: stackgres-restapi-build-jvm-image
220206
IMAGE_MODULE_NAME: restapi-jvm-image
221207

222-
build jobs jvm image arm64:
223-
extends: .build jvm image arm64
224-
variables:
225-
IMAGE_BASE_NAME: stackgres/jobs
226-
LOCK_FILE: stackgres-jobs-build-jvm-image
227-
IMAGE_MODULE_NAME: jobs-jvm-image
228-
229208
build cluster-controller jvm image arm64:
230209
extends: .build jvm image arm64
231210
variables:
@@ -254,13 +233,6 @@ build restapi native image arm64:
254233
LOCK_FILE: stackgres-restapi-build-native-image
255234
IMAGE_MODULE_NAME: restapi-native-image
256235

257-
build jobs native image arm64:
258-
extends: .build native image arm64
259-
variables:
260-
IMAGE_BASE_NAME: stackgres/jobs
261-
LOCK_FILE: stackgres-jobs-build-native-image
262-
IMAGE_MODULE_NAME: jobs-native-image
263-
264236
build cluster-controller native image arm64:
265237
extends: .build native image arm64
266238
variables:
@@ -327,11 +299,6 @@ build restapi jvm image multi archs:
327299
variables:
328300
IMAGE_BASE_NAME: stackgres/restapi
329301

330-
build jobs jvm image multi archs:
331-
extends: .build jvm image multi archs
332-
variables:
333-
IMAGE_BASE_NAME: stackgres/jobs
334-
335302
build cluster-controller jvm image multi archs:
336303
extends: .build jvm image multi archs
337304
variables:
@@ -352,11 +319,6 @@ build restapi native image multi archs:
352319
variables:
353320
IMAGE_BASE_NAME: stackgres/restapi
354321

355-
build jobs native image multi archs:
356-
extends: .build native image multi archs
357-
variables:
358-
IMAGE_BASE_NAME: stackgres/jobs
359-
360322
build cluster-controller native image multi archs:
361323
extends: .build native image multi archs
362324
variables:

‎.gitlab-ci/image-release.yml‎

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -110,13 +110,6 @@ release restapi jvm image amd64:
110110
LOCK_FILE: stackgres-restapi-release-jvm-release-image
111111
IMAGE_MODULE_NAME: restapi-jvm-release-image
112112

113-
release jobs jvm image amd64:
114-
extends: .release jvm image amd64
115-
variables:
116-
IMAGE_BASE_NAME: stackgres/jobs
117-
LOCK_FILE: stackgres-jobs-release-jvm-release-image
118-
IMAGE_MODULE_NAME: jobs-jvm-release-image
119-
120113
release cluster-controller jvm image amd64:
121114
extends: .release jvm image amd64
122115
variables:
@@ -145,13 +138,6 @@ release restapi native image amd64:
145138
LOCK_FILE: stackgres-restapi-release-native-release-image
146139
IMAGE_MODULE_NAME: restapi-native-release-image
147140

148-
release jobs native image amd64:
149-
extends: .release native image amd64
150-
variables:
151-
IMAGE_BASE_NAME: stackgres/jobs
152-
LOCK_FILE: stackgres-jobs-release-native-release-image
153-
IMAGE_MODULE_NAME: jobs-native-release-image
154-
155141
release cluster-controller native image amd64:
156142
extends: .release native image amd64
157143
variables:
@@ -238,13 +224,6 @@ release restapi jvm image arm64:
238224
LOCK_FILE: stackgres-restapi-release-jvm-release-image
239225
IMAGE_MODULE_NAME: restapi-jvm-release-image
240226

241-
release jobs jvm image arm64:
242-
extends: .release jvm image arm64
243-
variables:
244-
IMAGE_BASE_NAME: stackgres/jobs
245-
LOCK_FILE: stackgres-jobs-release-jvm-release-image
246-
IMAGE_MODULE_NAME: jobs-jvm-release-image
247-
248227
release cluster-controller jvm image arm64:
249228
extends: .release jvm image arm64
250229
variables:
@@ -273,13 +252,6 @@ release restapi native image arm64:
273252
LOCK_FILE: stackgres-restapi-release-native-release-image
274253
IMAGE_MODULE_NAME: restapi-native-release-image
275254

276-
release jobs native image arm64:
277-
extends: .release native image arm64
278-
variables:
279-
IMAGE_BASE_NAME: stackgres/jobs
280-
LOCK_FILE: stackgres-jobs-release-native-release-image
281-
IMAGE_MODULE_NAME: jobs-native-release-image
282-
283255
release cluster-controller native image arm64:
284256
extends: .release native image arm64
285257
variables:
@@ -357,11 +329,6 @@ release restapi jvm image multi archs:
357329
variables:
358330
IMAGE_BASE_NAME: stackgres/restapi
359331

360-
release jobs jvm image multi archs:
361-
extends: .release jvm image multi archs
362-
variables:
363-
IMAGE_BASE_NAME: stackgres/jobs
364-
365332
release cluster-controller jvm image multi archs:
366333
extends: .release jvm image multi archs
367334
variables:
@@ -382,11 +349,6 @@ release restapi native image multi archs:
382349
variables:
383350
IMAGE_BASE_NAME: stackgres/restapi
384351

385-
release jobs native image multi archs:
386-
extends: .release native image multi archs
387-
variables:
388-
IMAGE_BASE_NAME: stackgres/jobs
389-
390352
release cluster-controller native image multi archs:
391353
extends: .release native image multi archs
392354
variables:

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

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,6 @@ build restapi native executable amd64:
6161
MAVEN_EXTRA_ARGS: "-pl .,common,operator-framework,test-util,restapi"
6262
MODULE: "restapi-native"
6363

64-
build jobs native executable amd64:
65-
extends: .build native executable amd64
66-
variables:
67-
NATIVE_IMAGE_EXTRA_PREFIX: "-jobs"
68-
MAVEN_EXTRA_ARGS: "-pl .,common,operator-framework,test-util,jobs"
69-
MODULE: "jobs-native"
70-
7164
build cluster-controller native executable amd64:
7265
extends: .build native executable amd64
7366
variables:
@@ -112,13 +105,6 @@ build restapi native executable arm64:
112105
MAVEN_EXTRA_ARGS: "-pl .,common,operator-framework,test-util,restapi"
113106
MODULE: "restapi-native"
114107

115-
build jobs native executable arm64:
116-
extends: .build native executable arm64
117-
variables:
118-
NATIVE_IMAGE_EXTRA_PREFIX: "-jobs"
119-
MAVEN_EXTRA_ARGS: "-pl .,common,operator-framework,test-util,jobs"
120-
MODULE: "jobs-native"
121-
122108
build cluster-controller native executable arm64:
123109
extends: .build native executable arm64
124110
variables:

‎.gitlab/Release.md.template‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ EOF
4343
sh -x stackgres-k8s/ci/utils/update-version.sh "${VERSION}"
4444
```
4545
1. [ ] Update `CHANGELOG.md` (review commit messages to populate the changelog: `git log`)
46-
1. [ ] Add ${VERSION} section in `doc/content/en/01-introduction/06-versions/_index.md` with values from `stackgres-k8s/src/common/src/main/resources/versions.properties`
46+
1. [ ] Add ${VERSION} section in `doc/content/en/01-introduction/06-versions/_index.md` with values from `stackgres-k8s/src/common/src/main/resources/versions-${VERSION%.*}.properties`
4747
1. [ ] Check the changes to ensure everything is correct before commit:
4848
```
4949
git diff
@@ -246,15 +246,7 @@ $(
246246
```
247247
git push origin add-version-${NEXT_MINOR_VERSION}
248248
```
249-
1. [ ] Wait for the pipeline of `add-version-${NEXT_MINOR_VERSION}` branch to complete
250-
1. [ ] Merge local branch `add-version-${NEXT_MINOR_VERSION}` into `main`:
251-
```
252-
git checkout main && git pull && git merge --ff-only add-version-${NEXT_MINOR_VERSION}
253-
```
254-
1. [ ] Push `main` to origin:
255-
```
256-
git push
257-
```
249+
1. [ ] Create a MR using the link provided by the previous command (against the `main` branch) and merge it when all checks pass.
258250
1. [ ] Change scheduled pipeline description and `STACKGRES_PREVIOUS_VERSION` environment variable to test upgrade from version `${TO_REMOVE_MINOR_VERSION}` to version `${MINOR_VERSION}`: https://gitlab.com/ongresinc/stackgres/-/pipeline_schedules/237754/edit?id=237754
259251
1. [ ] Change scheduled pipeline description and `STACKGRES_VERSION` environment variable to test from version `${TO_REMOVE_MINOR_VERSION}` to version `${MINOR_VERSION}`: https://gitlab.com/ongresinc/stackgres/-/pipeline_schedules/262456/edit?id=262456 or https://gitlab.com/ongresinc/stackgres/-/pipeline_schedules/235791/edit?id=235791
260252
EOF

‎.gitlab/issue_templates/Beta Release.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ sh stackgres-k8s/ci/utils/generate-release-template.sh $VERSION
2929
sh -x stackgres-k8s/ci/utils/update-version.sh "1.18.0-beta1"
3030
```
3131
1. [ ] Update `CHANGELOG.md` (review commit messages to populate the changelog: `git log`)
32-
1. [ ] Add 1.18.0-beta1 section in `doc/content/en/01-introduction/06-versions/_index.md` with values from `stackgres-k8s/src/common/src/main/resources/versions.properties`
32+
1. [ ] Add 1.18.0-beta1 section in `doc/content/en/01-introduction/06-versions/_index.md` with values from `stackgres-k8s/src/common/src/main/resources/versions-${VERSION%.*}.properties`
3333
1. [ ] Check the changes to ensure everything is correct before commit:
3434
```
3535
git diff

‎.gitlab/issue_templates/GA Release.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ sh stackgres-k8s/ci/utils/generate-release-template.sh $VERSION
2929
sh -x stackgres-k8s/ci/utils/update-version.sh "1.18.0"
3030
```
3131
1. [ ] Update `CHANGELOG.md` (review commit messages to populate the changelog: `git log`)
32-
1. [ ] Add 1.18.0 section in `doc/content/en/01-introduction/06-versions/_index.md` with values from `stackgres-k8s/src/common/src/main/resources/versions.properties`
32+
1. [ ] Add 1.18.0 section in `doc/content/en/01-introduction/06-versions/_index.md` with values from `stackgres-k8s/src/common/src/main/resources/versions-${VERSION%.*}.properties`
3333
1. [ ] Check the changes to ensure everything is correct before commit:
3434
```
3535
git diff

‎.gitlab/issue_templates/Patch Release.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ sh stackgres-k8s/ci/utils/generate-release-template.sh $VERSION
2929
sh -x stackgres-k8s/ci/utils/update-version.sh "1.17.5"
3030
```
3131
1. [ ] Update `CHANGELOG.md` (review commit messages to populate the changelog: `git log`)
32-
1. [ ] Add 1.17.5 section in `doc/content/en/01-introduction/06-versions/_index.md` with values from `stackgres-k8s/src/common/src/main/resources/versions.properties`
32+
1. [ ] Add 1.17.5 section in `doc/content/en/01-introduction/06-versions/_index.md` with values from `stackgres-k8s/src/common/src/main/resources/versions-${VERSION%.*}.properties`
3333
1. [ ] Check the changes to ensure everything is correct before commit:
3434
```
3535
git diff

0 commit comments

Comments
 (0)