Merge branch 'cherry-pick-864f0251' into 'release/4.0'

Backport to 4.0: Owls 107767 part 1: delete the admin external service when all channels are removed

See merge request weblogic-cloud/weblogic-kubernetes-operator!4200

Author: rjeberhard

operator/src/main/java/oracle/kubernetes/operator/DomainProcessorImpl.java

@@ -344,8 +344,8 @@ private static String getReadinessStatus(CoreV1Event event) {
 
   // pre-conditions: DomainPresenceInfo SPI
   // "principal"
-  public static Step bringAdminServerUp(DomainPresenceInfo info, PodAwaiterStepFactory podAwaiterStepFactory) {
-    return bringAdminServerUpSteps(info, podAwaiterStepFactory);
+  public static Step bringAdminServerUp(PodAwaiterStepFactory podAwaiterStepFactory) {
+    return bringAdminServerUpSteps(podAwaiterStepFactory);
   }
 
   @Override
@@ -503,14 +503,11 @@ public void endScheduledDomainStatusUpdates(DomainPresenceInfo info) {
     }
   }
 
-  private static Step bringAdminServerUpSteps(DomainPresenceInfo info, PodAwaiterStepFactory podAwaiterStepFactory) {
+  private static Step bringAdminServerUpSteps(PodAwaiterStepFactory podAwaiterStepFactory) {
     List<Step> steps = new ArrayList<>();
     steps.add(new BeforeAdminServiceStep(null));
     steps.add(PodHelper.createAdminPodStep(null));
-
-    if (info.getDomain().isExternalServiceConfigured()) {
-      steps.add(ServiceHelper.createForExternalServiceStep(null));
-    }
+    steps.add(ServiceHelper.createForExternalServiceStep(null));
     steps.add(ServiceHelper.createForServerStep(null));
     steps.add(new WatchPodReadyAdminStep(podAwaiterStepFactory, null));
     return Step.chain(steps.toArray(new Step[0]));

operator/src/main/java/oracle/kubernetes/operator/LabelConstants.java

@@ -27,6 +27,7 @@ public interface LabelConstants {
   String TO_BE_ROLLED_LABEL = "weblogic.awaitingPodRoll";
   String DOMAIN_OBSERVED_GENERATION_LABEL = "weblogic.domainObservedGeneration";
   String CLUSTER_OBSERVED_GENERATION_LABEL = "weblogic.clusterObservedGeneration";
+  String SERVICE_TYPE_LABEL = "serviceType";
 
   static String forDomainUidSelector(String uid) {
     return String.format("%s=%s", DOMAINUID_LABEL, uid);
@@ -35,4 +36,8 @@ static String forDomainUidSelector(String uid) {
   static String getCreatedByOperatorSelector() {
     return String.format("%s=%s", CREATEDBYOPERATOR_LABEL, "true");
   }
+
+  static String getServiceTypeSelector(String type) {
+    return String.format("%s=%s", SERVICE_TYPE_LABEL, type);
+  }
 }

operator/src/main/java/oracle/kubernetes/operator/helpers/DomainPresenceInfo.java

@@ -676,7 +676,7 @@ public V1Service getExternalService(String serverName) {
     return getSko(serverName).getExternalService().get();
   }
 
-  void setExternalService(String serverName, V1Service service) {
+  public void setExternalService(String serverName, V1Service service) {
     getSko(serverName).getExternalService().set(service);
   }
 

operator/src/main/java/oracle/kubernetes/operator/helpers/ServiceHelper.java

@@ -61,6 +61,7 @@
 import static oracle.kubernetes.operator.KubernetesConstants.HTTP_NOT_FOUND;
 import static oracle.kubernetes.operator.LabelConstants.forDomainUidSelector;
 import static oracle.kubernetes.operator.LabelConstants.getCreatedByOperatorSelector;
+import static oracle.kubernetes.operator.LabelConstants.getServiceTypeSelector;
 import static oracle.kubernetes.operator.helpers.KubernetesUtils.getDomainUidLabel;
 import static oracle.kubernetes.operator.helpers.OperatorServiceType.EXTERNAL;
 
@@ -596,7 +597,7 @@ private Step deleteAndReplaceNodePortService() {
               .withLabelSelectors(forDomainUidSelector(info.getDomainUid()), getCreatedByOperatorSelector())
               .listServiceAsync(
                       getNamespace(),
-                      new ActionResponseStep<V1ServiceList>() {
+                      new ActionResponseStep<>() {
                       public Step createSuccessStep(V1ServiceList result, Step next) {
                         Collection<V1Service> c = Optional.ofNullable(result).map(list -> list.getItems().stream()
                                   .filter(ServiceHelper::isNodePortType)
@@ -898,6 +899,16 @@ private static class ExternalServiceStepContext extends ServiceStepContext {
       adminServerName = (String) packet.get(ProcessingConstants.SERVER_NAME);
     }
 
+    @Override
+    Step verifyService(Step next) {
+      if (info.getDomain().isExternalServiceConfigured()) {
+        return super.verifyService(next);
+      } else {
+        removeServiceFromRecord();
+        return deleteExternalService(next);
+      }
+    }
+
     @Override
     protected V1ObjectMeta createMetadata() {
       return super.createMetadata().putLabelsItem(LabelConstants.SERVERNAME_LABEL, adminServerName);
@@ -954,6 +965,24 @@ Map<String, String> getServiceAnnotations() {
       return getNullableAdminService().map(AdminService::getAnnotations).orElse(Collections.emptyMap());
     }
 
+    private Step deleteExternalService(Step next) {
+      return Step.chain(getStep(), next);
+    }
+
+    private Step getStep() {
+      return new CallBuilder()
+          .withLabelSelectors(forDomainUidSelector(info.getDomainUid()), getCreatedByOperatorSelector(),
+              getServiceTypeSelector("EXTERNAL"))
+          .listServiceAsync(
+              info.getNamespace(),
+              new ActionResponseStep<>() {
+                public Step createSuccessStep(V1ServiceList result, Step next) {
+                  return new DeleteServiceListStep(result.getItems(), next);
+                }
+              });
+    }
+
+
     @Override
     protected void logServiceCreated(String messageKey) {
       LOGGER.info(messageKey, getDomainUid());

operator/src/main/java/oracle/kubernetes/operator/makeright/MakeRightDomainOperationImpl.java

@@ -296,7 +296,7 @@ private Step createDomainUpPlan(DomainPresenceInfo info) {
             ConfigMapHelper.createOrReplaceFluentdConfigMapStep(),
             domainIntrospectionSteps(),
             new DomainStatusStep(),
-            DomainProcessorImpl.bringAdminServerUp(info, delegate.getPodAwaiterStepFactory(info.getNamespace())),
+            DomainProcessorImpl.bringAdminServerUp(delegate.getPodAwaiterStepFactory(info.getNamespace())),
             managedServerStrategy);
 
     Step introspectionAndDomainPresenceSteps = Step.chain(ConfigMapHelper.readExistingIntrospectorConfigMap(),

operator/src/test/java/oracle/kubernetes/operator/helpers/PodHelperTestBase.java

@@ -2882,7 +2882,7 @@ interface PodMutator {
     void mutate(V1Pod pod);
   }
 
-  protected static class PassthroughPodAwaiterStepFactory implements PodAwaiterStepFactory {
+  public static class PassthroughPodAwaiterStepFactory implements PodAwaiterStepFactory {
     @Override
     public Step waitForReady(V1Pod pod, Step next) {
       return next;