Remove rest of domain proxy. Reference new image location.

Author: tecarter94

.github/workflows/minikube.yaml

@@ -76,7 +76,6 @@ jobs:
           export JVM_BUILD_SERVICE_IMAGE=quay.io/$JBS_QUAY_ORG/$JBS_QUAY_IMAGE_CONTROLLER:$JBS_QUAY_IMAGE_TAG
           export JVM_BUILD_SERVICE_CACHE_IMAGE=quay.io/$JBS_QUAY_ORG/konflux-jbs-pnc-tenant/jvm-build-service/cache:$JBS_QUAY_IMAGE_TAG
           export JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE=quay.io/$JBS_QUAY_ORG/konflux-jbs-pnc-tenant/jvm-build-service/build-request-processor:$JBS_QUAY_IMAGE_TAG
-          export JVM_BUILD_SERVICE_DOMAIN_PROXY_IMAGE=quay.io/$JBS_QUAY_ORG/konflux-jbs-pnc-tenant/jvm-build-service/domain-proxy:$JBS_QUAY_IMAGE_TAG
 
           echo "Using worker namespace $JBS_WORKER_NAMESPACE DEV_IP $DEV_IP JVM_BUILD_SERVICE_IMAGE $JVM_BUILD_SERVICE_IMAGE"
 
@@ -140,7 +139,6 @@ jobs:
           export JVM_BUILD_SERVICE_IMAGE=quay.io/$JBS_QUAY_ORG/$JBS_QUAY_IMAGE_CONTROLLER:$JBS_QUAY_IMAGE_TAG
           export JVM_BUILD_SERVICE_CACHE_IMAGE=quay.io/$JBS_QUAY_ORG/konflux-jbs-pnc-tenant/jvm-build-service/cache:$JBS_QUAY_IMAGE_TAG
           export JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE=quay.io/$JBS_QUAY_ORG/konflux-jbs-pnc-tenant/jvm-build-service/build-request-processor:$JBS_QUAY_IMAGE_TAG
-          export JVM_BUILD_SERVICE_DOMAIN_PROXY_IMAGE=quay.io/$JBS_QUAY_ORG/konflux-jbs-pnc-tenant/jvm-build-service/domain-proxy:$JBS_QUAY_IMAGE_TAG
 
           echo "Using worker namespace $JBS_WORKER_NAMESPACE DEV_IP $DEV_IP JVM_BUILD_SERVICE_IMAGE $JVM_BUILD_SERVICE_IMAGE"
 

.gitignore

@@ -43,6 +43,3 @@ deploy/**/ci-final/**
 
 # Ignore Gradle build output directory
 **/gradle/build/
-
-# Ignore default domain proxy output directory
-output/

Makefile

@@ -44,8 +44,6 @@ minikube-test:
 build:
 	go build -o out/jvmbuildservice cmd/controller/main.go
 	env GOOS=linux GOARCH=amd64 GOTOOLCHAIN=auto GOSUMDB=sum.golang.org go build -mod=vendor -o out/jvmbuildservice ./cmd/controller
-	go build -o out/domainproxyserver cmd/domainproxy/server/main.go
-	go build -o out/domainproxyclient cmd/domainproxy/client/main.go
 
 clean:
 	rm -rf out
@@ -62,15 +60,13 @@ generate: generate-crds
 verify-generate-deepcopy-client: generate-deepcopy-client
 	hack/verify-codegen.sh
 
-dev-image: build
+dev-image:
 	@if [ -z "$$QUAY_USERNAME" ]; then \
             echo "ERROR: QUAY_USERNAME is not set"; \
             exit 1; \
     fi
 	docker build . -t quay.io/$(QUAY_USERNAME)/hacbs-jvm-controller:"$${JBS_QUAY_IMAGE_TAG:-dev}"
 	docker push quay.io/$(QUAY_USERNAME)/hacbs-jvm-controller:"$${JBS_QUAY_IMAGE_TAG:-dev}"
-	docker build . -f cmd/domainproxy/docker/Dockerfile.local -t quay.io/$(QUAY_USERNAME)/hacbs-jvm-domain-proxy:"$${JBS_QUAY_IMAGE_TAG:-dev}"
-	docker push quay.io/$(QUAY_USERNAME)/hacbs-jvm-domain-proxy:"$${JBS_QUAY_IMAGE_TAG:-dev}"
 
 dev: dev-image
 	cd java-components && mvn clean install -Dlocal -DskipTests -Ddev

cmd/domainproxy/client/main.go

@@ -11,8 +11,6 @@ echo "jvm build service jvm cache image:"
 echo ${JVM_BUILD_SERVICE_CACHE_IMAGE}
 echo "jvm build service jvm reqprocessor image:"
 echo ${JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE}
-echo "jvm build service jvm domain proxy image:"
-echo ${JVM_BUILD_SERVICE_DOMAIN_PROXY_IMAGE}
 
 function waitFor() {
     endTime=$(( $(date +%s) + 600 ))
@@ -52,4 +50,3 @@ oc set env deployment/hacbs-jvm-operator -n jvm-build-service \
 JVM_BUILD_SERVICE_IMAGE=${JVM_BUILD_SERVICE_IMAGE} \
 JVM_BUILD_SERVICE_CACHE_IMAGE=${JVM_BUILD_SERVICE_CACHE_IMAGE} \
 JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE=${JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE}
-JVM_BUILD_SERVICE_DOMAIN_PROXY_IMAGE=${JVM_BUILD_SERVICE_DOMAIN_PROXY_IMAGE}

cmd/domainproxy/docker/Dockerfile.all-in-one

@@ -153,7 +153,6 @@ export QUAY_USERNAME=<your-quay-io-account-username>
 export JVM_BUILD_SERVICE_IMAGE=
 export JVM_BUILD_SERVICE_CACHE_IMAGE=
 export JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE=
-export JVM_BUILD_SERVICE_DOMAIN_PROXY_IMAGE=
 ./deploy/openshift-ci.sh
 make openshift-e2e
 ----

cmd/domainproxy/docker/Dockerfile.local

@@ -29,10 +29,7 @@ require (
 	sigs.k8s.io/yaml v1.4.0
 )
 
-require (
-	github.com/elazarl/goproxy v0.0.0-20190421051319-9d40249d3c2f
-	github.com/swist/go-k8s-portforward v0.2.1
-)
+require github.com/swist/go-k8s-portforward v0.2.1
 
 require (
 	contrib.go.opencensus.io/exporter/ocagent v0.7.1-0.20200907061046-05415f1de66d // indirect
@@ -45,7 +42,6 @@ require (
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/creack/pty v1.1.21 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/elazarl/goproxy/ext v0.0.0-20240909085733-6741dbfc16a1 // indirect
 	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
 	github.com/evanphx/json-patch v5.6.0+incompatible // indirect
 	github.com/evanphx/json-patch/v5 v5.9.0 // indirect