When disabling name and version for label selected in k8s, don't remove from labels #30142

geoand · 2023-01-03T11:21:28Z

The version label should remain, only the labels in the selectors should be removed

…rsion label The version label should remain, only the labels in the selectors should be removed Fixes: quarkusio#30100

quarkus-bot · 2023-01-03T16:25:33Z

Failing Jobs - Building `b45c79c`

Status	Name	Step	Failures	Logs	Raw logs
✔️	JVM Tests - JDK 11
✔️	JVM Tests - JDK 17
✖	JVM Tests - JDK 17 MacOS M1	`Set up runner`	⚠️ Check →	Logs	Raw logs
✔️	JVM Tests - JDK 18

gsmet · 2023-01-09T15:14:46Z

...anilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesCommonHelper.java

            result.add(new DecoratorBuildItem(target, new RemoveFromSelectorDecorator(name, Labels.VERSION)));
            result.add(new DecoratorBuildItem(target, new RemoveFromMatchingLabelsDecorator(name, Labels.VERSION)));
        }

        if (!config.isAddNameToLabelSelectors()) {
-            result.add(new DecoratorBuildItem(target, new RemoveLabelDecorator(name, Labels.NAME)));


@geoand (working on the 2.13 backports with @rsvoboda) we saw that you are doing the same fix for the name but we don't see it mentioned anywhere. You positive it needs fixing too? If so could you adjust the title of the PR so that the change is properly documented in the changelog?

Thanks!

I am yeah, it's the same exact logic

PR title updated accordingly

We tried to backport it to 2.13 but this method doesn't exist at all (and I don't see something similar in this class). So either we should backport the previous fix that introduced this method or we can skip it.

I will let you and @Sgitario decide what to do with it. Please ping me loudly on Zulip if an action on my side is needed.

I will let you and @Sgitario decide what to do with it.

+1

I don't think that disabling the selectors is a super important feature that we should backport to 2.13, on the other hand, the changes are not very complex.
I would say to not backport the feature and hence these changes.

rsvoboda · 2023-01-10T14:26:56Z

@gsmet drop 2.13 backport label too?

