Merge pull request #99 from ContainerSolutions/mysqlsample-operator-serviceaccount

Mysqlsample operator sample improvements

Author: adam-sandor

samples/mysql-schema/README.md

@@ -44,7 +44,7 @@ This should update the actual nginx deployment with new configuration.
 
 ### Build
 
-You can build the sample using `mvn dockerfile:build` this will produce a Docker image you can push to the registry 
+You can build the sample using `mvn package dockerfile:build` this will produce a Docker image you can push to the registry 
 of your choice. The jar file is built using your local Maven and JDK and then copied into the Docker image.
 
 ### Deployment

samples/mysql-schema/k8s/deployment.yaml

@@ -45,6 +45,25 @@ spec:
           initialDelaySeconds: 30
           timeoutSeconds: 1
 ---
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: ClusterRole
+metadata:
+  name: mysql-schema-operator
+rules:
+- apiGroups:
+  - mysql.sample.javaoperatorsdk
+  resources:
+  - schemas
+  verbs:
+  - "*"
+- apiGroups:
+  - apiextensions.k8s.io
+  resources:
+  - customresourcedefinitions
+  verbs:
+  - "get"
+  - "list"
+---
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -61,5 +80,5 @@ subjects:
   namespace: mysql-schema-operator
 roleRef:
   kind: ClusterRole
-  name: cluster-admin
+  name: mysql-schema-operator
   apiGroup: ""

samples/mysql-schema/pom.xml

@@ -60,8 +60,8 @@
                 <artifactId>dockerfile-maven-plugin</artifactId>
                 <version>1.4.12</version>
                 <configuration>
-                    <repository>mysql-schema-operator</repository>
-                    <tag>latest</tag>
+                    <repository>${docker-registry}/mysql-schema-operator</repository>
+                    <tag>${project.version}</tag>
                     <buildArgs>
                         <JAR_FILE>${project.build.finalName}.jar</JAR_FILE>
                     </buildArgs>

samples/mysql-schema/src/main/java/com/github/containersolutions/operator/sample/SchemaController.java

@@ -24,10 +24,7 @@ public class SchemaController implements ResourceController<Schema> {
     @Override
     public Optional<Schema> createOrUpdateResource(Schema schema) {
         try (Connection connection = getConnection()) {
-            ResultSet resultSet = connection.createStatement().executeQuery(
-                    format("SELECT schema_name FROM information_schema.schemata WHERE schema_name = \"%1$s\"",
-                            schema.getMetadata().getName()));
-            if (!resultSet.first()) {
+            if (schemaExists(connection, schema.getMetadata().getName())) {
                 connection.createStatement().execute(format("CREATE SCHEMA `%1$s` DEFAULT CHARACTER SET %2$s",
                         schema.getMetadata().getName(),
                         schema.getSpec().getEncoding()));
@@ -40,10 +37,8 @@ public Optional<Schema> createOrUpdateResource(Schema schema) {
                 schema.setStatus(status);
 
                 log.info("Schema {} created", schema.getMetadata().getName());
-                return Optional.of(schema);
-            } else {
-                return Optional.of(schema);
             }
+            return Optional.of(schema);
         } catch (SQLException e) {
             log.error("Error while creating Schema", e);
 
@@ -61,9 +56,13 @@ public boolean deleteResource(Schema schema) {
         log.info("Execution deleteResource for: {}", schema.getMetadata().getName());
 
         try (Connection connection = getConnection()) {
-            connection.createStatement().execute("DROP DATABASE `" + schema.getMetadata().getName() + "`");
-            log.info("Deleted Schema '{}'", schema.getMetadata().getName());
-
+            if (schemaExists(connection, schema.getMetadata().getName())) {
+                connection.createStatement().execute("DROP DATABASE `" + schema.getMetadata().getName() + "`");
+                log.info("Deleted Schema '{}'", schema.getMetadata().getName());
+            } else {
+                log.info("Delete event ignored for schema '{}', real schema doesn't exist",
+                        schema.getMetadata().getName());
+            }
             return true;
         } catch (SQLException e) {
             log.error("Error while trying to delete Schema", e);
@@ -79,4 +78,11 @@ private Connection getConnection() throws SQLException {
                 System.getenv("MYSQL_PASSWORD")));
     }
 
+    private boolean schemaExists(Connection connection, String schemaName) throws SQLException {
+        ResultSet resultSet = connection.createStatement().executeQuery(
+                format("SELECT schema_name FROM information_schema.schemata WHERE schema_name = \"%1$s\"",
+                        schemaName));
+        return resultSet.first();
+    }
+
 }