Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[#512] Add service account for Hono adapter pods; update tracing image versions. #509

Merged
merged 3 commits into from
Oct 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions charts/hono/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.5.4
version: 2.5.5
# Version of Hono being deployed by the chart
appVersion: 2.4.0
keywords:
Expand All @@ -27,7 +27,7 @@ keywords:
home: https://www.eclipse.org/hono/
sources:
- https://github.com/eclipse-hono/hono
icon: https://eclipse.dev/hono/img/favicon.ico
icon: https://eclipse.dev/hono/img/hono-logo_image.svg
maintainers:
- name: dejanb
email: [email protected]
Expand Down
6 changes: 6 additions & 0 deletions charts/hono/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,12 @@ helm uninstall eclipse-hono -n hono
The command removes all the Kubernetes components associated with the chart and deletes the release.

## Release Notes
### 2.5.5

* Add service account for protocol-adapter pods. Needed to query the container id via the K8s API, as it is
done in upcoming Hono releases in case cgroups v2 is used.
* Update jaegertracing/all-in-one and opentelemetry-collector image versions.

### 2.5.4

* Fix Grafana dashboard being empty in case a release name is used that doesn't contain 'hono'.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{{- if .Values.adapters.amqp.enabled }}
#
# Copyright (c) 2019, 2022 Contributors to the Eclipse Foundation
# Copyright (c) 2019, 2023 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand Down Expand Up @@ -36,6 +36,7 @@ spec:
{{- end }}
{{- include "hono.pod.priorityClassName" $args | nindent 6 }}
{{- include "hono.pod.affinity" $args | nindent 6 }}
serviceAccountName: {{ printf "%s-%s" ( include "hono.fullname" . ) "adapter" | quote }}
containers:
{{- include "hono.otel.agent" . | indent 6 }}
{{- include "hono.container" $args | indent 6 }}
Expand Down
21 changes: 21 additions & 0 deletions charts/hono/templates/hono-adapter-base/hono-adapter-role.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#
# Copyright (c) 2023 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
#
{{- $args := dict "dot" . "name" "adapter" }}
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
{{- include "hono.metadata" $args | nindent 2 }}
rules:
- apiGroups: [""]
resources: ["pods"]
verbs: ["get"]
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#
# Copyright (c) 2023 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
#
{{- $args := dict "dot" . "name" "adapter" }}
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
{{- include "hono.metadata" $args | nindent 2 }}
roleRef:
kind: Role
name: {{ printf "%s-%s" ( include "hono.fullname" . ) $args.name | quote }}
apiGroup: rbac.authorization.k8s.io
subjects:
- kind: ServiceAccount
name: {{ printf "%s-%s" ( include "hono.fullname" . ) $args.name | quote }}
namespace: {{ .Release.Namespace }}
17 changes: 17 additions & 0 deletions charts/hono/templates/hono-adapter-base/hono-adapter-sa.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#
# Copyright (c) 2023 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
#
{{- $args := dict "dot" . "name" "adapter" }}
apiVersion: v1
kind: ServiceAccount
metadata:
{{- include "hono.metadata" $args | nindent 2 }}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{{- if .Values.adapters.coap.enabled }}
#
# Copyright (c) 2019, 2022 Contributors to the Eclipse Foundation
# Copyright (c) 2019, 2023 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand Down Expand Up @@ -36,6 +36,7 @@ spec:
{{- end }}
{{- include "hono.pod.priorityClassName" $args | nindent 6 }}
{{- include "hono.pod.affinity" $args | nindent 6 }}
serviceAccountName: {{ printf "%s-%s" ( include "hono.fullname" . ) "adapter" | quote }}
containers:
{{- include "hono.otel.agent" . | indent 6 }}
{{- include "hono.container" $args | indent 6 }}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{{- if .Values.adapters.http.enabled }}
#
# Copyright (c) 2019, 2022 Contributors to the Eclipse Foundation
# Copyright (c) 2019, 2023 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand Down Expand Up @@ -36,6 +36,7 @@ spec:
{{- end }}
{{- include "hono.pod.priorityClassName" $args | nindent 6 }}
{{- include "hono.pod.affinity" $args | nindent 6 }}
serviceAccountName: {{ printf "%s-%s" ( include "hono.fullname" . ) "adapter" | quote }}
containers:
{{- include "hono.otel.agent" . | indent 6 }}
{{- include "hono.container" $args | indent 6 }}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{{- if .Values.adapters.lora.enabled }}
#
# Copyright (c) 2019, 2022 Contributors to the Eclipse Foundation
# Copyright (c) 2019, 2023 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand Down Expand Up @@ -36,6 +36,7 @@ spec:
{{- end }}
{{- include "hono.pod.priorityClassName" $args | nindent 6 }}
{{- include "hono.pod.affinity" $args | nindent 6 }}
serviceAccountName: {{ printf "%s-%s" ( include "hono.fullname" . ) "adapter" | quote }}
containers:
{{- include "hono.otel.agent" . | indent 6 }}
{{- include "hono.container" $args | indent 6 }}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{{- if .Values.adapters.mqtt.enabled }}
#
# Copyright (c) 2019, 2022 Contributors to the Eclipse Foundation
# Copyright (c) 2019, 2023 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand Down Expand Up @@ -36,6 +36,7 @@ spec:
{{- end }}
{{- include "hono.pod.priorityClassName" $args | nindent 6 }}
{{- include "hono.pod.affinity" $args | nindent 6 }}
serviceAccountName: {{ printf "%s-%s" ( include "hono.fullname" . ) "adapter" | quote }}
containers:
{{- include "hono.otel.agent" . | indent 6 }}
{{- include "hono.container" $args | indent 6 }}
Expand Down
4 changes: 2 additions & 2 deletions charts/hono/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2066,7 +2066,7 @@ jaegerBackendExample:
enabled: false
# allInOneImage contains the name (including tag)
# of the container image to use for the example Jaeger back end.
allInOneImage: "jaegertracing/all-in-one:1.37"
allInOneImage: "jaegertracing/all-in-one:1.50"
# [DEPRECATED: use probes instead] livenessProbeInitialDelaySeconds contains the value to use for the "initialDelaySeconds"
# configuration property of the component's liveness probe.
# The value of the top level "livenessProbeInitialDelaySeconds" property will be used if not set.
Expand Down Expand Up @@ -2135,7 +2135,7 @@ jaegerBackendExample:
# to use for the OpenTelemetry collector agent sidecar containers.
# These containers are deployed with Hono's components if the example Jaeger all-in-one
# deployment is disabled and "otelCollectorAgentConfigMap" is not null.
otelCollectorAgentImage: "otel/opentelemetry-collector:0.53.0"
otelCollectorAgentImage: "otel/opentelemetry-collector:0.86.0"
# otelCollectorAgentConfigMap can be used to specify the name of an existing ConfigMap
# from which an OpenTelemetry collector configuration should be read.
# If a ConfigMap name is given, an OpenTelemetry collector agent sidecar container will
Expand Down