Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2.13.2 backports 1 #28396

Merged
merged 36 commits into from Oct 12, 2022
Merged

2.13.2 backports 1 #28396

merged 36 commits into from Oct 12, 2022

Conversation

gsmet
Copy link
Member

@gsmet gsmet commented Oct 5, 2022

Please don't merge, I will merge it myself.

This commit fixes several issues when using the `quarkus-openshift` extension:
- When providing the registry using the property `quarkus.container-image.image` (for example, quay.io/user/app:version, the registry is `quay.io`), the extension `quarkus-openshift` ignores the registry and uses the fallback property which is `docker.io`.

- The `quarkus-openshift` extension always creates the ImageStream resource regardless of the container image builder used (s2i, docker, jib, ...). However, when the user provides a docker image, it was using it for the container image of the Deployment resource, and this ImageStream was never in use. After these changes, the Deployment resource always uses the ImageStream resource, so no changes in the documentation are necessary.

- When the user provides a docker image and the deployment kind is "DeploymentConfig" (the default option), the `quarkus-openshift` extension removes the trigger image change params, so when deploying the application, the application is not automatically started.

(cherry picked from commit 827b1ab)
@gsmet gsmet added the area/infra internal and infrastructure related issues label Oct 5, 2022
@gsmet gsmet self-assigned this Oct 5, 2022
@quarkus-bot

This comment has been minimized.

@gsmet
Copy link
Member Author

gsmet commented Oct 6, 2022

@Sgitario I tried to backport these 2 PRs to 2.13 and a test is failing. I'm wondering if I should also backport another one (but we should probably check it's safe enough) or if the test should be adjusted. WDYT?

@Sgitario
Copy link
Contributor

Sgitario commented Oct 6, 2022

@Sgitario I tried to backport these 2 PRs to 2.13 and a test is failing. I'm wondering if I should also backport another one (but we should probably check it's safe enough) or if the test should be adjusted. WDYT?

I'm checking why these two 2 pull requests started failing in 2.13

@Sgitario
Copy link
Contributor

Sgitario commented Oct 6, 2022

The failing test is caused by this change: 781357a
And my guess is a change of behavior in either Fabric8 Kubernetes Client or sundrio because using Dekorate 3.0.0 (fabric8 kubernetes client 6.0.0 and sundrio 0.92.1) the Deployment resource has an empty selectors.matchLabels property but in Dekorate 2.11.3 the matchLabels is gone which is also ok.
To sum up, I would not backport the commit 781357a

dependabot bot and others added 22 commits October 10, 2022 15:39
Bumps `scala.version` from 2.13.8 to 2.13.9.

Updates `scala-reflect` from 2.13.8 to 2.13.9
- [Release notes](https://github.com/scala/scala/releases)
- [Commits](scala/scala@v2.13.8...v2.13.9)

Updates `scala-library` from 2.13.8 to 2.13.9
- [Release notes](https://github.com/scala/scala/releases)
- [Commits](scala/scala@v2.13.8...v2.13.9)

Updates `scala-compiler` from 2.13.8 to 2.13.9
- [Release notes](https://github.com/scala/scala/releases)
- [Commits](scala/scala@v2.13.8...v2.13.9)

---
updated-dependencies:
- dependency-name: org.scala-lang:scala-reflect
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.scala-lang:scala-library
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.scala-lang:scala-compiler
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit b036ea1)
- Add a substitution to avoid using the BouncyCastle (BC) PEM reader when BC is unavailable.

(cherry picked from commit b7954d1)
Bumps `elasticsearch-opensource-components.version` from 8.4.1 to 8.4.2.

Updates `elasticsearch-rest-client` from 8.4.1 to 8.4.2
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md)
- [Commits](elastic/elasticsearch@v8.4.1...v8.4.2)

Updates `elasticsearch-rest-client-sniffer` from 8.4.1 to 8.4.2
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md)
- [Commits](elastic/elasticsearch@v8.4.1...v8.4.2)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:elasticsearch-rest-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.elasticsearch.client:elasticsearch-rest-client-sniffer
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 99869a9)
Relates to: quarkusio#23997

(cherry picked from commit 5d485f0)
Bumps `mongo-client.version` from 4.7.1 to 4.7.2.

