Add e2e test to cover optional values

Author: honnix

sample-operators/leader-election/k8s/namespace-inferred-operator-instance-2.yaml

@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: leader-election-operator-2
+spec:
+  serviceAccountName: leader-election-operator
+  containers:
+    - name: operator
+      image: leader-election-operator
+      imagePullPolicy: Never
+      env:
+        - name: POD_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name

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

@@ -0,0 +1,61 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: leader-election-operator
+
+---
+apiVersion: v1
+kind: Pod
+metadata:
+  name: leader-election-operator-1
+spec:
+  serviceAccountName: leader-election-operator
+  containers:
+    - name: operator
+      image: leader-election-operator
+      imagePullPolicy: Never
+      env:
+        - name: POD_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
+
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: operator-admin
+subjects:
+  - kind: ServiceAccount
+    name: leader-election-operator
+roleRef:
+  kind: ClusterRole
+  name: leader-election-operator
+  apiGroup: ""
+
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: leader-election-operator
+rules:
+  - apiGroups:
+      - "apiextensions.k8s.io"
+    resources:
+      - customresourcedefinitions
+    verbs:
+      - '*'
+  - apiGroups:
+      - "sample.javaoperatorsdk"
+    resources:
+      - leaderelectiontestcustomresources
+      - leaderelectiontestcustomresources/status
+    verbs:
+      - '*'
+  - apiGroups:
+      - "coordination.k8s.io"
+    resources:
+      -  "leases"
+    verbs:
+      - '*'
+

sample-operators/leader-election/pom.xml

@@ -51,6 +51,10 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
@@ -75,4 +79,4 @@
         </plugins>
     </build>
 
-</project>
+</project>

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

@@ -17,14 +17,17 @@ public static void main(String[] args) {
 
     log.info("Starting operator with identity: {}", identity);
 
+    LeaderElectionConfiguration leaderElectionConfiguration =
+        namespace == null
+            ? new LeaderElectionConfiguration("leader-election-test")
+            : new LeaderElectionConfiguration("leader-election-test", namespace, identity);
+
     var client = new KubernetesClientBuilder().build();
-    Operator operator = new Operator(client,
-        c -> c.withLeaderElectionConfiguration(
-            new LeaderElectionConfiguration("leader-election-test", namespace, identity)));
+    Operator operator =
+        new Operator(client, c -> c.withLeaderElectionConfiguration(leaderElectionConfiguration));
 
     operator.register(new LeaderElectionTestReconciler(identity));
     operator.installShutdownHook();
     operator.start();
   }
-
 }

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

@@ -13,8 +13,9 @@
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -46,14 +47,15 @@ class LeaderElectionE2E {
   private String namespace;
   private KubernetesClient client;
 
-  @Test
+  @ParameterizedTest
+  @ValueSource(strings = {"namespace-inferred-", ""})
   // not for local mode by design
   @EnabledIfSystemProperty(named = "test.deployment", matches = "remote")
-  void otherInstancesTakesOverWhenSteppingDown() {
+  void otherInstancesTakesOverWhenSteppingDown(String yamlFilePrefix) {
     log.info("Applying custom resource");
     applyCustomResource();
     log.info("Deploying operator instances");
-    deployOperatorsInOrder();
+    deployOperatorsInOrder(yamlFilePrefix);
 
     log.info("Awaiting custom resource reconciliations");
     await().pollDelay(Duration.ofSeconds(MINIMAL_SECONDS_FOR_RENEWAL))
@@ -130,16 +132,16 @@ void tearDown() {
         .untilAsserted(() -> assertThat(client.namespaces().withName(namespace).get()).isNull());
   }
 
-  private void deployOperatorsInOrder() {
+  private void deployOperatorsInOrder(String yamlFilePrefix) {
     log.info("Installing 1st instance");
-    applyResources("k8s/operator.yaml");
+    applyResources("k8s/" + yamlFilePrefix + "operator.yaml");
     await().atMost(Duration.ofSeconds(POD_STARTUP_TIMEOUT)).untilAsserted(() -> {
       var pod = client.pods().inNamespace(namespace).withName(OPERATOR_1_POD_NAME).get();
       assertThat(pod.getStatus().getContainerStatuses().get(0).getReady()).isTrue();
     });
 
     log.info("Installing 2nd instance");
-    applyResources("k8s/operator-instance-2.yaml");
+    applyResources("k8s/" + yamlFilePrefix + "operator-instance-2.yaml");
     await().atMost(Duration.ofSeconds(POD_STARTUP_TIMEOUT)).untilAsserted(() -> {
       var pod = client.pods().inNamespace(namespace).withName(OPERATOR_2_POD_NAME).get();
       assertThat(pod.getStatus().getContainerStatuses().get(0).getReady()).isTrue();