Harden removing Ingress

Author: rjeberhard

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

@@ -197,8 +197,8 @@ public NextAction apply(Packet packet) {
       String clusterName = (String) packet.get(ProcessingConstants.CLUSTER_NAME);
       V1ObjectMeta meta = service.getMetadata();
 
-      String ingressName;
-      ingressName = getIngressName(info, serverName);
+      String ingressName= CallBuilder.toDNS1123LegalName(
+          info.getDomain().getSpec().getDomainUID() + "-" + clusterName);
       if (ingressName != null) {
         return doNext(CallBuilder.create().readIngressAsync(
           ingressName, meta.getNamespace(), new ResponseStep<V1beta1Ingress>(next) {
@@ -344,35 +344,4 @@ private static boolean addV1beta1HTTPIngressPath(V1beta1Ingress v1beta1Ingress,
     return false;
   }
 
-  /**
-   * Get the ingress name to remove.
-   * @param info DomainPresenceInfo object
-   * @param serverName server name to remove
-   * @return name of ingress
-   */
-  private static String getIngressName(DomainPresenceInfo info, String serverName) {
-    Map<String, WlsClusterConfig> clusters = info.getScan().getClusterConfigs();
-    String ingressName = null;
-
-    // Get the cluster ingress if we have one
-    if (clusters != null) {
-      for (Map.Entry<String, WlsClusterConfig> clusterConfig : clusters.entrySet()) {
-        List<WlsServerConfig> servers = clusterConfig.getValue().getServerConfigs();
-        if (servers != null) {
-          for (WlsServerConfig server : servers) {
-            if (serverName.equals(server.getName())) {
-              ingressName = CallBuilder.toDNS1123LegalName(
-                  info.getDomain().getSpec().getDomainUID() + "-" + clusterConfig.getKey());
-              break;
-            }
-          }
-        }
-        if (ingressName != null) {
-          break;
-        }
-      }
-    }
-
-    return ingressName;
-  }
 }

wercker.yml

@@ -43,7 +43,7 @@ build:
       mkdir /operator
       cp -R src/main/scripts/* /operator/
       cp target/weblogic-kubernetes-operator-0.1.0-alpha-SNAPSHOT.jar /operator/weblogic-kubernetes-operator.jar
-      export IMAGE_TAG_OPERATOR="${WERCKER_GIT_BRANCH//[_/]/-}"
+      export IMAGE_TAG_OPERATOR="${WERCKER_GIT_BRANCH//[_\/]/-}"
       if [ "$IMAGE_TAG_OPERATOR" = "master" ]; then
         export IMAGE_TAG_OPERATOR="latest"
       fi
@@ -146,7 +146,7 @@ integration-test:
       kubectl create secret docker-registry quay-io -n weblogic-operator-2 --docker-server=quay.io --docker-username=$QUAY_USERNAME --docker-password=$QUAY_PASSWORD --docker-email=$QUAY_EMAIL
 
       export IMAGE_NAME_OPERATOR="quay.io/markxnelson/weblogic-kubernetes-operator"
-      export IMAGE_TAG_OPERATOR="${WERCKER_GIT_BRANCH//[_/]/-}"
+      export IMAGE_TAG_OPERATOR="${WERCKER_GIT_BRANCH//[_\/]/-}"
       if [ "$IMAGE_TAG_OPERATOR" = "master" ]; then
         export IMAGE_TAG_OPERATOR="latest"
       fi