Skip to content

Commit e192e64

Browse files
tecarter94tecarter94
committed
Remove rest of domain proxy. Reference new image location.
1 parent 8433c6b commit e192e64

37 files changed

+7
-3088
lines changed

‎.github/workflows/minikube.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ jobs:
7676
export JVM_BUILD_SERVICE_IMAGE=quay.io/$JBS_QUAY_ORG/$JBS_QUAY_IMAGE_CONTROLLER:$JBS_QUAY_IMAGE_TAG
7777
export JVM_BUILD_SERVICE_CACHE_IMAGE=quay.io/$JBS_QUAY_ORG/konflux-jbs-pnc-tenant/jvm-build-service/cache:$JBS_QUAY_IMAGE_TAG
7878
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
79-
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
8079
8180
echo "Using worker namespace $JBS_WORKER_NAMESPACE DEV_IP $DEV_IP JVM_BUILD_SERVICE_IMAGE $JVM_BUILD_SERVICE_IMAGE"
8281
@@ -140,7 +139,6 @@ jobs:
140139
export JVM_BUILD_SERVICE_IMAGE=quay.io/$JBS_QUAY_ORG/$JBS_QUAY_IMAGE_CONTROLLER:$JBS_QUAY_IMAGE_TAG
141140
export JVM_BUILD_SERVICE_CACHE_IMAGE=quay.io/$JBS_QUAY_ORG/konflux-jbs-pnc-tenant/jvm-build-service/cache:$JBS_QUAY_IMAGE_TAG
142141
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
143-
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
144142
145143
echo "Using worker namespace $JBS_WORKER_NAMESPACE DEV_IP $DEV_IP JVM_BUILD_SERVICE_IMAGE $JVM_BUILD_SERVICE_IMAGE"
146144

‎.gitignore

-3
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,3 @@ deploy/**/ci-final/**
4343

4444
# Ignore Gradle build output directory
4545
**/gradle/build/
46-
47-
# Ignore default domain proxy output directory
48-
output/

‎Makefile

+1-5
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ minikube-test:
4444
build:
4545
go build -o out/jvmbuildservice cmd/controller/main.go
4646
env GOOS=linux GOARCH=amd64 GOTOOLCHAIN=auto GOSUMDB=sum.golang.org go build -mod=vendor -o out/jvmbuildservice ./cmd/controller
47-
go build -o out/domainproxyserver cmd/domainproxy/server/main.go
48-
go build -o out/domainproxyclient cmd/domainproxy/client/main.go
4947

5048
clean:
5149
rm -rf out
@@ -62,15 +60,13 @@ generate: generate-crds
6260
verify-generate-deepcopy-client: generate-deepcopy-client
6361
hack/verify-codegen.sh
6462

65-
dev-image: build
63+
dev-image:
6664
@if [ -z "$$QUAY_USERNAME" ]; then \
6765
echo "ERROR: QUAY_USERNAME is not set"; \
6866
exit 1; \
6967
fi
7068
docker build . -t quay.io/$(QUAY_USERNAME)/hacbs-jvm-controller:"$${JBS_QUAY_IMAGE_TAG:-dev}"
7169
docker push quay.io/$(QUAY_USERNAME)/hacbs-jvm-controller:"$${JBS_QUAY_IMAGE_TAG:-dev}"
72-
docker build . -f cmd/domainproxy/docker/Dockerfile.local -t quay.io/$(QUAY_USERNAME)/hacbs-jvm-domain-proxy:"$${JBS_QUAY_IMAGE_TAG:-dev}"
73-
docker push quay.io/$(QUAY_USERNAME)/hacbs-jvm-domain-proxy:"$${JBS_QUAY_IMAGE_TAG:-dev}"
7470

7571
dev: dev-image
7672
cd java-components && mvn clean install -Dlocal -DskipTests -Ddev

‎cmd/domainproxy/client/main.go

-19
This file was deleted.

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

-14
This file was deleted.

‎cmd/domainproxy/docker/Dockerfile.local

-5
This file was deleted.

‎cmd/domainproxy/server/main.go

-19
This file was deleted.

‎deploy/openshift-ci.sh

