Revert using a DEVFILE_PROXY env var

rm3l · rm3l · commit 5797b00bb9de · 2023-10-23T16:55:59.000+02:00
There is no proxy deployed in the internal test cluster.
As such, this env var no longer makes sense.
diff --git a/.ibm/pipelines/kubernetes-tests.sh b/.ibm/pipelines/kubernetes-tests.sh
@@ -15,8 +15,6 @@ cleanup_namespaces
 export SKIP_USER_LOGIN_TESTS=true
 (
     set -e
-    export DEVFILE_PROXY="$(kubectl get svc -n devfile-proxy nginx -o jsonpath='{.status.loadBalancer.ingress[0].hostname}' || true)"
-    echo Using Devfile proxy: ${DEVFILE_PROXY}
     make install
     make test-integration-cluster
 ) |& tee "/tmp/${LOGFILE}"
diff --git a/.ibm/pipelines/openshift-tests.sh b/.ibm/pipelines/openshift-tests.sh
@@ -16,8 +16,6 @@ cleanup_namespaces
 
 (
     set -e
-    export DEVFILE_PROXY="$(kubectl get svc -n devfile-proxy nginx -o jsonpath='{.status.loadBalancer.ingress[0].hostname}' || true)"
-    echo Using Devfile proxy: ${DEVFILE_PROXY}
     make install
     make test-integration-cluster
     make test-e2e
diff --git a/.ibm/pipelines/windows-test-script.ps1 b/.ibm/pipelines/windows-test-script.ps1
@@ -71,14 +71,6 @@ function Run-Test {
     oc login -u apikey -p ${API_KEY} ${IBM_OPENSHIFT_ENDPOINT}
     Check-ExitCode $LASTEXITCODE
 
-    Shout "Getting Devfile proxy address"
-    $DEVFILE_PROXY=$(oc get svc -n devfile-proxy nginx -o jsonpath='{.status.loadBalancer.ingress[0].hostname}')
-    if ( $LASTEXITCODE -eq 0 )
-    {
-        Shout "Using Devfile proxy: $DEVFILE_PROXY"
-        [Environment]::SetEnvironmentVariable("DEVFILE_PROXY", "$DEVFILE_PROXY")
-    }
-
     Shout "Create Binary"
     make install 
     Shout "Running test"
diff --git a/docs/website/docs/overview/configure.md b/docs/website/docs/overview/configure.md
@@ -189,7 +189,6 @@ Options here are mostly used for debugging and testing `odo` behavior.
 | `ODO_DISABLE_TELEMETRY`             | Useful for disabling [telemetry collection](https://github.com/redhat-developer/odo/blob/main/USAGE_DATA.md). **Deprecated in v3.2.0**. Use `ODO_TRACKING_CONSENT` instead.                                                                                                                                                                                                    | v2.1.0        | `true`                                     |
 | `GLOBALODOCONFIG`                   | Useful for setting a different location of global preference file `preference.yaml`.                                                                                                                                                                                                                                                                                           | v0.0.19       | `~/.config/odo/preference.yaml`            |
 | `ODO_DEBUG_TELEMETRY_FILE`          | Useful for debugging [telemetry](https://github.com/redhat-developer/odo/blob/main/USAGE_DATA.md). When set it will save telemetry data to a file instead of sending it to the server.                                                                                                                                                                                         | v3.0.0-alpha1 | `/tmp/telemetry_data.json`                 |
-| `DEVFILE_PROXY`                     | Integration tests will use this address as Devfile registry instead of `registry.stage.devfile.io`                                                                                                                                                                                                                                                                             | v3.0.0-beta3  | `my-registry.example.com`                  |
 | `TELEMETRY_CALLER`                  | Caller identifier passed to [telemetry](https://github.com/redhat-developer/odo/blob/main/USAGE_DATA.md). Case-insensitive. Acceptable values: `vscode`, `intellij`, `jboss`.                                                                                                                                                                                                  | v3.1.0        | `intellij`                                 |
 | `ODO_TRACKING_CONSENT`              | Useful for controlling [telemetry](https://github.com/redhat-developer/odo/blob/main/USAGE_DATA.md). Acceptable values: `yes` ([enables telemetry](https://github.com/redhat-developer/odo/blob/main/USAGE_DATA.md) and skips consent prompt), `no` (disables telemetry and consent prompt). Takes precedence over the [`ConsentTelemetry`](#preference-key-table) preference. | v3.2.0        | `yes`                                      |
 | `ODO_PUSH_IMAGES`                   | Whether to push the images once built; this is used only when applying Devfile image components as part of a Dev Session running on Podman; this is useful for integration tests running on Podman. `true` by default                                                                                                                                                          | v3.7.0        | `false`                                    |
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -8,7 +8,6 @@ import (
 )
 
 type Configuration struct {
-	DevfileProxy                  *string       `env:"DEVFILE_PROXY,noinit"`
 	DockerCmd                     string        `env:"DOCKER_CMD,default=docker"`
 	Globalodoconfig               *string       `env:"GLOBALODOCONFIG,noinit"`
 	OdoDebugTelemetryFile         *string       `env:"ODO_DEBUG_TELEMETRY_FILE,noinit"`
diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go
@@ -18,7 +18,6 @@ func TestDefaultValues(t *testing.T) {
 	checkDefaultBoolValue(t, "OdoExperimentalMode", cfg.OdoExperimentalMode, false)
 
 	// Use noinit to set non initialized value as nil instead of zero-value
-	checkNilString(t, "DevfileProxy", cfg.DevfileProxy)
 	checkNilString(t, "Globalodoconfig", cfg.Globalodoconfig)
 	checkNilString(t, "Globalodoconfig", cfg.Globalodoconfig)
 	checkNilString(t, "OdoDebugTelemetryFile", cfg.OdoDebugTelemetryFile)
diff --git a/tests/helper/helper_generic.go b/tests/helper/helper_generic.go
@@ -401,10 +401,6 @@ func SetDefaultDevfileRegistryAsStaging() {
 
 func GetDevfileRegistryURL() string {
 	registryURL := "https://registry.stage.devfile.io"
-	proxy := os.Getenv("DEVFILE_PROXY")
-	if proxy != "" {
-		registryURL = "http://" + proxy
-	}
 	customReg := os.Getenv("DEVFILE_REGISTRY")
 	if customReg != "" {
 		registryURL = customReg

Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,6 @@ cleanup_namespaces`
`15`	`15`	`export SKIP_USER_LOGIN_TESTS=true`
`16`	`16`	`(`
`17`	`17`	`set -e`
`18`		`- export DEVFILE_PROXY="$(kubectl get svc -n devfile-proxy nginx -o jsonpath='{.status.loadBalancer.ingress[0].hostname}' \|\| true)"`
`19`		`- echo Using Devfile proxy: ${DEVFILE_PROXY}`
`20`	`18`	`make install`
`21`	`19`	`make test-integration-cluster`
`22`	`20`	`) \|& tee "/tmp/${LOGFILE}"`
Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,6 @@ cleanup_namespaces`
`16`	`16`
`17`	`17`	`(`
`18`	`18`	`set -e`
`19`		`- export DEVFILE_PROXY="$(kubectl get svc -n devfile-proxy nginx -o jsonpath='{.status.loadBalancer.ingress[0].hostname}' \|\| true)"`
`20`		`- echo Using Devfile proxy: ${DEVFILE_PROXY}`
`21`	`19`	`make install`
`22`	`20`	`make test-integration-cluster`
`23`	`21`	`make test-e2e`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@ import (`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`type Configuration struct {`
`11`		- DevfileProxy *string `env:"DEVFILE_PROXY,noinit"`
`12`	`11`	DockerCmd string `env:"DOCKER_CMD,default=docker"`
`13`	`12`	Globalodoconfig *string `env:"GLOBALODOCONFIG,noinit"`
`14`	`13`	OdoDebugTelemetryFile *string `env:"ODO_DEBUG_TELEMETRY_FILE,noinit"`