webserver example now runs on java 8

csviri · csviri · commit 64895f2ee995 · 2019-09-09T22:45:52.000+02:00
diff --git a/samples/webserver/crd/webserver.yaml b/samples/webserver/crd/webserver.yaml
@@ -11,4 +11,4 @@ spec:
       <body>
         Hellooooo!! Operators!!
       </body>
-    </html>
+    </html>
diff --git a/samples/webserver/pom.xml b/samples/webserver/pom.xml
@@ -10,7 +10,9 @@
     <name>Operator SDK - Samples - Web Server</name>
 
     <properties>
-        <java.version>11</java.version>
+        <java.version>8</java.version>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
     </properties>
 
     <dependencies>
@@ -42,9 +44,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.8.1</version>
-                <configuration>
-                    <release>${java.version}</release>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>com.spotify</groupId>
diff --git a/samples/webserver/src/main/java/com/github/containersolutions/operator/sample/WebServerController.java b/samples/webserver/src/main/java/com/github/containersolutions/operator/sample/WebServerController.java
@@ -5,6 +5,10 @@
 import com.github.containersolutions.operator.api.ResourceController;
 import io.fabric8.kubernetes.api.model.*;
 import io.fabric8.kubernetes.api.model.apps.Deployment;
+import io.fabric8.kubernetes.api.model.apps.DoneableDeployment;
+import io.fabric8.kubernetes.client.dsl.Resource;
+import io.fabric8.kubernetes.client.dsl.RollableScalableResource;
+import io.fabric8.kubernetes.client.dsl.ServiceResource;
 import io.fabric8.kubernetes.client.utils.Serialization;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -79,7 +83,7 @@ public Optional<WebServer> createOrUpdateResource(WebServer webServer, Context<W
             }
         }
 
-        var status = new WebServerStatus();
+        WebServerStatus status = new WebServerStatus();
         status.setHtmlConfigMap(htmlConfigMap.getMetadata().getName());
         status.setAreWeGood("Yes!");
         webServer.setStatus(status);
@@ -92,23 +96,23 @@ public boolean deleteResource(WebServer nginx, Context<WebServer> context) {
         log.info("Execution deleteResource for: {}", nginx.getMetadata().getName());
 
         log.info("Deleting ConfigMap {}", configMapName(nginx));
-        var configMap = context.getK8sClient().configMaps()
+        Resource<ConfigMap, DoneableConfigMap> configMap = context.getK8sClient().configMaps()
                 .inNamespace(nginx.getMetadata().getNamespace())
                 .withName(configMapName(nginx));
         if (configMap.get() != null) {
             configMap.delete();
         }
 
         log.info("Deleting Deployment {}", deploymentName(nginx));
-        var deployment = context.getK8sClient().apps().deployments()
+        RollableScalableResource<Deployment, DoneableDeployment> deployment = context.getK8sClient().apps().deployments()
                 .inNamespace(nginx.getMetadata().getNamespace())
                 .withName(deploymentName(nginx));
         if (deployment.get() != null) {
             deployment.cascading(true).delete();
         }
 
         log.info("Deleting Service {}", serviceName(nginx));
-        var service = context.getK8sClient().services()
+        ServiceResource<Service, DoneableService> service = context.getK8sClient().services()
                 .inNamespace(nginx.getMetadata().getNamespace())
                 .withName(serviceName(nginx));
         if (service.get() != null) {

-Original file line number
+Diff line change
       <body>
         Hellooooo!! Operators!!
       </body>
 -    </html>
 +    </html>