diff --git a/stable/ring-mqtt/5.0.0/app-changelog.md b/stable/ring-mqtt/5.0.0/app-changelog.md deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/stable/ring-mqtt/5.0.0/templates/common.yaml b/stable/ring-mqtt/5.0.0/templates/common.yaml deleted file mode 100644 index 78d963fb168..00000000000 --- a/stable/ring-mqtt/5.0.0/templates/common.yaml +++ /dev/null @@ -1,2 +0,0 @@ -{{/* Render the templates */}} -{{ include "tc.v1.common.loader.all" . }} diff --git a/stable/ring-mqtt/5.0.0/CHANGELOG.md b/stable/ring-mqtt/5.1.0/CHANGELOG.md similarity index 95% rename from stable/ring-mqtt/5.0.0/CHANGELOG.md rename to stable/ring-mqtt/5.1.0/CHANGELOG.md index ed213c823a6..48b5d5c50b1 100644 --- a/stable/ring-mqtt/5.0.0/CHANGELOG.md +++ b/stable/ring-mqtt/5.1.0/CHANGELOG.md @@ -4,6 +4,11 @@ +## [ring-mqtt-5.1.0](https://github.com/truecharts/charts/compare/ring-mqtt-5.0.0...ring-mqtt-5.1.0) (2023-08-29) + + + + ## [ring-mqtt-5.0.0](https://github.com/truecharts/charts/compare/ring-mqtt-4.0.29...ring-mqtt-5.0.0) (2023-07-31) @@ -92,8 +97,3 @@ ## [ring-mqtt-4.0.20](https://github.com/truecharts/charts/compare/ring-mqtt-4.0.19...ring-mqtt-4.0.20) (2023-06-07) - -### Chore - -- update helm general non-major ([#9423](https://github.com/truecharts/charts/issues/9423)) - diff --git a/stable/ring-mqtt/5.0.0/Chart.yaml b/stable/ring-mqtt/5.1.0/Chart.yaml similarity index 98% rename from stable/ring-mqtt/5.0.0/Chart.yaml rename to stable/ring-mqtt/5.1.0/Chart.yaml index fb9a12fc556..c77637ae925 100644 --- a/stable/ring-mqtt/5.0.0/Chart.yaml +++ b/stable/ring-mqtt/5.1.0/Chart.yaml @@ -22,7 +22,7 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/stable/ring-mqtt - https://github.com/tsightler/ring-mqtt type: application -version: 5.0.0 +version: 5.1.0 annotations: truecharts.org/catagories: | - HomeAutomation diff --git a/stable/ring-mqtt/5.0.0/README.md b/stable/ring-mqtt/5.1.0/README.md similarity index 100% rename from stable/ring-mqtt/5.0.0/README.md rename to stable/ring-mqtt/5.1.0/README.md diff --git a/stable/ring-mqtt/5.1.0/app-changelog.md b/stable/ring-mqtt/5.1.0/app-changelog.md new file mode 100644 index 00000000000..ac570dd560b --- /dev/null +++ b/stable/ring-mqtt/5.1.0/app-changelog.md @@ -0,0 +1,4 @@ + + +## [ring-mqtt-5.1.0](https://github.com/truecharts/charts/compare/ring-mqtt-5.0.0...ring-mqtt-5.1.0) (2023-08-29) + diff --git a/stable/ring-mqtt/5.0.0/app-readme.md b/stable/ring-mqtt/5.1.0/app-readme.md similarity index 100% rename from stable/ring-mqtt/5.0.0/app-readme.md rename to stable/ring-mqtt/5.1.0/app-readme.md diff --git a/stable/ring-mqtt/5.0.0/charts/common-14.0.1.tgz b/stable/ring-mqtt/5.1.0/charts/common-14.0.1.tgz similarity index 100% rename from stable/ring-mqtt/5.0.0/charts/common-14.0.1.tgz rename to stable/ring-mqtt/5.1.0/charts/common-14.0.1.tgz diff --git a/stable/ring-mqtt/5.0.0/ix_values.yaml b/stable/ring-mqtt/5.1.0/ix_values.yaml similarity index 63% rename from stable/ring-mqtt/5.0.0/ix_values.yaml rename to stable/ring-mqtt/5.1.0/ix_values.yaml index 90f301a24f5..bc623d1026a 100644 --- a/stable/ring-mqtt/5.0.0/ix_values.yaml +++ b/stable/ring-mqtt/5.1.0/ix_values.yaml @@ -2,6 +2,14 @@ image: pullPolicy: IfNotPresent repository: tccr.io/truecharts/ring-mqtt tag: v5.5.1@sha256:948260b12bf1024af6042ac6a64733fa8556340959f1d7af4ddac4ab8488189d + +securityContext: + container: + readOnlyRootFilesystem: false + runAsNonRoot: false + runAsGroup: 0 + runAsUser: 0 + service: main: ports: @@ -17,19 +25,20 @@ service: protocol: tcp targetPort: 8554 port: 8554 -persistence: - data: - enabled: true - mountPath: /data -portal: - open: - enabled: false -securityContext: - container: - readOnlyRootFilesystem: false - runAsNonRoot: false - runAsGroup: 0 - runAsUser: 0 + +ring: + mqtt_url: "mqtt://localhost:1883" + mqtt_options: "" + livestream_user: "" + livestream_pass: "" + disarm_code: "" + enable_cameras: true + enable_modes: false + enable_panic: false + hass_topic: "homeassistant/status" + ring_topic: "ring" + location_ids": [] + workload: main: podSpec: @@ -42,16 +51,22 @@ workload: enabled: false startup: enabled: false - env: - BEAMDURATION: "0" - DISARMCODE: "" - ENABLECAMERAS: "false" - ENABLEMODES: "false" - ENABLEPANIC: "false" - MQTTHOST: "" - MQTTPORT: "1883" - RINGLOCATIONIDS: "" - SNAPSHOTMODE: disabled - RINGTOKEN: "" - MQTTUSER: "" - MQTTPASSWORD: "" + +persistence: + data: + enabled: true + mountPath: /data + ring-config: + enabled: true + type: configmap + objectName: ring-config + targetSelector: + main: + main: + mountPath: /data/config.json + subPath: config.json + readOnly: true + +portal: + open: + enabled: false diff --git a/stable/ring-mqtt/5.0.0/questions.yaml b/stable/ring-mqtt/5.1.0/questions.yaml similarity index 92% rename from stable/ring-mqtt/5.0.0/questions.yaml rename to stable/ring-mqtt/5.1.0/questions.yaml index 1219fea7379..fc0de70c1b8 100644 --- a/stable/ring-mqtt/5.0.0/questions.yaml +++ b/stable/ring-mqtt/5.1.0/questions.yaml @@ -94,98 +94,6 @@ questions: type: dict attrs: - - variable: env - group: "App Configuration" - label: "Image Environment" - schema: - additional_attrs: true - type: dict - attrs: - - variable: RINGTOKEN - label: "RINGTOKEN" - description: "RINGTOKEN can be left blank for web authenticated." - schema: - type: string - private: true - default: "" - - variable: MQTTUSER - label: "MQTTUSER" - description: "Set a username for your MQTT instance." - schema: - type: string - default: "" - - variable: MQTTPASSWORD - label: "MQTTPASSWORD" - description: "Set a password for your MQTT instance." - schema: - type: string - default: "" - private: true - - variable: MQTTHOST - label: "MQTTHOST" - description: "Set the MQTT host cluster url or ip. ex: `mosquitto.ix-mosquitto.svc.cluster.local`." - schema: - type: string - default: "" - - variable: MQTTPORT - label: "MQTTPORT" - description: "Set MQTTPORT to the port that your MQTT uses." - schema: - type: int - default: 1883 - - variable: ENABLECAMERAS - label: "ENABLECAMERAS" - description: "Default false since the native Ring component for Home Assistant supports cameras, set to true to enable camera/chime support in this add-on. Access to Chimes cannot be granted to shared users so Chime support requires use of the primary Ring account." - schema: - type: boolean - default: false - - variable: SNAPSHOTMODE - label: "SNAPSHOTMODE" - description: "Set SNAPSHOTMODE to [`Auto``, `Motion`, `Interval`, `All`] or default `disabled`" - schema: - type: string - default: "disabled" - enum: - - value: disabled - description: Disabled - - value: auto - description: Auto - - value: motion - description: Motion - - value: interval - description: Interval - - value: all - description: All - - variable: ENABLEMODES - label: "ENABLEMODES" - description: "Enable support for Location Modes for sites without a Ring Alarm Panel." - schema: - type: boolean - default: false - - variable: ENABLEPANIC - label: "ENABLEPANIC" - description: "Enable panic buttons on Alarm Control Panel device." - schema: - type: boolean - default: false - - variable: BEAMDURATION - label: "BEAMDURATION" - description: "Container Variable BEAMDURATION" - schema: - type: string - default: "0" - - variable: DISARMCODE - label: "DISARMCODE" - description: "Used only with Home Assistant, when defined this option causes the Home Assistant Alarm Control Panel integration to require entering this code to disarm the alarm" - schema: - type: string - default: "" - - variable: RINGLOCATIONIDS - label: "RINGLOCATIONIDS" - description: "Array of location Ids in format: [`loc-id`, `loc-id2`], see [Limiting Locations](https://github.com/tsightler/ring-mqtt/wiki/Configuration-Details#limiting-locations) for details." - schema: - type: string - default: "" - variable: envList label: Extra Environment Variables description: "Please be aware that some variables are set in the background, adding duplicates here might cause issues or prevent the app from starting..." @@ -236,6 +144,76 @@ questions: schema: type: string + - variable: ring + group: App Configuration + label: Ring-Mqtt + schema: + additional_attrs: true + type: dict + attrs: + - variable: mqtt_url + label: MQTT Url + description: URL for connecting to MQTT broker in standard MQTT URL format. + schema: + type: string + required: true + default: "mqtt://mosquitto.ix-mosquitto.svc.cluster.local:1883" + - variable: livestream_user + label: LiveStream User + description: Specify a user for RTSP connections. + schema: + type: string + default: "" + - variable: livestream_pass + label: LiveStream Password + description: Specify a password for RTSP connections. + schema: + type: string + private: true + default: "" + - variable: disarm_code + label: Disarm Code + description: Home Assistant Alarm Control Panel integration require entering this code to disarm the alarm + schema: + type: string + default: "" + - variable: enable_cameras + label: Enable Cameras + description: Enables support for camera/chimes. + schema: + type: boolean + default: true + - variable: enable_modes + label: Enable Modes + description: Enable support for Location Modes for sites without a Ring Alarm Panel. + schema: + type: boolean + default: false + - variable: enable_panic + label: Enable Panic + description: Enable panic buttons on Alarm Control Panel device. + schema: + type: boolean + default: false + - variable: hass_topic + label: Hass Topic + description: The topic to monitor for Home Assistant restarts (MQTT birth/last will messages) + schema: + type: string + default: "homeassistant/status" + - variable: location_ids + label: Location Ids + schema: + type: list + default: [] + items: + - variable: location + label: Location + schema: + type: string + required: true + default: "" + - variable: TZ label: Timezone group: "General Settings" diff --git a/stable/ring-mqtt/5.0.0/templates/NOTES.txt b/stable/ring-mqtt/5.1.0/templates/NOTES.txt similarity index 100% rename from stable/ring-mqtt/5.0.0/templates/NOTES.txt rename to stable/ring-mqtt/5.1.0/templates/NOTES.txt diff --git a/stable/ring-mqtt/5.1.0/templates/_configmap.tpl b/stable/ring-mqtt/5.1.0/templates/_configmap.tpl new file mode 100644 index 00000000000..2a3eb30b50a --- /dev/null +++ b/stable/ring-mqtt/5.1.0/templates/_configmap.tpl @@ -0,0 +1,13 @@ +{{/* Define the configmap */}} +{{- define "ring.configmaps" -}} +{{- $fullname := (include "tc.v1.common.lib.chart.names.fullname" $) -}} + +{{- $ring := .Values.ring -}} + +ring-config: + enabled: true + data: + config.json: | + {{ $ring | toJson }} + +{{- end -}} diff --git a/stable/ring-mqtt/5.1.0/templates/common.yaml b/stable/ring-mqtt/5.1.0/templates/common.yaml new file mode 100644 index 00000000000..93ff72b8442 --- /dev/null +++ b/stable/ring-mqtt/5.1.0/templates/common.yaml @@ -0,0 +1,11 @@ +{{/* Make sure all variables are set properly */}} +{{- include "tc.v1.common.loader.init" . -}} + +{{/* Render configmaps for all pods */}} +{{- $configmaps := include "ring.configmaps" . | fromYaml -}} +{{- if $configmaps -}} + {{- $_ := mustMergeOverwrite .Values.configmap $configmaps -}} +{{- end -}} + +{{/* Render the templates */}} +{{- include "tc.v1.common.loader.apply" . -}} diff --git a/stable/ring-mqtt/5.0.0/values.yaml b/stable/ring-mqtt/5.1.0/values.yaml similarity index 100% rename from stable/ring-mqtt/5.0.0/values.yaml rename to stable/ring-mqtt/5.1.0/values.yaml