mysql e2e test (#786)

Author: csviri

.github/workflows/e2e-test-mysql.yml

@@ -0,0 +1,80 @@
+# End to end integration test which deploys the Tomcat operator to a Kubernetes
+# (Kind) cluster and creates custom resources to verify the operator's functionality
+name: MySQL Schema Operator End to End test
+on:
+  pull_request:
+    branches: [ main, v1 ]
+jobs: 
+    tomcat_e2e_test:
+       runs-on: ubuntu-latest
+       env:
+        KIND_CL_NAME: e2e-test
+       steps:
+        - name: Checkout
+          uses: actions/checkout@v2
+
+        - name: clean resident local docker
+          if: ${{ env.ACT }}
+          continue-on-error: true
+          run: |
+            for DIMG in "$KIND_CL_NAME-control-plane "; do
+              docker stop $DIMG ; docker rm $DIMG ;
+            done ;
+            sleep 1
+
+        - name: Create Kubernetes KinD Cluster
+          uses: container-tools/[email protected]
+          with:
+            cluster_name: e2e-test
+            registry: false
+
+        - name: Deploy MySQL DB
+          working-directory: sample-operators/mysql-schema
+          run: |
+            kubectl create namespace mysql
+            kubectl apply -f k8s/mysql-deployment.yaml
+            kubectl apply -f k8s/mysql-service.yaml
+
+        - name: Set up Java and Maven
+          uses: actions/setup-java@v2
+          with:
+            java-version: 11
+            distribution: adopt-hotspot
+            cache: 'maven'
+
+        - name: Build SDK
+          run: mvn install -DskipTests
+
+        - name: build jib
+          working-directory: sample-operators/mysql-schema
+          run: |
+            mvn --version
+            mvn -B package jib:dockerBuild jib:buildTar -Djib-maven-image=mysql-schema-operator -DskipTests
+            kind load image-archive target/jib-image.tar --name=${{ env.KIND_CL_NAME }}
+
+        - name: Apply CRDs
+          working-directory: sample-operators/mysql-schema
+          run: |
+            kubectl apply -f target/classes/META-INF/fabric8/mysqlschemas.mysql.sample.javaoperatorsdk-v1.yml            
+
+        - name: Deploy MySQL Operator
+          working-directory: sample-operators/mysql-schema
+          run: |
+            kubectl apply -f k8s/operator.yaml
+
+        - name: Run E2E Tests
+          working-directory: sample-operators/mysql-schema
+          run: mvn -B test -P end-to-end-tests
+
+        - name: Dump state
+          if: ${{ failure() }}
+          run: |
+            set +e
+            echo "All namespaces"
+            kubectl get ns
+            echo "All objects in mysql"
+            kubectl get all -n mysql-schema-test" -o yaml
+            echo "Output of mysql pod"
+            kubectl logs -l app=mysql-schema-operator -n mysql-schema
+            echo "All objects in mysql-schema-test"
+            kubectl get deployment,pod,tomcat,webapp -n mysql-schema-test" -o yaml

.github/workflows/end-to-end-tests.yml renamed to .github/workflows/e2e-test-tomcat.yml

@@ -1,10 +1,9 @@
 # End to end integration test which deploys the Tomcat operator to a Kubernetes
 # (Kind) cluster and creates custom resources to verify the operator's functionality
-name: TomcatOperator End to End test
+name: Tomcat Operator End to End test
 on:
-   push:
-      branches:
-      - "*"
+  pull_request:
+    branches: [ main, v1 ]
 jobs: 
     tomcat_e2e_test:
        runs-on: ubuntu-latest

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/polling/PerResourcePollingEventSource.java

@@ -91,6 +91,7 @@ public void onResourceDeleted(R resource) {
     var resourceID = ResourceID.fromResource(resource);
     TimerTask task = timerTasks.remove(resourceID);
     if (task != null) {
+      log.debug("Canceling task for resource: {}", resource);
       task.cancel();
     }
     cache.remove(resourceID);
@@ -100,7 +101,7 @@ private void checkAndRegisterTask(R resource) {
     var resourceID = ResourceID.fromResource(resource);
     if (timerTasks.get(resourceID) == null && (registerPredicate == null
         || registerPredicate.test(resource))) {
-      timer.schedule(new TimerTask() {
+      var task = new TimerTask() {
         @Override
         public void run() {
           if (!isRunning()) {
@@ -112,7 +113,9 @@ public void run() {
           res.ifPresentOrElse(r -> pollForResource(r),
               () -> log.warn("No resource in cache for resource ID: {}", resourceID));
         }
-      }, 0, period);
+      };
+      timerTasks.put(resourceID, task);
+      timer.schedule(task, 0, period);
     }
   }
 

sample-operators/mysql-schema/k8s/mysql-deployment.yaml

@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: mysql
+  namespace: mysql
 spec:
   selector:
     matchLabels:

sample-operators/mysql-schema/k8s/mysql-service.yaml

@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: mysql
+  namespace: mysql
 spec:
   ports:
   - port: 3306

sample-operators/mysql-schema/k8s/operator.yaml

@@ -23,8 +23,8 @@ spec:
       serviceAccountName: mysql-schema-operator # specify the ServiceAccount under which's RBAC persmissions the operator will be executed under
       containers:
       - name: operator
-        image: ${DOCKER_REGISTRY}/mysql-schema-operator:${OPERATOR_VERSION}
-        imagePullPolicy: Always
+        image: mysql-schema-operator
+        imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 80
         env:
@@ -55,21 +55,21 @@ metadata:
   namespace: mysql-schema-operator
 
 ---
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: mysql-schema-operator
 rules:
 - apiGroups:
   - mysql.sample.javaoperatorsdk
   resources:
-  - schemas
+  - mysqlschemas
   verbs:
   - "*"
 - apiGroups:
   - mysql.sample.javaoperatorsdk
   resources:
-  - schemas/status
+  - mysqlschemas/status
   verbs:
   - "*"
 - apiGroups:

sample-operators/mysql-schema/pom.xml

@@ -71,6 +71,13 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <rerunFailingTestsCount>0</rerunFailingTestsCount>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>com.google.cloud.tools</groupId>
                 <artifactId>jib-maven-plugin</artifactId>

sample-operators/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/MySQLSchemaReconciler.java

@@ -50,9 +50,12 @@ public List<EventSource> prepareEventSources(
 
   @Override
   public UpdateControl<MySQLSchema> reconcile(MySQLSchema schema, Context context) {
+    log.info("Reconciling MySQLSchema with name: {}", schema.getMetadata().getName());
     var dbSchema = context.getSecondaryResource(Schema.class);
+    log.debug("Schema: {} found for: {} ", dbSchema, schema.getMetadata().getName());
     try (Connection connection = getConnection()) {
-      if (dbSchema == null) {
+      if (dbSchema.isEmpty()) {
+        log.debug("Creating Schema and related resources for: {}", schema.getMetadata().getName());
         var schemaName = schema.getMetadata().getName();
         String password = RandomStringUtils.randomAlphanumeric(16);
         String secretName = String.format(SECRET_FORMAT, schemaName);
@@ -64,8 +67,10 @@ public UpdateControl<MySQLSchema> reconcile(MySQLSchema schema, Context context)
         updateStatusPojo(schema, secretName, userName);
         log.info("Schema {} created - updating CR status", schema.getMetadata().getName());
         return UpdateControl.updateStatus(schema);
+      } else {
+        log.debug("No update on MySQLSchema with name: {}", schema.getMetadata().getName());
+        return UpdateControl.noUpdate();
       }
-      return UpdateControl.noUpdate();
     } catch (SQLException e) {
       log.error("Error while creating Schema", e);
       throw new IllegalStateException(e);

sample-operators/mysql-schema/src/test/java/io/javaoperatorsdk/operator/sample/MySQLSchemaOperatorE2E.java

@@ -1,9 +1,7 @@
 package io.javaoperatorsdk.operator.sample;
 
-import java.io.File;
 import java.io.IOException;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -16,20 +14,17 @@
 import io.javaoperatorsdk.operator.Operator;
 import io.javaoperatorsdk.operator.config.runtime.DefaultConfigurationService;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
-
 import static java.util.concurrent.TimeUnit.MINUTES;
 import static org.awaitility.Awaitility.await;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.notNullValue;
 
-@Disabled
 public class MySQLSchemaOperatorE2E {
 
   final static String TEST_NS = "mysql-schema-test";
+  final static String MY_SQL_NS = "mysql";
 
   final static Logger log = LoggerFactory.getLogger(MySQLSchemaOperatorE2E.class);
 
@@ -71,12 +66,7 @@ public void test() throws IOException {
     log.info("Creating test namespace {}", TEST_NS);
     client.namespaces().create(testNs);
 
-    log.info("Deploying MySQL server");
-    deployMySQLServer(client);
-
     log.info("Creating test MySQLSchema object: {}", testSchema);
-    // var mysqlSchemaClient = client.customResources(MySQLSchema.class);
-    // mysqlSchemaClient.inNamespace(TEST_NS).createOrReplace(testSchema);
     client.resource(testSchema).createOrReplace();
 
     log.info("Waiting 5 minutes for expected resources to be created and updated");
@@ -90,23 +80,4 @@ public void test() throws IOException {
     });
   }
 
-  private void deployMySQLServer(KubernetesClient client) throws IOException {
-    ObjectMapper mapper = new ObjectMapper(new YAMLFactory());
-    Deployment deployment =
-        mapper.readValue(new File("k8s/mysql-deployment.yaml"), Deployment.class);
-    deployment.getMetadata().setNamespace(TEST_NS);
-    Service service = mapper.readValue(new File("k8s/mysql-service.yaml"), Service.class);
-    service.getMetadata().setNamespace(TEST_NS);
-    client.resource(deployment).createOrReplace();
-    client.resource(service).createOrReplace();
-
-    log.info("Waiting for MySQL server to start");
-    await().atMost(5, MINUTES).until(() -> {
-      Deployment mysqlDeployment = client.apps().deployments().inNamespace(TEST_NS)
-          .withName(deployment.getMetadata().getName()).get();
-      return mysqlDeployment.getStatus().getReadyReplicas() != null
-          && mysqlDeployment.getStatus().getReadyReplicas() == 1;
-    });
-  }
-
 }

sample-operators/tomcat-operator/pom.xml

@@ -61,6 +61,13 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <rerunFailingTestsCount>0</rerunFailingTestsCount>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>com.google.cloud.tools</groupId>
                 <artifactId>jib-maven-plugin</artifactId>