Skip to content

Commit 54a1f8d

Browse files
committed
Experiment reducing resources and removing tasks
1 parent 7ebd073 commit 54a1f8d

File tree

2 files changed

+30
-30
lines changed

2 files changed

+30
-30
lines changed

deploy/tasks/buildah-oci-ta.yaml

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -686,8 +686,8 @@ spec:
686686
done
687687
computeResources:
688688
limits:
689-
cpu: "4"
690-
memory: 8Gi
689+
cpu: "2"
690+
memory: 6Gi
691691
requests:
692692
cpu: "1"
693693
memory: 2Gi
@@ -749,8 +749,8 @@ spec:
749749
cpu: "4"
750750
memory: 4Gi
751751
requests:
752-
cpu: "1"
753-
memory: 1Gi
752+
cpu: 200m
753+
memory: 500m
754754
securityContext:
755755
capabilities:
756756
add:
@@ -774,31 +774,31 @@ spec:
774774
cpu: "2"
775775
memory: 4Gi
776776
requests:
777-
cpu: 500m
778-
memory: 1Gi
779-
- name: analyse-dependencies-java-sbom
780-
image: quay.io/redhat-appstudio/hacbs-jvm-build-request-processor:127ee0c223a2b56a9bd20a6f2eaeed3bd6015f77
781-
volumeMounts:
782-
- mountPath: /var/lib/containers
783-
name: varlibcontainers
784-
- mountPath: /shared
785-
name: shared
786-
script: |
787-
if [ -f /var/lib/containers/java ]; then
788-
/opt/jboss/container/java/run/run-java.sh analyse-dependencies path $(cat /shared/container_path) -s /var/workdir/sbom-image.json --task-run-name $(context.taskRun.name) --publishers $(results.SBOM_JAVA_COMPONENTS_COUNT.path)
789-
sed -i 's/^/ /' $(results.SBOM_JAVA_COMPONENTS_COUNT.path) # Workaround for SRVKP-2875
790-
else
791-
touch $(results.JAVA_COMMUNITY_DEPENDENCIES.path)
792-
fi
793-
computeResources:
794-
limits:
795777
cpu: 200m
796-
memory: 512Mi
797-
requests:
798-
cpu: 100m
799-
memory: 256Mi
800-
securityContext:
801-
runAsUser: 0
778+
memory: 1Gi
779+
# - name: analyse-dependencies-java-sbom
780+
# image: quay.io/redhat-appstudio/hacbs-jvm-build-request-processor:127ee0c223a2b56a9bd20a6f2eaeed3bd6015f77
781+
# volumeMounts:
782+
# - mountPath: /var/lib/containers
783+
# name: varlibcontainers
784+
# - mountPath: /shared
785+
# name: shared
786+
# script: |
787+
# if [ -f /var/lib/containers/java ]; then
788+
# /opt/jboss/container/java/run/run-java.sh analyse-dependencies path $(cat /shared/container_path) -s /var/workdir/sbom-image.json --task-run-name $(context.taskRun.name) --publishers $(results.SBOM_JAVA_COMPONENTS_COUNT.path)
789+
# sed -i 's/^/ /' $(results.SBOM_JAVA_COMPONENTS_COUNT.path) # Workaround for SRVKP-2875
790+
# else
791+
# touch $(results.JAVA_COMMUNITY_DEPENDENCIES.path)
792+
# fi
793+
# computeResources:
794+
# limits:
795+
# cpu: 200m
796+
# memory: 512Mi
797+
# requests:
798+
# cpu: 100m
799+
# memory: 256Mi
800+
# securityContext:
801+
# runAsUser: 0
802802
- name: prepare-sboms
803803
image: quay.io/redhat-appstudio/sbom-utility-scripts-image@sha256:e1347023ef1e83d52813c26384f551e3a03e482539d17a647955603e7ea6b579
804804
workingDir: /var/workdir

pkg/apis/jvmbuildservice/v1alpha1/systemconfig_types.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,6 @@ const (
4949
KonfluxGitDefinition = "https://raw.githubusercontent.com/konflux-ci/build-definitions/refs/heads/main/task/git-clone/0.1/git-clone.yaml"
5050
KonfluxPreBuildDefinitions = "https://raw.githubusercontent.com/rnc/jvm-build-service/BR1/deploy/tasks/pre-build.yaml"
5151
KonfluxPreBuildGitDefinitions = "https://raw.githubusercontent.com/rnc/jvm-build-service/BR1/deploy/tasks/pre-build-git.yaml"
52-
KonfluxBuildDefinitions = "https://raw.githubusercontent.com/redhat-appstudio/jvm-build-service/main/deploy/tasks/buildah-oci-ta.yaml"
53-
KonfluxMavenDeployDefinitions = "https://raw.githubusercontent.com/redhat-appstudio/jvm-build-service/main/deploy/tasks/maven-deployment.yaml"
52+
KonfluxBuildDefinitions = "https://raw.githubusercontent.com/rnc/jvm-build-service/BR1/deploy/tasks/buildah-oci-ta.yaml"
53+
KonfluxMavenDeployDefinitions = "https://raw.githubusercontent.com/rnc/jvm-build-service/BR1/deploy/tasks/maven-deployment.yaml"
5454
)

0 commit comments

Comments
 (0)