[TH2-5226] infra-operator periodically deletes redundant resources from RabbitMQ instead of remove on start

.github/workflows/build-dev-release.yml

@@ -0,0 +1,15 @@
+name: Build and publish dev release Docker image to Github Container Registry ghcr.io
+
+on: workflow_dispatch
+
+jobs:
+  build:
+    uses: th2-net/.github/.github/workflows/compound-java.yml@main
+    with:
+      build-target: 'Docker'
+      devRelease: true
+      createTag: true
+      docker-username: ${{ github.actor }}
+    secrets:
+      docker-password: ${{ secrets.GITHUB_TOKEN }}
+      nvd-api-key: ${{ secrets.NVD_APIKEY }}

.github/workflows/build-release.yml

@@ -0,0 +1,15 @@
+name: Build and publish release Docker image to Github Container Registry ghcr.io
+
+on: workflow_dispatch
+
+jobs:
+  build:
+    uses: th2-net/.github/.github/workflows/compound-java.yml@main
+    with:
+      build-target: 'Docker'
+      devRelease: false
+      createTag: true
+      docker-username: ${{ github.actor }}
+    secrets:
+      docker-password: ${{ secrets.GITHUB_TOKEN }}
+      nvd-api-key: ${{ secrets.NVD_APIKEY }}

.github/workflows/dev-java-publish-docker.yml → .github/workflows/build-sanpshot.yml

@@ -1,12 +1,11 @@
-name: Dev build and publish Docker images to github registry
+name: Build and publish Docker image to Github Container Registry ghcr.io
 
 on:
   push:
     branches-ignore:
       - master
       - version-*
-      - dev-version-*
-      - dependabot*
+      - dependabot**
     paths-ignore:
       - README.md
 
@@ -15,8 +14,7 @@ jobs:
     uses: th2-net/.github/.github/workflows/compound-java-dev.yml@main
     with:
       build-target: 'Docker'
-      runsOn: ubuntu-latest
-      gradleVersion: '7'
       docker-username: ${{ github.actor }}
     secrets:
-      docker-password: ${{ secrets.GITHUB_TOKEN }}
+      docker-password: ${{ secrets.GITHUB_TOKEN }}
+      nvd-api-key: ${{ secrets.NVD_APIKEY }}

.github/workflows/ci-unwelcome-words.yml

@@ -7,17 +7,17 @@ jobs:
   test:
     runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@v2
-      with:
-        ref: ${{ github.sha }}
-    - name: Checkout tool
-      uses: actions/checkout@v2
-      with:
-        repository: exactpro-th2/ci-github-action
-        ref: master
-        token: ${{ secrets.PAT_CI_ACTION }}
-        path: ci-github-action
-    - name: Run CI action
-      uses: ./ci-github-action
-      with:
-        ref: ${{ github.sha }}
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.sha }}
+      - name: Checkout tool
+        uses: actions/checkout@v4
+        with:
+          repository: exactpro-th2/ci-github-action
+          ref: master
+          token: ${{ secrets.PAT_CI_ACTION }}
+          path: ci-github-action
+      - name: Run CI action
+        uses: ./ci-github-action
+        with:
+          ref: ${{ github.sha }}

Dockerfile

@@ -6,4 +6,4 @@ RUN gradle --no-daemon clean build dockerPrepare -Prelease_version=${release_ver
 FROM adoptopenjdk/openjdk11:alpine
 WORKDIR /home
 COPY --from=build /home/gradle/build/docker .
-ENTRYPOINT ["/home/service/bin/service", "-Dlog4j2.configurationFile=file:/var/th2/config/log4j2.properties"]
+ENTRYPOINT ["/home/service/bin/service"]

README.md

@@ -64,22 +64,31 @@ chart:
 
 rabbitMQManagement:
   host: host
-  # RabbitMQ host used for managing vHosts and users
-
-  port: 8080
-  # RabbitMQ port
+  # host used for managing vHosts and users
+
+  managementPort: 15672
+  # management port for HTTP requests 
+
+  applicationPort: 5672
+  # AMQP port
+
+  vhostName: vHost
+  # AMQP vHost name 
+
+  exchangeName: exchange
+  # topic exchange name
 
   username: username
-  # RabbitMQ management username
+  # username for management and AMQP 
 
   password: password
-  # password for management user
+  # password for management and AMQP
 
   persistence: true
   # determines if the RabbitMQ resources are persistent or not
 
-  gcIntervalSec: 900
-  # Interval of garbage collection in RabbitMQ. Each GC task integration consist of:
+  rubbishCollectionInterval: 900
+  # Interval in seconds of rubbish collection (RC) in RabbitMQ. Each RC task integration consist of:
   # 1) collect redundant resources according current RabbitMQ and Kubernetes resources state.
   # 2) delete only resources included into both current and previous integrations (previous intersect current).
   # 3) save collected resources but not included in the previous integration (current minus previous) for the next iteration  

build.gradle

@@ -58,7 +58,12 @@ dependencies {
     testImplementation libs.junit.jupiter.api
     testRuntimeOnly libs.junit.jupiter.engine
 
-    detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:${detekt_version}")
+    detektPlugins libs.detekt.formatting
+}
+
+wrapper {
+    version '8.7'
+    distributionType Wrapper.DistributionType.BIN
 }
 
 test {

gradle/libs.versions.toml

@@ -3,10 +3,10 @@ kotlin = "1.8.22"
 th2-plugin = "0.1.1"
 jupiter = "5.10.3"
 okhttp3 = "4.12.0"
+detekt = "1.23.6"
 
 [libraries]
 kotlin-logging = { group = "io.github.microutils", name = "kotlin-logging", version = "3.0.5" }
-
 okhttp = { group = "com.squareup.okhttp3", name = "okhttp", version.ref = "okhttp3" }
 logging-interceptor = { group = "com.squareup.okhttp3", name = "logging-interceptor", version.ref = "okhttp3" }
 kubernetes-client = { group = "io.fabric8", name = "kubernetes-client", version = "6.13.1" }
@@ -17,8 +17,10 @@ mockito-core = { group = "org.mockito", name = "mockito-core", version = "5.12.0
 junit-jupiter-api = { group = "org.junit.jupiter", name = "junit-jupiter-api", version.ref = "jupiter" }
 junit-jupiter-engine = { group = "org.junit.jupiter", name = "junit-jupiter-engine", version.ref = "jupiter" }
 
+detekt-formatting = { group = "io.gitlab.arturbosch.detekt", name = "detekt-formatting", version.ref = "detekt" }
+
 [plugins]
 kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
-detekt = { id = "io.gitlab.arturbosch.detekt", version = "1.23.6" }
+detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
 
 th2-component = { id = "com.exactpro.th2.gradle.component", version.ref = "th2-plugin" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
-#Mon May 04 17:09:53 MSK 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip