Skip to content

Commit

Permalink
Remove rest of domain proxy. Reference new image location.
Browse files Browse the repository at this point in the history
  • Loading branch information
tecarter94 committed Dec 23, 2024
1 parent 8433c6b commit 5798cd4
Show file tree
Hide file tree
Showing 16 changed files with 6 additions and 1,229 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/minikube.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,3 @@ deploy/**/ci-final/**

# Ignore Gradle build output directory
**/gradle/build/

# Ignore default domain proxy output directory
output/
6 changes: 1 addition & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
19 changes: 0 additions & 19 deletions cmd/domainproxy/client/main.go

This file was deleted.

14 changes: 0 additions & 14 deletions cmd/domainproxy/docker/Dockerfile.all-in-one

This file was deleted.

5 changes: 0 additions & 5 deletions cmd/domainproxy/docker/Dockerfile.local

This file was deleted.

19 changes: 0 additions & 19 deletions cmd/domainproxy/server/main.go

This file was deleted.

3 changes: 0 additions & 3 deletions deploy/openshift-ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 ))
Expand Down Expand Up @@ -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}
1 change: 0 additions & 1 deletion docs/development.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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
----
110 changes: 0 additions & 110 deletions pkg/domainproxy/client/client.go

This file was deleted.

Loading

0 comments on commit 5798cd4

Please sign in to comment.