Merge pull request #119 from oracle/oracle/issue106-as-java-options

Support environment properties set in admin server's ServerStartup

Author: rjeberhard

site/creating-domain.md

@@ -258,7 +258,6 @@ Metadata:
 Spec:
   Admin Secret:
     Name:  domain1-weblogic-credentials
-  As Env:
   As Name:  admin-server
   As Port:  7001
   Cluster Startup:

src-generated-swagger/main/java/oracle/kubernetes/operator/domain/model/oracle/kubernetes/weblogic/domain/v1/DomainSpec.java

@@ -52,9 +52,6 @@ public class DomainSpec {
   @SerializedName("asNodePort")
   private Integer asNodePort = null;
 
-  @SerializedName("asEnv")
-  private List<io.kubernetes.client.models.V1EnvVar> asEnv = null;
-
   @SerializedName("exportT3Channels")
   private List<String> exportT3Channels = null;
 
@@ -230,33 +227,6 @@ public void setAsNodePort(Integer asNodePort) {
     this.asNodePort = asNodePort;
   }
 
-  public DomainSpec asEnv(List<io.kubernetes.client.models.V1EnvVar> asEnv) {
-    this.asEnv = asEnv;
-    return this;
-  }
-
-  public DomainSpec addAsEnvItem(io.kubernetes.client.models.V1EnvVar asEnvItem) {
-    if (this.asEnv == null) {
-      this.asEnv = new ArrayList<io.kubernetes.client.models.V1EnvVar>();
-    }
-    this.asEnv.add(asEnvItem);
-    return this;
-  }
-
-  /**
-   * Environment variables for use in starting the administration server.
-   * 
-   * @return asEnv
-   **/
-  @ApiModelProperty(value = "Environment variables for use in starting the administration server.")
-  public List<io.kubernetes.client.models.V1EnvVar> getAsEnv() {
-    return asEnv;
-  }
-
-  public void setAsEnv(List<io.kubernetes.client.models.V1EnvVar> asEnv) {
-    this.asEnv = asEnv;
-  }
-
   public DomainSpec exportT3Channels(List<String> exportT3Channels) {
     this.exportT3Channels = exportT3Channels;
     return this;
@@ -410,7 +380,6 @@ public boolean equals(java.lang.Object o) {
         && Objects.equals(this.asName, oracleKubernetesWeblogicDomainV1DomainSpec.asName)
         && Objects.equals(this.asPort, oracleKubernetesWeblogicDomainV1DomainSpec.asPort)
         && Objects.equals(this.asNodePort, oracleKubernetesWeblogicDomainV1DomainSpec.asNodePort)
-        && Objects.equals(this.asEnv, oracleKubernetesWeblogicDomainV1DomainSpec.asEnv)
         && Objects.equals(this.exportT3Channels, oracleKubernetesWeblogicDomainV1DomainSpec.exportT3Channels)
         && Objects.equals(this.startupControl, oracleKubernetesWeblogicDomainV1DomainSpec.startupControl)
         && Objects.equals(this.serverStartup, oracleKubernetesWeblogicDomainV1DomainSpec.serverStartup)
@@ -420,7 +389,7 @@ public boolean equals(java.lang.Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(domainUID, domainName, image, imagePullPolicy, adminSecret, asName, asPort, asNodePort, asEnv,
+    return Objects.hash(domainUID, domainName, image, imagePullPolicy, adminSecret, asName, asPort, asNodePort, 
         exportT3Channels, startupControl, serverStartup, clusterStartup, replicas);
   }
 
@@ -437,7 +406,6 @@ public String toString() {
     sb.append("    asName: ").append(toIndentedString(asName)).append("\n");
     sb.append("    asPort: ").append(toIndentedString(asPort)).append("\n");
     sb.append("    asNodePort: ").append(toIndentedString(asNodePort)).append("\n");
-    sb.append("    asEnv: ").append(toIndentedString(asEnv)).append("\n");
     sb.append("    exportT3Channels: ").append(toIndentedString(exportT3Channels)).append("\n");
     sb.append("    startupControl: ").append(toIndentedString(startupControl)).append("\n");
     sb.append("    serverStartup: ").append(toIndentedString(serverStartup)).append("\n");

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

@@ -361,9 +361,6 @@ private static void normalizeDomainSpec(DomainSpec spec) {
     if (imagePullPolicy == null || imagePullPolicy.length() == 0) {
       spec.setImagePullPolicy(imagePullPolicy = (imageName.endsWith(KubernetesConstants.LATEST_IMAGE_SUFFIX)) ? KubernetesConstants.ALWAYS_IMAGEPULLPOLICY : KubernetesConstants.IFNOTPRESENT_IMAGEPULLPOLICY);
     }
-    if (spec.getAsEnv() == null) {
-      spec.setAsEnv(new ArrayList<V1EnvVar>());
-    }
     if (spec.getExportT3Channels() == null) {
       spec.setExportT3Channels(new ArrayList<String>());
     }

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

@@ -29,6 +29,7 @@
 import oracle.kubernetes.operator.ProcessingConstants;
 import oracle.kubernetes.operator.domain.model.oracle.kubernetes.weblogic.domain.v1.Domain;
 import oracle.kubernetes.operator.domain.model.oracle.kubernetes.weblogic.domain.v1.DomainSpec;
+import oracle.kubernetes.operator.domain.model.oracle.kubernetes.weblogic.domain.v1.ServerStartup;
 import oracle.kubernetes.operator.logging.LoggingFacade;
 import oracle.kubernetes.operator.logging.LoggingFactory;
 import oracle.kubernetes.operator.logging.MessageKeys;
@@ -171,9 +172,13 @@ public NextAction apply(Packet packet) {
       livenessProbe.setFailureThreshold(1);
       container.livenessProbe(livenessProbe);
 
-      if (spec.getAsEnv() != null) {
-        for (V1EnvVar ev : spec.getAsEnv()) {
-          container.addEnvItem(ev);
+      if (spec.getServerStartup() != null) {
+        for (ServerStartup ss : spec.getServerStartup()) {
+          if (ss.getServerName().equals(spec.getAsName())) {
+            for (V1EnvVar ev : ss.getEnv()) {
+              container.addEnvItem(ev);
+            }
+          }
         }
       }
 

swagger/domain.json

@@ -1524,13 +1524,6 @@
       "description": "Administration server NodePort port.  The port on each node on which the administration server will be exposed.  If specified, this value must be an unused port.  By default, the administration server will not be exposed outside the Kubernetes cluster.",
       "type": "integer"
      },
-     "asEnv": {
-      "description": "Environment variables for use in starting the administration server.",
-      "type": "array",
-      "items": {
-       "$ref": "#/definitions/io.k8s.api.core.v1.EnvVar"
-      }
-     },
      "exportT3Channels": {
       "description": "List of specific T3 channels to export.  Named T3 Channels will be exposed using NodePort Services.  The internal and external ports must match; therefore, it is required that the channel's port in the WebLogic configuration be a legal and unique value in the Kubernetes cluster's legal NodePort port range.",
       "type": "array",
@@ -1631,4 +1624,4 @@
     "BearerToken": []
    }
   ]
- }
+ }