Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: operator-framework/java-operator-sdk
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: operator-framework/java-operator-sdk
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: activation-condition-share-event-source
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 2 commits
  • 22 files changed
  • 1 contributor

Commits on Dec 12, 2023

  1. chore: change version to 4.7.0-SNAPSHOT (#2132)

    Signed-off-by: Attila Mészáros <[email protected]>
    csviri committed Dec 12, 2023

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    csviri Attila Mészáros
    Copy the full SHA
    339520a View commit details
  2. activation condition share event sounrce in DR

    Signed-off-by: Attila Mészáros <[email protected]>
    csviri committed Dec 12, 2023

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    csviri Attila Mészáros
    Copy the full SHA
    be39309 View commit details
Showing with 204 additions and 13 deletions.
  1. +1 −1 bootstrapper-maven-plugin/pom.xml
  2. +1 −1 caffeine-bounded-cache-support/pom.xml
  3. +1 −1 micrometer-support/pom.xml
  4. +1 −1 operator-framework-bom/pom.xml
  5. +1 −1 operator-framework-core/pom.xml
  6. +1 −1 operator-framework-junit5/pom.xml
  7. +1 −1 operator-framework/pom.xml
  8. +7 −0 ...ator-framework/src/test/java/io/javaoperatorsdk/operator/MultipleActivationSharingInformerIT.java
  9. +34 −0 ...atorsdk/operator/sample/multipleactivationsharinginformer/AbstractConfigMapDependentResource.java
  10. +20 −0 ...ava/io/javaoperatorsdk/operator/sample/multipleactivationsharinginformer/ActivationCondition.java
  11. +11 −0 ...avaoperatorsdk/operator/sample/multipleactivationsharinginformer/ConfigMapDependentResource1.java
  12. +11 −0 ...avaoperatorsdk/operator/sample/multipleactivationsharinginformer/ConfigMapDependentResource2.java
  13. +17 −0 ...tor/sample/multipleactivationsharinginformer/MultipleActivationSharingInformerCustomResource.java
  14. +14 −0 ...sample/multipleactivationsharinginformer/MultipleActivationSharingInformerCustomResourceSpec.java
  15. +45 −0 ...perator/sample/multipleactivationsharinginformer/MultipleActivationSharingInformerReconciler.java
  16. +32 −0 ...io/javaoperatorsdk/operator/sample/multipleactivationsharinginformer/SecretDependentResource.java
  17. +1 −1 pom.xml
  18. +1 −1 sample-operators/leader-election/pom.xml
  19. +1 −1 sample-operators/mysql-schema/pom.xml
  20. +1 −1 sample-operators/pom.xml
  21. +1 −1 sample-operators/tomcat-operator/pom.xml
  22. +1 −1 sample-operators/webpage/pom.xml
2 changes: 1 addition & 1 deletion bootstrapper-maven-plugin/pom.xml
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
<parent>
<artifactId>java-operator-sdk</artifactId>
<groupId>io.javaoperatorsdk</groupId>
<version>4.6.1-SNAPSHOT</version>
<version>4.7.0-SNAPSHOT</version>
</parent>

<artifactId>bootstrapper</artifactId>
2 changes: 1 addition & 1 deletion caffeine-bounded-cache-support/pom.xml
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
<parent>
<artifactId>java-operator-sdk</artifactId>
<groupId>io.javaoperatorsdk</groupId>
<version>4.6.1-SNAPSHOT</version>
<version>4.7.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2 changes: 1 addition & 1 deletion micrometer-support/pom.xml
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
<parent>
<artifactId>java-operator-sdk</artifactId>
<groupId>io.javaoperatorsdk</groupId>
<version>4.6.1-SNAPSHOT</version>
<version>4.7.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2 changes: 1 addition & 1 deletion operator-framework-bom/pom.xml
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@

<groupId>io.javaoperatorsdk</groupId>
<artifactId>operator-framework-bom</artifactId>
<version>4.6.1-SNAPSHOT</version>
<version>4.7.0-SNAPSHOT</version>
<name>Operator SDK - Bill of Materials</name>
<packaging>pom</packaging>
<description>Java SDK for implementing Kubernetes operators</description>
2 changes: 1 addition & 1 deletion operator-framework-core/pom.xml
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
<parent>
<groupId>io.javaoperatorsdk</groupId>
<artifactId>java-operator-sdk</artifactId>
<version>4.6.1-SNAPSHOT</version>
<version>4.7.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2 changes: 1 addition & 1 deletion operator-framework-junit5/pom.xml
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
<parent>
<artifactId>java-operator-sdk</artifactId>
<groupId>io.javaoperatorsdk</groupId>
<version>4.6.1-SNAPSHOT</version>
<version>4.7.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2 changes: 1 addition & 1 deletion operator-framework/pom.xml
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
<parent>
<artifactId>java-operator-sdk</artifactId>
<groupId>io.javaoperatorsdk</groupId>
<version>4.6.1-SNAPSHOT</version>
<version>4.7.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package io.javaoperatorsdk.operator;

public class MultipleActivationSharingInformerIT {



}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
package io.javaoperatorsdk.operator.sample.multipleactivationsharinginformer;

import io.fabric8.kubernetes.api.model.ConfigMap;
import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
import io.javaoperatorsdk.operator.api.reconciler.Context;
import io.javaoperatorsdk.operator.processing.dependent.kubernetes.CRUDNoGCKubernetesDependentResource;

import java.util.Map;

public abstract class AbstractConfigMapDependentResource
extends
CRUDNoGCKubernetesDependentResource<ConfigMap, MultipleActivationSharingInformerCustomResource> {

public static final String DATA_KEY = "data";

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

@Override
protected ConfigMap desired(MultipleActivationSharingInformerCustomResource primary,
Context<MultipleActivationSharingInformerCustomResource> context) {
ConfigMap configMap = new ConfigMap();
configMap.setMetadata(new ObjectMetaBuilder()
.withName(primary.getMetadata().getName())
.withNamespace(primary.getMetadata().getNamespace())
.build());
configMap.setData(Map.of(DATA_KEY, value(primary)));
return configMap;
}

abstract String value(MultipleActivationSharingInformerCustomResource primary);

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package io.javaoperatorsdk.operator.sample.multipleactivationsharinginformer;

import io.fabric8.openshift.api.model.Route;
import io.javaoperatorsdk.operator.api.reconciler.Context;
import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource;
import io.javaoperatorsdk.operator.processing.dependent.workflow.Condition;

public class ActivationCondition
implements Condition<Route, MultipleActivationSharingInformerCustomResource> {

public final static boolean MET = true;

@Override
public boolean isMet(
DependentResource<Route, MultipleActivationSharingInformerCustomResource> dependentResource,
MultipleActivationSharingInformerCustomResource primary,
Context<MultipleActivationSharingInformerCustomResource> context) {
return MET;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package io.javaoperatorsdk.operator.sample.multipleactivationsharinginformer;

public class ConfigMapDependentResource1 extends AbstractConfigMapDependentResource {

public static final String VALUE_SUFFIX = "_1";

@Override
String value(MultipleActivationSharingInformerCustomResource primary) {
return primary.getSpec().getValue()+ VALUE_SUFFIX;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package io.javaoperatorsdk.operator.sample.multipleactivationsharinginformer;

public class ConfigMapDependentResource2 extends AbstractConfigMapDependentResource {

public static final String VALUE_SUFFIX = "_2";

@Override
String value(MultipleActivationSharingInformerCustomResource primary) {
return primary.getSpec().getValue()+ VALUE_SUFFIX;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package io.javaoperatorsdk.operator.sample.multipleactivationsharinginformer;

import io.fabric8.kubernetes.api.model.Namespaced;
import io.fabric8.kubernetes.client.CustomResource;
import io.fabric8.kubernetes.model.annotation.Group;
import io.fabric8.kubernetes.model.annotation.ShortNames;
import io.fabric8.kubernetes.model.annotation.Version;

@Group("sample.javaoperatorsdk")
@Version("v1")
@ShortNames("mwac")
public class MultipleActivationSharingInformerCustomResource
extends CustomResource<MultipleActivationSharingInformerCustomResourceSpec, Void>
implements Namespaced {


}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package io.javaoperatorsdk.operator.sample.multipleactivationsharinginformer;

public class MultipleActivationSharingInformerCustomResourceSpec {

private String value;

public String getValue() {
return value;
}

public void setValue(String value) {
this.value = value;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
package io.javaoperatorsdk.operator.sample.multipleactivationsharinginformer;

import io.fabric8.kubernetes.api.model.ConfigMap;
import io.javaoperatorsdk.operator.api.config.informer.InformerConfiguration;
import io.javaoperatorsdk.operator.api.reconciler.*;
import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent;
import io.javaoperatorsdk.operator.processing.event.source.EventSource;
import io.javaoperatorsdk.operator.processing.event.source.informer.InformerEventSource;

import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;

@ControllerConfiguration(dependents = {
@Dependent(type = ConfigMapDependentResource1.class,
activationCondition = ActivationCondition.class),
@Dependent(type = ConfigMapDependentResource2.class,
activationCondition = ActivationCondition.class),
@Dependent(type = SecretDependentResource.class)
})
public class MultipleActivationSharingInformerReconciler
implements Reconciler<MultipleActivationSharingInformerCustomResource> {

public static final String CONFIG_MAP_INFORMER_NAME = "ConfigMapInformer";
private final AtomicInteger numberOfReconciliationExecution = new AtomicInteger(0);

InformerEventSource<ConfigMap,MultipleActivationSharingInformerCustomResource> configMapES;


public MultipleActivationSharingInformerReconciler() {
}

@Override
public UpdateControl<MultipleActivationSharingInformerCustomResource> reconcile(
MultipleActivationSharingInformerCustomResource resource,
Context<MultipleActivationSharingInformerCustomResource> context) {

numberOfReconciliationExecution.incrementAndGet();

return UpdateControl.noUpdate();
}

public int getNumberOfReconciliationExecution() {
return numberOfReconciliationExecution.get();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package io.javaoperatorsdk.operator.sample.multipleactivationsharinginformer;

import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
import io.fabric8.kubernetes.api.model.Secret;
import io.javaoperatorsdk.operator.api.reconciler.Context;
import io.javaoperatorsdk.operator.processing.dependent.kubernetes.CRUDKubernetesDependentResource;
import io.javaoperatorsdk.operator.sample.workflowmultipleactivation.WorkflowMultipleActivationCustomResource;

import java.util.Base64;
import java.util.Map;

public class SecretDependentResource
extends CRUDKubernetesDependentResource<Secret, MultipleActivationSharingInformerCustomResource> {

public SecretDependentResource() {
super(Secret.class);
}

@Override
protected Secret desired(MultipleActivationSharingInformerCustomResource primary,
Context<MultipleActivationSharingInformerCustomResource> context) {
// basically does not matter since this should not be called
Secret secret = new Secret();
secret.setMetadata(new ObjectMetaBuilder()
.withName(primary.getMetadata().getName())
.withNamespace(primary.getMetadata().getNamespace())
.build());
secret.setData(Map.of("data",
Base64.getEncoder().encodeToString(primary.getSpec().getValue().getBytes())));
return secret;
}
}
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@

<groupId>io.javaoperatorsdk</groupId>
<artifactId>java-operator-sdk</artifactId>
<version>4.6.1-SNAPSHOT</version>
<version>4.7.0-SNAPSHOT</version>
<name>Operator SDK for Java</name>
<description>Java SDK for implementing Kubernetes operators</description>
<packaging>pom</packaging>
2 changes: 1 addition & 1 deletion sample-operators/leader-election/pom.xml
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
<parent>
<groupId>io.javaoperatorsdk</groupId>
<artifactId>sample-operators</artifactId>
<version>4.6.1-SNAPSHOT</version>
<version>4.7.0-SNAPSHOT</version>
</parent>

<artifactId>sample-leader-election</artifactId>
2 changes: 1 addition & 1 deletion sample-operators/mysql-schema/pom.xml
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
<parent>
<groupId>io.javaoperatorsdk</groupId>
<artifactId>sample-operators</artifactId>
<version>4.6.1-SNAPSHOT</version>
<version>4.7.0-SNAPSHOT</version>
</parent>

<artifactId>sample-mysql-schema-operator</artifactId>
2 changes: 1 addition & 1 deletion sample-operators/pom.xml
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
<parent>
<groupId>io.javaoperatorsdk</groupId>
<artifactId>java-operator-sdk</artifactId>
<version>4.6.1-SNAPSHOT</version>
<version>4.7.0-SNAPSHOT</version>
</parent>

<artifactId>sample-operators</artifactId>
2 changes: 1 addition & 1 deletion sample-operators/tomcat-operator/pom.xml
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
<parent>
<groupId>io.javaoperatorsdk</groupId>
<artifactId>sample-operators</artifactId>
<version>4.6.1-SNAPSHOT</version>
<version>4.7.0-SNAPSHOT</version>
</parent>

<artifactId>sample-tomcat-operator</artifactId>
2 changes: 1 addition & 1 deletion sample-operators/webpage/pom.xml
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
<parent>
<groupId>io.javaoperatorsdk</groupId>
<artifactId>sample-operators</artifactId>
<version>4.6.1-SNAPSHOT</version>
<version>4.7.0-SNAPSHOT</version>
</parent>

<artifactId>sample-webpage-operator</artifactId>