Skip to content

fix: homogenize label selector default value #1135

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 1 commit into from
Apr 5, 2022
Merged

fix: homogenize label selector default value #1135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 7 additions & 2 deletions ...c/main/java/io/javaoperatorsdk/operator/api/config/AnnotationControllerConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import io.fabric8.kubernetes.api.model.HasMetadata;
import io.javaoperatorsdk.operator.ReconcilerUtils;
import io.javaoperatorsdk.operator.api.config.dependent.DependentResourceSpec;
import io.javaoperatorsdk.operator.api.reconciler.Constants;
import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent;
Expand Down Expand Up @@ -189,8 +190,12 @@ private Object createKubernetesResourceConfig(Class<? extends DependentResource>
configuredNS = true;
}

final var labelSelector =
Utils.valueOrDefault(kubeDependent, KubernetesDependent::labelSelector, null);
String labelSelector = null;
if (kubeDependent != null) {
final var fromAnnotation = kubeDependent.labelSelector();
labelSelector = Constants.NO_VALUE_SET.equals(fromAnnotation) ? null : fromAnnotation;
}

config =
new KubernetesDependentResourceConfig(namespaces, labelSelector, configuredNS);
return config;
Expand Down
41 changes: 41 additions & 0 deletions ...ava/io/javaoperatorsdk/operator/config/runtime/AnnotationControllerConfigurationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,36 @@
import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent;
import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource;
import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependent;
import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependentResource;
import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependentResourceConfig;
import io.javaoperatorsdk.operator.sample.readonly.ReadOnlyDependent;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;

class AnnotationControllerConfigurationTest {

@Test
void defaultValuesShouldBeConsistent() {
final var configuration = new AnnotationControllerConfiguration<>(new SelectorReconciler());
final var annotated = extractDependentKubernetesResourceConfig(configuration, 1);
final var unannotated = extractDependentKubernetesResourceConfig(configuration, 0);

assertNull(annotated.labelSelector());
assertNull(unannotated.labelSelector());
}

private KubernetesDependentResourceConfig extractDependentKubernetesResourceConfig(
io.javaoperatorsdk.operator.api.config.ControllerConfiguration<?> configuration, int index) {
return (KubernetesDependentResourceConfig) configuration.getDependentResources().get(index)
.getDependentResourceConfiguration()
.orElseThrow();
}

@Test
void getDependentResources() {
var configuration = new AnnotationControllerConfiguration<>(new NoDepReconciler());
Expand Down Expand Up @@ -144,4 +164,25 @@ public UpdateControl<ConfigMap> reconcile(ConfigMap resource, Context<ConfigMap>
return null;
}
}

@ControllerConfiguration(dependents = {
@Dependent(type = SelectorReconciler.WithAnnotation.class),
@Dependent(type = ReadOnlyDependent.class)
})
private static class SelectorReconciler implements Reconciler<ConfigMap> {

@Override
public UpdateControl<ConfigMap> reconcile(ConfigMap resource, Context<ConfigMap> context)
throws Exception {
return null;
}

@KubernetesDependent
private static class WithAnnotation extends KubernetesDependentResource<ConfigMap, ConfigMap> {

public WithAnnotation() {
super(ConfigMap.class);
}
}
}
}