This MR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [io.quarkus:quarkus-maven-plugin](https://github.com/quarkusio/quarkus) | build | patch | `2.15.2.Final` -> `2.15.3.Final` | | [io.quarkus:quarkus-universe-bom](https://github.com/quarkusio/quarkus-platform) | import | patch | `2.15.2.Final` -> `2.15.3.Final` | --- ### Release Notes <details> <summary>quarkusio/quarkus</summary> ### [`v2.15.3.Final`](https://github.com/quarkusio/quarkus/releases/tag/2.15.3.Final) [Compare Source](quarkusio/quarkus@2.15.2.Final...2.15.3.Final) ##### Complete changelog - [#30255](quarkusio/quarkus#30255) - Introduce a JSON Stream parser for the reactive rest client - [#30242](quarkusio/quarkus#30242) - Throw an IllegalStateException with basic info about the provider that failed to provide a resource - [#30227](quarkusio/quarkus#30227) - SmallRye GraphQL 1.9.1/2.0.1 + config property to control Federation - [#30218](quarkusio/quarkus#30218) - OIDC documentation fixes - [#30200](quarkusio/quarkus#30200) - Ensure that Kotlin implementation of QuarkusApplication works properly - [#30195](quarkusio/quarkus#30195) - Log graphql.execution.AbortExecutionException when it occurs - [#30190](quarkusio/quarkus#30190) - 2.15.2.Final breaks command mode with main class extends from QuarkusApplication in kotlin - [#30187](quarkusio/quarkus#30187) - Bump xstream from 1.4.19 to 1.4.20 - [#30183](quarkusio/quarkus#30183) - Fixing typos in security overview doc - [#30177](quarkusio/quarkus#30177) - Properly handle SSE comments in RESTEasy Reactive client and server code - [#30172](quarkusio/quarkus#30172) - Codestarts - Fix flattening of log levels - [#30169](quarkusio/quarkus#30169) - NullPointerException when sending SSE with comment only - [#30161](quarkusio/quarkus#30161) - Align behavior for getDeferredIdentity and getIdentity in TestIdentityAssociation - [#30160](quarkusio/quarkus#30160) - Different behavior in TestIdentityAssociation for getDeferredIdentity and getIdentity - [#30157](quarkusio/quarkus#30157) - Gradle quarkusDev: don't use test classes dir for app classes - [#30155](quarkusio/quarkus#30155) - Show how to verify smallrye-jwt issuer in a shared network - [#30154](quarkusio/quarkus#30154) - Remove remaining references to javax classes - [#30152](quarkusio/quarkus#30152) - Improve error handling of AbortExecutionException in smallrye-graphql extension - [#30146](quarkusio/quarkus#30146) - Properly segregate Json MessageBodyReader/Writer classes for server and client - [#30145](quarkusio/quarkus#30145) - GraphQL federation directives, which allow multiple values, do not match Apollo contract - [#30142](quarkusio/quarkus#30142) - When disabling name and version for label selectod in k8s, don't remove from labels - [#30138](quarkusio/quarkus#30138) - Keycloak Dev Services - [#30132](quarkusio/quarkus#30132) - Register REST Client body parameters for reflection - [#30119](quarkusio/quarkus#30119) - Enable/disable GraphQL Federation automatically (+ add a config property for it) - [#30100](quarkusio/quarkus#30100) - Setting `add-version-to-label-selectors: false` removes the app.kubernetes.io/version label - [#30078](quarkusio/quarkus#30078) - Quarkus Kotlin Native Reactive REST Client not working properly - [#30061](quarkusio/quarkus#30061) - Adding Kotlin Tests Breaks Kotlin/Java project - [#30044](quarkusio/quarkus#30044) - Resteasy Reactive Rest Client fails to re-construct large chunks of streamed json (stream+json) and fails deserialization - [#29998](quarkusio/quarkus#29998) - Bump to smallrye-config 2.13.1 - [#29918](quarkusio/quarkus#29918) - smallrye-config: Converter<Int> throws IllegalStateException - [#29609](quarkusio/quarkus#29609) - Remove Reflection replacements, now supported by GraalVM </details> <details> <summary>quarkusio/quarkus-platform</summary> ### [`v2.15.3.Final`](quarkusio/quarkus-platform@2.15.2.Final...2.15.3.Final) [Compare Source](quarkusio/quarkus-platform@2.15.2.Final...2.15.3.Final) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever MR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this MR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this MR, check this box --- This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).

When disabling add-version-to-label-selectors in k8s, don't remove ve…

b45c79c

…rsion label The version label should remain, only the labels in the selectors should be removed Fixes: quarkusio#30100

geoand requested a review from Sgitario January 3, 2023 11:21

geoand mentioned this pull request Jan 3, 2023

Setting add-version-to-label-selectors: false removes the app.kubernetes.io/version label #30100

Closed

quarkus-bot bot added the area/kubernetes label Jan 3, 2023

geoand added triage/backport-2.13 triage/backport? and removed area/kubernetes labels Jan 3, 2023

geoand requested a review from iocanel January 5, 2023 15:31

Sgitario approved these changes Jan 9, 2023

View reviewed changes

geoand merged commit bec99de into quarkusio:main Jan 9, 2023

quarkus-bot bot added this to the 2.16 - main milestone Jan 9, 2023

quarkus-bot bot added the kind/bugfix label Jan 9, 2023

geoand deleted the #30100 branch January 9, 2023 07:31

gsmet reviewed Jan 9, 2023

View reviewed changes

geoand changed the title ~~When disabling add-version-to-label-selectors in k8s, don't remove version label~~ When disabling name and version for label selectod in k8s, don't remove from labels Jan 9, 2023

quarkus-bot bot added the area/kubernetes label Jan 9, 2023

gsmet modified the milestones: 2.16 - main, 2.15.3.Final Jan 9, 2023

gsmet removed the triage/backport? label Jan 9, 2023

gsmet changed the title ~~When disabling name and version for label selectod in k8s, don't remove from labels~~ When disabling name and version for label selected in k8s, don't remove from labels Jan 17, 2023

gsmet removed the triage/backport-2.13 label Jan 17, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

When disabling name and version for label selected in k8s, don't remove from labels #30142

When disabling name and version for label selected in k8s, don't remove from labels #30142

geoand commented Jan 3, 2023

quarkus-bot bot commented Jan 3, 2023

gsmet Jan 9, 2023

geoand Jan 9, 2023

geoand Jan 9, 2023

gsmet Jan 9, 2023

geoand Jan 9, 2023

Sgitario Jan 10, 2023

rsvoboda commented Jan 10, 2023

When disabling name and version for label selected in k8s, don't remove from labels #30142

When disabling name and version for label selected in k8s, don't remove from labels #30142

Conversation

geoand commented Jan 3, 2023

quarkus-bot bot commented Jan 3, 2023

Failing Jobs - Building b45c79c

gsmet Jan 9, 2023

Choose a reason for hiding this comment

geoand Jan 9, 2023

Choose a reason for hiding this comment

geoand Jan 9, 2023

Choose a reason for hiding this comment

gsmet Jan 9, 2023

Choose a reason for hiding this comment

geoand Jan 9, 2023

Choose a reason for hiding this comment

Sgitario Jan 10, 2023

Choose a reason for hiding this comment

rsvoboda commented Jan 10, 2023

Failing Jobs - Building `b45c79c`