-3
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ echo "jvm build service jvm cache image:"
1111
echo ${JVM_BUILD_SERVICE_CACHE_IMAGE}
1212
echo "jvm build service jvm reqprocessor image:"
1313
echo ${JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE}
14-
echo "jvm build service jvm domain proxy image:"
15-
echo ${JVM_BUILD_SERVICE_DOMAIN_PROXY_IMAGE}
1614

1715
function waitFor() {
1816
endTime=$(( $(date +%s) + 600 ))
@@ -52,4 +50,3 @@ oc set env deployment/hacbs-jvm-operator -n jvm-build-service \
5250
JVM_BUILD_SERVICE_IMAGE=${JVM_BUILD_SERVICE_IMAGE} \
5351
JVM_BUILD_SERVICE_CACHE_IMAGE=${JVM_BUILD_SERVICE_CACHE_IMAGE} \
5452
JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE=${JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE}
55-
JVM_BUILD_SERVICE_DOMAIN_PROXY_IMAGE=${JVM_BUILD_SERVICE_DOMAIN_PROXY_IMAGE}

‎docs/development.adoc

-1
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,6 @@ export QUAY_USERNAME=<your-quay-io-account-username>
153153
export JVM_BUILD_SERVICE_IMAGE=
154154
export JVM_BUILD_SERVICE_CACHE_IMAGE=
155155
export JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE=
156-
export JVM_BUILD_SERVICE_DOMAIN_PROXY_IMAGE=
157156
./deploy/openshift-ci.sh
158157
make openshift-e2e
159158
----

‎go.mod

+1-5
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,7 @@ require (
2929
sigs.k8s.io/yaml v1.4.0
3030
)
3131

32-
require (
33-
github.com/elazarl/goproxy v0.0.0-20190421051319-9d40249d3c2f
34-
github.com/swist/go-k8s-portforward v0.2.1
35-
)
32+
require github.com/swist/go-k8s-portforward v0.2.1
3633

3734
require (
3835
contrib.go.opencensus.io/exporter/ocagent v0.7.1-0.20200907061046-05415f1de66d // indirect
@@ -45,7 +42,6 @@ require (
4542
github.com/cespare/xxhash/v2 v2.3.0 // indirect
4643
github.com/creack/pty v1.1.21 // indirect
4744
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
48-
github.com/elazarl/goproxy/ext v0.0.0-20240909085733-6741dbfc16a1 // indirect
4945
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
5046
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
5147
github.com/evanphx/json-patch/v5 v5.9.0 // indirect

‎go.sum

-5
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,6 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1
9595
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
9696
github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
9797
github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
98-
github.com/elazarl/goproxy v0.0.0-20190421051319-9d40249d3c2f h1:8GDPb0tCY8LQ+OJ3dbHb5sA6YZWXFORQYZx5sdsTlMs=
99-
github.com/elazarl/goproxy v0.0.0-20190421051319-9d40249d3c2f/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
100-
github.com/elazarl/goproxy/ext v0.0.0-20240909085733-6741dbfc16a1 h1:XgXwWTQglBILwCpfm8I9xUjPXKOi1EzRzuYzyczU5Z0=
101-
github.com/elazarl/goproxy/ext v0.0.0-20240909085733-6741dbfc16a1/go.mod h1:gNh8nYJoAm43RfaxurUnxr+N1PwuFV3ZMl/efxlIlY8=
10298
github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
10399
github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
104100
github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g=
@@ -395,7 +391,6 @@ github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoG
395391
github.com/prometheus/statsd_exporter v0.22.7 h1:7Pji/i2GuhK6Lu7DHrtTkFmNBCudCPT1pX2CziuyQR0=
396392
github.com/prometheus/statsd_exporter v0.22.7/go.mod h1:N/TevpjkIh9ccs6nuzY3jQn9dFqnUakOjnEuMPJJJnI=
397393
github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
398-
github.com/rogpeppe/go-charset v0.0.0-20180617210344-2471d30d28b4/go.mod h1:qgYeAmZ5ZIpBWTGllZSQnw97Dj+woV0toclVaRGI8pc=
399394
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
400395
github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
401396
github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=

‎pkg/domainproxy/client/client.go

-110
This file was deleted.

0 commit comments

Comments
 (0)