fix remarks

Signed-off-by: Dirk Van Haerenborgh <[email protected]>
eclipse · Oct 21, 2022 · a20e6ee · a20e6ee
1 parent d705224
commit a20e6ee
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 31 deletions.
diff --git a/charts/hono/Chart.yaml b/charts/hono/Chart.yaml
@@ -15,7 +15,7 @@ name: hono
 description: |
   Eclipse Hono™ provides remote service interfaces for connecting large numbers of IoT devices to a back end and
   interacting with them in a uniform way regardless of the device communication protocol.
-version: 2.1.6
+version: 2.2.0
 # Version of Hono being deployed by the chart
 appVersion: 2.1.1
 keywords:

diff --git a/charts/hono/README.md b/charts/hono/README.md
@@ -103,6 +103,10 @@ The command removes all the Kubernetes components associated with the chart and
 
 ## Release Notes
 
+### 2.2.0
+
+* Allow customizing the pod/service names irrespective or .Release.Name
+
 ### 2.1.5
 
 * Use Hono 2.1.1 container images.
@@ -359,7 +363,7 @@ amqpMessagingNetworkExample:
 
 # mount (existing) Kubernetes secret which contains
 # credentials for connecting to AMQP network
-# into Command Router and protocol adapter containers 
+# into Command Router and protocol adapter containers
 commandRouterService:
   extraVolumes:
   - name: "amqp-network"

diff --git a/charts/hono/config/infinispan/hono-data-grid.xml b/charts/hono/config/infinispan/hono-data-grid.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
+<!--
     Copyright (c) 2020, 2022 Contributors to the Eclipse Foundation
-   
+
     See the NOTICE file(s) distributed with this work for additional
     information regarding copyright ownership.
-   
+
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License 2.0 which is available at
     http://www.eclipse.org/legal/epl-2.0
-   
+
     SPDX-License-Identifier: EPL-2.0
  -->
 <infinispan
@@ -84,7 +84,7 @@
         <hotrod-connector name="hotrod">
           <authentication security-realm="ApplicationRealm">
             <sasl mechanisms="SCRAM-SHA-512 SCRAM-SHA-384 DIGEST-SHA-512 DIGEST-SHA-384 DIGEST-MD5"
-                  server-name='{{ printf "%s-data-grid" .Release.Name }}'
+                  server-name='{{ printf "%s-data-grid" (include "hono.fullname" .) }}'
                   qop="auth" />
           </authentication>
         </hotrod-connector>

diff --git a/charts/hono/config/router/qdrouterd.json b/charts/hono/config/router/qdrouterd.json
@@ -1,6 +1,6 @@
 [
   ["router", {
-    "id": "{{ .Release.Name }}.Example.Router",
+    "id": "{{ include "hono.fullname" . }}.Example.Router",
     "mode": "standalone",
     "workerThreads": 3
   }],
@@ -13,7 +13,7 @@
 
   ["authServicePlugin", {
     "name": "Hono Auth",
-    "host": "{{ .Release.Name }}-service-auth",
+    "host": "{{ include "hono.fullname" . }}-service-auth",
     "port": 5671,
     "sslProfile": "auth-server-profile"
   }],
@@ -90,7 +90,7 @@
     "host": "{{ .Values.amqpMessagingNetworkExample.broker.serviceBus.host }}",
     "idleTimeoutSeconds": 120
     {{- else }}
-    "host": "{{ .Release.Name }}-artemis",
+    "host": "{{ include "hono.fullname" . }}-artemis",
     "verifyHostname": false
     {{- end }}
   }],

diff --git a/charts/hono/example/add_example_data_device_registry.sh b/charts/hono/example/add_example_data_device_registry.sh
@@ -11,7 +11,7 @@
 #
 # SPDX-License-Identifier: EPL-2.0
 #*******************************************************************************
