From d42782b66264bd3e5ca3e392f03fe68147b1cfe3 Mon Sep 17 00:00:00 2001 From: Yonathan Negussie Mengesha Date: Thu, 1 Aug 2024 05:02:57 +0300 Subject: [PATCH] Update version to 4.31.0 (#294) * Update version to 4.31.0 * Use default entrypoint of the mqtt-cli image instead of a custom java command --------- Co-authored-by: Lukas Brand --- charts/hivemq-operator/Chart.yaml | 4 ++-- charts/hivemq-operator/values.yaml | 2 +- charts/hivemq-platform/Chart.yaml | 4 ++-- charts/hivemq-platform/templates/tests/test-mqtt-cli.yml | 8 ++------ charts/hivemq-platform/values.yaml | 2 +- charts/hivemq-swarm/Chart.yaml | 4 ++-- charts/hivemq-swarm/values.yaml | 2 +- examples/hivemq-operator/localStatefulTest.yml | 2 +- examples/hivemq-operator/localTestValues.yml | 2 +- manifests/hivemq-platform/hivemq-configuration.yml | 2 +- manifests/hivemq-platform/hivemq-custom-resource.yml | 4 ++-- manifests/hivemq-swarm/deployment_agents.yaml | 4 ++-- manifests/hivemq-swarm/service_agents_headless.yaml | 2 +- manifests/hivemq-swarm/service_commander_api.yaml | 2 +- manifests/hivemq-swarm/serviceaccount.yaml | 2 +- manifests/hivemq-swarm/statefulset_commander.yaml | 4 ++-- tests-hivemq-operator/gradle/libs.versions.toml | 2 +- .../resources/values/ese-extension-values.yaml | 2 +- .../resources/values/log-extension-values.yaml | 2 +- .../resources/values/stateful-set-values.yaml | 2 +- .../src/integrationTest/resources/values/test-values.yaml | 2 +- .../resources/values/update-stateful-set-values.yaml | 2 +- tests-hivemq-platform-operator/gradle/libs.versions.toml | 2 +- .../resources/values/stateful-set-spec.yaml | 2 +- 24 files changed, 31 insertions(+), 35 deletions(-) diff --git a/charts/hivemq-operator/Chart.yaml b/charts/hivemq-operator/Chart.yaml index 658fb34ab..1f08e11f3 100644 --- a/charts/hivemq-operator/Chart.yaml +++ b/charts/hivemq-operator/Chart.yaml @@ -10,10 +10,10 @@ keywords: - messaging # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 0.11.39 +version: 0.11.40 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. -appVersion: 4.30.0 +appVersion: 4.31.0 icon: https://www.hivemq.com/img/svg/hivemq-bee.svg dependencies: - name: kube-prometheus-stack diff --git a/charts/hivemq-operator/values.yaml b/charts/hivemq-operator/values.yaml index 32b9b891b..fe66dfd49 100644 --- a/charts/hivemq-operator/values.yaml +++ b/charts/hivemq-operator/values.yaml @@ -142,7 +142,7 @@ hivemq: # Annotations to apply to the service account serviceAccountAnnotations: {} # The values below apply to the HiveMQCluster object. If you are using deployCr: false, this is unused - image: hivemq/hivemq4:k8s-4.30.0 + image: hivemq/hivemq4:k8s-4.31.0 imagePullPolicy: IfNotPresent nodeCount: "3" cpu: "4" diff --git a/charts/hivemq-platform/Chart.yaml b/charts/hivemq-platform/Chart.yaml index b2c2116a3..6d756e40d 100644 --- a/charts/hivemq-platform/Chart.yaml +++ b/charts/hivemq-platform/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: hivemq-platform description: HiveMQ Platform Helm Chart (new) type: application -version: 0.2.19 -appVersion: 4.30.0 +version: 0.2.20 +appVersion: 4.31.0 maintainers: - email: support@hivemq.com name: HiveMQ diff --git a/charts/hivemq-platform/templates/tests/test-mqtt-cli.yml b/charts/hivemq-platform/templates/tests/test-mqtt-cli.yml index c6bec0b0e..18db01004 100644 --- a/charts/hivemq-platform/templates/tests/test-mqtt-cli.yml +++ b/charts/hivemq-platform/templates/tests/test-mqtt-cli.yml @@ -7,12 +7,8 @@ metadata: spec: containers: - name: hivemq-mqtt-cli - image: hivemq/mqtt-cli:4.30.0 - command: [ "java" ] - args: [ "-cp", - "/app/resources:/app/classes:/app/libs/*", - "com.hivemq.cli.MqttCLIMain", - "test", + image: hivemq/mqtt-cli:4.31.0 + args: [ "test", "-h", "{{ printf "hivemq-%s-mqtt-1883" $.Release.Name | trimAll "-" | trunc 63 | trimSuffix "-" | trim }}" ] restartPolicy: Never diff --git a/charts/hivemq-platform/values.yaml b/charts/hivemq-platform/values.yaml index efc8da233..8b1838b8d 100644 --- a/charts/hivemq-platform/values.yaml +++ b/charts/hivemq-platform/values.yaml @@ -5,7 +5,7 @@ image: repository: docker.io/hivemq name: hivemq4 - tag: 4.30.0 + tag: 4.31.0 pullPolicy: IfNotPresent pullSecretName: "" diff --git a/charts/hivemq-swarm/Chart.yaml b/charts/hivemq-swarm/Chart.yaml index 031305fce..c922bea4a 100644 --- a/charts/hivemq-swarm/Chart.yaml +++ b/charts/hivemq-swarm/Chart.yaml @@ -10,9 +10,9 @@ keywords: - messaging # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 0.2.36 +version: 0.2.37 # This is the version number of HiveMQ Swarm. -appVersion: 4.30.0 +appVersion: 4.31.0 icon: https://www.hivemq.com/img/svg/icon-hivemq-swarm.svg dependencies: - name: kube-prometheus-stack diff --git a/charts/hivemq-swarm/values.yaml b/charts/hivemq-swarm/values.yaml index 06c56baad..0e4349b63 100644 --- a/charts/hivemq-swarm/values.yaml +++ b/charts/hivemq-swarm/values.yaml @@ -1,7 +1,7 @@ image: repository: hivemq/hivemq-swarm pullPolicy: IfNotPresent - tag: 4.30.0 + tag: 4.31.0 imagePullSecrets: [] ## Cluster domain ## diff --git a/examples/hivemq-operator/localStatefulTest.yml b/examples/hivemq-operator/localStatefulTest.yml index 8b8f2b582..9ee328bc7 100644 --- a/examples/hivemq-operator/localStatefulTest.yml +++ b/examples/hivemq-operator/localStatefulTest.yml @@ -5,7 +5,7 @@ operator: admissionWebhooks: enabled: false hivemq: - image: hivemq/hivemq4:k8s-4.30.0 + image: hivemq/hivemq4:k8s-4.31.0 imagePullPolicy: Never initDnsWaitImage: hivemq/init-dns-wait:snapshot logLevel: DEBUG diff --git a/examples/hivemq-operator/localTestValues.yml b/examples/hivemq-operator/localTestValues.yml index e38fa284d..cb6247912 100644 --- a/examples/hivemq-operator/localTestValues.yml +++ b/examples/hivemq-operator/localTestValues.yml @@ -10,7 +10,7 @@ monitoring: enabled: true hivemq: - image: hivemq/hivemq4:k8s-4.30.0 + image: hivemq/hivemq4:k8s-4.31.0 imagePullPolicy: Never initDnsWaitImage: hivemq/init-dns-wait:snapshot logLevel: DEBUG diff --git a/manifests/hivemq-platform/hivemq-configuration.yml b/manifests/hivemq-platform/hivemq-configuration.yml index 89ef7464b..5186ef05d 100644 --- a/manifests/hivemq-platform/hivemq-configuration.yml +++ b/manifests/hivemq-platform/hivemq-configuration.yml @@ -7,7 +7,7 @@ metadata: labels: app.kubernetes.io/name: "hivemq-platform" app.kubernetes.io/instance: "my-platform" - app.kubernetes.io/version: "4.30.0" + app.kubernetes.io/version: "4.31.0" data: # noinspection XmlPathReference config.xml: |- diff --git a/manifests/hivemq-platform/hivemq-custom-resource.yml b/manifests/hivemq-platform/hivemq-custom-resource.yml index 2a9e03525..a08176538 100644 --- a/manifests/hivemq-platform/hivemq-custom-resource.yml +++ b/manifests/hivemq-platform/hivemq-custom-resource.yml @@ -7,7 +7,7 @@ metadata: labels: app.kubernetes.io/name: "hivemq-platform" app.kubernetes.io/instance: "my-platform" - app.kubernetes.io/version: "4.30.0" + app.kubernetes.io/version: "4.31.0" spec: configMapName: hivemq-configuration-my-platform logLevel: INFO @@ -25,7 +25,7 @@ spec: env: - name: JAVA_OPTS value: "-XX:+UnlockExperimentalVMOptions -XX:InitialRAMPercentage=50 -XX:MaxRAMPercentage=50" - image: "docker.io/hivemq/hivemq4:4.30.0" + image: "docker.io/hivemq/hivemq4:4.31.0" imagePullPolicy: IfNotPresent ports: - name: mqtt-1883 diff --git a/manifests/hivemq-swarm/deployment_agents.yaml b/manifests/hivemq-swarm/deployment_agents.yaml index 696bc9255..88f7241aa 100644 --- a/manifests/hivemq-swarm/deployment_agents.yaml +++ b/manifests/hivemq-swarm/deployment_agents.yaml @@ -8,7 +8,7 @@ metadata: labels: app.kubernetes.io/name: hivemq-swarm app.kubernetes.io/instance: my-swarm - app.kubernetes.io/version: "4.30.0" + app.kubernetes.io/version: "4.31.0" spec: replicas: 3 selector: @@ -32,7 +32,7 @@ spec: - name: hivemq-swarm-agent securityContext: {} - image: "hivemq/hivemq-swarm:4.30.0" + image: "hivemq/hivemq-swarm:4.31.0" imagePullPolicy: IfNotPresent env: - name: SWARM_AGENT_BIND_ADDRESS diff --git a/manifests/hivemq-swarm/service_agents_headless.yaml b/manifests/hivemq-swarm/service_agents_headless.yaml index 1bf5f139f..461dcbb46 100644 --- a/manifests/hivemq-swarm/service_agents_headless.yaml +++ b/manifests/hivemq-swarm/service_agents_headless.yaml @@ -9,7 +9,7 @@ metadata: hivemq.com/swarm-role: agent app.kubernetes.io/name: hivemq-swarm app.kubernetes.io/instance: my-swarm - app.kubernetes.io/version: "4.30.0" + app.kubernetes.io/version: "4.31.0" spec: type: ClusterIP clusterIP: None diff --git a/manifests/hivemq-swarm/service_commander_api.yaml b/manifests/hivemq-swarm/service_commander_api.yaml index 7c842fa5d..81c1e50b7 100644 --- a/manifests/hivemq-swarm/service_commander_api.yaml +++ b/manifests/hivemq-swarm/service_commander_api.yaml @@ -9,7 +9,7 @@ metadata: hivemq.com/swarm-role: commander app.kubernetes.io/name: hivemq-swarm app.kubernetes.io/instance: my-swarm - app.kubernetes.io/version: "4.30.0" + app.kubernetes.io/version: "4.31.0" spec: type: ClusterIP ports: diff --git a/manifests/hivemq-swarm/serviceaccount.yaml b/manifests/hivemq-swarm/serviceaccount.yaml index 8cfe6ddc1..c62481233 100644 --- a/manifests/hivemq-swarm/serviceaccount.yaml +++ b/manifests/hivemq-swarm/serviceaccount.yaml @@ -8,4 +8,4 @@ metadata: labels: app.kubernetes.io/name: hivemq-swarm app.kubernetes.io/instance: my-swarm - app.kubernetes.io/version: "4.30.0" + app.kubernetes.io/version: "4.31.0" diff --git a/manifests/hivemq-swarm/statefulset_commander.yaml b/manifests/hivemq-swarm/statefulset_commander.yaml index 689481b16..293e7cd92 100644 --- a/manifests/hivemq-swarm/statefulset_commander.yaml +++ b/manifests/hivemq-swarm/statefulset_commander.yaml @@ -8,7 +8,7 @@ metadata: labels: app.kubernetes.io/name: hivemq-swarm app.kubernetes.io/instance: my-swarm - app.kubernetes.io/version: "4.30.0" + app.kubernetes.io/version: "4.31.0" spec: replicas: 1 serviceName: my-swarm-hivemq-swarm-api @@ -31,7 +31,7 @@ spec: - name: hivemq-swarm-commander securityContext: {} - image: "hivemq/hivemq-swarm:4.30.0" + image: "hivemq/hivemq-swarm:4.31.0" imagePullPolicy: IfNotPresent env: - name: SWARM_COMMANDER_MODE diff --git a/tests-hivemq-operator/gradle/libs.versions.toml b/tests-hivemq-operator/gradle/libs.versions.toml index ce0854d48..d6a11fed0 100644 --- a/tests-hivemq-operator/gradle/libs.versions.toml +++ b/tests-hivemq-operator/gradle/libs.versions.toml @@ -4,7 +4,7 @@ awaitility = "4.2.1" bouncycastle = "1.78.1" fabric8-kubernetes-client = "6.13.1" hivemq-mqttClient = "1.3.3" -hivemq-platform = "4.30.0" +hivemq-platform = "4.31.0" junit-jupiter = "5.10.3" logback = "1.5.6" slf4j = "2.0.13" diff --git a/tests-hivemq-operator/src/integrationTest/resources/values/ese-extension-values.yaml b/tests-hivemq-operator/src/integrationTest/resources/values/ese-extension-values.yaml index 417de6133..3349fabb8 100644 --- a/tests-hivemq-operator/src/integrationTest/resources/values/ese-extension-values.yaml +++ b/tests-hivemq-operator/src/integrationTest/resources/values/ese-extension-values.yaml @@ -10,7 +10,7 @@ operator: enabled: false hivemq: - image: hivemq/hivemq4:k8s-4.30.0 + image: hivemq/hivemq4:k8s-4.31.0 imagePullPolicy: Never initDnsWaitImage: hivemq/init-dns-wait:snapshot logLevel: DEBUG diff --git a/tests-hivemq-operator/src/integrationTest/resources/values/log-extension-values.yaml b/tests-hivemq-operator/src/integrationTest/resources/values/log-extension-values.yaml index 86dc3b7b6..9c5309a08 100644 --- a/tests-hivemq-operator/src/integrationTest/resources/values/log-extension-values.yaml +++ b/tests-hivemq-operator/src/integrationTest/resources/values/log-extension-values.yaml @@ -10,7 +10,7 @@ operator: enabled: false hivemq: - image: hivemq/hivemq4:k8s-4.30.0 + image: hivemq/hivemq4:k8s-4.31.0 imagePullPolicy: Never initDnsWaitImage: hivemq/init-dns-wait:snapshot logLevel: DEBUG diff --git a/tests-hivemq-operator/src/integrationTest/resources/values/stateful-set-values.yaml b/tests-hivemq-operator/src/integrationTest/resources/values/stateful-set-values.yaml index e9fc77589..2bb728d98 100644 --- a/tests-hivemq-operator/src/integrationTest/resources/values/stateful-set-values.yaml +++ b/tests-hivemq-operator/src/integrationTest/resources/values/stateful-set-values.yaml @@ -10,7 +10,7 @@ operator: enabled: false hivemq: - image: hivemq/hivemq4:k8s-4.30.0 + image: hivemq/hivemq4:k8s-4.31.0 imagePullPolicy: Never initDnsWaitImage: hivemq/init-dns-wait:snapshot logLevel: DEBUG diff --git a/tests-hivemq-operator/src/integrationTest/resources/values/test-values.yaml b/tests-hivemq-operator/src/integrationTest/resources/values/test-values.yaml index 25d728828..86be44d01 100644 --- a/tests-hivemq-operator/src/integrationTest/resources/values/test-values.yaml +++ b/tests-hivemq-operator/src/integrationTest/resources/values/test-values.yaml @@ -11,7 +11,7 @@ operator: enabled: false hivemq: - image: hivemq/hivemq4:k8s-4.30.0 + image: hivemq/hivemq4:k8s-4.31.0 imagePullPolicy: Never initDnsWaitImage: hivemq/init-dns-wait:snapshot logLevel: DEBUG diff --git a/tests-hivemq-operator/src/integrationTest/resources/values/update-stateful-set-values.yaml b/tests-hivemq-operator/src/integrationTest/resources/values/update-stateful-set-values.yaml index 3146d5664..6ee6441d2 100644 --- a/tests-hivemq-operator/src/integrationTest/resources/values/update-stateful-set-values.yaml +++ b/tests-hivemq-operator/src/integrationTest/resources/values/update-stateful-set-values.yaml @@ -11,7 +11,7 @@ operator: enabled: false hivemq: - image: hivemq/hivemq4:k8s-4.30.0 + image: hivemq/hivemq4:k8s-4.31.0 imagePullPolicy: Never initDnsWaitImage: hivemq/init-dns-wait:snapshot logLevel: DEBUG diff --git a/tests-hivemq-platform-operator/gradle/libs.versions.toml b/tests-hivemq-platform-operator/gradle/libs.versions.toml index ceb7d5dd3..316ad4bfa 100644 --- a/tests-hivemq-platform-operator/gradle/libs.versions.toml +++ b/tests-hivemq-platform-operator/gradle/libs.versions.toml @@ -4,7 +4,7 @@ awaitility = "4.2.1" bouncycastle = "1.78.1" fabric8-kubernetes-client = "6.13.1" hivemq-mqttClient = "1.3.3" -hivemq-platform = "4.30.0" +hivemq-platform = "4.31.0" javassist = "3.30.2-GA" junit-jupiter = "5.10.3" logback = "1.5.6" diff --git a/tests-hivemq-platform-operator/src/integrationTest/resources/values/stateful-set-spec.yaml b/tests-hivemq-platform-operator/src/integrationTest/resources/values/stateful-set-spec.yaml index 3d58c58d6..45ae54d39 100644 --- a/tests-hivemq-platform-operator/src/integrationTest/resources/values/stateful-set-spec.yaml +++ b/tests-hivemq-platform-operator/src/integrationTest/resources/values/stateful-set-spec.yaml @@ -4,7 +4,7 @@ spec: spec: containers: - name: hivemq - image: docker.io/hivemq/hivemq4:4.30.0 + image: docker.io/hivemq/hivemq4:4.31.0 imagePullPolicy: IfNotPresent ports: - name: mqtt-1883