Merge pull request #816 from oracle/OWLS-70638

Fix integration tests

Author: rjeberhard

kubernetes/charts/weblogic-operator/templates/_validate-inputs.tpl

@@ -16,8 +16,10 @@
 {{- if include "utils.verifyBoolean" (list $scope "externalRestEnabled") -}}
 {{-   if $scope.externalRestEnabled -}}
 {{-     $ignore := include "utils.verifyInteger" (list $scope "externalRestHttpsPort") -}}
-{{/*        The following condition is for backward compatibility only */}}
-{{-     if (or (not (hasKey $scope "externalOperatorCert")) (not (hasKey $scope "externalOperatorKey"))) -}}
+{{-     if (or (hasKey $scope "externalOperatorCert") (hasKey $scope "externalOperatorKey")) -}}
+{{-       $ignore := include "utils.verifyString"  (list $scope "externalOperatorCert") -}}
+{{-       $ignore := include "utils.verifyString"  (list $scope "externalOperatorKey") -}}
+{{-     else }}
 {{-       $ignore := include "utils.verifyString"  (list $scope "externalCertificateSecret") -}}
 {{-     end -}}
 {{-   end -}}

kubernetes/samples/scripts/rest/generate-external-rest-identity.sh

@@ -130,6 +130,16 @@ openssl \
 2> /dev/null
 
 # Create the secret with the self-signed certificate and private key in the weblogic-operator namespace
-kubectl create secret tls "weblogic-operator-certificate" --cert=${OP_CERT_PEM} --key=${OP_KEY_PEM} -n weblogic-operator
-echo "externalCertificateSecret: weblogic-operator-certificate"
+# kubectl create secret tls "weblogic-operator-certificate" --cert=${OP_CERT_PEM} --key=${OP_KEY_PEM} -n weblogic-operator
+# echo "externalCertificateSecret: weblogic-operator-certificate"
+
+# base64 encode the cert and private key pem
+CERT_DATA=`base64 -i ${OP_CERT_PEM} | tr -d '\n'`
+KEY_DATA=`base64 -i ${OP_KEY_PEM} | tr -d '\n'`
+
+# print out the cert and pem in the form that can be added to
+# the operator helm chart's values.yaml
+echo "externalOperatorCert: ${CERT_DATA}"
+echo "externalOperatorKey: ${KEY_DATA}"
+
 SUCCEEDED=true

kubernetes/src/test/java/oracle/kubernetes/operator/helm/CreateOperatorInputsValidationIT.java

@@ -17,6 +17,8 @@
 
 public class CreateOperatorInputsValidationIT extends OperatorChartITBase {
 
+  private static final String MUTEX = "%s can not be present when %s is defined";
+
   private static final String MISSING = "%s %s must be specified";
 
   private static final String WRONG_TYPE = "%s must be a %s : %s";
@@ -116,15 +118,15 @@ public void whenExternalRestEnabled_reportMissingRelatedParameters() throws Exce
     setProperty("externalRestEnabled", true);
 
     removeProperty("externalRestHttpsPort");
+    removeProperty("externalOperatorSecret");
     removeProperty("externalOperatorCert");
     removeProperty("externalOperatorKey");
 
     assertThat(
         getProcessingError(),
         allOf(
-            containsMissingIntParameterError("externalRestHttpsPort"),
-            containsMissingStringParameterError("externalOperatorCert"),
-            containsMissingStringParameterError("externalOperatorKey")));
+            containsMissingStringParameterError("externalCertificateSecret"),
+            containsMissingIntParameterError("externalRestHttpsPort")));
   }
 
   @Test
@@ -283,6 +285,10 @@ private Matcher<String> containsTypeError(String name, String expectedType, Stri
     return containsString(String.format(WRONG_TYPE, name, expectedType, actualType));
   }
 
+  private Matcher<String> containsMutexParameterError(String excluded, String value) {
+    return containsString(String.format(MUTEX, excluded, value));
+  }
+
   private Matcher<String> containsMissingEnumParameterError(String propertyName) {
     return containsString(String.format(MISSING, "string", propertyName));
   }

kubernetes/src/test/java/oracle/kubernetes/operator/helm/HelmOperatorValues.java

@@ -29,6 +29,7 @@ class HelmOperatorValues extends OperatorValues {
     loadFromMap(map, this::setJavaLoggingLevel, "javaLoggingLevel");
     loadFromMap(map, this::setNamespace, "operatorNamespace");
     loadFromMap(map, this::setWeblogicOperatorImagePullPolicy, "imagePullPolicy");
+    loadFromMap(map, this::setExternalOperatorSecret, "externalOperatorSecret");
     loadFromMap(map, this::setExternalOperatorCert, "externalOperatorCert");
     loadFromMap(map, this::setExternalOperatorKey, "externalOperatorKey");
     loadFromMap(map, this::setLogStashImage, "logStashImage");
@@ -96,6 +97,7 @@ Map<String, Object> createMap() {
     addStringMapEntry(map, this::getJavaLoggingLevel, "javaLoggingLevel");
     addStringMapEntry(map, this::getNamespace, "operatorNamespace");
     addStringMapEntry(map, this::getWeblogicOperatorImagePullPolicy, "imagePullPolicy");
+    addStringMapEntry(map, this::getExternalOperatorSecret, "externalOperatorSecret");
     addStringMapEntry(map, this::getExternalOperatorCert, "externalOperatorCert");
     addStringMapEntry(map, this::getExternalOperatorKey, "externalOperatorKey");
     addStringMapEntry(map, this::getLogStashImage, "logStashImage");

kubernetes/src/test/java/oracle/kubernetes/operator/utils/OperatorValues.java

@@ -30,6 +30,7 @@ public class OperatorValues {
   private String externalRestEnabled = "";
   private String externalRestHttpsPort = "";
   private String externalOperatorCert = "";
+  private String externalOperatorSecret = "";
   private String externalOperatorKey = "";
   private String remoteDebugNodePortEnabled = "";
   private String internalDebugHttpPort = "";
@@ -190,6 +191,14 @@ public OperatorValues externalRestHttpsPort(String val) {
     return this;
   }
 
+  public String getExternalOperatorSecret() {
+    return externalOperatorSecret;
+  }
+
+  public void setExternalOperatorSecret(String val) {
+    externalOperatorSecret = convertNullToEmptyString(val);
+  }
+
   public String getExternalOperatorCert() {
     return externalOperatorCert;
   }