test for operator created 'true'

russgold · russgold · commit 21719b533ba4 · 2019-03-28T09:33:12.000-04:00
diff --git a/model/src/main/java/oracle/kubernetes/operator/LabelConstants.java b/model/src/main/java/oracle/kubernetes/operator/LabelConstants.java
@@ -20,7 +20,11 @@ public interface LabelConstants {
   String CLUSTERRESTARTVERSION_LABEL = "weblogic.clusterRestartVersion";
   String SERVERRESTARTVERSION_LABEL = "weblogic.serverRestartVersion";
 
-  static String forDomainUid(String uid) {
+  static String forDomainUidSelector(String uid) {
     return String.format("%s=%s", DOMAINUID_LABEL, uid);
   }
+
+  static String getCreatedbyOperatorSelector() {
+    return String.format("%s=%s", CREATEDBYOPERATOR_LABEL, "true");
+  }
 }
diff --git a/operator/src/main/java/oracle/kubernetes/operator/DomainProcessorImpl.java b/operator/src/main/java/oracle/kubernetes/operator/DomainProcessorImpl.java
@@ -512,15 +512,15 @@ public NextAction apply(Packet packet) {
   private static Step readExistingPods(DomainPresenceInfo info) {
     return new CallBuilder()
         .withLabelSelectors(
-            LabelConstants.forDomainUid(info.getDomainUID()),
+            LabelConstants.forDomainUidSelector(info.getDomainUID()),
             LabelConstants.CREATEDBYOPERATOR_LABEL)
         .listPodAsync(info.getNamespace(), new PodListStep(info));
   }
 
   private Step readExistingServices(DomainPresenceInfo info) {
     return new CallBuilder()
         .withLabelSelectors(
-            LabelConstants.forDomainUid(info.getDomainUID()),
+            LabelConstants.forDomainUidSelector(info.getDomainUID()),
             LabelConstants.CREATEDBYOPERATOR_LABEL)
         .listServiceAsync(info.getNamespace(), new ServiceListStep(info));
   }
diff --git a/operator/src/main/java/oracle/kubernetes/operator/helpers/KubernetesServiceType.java b/operator/src/main/java/oracle/kubernetes/operator/helpers/KubernetesServiceType.java
@@ -81,6 +81,7 @@ boolean matches(V1Service service) {
   private static final String SERVICE_TYPE = "serviceType";
 
   static KubernetesServiceType getType(V1Service service) {
+    if (!KubernetesUtils.isOperatorCreated(service.getMetadata())) return EXTERNAL;
     String type = ServiceHelper.getLabelValue(service, SERVICE_TYPE);
     if (type != null) return KubernetesServiceType.valueOf(type);
 
diff --git a/operator/src/main/java/oracle/kubernetes/operator/helpers/KubernetesUtils.java b/operator/src/main/java/oracle/kubernetes/operator/helpers/KubernetesUtils.java
@@ -4,10 +4,13 @@
 
 package oracle.kubernetes.operator.helpers;
 
+import static oracle.kubernetes.operator.LabelConstants.CREATEDBYOPERATOR_LABEL;
+
 import io.kubernetes.client.models.V1ObjectMeta;
 import java.lang.reflect.Field;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import javax.json.JsonPatchBuilder;
 import oracle.kubernetes.operator.LabelConstants;
 import org.apache.commons.collections.MapUtils;
@@ -133,6 +136,16 @@ private static int getResourceVersion(V1ObjectMeta metadata) {
 
   public static V1ObjectMeta withOperatorLabels(V1ObjectMeta meta, String uid) {
     return meta.putLabelsItem(LabelConstants.DOMAINUID_LABEL, uid)
-        .putLabelsItem(LabelConstants.CREATEDBYOPERATOR_LABEL, "true");
+        .putLabelsItem(CREATEDBYOPERATOR_LABEL, "true");
+  }
+
+  static boolean isOperatorCreated(V1ObjectMeta metadata) {
+    return Boolean.parseBoolean(getOperatorCreatedLabel(metadata));
+  }
+
+  private static String getOperatorCreatedLabel(V1ObjectMeta metadata) {
+    return Optional.ofNullable(metadata.getLabels())
+        .map(labels -> labels.get(CREATEDBYOPERATOR_LABEL))
+        .orElse("false");
   }
 }
diff --git a/operator/src/main/java/oracle/kubernetes/operator/helpers/PodStepContext.java b/operator/src/main/java/oracle/kubernetes/operator/helpers/PodStepContext.java
@@ -4,7 +4,7 @@
 
 package oracle.kubernetes.operator.helpers;
 
-import static oracle.kubernetes.operator.LabelConstants.forDomainUid;
+import static oracle.kubernetes.operator.LabelConstants.forDomainUidSelector;
 import static oracle.kubernetes.operator.VersionConstants.DEFAULT_DOMAIN_VERSION;
 
 import io.kubernetes.client.custom.IntOrString;
@@ -529,7 +529,7 @@ public NextAction apply(Packet packet) {
       String domainUID = getDomainUID();
       Step list =
           new CallBuilder()
-              .withLabelSelectors(forDomainUid(domainUID))
+              .withLabelSelectors(forDomainUidSelector(domainUID))
               .listPersistentVolumeAsync(
                   new DefaultResponseStep<V1PersistentVolumeList>(getNext()) {
                     @Override
diff --git a/operator/src/main/java/oracle/kubernetes/operator/steps/DeleteDomainStep.java b/operator/src/main/java/oracle/kubernetes/operator/steps/DeleteDomainStep.java
@@ -1,11 +1,11 @@
-// Copyright 2017, 2018, Oracle Corporation and/or its affiliates.  All rights reserved.
+// Copyright 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
 // Licensed under the Universal Permissive License v 1.0 as shown at
 // http://oss.oracle.com/licenses/upl.
 
 package oracle.kubernetes.operator.steps;
 
-import static oracle.kubernetes.operator.LabelConstants.CREATEDBYOPERATOR_LABEL;
-import static oracle.kubernetes.operator.LabelConstants.forDomainUid;
+import static oracle.kubernetes.operator.LabelConstants.forDomainUidSelector;
+import static oracle.kubernetes.operator.LabelConstants.getCreatedbyOperatorSelector;
 
 import io.kubernetes.client.models.V1PersistentVolumeClaimList;
 import io.kubernetes.client.models.V1PersistentVolumeList;
@@ -54,7 +54,7 @@ public NextAction apply(Packet packet) {
 
   private Step deleteServices() {
     return new CallBuilder()
-        .withLabelSelectors(forDomainUid(domainUID), CREATEDBYOPERATOR_LABEL)
+        .withLabelSelectors(forDomainUidSelector(domainUID), getCreatedbyOperatorSelector())
         .listServiceAsync(
             namespace,
             new ActionResponseStep<V1ServiceList>() {
@@ -66,13 +66,13 @@ Step createSuccessStep(V1ServiceList result, Step next) {
 
   private Step deletePods() {
     return new CallBuilder()
-        .withLabelSelectors(forDomainUid(domainUID), CREATEDBYOPERATOR_LABEL)
+        .withLabelSelectors(forDomainUidSelector(domainUID), getCreatedbyOperatorSelector())
         .deleteCollectionPodAsync(namespace, new DefaultResponseStep<>(null));
   }
 
   private Step deletePersistentVolumes() {
     return new CallBuilder()
-        .withLabelSelectors(forDomainUid(domainUID), CREATEDBYOPERATOR_LABEL)
+        .withLabelSelectors(forDomainUidSelector(domainUID), getCreatedbyOperatorSelector())
         .listPersistentVolumeAsync(
             new ActionResponseStep<V1PersistentVolumeList>() {
               @Override
@@ -84,7 +84,7 @@ Step createSuccessStep(V1PersistentVolumeList result, Step next) {
 
   private Step deletePersistentVolumeClaims() {
     return new CallBuilder()
-        .withLabelSelectors(forDomainUid(domainUID), CREATEDBYOPERATOR_LABEL)
+        .withLabelSelectors(forDomainUidSelector(domainUID), getCreatedbyOperatorSelector())
         .listPersistentVolumeClaimAsync(
             namespace,
             new ActionResponseStep<V1PersistentVolumeClaimList>() {
diff --git a/operator/src/test/java/oracle/kubernetes/operator/DomainProcessorTest.java b/operator/src/test/java/oracle/kubernetes/operator/DomainProcessorTest.java
@@ -6,8 +6,15 @@
 
 import static com.meterware.simplestub.Stub.createStrictStub;
 import static oracle.kubernetes.operator.KubernetesConstants.INTROSPECTOR_CONFIG_MAP_NAME_SUFFIX;
+import static oracle.kubernetes.operator.LabelConstants.CREATEDBYOPERATOR_LABEL;
+import static oracle.kubernetes.operator.LabelConstants.DOMAINNAME_LABEL;
+import static oracle.kubernetes.operator.LabelConstants.DOMAINUID_LABEL;
+import static oracle.kubernetes.operator.LabelConstants.RESOURCE_VERSION_LABEL;
 import static oracle.kubernetes.operator.LabelConstants.SERVERNAME_LABEL;
 import static oracle.kubernetes.operator.ProcessingConstants.JOB_POD_NAME;
+import static oracle.kubernetes.operator.VersionConstants.DEFAULT_DOMAIN_VERSION;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.empty;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.junit.MatcherAssert.assertThat;
@@ -24,6 +31,7 @@
 import io.kubernetes.client.models.V1PodSpec;
 import io.kubernetes.client.models.V1SecretReference;
 import io.kubernetes.client.models.V1Service;
+import io.kubernetes.client.models.V1ServiceSpec;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -153,6 +161,46 @@ public void whenDomainScaledDown_removeExcessPodsAndServices() {
     assertThat(getRunningPods().size(), equalTo(MIN_REPLICAS + NUM_ADMIN_SERVERS + NUM_JOB_PODS));
   }
 
+  @Test
+  public void whenDomainShutDown_removeAllPodsAndServices() {
+    defineServerResources(ADMIN_SERVER_NAME);
+    Arrays.stream(managedServerNames).forEach(this::defineServerResources);
+
+    DomainPresenceInfo info = new DomainPresenceInfo(domain);
+    processor.makeRightDomainPresence(info, true, true, true);
+
+    assertThat(getRunningServices(), empty());
+    assertThat(getRunningPods(), empty());
+  }
+
+  @Test
+  public void whenDomainShutDown_ignoreNonOperatorServices() {
+    defineServerResources(ADMIN_SERVER_NAME);
+    Arrays.stream(managedServerNames).forEach(this::defineServerResources);
+    testSupport.defineResources(createNonOperatorService());
+
+    DomainPresenceInfo info = new DomainPresenceInfo(domain);
+    processor.makeRightDomainPresence(info, true, true, true);
+
+    assertThat(getRunningServices(), contains(createNonOperatorService()));
+    assertThat(getRunningPods(), empty());
+  }
+
+  private V1Service createNonOperatorService() {
+    return new V1Service()
+        .metadata(
+            new V1ObjectMeta()
+                .name("do-not-delete-service")
+                .namespace(NS)
+                .putLabelsItem("serviceType", "SERVER")
+                .putLabelsItem(CREATEDBYOPERATOR_LABEL, "false")
+                .putLabelsItem(DOMAINNAME_LABEL, UID)
+                .putLabelsItem(DOMAINUID_LABEL, UID)
+                .putLabelsItem(RESOURCE_VERSION_LABEL, DEFAULT_DOMAIN_VERSION)
+                .putLabelsItem(SERVERNAME_LABEL, ADMIN_SERVER_NAME))
+        .spec(new V1ServiceSpec().type("ClusterIP"));
+  }
+
   private Stream<V1Service> getServerServices() {
     return getRunningServices().stream().filter(ServiceHelper::isServerService);
   }
diff --git a/operator/src/test/java/oracle/kubernetes/operator/helpers/ServicePresenceTest.java b/operator/src/test/java/oracle/kubernetes/operator/helpers/ServicePresenceTest.java
@@ -6,6 +6,7 @@
 
 import static com.meterware.simplestub.Stub.createStrictStub;
 import static oracle.kubernetes.operator.LabelConstants.CLUSTERNAME_LABEL;
+import static oracle.kubernetes.operator.LabelConstants.CREATEDBYOPERATOR_LABEL;
 import static oracle.kubernetes.operator.LabelConstants.DOMAINUID_LABEL;
 import static oracle.kubernetes.operator.LabelConstants.SERVERNAME_LABEL;
 import static oracle.kubernetes.operator.ProcessingConstants.CLUSTER_NAME;
@@ -244,7 +245,11 @@ public void onDeleteEventWithNewerClusterService_removeIt() {
   @Test
   public void whenEventContainsServiceWithClusterNameAndNoTypeLabel_addAsClusterService() {
     V1Service service =
-        new V1Service().metadata(createMetadata().putLabelsItem(CLUSTERNAME_LABEL, CLUSTER));
+        new V1Service()
+            .metadata(
+                createMetadata()
+                    .putLabelsItem(CREATEDBYOPERATOR_LABEL, "true")
+                    .putLabelsItem(CLUSTERNAME_LABEL, CLUSTER));
     Watch.Response<V1Service> event = WatchEvent.createAddedEvent(service).toWatchResponse();
 
     processor.dispatchServiceWatch(event);
@@ -372,6 +377,7 @@ public void whenEventContainsServiceWithServerNameAndNoTypeLabel_addAsServerServ
         new V1Service()
             .metadata(
                 createMetadata()
+                    .putLabelsItem(CREATEDBYOPERATOR_LABEL, "true")
                     .putLabelsItem(CLUSTERNAME_LABEL, CLUSTER)
                     .putLabelsItem(SERVERNAME_LABEL, SERVER));
     Watch.Response<V1Service> event = WatchEvent.createAddedEvent(service).toWatchResponse();

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,11 @@ public interface LabelConstants {`
`20`	`20`	`String CLUSTERRESTARTVERSION_LABEL = "weblogic.clusterRestartVersion";`
`21`	`21`	`String SERVERRESTARTVERSION_LABEL = "weblogic.serverRestartVersion";`
`22`	`22`
`23`		`- static String forDomainUid(String uid) {`
	`23`	`+ static String forDomainUidSelector(String uid) {`
`24`	`24`	`return String.format("%s=%s", DOMAINUID_LABEL, uid);`
`25`	`25`	`}`
	`26`	`+`
	`27`	`+ static String getCreatedbyOperatorSelector() {`
	`28`	`+ return String.format("%s=%s", CREATEDBYOPERATOR_LABEL, "true");`
	`29`	`+ }`
`26`	`30`	`}`