Merge branch 'develop' of https://github.com/oracle/weblogic-kubernetes-operator into OWLS-68437

Author: swapnanitin

integration-tests/src/test/java/oracle/kubernetes/operator/utils/Operator.java

@@ -230,7 +230,7 @@ private void generateInputYaml() throws Exception {
     // write certificates
     ExecCommand.exec(
         BaseTest.getProjectRoot()
-            + "/kubernetes/samples/scripts/generate-external-rest-identity.sh "
+            + "/kubernetes/samples/scripts/rest/generate-external-rest-identity.sh "
             + "DNS:"
             + TestUtils.getHostName()
             + " >> "

integration-tests/src/test/java/oracle/kubernetes/operator/utils/TestUtils.java

@@ -735,7 +735,8 @@ public static void createRBACPoliciesForWLDFScaling() throws Exception {
   public static void deleteWeblogicDomainResources(String domainUid) throws Exception {
     StringBuilder cmd =
         new StringBuilder(BaseTest.getProjectRoot())
-            .append("/kubernetes/samples/scripts/delete-weblogic-domain-resources.sh ")
+            .append(
+                "/kubernetes/samples/scripts/delete-domain/delete-weblogic-domain-resources.sh ")
             .append("-d ")
             .append(domainUid);
     logger.info("Running " + cmd);

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

@@ -117,7 +117,7 @@ protected V1ServiceSpec createServiceSpec() {
 
     protected List<V1ServicePort> createServicePorts() {
       List<V1ServicePort> ports = new ArrayList<>();
-      if (scan != null) {
+      if (scan != null && scan.getNetworkAccessPoints() != null) {
         for (NetworkAccessPoint nap : scan.getNetworkAccessPoints()) {
           V1ServicePort port =
               new V1ServicePort()
@@ -869,7 +869,7 @@ private int searchAdminChannelPort(String channel) {
           return serverConfig.getSslListenPort();
         } /*else if("adminSecure".equals(channel) && serverConfig.isAdminPortEnabled()){
             return serverConfig.getAdminPort();
-          }*/ else {
+          }*/ else if (serverConfig.getNetworkAccessPoints() != null) {
           for (NetworkAccessPoint nap : serverConfig.getNetworkAccessPoints()) {
             if (nap.getName().equals(channel)) {
               return nap.getListenPort();

operator/src/main/java/oracle/kubernetes/operator/steps/ExternalAdminChannelsStep.java

@@ -67,11 +67,13 @@ public static Collection<NetworkAccessPoint> adminChannelsToCreate(
     // Pick out externalized channels from the server channels list
     for (String incomingChannel : dom.getExportedNetworkAccessPointNames()) {
       boolean missingChannel = true;
-      for (NetworkAccessPoint nap : naps) {
-        if (nap.getName().equalsIgnoreCase(incomingChannel)) {
-          missingChannel = false;
-          channels.add(nap);
-          break;
+      if (naps != null) {
+        for (NetworkAccessPoint nap : naps) {
+          if (nap.getName().equalsIgnoreCase(incomingChannel)) {
+            missingChannel = false;
+            channels.add(nap);
+            break;
+          }
         }
       }
       if (missingChannel) {