e2e improvements

Author: csviri

sample-operators/leader-election/k8s/operator.yaml

@@ -52,8 +52,8 @@ rules:
   - apiGroups:
       - "sample.javaoperatorsdk"
     resources:
-      - leaderelectiontests
-      - leaderelectiontests/status
+      - leaderelectiontestcustomresources
+      - leaderelectiontestcustomresources/status
     verbs:
       - '*'
   - apiGroups:

sample-operators/leader-election/src/main/java/io/javaoperatorsdk/operator/sample/LeaderElectionTest.java renamed to sample-operators/leader-election/src/main/java/io/javaoperatorsdk/operator/sample/LeaderElectionTestCustomResource.java

@@ -9,7 +9,7 @@
 @Group("sample.javaoperatorsdk")
 @Version("v1")
 @ShortNames("le")
-public class LeaderElectionTest
+public class LeaderElectionTestCustomResource
     extends CustomResource<Void, LeaderElectionTestStatus>
     implements Namespaced {
 }

sample-operators/leader-election/src/main/java/io/javaoperatorsdk/operator/sample/LeaderElectionTestReconciler.java

@@ -9,8 +9,7 @@
 
 @ControllerConfiguration()
 public class LeaderElectionTestReconciler
-    implements Reconciler<LeaderElectionTest> {
-
+    implements Reconciler<LeaderElectionTestCustomResource> {
 
   private final String reconcilerName;
 
@@ -19,9 +18,9 @@ public LeaderElectionTestReconciler(String reconcilerName) {
   }
 
   @Override
-  public UpdateControl<LeaderElectionTest> reconcile(
-      LeaderElectionTest resource,
-      Context<LeaderElectionTest> context) {
+  public UpdateControl<LeaderElectionTestCustomResource> reconcile(
+      LeaderElectionTestCustomResource resource,
+      Context<LeaderElectionTestCustomResource> context) {
 
     if (resource.getStatus() == null) {
       resource.setStatus(new LeaderElectionTestStatus());

sample-operators/leader-election/src/test/java/io/javaoperatorsdk/operator/sample/LeaderElectionE2E.java

@@ -36,7 +36,7 @@ class LeaderElectionE2E {
 
   public static final String TEST_RESOURCE_NAME = "test1";
   public static final int MINIMAL_SECONDS_FOR_RENEWAL = 3;
-  public static final int MAX_WAIT_SECONDS = 10;
+  public static final int MAX_WAIT_SECONDS = 30;
 
   private static final String OPERATOR_1_POD_NAME = "leader-election-operator-1";
   private static final String OPERATOR_2_POD_NAME = "leader-election-operator-2";
@@ -55,7 +55,7 @@ void otherInstancesTakesOverWhenSteppingDown() {
     await().pollDelay(Duration.ofSeconds(MINIMAL_SECONDS_FOR_RENEWAL))
         .atMost(Duration.ofSeconds(MAX_WAIT_SECONDS))
         .untilAsserted(() -> {
-          var actualStatus = client.resources(LeaderElectionTest.class)
+          var actualStatus = client.resources(LeaderElectionTestCustomResource.class)
               .inNamespace(namespace).withName(TEST_RESOURCE_NAME).get().getStatus();
 
           assertThat(actualStatus).isNotNull();
@@ -64,22 +64,23 @@ void otherInstancesTakesOverWhenSteppingDown() {
 
     client.pods().inNamespace(namespace).withName(OPERATOR_1_POD_NAME).delete();
 
-    var actualListSize = client.resources(LeaderElectionTest.class)
+    var actualListSize = client.resources(LeaderElectionTestCustomResource.class)
         .inNamespace(namespace).withName(TEST_RESOURCE_NAME).get().getStatus().getReconciledBy()
         .size();
 
     await().pollDelay(Duration.ofSeconds(MINIMAL_SECONDS_FOR_RENEWAL))
         .atMost(Duration.ofSeconds(240))
         .untilAsserted(() -> {
-          var actualStatus = client.resources(LeaderElectionTest.class)
+          var actualStatus = client.resources(LeaderElectionTestCustomResource.class)
               .inNamespace(namespace).withName(TEST_RESOURCE_NAME).get().getStatus();
 
           assertThat(actualStatus).isNotNull();
           assertThat(actualStatus.getReconciledBy()).hasSizeGreaterThan(actualListSize + 2);
         });
 
-    assertReconciliations(client.resources(LeaderElectionTest.class).inNamespace(namespace)
-        .withName(TEST_RESOURCE_NAME).get().getStatus().getReconciledBy());
+    assertReconciliations(
+        client.resources(LeaderElectionTestCustomResource.class).inNamespace(namespace)
+            .withName(TEST_RESOURCE_NAME).get().getStatus().getReconciledBy());
   }
 
   private void assertReconciliations(List<String> reconciledBy) {
@@ -95,7 +96,7 @@ private void assertReconciliations(List<String> reconciledBy) {
   }
 
   private void applyCustomResource() {
-    var res = new LeaderElectionTest();
+    var res = new LeaderElectionTestCustomResource();
     res.setMetadata(new ObjectMetaBuilder()
         .withName(TEST_RESOURCE_NAME)
         .withNamespace(namespace)
@@ -119,7 +120,7 @@ void tearDown() {
     client.namespaces().resource(new NamespaceBuilder().withNewMetadata().withName(namespace)
         .endMetadata().build()).delete();
     await()
-        .atMost(Duration.ofSeconds(15))
+        .atMost(Duration.ofSeconds(60))
         .untilAsserted(() -> assertThat(client.namespaces().withName(namespace).get()).isNull());
   }
 
@@ -139,7 +140,7 @@ private void deployOperatorsInOrder() {
 
   void applyCRD() {
     String path =
-        "./target/classes/META-INF/fabric8/leaderelectiontests.sample.javaoperatorsdk-v1.yml";
+        "./target/classes/META-INF/fabric8/leaderelectiontestcustomresources.sample.javaoperatorsdk-v1.yml";
     try (InputStream is = new FileInputStream(path)) {
       final var crd = client.load(is);
       crd.createOrReplace();