From: FrancescoFioraEst Date: Mon, 8 Dec 2025 17:14:59 +0000 (+0000) Subject: Remove duplication of Spring configs in participants X-Git-Tag: 5.0.0~2 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=624ed7033049cb8bdb625d0c9455a8ff76ba8265;p=policy%2Fdocker.git Remove duplication of Spring configs in participants Issue-ID: POLICY-5511 Change-Id: I96873e58c26b7bd7619bcf367886c6d6b8917c1f Signed-off-by: FrancescoFioraEst --- diff --git a/compose/compose.acm.scale.yml b/compose/compose.acm.scale.yml index 2a868fde..d0b059b2 100644 --- a/compose/compose.acm.scale.yml +++ b/compose/compose.acm.scale.yml @@ -82,6 +82,10 @@ services: mode: replicated replicas: ${REPLICAS:-2} environment: + HTTP_USER: participantUser + HTTP_PASSWORD: zb!XztG34 + topicCommInfrastructure: kafka + allowTracing: true OTEL_SERVICE_NAME: http-ppnt OTEL_EXPORTER_OTLP_PROTOCOL: http/protobuf OTEL_EXPORTER_OTLP_TRACES_PROTOCOL: http/protobuf @@ -90,9 +94,7 @@ services: -Dlogging.config="/opt/app/policy/clamp/etc/logback.xml" -Dotel.java.global-autoconfigure.enabled=true SPRING_PROFILES_ACTIVE: ${PPNT_PROFILE:-default} - SPRING_CONFIG_LOCATION: /opt/app/policy/clamp/etc/HttpParticipantParameters.yaml volumes: - - ./config/clamp/HttpParticipantParameters.yaml:/opt/app/policy/clamp/etc/HttpParticipantParameters.yaml - ./config/clamp/logback-ppnt.xml:/opt/app/policy/clamp/etc/logback.xml:ro healthcheck: test: "curl --fail --silent http://localhost:6969/onap/policy/clamp/acm/httpparticipant/health/readiness | grep UP || exit 1" @@ -109,6 +111,10 @@ services: - kafka - jaeger environment: + HTTP_USER: participantUser + HTTP_PASSWORD: zb!XztG34 + topicCommInfrastructure: kafka + allowTracing: true OTEL_SERVICE_NAME: k8s-ppnt OTEL_EXPORTER_OTLP_PROTOCOL: http/protobuf OTEL_EXPORTER_OTLP_TRACES_PROTOCOL: http/protobuf @@ -117,14 +123,12 @@ services: -Dlogging.config="/opt/app/policy/clamp/etc/logback.xml" -Dotel.java.global-autoconfigure.enabled=true SPRING_PROFILES_ACTIVE: ${PPNT_PROFILE:-default} - SPRING_CONFIG_LOCATION: /opt/app/policy/clamp/etc/KubernetesParticipantParameters.yaml expose: - 6969 deploy: mode: replicated replicas: ${REPLICAS:-2} volumes: - - ./config/clamp/KubernetesParticipantParameters.yaml:/opt/app/policy/clamp/etc/KubernetesParticipantParameters.yaml - ./config/clamp/logback-ppnt.xml:/opt/app/policy/clamp/etc/logback.xml:ro healthcheck: test: "curl --fail --silent http://localhost:6969/onap/policy/clamp/acm/k8sparticipant/health/readiness | grep UP || exit 1" @@ -146,6 +150,14 @@ services: mode: replicated replicas: ${REPLICAS:-2} environment: + API_USER: policyadmin + API_PASSWORD: zb!XztG34 + PAP_USER: policyadmin + PAP_PASSWORD: zb!XztG34 + HTTP_USER: participantUser + HTTP_PASSWORD: zb!XztG34 + topicCommInfrastructure: kafka + allowTracing: true OTEL_SERVICE_NAME: policy-ppnt OTEL_EXPORTER_OTLP_PROTOCOL: http/protobuf OTEL_EXPORTER_OTLP_TRACES_PROTOCOL: http/protobuf @@ -154,9 +166,7 @@ services: -Dlogging.config="/opt/app/policy/clamp/etc/logback.xml" -Dotel.java.global-autoconfigure.enabled=true SPRING_PROFILES_ACTIVE: ${PPNT_PROFILE:-default} - SPRING_CONFIG_LOCATION: /opt/app/policy/clamp/etc/PolicyParticipantParameters.yaml volumes: - - ./config/clamp/PolicyParticipantParameters.yaml:/opt/app/policy/clamp/etc/PolicyParticipantParameters.yaml:ro - ./config/clamp/logback-ppnt.xml:/opt/app/policy/clamp/etc/logback.xml:ro healthcheck: test: "curl --fail --silent http://localhost:6969/onap/policy/clamp/acm/policyparticipant/health/readiness | grep UP || exit 1" diff --git a/compose/compose.common.yml b/compose/compose.common.yml index 1a7b5f97..61b87d7a 100644 --- a/compose/compose.common.yml +++ b/compose/compose.common.yml @@ -49,6 +49,10 @@ services: - kafka - jaeger environment: + HTTP_USER: participantUser + HTTP_PASSWORD: zb!XztG34 + topicCommInfrastructure: kafka + allowTracing: true OTEL_SERVICE_NAME: sim-ppnt-1 OTEL_EXPORTER_OTLP_PROTOCOL: http/protobuf OTEL_EXPORTER_OTLP_TRACES_PROTOCOL: http/protobuf @@ -61,11 +65,9 @@ services: JAVA_TOOL_OPTIONS: >- -Dlogging.config="/opt/app/policy/clamp/etc/logback.xml" -Dotel.java.global-autoconfigure.enabled=true - spring.config.location: /opt/app/policy/clamp/etc/SimulatorParticipantParameters.yaml ports: - ${SIM_PARTICIPANT1_PORT}:6969 volumes: - - ./config/clamp/SimulatorParticipantParameters.yaml:/opt/app/policy/clamp/etc/SimulatorParticipantParameters.yaml:ro - ./config/clamp/logback-ppnt.xml:/opt/app/policy/clamp/etc/logback.xml:ro - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro entrypoint: /opt/app/policy/bin/wait_for_port.sh @@ -82,6 +84,10 @@ services: - kafka - jaeger environment: + HTTP_USER: participantUser + HTTP_PASSWORD: zb!XztG34 + topicCommInfrastructure: kafka + allowTracing: true OTEL_SERVICE_NAME: sim-ppnt-2 OTEL_EXPORTER_OTLP_PROTOCOL: http/protobuf OTEL_EXPORTER_OTLP_TRACES_PROTOCOL: http/protobuf @@ -94,11 +100,9 @@ services: JAVA_TOOL_OPTIONS: >- -Dlogging.config="/opt/app/policy/clamp/etc/logback.xml" -Dotel.java.global-autoconfigure.enabled=true - spring.config.location: /opt/app/policy/clamp/etc/SimulatorParticipantParameters.yaml ports: - ${SIM_PARTICIPANT2_PORT}:6969 volumes: - - ./config/clamp/SimulatorParticipantParameters.yaml:/opt/app/policy/clamp/etc/SimulatorParticipantParameters.yaml:ro - ./config/clamp/logback-ppnt.xml:/opt/app/policy/clamp/etc/logback.xml:ro - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro entrypoint: /opt/app/policy/bin/wait_for_port.sh @@ -115,6 +119,10 @@ services: - kafka - jaeger environment: + HTTP_USER: participantUser + HTTP_PASSWORD: zb!XztG34 + topicCommInfrastructure: kafka + allowTracing: true OTEL_SERVICE_NAME: sim-ppnt-3 OTEL_EXPORTER_OTLP_PROTOCOL: http/protobuf OTEL_EXPORTER_OTLP_TRACES_PROTOCOL: http/protobuf @@ -127,11 +135,9 @@ services: JAVA_TOOL_OPTIONS: >- -Dlogging.config="/opt/app/policy/clamp/etc/logback.xml" -Dotel.java.global-autoconfigure.enabled=true - spring.config.location: /opt/app/policy/clamp/etc/SimulatorParticipantParameters.yaml ports: - ${SIM_PARTICIPANT3_PORT}:6969 volumes: - - ./config/clamp/SimulatorParticipantParameters.yaml:/opt/app/policy/clamp/etc/SimulatorParticipantParameters.yaml:ro - ./config/clamp/logback-ppnt.xml:/opt/app/policy/clamp/etc/logback.xml:ro - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro entrypoint: /opt/app/policy/bin/wait_for_port.sh diff --git a/compose/compose.yaml b/compose/compose.yaml index f97be8fa..d2cf7f81 100644 --- a/compose/compose.yaml +++ b/compose/compose.yaml @@ -266,6 +266,10 @@ services: ports: - "30290:6969" environment: + HTTP_USER: participantUser + HTTP_PASSWORD: zb!XztG34 + topicCommInfrastructure: kafka + allowTracing: true OTEL_SERVICE_NAME: http-ppnt OTEL_EXPORTER_OTLP_PROTOCOL: http/protobuf OTEL_EXPORTER_OTLP_TRACES_PROTOCOL: http/protobuf @@ -274,9 +278,7 @@ services: -Dlogging.config="/opt/app/policy/clamp/etc/logback.xml" -Dotel.java.global-autoconfigure.enabled=true SPRING_PROFILES_ACTIVE: ${PPNT_PROFILE:-default} - SPRING_CONFIG_LOCATION: /opt/app/policy/clamp/etc/HttpParticipantParameters.yaml volumes: - - ./config/clamp/HttpParticipantParameters.yaml:/opt/app/policy/clamp/etc/HttpParticipantParameters.yaml - ./config/clamp/logback-ppnt.xml:/opt/app/policy/clamp/etc/logback.xml:ro healthcheck: test: "curl --fail --silent http://localhost:6969/onap/policy/clamp/acm/httpparticipant/health/readiness | grep UP || exit 1" @@ -294,6 +296,10 @@ services: - kafka - jaeger environment: + HTTP_USER: participantUser + HTTP_PASSWORD: zb!XztG34 + topicCommInfrastructure: kafka + allowTracing: true OTEL_SERVICE_NAME: k8s-ppnt OTEL_EXPORTER_OTLP_PROTOCOL: http/protobuf OTEL_EXPORTER_OTLP_TRACES_PROTOCOL: http/protobuf @@ -302,11 +308,9 @@ services: -Dlogging.config="/opt/app/policy/clamp/etc/logback.xml" -Dotel.java.global-autoconfigure.enabled=true SPRING_PROFILES_ACTIVE: ${PPNT_PROFILE:-default} - SPRING_CONFIG_LOCATION: /opt/app/policy/clamp/etc/KubernetesParticipantParameters.yaml ports: - "30295:6969" volumes: - - ./config/clamp/KubernetesParticipantParameters.yaml:/opt/app/policy/clamp/etc/KubernetesParticipantParameters.yaml - ./config/clamp/logback-ppnt.xml:/opt/app/policy/clamp/etc/logback.xml:ro healthcheck: test: "curl --fail --silent http://localhost:6969/onap/policy/clamp/acm/k8sparticipant/health/readiness | grep UP || exit 1" @@ -327,6 +331,14 @@ services: ports: - ${POLICY_PARTICIPANT_PORT}:6969 environment: + API_USER: policyadmin + API_PASSWORD: zb!XztG34 + PAP_USER: policyadmin + PAP_PASSWORD: zb!XztG34 + HTTP_USER: participantUser + HTTP_PASSWORD: zb!XztG34 + topicCommInfrastructure: kafka + allowTracing: true OTEL_SERVICE_NAME: policy-ppnt OTEL_EXPORTER_OTLP_PROTOCOL: http/protobuf OTEL_EXPORTER_OTLP_TRACES_PROTOCOL: http/protobuf @@ -335,9 +347,7 @@ services: -Dlogging.config="/opt/app/policy/clamp/etc/logback.xml" -Dotel.java.global-autoconfigure.enabled=true SPRING_PROFILES_ACTIVE: ${PPNT_PROFILE:-default} - SPRING_CONFIG_LOCATION: /opt/app/policy/clamp/etc/PolicyParticipantParameters.yaml volumes: - - ./config/clamp/PolicyParticipantParameters.yaml:/opt/app/policy/clamp/etc/PolicyParticipantParameters.yaml:ro - ./config/clamp/logback-ppnt.xml:/opt/app/policy/clamp/etc/logback.xml:ro healthcheck: test: "curl --fail --silent http://localhost:6969/onap/policy/clamp/acm/policyparticipant/health/readiness | grep UP || exit 1" @@ -355,6 +365,10 @@ services: - kafka - jaeger environment: + HTTP_USER: participantUser + HTTP_PASSWORD: zb!XztG34 + topicCommInfrastructure: kafka + allowTracing: true OTEL_SERVICE_NAME: a1pms-ppnt OTEL_EXPORTER_OTLP_PROTOCOL: http/protobuf OTEL_EXPORTER_OTLP_TRACES_PROTOCOL: http/protobuf @@ -362,11 +376,9 @@ services: JAVA_TOOL_OPTIONS: >- -Dlogging.config="/opt/app/policy/clamp/etc/logback.xml" -Dotel.java.global-autoconfigure.enabled=true - SPRING_CONFIG_LOCATION: /opt/app/policy/clamp/etc/A1pmsParticipantParameters.yaml ports: - "30296:6969" volumes: - - ./config/clamp/A1pmsParticipantParameters.yaml:/opt/app/policy/clamp/etc/A1pmsParticipantParameters.yaml:ro - ./config/clamp/logback-ppnt.xml:/opt/app/policy/clamp/etc/logback.xml:ro healthcheck: test: "curl --fail --silent http://localhost:6969/onap/policy/clamp/acm/a1pmsparticipant/health/readiness | grep UP || exit 1" @@ -384,6 +396,10 @@ services: - kafka - jaeger environment: + HTTP_USER: participantUser + HTTP_PASSWORD: zb!XztG34 + topicCommInfrastructure: kafka + allowTracing: true OTEL_SERVICE_NAME: kserve-ppnt OTEL_EXPORTER_OTLP_PROTOCOL: http/protobuf OTEL_EXPORTER_OTLP_TRACES_PROTOCOL: http/protobuf @@ -391,11 +407,9 @@ services: JAVA_TOOL_OPTIONS: >- -Dlogging.config="/opt/app/policy/clamp/etc/logback.xml" -Dotel.java.global-autoconfigure.enabled=true - SPRING_CONFIG_LOCATION: /opt/app/policy/clamp/etc/KserveParticipantParameters.yaml ports: - "30297:6969" volumes: - - ./config/clamp/KserveParticipantParameters.yaml:/opt/app/policy/clamp/etc/KserveParticipantParameters.yaml:ro - ./config/clamp/logback-ppnt.xml:/opt/app/policy/clamp/etc/logback.xml:ro healthcheck: test: "curl --fail --silent http://localhost:6969/onap/policy/clamp/acm/kserveparticipant/health/readiness | grep UP || exit 1" diff --git a/compose/config/clamp/A1pmsParticipantParameters.yaml b/compose/config/clamp/A1pmsParticipantParameters.yaml deleted file mode 100755 index bdf77df4..00000000 --- a/compose/config/clamp/A1pmsParticipantParameters.yaml +++ /dev/null @@ -1,93 +0,0 @@ -spring: - application: - name: a1pms-ppnt - security: - user: - name: participantUser - password: zb!XztG34 - autoconfigure: - exclude: - - org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration - - org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration - - org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration - - org.springframework.boot.autoconfigure.data.web.SpringDataWebAutoConfiguration -security: - enable-csrf: false - -a1pms: - baseUrl: http://a1policymanagement.onap:8081 - headers: - content-type: application/json - endpoints: - health: /a1-policy/v2/rics - services: /a1-policy/v2/services - service: /a1-policy/v2/services/{service_id} - -participant: - intermediaryParameters: - reportingTimeIntervalMs: 120000 - description: Participant Description - participantId: 101c62b3-8918-41b9-a747-d21eb79c6c00 - topics: - operationTopic: policy-acruntime-participant - syncTopic: acm-ppnt-sync - clampAutomationCompositionTopics: - topicSources: - - topic: ${participant.intermediaryParameters.topics.operationTopic} - servers: - - ${topicServer:kafka:9092} - topicCommInfrastructure: kafka - fetchTimeout: 15000 - allowTracing: true - additionalProps: - group.id: policy-clamp-ac-a1pms-ppnt - - - topic: ${participant.intermediaryParameters.topics.syncTopic} - servers: - - ${topicServer:kafka:9092} - topicCommInfrastructure: kafka - fetchTimeout: 15000 - useHttps: false - allowTracing: true - topicSinks: - - topic: ${participant.intermediaryParameters.topics.operationTopic} - servers: - - ${topicServer:kafka:9092} - topicCommInfrastructure: kafka - allowTracing: true - - -management: - tracing: - propagation: - produce: B3 - sampling: - probability: 1.0 - endpoints: - web: - base-path: / - exposure: - include: health, metrics, prometheus - endpoint: - health: - access: unrestricted - show-details: always - probes: - enabled: true - show-components: always - -server: - port: 6969 - ssl: - enabled: false - servlet: - context-path: /onap/policy/clamp/acm/a1pmsparticipant - -tracing: - enabled: true - exporter: - endpoint: http://jaeger:4318/v1/traces - protocol: http - sampler: - jaeger-remote: - endpoint: http://jaeger:14250 diff --git a/compose/config/clamp/HttpParticipantParameters.yaml b/compose/config/clamp/HttpParticipantParameters.yaml deleted file mode 100644 index 1a48b27b..00000000 --- a/compose/config/clamp/HttpParticipantParameters.yaml +++ /dev/null @@ -1,109 +0,0 @@ -spring: - application: - name: http-ppnt - security: - user: - name: participantUser - password: zb!XztG34 - autoconfigure: - exclude: > - org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration, - org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration, - org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration -security: - enable-csrf: false -participant: - intermediaryParameters: - reportingTimeIntervalMs: 120000 - description: Participant Description - participantId: 101c62b3-8918-41b9-a747-d21eb79c6c01 - topics: - operationTopic: policy-acruntime-participant - syncTopic: acm-ppnt-sync - clampAutomationCompositionTopics: - topicSources: - - topic: ${participant.intermediaryParameters.topics.operationTopic} - servers: - - ${topicServer:kafka:9092} - topicCommInfrastructure: kafka - fetchTimeout: 15000 - useHttps: false - allowTracing: true - additionalProps: - group.id: policy-clamp-ac-http-ppnt - - topic: ${participant.intermediaryParameters.topics.syncTopic} - servers: - - ${topicServer:kafka:9092} - topicCommInfrastructure: kafka - fetchTimeout: 15000 - useHttps: false - allowTracing: true - topicSinks: - - topic: ${participant.intermediaryParameters.topics.operationTopic} - servers: - - ${topicServer:kafka:9092} - topicCommInfrastructure: kafka - useHttps: false - allowTracing: true - participantSupportedElementTypes: - - typeName: org.onap.policy.clamp.acm.HttpAutomationCompositionElement - typeVersion: 1.0.0 -management: - tracing: - propagation: - produce: B3 - sampling: - probability: 1.0 - endpoints: - web: - exposure: - include: health, metrics, prometheus - endpoint: - health: - access: unrestricted - show-details: always - probes: - enabled: true - show-components: always - -server: - port: 6969 - ssl: - enabled: false - servlet: - context-path: /onap/policy/clamp/acm/httpparticipant - -tracing: - enabled: true - exporter: - endpoint: http://jaeger:4318/v1/traces - protocol: http - sampler: - jaeger-remote: - endpoint: http://jaeger:14250 - -# legacy config ---- - -spring: - config: - activate: - on-profile: legacy -participant: - intermediaryParameters: - reportingTimeIntervalMs: 120000 - participantId: 101c62b3-8918-41b9-a747-d21eb79c6c01 - clampAutomationCompositionTopics: - topicSources: - - topic: policy-acruntime-participant - servers: - - ${topicServer:kafka:9092} - topicCommInfrastructure: kafka - fetchTimeout: 15000 - useHttps: false - topicSinks: - - topic: policy-acruntime-participant - servers: - - ${topicServer:kafka:9092} - topicCommInfrastructure: kafka - useHttps: false diff --git a/compose/config/clamp/KserveParticipantParameters.yaml b/compose/config/clamp/KserveParticipantParameters.yaml deleted file mode 100755 index 3c235659..00000000 --- a/compose/config/clamp/KserveParticipantParameters.yaml +++ /dev/null @@ -1,98 +0,0 @@ -spring: - application: - name: kserve-ppnt - cloud: - kubernetes: - enabled: false - discovery: - enabled: false - security: - user: - name: participantUser - password: zb!XztG34 - autoconfigure: - exclude: - - org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration - - org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration - - org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration - - org.springframework.boot.autoconfigure.data.web.SpringDataWebAutoConfiguration - - io.kubernetes.client.spring.extended.manifests.config.KubernetesManifestsAutoConfiguration - - io.kubernetes.client.spring.extended.network.config.KubernetesLoadBalancerAutoConfiguration - -security: - enable-csrf: false - -participant: - intermediaryParameters: - reportingTimeIntervalMs: 120000 - description: Participant Description - participantId: 101c62b3-8918-41b9-a747-d21eb79c6c04 - clampAutomationCompositionTopics: - topicSources: - - topic: ${participant.intermediaryParameters.topics.operationTopic} - servers: - - ${topicServer:kafka:9092} - topicCommInfrastructure: kafka - fetchTimeout: 15000 - allowTracing: true - additionalProps: - group.id: policy-clamp-ac-kserve-ppnt - - - topic: ${participant.intermediaryParameters.topics.syncTopic} - servers: - - ${topicServer:kafka:9092} - topicCommInfrastructure: kafka - fetchTimeout: 15000 - useHttps: false - allowTracing: true - topicSinks: - - topic: ${participant.intermediaryParameters.topics.operationTopic} - servers: - - ${topicServer:kafka:9092} - topicCommInfrastructure: kafka - allowTracing: true - participantSupportedElementTypes: - - - typeName: org.onap.policy.clamp.acm.KserveAutomationCompositionElement - typeVersion: 1.0.1 - -customresourcedefinition: - group: serving.kserve.io - version: v1beta1 - plural: inferenceservices - grace-period: 10 - -management: - tracing: - propagation: - produce: B3 - sampling: - probability: 1.0 - endpoints: - web: - base-path: / - exposure: - include: health, metrics, prometheus - endpoint: - health: - access: unrestricted - show-details: always - probes: - enabled: true - show-components: always - -server: - port: 6969 - servlet: - context-path: /onap/policy/clamp/acm/kserveparticipant - ssl: - enabled: false - -tracing: - enabled: true - exporter: - endpoint: http://jaeger:4318/v1/traces - protocol: http - sampler: - jaeger-remote: - endpoint: http://jaeger:14250 \ No newline at end of file diff --git a/compose/config/clamp/KubernetesParticipantParameters.yaml b/compose/config/clamp/KubernetesParticipantParameters.yaml deleted file mode 100644 index 6204ea7c..00000000 --- a/compose/config/clamp/KubernetesParticipantParameters.yaml +++ /dev/null @@ -1,125 +0,0 @@ -spring: - application: - name: k8s-ppnt - security: - user: - name: participantUser - password: zb!XztG34 - autoconfigure: - exclude: > - org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration, - org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration, - org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration -security: - enable-csrf: false - -participant: - localChartDirectory: /home/policy/local-charts - infoFileName: CHART_INFO.json - intermediaryParameters: - reportingTimeIntervalMs: 120000 - description: Participant Description - participantId: 101c62b3-8918-41b9-a747-d21eb79c6c02 - topics: - operationTopic: policy-acruntime-participant - syncTopic: acm-ppnt-sync - clampAutomationCompositionTopics: - topicSources: - - - topic: ${participant.intermediaryParameters.topics.operationTopic} - servers: - - ${topicServer:kafka:9092} - topicCommInfrastructure: kafka - fetchTimeout: 15000 - useHttps: false - allowTracing: true - additionalProps: - group.id: policy-clamp-ac-k8s-ppnt - - - topic: ${participant.intermediaryParameters.topics.syncTopic} - servers: - - ${topicServer:kafka:9092} - topicCommInfrastructure: kafka - additionalProps: - group.id: k8s-ppnt - security.protocol: PLAINTEXT - fetchTimeout: 15000 - useHttps: false - allowTracing: true - topicSinks: - - - topic: ${participant.intermediaryParameters.topics.operationTopic} - servers: - - ${topicServer:kafka:9092} - topicCommInfrastructure: kafka - additionalProps: - group.id: k8s-ppnt - security.protocol: PLAINTEXT - useHttps: false - allowTracing: true - participantSupportedElementTypes: - - typeName: org.onap.policy.clamp.acm.K8SMicroserviceAutomationCompositionElement - typeVersion: 1.0.0 - -management: - endpoints: - web: - exposure: - include: health, metrics, prometheus - endpoint: - health: - access: unrestricted - show-details: always - probes: - enabled: true - show-components: always - -server: - port: 6969 - ssl: - enabled: false - servlet: - context-path: /onap/policy/clamp/acm/k8sparticipant - -logging: - # Configuration of logging - level: - ROOT: ERROR - org.springframework: ERROR - org.springframework.data: ERROR - org.springframework.web.reactive.function.client.ExchangeFunctions: ERROR - org.onap.policy.clamp.acm.participant.kubernetes: INFO - file: - name: /var/log/onap/policy/clamp/application.log - -chart: - api: - enabled: false - -# legacy config ---- - -spring: - config: - activate: - on-profile: legacy -participant: - intermediaryParameters: - reportingTimeIntervalMs: 120000 - participantId: 101c62b3-8918-41b9-a747-d21eb79c6c02 - clampAutomationCompositionTopics: - topicSources: - - - topic: policy-acruntime-participant - servers: - - ${topicServer:kafka:9092} - topicCommInfrastructure: kafka - fetchTimeout: 15000 - useHttps: false - topicSinks: - - - topic: policy-acruntime-participant - servers: - - ${topicServer:kafka:9092} - topicCommInfrastructure: kafka - useHttps: false diff --git a/compose/config/clamp/PolicyParticipantParameters.yaml b/compose/config/clamp/PolicyParticipantParameters.yaml deleted file mode 100644 index bcc76f70..00000000 --- a/compose/config/clamp/PolicyParticipantParameters.yaml +++ /dev/null @@ -1,122 +0,0 @@ -spring: - application: - name: policy-ppnt - security: - user: - name: participantUser - password: zb!XztG34 - autoconfigure: - exclude: > - org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration, - org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration, - org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration -participant: - pdpGroup: defaultGroup - pdpType: apex - policyApiParameters: - clientName: api - hostname: policy-api - port: 6969 - userName: policyadmin - password: zb!XztG34 - useHttps: false - allowSelfSignedCerts: true - policyPapParameters: - clientName: pap - hostname: policy-pap - port: 6969 - userName: policyadmin - password: zb!XztG34 - useHttps: false - allowSelfSignedCerts: true - intermediaryParameters: - reportingTimeIntervalMs: 120000 - description: Participant Description - participantId: 101c62b3-8918-41b9-a747-d21eb79c6c03 - topics: - operationTopic: policy-acruntime-participant - syncTopic: acm-ppnt-sync - clampAutomationCompositionTopics: - topicSources: - - - topic: ${participant.intermediaryParameters.topics.operationTopic} - servers: - - ${topicServer:kafka:9092} - topicCommInfrastructure: kafka - fetchTimeout: 15000 - useHttps: false - allowTracing: true - additionalProps: - group.id: policy-clamp-ac-pf-ppnt - - - topic: ${participant.intermediaryParameters.topics.syncTopic} - servers: - - ${topicServer:kafka:9092} - topicCommInfrastructure: kafka - additionalProps: - group.id: policy-ppnt - security.protocol: PLAINTEXT - fetchTimeout: 15000 - useHttps: false - allowTracing: true - topicSinks: - - - topic: ${participant.intermediaryParameters.topics.operationTopic} - servers: - - ${topicServer:kafka:9092} - topicCommInfrastructure: kafka - additionalProps: - group.id: policy-ppnt - security.protocol: PLAINTEXT - useHttps: false - allowTracing: true - participantSupportedElementTypes: - - typeName: org.onap.policy.clamp.acm.PolicyAutomationCompositionElement - typeVersion: 1.0.0 -management: - endpoints: - web: - exposure: - include: health, metrics, prometheus - endpoint: - health: - access: unrestricted - show-details: always - probes: - enabled: true - show-components: always - -server: - port: 6969 - ssl: - enabled: false - servlet: - context-path: /onap/policy/clamp/acm/policyparticipant - -# legacy config ---- - -spring: - config: - activate: - on-profile: legacy -participant: - intermediaryParameters: - reportingTimeIntervalMs: 120000 - participantId: 101c62b3-8918-41b9-a747-d21eb79c6c03 - clampAutomationCompositionTopics: - topicSources: - - - topic: policy-acruntime-participant - servers: - - ${topicServer:kafka:9092} - topicCommInfrastructure: kafka - fetchTimeout: 15000 - useHttps: false - topicSinks: - - - topic: policy-acruntime-participant - servers: - - ${topicServer:kafka:9092} - topicCommInfrastructure: kafka - useHttps: false diff --git a/compose/config/clamp/SimulatorParticipantParameters.yaml b/compose/config/clamp/SimulatorParticipantParameters.yaml deleted file mode 100644 index b02c8646..00000000 --- a/compose/config/clamp/SimulatorParticipantParameters.yaml +++ /dev/null @@ -1,114 +0,0 @@ -spring: - application: - name: ${applicationName} - security: - user: - name: participantUser - password: zb!XztG34 - autoconfigure: - exclude: - - org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration - - org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration - - org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration - - org.springframework.boot.autoconfigure.data.web.SpringDataWebAutoConfiguration - -security: - enable-csrf: false -participant: - intermediaryParameters: - reportingTimeIntervalMs: 120000 - description: Participant Description - participantId: ${participantId} - topics: - operationTopic: policy-acruntime-participant - syncTopic: acm-ppnt-sync - clampAutomationCompositionTopics: - topicSources: - - topic: ${participant.intermediaryParameters.topics.operationTopic} - servers: - - kafka:9092 - topicCommInfrastructure: kafka - fetchTimeout: 15000 - useHttps: false - allowTracing: true - additionalProps: - group.id: ${groupId} - - topic: ${participant.intermediaryParameters.topics.syncTopic} - servers: - - kafka:9092 - topicCommInfrastructure: kafka - fetchTimeout: 15000 - useHttps: false - allowTracing: true - topicSinks: - - topic: ${participant.intermediaryParameters.topics.operationTopic} - servers: - - kafka:9092 - topicCommInfrastructure: kafka - useHttps: false - allowTracing: true - participantSupportedElementTypes: - - - typeName: ${supportedElementTypeName} - typeVersion: ${supportedElementTypeVersion:1.0.0} - -management: - tracing: - propagation: - produce: B3 - sampling: - probability: 1.0 - endpoints: - web: - base-path: / - exposure: - include: health, metrics, prometheus - endpoint: - health: - access: unrestricted - show-details: always - probes: - enabled: true - show-components: always - -server: - port: 6969 - ssl: - enabled: false - servlet: - context-path: /onap/policy/simparticipant - -tracing: - enabled: true - exporter: - endpoint: http://jaeger:4318/v1/traces - protocol: http - sampler: - jaeger-remote: - endpoint: http://jaeger:14250 - -# legacy config ---- - -spring: - config: - activate: - on-profile: legacy -participant: - intermediaryParameters: - reportingTimeIntervalMs: 120000 - participantId: ${participantId:101c62b3-8918-41b9-a747-d21eb79c6c90} - clampAutomationCompositionTopics: - topicSources: - - topic: policy-acruntime-participant - servers: - - kafka:9092 - topicCommInfrastructure: kafka - fetchTimeout: 15000 - useHttps: false - topicSinks: - - topic: policy-acruntime-participant - servers: - - kafka:9092 - topicCommInfrastructure: kafka - useHttps: false diff --git a/helm/policy/components/policy-clamp-ac-a1pms-ppnt/resources/config/A1pmsParticipantParameters.yaml b/helm/policy/components/policy-clamp-ac-a1pms-ppnt/resources/config/A1pmsParticipantParameters.yaml deleted file mode 100755 index 31c7859a..00000000 --- a/helm/policy/components/policy-clamp-ac-a1pms-ppnt/resources/config/A1pmsParticipantParameters.yaml +++ /dev/null @@ -1,105 +0,0 @@ -# ============LICENSE_START======================================================= -# Copyright (C) 2023-2025 OpenInfra Foundation Europe. All rights reserved. -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 - -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# SPDX-License-Identifier: Apache-2.0 -# ============LICENSE_END========================================================= - -spring: - application: - name: {{ .Values.applicationName }} - security: - user: - name: participantUser - password: zb!XztG34 - autoconfigure: - exclude: - - org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration - - org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration - - org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration - - org.springframework.boot.autoconfigure.data.web.SpringDataWebAutoConfiguration -security: - enable-csrf: false - -a1pms: - baseUrl: {{ .Values.a1pms.baseUrl }} - headers: - content-type: application/json - endpoints: - health: /a1-policy/v2/rics - services: /a1-policy/v2/services - service: /a1-policy/v2/services/{service_id} - -participant: - intermediaryParameters: - topics: - operationTopic: policy-acruntime-participant - syncTopic: acm-ppnt-sync - reportingTimeIntervalMs: 120000 - description: Participant Description - participantId: 101c62b3-8918-41b9-a747-d21eb79c6c00 - clampAutomationCompositionTopics: - topicSources: - - topic: ${participant.intermediaryParameters.topics.operationTopic} - servers: - - "{{ .Values.global.kafkaServer }}:9092" - topicCommInfrastructure: kafka - fetchTimeout: 15000 - allowTracing: {{ include "policy-clamp-ac-a1pms-ppnt.jaeger-enabled" . }} - additionalProps: - group.id: policy-clamp-ac-a1pms-ppnt - - topic: ${participant.intermediaryParameters.topics.syncTopic} - servers: - - "{{ .Values.global.kafkaServer }}:9092" - topicCommInfrastructure: kafka - fetchTimeout: 15000 - allowTracing: {{ include "policy-clamp-ac-a1pms-ppnt.jaeger-enabled" . }} - topicSinks: - - topic: ${participant.intermediaryParameters.topics.operationTopic} - servers: - - "{{ .Values.global.kafkaServer }}:9092" - topicCommInfrastructure: kafka - allowTracing: {{ include "policy-clamp-ac-a1pms-ppnt.jaeger-enabled" . }} - participantSupportedElementTypes: - - - typeName: org.onap.policy.clamp.acm.A1PMSAutomationCompositionElement - typeVersion: 1.0.1 - -management: - tracing: - propagation: - produce: [{{ .Values.jaeger.producer.type }}] - sampling: - probability: {{ .Values.jaeger.sampling.probability }} - endpoints: - web: - base-path: / - exposure: - include: health, metrics, prometheus -server: - port: 8086 - servlet: - context-path: /onap/policy/clamp/acm/a1pmsparticipant - ssl: - enabled: false - -tracing: - enabled: {{ .Values.jaeger.enabled }} - exporter: - endpoint: "{{ .Values.jaeger.collector.host }}:{{ include "policy-clamp-ac-a1pms-ppnt.exporter-port" . }}" - protocol: {{ .Values.jaeger.collector.protocol }} - sampler: - jaeger-remote: - endpoint: "{{ .Values.jaeger.collector.host }}:{{ .Values.jaeger.collector.portJaegerGrpc }}" - - diff --git a/helm/policy/components/policy-clamp-ac-a1pms-ppnt/resources/config/a1pms-participant.sh b/helm/policy/components/policy-clamp-ac-a1pms-ppnt/resources/config/a1pms-participant.sh deleted file mode 100644 index 88ff3b88..00000000 --- a/helm/policy/components/policy-clamp-ac-a1pms-ppnt/resources/config/a1pms-participant.sh +++ /dev/null @@ -1,60 +0,0 @@ -#!/usr/bin/env sh -# -# ============LICENSE_START======================================================= -# Copyright (C) 2024 Nordix Foundation. -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# SPDX-License-Identifier: Apache-2.0 -# ============LICENSE_END========================================================= -# - -KEYSTORE="${KEYSTORE:-$POLICY_HOME/etc/ssl/policy-keystore}" -TRUSTSTORE="${TRUSTSTORE:-$POLICY_HOME/etc/ssl/policy-truststore}" -KEYSTORE_PASSWD="${KEYSTORE_PASSWD:-Pol1cy_0nap}" -TRUSTSTORE_PASSWD="${TRUSTSTORE_PASSWD:-Pol1cy_0nap}" - -if [ "$#" -eq 1 ]; then - CONFIG_FILE=$1 -fi - -if [ -z "$CONFIG_FILE" ]; then - CONFIG_FILE="${POLICY_HOME}/etc/A1pmsParticipantParameters.yaml" -fi - -echo "Policy clamp A1 Pms participant config file: $CONFIG_FILE" - -if [ -f "${POLICY_HOME}/etc/mounted/policy-truststore" ]; then - echo "overriding policy-truststore" - cp -f "${POLICY_HOME}"/etc/mounted/policy-truststore "${TRUSTSTORE}" -fi - -if [ -f "${POLICY_HOME}/etc/mounted/policy-keystore" ]; then - echo "overriding policy-keystore" - cp -f "${POLICY_HOME}"/etc/mounted/policy-keystore "${KEYSTORE}" -fi - -if [ -f "${POLICY_HOME}/etc/mounted/logback.xml" ]; then - echo "overriding logback xml file" - cp -f "${POLICY_HOME}"/etc/mounted/logback.xml "${POLICY_HOME}"/etc/ -fi - -$JAVA_HOME/bin/java \ - -Dlogging.config="${POLICY_HOME}/etc/logback.xml" \ - -Dserver.ssl.keyStore="${KEYSTORE}" \ - -Dserver.ssl.keyStorePassword="${KEYSTORE_PASSWD}" \ - -Djavax.net.ssl.trustStore="${TRUSTSTORE}" \ - -Djavax.net.ssl.trustStorePassword="${TRUSTSTORE_PASSWD}" \ - -Dotel.java.global-autoconfigure.enabled=true \ - -jar /app/app.jar \ - --spring.config.location="${CONFIG_FILE}" diff --git a/helm/policy/components/policy-clamp-ac-a1pms-ppnt/templates/deployment.yaml b/helm/policy/components/policy-clamp-ac-a1pms-ppnt/templates/deployment.yaml index bec288f5..ae5a050d 100755 --- a/helm/policy/components/policy-clamp-ac-a1pms-ppnt/templates/deployment.yaml +++ b/helm/policy/components/policy-clamp-ac-a1pms-ppnt/templates/deployment.yaml @@ -1,6 +1,6 @@ {{/* # ============LICENSE_START======================================================= -# Copyright (C) 2023-2024 Nordix Foundation. +# Copyright (C) 2023-2025 OpenInfra Foundation Europe. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -50,19 +50,6 @@ spec: args: - -c - "cd /config-input && for PFILE in `ls -1`; do envsubst <${PFILE} >/config/${PFILE}; done" - env: - - name: RESTSERVER_USER - valueFrom: - secretKeyRef: - name: {{ .Chart.Name }}-restserver-secret - key: login - - - name: RESTSERVER_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Chart.Name }}-restserver-secret - key: password - volumeMounts: - mountPath: /config-input name: ac-a1pms-ppnt-config @@ -76,10 +63,39 @@ spec: image: {{ .Values.global.repository }}/{{ .Values.global.image.a1pmsparticipant }} imagePullPolicy: {{ .Values.global.pullPolicy }} command: ["/opt/app/policy/clamp/bin/a1pms-participant.sh"] - args: ["/opt/app/policy/clamp/etc/mounted/A1pmsParticipantParameters.yaml"] + env: + - name: HTTP_USER + valueFrom: + secretKeyRef: + name: {{ .Chart.Name }}-restserver-secret + key: login + - name: HTTP_PASSWORD + valueFrom: + secretKeyRef: + name: {{ .Chart.Name }}-restserver-secret + key: password + - name: SERVER_PORT + value: "8086" + - name: a1pmsBaseUrl + value: {{ .Values.a1pms.baseUrl }} + - name: topicCommInfrastructure + value: kafka + - name: kafkaServer + value: "{{ .Values.global.kafkaServer }}:9092" {{- $jaegerEnabled := tpl "policy-clamp-ac-a1pms-ppnt.jaeger-enabled" . | trimSuffix "\n" -}} {{- if $jaegerEnabled }} - env: + - name: allowTracing + value: "true" + - name: jaegerProducerType + value: {{ .Values.jaeger.producer.type | quote }} + - name: jaegerSamplingProbability + value: {{ .Values.jaeger.sampling.probability | quote }} + - name: tracingExporterEndpoint + value: "{{ .Values.jaeger.collector.host }}:{{ include "policy-clamp-ac-a1pms-ppnt.exporter-port" . }}" + - name: tracingExporterProtocol + value: {{ .Values.jaeger.collector.protocol }} + - name: tracingSamplerEndpoint + value: "{{ .Values.jaeger.collector.host }}:{{ .Values.jaeger.collector.portJaegerGrpc }}" - name: OTEL_SERVICE_NAME value: {{ .Values.applicationName }} - name: OTEL_EXPORTER_OTLP_PROTOCOL @@ -88,6 +104,8 @@ spec: value: {{ include "policy-clamp-ac-a1pms-ppnt.jaeger-protocol" . }} - name: OTEL_EXPORTER_OTLP_ENDPOINT value: {{ printf "%s:%s" (.Values.jaeger.collector.host) (include "policy-clamp-ac-a1pms-ppnt.exporter-port" .) }} + - name: OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED + value: "true" {{- end }} ports: - containerPort: 8086 @@ -112,9 +130,6 @@ spec: readOnly: true - mountPath: /opt/app/policy/clamp/etc/mounted name: ac-a1pms-ppnt-config-processed - - mountPath: /opt/app/policy/clamp/bin/a1pms-participant.sh - name: ac-a1pms-ppnt-config - subPath: a1pms-participant.sh resources: {{ toYaml .Values.resources.small | indent 12 }} {{- if .Values.nodeSelector }} diff --git a/helm/policy/components/policy-clamp-ac-a1pms-ppnt/values.yaml b/helm/policy/components/policy-clamp-ac-a1pms-ppnt/values.yaml index c70dec3b..a0ac398f 100755 --- a/helm/policy/components/policy-clamp-ac-a1pms-ppnt/values.yaml +++ b/helm/policy/components/policy-clamp-ac-a1pms-ppnt/values.yaml @@ -89,7 +89,7 @@ jaeger: sampling: probability: "1.0" producer: - type: B3,W3C,B3_MULTI + type: "[B3,W3C,B3_MULTI]" collector: protocol: grpc host: "http://jaeger" diff --git a/helm/policy/components/policy-clamp-ac-http-ppnt/resources/config/HttpParticipantParameters.yaml b/helm/policy/components/policy-clamp-ac-http-ppnt/resources/config/HttpParticipantParameters.yaml deleted file mode 100644 index db10b4a4..00000000 --- a/helm/policy/components/policy-clamp-ac-http-ppnt/resources/config/HttpParticipantParameters.yaml +++ /dev/null @@ -1,99 +0,0 @@ -# ============LICENSE_START======================================================= -# Copyright (C) 2023-2025 Nordix Foundation. -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# SPDX-License-Identifier: Apache-2.0 -# ============LICENSE_END========================================================= - -spring: - application: - name: {{ .Values.applicationName }} - autoconfigure: - exclude: > - org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration, - org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration, - org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration - security: - user: - name: ${RESTSERVER_USER} - password: ${RESTSERVER_PASSWORD} - -security: - enable-csrf: false - -participant: - intermediaryParameters: - topics: - operationTopic: policy-acruntime-participant - syncTopic: acm-ppnt-sync - reportingTimeIntervalMs: 120000 - description: Participant Description - participantId: 101c62b3-8918-41b9-a747-d21eb79c6c01 - clampAutomationCompositionTopics: - topicSources: - - topic: ${participant.intermediaryParameters.topics.operationTopic} - servers: - - "{{ .Values.global.kafkaServer }}:9092" - topicCommInfrastructure: kafka - fetchTimeout: 15000 - useHttps: false - allowTracing: {{ include "policy-clamp-ac-http-ppnt.jaeger-enabled" . }} - additionalProps: - group.id: policy-clamp-ac-http-ppnt - - topic: ${participant.intermediaryParameters.topics.syncTopic} - servers: - - "{{ .Values.global.kafkaServer }}:9092" - topicCommInfrastructure: kafka - fetchTimeout: 15000 - useHttps: false - allowTracing: {{ include "policy-clamp-ac-http-ppnt.jaeger-enabled" . }} - topicSinks: - - topic: ${participant.intermediaryParameters.topics.operationTopic} - servers: - - "{{ .Values.global.kafkaServer }}:9092" - topicCommInfrastructure: kafka - useHttps: false - allowTracing: {{ include "policy-clamp-ac-http-ppnt.jaeger-enabled" . }} - participantSupportedElementTypes: - - - typeName: org.onap.policy.clamp.acm.HttpAutomationCompositionElement - typeVersion: 1.0.0 - -management: - tracing: - propagation: - produce: [{{ .Values.jaeger.producer.type }}] - sampling: - probability: {{ .Values.jaeger.sampling.probability }} - endpoints: - web: - base-path: / - exposure: - include: health, metrics, prometheus -server: - port: 8084 - servlet: - context-path: /onap/httpparticipant - ssl: - enabled: false - - -tracing: - enabled: {{ .Values.jaeger.enabled }} - exporter: - endpoint: "{{ .Values.jaeger.collector.host }}:{{ include "policy-clamp-ac-http-ppnt.exporter-port" . }}" - protocol: {{ .Values.jaeger.collector.protocol }} - sampler: - jaeger-remote: - endpoint: "{{ .Values.jaeger.collector.host }}:{{ .Values.jaeger.collector.portJaegerGrpc }}" \ No newline at end of file diff --git a/helm/policy/components/policy-clamp-ac-http-ppnt/resources/config/http-participant.sh b/helm/policy/components/policy-clamp-ac-http-ppnt/resources/config/http-participant.sh deleted file mode 100755 index e35fb868..00000000 --- a/helm/policy/components/policy-clamp-ac-http-ppnt/resources/config/http-participant.sh +++ /dev/null @@ -1,60 +0,0 @@ -#!/usr/bin/env sh -# -# ============LICENSE_START======================================================= -# Copyright (C) 2024 Nordix Foundation. -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# SPDX-License-Identifier: Apache-2.0 -# ============LICENSE_END========================================================= -# - -KEYSTORE="${KEYSTORE:-$POLICY_HOME/etc/ssl/policy-keystore}" -TRUSTSTORE="${TRUSTSTORE:-$POLICY_HOME/etc/ssl/policy-truststore}" -KEYSTORE_PASSWD="${KEYSTORE_PASSWD:-Pol1cy_0nap}" -TRUSTSTORE_PASSWD="${TRUSTSTORE_PASSWD:-Pol1cy_0nap}" - -if [ "$#" -eq 1 ]; then - CONFIG_FILE=$1 -fi - -if [ -z "$CONFIG_FILE" ]; then - CONFIG_FILE="${POLICY_HOME}/etc/HttpParticipantParameters.yaml" -fi - -echo "Policy clamp HTTP participant config file: $CONFIG_FILE" - -if [ -f "${POLICY_HOME}/etc/mounted/policy-truststore" ]; then - echo "overriding policy-truststore" - cp -f "${POLICY_HOME}"/etc/mounted/policy-truststore "${TRUSTSTORE}" -fi - -if [ -f "${POLICY_HOME}/etc/mounted/policy-keystore" ]; then - echo "overriding policy-keystore" - cp -f "${POLICY_HOME}"/etc/mounted/policy-keystore "${KEYSTORE}" -fi - -if [ -f "${POLICY_HOME}/etc/mounted/logback.xml" ]; then - echo "overriding logback xml file" - cp -f "${POLICY_HOME}"/etc/mounted/logback.xml "${POLICY_HOME}"/etc/ -fi - -$JAVA_HOME/bin/java \ - -Dlogging.config="${POLICY_HOME}/etc/logback.xml" \ - -Dserver.ssl.keyStore="${KEYSTORE}" \ - -Dserver.ssl.keyStorePassword="${KEYSTORE_PASSWD}" \ - -Djavax.net.ssl.trustStore="${TRUSTSTORE}" \ - -Djavax.net.ssl.trustStorePassword="${TRUSTSTORE_PASSWD}" \ - -Dotel.java.global-autoconfigure.enabled=true \ - -jar /app/app.jar \ - --spring.config.location="${CONFIG_FILE}" diff --git a/helm/policy/components/policy-clamp-ac-http-ppnt/templates/deployment.yaml b/helm/policy/components/policy-clamp-ac-http-ppnt/templates/deployment.yaml index 1cb3e9e3..ba31299b 100644 --- a/helm/policy/components/policy-clamp-ac-http-ppnt/templates/deployment.yaml +++ b/helm/policy/components/policy-clamp-ac-http-ppnt/templates/deployment.yaml @@ -1,6 +1,6 @@ {{/* # ============LICENSE_START======================================================= -# Copyright (C) 2023-2024 Nordix Foundation. +# Copyright (C) 2023-2025 OpenInfra Foundation Europe. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -49,18 +49,6 @@ spec: args: - -c - "cd /config-input && for PFILE in `ls -1`; do envsubst <${PFILE} >/config/${PFILE}; done" - env: - - name: RESTSERVER_USER - valueFrom: - secretKeyRef: - name: {{ .Chart.Name }}-restserver-secret - key: login - - name: RESTSERVER_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Chart.Name }}-restserver-secret - key: password - volumeMounts: - mountPath: /config-input name: ac-http-ppnt-config @@ -74,10 +62,37 @@ spec: image: {{ .Values.global.repository }}/{{ .Values.global.image.httpparticipant }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} command: ["/opt/app/policy/clamp/bin/http-participant.sh"] - args: ["/opt/app/policy/clamp/etc/mounted/HttpParticipantParameters.yaml"] + env: + - name: HTTP_USER + valueFrom: + secretKeyRef: + name: {{ .Chart.Name }}-restserver-secret + key: login + - name: HTTP_PASSWORD + valueFrom: + secretKeyRef: + name: {{ .Chart.Name }}-restserver-secret + key: password + - name: SERVER_PORT + value: "8084" + - name: topicCommInfrastructure + value: kafka + - name: kafkaServer + value: "{{ .Values.global.kafkaServer }}:9092" {{- $jaegerEnabled := tpl "policy-clamp-ac-http-ppnt.jaeger-enabled" . | trimSuffix "\n" -}} {{- if $jaegerEnabled }} - env: + - name: allowTracing + value: "true" + - name: jaegerProducerType + value: {{ .Values.jaeger.producer.type | quote }} + - name: jaegerSamplingProbability + value: {{ .Values.jaeger.sampling.probability | quote }} + - name: tracingExporterEndpoint + value: {{ .Values.jaeger.collector.host }}:{{ include "policy-clamp-ac-http-ppnt.exporter-port" . }} + - name: tracingExporterProtocol + value: {{ .Values.jaeger.collector.protocol }} + - name: tracingSamplerEndpoint + value: "{{ .Values.jaeger.collector.host }}:{{ .Values.jaeger.collector.portJaegerGrpc }}" - name: OTEL_SERVICE_NAME value: {{ .Values.applicationName }} - name: OTEL_EXPORTER_OTLP_PROTOCOL @@ -86,6 +101,8 @@ spec: value: {{ include "policy-clamp-ac-http-ppnt.jaeger-protocol" . }} - name: OTEL_EXPORTER_OTLP_ENDPOINT value: {{ printf "%s:%s" (.Values.jaeger.collector.host) (include "policy-clamp-ac-http-ppnt.exporter-port" .) }} + - name: OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED + value: "true" {{- end }} ports: - containerPort: 8084 @@ -110,9 +127,6 @@ spec: readOnly: true - mountPath: /opt/app/policy/clamp/etc/mounted name: ac-http-ppnt-config-processed - - mountPath: /opt/app/policy/clamp/bin/http-participant.sh - name: ac-http-ppnt-config - subPath: http-participant.sh resources: {{ toYaml .Values.resources.small | indent 12 }} {{- if .Values.nodeSelector }} diff --git a/helm/policy/components/policy-clamp-ac-http-ppnt/values.yaml b/helm/policy/components/policy-clamp-ac-http-ppnt/values.yaml index 82686b55..441df438 100644 --- a/helm/policy/components/policy-clamp-ac-http-ppnt/values.yaml +++ b/helm/policy/components/policy-clamp-ac-http-ppnt/values.yaml @@ -1,5 +1,5 @@ # ============LICENSE_START======================================================= -# Copyright (C) 2023-2024 Nordix Foundation. +# Copyright (C) 2023-2025 OpenInfra Foundation Europe. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -96,7 +96,7 @@ jaeger: sampling: probability: "1.0" producer: - type: B3,W3C,B3_MULTI + type: "[B3,W3C,B3_MULTI]" collector: protocol: grpc host: "http://jaeger" @@ -104,4 +104,4 @@ jaeger: portOtlpHttp: 4318 portJaegerGrpc: 14250 -applicationName: http-ppnt \ No newline at end of file +applicationName: http-ppnt diff --git a/helm/policy/components/policy-clamp-ac-kserve-ppnt/resources/config/KserveParticipantParameters.yaml b/helm/policy/components/policy-clamp-ac-kserve-ppnt/resources/config/KserveParticipantParameters.yaml deleted file mode 100755 index 60eb6296..00000000 --- a/helm/policy/components/policy-clamp-ac-kserve-ppnt/resources/config/KserveParticipantParameters.yaml +++ /dev/null @@ -1,109 +0,0 @@ -# ============LICENSE_START======================================================= -# Copyright (C) 2023-2025 Nordix Foundation. All rights reserved. -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 - -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# SPDX-License-Identifier: Apache-2.0 -# ============LICENSE_END========================================================= - -spring: - application: - name: kserve-ppnt - cloud: - kubernetes: - enabled: false - discovery: - enabled: false - security: - user: - name: ${RESTSERVER_USER} - password: ${RESTSERVER_PASSWORD} - autoconfigure: - exclude: - - org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration - - org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration - - org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration - - org.springframework.boot.autoconfigure.data.web.SpringDataWebAutoConfiguration - - io.kubernetes.client.spring.extended.manifests.config.KubernetesManifestsAutoConfiguration - - io.kubernetes.client.spring.extended.network.config.KubernetesLoadBalancerAutoConfiguration - -security: - enable-csrf: false - -participant: - intermediaryParameters: - topics: - operationTopic: policy-acruntime-participant - syncTopic: acm-ppnt-sync - reportingTimeIntervalMs: 120000 - description: Participant Description - participantId: 101c62b3-8918-41b9-a747-d21eb79c6c04 - clampAutomationCompositionTopics: - topicSources: - - topic: ${participant.intermediaryParameters.topics.operationTopic} - servers: - - "{{ .Values.global.kafkaServer }}:9092" - topicCommInfrastructure: kafka - fetchTimeout: 15000 - allowTracing: {{ include "policy-clamp-ac-kserve-ppnt.jaeger-enabled" . }} - additionalProps: - group.id: policy-clamp-ac-kserve-ppnt - - topic: ${participant.intermediaryParameters.topics.syncTopic} - servers: - - "{{ .Values.global.kafkaServer }}:9092" - topicCommInfrastructure: kafka - allowTracing: {{ include "policy-clamp-ac-kserve-ppnt.jaeger-enabled" . }} - fetchTimeout: 15000 - topicSinks: - - topic: ${participant.intermediaryParameters.topics.operationTopic} - servers: - - "{{ .Values.global.kafkaServer }}:9092" - topicCommInfrastructure: kafka - allowTracing: {{ include "policy-clamp-ac-kserve-ppnt.jaeger-enabled" . }} - participantSupportedElementTypes: - - - typeName: org.onap.policy.clamp.acm.KserveAutomationCompositionElement - typeVersion: 1.0.1 - -customresourcedefinition: - group: serving.kserve.io - version: v1beta1 - plural: inferenceservices - grace-period: 10 - -management: - tracing: - propagation: - produce: [{{ .Values.jaeger.producer.type }}] - sampling: - probability: {{ .Values.jaeger.sampling.probability }} - endpoints: - web: - base-path: / - exposure: - include: health, metrics, prometheus -server: - port: 8087 - servlet: - context-path: /onap/policy/clamp/acm/kserveparticipant - ssl: - enabled: false - - -tracing: - enabled: {{ .Values.jaeger.enabled }} - exporter: - endpoint: "{{ .Values.jaeger.collector.host }}:{{ include "policy-clamp-ac-kserve-ppnt.exporter-port" . }}" - protocol: {{ .Values.jaeger.collector.protocol }} - sampler: - jaeger-remote: - endpoint: "{{ .Values.jaeger.collector.host }}:{{ .Values.jaeger.collector.portJaegerGrpc }}" diff --git a/helm/policy/components/policy-clamp-ac-kserve-ppnt/resources/config/kserve-participant.sh b/helm/policy/components/policy-clamp-ac-kserve-ppnt/resources/config/kserve-participant.sh deleted file mode 100644 index 7da0b0f6..00000000 --- a/helm/policy/components/policy-clamp-ac-kserve-ppnt/resources/config/kserve-participant.sh +++ /dev/null @@ -1,60 +0,0 @@ -#!/usr/bin/env sh -# -# ============LICENSE_START======================================================= -# Copyright (C) 2024 Nordix Foundation. -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# SPDX-License-Identifier: Apache-2.0 -# ============LICENSE_END========================================================= -# - -KEYSTORE="${KEYSTORE:-$POLICY_HOME/etc/ssl/policy-keystore}" -TRUSTSTORE="${TRUSTSTORE:-$POLICY_HOME/etc/ssl/policy-truststore}" -KEYSTORE_PASSWD="${KEYSTORE_PASSWD:-Pol1cy_0nap}" -TRUSTSTORE_PASSWD="${TRUSTSTORE_PASSWD:-Pol1cy_0nap}" - -if [ "$#" -eq 1 ]; then - CONFIG_FILE=$1 -fi - -if [ -z "$CONFIG_FILE" ]; then - CONFIG_FILE="${POLICY_HOME}/etc/KserveParticipantParameters.yaml" -fi - -echo "Policy clamp Kserve participant config file: $CONFIG_FILE" - -if [ -f "${POLICY_HOME}/etc/mounted/policy-truststore" ]; then - echo "overriding policy-truststore" - cp -f "${POLICY_HOME}"/etc/mounted/policy-truststore "${TRUSTSTORE}" -fi - -if [ -f "${POLICY_HOME}/etc/mounted/policy-keystore" ]; then - echo "overriding policy-keystore" - cp -f "${POLICY_HOME}"/etc/mounted/policy-keystore "${KEYSTORE}" -fi - -if [ -f "${POLICY_HOME}/etc/mounted/logback.xml" ]; then - echo "overriding logback xml file" - cp -f "${POLICY_HOME}"/etc/mounted/logback.xml "${POLICY_HOME}"/etc/ -fi - -$JAVA_HOME/bin/java \ - -Dlogging.config="${POLICY_HOME}/etc/logback.xml" \ - -Dserver.ssl.keyStore="${KEYSTORE}" \ - -Dserver.ssl.keyStorePassword="${KEYSTORE_PASSWD}" \ - -Djavax.net.ssl.trustStore="${TRUSTSTORE}" \ - -Djavax.net.ssl.trustStorePassword="${TRUSTSTORE_PASSWD}" \ - -Dotel.java.global-autoconfigure.enabled=true \ - -jar /app/app.jar \ - --spring.config.location="${CONFIG_FILE}" diff --git a/helm/policy/components/policy-clamp-ac-kserve-ppnt/templates/deployment.yaml b/helm/policy/components/policy-clamp-ac-kserve-ppnt/templates/deployment.yaml index f8f53287..3d3b3d7c 100755 --- a/helm/policy/components/policy-clamp-ac-kserve-ppnt/templates/deployment.yaml +++ b/helm/policy/components/policy-clamp-ac-kserve-ppnt/templates/deployment.yaml @@ -1,6 +1,6 @@ {{/* # ============LICENSE_START======================================================= -# Copyright (C) 2023-2024 Nordix Foundation. +# Copyright (C) 2023-2025 OpenInfra Foundation Europe. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -50,19 +50,6 @@ spec: args: - -c - "cd /config-input && for PFILE in `ls -1`; do envsubst <${PFILE} >/config/${PFILE}; done" - env: - - name: RESTSERVER_USER - valueFrom: - secretKeyRef: - name: {{ .Chart.Name }}-restserver-secret - key: login - - - name: RESTSERVER_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Chart.Name }}-restserver-secret - key: password - volumeMounts: - mountPath: /config-input name: ac-kserve-ppnt-config @@ -76,10 +63,37 @@ spec: image: {{ .Values.global.repository }}/{{ .Values.global.image.kserveparticipant }} imagePullPolicy: {{ .Values.global.pullPolicy }} command: ["/opt/app/policy/clamp/bin/kserve-participant.sh"] - args: ["/opt/app/policy/clamp/etc/mounted/KserveParticipantParameters.yaml"] + env: + - name: HTTP_USER + valueFrom: + secretKeyRef: + name: {{ .Chart.Name }}-restserver-secret + key: login + - name: HTTP_PASSWORD + valueFrom: + secretKeyRef: + name: {{ .Chart.Name }}-restserver-secret + key: password + - name: SERVER_PORT + value: "8087" + - name: topicCommInfrastructure + value: kafka + - name: kafkaServer + value: "{{ .Values.global.kafkaServer }}:9092" {{- $jaegerEnabled := tpl "policy-clamp-ac-kserve-ppnt.jaeger-enabled" . | trimSuffix "\n" -}} {{- if $jaegerEnabled }} - env: + - name: allowTracing + value: "true" + - name: jaegerProducerType + value: {{ .Values.jaeger.producer.type | quote }} + - name: jaegerSamplingProbability + value: {{ .Values.jaeger.sampling.probability | quote }} + - name: tracingExporterEndpoint + value: "{{ .Values.jaeger.collector.host }}:{{ include "policy-clamp-ac-kserve-ppnt.exporter-port" . }}" + - name: tracingExporterProtocol + value: {{ .Values.jaeger.collector.protocol }} + - name: tracingSamplerEndpoint + value: "{{ .Values.jaeger.collector.host }}:{{ .Values.jaeger.collector.portJaegerGrpc }}" - name: OTEL_SERVICE_NAME value: {{ .Values.applicationName }} - name: OTEL_EXPORTER_OTLP_PROTOCOL @@ -88,6 +102,8 @@ spec: value: {{ include "policy-clamp-ac-kserve-ppnt.jaeger-protocol" . }} - name: OTEL_EXPORTER_OTLP_ENDPOINT value: {{ printf "%s:%s" (.Values.jaeger.collector.host) (include "policy-clamp-ac-kserve-ppnt.exporter-port" .) }} + - name: OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED + value: "true" {{- end }} ports: - containerPort: 8087 @@ -112,9 +128,6 @@ spec: readOnly: true - mountPath: /opt/app/policy/clamp/etc/mounted name: ac-kserve-ppnt-config-processed - - mountPath: /opt/app/policy/clamp/bin/kserve-participant.sh - name: ac-kserve-ppnt-config - subPath: kserve-participant.sh resources: {{ toYaml .Values.resources.small | indent 12 }} {{- if .Values.nodeSelector }} diff --git a/helm/policy/components/policy-clamp-ac-kserve-ppnt/values.yaml b/helm/policy/components/policy-clamp-ac-kserve-ppnt/values.yaml index 0f354edf..6b8f1854 100755 --- a/helm/policy/components/policy-clamp-ac-kserve-ppnt/values.yaml +++ b/helm/policy/components/policy-clamp-ac-kserve-ppnt/values.yaml @@ -1,5 +1,5 @@ # ============LICENSE_START======================================================= -# Copyright (C) 2023-2024 Nordix Foundation. +# Copyright (C) 2023-2025 OpenInfra Foundation Europe. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -86,7 +86,7 @@ jaeger: sampling: probability: "1.0" producer: - type: B3,W3C,B3_MULTI + type: "[B3,W3C,B3_MULTI]" collector: protocol: grpc host: "http://jaeger" @@ -94,4 +94,4 @@ jaeger: portOtlpHttp: 4318 portJaegerGrpc: 14250 -applicationName: kserve-ppnt \ No newline at end of file +applicationName: kserve-ppnt diff --git a/helm/policy/components/policy-clamp-ac-pf-ppnt/resources/config/PolicyParticipantParameters.yaml b/helm/policy/components/policy-clamp-ac-pf-ppnt/resources/config/PolicyParticipantParameters.yaml deleted file mode 100644 index 51b9a0d7..00000000 --- a/helm/policy/components/policy-clamp-ac-pf-ppnt/resources/config/PolicyParticipantParameters.yaml +++ /dev/null @@ -1,120 +0,0 @@ -# ============LICENSE_START======================================================= -# Copyright (C) 2023-2025 Nordix Foundation. -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# SPDX-License-Identifier: Apache-2.0 -# ============LICENSE_END========================================================= - -spring: - application: - name: pf-ppnt - autoconfigure: - exclude: > - org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration, - org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration, - org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration - security: - user: - name: ${RESTSERVER_USER} - password: ${RESTSERVER_PASSWORD} - -security: - enable-csrf: false - -participant: - pdpGroup: defaultGroup - pdpType: apex - policyApiParameters: - clientName: api - hostname: policy-api - port: 6969 - userName: ${API_USER} - password: ${API_PASSWORD} - useHttps: false - allowSelfSignedCerts: true - policyPapParameters: - clientName: pap - hostname: policy-pap - port: 6969 - userName: ${PAP_USER} - password: ${PAP_PASSWORD} - useHttps: false - allowSelfSignedCerts: true - intermediaryParameters: - topics: - operationTopic: policy-acruntime-participant - syncTopic: acm-ppnt-sync - reportingTimeIntervalMs: 120000 - description: Participant Description - participantId: 101c62b3-8918-41b9-a747-d21eb79c6c03 - clampAutomationCompositionTopics: - topicSources: - - - topic: ${participant.intermediaryParameters.topics.operationTopic} - servers: - - "{{ .Values.global.kafkaServer }}:9092" - topicCommInfrastructure: kafka - fetchTimeout: 15000 - useHttps: false - allowTracing: {{ include "policy-clamp-ac-pf-ppnt.jaeger-enabled" . }} - additionalProps: - group.id: policy-clamp-ac-pf-ppnt - - - topic: ${participant.intermediaryParameters.topics.syncTopic} - servers: - - "{{ .Values.global.kafkaServer }}:9092" - topicCommInfrastructure: kafka - fetchTimeout: 15000 - useHttps: false - allowTracing: {{ include "policy-clamp-ac-pf-ppnt.jaeger-enabled" . }} - topicSinks: - - - topic: ${participant.intermediaryParameters.topics.operationTopic} - servers: - - "{{ .Values.global.kafkaServer }}:9092" - topicCommInfrastructure: kafka - useHttps: false - allowTracing: {{ include "policy-clamp-ac-pf-ppnt.jaeger-enabled" . }} - participantSupportedElementTypes: - - - typeName: org.onap.policy.clamp.acm.PolicyAutomationCompositionElement - typeVersion: 1.0.0 - -management: - tracing: - propagation: - produce: [{{ .Values.jaeger.producer.type }}] - sampling: - probability: {{ .Values.jaeger.sampling.probability }} - endpoints: - web: - base-path: / - exposure: - include: health, metrics, prometheus - -server: - port: 6969 - servlet: - context-path: /onap/policyparticipant - ssl: - enabled: false - -tracing: - enabled: {{ .Values.jaeger.enabled }} - exporter: - endpoint: "{{ .Values.jaeger.collector.host }}:{{ include "policy-clamp-ac-pf-ppnt.exporter-port" . }}" - protocol: {{ .Values.jaeger.collector.protocol }} - sampler: - jaeger-remote: - endpoint: "{{ .Values.jaeger.collector.host }}:{{ .Values.jaeger.collector.portJaegerGrpc }}" \ No newline at end of file diff --git a/helm/policy/components/policy-clamp-ac-pf-ppnt/resources/config/policy-participant.sh b/helm/policy/components/policy-clamp-ac-pf-ppnt/resources/config/policy-participant.sh deleted file mode 100755 index f36c2b37..00000000 --- a/helm/policy/components/policy-clamp-ac-pf-ppnt/resources/config/policy-participant.sh +++ /dev/null @@ -1,60 +0,0 @@ -#!/usr/bin/env sh -# -# ============LICENSE_START======================================================= -# Copyright (C) 2024 Nordix Foundation. -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# SPDX-License-Identifier: Apache-2.0 -# ============LICENSE_END========================================================= -# - -KEYSTORE="${KEYSTORE:-$POLICY_HOME/etc/ssl/policy-keystore}" -TRUSTSTORE="${TRUSTSTORE:-$POLICY_HOME/etc/ssl/policy-truststore}" -KEYSTORE_PASSWD="${KEYSTORE_PASSWD:-Pol1cy_0nap}" -TRUSTSTORE_PASSWD="${TRUSTSTORE_PASSWD:-Pol1cy_0nap}" - -if [ "$#" -eq 1 ]; then - CONFIG_FILE=$1 -fi - -if [ -z "$CONFIG_FILE" ]; then - CONFIG_FILE="${POLICY_HOME}/etc/PolicyParticipantParameters.yaml" -fi - -echo "Policy clamp policy participant config file: $CONFIG_FILE" - -if [ -f "${POLICY_HOME}/etc/mounted/policy-truststore" ]; then - echo "overriding policy-truststore" - cp -f "${POLICY_HOME}"/etc/mounted/policy-truststore "${TRUSTSTORE}" -fi - -if [ -f "${POLICY_HOME}/etc/mounted/policy-keystore" ]; then - echo "overriding policy-keystore" - cp -f "${POLICY_HOME}"/etc/mounted/policy-keystore "${KEYSTORE}" -fi - -if [ -f "${POLICY_HOME}/etc/mounted/logback.xml" ]; then - echo "overriding logback xml file" - cp -f "${POLICY_HOME}"/etc/mounted/logback.xml "${POLICY_HOME}"/etc/ -fi - -$JAVA_HOME/bin/java \ - -Dlogging.config="${POLICY_HOME}/etc/logback.xml" \ - -Dserver.ssl.keyStore="${KEYSTORE}" \ - -Dserver.ssl.keyStorePassword="${KEYSTORE_PASSWD}" \ - -Djavax.net.ssl.trustStore="${TRUSTSTORE}" \ - -Djavax.net.ssl.trustStorePassword="${TRUSTSTORE_PASSWD}" \ - -Dotel.java.global-autoconfigure.enabled=true \ - -jar /app/app.jar \ - --spring.config.location="${CONFIG_FILE}" diff --git a/helm/policy/components/policy-clamp-ac-pf-ppnt/templates/deployment.yaml b/helm/policy/components/policy-clamp-ac-pf-ppnt/templates/deployment.yaml index 7e921cbd..c640d384 100644 --- a/helm/policy/components/policy-clamp-ac-pf-ppnt/templates/deployment.yaml +++ b/helm/policy/components/policy-clamp-ac-pf-ppnt/templates/deployment.yaml @@ -1,6 +1,6 @@ {{/* # ============LICENSE_START======================================================= -# Copyright (C) 2023-2024 Nordix Foundation. +# Copyright (C) 2023-2025 OpenInfra Foundation Europe. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -49,38 +49,6 @@ spec: args: - -c - "cd /config-input && for PFILE in `ls -1`; do envsubst <${PFILE} >/config/${PFILE}; done" - env: - - name: API_USER - valueFrom: - secretKeyRef: - name: {{ .Chart.Name }}-api-secret - key: login - - name: API_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Chart.Name }}-api-secret - key: password - - name: PAP_USER - valueFrom: - secretKeyRef: - name: {{ .Chart.Name }}-pap-secret - key: login - - name: PAP_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Chart.Name }}-pap-secret - key: password - - name: RESTSERVER_USER - valueFrom: - secretKeyRef: - name: {{ .Chart.Name }}-restserver-secret - key: login - - name: RESTSERVER_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Chart.Name }}-restserver-secret - key: password - volumeMounts: - mountPath: /config-input name: ac-pf-ppnt-config @@ -94,10 +62,57 @@ spec: image: {{ .Values.global.repository }}/{{ .Values.global.image.pfparticipant }} imagePullPolicy: {{ .Values.global.pullPolicy }} command: ["/opt/app/policy/clamp/bin/policy-participant.sh"] - args: ["/opt/app/policy/clamp/etc/mounted/PolicyParticipantParameters.yaml"] + env: + - name: HTTP_USER + valueFrom: + secretKeyRef: + name: {{ .Chart.Name }}-restserver-secret + key: login + - name: HTTP_PASSWORD + valueFrom: + secretKeyRef: + name: {{ .Chart.Name }}-restserver-secret + key: password + - name: SERVER_PORT + value: "6969" + - name: API_USER + valueFrom: + secretKeyRef: + name: {{ .Chart.Name }}-api-secret + key: login + - name: API_PASSWORD + valueFrom: + secretKeyRef: + name: {{ .Chart.Name }}-api-secret + key: password + - name: PAP_USER + valueFrom: + secretKeyRef: + name: {{ .Chart.Name }}-pap-secret + key: login + - name: PAP_PASSWORD + valueFrom: + secretKeyRef: + name: {{ .Chart.Name }}-pap-secret + key: password + - name: topicCommInfrastructure + value: kafka + - name: kafkaServer + value: "{{ .Values.global.kafkaServer }}:9092" {{- $jaegerEnabled := tpl "policy-clamp-ac-pf-ppnt.jaeger-enabled" . | trimSuffix "\n" -}} {{- if $jaegerEnabled }} - env: + - name: allowTracing + value: "true" + - name: jaegerProducerType + value: {{ .Values.jaeger.producer.type | quote }} + - name: jaegerSamplingProbability + value: {{ .Values.jaeger.sampling.probability | quote }} + - name: tracingExporterEndpoint + value: {{ .Values.jaeger.collector.host }}:{{ include "policy-clamp-ac-pf-ppnt.exporter-port" . }} + - name: tracingExporterProtocol + value: {{ .Values.jaeger.collector.protocol }} + - name: tracingSamplerEndpoint + value: "{{ .Values.jaeger.collector.host }}:{{ .Values.jaeger.collector.portJaegerGrpc }}" - name: OTEL_SERVICE_NAME value: {{ .Values.applicationName }} - name: OTEL_EXPORTER_OTLP_PROTOCOL @@ -106,10 +121,12 @@ spec: value: {{ include "policy-clamp-ac-pf-ppnt.jaeger-protocol" . }} - name: OTEL_EXPORTER_OTLP_ENDPOINT value: {{ printf "%s:%s" (.Values.jaeger.collector.host) (include "policy-clamp-ac-pf-ppnt.exporter-port" .) }} + - name: OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED + value: "true" {{- end }} ports: - containerPort: 6969 - name: http-api + name: pf-api # disable liveness probe when breakpoints set in debugger # so K8s doesn't restart unresponsive container {{- if eq .Values.liveness.enabled true }} @@ -130,9 +147,6 @@ spec: readOnly: true - mountPath: /opt/app/policy/clamp/etc/mounted name: ac-pf-ppnt-config-processed - - mountPath: /opt/app/policy/clamp/bin/policy-participant.sh - name: ac-pf-ppnt-config - subPath: policy-participant.sh resources: {{ toYaml .Values.resources.small | indent 12 }} {{- if .Values.nodeSelector }} diff --git a/helm/policy/components/policy-clamp-ac-pf-ppnt/values.yaml b/helm/policy/components/policy-clamp-ac-pf-ppnt/values.yaml index 314fc237..d97690be 100644 --- a/helm/policy/components/policy-clamp-ac-pf-ppnt/values.yaml +++ b/helm/policy/components/policy-clamp-ac-pf-ppnt/values.yaml @@ -1,5 +1,5 @@ # ============LICENSE_START======================================================= -# Copyright (C) 2023-2024 Nordix Foundation. +# Copyright (C) 2023-2025 OpenInfra Foundation Europe. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -61,20 +61,20 @@ liveness: # necessary to disable liveness probe when setting breakpoints # in debugger so K8s doesn't restart unresponsive container enabled: true - port: http-api + port: pf-api readiness: initialDelaySeconds: 50 periodSeconds: 10 failureThreshold: 10 - port: http-api + port: pf-api service: type: ClusterIP name: policy-clamp-ac-pf-ppnt useNodePortExt: true ports: - name: http-api + name: pf-api port: 6969 nodePort: 42 @@ -101,7 +101,7 @@ jaeger: sampling: probability: "1.0" producer: - type: B3,W3C,B3_MULTI + type: "[B3,W3C,B3_MULTI]" collector: protocol: grpc host: "http://jaeger" diff --git a/helm/policy/components/policy-clamp-ac-sim-ppnt/resources/config/SimulatorParticipantParameters.yaml b/helm/policy/components/policy-clamp-ac-sim-ppnt/resources/config/SimulatorParticipantParameters.yaml deleted file mode 100644 index ee52ec87..00000000 --- a/helm/policy/components/policy-clamp-ac-sim-ppnt/resources/config/SimulatorParticipantParameters.yaml +++ /dev/null @@ -1,99 +0,0 @@ -# ============LICENSE_START======================================================= -# Copyright (C) 2024-2025 Nordix Foundation. -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# SPDX-License-Identifier: Apache-2.0 -# ============LICENSE_END========================================================= - -spring: - application: - name: {{ .Values.applicationName }} - autoconfigure: - exclude: - - org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration - - org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration - - org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration - - org.springframework.boot.autoconfigure.data.web.SpringDataWebAutoConfiguration - security: - user: - name: ${RESTSERVER_USER} - password: ${RESTSERVER_PASSWORD} - -security: - enable-csrf: false - -participant: - intermediaryParameters: - topics: - operationTopic: policy-acruntime-participant - syncTopic: acm-ppnt-sync - reportingTimeIntervalMs: 120000 - description: Participant Description - participantId: {{ .Values.participantId }} - clampAutomationCompositionTopics: - topicSources: - - topic: ${participant.intermediaryParameters.topics.operationTopic} - servers: - - "{{ .Values.global.kafkaServer }}:9092" - topicCommInfrastructure: kafka - fetchTimeout: 15000 - useHttps: false - allowTracing: {{ include "policy-clamp-ac-sim-ppnt.jaeger-enabled" . }} - additionalProps: - group.id: {{ .Values.groupId }} - - topic: ${participant.intermediaryParameters.topics.syncTopic} - servers: - - "{{ .Values.global.kafkaServer }}:9092" - topicCommInfrastructure: kafka - fetchTimeout: 15000 - useHttps: false - allowTracing: {{ include "policy-clamp-ac-sim-ppnt.jaeger-enabled" . }} - topicSinks: - - topic: ${participant.intermediaryParameters.topics.operationTopic} - servers: - - "{{ .Values.global.kafkaServer }}:9092" - topicCommInfrastructure: kafka - useHttps: false - allowTracing: {{ include "policy-clamp-ac-sim-ppnt.jaeger-enabled" . }} - participantSupportedElementTypes: - - - typeName: {{ .Values.supportedElementTypeName }} - typeVersion: 1.0.0 - -management: - tracing: - propagation: - produce: [{{ .Values.jaeger.producer.type }}] - sampling: - probability: {{ .Values.jaeger.sampling.probability }} - endpoints: - web: - base-path: / - exposure: - include: health, metrics, prometheus -server: - port: 6969 - servlet: - context-path: /onap/policy/simparticipant - ssl: - enabled: false - -tracing: - enabled: {{ .Values.jaeger.enabled }} - exporter: - endpoint: "{{ .Values.jaeger.collector.host }}:{{ include "policy-clamp-ac-sim-ppnt.exporter-port" . }}" - protocol: {{ .Values.jaeger.collector.protocol }} - sampler: - jaeger-remote: - endpoint: "{{ .Values.jaeger.collector.host }}:{{ .Values.jaeger.collector.portJaegerGrpc }}" diff --git a/helm/policy/components/policy-clamp-ac-sim-ppnt/resources/config/sim-participant.sh b/helm/policy/components/policy-clamp-ac-sim-ppnt/resources/config/sim-participant.sh deleted file mode 100755 index 556f4ef8..00000000 --- a/helm/policy/components/policy-clamp-ac-sim-ppnt/resources/config/sim-participant.sh +++ /dev/null @@ -1,60 +0,0 @@ -#!/usr/bin/env sh -# -# ============LICENSE_START======================================================= -# Copyright (C) 2024 Nordix Foundation. -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# SPDX-License-Identifier: Apache-2.0 -# ============LICENSE_END========================================================= -# - -KEYSTORE="${KEYSTORE:-$POLICY_HOME/etc/ssl/policy-keystore}" -TRUSTSTORE="${TRUSTSTORE:-$POLICY_HOME/etc/ssl/policy-truststore}" -KEYSTORE_PASSWD="${KEYSTORE_PASSWD:-Pol1cy_0nap}" -TRUSTSTORE_PASSWD="${TRUSTSTORE_PASSWD:-Pol1cy_0nap}" - -if [ "$#" -eq 1 ]; then - CONFIG_FILE=$1 -fi - -if [ -z "$CONFIG_FILE" ]; then - CONFIG_FILE="${POLICY_HOME}/etc/SimulatorParticipantParameters.yaml" -fi - -echo "Policy clamp Simulator participant config file: $CONFIG_FILE" - -if [ -f "${POLICY_HOME}/etc/mounted/policy-truststore" ]; then - echo "overriding policy-truststore" - cp -f "${POLICY_HOME}"/etc/mounted/policy-truststore "${TRUSTSTORE}" -fi - -if [ -f "${POLICY_HOME}/etc/mounted/policy-keystore" ]; then - echo "overriding policy-keystore" - cp -f "${POLICY_HOME}"/etc/mounted/policy-keystore "${KEYSTORE}" -fi - -if [ -f "${POLICY_HOME}/etc/mounted/logback.xml" ]; then - echo "overriding logback xml file" - cp -f "${POLICY_HOME}"/etc/mounted/logback.xml "${POLICY_HOME}"/etc/ -fi - -$JAVA_HOME/bin/java \ - -Dlogging.config="${POLICY_HOME}/etc/logback.xml" \ - -Dserver.ssl.keyStore="${KEYSTORE}" \ - -Dserver.ssl.keyStorePassword="${KEYSTORE_PASSWD}" \ - -Djavax.net.ssl.trustStore="${TRUSTSTORE}" \ - -Djavax.net.ssl.trustStorePassword="${TRUSTSTORE_PASSWD}" \ - -Dotel.java.global-autoconfigure.enabled=true \ - -jar /app/app.jar \ - --spring.config.location="${CONFIG_FILE}" diff --git a/helm/policy/components/policy-clamp-ac-sim-ppnt/templates/deployment.yaml b/helm/policy/components/policy-clamp-ac-sim-ppnt/templates/deployment.yaml index 446f000b..6042bf06 100644 --- a/helm/policy/components/policy-clamp-ac-sim-ppnt/templates/deployment.yaml +++ b/helm/policy/components/policy-clamp-ac-sim-ppnt/templates/deployment.yaml @@ -1,6 +1,6 @@ {{/* # ============LICENSE_START======================================================= -# Copyright (C) 2024 Nordix Foundation. +# Copyright (C) 2024-2025 OpenInfra Foundation Europe. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -49,18 +49,6 @@ spec: args: - -c - "cd /config-input && for PFILE in `ls -1`; do envsubst <${PFILE} >/config/${PFILE}; done" - env: - - name: RESTSERVER_USER - valueFrom: - secretKeyRef: - name: {{ .Chart.Name }}-restserver-secret - key: login - - name: RESTSERVER_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Chart.Name }}-restserver-secret - key: password - volumeMounts: - mountPath: /config-input name: ac-sim-ppnt-config @@ -74,10 +62,45 @@ spec: image: {{ .Values.global.repository }}/{{ .Values.global.image.simparticipant }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} command: ["/opt/app/policy/clamp/bin/sim-participant.sh"] - args: ["/opt/app/policy/clamp/etc/mounted/SimulatorParticipantParameters.yaml"] + env: + - name: HTTP_USER + valueFrom: + secretKeyRef: + name: {{ .Chart.Name }}-restserver-secret + key: login + - name: HTTP_PASSWORD + valueFrom: + secretKeyRef: + name: {{ .Chart.Name }}-restserver-secret + key: password + - name: SERVER_PORT + value: "6969" + - name: topicCommInfrastructure + value: kafka + - name: kafkaServer + value: "{{ .Values.global.kafkaServer }}:9092" + - name: participantId + value: {{ .Values.participantId }} + - name: applicationName + value: {{ .Values.applicationName }} + - name: groupId + value: {{ .Values.groupId }} + - name: supportedElementTypeName + value: {{ .Values.supportedElementTypeName }} {{- $jaegerEnabled := tpl "policy-clamp-ac-sim-ppnt.jaeger-enabled" . | trimSuffix "\n" -}} {{- if $jaegerEnabled }} - env: + - name: allowTracing + value: "true" + - name: jaegerProducerType + value: {{ .Values.jaeger.producer.type | quote }} + - name: jaegerSamplingProbability + value: {{ .Values.jaeger.sampling.probability | quote }} + - name: tracingExporterEndpoint + value: "{{ .Values.jaeger.collector.host }}:{{ include "policy-clamp-ac-sim-ppnt.exporter-port" . }}" + - name: tracingExporterProtocol + value: {{ .Values.jaeger.collector.protocol }} + - name: tracingSamplerEndpoint + value: "{{ .Values.jaeger.collector.host }}:{{ .Values.jaeger.collector.portJaegerGrpc }}" - name: OTEL_SERVICE_NAME value: {{ .Values.applicationName }} - name: OTEL_EXPORTER_OTLP_PROTOCOL @@ -86,10 +109,12 @@ spec: value: {{ include "policy-clamp-ac-sim-ppnt.jaeger-protocol" . }} - name: OTEL_EXPORTER_OTLP_ENDPOINT value: {{ printf "%s:%s" (.Values.jaeger.collector.host) (include "policy-clamp-ac-sim-ppnt.exporter-port" .) }} + - name: OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED + value: "true" {{- end }} ports: - containerPort: 6969 - name: http-api + name: sim-api # disable liveness probe when breakpoints set in debugger # so K8s doesn't restart unresponsive container {{- if eq .Values.liveness.enabled true }} @@ -110,9 +135,6 @@ spec: readOnly: true - mountPath: /opt/app/policy/clamp/etc/mounted name: ac-sim-ppnt-config-processed - - mountPath: /opt/app/policy/clamp/bin/sim-participant.sh - name: ac-sim-ppnt-config - subPath: sim-participant.sh resources: {{ toYaml .Values.resources.small | indent 12 }} {{- if .Values.nodeSelector }} diff --git a/helm/policy/components/policy-clamp-ac-sim-ppnt/values.yaml b/helm/policy/components/policy-clamp-ac-sim-ppnt/values.yaml index 0fcf3604..1f280803 100644 --- a/helm/policy/components/policy-clamp-ac-sim-ppnt/values.yaml +++ b/helm/policy/components/policy-clamp-ac-sim-ppnt/values.yaml @@ -1,5 +1,5 @@ # ============LICENSE_START======================================================= -# Copyright (C) 2024 Nordix Foundation. +# Copyright (C) 2024-2025 OpenInfra Foundation Europe. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -54,20 +54,20 @@ liveness: # necessary to disable liveness probe when setting breakpoints # in debugger so K8s doesn't restart unresponsive container enabled: true - port: http-api + port: sim-api readiness: initialDelaySeconds: 50 periodSeconds: 10 failureThreshold: 10 - port: http-api + port: sim-api service: type: ClusterIP name: policy-clamp-ac-sim-ppnt useNodePortExt: true ports: - name: http-api + name: sim-api port: 6969 nodePort: 42 @@ -94,7 +94,7 @@ jaeger: sampling: probability: "1.0" producer: - type: B3,W3C,B3_MULTI + type: "[B3,W3C,B3_MULTI]" collector: protocol: grpc host: "http://jaeger"