Rename externalRestOption property values

Author: russgold

kubernetes/create-weblogic-operator-inputs.yaml

@@ -29,45 +29,45 @@ weblogicOperatorImagePullPolicy: IfNotPresent
 # Options for externally exposing the operator REST https interface
 # (i.e. outside of the Kubernetes cluster). Valid values are:
 #
-# "none"
+# "NONE"
 #    The REST interface is not exposed outside the Kubernetes cluster.
 #
-# "self-signed-cert"
+# "SELF_SIGNED_CERT"
 #    The REST interface is exposed outside of the Kubernetes cluster on the
 #    port specified by the 'externalRestHttpsPort' property.
 #    A self-signed certificate and private key are generated for the REST interface.
 #    The certificate's subject alternative names are specified by the 'externalSans'
 #    property.
 #
-# "custom-cert"
+# "CUSTOM_CERT"
 #    The REST interface is exposed outside of the Kubernetes cluster on the
 #    port specified by the 'externalRestHttpsPort' property.
 #    The customer supplied certificate and private key are used for the REST
 #    interface.  They are specified by the 'externalOperatorCert' and
 #    'eternalOperatorKey' properties.
-externalRestOption: none
+externalRestOption: NONE
 
 # The node port that should be allocated for the external operator REST https interface.
-# This parameter is required if 'externalRestOption' is not 'none'.
+# This parameter is required if 'externalRestOption' is not 'NONE'.
 # Otherwise, it is ignored.
 externalRestHttpsPort: 31001
 
 # The subject alternative names to put into the generated self-signed certificate
 # for the external WebLogic Operator REST https interface, for example:
 #   DNS:myhost,DNS:localhost,IP:127.0.0.1
-# This parameter is required if 'externalRestOption' is 'self-signed-cert'.
+# This parameter is required if 'externalRestOption' is 'SELF_SIGNED_CERT'.
 # Otherwise, it is ignored.
 externalSans:
 
 # The customer supplied certificate to use for the external operator REST
 # https interface.  The value must be a string containing a base64 encoded PEM certificate.
-# This parameter is required if 'externalRestOption' is 'custom-cert'.
+# This parameter is required if 'externalRestOption' is 'CUSTOM_CERT'.
 # Otherwise, it is ignored.
 externalOperatorCert:
 
 # The customer supplied private key to use for the external operator REST
 # https interface.  The value must be a string containing a base64 encoded PEM key.
-# This parameter is required if 'externalRestOption' is 'custom-cert'.
+# This parameter is required if 'externalRestOption' is 'CUSTOM_CERT'.
 # Otherwise, it is ignored.
 externalOperatorKey:
 

kubernetes/internal/create-weblogic-operator.sh

@@ -270,9 +270,9 @@ function validateExternalRest {
 
   if [ ! -z ${externalRestOption} ]; then
     # Validate the specified externalRestOption value and any sub options that it requires
-    EXT_REST_OPT_NONE="none"
-    EXT_REST_OPT_SELF_SIGNED="self-signed-cert"
-    EXT_REST_OPT_CUSTOM="custom-cert"
+    EXT_REST_OPT_NONE="NONE"
+    EXT_REST_OPT_SELF_SIGNED="SELF_SIGNED_CERT"
+    EXT_REST_OPT_CUSTOM="CUSTOM_CERT"
     case ${externalRestOption} in
       ${EXT_REST_OPT_NONE})
         echo The WebLogic Operator REST interface will not be externally exposed

site/installation.md

@@ -70,9 +70,9 @@ The following parameters must be provided in the input file:
 
 | Parameter	| Definition	| Default |
 | --- | --- | --- |
