Multiple version in CRD Support

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/Operator.java

@@ -180,7 +180,8 @@ public synchronized void stop() {
 
     public synchronized void add(Controller controller) {
       final var configuration = controller.getConfiguration();
-      final var resourceTypeName = configuration.getResourceTypeName();
+      final var resourceTypeName = ReconcilerUtils
+          .getResourceTypeNameWithVersion(configuration.getResourceClass());
       final var existing = controllers.get(resourceTypeName);
       if (existing != null) {
         throw new OperatorException("Cannot register controller '" + configuration.getName()

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/ReconcilerUtils.java

@@ -40,9 +40,13 @@ public void setApiVersion(String s) {
     return Constants.NO_FINALIZER.equals(finalizer) || validator.isFinalizerValid(finalizer);
   }
 
-  public static String getResourceTypeName(Class<? extends HasMetadata> resourceClass) {
-    // todo: use fabric8 method when 5.12 is released
-    // return HasMetadata.getFullResourceName(resourceClass);
+  public static String getResourceTypeNameWithVersion(Class<? extends HasMetadata> resourceClass) {
+    final var version = HasMetadata.getVersion(resourceClass);
+    return getResourceTypeName(resourceClass) + "/" + version;
+  }
+
+  public static String getResourceTypeName(
+      Class<? extends HasMetadata> resourceClass) {
     final var group = HasMetadata.getGroup(resourceClass);
     final var plural = HasMetadata.getPlural(resourceClass);
     return (group == null || group.isEmpty()) ? plural : plural + "." + group;

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/EventSourceManager.java

@@ -71,7 +71,7 @@ public void start() {
         try {
           eventSource.start();
         } catch (Exception e) {
-          log.warn("Error starting {} -> {}", eventSource, e);
+          log.warn("Error starting {}", eventSource, e);
         }
       }
       eventProcessor.start();

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/ControllerManagerTest.java

@@ -10,9 +10,9 @@
 import io.javaoperatorsdk.operator.processing.Controller;
 import io.javaoperatorsdk.operator.sample.simple.DuplicateCRController;
 import io.javaoperatorsdk.operator.sample.simple.TestCustomReconciler;
-import io.javaoperatorsdk.operator.sample.simple.TestCustomReconcilerV2;
+import io.javaoperatorsdk.operator.sample.simple.TestCustomReconcilerOtherV1;
 import io.javaoperatorsdk.operator.sample.simple.TestCustomResource;
-import io.javaoperatorsdk.operator.sample.simple.TestCustomResourceV2;
+import io.javaoperatorsdk.operator.sample.simple.TestCustomResourceOtherV1;
 
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -30,11 +30,11 @@ public void shouldNotAddMultipleControllersForSameCustomResource() {
   }
 
   @Test
-  public void addingMultipleControllersForCustomResourcesWithDifferentVersionsShouldNotWork() {
+  public void addingMultipleControllersForCustomResourcesWithSameVersionsShouldNotWork() {
     final var registered = new TestControllerConfiguration<>(new TestCustomReconciler(null),
         TestCustomResource.class);
-    final var duplicated = new TestControllerConfiguration<>(new TestCustomReconcilerV2(),
-        TestCustomResourceV2.class);
+    final var duplicated = new TestControllerConfiguration<>(new TestCustomReconcilerOtherV1(),
+        TestCustomResourceOtherV1.class);
 
     checkException(registered, duplicated);
   }

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/sample/simple/TestCustomReconcilerV2.java → operator-framework-core/src/test/java/io/javaoperatorsdk/operator/sample/simple/TestCustomReconcilerOtherV1.java

@@ -6,10 +6,10 @@
 import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
 
 @ControllerConfiguration
-public class TestCustomReconcilerV2 implements Reconciler<TestCustomResourceV2> {
+public class TestCustomReconcilerOtherV1 implements Reconciler<TestCustomResourceOtherV1> {
 
   @Override
-  public UpdateControl<TestCustomResourceV2> reconcile(TestCustomResourceV2 resource,
+  public UpdateControl<TestCustomResourceOtherV1> reconcile(TestCustomResourceOtherV1 resource,
       Context context) {
     return UpdateControl.noUpdate();
   }

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/sample/simple/TestCustomResourceV2.java → operator-framework-core/src/test/java/io/javaoperatorsdk/operator/sample/simple/TestCustomResourceOtherV1.java

@@ -6,9 +6,9 @@
 import io.fabric8.kubernetes.model.annotation.Version;
 
 @Group("sample.javaoperatorsdk.io")
-@Version("v2")
+@Version("v1")
 @Kind("TestCustomResource") // this is needed to override the automatically generated kind
-public class TestCustomResourceV2
+public class TestCustomResourceOtherV1
     extends CustomResource<TestCustomResourceSpec, TestCustomResourceStatus> {
 
 }

smoke-test-samples/multi-version-crd/README.md

@@ -0,0 +1,11 @@
+## Description
+
+This sample shows how to use CRD with multiple versions.
+
+## How-to
+
+For getting the resource with target version use:
+
+`k get MultiVersionCRDTestCustomResource.v1.sample.javaoperatorsdk mvcv1  -o yaml`
+
+`k get MultiVersionCRDTestCustomResource.v2.sample.javaoperatorsdk mvcv1  -o yaml`

smoke-test-samples/multi-version-crd/k8s/crv1.yaml

@@ -0,0 +1,9 @@
+apiVersion: "sample.javaoperatorsdk/v1"
+kind: MultiVersionCRDTestCustomResource
+metadata:
+  name: mvcv1
+  labels:
+    version: v1
+spec:
+  value1: 1
+  value2: 2

smoke-test-samples/multi-version-crd/k8s/crv2.yaml

@@ -0,0 +1,8 @@
+apiVersion: "sample.javaoperatorsdk/v2"
+kind: MultiVersionCRDTestCustomResource
+metadata:
+  name: mvcv2
+  labels:
+    version: v2
+spec:
+  value1: 1

smoke-test-samples/multi-version-crd/pom.xml

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.javaoperatorsdk</groupId>
+        <artifactId>java-operator-sdk-smoke-test-samples</artifactId>
+        <version>2.0.3-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>operator-framework-smoke-test-samples-multi-version-crd</artifactId>
+    <name>Operator SDK - Smoke Test Samples - Multi Version CRD</name>
+    <description>Sample usage with pure java app</description>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.javaoperatorsdk</groupId>
+            <artifactId>operator-framework</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-slf4j-impl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.fabric8</groupId>
+            <artifactId>crd-generator-apt</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+</project>

smoke-test-samples/multi-version-crd/src/main/java/io/javaoperatorsdk/operator/sample/multiversioncrd/MultiVersionCRDOperator.java

@@ -0,0 +1,17 @@
+package io.javaoperatorsdk.operator.sample.multiversioncrd;
+
+import io.javaoperatorsdk.operator.Operator;
+import io.javaoperatorsdk.operator.api.config.ConfigurationServiceOverrider;
+import io.javaoperatorsdk.operator.config.runtime.DefaultConfigurationService;
+
+public class MultiVersionCRDOperator {
+
+  public static void main(String[] args) {
+    Operator operator =
+        new Operator(
+            ConfigurationServiceOverrider.override(DefaultConfigurationService.instance()).build());
+    operator.register(new MultiVersionCRDTestReconciler1());
+    operator.register(new MultiVersionCRDTestReconciler2());
+    operator.start();
+  }
+}

smoke-test-samples/multi-version-crd/src/main/java/io/javaoperatorsdk/operator/sample/multiversioncrd/MultiVersionCRDTestReconciler1.java

@@ -0,0 +1,32 @@
+package io.javaoperatorsdk.operator.sample.multiversioncrd;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import io.javaoperatorsdk.operator.api.reconciler.Context;
+import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
+import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
+import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
+import io.javaoperatorsdk.operator.sample.multiversioncrd.cr.MultiVersionCRDTestCustomResource1;
+
+import static io.javaoperatorsdk.operator.api.reconciler.Constants.NO_FINALIZER;
+
+@ControllerConfiguration(finalizerName = NO_FINALIZER, labelSelector = "version in (v1)")
+public class MultiVersionCRDTestReconciler1
+    implements Reconciler<MultiVersionCRDTestCustomResource1> {
+
+  private static final Logger log = LoggerFactory.getLogger(MultiVersionCRDTestReconciler1.class);
+
+  @Override
+  public UpdateControl<MultiVersionCRDTestCustomResource1> reconcile(
+      MultiVersionCRDTestCustomResource1 resource, Context context) {
+    log.info("Reconcile MultiVersionCRDTestCustomResource1: {}",
+        resource.getMetadata().getName());
+    resource.getStatus().setValue1(resource.getStatus().getValue1() + 1);
+    resource.getStatus().setValue2(resource.getStatus().getValue2() + 1);
+    if (!resource.getStatus().getReconciledBy().contains(getClass().getSimpleName())) {
+      resource.getStatus().getReconciledBy().add(getClass().getSimpleName());
+    }
+    return UpdateControl.updateStatus(resource);
+  }
+}

smoke-test-samples/multi-version-crd/src/main/java/io/javaoperatorsdk/operator/sample/multiversioncrd/MultiVersionCRDTestReconciler2.java

@@ -0,0 +1,33 @@
+package io.javaoperatorsdk.operator.sample.multiversioncrd;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import io.javaoperatorsdk.operator.api.reconciler.Context;
+import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
+import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
+import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
+import io.javaoperatorsdk.operator.sample.multiversioncrd.cr.MultiVersionCRDTestCustomResource2;
+
+import static io.javaoperatorsdk.operator.api.reconciler.Constants.NO_FINALIZER;
+
+@ControllerConfiguration(
+    finalizerName = NO_FINALIZER,
+    labelSelector = "version in (v2)")
+public class MultiVersionCRDTestReconciler2
+    implements Reconciler<MultiVersionCRDTestCustomResource2> {
+
+  private static final Logger log = LoggerFactory.getLogger(MultiVersionCRDTestReconciler2.class);
+
+  @Override
+  public UpdateControl<MultiVersionCRDTestCustomResource2> reconcile(
+      MultiVersionCRDTestCustomResource2 resource, Context context) {
+    log.info("Reconcile MultiVersionCRDTestCustomResource2: {}",
+        resource.getMetadata().getName());
+    resource.getStatus().setValue1(resource.getStatus().getValue1() + 1);
+    if (!resource.getStatus().getReconciledBy().contains(getClass().getSimpleName())) {
+      resource.getStatus().getReconciledBy().add(getClass().getSimpleName());
+    }
+    return UpdateControl.updateStatus(resource);
+  }
+}

smoke-test-samples/multi-version-crd/src/main/java/io/javaoperatorsdk/operator/sample/multiversioncrd/cr/MultiVersionCRDTestCustomResource1.java

@@ -0,0 +1,24 @@
+package io.javaoperatorsdk.operator.sample.multiversioncrd.cr;
+
+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.Kind;
+import io.fabric8.kubernetes.model.annotation.ShortNames;
+import io.fabric8.kubernetes.model.annotation.Version;
+
+@Group("sample.javaoperatorsdk")
+@Version("v1")
+@Kind("MultiVersionCRDTestCustomResource")
+@ShortNames("mv1")
+public class MultiVersionCRDTestCustomResource1
+    extends
+    CustomResource<MultiVersionCRDTestCustomResourceSpec1, MultiVersionCRDTestCustomResourceStatus1>
+    implements Namespaced {
+
+  @Override
+  protected MultiVersionCRDTestCustomResourceStatus1 initStatus() {
+    return new MultiVersionCRDTestCustomResourceStatus1();
+  }
+
+}

smoke-test-samples/multi-version-crd/src/main/java/io/javaoperatorsdk/operator/sample/multiversioncrd/cr/MultiVersionCRDTestCustomResource2.java

@@ -0,0 +1,24 @@
+package io.javaoperatorsdk.operator.sample.multiversioncrd.cr;
+
+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.Kind;
+import io.fabric8.kubernetes.model.annotation.ShortNames;
+import io.fabric8.kubernetes.model.annotation.Version;
+
+@Group("sample.javaoperatorsdk")
+@Version(value = "v2", storage = false)
+@Kind("MultiVersionCRDTestCustomResource")
+@ShortNames("mv2")
+public class MultiVersionCRDTestCustomResource2
+    extends
+    CustomResource<MultiVersionCRDTestCustomResourceSpec2, MultiVersionCRDTestCustomResourceStatus2>
+    implements Namespaced {
+
+  @Override
+  protected MultiVersionCRDTestCustomResourceStatus2 initStatus() {
+    return new MultiVersionCRDTestCustomResourceStatus2();
+  }
+
+}

smoke-test-samples/multi-version-crd/src/main/java/io/javaoperatorsdk/operator/sample/multiversioncrd/cr/MultiVersionCRDTestCustomResourceSpec1.java

@@ -0,0 +1,26 @@
+package io.javaoperatorsdk.operator.sample.multiversioncrd.cr;
+
+public class MultiVersionCRDTestCustomResourceSpec1 {
+
+  private int value1;
+
+  private int value2;
+
+  public int getValue1() {
+    return value1;
+  }
+
+  public MultiVersionCRDTestCustomResourceSpec1 setValue1(int value1) {
+    this.value1 = value1;
+    return this;
+  }
+
+  public int getValue2() {
+    return value2;
+  }
+
+  public MultiVersionCRDTestCustomResourceSpec1 setValue2(int value2) {
+    this.value2 = value2;
+    return this;
+  }
+}

smoke-test-samples/multi-version-crd/src/main/java/io/javaoperatorsdk/operator/sample/multiversioncrd/cr/MultiVersionCRDTestCustomResourceSpec2.java

@@ -0,0 +1,15 @@
+package io.javaoperatorsdk.operator.sample.multiversioncrd.cr;
+
+public class MultiVersionCRDTestCustomResourceSpec2 {
+
+  private int value1;
+
+  public int getValue1() {
+    return value1;
+  }
+
+  public MultiVersionCRDTestCustomResourceSpec2 setValue1(int value1) {
+    this.value1 = value1;
+    return this;
+  }
+}

smoke-test-samples/multi-version-crd/src/main/java/io/javaoperatorsdk/operator/sample/multiversioncrd/cr/MultiVersionCRDTestCustomResourceStatus1.java

@@ -0,0 +1,40 @@
+package io.javaoperatorsdk.operator.sample.multiversioncrd.cr;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class MultiVersionCRDTestCustomResourceStatus1 {
+
+  private int value1;
+
+  private int value2;
+
+  private List<String> reconciledBy = new ArrayList<>();
+
+  public int getValue1() {
+    return value1;
+  }
+
+  public MultiVersionCRDTestCustomResourceStatus1 setValue1(int value1) {
+    this.value1 = value1;
+    return this;
+  }
+
+  public int getValue2() {
+    return value2;
+  }
+
+  public MultiVersionCRDTestCustomResourceStatus1 setValue2(int value2) {
+    this.value2 = value2;
+    return this;
+  }
+
+  public List<String> getReconciledBy() {
+    return reconciledBy;
+  }
+
+  public MultiVersionCRDTestCustomResourceStatus1 setReconciledBy(List<String> reconciledBy) {
+    this.reconciledBy = reconciledBy;
+    return this;
+  }
+}