Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/maven/com.redhat.cloud.common-i…
Browse files Browse the repository at this point in the history
…nsights-notification-schemas-java-0.22
  • Loading branch information
fellipeh authored Jan 10, 2025
2 parents 24703ba + 41f31d8 commit b260993
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 95 deletions.
2 changes: 1 addition & 1 deletion .baseimage
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
sha256:cf095e5668919ba1b4ace3888107684ad9d587b1830d3eb56973e6a54f456e67
618c747c18f6a4ee0bed719dc862927431fcdd41df9986ab5e999b6a3e1b5d92 -
165b03727fc64d107d6126ce5009c7a23cdd20939989da58c6acb0fea1683966 -
20 changes: 9 additions & 11 deletions .rhcicd/clowdapp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ objects:
image: ${IMAGE}:${IMAGE_TAG}
resources:
requests:
cpu: ${CPU_REQUEST}
memory: ${MEMORY_REQUEST}
cpu: ${CPU_REQUEST_ENGINE}
memory: ${MEMORY_REQUEST_ENGINE}
limits:
cpu: ${CPU_LIMIT}
memory: ${MEMORY_LIMIT}
cpu: ${CPU_LIMIT_ENGINE}
memory: ${MEMORY_LIMIT_ENGINE}
volumes:
- name: certs
emptyDir: {}
Expand Down Expand Up @@ -77,8 +77,6 @@ objects:
value: ${EXTERNAL_LOGGING_LEVEL}
- name: JAVA_OPTIONS
value: ${JAVA_OPTIONS}
- name: GC_CONTAINER_OPTIONS
value: "-XX:+UseG1GC"
- name: QUARKUS_HTTP_PORT
value: "8000"
- name: QUARKUS_LOG_CLOUDWATCH_ENABLED
Expand All @@ -99,11 +97,11 @@ parameters:
value: "false"
- name: JAVA_OPTIONS
description: Additional options to JDK runtime
value: "-XX:+ExitOnOutOfMemoryError -Xms640m -Xmx1024m"
- name: CPU_LIMIT
value: "-XX:+ExitOnOutOfMemoryError -Xms128m -Xmx512m"
- name: CPU_LIMIT_ENGINE
description: CPU limit
value: 250m
- name: CPU_REQUEST
- name: CPU_REQUEST_ENGINE
description: CPU request
value: 125m
- name: ENV_NAME
Expand All @@ -117,10 +115,10 @@ parameters:
value: latest
- name: EXTERNAL_LOGGING_LEVEL
value: INFO
- name: MEMORY_LIMIT
- name: MEMORY_LIMIT_ENGINE
description: Memory limit
value: 1000Mi
- name: MEMORY_REQUEST
- name: MEMORY_REQUEST_ENGINE
description: Memory request
value: 500Mi
- name: MIN_REPLICAS
Expand Down
2 changes: 1 addition & 1 deletion .tekton/policies-engine-pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ spec:
- name: name
value: buildah
- name: bundle
value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.2@sha256:c3fb20564f297f8a5590db73f45910b1e6ec674dd4ef644779f95b60feca3e8b
value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.3@sha256:2f07e7813b6f3d0cb26e41a3732ce813809963537b1926df7c24020c9867ea0b
- name: kind
value: task
resolver: bundles
Expand Down
2 changes: 1 addition & 1 deletion .tekton/policies-engine-push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ spec:
- name: name
value: buildah
- name: bundle
value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.2@sha256:c3fb20564f297f8a5590db73f45910b1e6ec674dd4ef644779f95b60feca3e8b
value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.3@sha256:2f07e7813b6f3d0cb26e41a3732ce813809963537b1926df7c24020c9867ea0b
- name: kind
value: task
resolver: bundles
Expand Down
2 changes: 1 addition & 1 deletion src/main/docker/Dockerfile-build.jvm
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ RUN microdnf install -y openssl curl ca-certificates ${JAVA_PACKAGE} \
&& chown 1001:root /deployments \
&& echo "securerandom.source=file:/dev/urandom" >> /etc/alternatives/jre/lib/security/java.security

ENV JAVA_OPTIONS="-XX:+ExitOnOutOfMemoryError -Xms640m -Xmx1024m"
ENV JAVA_OPTIONS="-XX:+ExitOnOutOfMemoryError -Xms128m -Xmx512m"

# Use four distinct layers so if there are application changes the library layers can be re-used
COPY --from=build --chown=1001 /home/jboss/target/quarkus-app/lib/ /deployments/lib/
Expand Down

This file was deleted.

3 changes: 3 additions & 0 deletions src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ kafka.bootstrap.servers=localhost:9092
# kafka.ssl.truststore.location=
# kafka.ssl.truststore.type=PEM

# Enable ClowdConfigSource to load Kafka SSL configuration
feature-flags.expose-kafka-ssl-config-keys.enabled=true

# Source <= hosts
mp.messaging.incoming.events.connector=smallrye-kafka
mp.messaging.incoming.events.topic=platform.inventory.events
Expand Down

0 comments on commit b260993

Please sign in to comment.