Skip to content

fix: do not change namespaces if they were manually set #1734

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Feb 27, 2023
Merged

fix: do not change namespaces if they were manually set #1734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
366aa07
chore: update version to 4.3.0-SNAPSHOT (#1709)
metacosm Jan 9, 2023
dedc589
fix: do not change namespaces if they were manually set
metacosm Jan 25, 2023
552050a
refactor: remove unneeded implementation of NamespaceChangeable
metacosm Feb 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 3 additions & 11 deletions ...eratorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResourceConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import java.util.Set;

import io.javaoperatorsdk.operator.api.config.NamespaceChangeable;
import io.javaoperatorsdk.operator.api.reconciler.Constants;
import io.javaoperatorsdk.operator.api.reconciler.ResourceDiscriminator;
import io.javaoperatorsdk.operator.processing.event.source.filter.GenericFilter;
Expand All @@ -12,7 +11,7 @@

import static io.javaoperatorsdk.operator.api.reconciler.Constants.NO_VALUE_SET;

public class KubernetesDependentResourceConfig<R> implements NamespaceChangeable {
public class KubernetesDependentResourceConfig<R> {

private Set<String> namespaces = Constants.SAME_AS_CONTROLLER_NAMESPACES_SET;
private String labelSelector = NO_VALUE_SET;
Expand Down Expand Up @@ -89,16 +88,9 @@ public ResourceDiscriminator getResourceDiscriminator() {
return resourceDiscriminator;
}

@Override
public void changeNamespaces(Set<String> namespaces) {
if (!wereNamespacesConfigured()) {
this.namespacesWereConfigured = true;
setNamespaces(namespaces);
}
}

@SuppressWarnings("unused")
protected void setNamespaces(Set<String> namespaces) {
if (namespaces != null && !namespaces.isEmpty()) {
if (!wereNamespacesConfigured() && namespaces != null && !namespaces.isEmpty()) {
this.namespaces = namespaces;
}
}
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,14 @@
<fabric8-client.version>6.4.1</fabric8-client.version>
<slf4j.version>1.7.36</slf4j.version>
<log4j.version>2.19.0</log4j.version>
<mokito.version>5.1.0</mokito.version>
<mokito.version>5.1.1</mokito.version>
<commons-lang3.version>3.12.0</commons-lang3.version>
<compile-testing.version>0.19</compile-testing.version>
<javapoet.version>1.13.0</javapoet.version>
<assertj.version>3.24.2</assertj.version>
<awaitility.version>4.2.0</awaitility.version>
<spring-boot.version>2.7.3</spring-boot.version>
<micrometer-core.version>1.10.3</micrometer-core.version>
<micrometer-core.version>1.10.4</micrometer-core.version>

<fmt-maven-plugin.version>2.11</fmt-maven-plugin.version>
<maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
Expand All @@ -68,7 +68,7 @@
<maven-deploy-plugin.version>3.0.0</maven-deploy-plugin.version>
<maven-install-plugin.version>3.1.0</maven-install-plugin.version>
<git-commit-id-maven-plugin.version>5.0.0</git-commit-id-maven-plugin.version>
<formatter-maven-plugin.version>2.21.0</formatter-maven-plugin.version>
<formatter-maven-plugin.version>2.22.0</formatter-maven-plugin.version>
<directory-maven-plugin.version>1.0</directory-maven-plugin.version>
<impsort-maven-plugin.version>1.8.0</impsort-maven-plugin.version>
<okhttp.version>4.10.0</okhttp.version>
Expand Down