Skip to content

Commit

Permalink
remove references to jvm-build-service
Browse files Browse the repository at this point in the history
- jvm-build-service is currently not being used by anyone
- It is going to undergo major breaking changes and is going to be removed for now until the changes are done
  • Loading branch information
tnevrlka committed Jan 20, 2025
1 parent e477f67 commit 1b4ef60
Show file tree
Hide file tree
Showing 26 changed files with 1 addition and 256 deletions.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ resources:
- integration
- enterprise-contract
- build-service
- jvm-build-service
- pipeline-service
- build-templates
- internal-services
Expand Down
5 changes: 0 additions & 5 deletions argo-cd-apps/overlays/development/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,6 @@ patches:
kind: ApplicationSet
version: v1alpha1
name: multi-platform-controller
- path: development-overlay-patch.yaml
target:
kind: ApplicationSet
version: v1alpha1
name: jvm-build-service
- path: development-overlay-patch.yaml
target:
kind: ApplicationSet
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ spec:
- image-controller
- integration-service
- internal-services
- jvm-build-service
- multi-platform-controller
- perf-team-prometheus-reader
- plnsvc-tests
Expand Down
3 changes: 1 addition & 2 deletions components/build-service/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ The StoneSoup Build System is composed of the following components:
- [Tekton Results](https://github.com/tektoncd/results)
- [Pipelines as Code](https://pipelinesascode.com/)
- [App Studio Build Service](https://github.com/konflux-ci/build-service/)
- [HACBS JVM Build Service](https://github.com/redhat-appstudio/jvm-build-service)
- [PVC Cleaner](https://github.com/redhat-appstudio/pvc-cleaner/)

This repository installs all the components and includes a set of example scripts that simplify usage and provide examples of a working system. There are no additional components needed to use the build system API, however some utilities and scripts are provided to demonstrate functionality.
Expand All @@ -30,7 +29,7 @@ To validate execution via RHTAP you can run `./hack/build/build-via-appstudio.sh
To build specific repository, pass its URL and path to repository's Dockerfile as arguments as shown below:

```
./hack/build/build-via-appstudio.sh https://github.com/devfile-samples/devfile-sample-java-springboot-basic docker/Dockerfile
./hack/build/build-via-appstudio.sh https://github.com/devfile-samples/devfile-sample-python-basic docker/Dockerfile
```

To enable PipelineAsCode integration you need to set `PIPELINESASCODE` env variable to `1` and also have to have set GitHub credentials in your `./hack/preview.env`.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ spec:
- konflux-ci
- image-controller
- multi-platform-controller
- jvm-build-service
- openshift-logging
- quality-dashboard
- sprayproxy
Expand Down
9 changes: 0 additions & 9 deletions components/jvm-build-service/OWNERS

This file was deleted.

12 changes: 0 additions & 12 deletions components/jvm-build-service/base/allow-argocd-to-manage.yaml

This file was deleted.

This file was deleted.

19 changes: 0 additions & 19 deletions components/jvm-build-service/base/external-secrets/quaytoken.yaml

This file was deleted.

28 changes: 0 additions & 28 deletions components/jvm-build-service/base/kustomization.yaml

This file was deleted.

48 changes: 0 additions & 48 deletions components/jvm-build-service/base/monitoring.yaml

This file was deleted.

11 changes: 0 additions & 11 deletions components/jvm-build-service/base/operator_env_patch.yaml

This file was deleted.

4 changes: 0 additions & 4 deletions components/jvm-build-service/development/kustomization.yaml

This file was deleted.

12 changes: 0 additions & 12 deletions components/jvm-build-service/production/kustomization.yaml

This file was deleted.

4 changes: 0 additions & 4 deletions components/jvm-build-service/production/quaytoken.yaml

This file was deleted.

5 changes: 0 additions & 5 deletions components/jvm-build-service/staging/kustomization.yaml

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ resources:
- image-controller/
- dora-metrics/
- has/
- jvm-build-service/
- integration/
- migration/
- release/
Expand Down
2 changes: 0 additions & 2 deletions hack/build/build-via-appstudio.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ function create-component {
create-secret

if [ -z "$COMPONENT" ]; then
create-component https://github.com/devfile-samples/devfile-sample-java-springboot-basic docker/Dockerfile
create-component https://github.com/devfile-samples/devfile-sample-code-with-quarkus src/main/docker/Dockerfile.jvm.staged
create-component https://github.com/devfile-samples/devfile-sample-python-basic docker/Dockerfile
else
create-component $COMPONENT $PATH_TO_DOCKERFILE
Expand Down
7 changes: 0 additions & 7 deletions hack/preview-template.env
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,6 @@ export BUILD_SERVICE_IMAGE_TAG=
export BUILD_SERVICE_IMAGE_TAG_EXPIRATION=
export BUILD_SERVICE_PR_OWNER=
export BUILD_SERVICE_PR_SHA=
### Override JVM Build service image
export JVM_BUILD_SERVICE_IMAGE_REPO=
export JVM_BUILD_SERVICE_IMAGE_TAG=
export JVM_BUILD_SERVICE_PR_OWNER=
export JVM_BUILD_SERVICE_PR_SHA=
export JVM_BUILD_SERVICE_CACHE_IMAGE=
export JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE=
### Override the default Tekton bundle
export DEFAULT_BUILD_BUNDLE=

Expand Down
5 changes: 0 additions & 5 deletions hack/preview.sh
Original file line number Diff line number Diff line change
Expand Up @@ -191,11 +191,6 @@ sed -i.bak "s/rekor-server.enterprise-contract-service.svc/$rekor_server/" $ROOT
[ -n "${BUILD_SERVICE_IMAGE_TAG}" ] && yq -i e "(.images.[] | select(.name==\"quay.io/konflux-ci/build-service\")) |=.newTag=\"${BUILD_SERVICE_IMAGE_TAG}\"" $ROOT/components/build-service/development/kustomization.yaml
[ -n "${BUILD_SERVICE_IMAGE_TAG_EXPIRATION}" ] && yq -i e "(.spec.template.spec.containers[].env[] | select(.name==\"IMAGE_TAG_ON_PR_EXPIRATION\") | .value) |= \"${BUILD_SERVICE_IMAGE_TAG_EXPIRATION}\"" $ROOT/components/build-service/development/image-expiration-patch.yaml
[[ -n "${BUILD_SERVICE_PR_OWNER}" && "${BUILD_SERVICE_PR_SHA}" ]] && yq -i e "(.resources[] | select(. ==\"*github.com/konflux-ci/build-service*\")) |= \"https://github.com/${BUILD_SERVICE_PR_OWNER}/build-service/config/default?ref=${BUILD_SERVICE_PR_SHA}\"" $ROOT/components/build-service/development/kustomization.yaml
[ -n "${JVM_BUILD_SERVICE_IMAGE_REPO}" ] && yq -i e "(.images.[] | select(.name==\"hacbs-jvm-operator\")) |=.newName=\"${JVM_BUILD_SERVICE_IMAGE_REPO}\"" $ROOT/components/jvm-build-service/base/kustomization.yaml
[ -n "${JVM_BUILD_SERVICE_IMAGE_TAG}" ] && yq -i e "(.images.[] | select(.name==\"hacbs-jvm-operator\")) |=.newTag=\"${JVM_BUILD_SERVICE_IMAGE_TAG}\"" $ROOT/components/jvm-build-service/base/kustomization.yaml
[[ -n "${JVM_BUILD_SERVICE_PR_OWNER}" && "${JVM_BUILD_SERVICE_PR_SHA}" ]] && sed -i -e "s|\(https://github.com/\)redhat-appstudio\(/jvm-build-service/.*?ref=\)\(.*\)|\1${JVM_BUILD_SERVICE_PR_OWNER}\2${JVM_BUILD_SERVICE_PR_SHA}|" -e "s|\(https://raw.githubusercontent.com/\)redhat-appstudio\(/jvm-build-service/\)[^/]*\(/.*\)|\1${JVM_BUILD_SERVICE_PR_OWNER}\2${JVM_BUILD_SERVICE_PR_SHA}\3|" $ROOT/components/jvm-build-service/base/kustomization.yaml
[[ -n "${JVM_BUILD_SERVICE_CACHE_IMAGE}" && ${JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE} ]] && yq -i e "select(.[].path == \"/spec/template/spec/containers/0/env\") | .[].value |= . + [{\"name\" : \"JVM_BUILD_SERVICE_CACHE_IMAGE\", \"value\": \"${JVM_BUILD_SERVICE_CACHE_IMAGE}\"}, {\"name\": \"JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE\", \"value\": \"${JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE}\"}] | (.[].value[] | select(.name == \"IMAGE_TAG\")) |= .value = \"\"" $ROOT/components/jvm-build-service/base/operator_env_patch.yaml

[ -n "${HAS_IMAGE_REPO}" ] && yq -i e "(.images.[] | select(.name==\"quay.io/redhat-appstudio/application-service\")) |=.newName=\"${HAS_IMAGE_REPO}\"" $ROOT/components/has/base/kustomization.yaml
[ -n "${HAS_IMAGE_TAG}" ] && yq -i e "(.images.[] | select(.name==\"quay.io/redhat-appstudio/application-service\")) |=.newTag=\"${HAS_IMAGE_TAG}\"" $ROOT/components/has/base/kustomization.yaml
[[ -n "${HAS_PR_OWNER}" && "${HAS_PR_SHA}" ]] && yq -i e "(.resources[] | select(. ==\"*github.com/redhat-appstudio/application-service*\")) |= \"https://github.com/${HAS_PR_OWNER}/application-service/config/default?ref=${HAS_PR_SHA}\"" $ROOT/components/has/base/kustomization.yaml
Expand Down
4 changes: 0 additions & 4 deletions hack/secret-creator/create-image-controller-secret.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@ main() {
echo "Creating a secret with a token for Image Controller"
oc create namespace image-controller --dry-run=client -o yaml | oc apply -f -
oc create -n image-controller secret generic quaytoken --from-literal=organization="$organization" --from-literal=quaytoken="$quay_token" --dry-run=client -o yaml | oc apply -f -

echo "Creating a secret with a token for JVM Build Service"
oc create namespace jvm-build-service --dry-run=client -o yaml | oc apply -f -
oc create -n jvm-build-service secret generic quaytoken --from-literal=organization="$organization" --from-literal=quaytoken="$quay_token" --dry-run=client -o yaml | oc apply -f -
}

if [[ "${BASH_SOURCE[0]}" == "$0" ]]; then
Expand Down

0 comments on commit 1b4ef60

Please sign in to comment.