[KOGITO-5888] Remove namespace option from BDD tests (#1017)

* Remove namespace option from BDD tests * correction
kiegroup · Sep 14, 2021 · 5b837c2 · 5b837c2
1 parent da33583
commit 5b837c2
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 127 deletions.
diff --git a/.ci/jenkins/Jenkinsfile b/.ci/jenkins/Jenkinsfile
@@ -113,8 +113,7 @@ String getBDDParameters() {
 
     // Reuse runtime application images from nightly builds
     testParamsMap['image_cache_mode'] = 'always'
-    testParamsMap['runtime_application_image_registry'] = 'quay.io'
-    testParamsMap['runtime_application_image_namespace'] = 'kiegroup'
+    testParamsMap['runtime_application_image_registry'] = 'quay.io/kiegroup'
 
     testParamsMap['container_engine'] = env.CONTAINER_ENGINE
 

diff --git a/.ci/jenkins/Jenkinsfile.profiling b/.ci/jenkins/Jenkinsfile.profiling
@@ -150,8 +150,7 @@ String getBDDParameters() {
 
     // Reuse runtime application images from nightly builds
     testParamsMap['image_cache_mode'] = 'always'
-    testParamsMap['runtime_application_image_registry'] = 'quay.io'
-    testParamsMap['runtime_application_image_namespace'] = 'kiegroup'
+    testParamsMap['runtime_application_image_registry'] = 'quay.io/kiegroup'
 
     String testParams = testParamsMap.findAll { entry -> entry.getValue() }
                             .collect { entry -> "${entry.getKey()}=\"${entry.getValue()}\"" }.join(' ')

diff --git a/.ci/jenkins/scripts/helper.groovy b/.ci/jenkins/scripts/helper.groovy
@@ -370,8 +370,7 @@ Map getBDDCommonParameters(boolean runtime_app_registry_internal) {
 Map getBDDBuildImageParameters(String paramsPrefix = defaultImageParamsPrefix) {
     Map testParamsMap = [:]
 
-    testParamsMap['build_image_registry'] = getImageRegistry(paramsPrefix)
-    testParamsMap['build_image_namespace'] = getImageNamespace(paramsPrefix)
+    testParamsMap['build_image_registry'] = "${getImageRegistry(paramsPrefix)}/${getImageNamespace(paramsPrefix)}"
     testParamsMap['build_image_name_suffix'] = getImageNameSuffix(paramsPrefix) ?: ''
     testParamsMap['build_image_version'] = getImageTag(paramsPrefix) ?: ''
 
@@ -381,8 +380,7 @@ Map getBDDBuildImageParameters(String paramsPrefix = defaultImageParamsPrefix) {
 Map getBDDServicesImageParameters(String paramsPrefix = defaultImageParamsPrefix) {
     Map testParamsMap = [:]
 
-    testParamsMap['services_image_registry'] = getImageRegistry(paramsPrefix)
-    testParamsMap['services_image_namespace'] = getImageNamespace(paramsPrefix)
+    testParamsMap['services_image_registry'] = "${getImageRegistry(paramsPrefix)}/${getImageNamespace(paramsPrefix)}"
     testParamsMap['services_image_name_suffix'] = getImageNameSuffix(paramsPrefix) ?: ''
     testParamsMap['services_image_version'] = getImageTag(paramsPrefix) ?: ''
 
@@ -392,8 +390,7 @@ Map getBDDServicesImageParameters(String paramsPrefix = defaultImageParamsPrefix
 Map getBDDRuntimeImageParameters(String paramsPrefix = defaultImageParamsPrefix) {
     Map testParamsMap = [:]
 
-    testParamsMap['runtime_application_image_registry'] = getImageRegistry(paramsPrefix)
-    testParamsMap['runtime_application_image_namespace'] = getImageNamespace(paramsPrefix)
+    testParamsMap['runtime_application_image_registry'] = "${getImageRegistry(paramsPrefix)}/${getImageNamespace(paramsPrefix)}"
     testParamsMap['runtime_application_image_name_prefix'] = getImageNamePrefix(paramsPrefix) ?: ''
     testParamsMap['runtime_application_image_name_suffix'] = getImageNameSuffix(paramsPrefix) ?: ''
     testParamsMap['runtime_application_image_version'] = getImageTag(paramsPrefix) ?: ''

diff --git a/go.sum b/go.sum
@@ -603,6 +603,7 @@ github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwds
 github.com/go-openapi/jsonpointer v0.17.2/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
 github.com/go-openapi/jsonpointer v0.18.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
 github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg=
+github.com/go-openapi/jsonpointer v0.19.3 h1:gihV7YNZK1iK6Tgwwsxo2rJbD1GTbdm72325Bq8FI3w=
 github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
 github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY=
 github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
@@ -611,6 +612,7 @@ github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3Hfo
 github.com/go-openapi/jsonreference v0.17.2/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
 github.com/go-openapi/jsonreference v0.18.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
 github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc=
+github.com/go-openapi/jsonreference v0.19.3 h1:5cxNfTy0UVC3X8JL5ymxzyoUZmo8iZb+jeTWn7tUa8o=
 github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8=
 github.com/go-openapi/jsonreference v0.19.5 h1:1WJP/wi4OjB4iV8KVbH73rQaoialJrqv8gitZLxGLtM=
 github.com/go-openapi/jsonreference v0.19.5/go.mod h1:RdybgQwPxbL4UEjuAruzK1x3nE69AqPYEJeo/TWfEeg=
@@ -636,6 +638,7 @@ github.com/go-openapi/spec v0.19.2/go.mod h1:sCxk3jxKgioEJikev4fgkNmwS+3kuYdJtcs
 github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo=
 github.com/go-openapi/spec v0.19.4/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo=
 github.com/go-openapi/spec v0.19.6/go.mod h1:Hm2Jr4jv8G1ciIAo+frC/Ft+rR2kQDh8JHKHb3gWUSk=
+github.com/go-openapi/spec v0.19.7 h1:0xWSeMd35y5avQAThZR2PkEuqSosoS5t6gDH4L8n11M=
 github.com/go-openapi/spec v0.19.7/go.mod h1:Hm2Jr4jv8G1ciIAo+frC/Ft+rR2kQDh8JHKHb3gWUSk=
 github.com/go-openapi/spec v0.19.15 h1:uxh8miNJEfMm8l8ekpY7i39LcORm1xSRtoipEGl1JPk=
 github.com/go-openapi/spec v0.19.15/go.mod h1:+81FIL1JwC5P3/Iuuozq3pPE9dXdIEGxFutcFKaVbmU=
@@ -2559,6 +2562,7 @@ k8s.io/kube-openapi v0.0.0-20190918143330-0270cf2f1c1d/go.mod h1:1TqjTSzOxsLGIKf
 k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E=
 k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E=
 k8s.io/kube-openapi v0.0.0-20200410145947-bcb3869e6f29/go.mod h1:F+5wygcW0wmRTnM3cOgIqGivxkwSWIWT5YdsDbeAOaU=
+k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd h1:sOHNzJIkytDF6qadMNKhhDRpc6ODik8lVC6nOur7B2c=
 k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM=
 k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7 h1:vEx13qjvaZ4yfObSSXW7BrMc/KQBBT/Jyee8XtLf4x0=
 k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7/go.mod h1:wXW5VT87nVfh/iLV8FpR2uDvrFyomxbtb1KivDbvPTE=

diff --git a/hack/run-tests.sh b/hack/run-tests.sh
@@ -71,7 +71,6 @@ function usage(){
   # runtime
 
   printf "\n--services_image_registry {REGISTRY}\n\tSet the services image registry."
-  printf "\n--services_image_namespace {NAMESPACE}\n\tSet the services image namespace."
   printf "\n--services_image_name_suffix {NAMESPACE}\n\tSet the build image name suffix to append to usual image names."
   printf "\n--services_image_version {VERSION}\n\tSet the services image version."
   printf "\n--data_index_image_tag {IMAGE_TAG}\n\tSet the Kogito Data Index image tag ('services_image_version' is ignored)"
@@ -82,7 +81,6 @@ function usage(){
   printf "\n--trusty_image_tag {IMAGE_TAG}\n\tSet the Kogito Trusty image tag ('services_image_version' is ignored)"
   printf "\n--trusty_ui_image_tag {IMAGE_TAG}\n\tSet the Kogito Trusty UI image tag ('services_image_version' is ignored)"
   printf "\n--runtime_application_image_registry {REGISTRY}\n\tSet the registry for built runtime applications."
-  printf "\n--runtime_application_image_namespace {NAMESPACE}\n\tSet the namespace for built runtime applications."
   printf "\n--runtime_application_image_name_prefix {NAME_PREFIX}\n\tSet the image name suffix to prepend to usual image names for built runtime applications."
   printf "\n--runtime_application_image_name_suffix {NAME_SUFFIX}\n\tSet the image name suffix to append to usual image names for built runtime applications."
   printf "\n--runtime_application_image_version {VERSION}\n\tSet the version for built runtime applications."
@@ -93,7 +91,6 @@ function usage(){
   printf "\n--maven_mirror {URI}\n\tMaven mirror url to be used when building app in the tests."
   printf "\n--maven_ignore_self_signed_certificate\n\tSet to true if maven build need to ignore self-signed certificate. This could happen when using internal maven mirror url."
   printf "\n--build_image_registry {REGISTRY}\n\tSet the build image registry."
-  printf "\n--build_image_namespace {NAMESPACE}\n\tSet the build image namespace."
   printf "\n--build_image_name_suffix {NAMESPACE}\n\tSet the build image name suffix to append to usual image names."
   printf "\n--build_image_version {VERSION}\n\tSet the build image version."
   printf "\n--build_image_tag {TAG}\n\tSet the build image full tag."
@@ -321,10 +318,6 @@ case $1 in
     shift
     if addParamKeyValueIfAccepted "--tests.services-image-registry" ${1}; then shift; fi
   ;;
-  --services_image_namespace)
-    shift
-    if addParamKeyValueIfAccepted "--tests.services-image-namespace" ${1}; then shift; fi
-  ;;
   --services_image_name_suffix)
     shift
     if addParamKeyValueIfAccepted "--tests.services-image-name-suffix" ${1}; then shift; fi
@@ -365,10 +358,6 @@ case $1 in
     shift
     if addParamKeyValueIfAccepted "--tests.runtime-application-image-registry" ${1}; then shift; fi
   ;;
-  --runtime_application_image_namespace)
-    shift
-    if addParamKeyValueIfAccepted "--tests.runtime-application-image-namespace" ${1}; then shift; fi
-  ;;
   --runtime_application_image_name_prefix)
     shift
     if addParamKeyValueIfAccepted "--tests.runtime-application-image-name-prefix" ${1}; then shift; fi
@@ -403,10 +392,6 @@ case $1 in
     shift
     if addParamKeyValueIfAccepted "--tests.build-image-registry" ${1}; then shift; fi
   ;;
-  --build_image_namespace)
-    shift
-    if addParamKeyValueIfAccepted "--tests.build-image-namespace" ${1}; then shift; fi
-  ;;
   --build_image_name_suffix)
     shift
     if addParamKeyValueIfAccepted "--tests.build-image-name-suffix" ${1}; then shift; fi

diff --git a/hack/run-tests.sh.bats b/hack/run-tests.sh.bats
@@ -514,24 +514,6 @@ export -f oc
     [[ "${output}" != *"--tests.services-image-registry"* ]]
 }
 
-@test "invoke run-tests with services_image_namespace" {
-    run ${BATS_TEST_DIRNAME}/run-tests.sh --services_image_namespace namespace --dry_run
-    [ "$status" -eq 0 ]
-    [[ "${output}" =~ "--tests.services-image-namespace=namespace" ]]
-}
-
-@test "invoke run-tests with services_image_namespace missing value" {
-    run ${BATS_TEST_DIRNAME}/run-tests.sh --services_image_namespace --dry_run
-    [ "$status" -eq 0 ]
-    [[ "${output}" != *"--tests.services-image-namespace"* ]]
-}
-
-@test "invoke run-tests with services_image_namespace empty value" {
-    run ${BATS_TEST_DIRNAME}/run-tests.sh --services_image_namespace "" --dry_run
-    [ "$status" -eq 0 ]
-    [[ "${output}" != *"--tests.services-image-namespace"* ]]
-}
-
 @test "invoke run-tests with services_image_name_suffix" {
     run ${BATS_TEST_DIRNAME}/run-tests.sh --services_image_name_suffix suffix --dry_run
     [ "$status" -eq 0 ]
@@ -711,24 +693,6 @@ export -f oc
     [[ "${output}" != *"--tests.runtime-application-image-registry"* ]]
 }
 
-@test "invoke run-tests with runtime_application_image_namespace" {
-    run ${BATS_TEST_DIRNAME}/run-tests.sh --runtime_application_image_namespace namespace --dry_run
-    [ "$status" -eq 0 ]
-    [[ "${output}" =~ "--tests.runtime-application-image-namespace=namespace" ]]
-}
-
-@test "invoke run-tests with runtime_application_image_namespace missing value" {
-    run ${BATS_TEST_DIRNAME}/run-tests.sh --runtime_application_image_namespace --dry_run
-    [ "$status" -eq 0 ]
-    [[ "${output}" != *"--tests.runtime-application-image-namespace"* ]]
-}
-
-@test "invoke run-tests with runtime_application_image_namespace empty value" {
-    run ${BATS_TEST_DIRNAME}/run-tests.sh --runtime_application_image_namespace "" --dry_run
-    [ "$status" -eq 0 ]
-    [[ "${output}" != *"--tests.runtime-application-image-namespace"* ]]
-}
-
 @test "invoke run-tests with runtime_application_image_name_prefix" {
     run ${BATS_TEST_DIRNAME}/run-tests.sh --runtime_application_image_name_prefix prefix --dry_run
     [ "$status" -eq 0 ]
@@ -863,24 +827,6 @@ export -f oc
     [[ "${output}" != *"--tests.build-image-registry"* ]]
 }
 
-@test "invoke run-tests with build_image_namespace" {
-    run ${BATS_TEST_DIRNAME}/run-tests.sh --build_image_namespace namespace --dry_run
-    [ "$status" -eq 0 ]
-    [[ "${output}" =~ "--tests.build-image-namespace=namespace" ]]
-}
-
-@test "invoke run-tests with build_image_namespace missing value" {
-    run ${BATS_TEST_DIRNAME}/run-tests.sh --build_image_namespace --dry_run
-    [ "$status" -eq 0 ]
-    [[ "${output}" != *"--tests.build-image-namespace"* ]]
-}
-
-@test "invoke run-tests with build_image_namespace empty value" {
-    run ${BATS_TEST_DIRNAME}/run-tests.sh --build_image_namespace "" --dry_run
-    [ "$status" -eq 0 ]
-    [[ "${output}" != *"--tests.build-image-namespace"* ]]
-}
-
 @test "invoke run-tests with build_image_name_suffix" {
     run ${BATS_TEST_DIRNAME}/run-tests.sh --build_image_name_suffix suffix --dry_run
     [ "$status" -eq 0 ]

diff --git a/test/Makefile b/test/Makefile
@@ -32,7 +32,6 @@ operator_yaml_uri=
 cli_path=
 # runtime
 services_image_registry=
-services_image_namespace=
 services_image_name_suffix=
 services_image_version=
 data_index_image_tag=
@@ -43,7 +42,6 @@ task_console_image_tag=
 trusty_image_tag=
 trusty_ui_image_tag=
 runtime_application_image_registry=
-runtime_application_image_namespace=
 runtime_application_image_name_prefix=
 runtime_application_image_name_suffix=
 runtime_application_image_version=
@@ -53,7 +51,6 @@ custom_maven_repo_replace_default=false
 maven_mirror=
 maven_ignore_self_signed_certificate=false
 build_image_registry=
-build_image_namespace=
 build_image_name_suffix=
 build_image_version=
 build_builder_image_tag=
@@ -112,7 +109,6 @@ run-tests:
 		--operator_profiling_output_file_uri ${operator_profiling_output_file_uri} \
 		--cli_path ${cli_path} \
 		--services_image_registry ${services_image_registry} \
-		--services_image_namespace ${services_image_namespace} \
 		--services_image_name_suffix ${services_image_name_suffix} \
 		--services_image_version ${services_image_version} \
 		--data_index_image_tag ${data_index_image_tag} \
@@ -123,14 +119,12 @@ run-tests:
 		--trusty_image_tag ${trusty_image_tag} \
 		--trusty_ui_image_tag ${trusty_ui_image_tag} \
 		--runtime_application_image_registry ${runtime_application_image_registry} \
-		--runtime_application_image_namespace ${runtime_application_image_namespace} \
 		--runtime_application_image_name_prefix ${runtime_application_image_name_prefix} \
 		--runtime_application_image_name_suffix ${runtime_application_image_name_suffix} \
 		--runtime_application_image_version ${runtime_application_image_version} \
 		--custom_maven_repo $(custom_maven_repo) \
 		--maven_mirror $(maven_mirror) \
 		--build_image_registry ${build_image_registry} \
-		--build_image_namespace ${build_image_namespace} \
 		--build_image_name_suffix ${build_image_name_suffix} \
 		--build_image_version ${build_image_version} \
 		--build_builder_image_tag ${build_builder_image_tag} \

diff --git a/test/pkg/config/config.go b/test/pkg/config/config.go
@@ -55,7 +55,6 @@ type TestConfig struct {
 
 	// runtime
 	servicesImageRegistry             string
-	servicesImageNamespace            string
 	servicesImageNameSuffix           string
 	servicesImageVersion              string
 	dataIndexImageTag                 string
@@ -66,7 +65,6 @@ type TestConfig struct {
 	trustyImageTag                    string
 	trustyUIImageTag                  string
 	runtimeApplicationImageRegistry   string
-	runtimeApplicationImageNamespace  string
 	runtimeApplicationImageNamePrefix string
 	runtimeApplicationImageNameSuffix string
 	runtimeApplicationImageVersion    string
@@ -77,7 +75,6 @@ type TestConfig struct {
 	mavenMirrorURL                     string
 	mavenIgnoreSelfSignedCertificate   bool
 	buildImageRegistry                 string
-	buildImageNamespace                string
 	buildImageNameSuffix               string
 	buildImageVersion                  string
 	buildBuilderImageTag               string
@@ -168,7 +165,6 @@ func BindFlags(set *flag.FlagSet) {
 
 	// runtime
 	set.StringVar(&env.servicesImageRegistry, prefix+"services-image-registry", "", "Set the services (jobs-service, data-index, trusty, explainability) image registry")
-	set.StringVar(&env.servicesImageNamespace, prefix+"services-image-namespace", "", "Set the services (jobs-service, data-index, trusty, explainability) image namespace")
 	set.StringVar(&env.servicesImageNameSuffix, prefix+"services-image-name-suffix", "", "Set the services (jobs-service, data-index, trusty, explainability) image name suffix")
 	set.StringVar(&env.servicesImageVersion, prefix+"services-image-version", "", "Set the services (jobs-service, data-index, trusty, explainability) image version")
 	set.StringVar(&env.dataIndexImageTag, prefix+"data-index-image-tag", "", "Set the Kogito Data Index image tag ('services-image-version' is ignored)")
@@ -179,7 +175,6 @@ func BindFlags(set *flag.FlagSet) {
 	set.StringVar(&env.trustyImageTag, prefix+"trusty-image-tag", "", "Set the Kogito Trusty image tag ('services-image-version' is ignored)")
 	set.StringVar(&env.trustyUIImageTag, prefix+"trusty-ui-image-tag", "", "Set the Kogito Trusty UI image tag ('services-image-version' is ignored)")
 	set.StringVar(&env.runtimeApplicationImageRegistry, prefix+"runtime-application-image-registry", "", "Set the runtime application (built Kogito application image) image registry")
-	set.StringVar(&env.runtimeApplicationImageNamespace, prefix+"runtime-application-image-namespace", "", "Set the runtime application (built Kogito application image) image namespace")
 	set.StringVar(&env.runtimeApplicationImageNamePrefix, prefix+"runtime-application-image-name-prefix", "", "Set the runtime application (built Kogito application image) image name prefix")
 	set.StringVar(&env.runtimeApplicationImageNameSuffix, prefix+"runtime-application-image-name-suffix", "", "Set the runtime application (built Kogito application image) image name suffix")
 	set.StringVar(&env.runtimeApplicationImageVersion, prefix+"runtime-application-image-version", "", "Set the runtime application (built Kogito application image) image version")
@@ -190,7 +185,6 @@ func BindFlags(set *flag.FlagSet) {
 	set.StringVar(&env.mavenMirrorURL, prefix+"maven-mirror-url", "", "Maven mirror url to be used when building app in the tests")
 	set.BoolVar(&env.mavenIgnoreSelfSignedCertificate, prefix+"maven-ignore-self-signed-certificate", false, "Set to true if maven build need to ignore self-signed certificate. This could happen when using internal maven mirror url.")
 	set.StringVar(&env.buildImageRegistry, prefix+"build-image-registry", "", "Set the build image registry")
-	set.StringVar(&env.buildImageNamespace, prefix+"build-image-namespace", "", "Set the build image namespace")
 	set.StringVar(&env.buildImageNameSuffix, prefix+"build-image-name-suffix", "", "Set the build image name suffix")
 	set.StringVar(&env.buildImageVersion, prefix+"build-image-version", "", "Set the build image version")
 	set.StringVar(&env.buildBuilderImageTag, prefix+"build-builder-image-tag", "", "Set the S2I build image full tag")
@@ -344,11 +338,6 @@ func GetServicesImageRegistry() string {
 	return env.servicesImageRegistry
 }
 
-// GetServicesImageNamespace return the namespace for the services images
-func GetServicesImageNamespace() string {
-	return env.servicesImageNamespace
-}
-
 // GetServicesImageNameSuffix return the name suffix for the services images
 func GetServicesImageNameSuffix() string {
 	return env.servicesImageNameSuffix
@@ -399,11 +388,6 @@ func GetRuntimeApplicationImageRegistry() string {
 	return env.runtimeApplicationImageRegistry
 }
 
-// GetRuntimeApplicationImageNamespace return the namespace for runtime application images
-func GetRuntimeApplicationImageNamespace() string {
-	return env.runtimeApplicationImageNamespace
-}
-
 // GetRuntimeApplicationImageNamePrefix return the name prefix for runtime application images
 func GetRuntimeApplicationImageNamePrefix() string {
 	return env.runtimeApplicationImageNamePrefix
@@ -446,11 +430,6 @@ func GetBuildImageRegistry() string {
 	return env.buildImageRegistry
 }
 
-// GetBuildImageNamespace return the namespace for the build images
-func GetBuildImageNamespace() string {
-	return env.buildImageNamespace
-}
-
 // GetBuildImageNameSuffix return the namespace for the build images
 func GetBuildImageNameSuffix() string {
 	return env.buildImageNameSuffix