-HTTP_BASE_URL="http://{{ .Release.Name }}-service-device-registry:8080/v1"
+HTTP_BASE_URL="http://{{ include "hono.fullname" . }}-service-device-registry:8080/v1"
 
 check_status() {
   EXIT_STATUS=$1

diff --git a/charts/hono/templates/NOTES.txt b/charts/hono/templates/NOTES.txt
@@ -14,41 +14,41 @@ The output should look similar to this:
 
 NAME                                       {{ "READY   STATUS    RESTARTS   AGE" | indent ( len .Release.Name ) }}
 {{- if .Values.adapters.amqp.enabled }}
-{{ .Release.Name }}-adapter-amqp-65cfb4d675-g5wn4             1/1     Running   0          5m50s
+{{ include "hono.fullname" . }}-adapter-amqp-65cfb4d675-g5wn4             1/1     Running   0          5m50s
 {{- end }}
 {{- if .Values.adapters.coap.enabled }}
-{{ .Release.Name }}-adapter-coap-786b784f47-qx9tg             1/1     Running   0          5m51s
+{{ include "hono.fullname" . }}-adapter-coap-786b784f47-qx9tg             1/1     Running   0          5m51s
 {{- end }}
 {{- if .Values.adapters.http.enabled }}
-{{ .Release.Name }}-adapter-http-66bd6bb89c-mng5t             1/1     Running   0          5m51s
+{{ include "hono.fullname" . }}-adapter-http-66bd6bb89c-mng5t             1/1     Running   0          5m51s
 {{- end }}
 {{- if .Values.adapters.lora.enabled }}
-{{ .Release.Name }}-adapter-lora-341fca588c-1hl8n             1/1     Running   0          5m51s
+{{ include "hono.fullname" . }}-adapter-lora-341fca588c-1hl8n             1/1     Running   0          5m51s
 {{- end }}
 {{- if .Values.adapters.mqtt.enabled }}
-{{ .Release.Name }}-adapter-mqtt-765fcd578b-5rl7n             1/1     Running   0          5m51s
+{{ include "hono.fullname" . }}-adapter-mqtt-765fcd578b-5rl7n             1/1     Running   0          5m51s
 {{- end }}
 {{- if ( has "amqp" .Values.messagingNetworkTypes ) }}
-{{ .Release.Name }}-artemis-f8f7dc7f4-864cj                   1/1     Running   0          5m51s
-{{ .Release.Name }}-dispatch-router-6c77dc78bd-hjn4l          1/1     Running   0          5m51s
+{{ include "hono.fullname" . }}-artemis-f8f7dc7f4-864cj                   1/1     Running   0          5m51s
+{{ include "hono.fullname" . }}-dispatch-router-6c77dc78bd-hjn4l          1/1     Running   0          5m51s
 {{- end }}
 {{- if ( has "kafka" .Values.messagingNetworkTypes ) }}
-{{ .Release.Name }}-kafka-0                                   1/1     Running   0          5m51s
+{{ include "hono.fullname" . }}-kafka-0                                   1/1     Running   0          5m51s
 {{- end }}
 {{- if all .Values.deviceRegistryExample.enabled ( eq .Values.deviceRegistryExample.type "mongodb" ) }}
-{{ .Release.Name }}-monogodb-server-77ffb85c97-78554          1/1     Running   0          5m51s
+{{ include "hono.fullname" . }}-monogodb-server-77ffb85c97-78554          1/1     Running   0          5m51s
 {{- end }}
-{{ .Release.Name }}-service-auth-84d9695cfc-5wlfh             1/1     Running   0          5m51s
-{{ .Release.Name }}-service-command-router-687fd4fbcf-7527b   1/1     Running   0          5m51s
+{{ include "hono.fullname" . }}-service-auth-84d9695cfc-5wlfh             1/1     Running   0          5m51s
+{{ include "hono.fullname" . }}-service-command-router-687fd4fbcf-7527b   1/1     Running   0          5m51s
 {{- if .Values.deviceRegistryExample.enabled }}
 {{- if eq .Values.deviceRegistryExample.type "embedded" }}
-{{ .Release.Name }}-service-device-registry-0                 1/1     Running   0          5m51s
+{{ include "hono.fullname" . }}-service-device-registry-0                 1/1     Running   0          5m51s
 {{- else }}
-{{ .Release.Name }}-service-device-registry-64d645dd9c-q9c5q  1/1     Running   0          5m51s
+{{ include "hono.fullname" . }}-service-device-registry-64d645dd9c-q9c5q  1/1     Running   0          5m51s
 {{- end }}
 {{- end }}
 {{- if ( has "kafka" .Values.messagingNetworkTypes ) }}
-{{ .Release.Name }}-zookeeper-0                               1/1     Running   0          5m51s
+{{ include "hono.fullname" . }}-zookeeper-0                               1/1     Running   0          5m51s
 {{- end }}
 
 Once all pods have reached the READY state, you can start using Hono.

diff --git a/charts/hono/templates/example-data-grid/statefulset.yaml b/charts/hono/templates/example-data-grid/statefulset.yaml
@@ -18,7 +18,7 @@ metadata:
   {{- include "hono.metadata" $args | nindent 2 }}
 spec:
   replicas: 1
-  serviceName: {{ printf "%s-%s" (include "hono.name" .) $args.name }}
+  serviceName: {{ printf "%s-%s" (include "hono.fullname" .) $args.name }}
   selector:
     matchLabels:
       {{- include "hono.matchLabels" $args | nindent 6 }}
@@ -43,7 +43,7 @@ spec:
         - name: JDK_JAVA_OPTIONS
           value: "-XX:MinRAMPercentage=85 -XX:MaxRAMPercentage=85"
         - name: JAVA_OPTIONS
-          value: {{ printf "-Djgroups.dns.query=%s-%s" (include "hono.name" .) $args.name }}
+          value: {{ printf "-Djgroups.dns.query=%s-%s" (include "hono.fullname" .) $args.name }}
         ports:
         - name: hotrod
           containerPort: 11222
@@ -74,5 +74,5 @@ spec:
       volumes:
       - name: conf
         configMap:
-          name: {{ printf "%s-%s-conf" (include "hono.name" .) $args.name }}
+          name: {{ printf "%s-%s-conf" (include "hono.fullname" .) $args.name }}
 {{- end }}
diff --git a/charts/hono/values.yaml b/charts/hono/values.yaml
@@ -1682,7 +1682,7 @@ kafka:
       type: "pem"
       pemChainIncluded: true
       existingSecrets:
-      - "{{ .Release.Name }}-kafka-example-keys"
+      - "{{ include \"hono.fullname\" . }}-kafka-example-keys"
 
   service:
     ports:

diff --git a/packages/cloud2edge/Chart.yaml b/packages/cloud2edge/Chart.yaml
@@ -11,7 +11,7 @@
 # SPDX-License-Identifier: EPL-2.0
 #
 apiVersion: v1
-version: 0.4.0
+version: 0.4.1
 appVersion: 0.4.0
 name: cloud2edge
 description: |

diff --git a/packages/cloud2edge/requirements.yaml b/packages/cloud2edge/requirements.yaml
@@ -12,7 +12,7 @@
 #
 dependencies:
   - name: hono
-    version: ^2.1.0
+    version: ~2.1.0
     repository: "https://eclipse.org/packages/charts/"
   - name: ditto
     version: ~3.0.0