Updates `mongodb-driver-sync` from 4.7.1 to 4.7.2
- [Release notes](https://github.com/mongodb/mongo-java-driver/releases)
- [Commits](mongodb/mongo-java-driver@r4.7.1...r4.7.2)

Updates `mongodb-driver-core` from 4.7.1 to 4.7.2
- [Release notes](https://github.com/mongodb/mongo-java-driver/releases)
- [Commits](mongodb/mongo-java-driver@r4.7.1...r4.7.2)

Updates `mongodb-driver-legacy` from 4.7.1 to 4.7.2
- [Release notes](https://github.com/mongodb/mongo-java-driver/releases)
- [Commits](mongodb/mongo-java-driver@r4.7.1...r4.7.2)

Updates `mongodb-driver-reactivestreams` from 4.7.1 to 4.7.2
- [Release notes](https://github.com/mongodb/mongo-java-driver/releases)
- [Commits](mongodb/mongo-java-driver@r4.7.1...r4.7.2)

Updates `bson` from 4.7.1 to 4.7.2
- [Release notes](https://github.com/mongodb/mongo-java-driver/releases)
- [Commits](mongodb/mongo-java-driver@r4.7.1...r4.7.2)

---
updated-dependencies:
- dependency-name: org.mongodb:mongodb-driver-sync
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.mongodb:mongodb-driver-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.mongodb:mongodb-driver-legacy
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.mongodb:mongodb-driver-reactivestreams
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.mongodb:bson
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 4f7610d)
(cherry picked from commit ed68ec2)
Without the option mount won't work on machines with SELinux enabled.

Signed-off-by: Matej Vasek <mvasek@redhat.com>
(cherry picked from commit f50794d)
Bumps `elasticsearch-opensource-components.version` from 8.4.2 to 8.4.3.

Updates `elasticsearch-rest-client` from 8.4.2 to 8.4.3
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md)
- [Commits](elastic/elasticsearch@v8.4.2...v8.4.3)

Updates `elasticsearch-rest-client-sniffer` from 8.4.2 to 8.4.3
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md)
- [Commits](elastic/elasticsearch@v8.4.2...v8.4.3)

---
updated-dependencies:
- dependency-name: org.elasticsearch.client:elasticsearch-rest-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.elasticsearch.client:elasticsearch-rest-client-sniffer
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 02cdd09)
Maven plugin that could be manipulated by Maven extensions

(cherry picked from commit a426f6a)
(cherry picked from commit c78f626)
(cherry picked from commit 7c176d6)
The NPE could happen when Response was used as a return type
and no @produces annotation was present.

Fixes: quarkusio/quarkus-workshops#183
(cherry picked from commit 1a15852)
@quarkus-bot

This comment has been minimized.

sberyozkin and others added 8 commits October 12, 2022 01:38
When matching literals we break out of the wrong loop

(cherry picked from commit 7dfe43a)
The failure showed up in a few PRs
(like quarkusio#28429 and quarkusio#27526)

(cherry picked from commit fbd8fff)
Bumps `scala.version` from 2.13.9 to 2.13.10.

Updates `scala-reflect` from 2.13.9 to 2.13.10
- [Release notes](https://github.com/scala/scala/releases)
- [Commits](scala/scala@v2.13.9...v2.13.10)

Updates `scala-library` from 2.13.9 to 2.13.10
- [Release notes](https://github.com/scala/scala/releases)
- [Commits](scala/scala@v2.13.9...v2.13.10)

Updates `scala-compiler` from 2.13.9 to 2.13.10
- [Release notes](https://github.com/scala/scala/releases)
- [Commits](scala/scala@v2.13.9...v2.13.10)

---
updated-dependencies:
- dependency-name: org.scala-lang:scala-reflect
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.scala-lang:scala-library
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.scala-lang:scala-compiler
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 23a0005)
(cherry picked from commit 4e96d33)
@quarkus-bot
Copy link

quarkus-bot bot commented Oct 12, 2022

Failing Jobs - Building 3aaf91e

Status Name Step Failures Logs Raw logs
JVM Tests - JDK 11 Build Failures Logs Raw logs
✔️ JVM Tests - JDK 17
✔️ JVM Tests - JDK 18

Full information is available in the Build summary check run.

Failures

⚙️ JVM Tests - JDK 11 #

- Failing: devtools/cli devtools/gradle/gradle-extension-plugin 

📦 devtools/cli

io.quarkus.cli.CliProjectGradleTest.testCreateAppDefaults line 117 - More details - Source on GitHub

org.opentest4j.AssertionFailedError: 
Expected OK return code. Result:
result: {

io.quarkus.cli.CliProjectGradleTest.testCreateCliDefaults - More details - Source on GitHub

org.opentest4j.AssertionFailedError: 
Expected OK return code. Result:
result: {

📦 devtools/gradle/gradle-extension-plugin

Failed to execute goal org.codehaus.mojo:exec-maven-plugin:3.0.0:exec (gradle) on project io.quarkus.extension.gradle.plugin: Command execution failed.

@gsmet gsmet merged commit 3d61bd5 into quarkusio:2.13 Oct 12, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/core area/dependencies Pull requests that update a dependency file area/devtools Issues/PR related to maven, gradle, platform and cli tooling/plugins area/documentation area/hibernate-validator Hibernate Validator area/infra internal and infrastructure related issues area/kubernetes area/maven area/oidc area/openapi area/persistence area/resteasy-reactive area/smallrye
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet