Owls 88574 - Remove internal network name and "www-proxy-hqdc" from the sample and test scripts (#2298)

ankedia · web-flow · commit 57d009ec2b18 · 2021-04-06T20:10:17.000-04:00
* OWLS-88574 - Remove usage of www-proxy-hqdc and us.oracle.com in sample scripts and integration tests.
diff --git a/documentation/3.2/content/userguide/managing-domains/domain-events.md b/documentation/3.2/content/userguide/managing-domains/domain-events.md
@@ -236,7 +236,6 @@ LAST SEEN   TYPE      REASON                      OBJECT
 114s        Normal    Started                     pod/sample-domain1-introspector-ght6p   Started container sample-domain1-introspector
 114s        Warning   DomainProcessingFailed      domain/sample-domain1                   Failed to complete processing domain resource sample-domain1 due to: rpc error: code = Unknown desc = pull access denied for domain-home-in-image, repository does not exist or may require 'docker login', the processing will be retried if needed
 98s         Normal    Completed                   job/sample-domain1-introspector         Job completed
-98s         Warning   DNSConfigForming            pod/sample-domain1-introspector-ght6p   Search Line limits were exceeded, some search paths have been omitted, the applied search line is: sample-domain1-ns.svc.cluster.local svc.cluster.local cluster.local subnet1ad3phx.devweblogicphx.oraclevcn.com us.oracle.com oracle.com
 97s         Normal    Killing                     pod/sample-domain1-introspector-ght6p   Stopping container sample-domain1-introspector
 96s         Normal    Scheduled                   pod/sample-domain1-admin-server         Successfully assigned sample-domain1-ns/sample-domain1-admin-server to doxiao-1
 96s         Normal    DomainProcessingStarting    domain/sample-domain1                   Creating or updating Kubernetes presence for WebLogic Domain with UID sample-domain1
@@ -283,4 +282,4 @@ Reporting Instance:   weblogic-operator-67c9999d99-clgpw
 Source:
 Type:    Normal
 Events:  <none>
-```
+```
diff --git a/documentation/staging/content/userguide/managing-domains/domain-events.md b/documentation/staging/content/userguide/managing-domains/domain-events.md
@@ -236,7 +236,6 @@ LAST SEEN   TYPE      REASON                      OBJECT
 114s        Normal    Started                     pod/sample-domain1-introspector-ght6p   Started container sample-domain1-introspector
 114s        Warning   DomainProcessingFailed      domain/sample-domain1                   Failed to complete processing domain resource sample-domain1 due to: rpc error: code = Unknown desc = pull access denied for domain-home-in-image, repository does not exist or may require 'docker login', the processing will be retried if needed
 98s         Normal    Completed                   job/sample-domain1-introspector         Job completed
-98s         Warning   DNSConfigForming            pod/sample-domain1-introspector-ght6p   Search Line limits were exceeded, some search paths have been omitted, the applied search line is: sample-domain1-ns.svc.cluster.local svc.cluster.local cluster.local subnet1ad3phx.devweblogicphx.oraclevcn.com us.oracle.com oracle.com
 97s         Normal    Killing                     pod/sample-domain1-introspector-ght6p   Stopping container sample-domain1-introspector
 96s         Normal    Scheduled                   pod/sample-domain1-admin-server         Successfully assigned sample-domain1-ns/sample-domain1-admin-server to doxiao-1
 96s         Normal    DomainProcessingStarting    domain/sample-domain1                   Creating or updating Kubernetes presence for WebLogic Domain with UID sample-domain1
@@ -283,4 +282,4 @@ Reporting Instance:   weblogic-operator-67c9999d99-clgpw
 Source:
 Type:    Normal
 Events:  <none>
-```
+```
diff --git a/integration-tests/src/test/resources/bash-scripts/wdt-create-domain-onpv.sh b/integration-tests/src/test/resources/bash-scripts/wdt-create-domain-onpv.sh
@@ -48,7 +48,7 @@
 #                  default:  https://github.com/oracle/weblogic-deploy-tooling/releases/download/release-1.9.7/$WDT_INSTALL_ZIP_FILE
 #
 #   https_proxy    Proxy for downloading WDT_INSTALL_ZIP_URL.
-#                  default: "http://www-proxy-hqdc.us.oracle.com:80"
+#                  default: ""
 #                  (If set to empty the script will try with no proxy.)
 #
 #   https_proxy2   Alternate proxy for downloading WDT_INSTALL_ZIP_URL
@@ -69,7 +69,7 @@
 
 # using "-" instead of ":-" in case proxy vars are explicitly set to "".
 https_proxy=${https_proxy-""}
-https_proxy2=${https_proxy2-"http://www-proxy-hqdc.us.oracle.com:80"}
+https_proxy2=${https_proxy2-""}
 
 export ORACLE_HOME=${ORACLE_HOME:-/u01/oracle}
 
diff --git a/integration-tests/src/test/resources/exporter/promvalues.yaml b/integration-tests/src/test/resources/exporter/promvalues.yaml
@@ -54,8 +54,6 @@ alertmanagerFiles:
   alertmanager.yml:
     global:
       resolve_timeout: 5m
-      #http_config:
-       # proxy_url: 'http://www-proxy-hqdc.us.oracle.com:80'
 
     route:
       group_by: ['alertname']
diff --git a/kubernetes/samples/charts/apache-samples/custom-sample/certgen.sh b/kubernetes/samples/charts/apache-samples/custom-sample/certgen.sh
@@ -32,10 +32,9 @@ CN = $VIRTUAL_HOST_NAME
 subjectAltName = @alt_names
 [alt_names]
 DNS.1 = $VIRTUAL_HOST_NAME
-DNS.2 = $VIRTUAL_HOST_NAME.us.oracle.com
-DNS.3 = $VIRTUAL_HOST_NAME.cloud.oracle.com
-DNS.4 = *.$VIRTUAL_HOST_NAME
-DNS.5 = localhost
+DNS.2 = $VIRTUAL_HOST_NAME.cloud.oracle.com
+DNS.3 = *.$VIRTUAL_HOST_NAME
+DNS.4 = localhost
 EOF
 
 echo "Generating certs for $VIRTUAL_HOST_NAME"
diff --git a/kubernetes/samples/scripts/create-fmw-infrastructure-domain/domain-home-in-image/common/Dockerfile b/kubernetes/samples/scripts/create-fmw-infrastructure-domain/domain-home-in-image/common/Dockerfile
@@ -36,7 +36,7 @@ ARG CUSTOM_RCUPREFIX="${CUSTOM_RCUPREFIX:-INFRA01}"
 ARG CUSTOM_PRODUCTION_MODE="${CUSTOM_PRODUCTION_MODE:-prod}" 
 ARG CUSTOM_DEBUG_PORT="${CUSTOM_DEBUG_PORT:-8453}" 
 ARG CUSTOM_DEBUG_FLAG="${CUSTOM_DEBUG_FLAG:-false}"
-ARG CUSTOM_CONNECTION_STRING="${CUSTOM_CONNECTION_STRING:-"InfraDB:1521/InfraPDB1.us.oracle.com"}"
+ARG CUSTOM_CONNECTION_STRING="${CUSTOM_CONNECTION_STRING:-"InfraDB:1521/InfraPDB1"}"
 ARG CUSTOM_EXPOSE_T3_CHANNEL="${CUSTOM_EXPOSE_T3_CHANNEL:-false}" 
 ARG CUSTOM_T3_PUBLIC_ADDRESS="${CUSTOM_T3_PUBLIC_ADDRESS:-InfraAdminContainer}"
 ARG CUSTOM_T3_CHANNEL_PORT="${CUSTOM_T3_CHANNEL_PORT:-30012}"
diff --git a/kubernetes/samples/scripts/create-fmw-infrastructure-domain/domain-home-in-image/create-domain.sh b/kubernetes/samples/scripts/create-fmw-infrastructure-domain/domain-home-in-image/create-domain.sh
@@ -194,7 +194,7 @@ function createDomainHome {
   sed -i -e "s|welcome1|${password}|g" $passwordFile
 
   sed -i -e "s|INFRA08|${rcuSchemaPrefix}|g" $rcuPropFile
-  sed -i -e "s|InfraDB:1521/InfraPDB1.us.oracle.com|${rcuDatabaseURL}|g" $rcuPropFile
+  sed -i -e "s|InfraDB:1521/InfraPDB1|${rcuDatabaseURL}|g" $rcuPropFile
 
   cp -f ${scriptDir}/common/Dockerfile ${dockerDir}/Dockerfile
   cp -f ${scriptDir}/common/createFMWDomain.sh ${dockerDir}/container-scripts
diff --git a/kubernetes/samples/scripts/create-fmw-infrastructure-domain/domain-home-on-pv/wdt/create-domain-script.sh b/kubernetes/samples/scripts/create-fmw-infrastructure-domain/domain-home-on-pv/wdt/create-domain-script.sh
@@ -51,7 +51,7 @@
 #                  default:  https://github.com/oracle/weblogic-deploy-tooling/releases/download/release-$WDT_VERSION/$WDT_INSTALL_ZIP_FILE
 #
 #   https_proxy    Proxy for downloading WDT_INSTALL_ZIP_URL.
-#                  default: "http://www-proxy-hqdc.us.oracle.com:80"
+#                  default: ""
 #                  (If set to empty the script will try with no proxy.)
 #
 #   https_proxy2   Alternate proxy for downloading WDT_INSTALL_ZIP_URL
@@ -82,7 +82,7 @@ WDT_INSTALL_ZIP_URL=${WDT_INSTALL_ZIP_URL:-"https://github.com/oracle/weblogic-d
 
 # using "-" instead of ":-" in case proxy vars are explicitly set to "".
 https_proxy=${https_proxy-""}
-https_proxy2=${https_proxy2-"http://www-proxy-hqdc.us.oracle.com:80"}
+https_proxy2=${https_proxy2-""}
 
 # Define functions
 
diff --git a/kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/wdt/create-domain-script.sh b/kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/wdt/create-domain-script.sh
@@ -48,7 +48,7 @@
 #                  default:  https://github.com/oracle/weblogic-deploy-tooling/releases/download/release-1.9.7/$WDT_INSTALL_ZIP_FILE
 #
 #   https_proxy    Proxy for downloading WDT_INSTALL_ZIP_URL.
-#                  default: "http://www-proxy-hqdc.us.oracle.com:80"
+#                  default: ""
 #                  (If set to empty the script will try with no proxy.)
 #
 #   https_proxy2   Alternate proxy for downloading WDT_INSTALL_ZIP_URL
@@ -82,7 +82,7 @@ WDT_INSTALL_ZIP_URL=${WDT_INSTALL_ZIP_URL:-"https://github.com/oracle/weblogic-d
 
 # using "-" instead of ":-" in case proxy vars are explicitly set to "".
 https_proxy=${https_proxy-""}
-https_proxy2=${https_proxy2-"http://www-proxy-hqdc.us.oracle.com:80"}
+https_proxy2=${https_proxy2-""}
 
 # Define functions
 
diff --git a/kubernetes/src/test/scripts/unit-test-generate-weblogic-operator-cert.sh b/kubernetes/src/test/scripts/unit-test-generate-weblogic-operator-cert.sh
@@ -14,7 +14,7 @@
 # used to actually run the operator.
 
 if [ ! $# -eq 1 ]; then
-  echo "Syntax: ${BASH_SOURCE[0]} <subject alternative names, e.g. DNS:localhost,DNS:mymachine,DNS:mymachine.us.oracle.com,IP:127.0.0.1>"
+  echo "Syntax: ${BASH_SOURCE[0]} <subject alternative names, e.g. DNS:localhost,DNS:mymachine,IP:127.0.0.1>"
   exit 1
 fi
 

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@`
`48`	`48`	`# default: https://github.com/oracle/weblogic-deploy-tooling/releases/download/release-1.9.7/$WDT_INSTALL_ZIP_FILE`
`49`	`49`	`#`
`50`	`50`	`# https_proxy Proxy for downloading WDT_INSTALL_ZIP_URL.`
`51`		`-# default: "http://www-proxy-hqdc.us.oracle.com:80"`
	`51`	`+# default: ""`
`52`	`52`	`# (If set to empty the script will try with no proxy.)`
`53`	`53`	`#`
`54`	`54`	`# https_proxy2 Alternate proxy for downloading WDT_INSTALL_ZIP_URL`
`@@ -69,7 +69,7 @@`
`69`	`69`
`70`	`70`	`# using "-" instead of ":-" in case proxy vars are explicitly set to "".`
`71`	`71`	`https_proxy=${https_proxy-""}`
`72`		`-https_proxy2=${https_proxy2-"http://www-proxy-hqdc.us.oracle.com:80"}`
	`72`	`+https_proxy2=${https_proxy2-""}`
`73`	`73`
`74`	`74`	`export ORACLE_HOME=${ORACLE_HOME:-/u01/oracle}`
`75`	`75`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@`
`51`	`51`	`# default: https://github.com/oracle/weblogic-deploy-tooling/releases/download/release-$WDT_VERSION/$WDT_INSTALL_ZIP_FILE`
`52`	`52`	`#`
`53`	`53`	`# https_proxy Proxy for downloading WDT_INSTALL_ZIP_URL.`
`54`		`-# default: "http://www-proxy-hqdc.us.oracle.com:80"`
	`54`	`+# default: ""`
`55`	`55`	`# (If set to empty the script will try with no proxy.)`
`56`	`56`	`#`
`57`	`57`	`# https_proxy2 Alternate proxy for downloading WDT_INSTALL_ZIP_URL`
`@@ -82,7 +82,7 @@ WDT_INSTALL_ZIP_URL=${WDT_INSTALL_ZIP_URL:-"https://github.com/oracle/weblogic-d`
`82`	`82`
`83`	`83`	`# using "-" instead of ":-" in case proxy vars are explicitly set to "".`
`84`	`84`	`https_proxy=${https_proxy-""}`
`85`		`-https_proxy2=${https_proxy2-"http://www-proxy-hqdc.us.oracle.com:80"}`
	`85`	`+https_proxy2=${https_proxy2-""}`
`86`	`86`
`87`	`87`	`# Define functions`
`88`	`88`