-| externalOperatorCert	| A base64 encoded string containing the X.509 certificate that the operator will present to clients accessing its REST endpoints. This value is only used when `externalRestOption` is set to `custom-cert`. | |
-| externalOperatorKey	| A base64 encoded string containing the private key **ask tom** This value is only used when externalRestOption is set to `custom-cert`. | |
-| externalRestOption	| Which of the available REST options is desired.  Allowed values: <br/>- `none` Disable the REST interface.  <br/>- `self-signed-cert` The operator will use a self-signed certificate for its REST server.  If this value is specified, then the `externalSans` parameter must also be set. <br/>- `custom-cert` Provide custom certificates, for example from an external certification authority. If this value is specified, then the `externalOperatorCert` and `externalOperatorKey` must also be provided.	| none |
+| externalOperatorCert	| A base64 encoded string containing the X.509 certificate that the operator will present to clients accessing its REST endpoints. This value is only used when `externalRestOption` is set to `CUSTOM_CERT`. | |
+| externalOperatorKey	| A base64 encoded string containing the private key **ask tom** This value is only used when externalRestOption is set to `CUSTOM_CERT`. | |
+| externalRestOption	| Which of the available REST options is desired.  Allowed values: <br/>- `NONE` Disable the REST interface.  <br/>- `SELF_SIGNED_CERT` The operator will use a self-signed certificate for its REST server.  If this value is specified, then the `externalSans` parameter must also be set. <br/>- `CUSTOM_CERT` Provide custom certificates, for example from an external certification authority. If this value is specified, then the `externalOperatorCert` and `externalOperatorKey` must also be provided.	| none |
 | externalSans	| A comma-separated list of Subject Alternative Names that should be included in the X.509 Certificate.  This list should include ... <br/>Example:  `DNS:myhost,DNS:localhost,IP:127.0.0.1` | |
 | namespace	| The Kubernetes namespace that the operator will be deployed in.  It is recommended that a namespace be created for the operator rather than using the `default` namespace.	| weblogic-operator |
 | targetNamespaces	| A list of the Kubernetes namespaces that may contain WebLogic domains that the operator will manage.  The operator will not take any action against a domain that is in a namespace not listed here.	| default |
@@ -88,9 +88,9 @@ The following parameters must be provided in the input file:
 
 The operator provides three REST certificate options:
 
-*	`none` will disable the REST server.
-*	`self-signed-cert` will generate self-signed certificates.
-*	`custom-cert` provides a mechanism to provide certificates that were created and signed by some other means.
+*	`NONE` will disable the REST server.
+*	`SELF_SIGNED_CERT` will generate self-signed certificates.
+*	`CUSTOM_CERT` provides a mechanism to provide certificates that were created and signed by some other means.
 
 ## Decide which options to enable
 

src/integration-tests/bash/run.sh

@@ -563,7 +563,7 @@ function deploy_operator {
       sed -i -e "s|#weblogicOperatorImagePullSecretName:.*|weblogicOperatorImagePullSecretName: ${IMAGE_PULL_SECRET_OPERATOR}|g" $inputs
     fi
     trace 'customize the inputs yaml file to generate a self-signed cert for the external Operator REST https port'
-    sed -i -e "s|\(externalRestOption:\).*|\1self-signed-cert|g" $inputs
+    sed -i -e "s|\(externalRestOption:\).*|\1SELF_SIGNED_CERT|g" $inputs
     sed -i -e "s|\(externalSans:\).*|\1DNS:${NODEPORT_HOST}|g" $inputs
     trace 'customize the inputs yaml file to set the java logging level to FINER'
     sed -i -e "s|\(javaLoggingLevel:\).*|\1FINER|g" $inputs

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

@@ -29,9 +29,9 @@ public class CreateOperatorInputs {
 
   private static final String DEFAULT_INPUTS = "kubernetes/create-weblogic-operator-inputs.yaml";
 
-  public static final String EXTERNAL_REST_OPTION_NONE = "none";
-  public static final String EXTERNAL_REST_OPTION_CUSTOM_CERT = "custom-cert";
-  public static final String EXTERNAL_REST_OPTION_SELF_SIGNED_CERT = "self-signed-cert";
+  public static final String EXTERNAL_REST_OPTION_NONE = "NONE";
+  public static final String EXTERNAL_REST_OPTION_CUSTOM_CERT = "CUSTOM_CERT";
+  public static final String EXTERNAL_REST_OPTION_SELF_SIGNED_CERT = "SELF_SIGNED_CERT";
 
   public static final String JAVA_LOGGING_LEVEL_SEVERE = "SEVERE";
   public static final String JAVA_LOGGING_LEVEL_WARNING = "WARNING";