Merge branch 'develop' into owls-70947

Author: alai8

kubernetes/charts/weblogic-operator/templates/_operator-dep.tpl

@@ -44,6 +44,10 @@ spec:
         - name: "MOCK_WLS"
           value: "true"
         {{- end }}
+        resources:
+          requests:
+            cpu: "100m"
+            memory: "512Mi"
         volumeMounts:
         - name: "weblogic-operator-cm-volume"
           mountPath: "/operator/config"

kubernetes/src/test/java/oracle/kubernetes/operator/create/CreateOperatorGeneratedFilesTestBase.java

@@ -44,11 +44,13 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.fail;
 
+import io.kubernetes.client.custom.Quantity;
 import io.kubernetes.client.models.ExtensionsV1beta1Deployment;
 import io.kubernetes.client.models.V1ClusterRole;
 import io.kubernetes.client.models.V1ClusterRoleBinding;
 import io.kubernetes.client.models.V1ConfigMap;
 import io.kubernetes.client.models.V1Namespace;
+import io.kubernetes.client.models.V1ResourceRequirements;
 import io.kubernetes.client.models.V1Role;
 import io.kubernetes.client.models.V1RoleBinding;
 import io.kubernetes.client.models.V1Secret;
@@ -210,6 +212,11 @@ protected ExtensionsV1beta1Deployment getExpectedWeblogicOperatorDeployment() {
                                             newEnvVar()
                                                 .name("JAVA_LOGGING_LEVEL")
                                                 .value(getInputs().getJavaLoggingLevel()))
+                                        .resources(
+                                            new V1ResourceRequirements()
+                                                .putRequestsItem("cpu", Quantity.fromString("100m"))
+                                                .putRequestsItem(
+                                                    "memory", Quantity.fromString("512Mi")))
                                         .addVolumeMountsItem(
                                             newVolumeMount()
                                                 .name("weblogic-operator-cm-volume")

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

@@ -85,6 +85,13 @@ private ApiClient getApiClient() {
     return client;
   }
 
+  @Override
+  protected ApiClient onRecycle(ApiClient instance) {
+    // Work around async processing creating, but not cleaning-up network interceptors
+    instance.getHttpClient().networkInterceptors().clear();
+    return super.onRecycle(instance);
+  }
+
   private static class DefaultClientFactory implements ClientFactory {
     private final AtomicBoolean first = new AtomicBoolean(true);
 

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

@@ -46,12 +46,16 @@ protected Queue<T> getQueue() {
    * @param instance Pool object to recycle
    */
   public final void recycle(T instance) {
-    getQueue().offer(instance);
+    getQueue().offer(onRecycle(instance));
     if (LOGGER.isFinerEnabled()) {
       LOGGER.finer("Recycling instance to pool, instances now in pool: " + getQueue().size());
     }
   }
 
+  protected T onRecycle(T instance) {
+    return instance;
+  }
+
   /**
    * Creates a new instance of object. This method is used when someone wants to {@link #take()
    * take} an object from an empty pool. Also note that multiple threads may call this method

operator/src/main/resources/scripts/introspectDomain.py

@@ -106,7 +106,6 @@ def open(self):
 
     self.DOMAIN_UID               = self.getEnv('DOMAIN_UID')
     self.DOMAIN_HOME              = self.getEnv('DOMAIN_HOME')
-    self.DOMAIN_NAME              = self.getEnv('DOMAIN_NAME')
     self.LOG_HOME                 = self.getEnv('LOG_HOME')
     self.CREDENTIALS_SECRET_NAME  = self.getEnv('CREDENTIALS_SECRET_NAME')
 
@@ -155,6 +154,7 @@ def open(self):
     trace("About to load domain from "+self.getDomainHome())
     readDomain(self.getDomainHome())
     self.domain = cmo
+    self.DOMAIN_NAME = self.getDomain().getName()
 
   def close(self):
     closeDomain()
@@ -787,6 +787,7 @@ def addSitCfgXml(self):
     self.writeln("<?xml version='1.0' encoding='UTF-8'?>")
     self.writeln("<d:domain xmlns:d=\"http://xmlns.oracle.com/weblogic/domain\" xmlns:f=\"http://xmlns.oracle.com/weblogic/domain-fragment\" xmlns:s=\"http://xmlns.oracle.com/weblogic/situational-config\">")
     self.indent()
+    self.writeln("<s:expiration> 2099-07-16T19:20+01:00 </s:expiration>")
     self.writeln("<d:name>" + self.env.DOMAIN_NAME + "</d:name>")
     self.customizeNodeManagerCreds()
     self.customizeDomainLogPath()

src/scripts/operator.sh

@@ -64,7 +64,10 @@ cp /operator/logstash.conf /logs/logstash.conf
 # assumption is that we have mounted a volume on /logs which is also visible to
 # the logstash container/pod.
 
+# Container memory optimizaton flags
+HEAP="-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:MaxRAMFraction=1 -XshowSettings:vm"
+
 # Start operator
-java $MOCKING_WLS $DEBUG $LOGGING -jar /operator/weblogic-kubernetes-operator.jar &
+java $HEAP $MOCKING_WLS $DEBUG $LOGGING -jar /operator/weblogic-kubernetes-operator.jar &
 PID=$!
 wait $PID