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

Allow overriding of app.openshift.io/runtime label #26285

Merged
merged 1 commit into from
Jun 27, 2022
Merged

Conversation

geoand
Copy link
Contributor

@geoand geoand commented Jun 22, 2022

Fixes: #26273

@geoand geoand requested a review from iocanel June 22, 2022 09:12
@geoand geoand marked this pull request as ready for review June 22, 2022 09:12
Copy link
Contributor

@iocanel iocanel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@@ -246,7 +246,10 @@ public List<DecoratorBuildItem> createDecorators(ApplicationInfoBuildItem applic
});

result.add(new DecoratorBuildItem(OPENSHIFT, new ApplyImagePullPolicyDecorator(name, config.getImagePullPolicy())));
result.add(new DecoratorBuildItem(OPENSHIFT, new AddLabelDecorator(name, OPENSHIFT_APP_RUNTIME, QUARKUS)));

if (labels.stream().noneMatch(l -> l.getKey().equals(OPENSHIFT_APP_RUNTIME))) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I really like it.
Ideally we should apply the same logic to all labels, annotations we add.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed! I'll try and go through the rest later on

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#26543 should take care of the rest of the labels

@gsmet gsmet merged commit ad8feb1 into quarkusio:main Jun 27, 2022
@quarkus-bot quarkus-bot bot added this to the 2.11 - main milestone Jun 27, 2022
@geoand geoand deleted the #26273 branch June 27, 2022 12:42
@Myalyssa216
Copy link

ZnjuHZnjuH
L

@gsmet gsmet modified the milestones: 2.11 - main, 2.10.1.Final Jun 28, 2022
geoand added a commit to geoand/quarkus that referenced this pull request Jul 4, 2022
geoand added a commit to geoand/quarkus that referenced this pull request Jul 4, 2022
gsmet pushed a commit to gsmet/quarkus that referenced this pull request Jul 18, 2022
Follows up on quarkusio#26285

(cherry picked from commit 80bd1c8)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Unable to set custom app.openshift.io/runtime label when deploying with OpenShift extension
4 participants