Merge pull request #11583 from stevekuznetsov/skuznets/remove-deprecated-starts

Merged by openshift-bot

Author: OpenShift Bot

hack/lib/start.sh

@@ -197,7 +197,7 @@ function os::start::internal::patch_master_config() {
 readonly -f os::start::internal::patch_master_config
 
 # os::start::server starts the OpenShift server, exports the PID of the OpenShift server and waits until openshift server endpoints are available
-# It is advised to use this function after a successful run of 'configure_os_server'
+# It is advised to use this function after a successful run of 'os::start::configure_server'
 #
 # Globals:
 #  - USE_SUDO
@@ -303,7 +303,7 @@ function os::start::master() {
 readonly -f os::start::master
 
 # os::start::all_in_one starts the OpenShift server all in one.
-# It is advised to use this function after a successful run of 'configure_os_server'
+# It is advised to use this function after a successful run of 'os::start::configure_server'
 #
 # Globals:
 #  - USE_SUDO

hack/test-end-to-end.sh

@@ -48,8 +48,8 @@ reset_tmp_dir
 
 os::log::system::start
 
-configure_os_server
-start_os_server
+os::start::configure_server
+os::start::server
 
 # set our default KUBECONFIG location
 export KUBECONFIG="${ADMIN_KUBECONFIG}"

hack/update-generated-swagger-spec.sh

@@ -29,15 +29,15 @@ export ETCD_PORT=34001
 export ETCD_PEER_PORT=37001
 os::util::environment::setup_all_server_vars "generate-swagger-spec/"
 reset_tmp_dir
-configure_os_server
+os::start::configure_server
 
 
 SWAGGER_SPEC_REL_DIR="${1:-}"
 SWAGGER_SPEC_OUT_DIR="${OS_ROOT}/${SWAGGER_SPEC_REL_DIR}/api/swagger-spec"
 mkdir -p "${SWAGGER_SPEC_OUT_DIR}"
 
 # Start openshift
-start_os_master
+os::start::master
 
 os::log::info "Updating ${SWAGGER_SPEC_OUT_DIR}:"
 

hack/util.sh

@@ -2,21 +2,6 @@
 
 # Provides simple utility functions
 
-function start_os_server() {
-        os::log::warn "start_os_server is deprecated, please use os::start::server"
-        os::start::server "$@"
-}
-
-function configure_os_server() {
-        os::log::warn "configure_os_server is deprecated, please use os::start::configure_server"
-        os::start::configure_server "$@"
-}
-
-function start_os_master() {
-        os::log::warn "start_os_master is deprecated, please use os::start::master"
-        os::start::master "$@"
-}
-
 # ensure_iptables_or_die tests if the testing machine has iptables available
 # and in PATH. Also test whether current user has sudo privileges.
 function ensure_iptables_or_die() {

test/extended/README.md

@@ -96,8 +96,8 @@ Common functions for extended tests are located in `./hack/util.sh`. Environment
 * `compile_extended()` perform the compilation of the Go tests into a test binary.
 * `test_privileges()` verify if you have permissions to start OpenShift server.
 * `os::util::environment::setup_all_server_vars()` setup all required environment variables related to OpenShift server.
-* `configure_os_server()` generates all configuration files for OpenShift server.
-* `start_os_server()` starts the OpenShift master and node.
+* `os::start::configure_server()` generates all configuration files for OpenShift server.
+* `os::start::server()` starts the OpenShift master and node.
 * `install_router_extended()` installs the OpenShift router service.
 * `install_registry_extended()` installs the OpenShift Docker registry service.
 * `create_image_streams_extended()` creates ImageStream(s) for all OpenShift images.

test/extended/alternate_launches.sh

@@ -25,7 +25,7 @@ trap "cleanup" EXIT
 
 echo "[INFO] Starting server as distinct processes"
 ensure_iptables_or_die
-configure_os_server
+os::start::configure_server
 
 echo "[INFO] `openshift version`"
 echo "[INFO] Server logs will be at:    ${LOG_DIR}/openshift.log"

test/extended/cmd.sh

@@ -29,8 +29,8 @@ reset_tmp_dir
 
 os::log::system::start
 
-configure_os_server
-start_os_server
+os::start::configure_server
+os::start::server
 
 export KUBECONFIG="${ADMIN_KUBECONFIG}"
 

test/extended/gssapi.sh

@@ -72,7 +72,7 @@ function cleanup() {
 }
 trap "cleanup" EXIT
 
-configure_os_server
+os::start::configure_server
 
 # set up env vars
 cp -R test/extended/testdata/gssapi "${BASETMPDIR}"
@@ -85,7 +85,7 @@ backend='https://openshift.default.svc.cluster.local:443'
 oauth_patch="$(sed "s/HOST_NAME/${host}/" "${test_data_location}/config/oauth_config.json")"
 cp "${SERVER_CONFIG_DIR}/master/master-config.yaml" "${SERVER_CONFIG_DIR}/master/master-config.tmp.yaml"
 openshift ex config patch "${SERVER_CONFIG_DIR}/master/master-config.tmp.yaml" --patch="${oauth_patch}" > "${SERVER_CONFIG_DIR}/master/master-config.yaml"
-start_os_server
+os::start::server
 
 export KUBECONFIG="${ADMIN_KUBECONFIG}"
 

test/extended/ldap_groups.sh

@@ -28,8 +28,8 @@ reset_tmp_dir
 
 os::log::system::start
 
-configure_os_server
-start_os_server
+os::start::configure_server
+os::start::server
 
 export KUBECONFIG="${ADMIN_KUBECONFIG}"
 

test/extended/setup.sh

@@ -96,7 +96,7 @@ function os::test::extended::setup () {
 			CONFIG_VERSION="${CONTROLLER_VERSION}"
 		fi
 		os::start::configure_server "${CONFIG_VERSION}"
-		#turn on audit logging for extended tests ... mimic what is done in util.sh configure_os_server, but don't
+		#turn on audit logging for extended tests ... mimic what is done in os::start::configure_server, but don't
 		# put change there - only want this for extended tests
 		os::log::info "Turn on audit logging"
 		cp "${SERVER_CONFIG_DIR}/master/master-config.yaml" "${SERVER_CONFIG_DIR}/master/master-config.orig2.yaml"