From 54a1f8d1c13556df56c468cad82ff6de8786b105 Mon Sep 17 00:00:00 2001
From: Nick Cross <ncross@redhat.com>
Date: Tue, 24 Dec 2024 15:17:34 +0000
Subject: [PATCH] Experiment reducing resources and removing tasks

---
 deploy/tasks/buildah-oci-ta.yaml              | 56 +++++++++----------
 .../v1alpha1/systemconfig_types.go            |  4 +-
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/deploy/tasks/buildah-oci-ta.yaml b/deploy/tasks/buildah-oci-ta.yaml
index 2b485f704..3d605c823 100644
--- a/deploy/tasks/buildah-oci-ta.yaml
+++ b/deploy/tasks/buildah-oci-ta.yaml
@@ -686,8 +686,8 @@ spec:
         done
       computeResources:
         limits:
-          cpu: "4"
-          memory: 8Gi
+          cpu: "2"
+          memory: 6Gi
         requests:
           cpu: "1"
           memory: 2Gi
@@ -749,8 +749,8 @@ spec:
           cpu: "4"
           memory: 4Gi
         requests:
-          cpu: "1"
-          memory: 1Gi
+          cpu: 200m
+          memory: 500m
       securityContext:
         capabilities:
           add:
@@ -774,31 +774,31 @@ spec:
           cpu: "2"
           memory: 4Gi
         requests:
-          cpu: 500m
-          memory: 1Gi
-    - name: analyse-dependencies-java-sbom
-      image: quay.io/redhat-appstudio/hacbs-jvm-build-request-processor:127ee0c223a2b56a9bd20a6f2eaeed3bd6015f77
-      volumeMounts:
-        - mountPath: /var/lib/containers
-          name: varlibcontainers
-        - mountPath: /shared
-          name: shared
-      script: |
-        if [ -f /var/lib/containers/java ]; then
-          /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)
-          sed -i 's/^/ /' $(results.SBOM_JAVA_COMPONENTS_COUNT.path) # Workaround for SRVKP-2875
-        else
-          touch $(results.JAVA_COMMUNITY_DEPENDENCIES.path)
-        fi
-      computeResources:
-        limits:
           cpu: 200m
-          memory: 512Mi
-        requests:
-          cpu: 100m
-          memory: 256Mi
-      securityContext:
-        runAsUser: 0
+          memory: 1Gi
+#    - name: analyse-dependencies-java-sbom
+#      image: quay.io/redhat-appstudio/hacbs-jvm-build-request-processor:127ee0c223a2b56a9bd20a6f2eaeed3bd6015f77
+#      volumeMounts:
+#        - mountPath: /var/lib/containers
+#          name: varlibcontainers
+#        - mountPath: /shared
+#          name: shared
+#      script: |
+#        if [ -f /var/lib/containers/java ]; then
+#          /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)
+#          sed -i 's/^/ /' $(results.SBOM_JAVA_COMPONENTS_COUNT.path) # Workaround for SRVKP-2875
+#        else
+#          touch $(results.JAVA_COMMUNITY_DEPENDENCIES.path)
+#        fi
+#      computeResources:
+#        limits:
+#          cpu: 200m
+#          memory: 512Mi
+#        requests:
+#          cpu: 100m
+#          memory: 256Mi
+#      securityContext:
+#        runAsUser: 0
     - name: prepare-sboms
       image: quay.io/redhat-appstudio/sbom-utility-scripts-image@sha256:e1347023ef1e83d52813c26384f551e3a03e482539d17a647955603e7ea6b579
       workingDir: /var/workdir
diff --git a/pkg/apis/jvmbuildservice/v1alpha1/systemconfig_types.go b/pkg/apis/jvmbuildservice/v1alpha1/systemconfig_types.go
index 7eeed6fc4..b653b4001 100644
--- a/pkg/apis/jvmbuildservice/v1alpha1/systemconfig_types.go
+++ b/pkg/apis/jvmbuildservice/v1alpha1/systemconfig_types.go
@@ -49,6 +49,6 @@ const (
 	KonfluxGitDefinition          = "https://raw.githubusercontent.com/konflux-ci/build-definitions/refs/heads/main/task/git-clone/0.1/git-clone.yaml"
 	KonfluxPreBuildDefinitions    = "https://raw.githubusercontent.com/rnc/jvm-build-service/BR1/deploy/tasks/pre-build.yaml"
 	KonfluxPreBuildGitDefinitions = "https://raw.githubusercontent.com/rnc/jvm-build-service/BR1/deploy/tasks/pre-build-git.yaml"
-	KonfluxBuildDefinitions       = "https://raw.githubusercontent.com/redhat-appstudio/jvm-build-service/main/deploy/tasks/buildah-oci-ta.yaml"
-	KonfluxMavenDeployDefinitions = "https://raw.githubusercontent.com/redhat-appstudio/jvm-build-service/main/deploy/tasks/maven-deployment.yaml"
+	KonfluxBuildDefinitions       = "https://raw.githubusercontent.com/rnc/jvm-build-service/BR1/deploy/tasks/buildah-oci-ta.yaml"
+	KonfluxMavenDeployDefinitions = "https://raw.githubusercontent.com/rnc/jvm-build-service/BR1/deploy/tasks/maven-deployment.yaml"
 )