From 24f550079875bed2a4f94499d2b9dcd401395861 Mon Sep 17 00:00:00 2001 From: jlestel Date: Tue, 14 Nov 2023 00:12:57 +0100 Subject: [PATCH 01/11] Update values.yaml --- charts/fleet-telemetry/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/fleet-telemetry/values.yaml b/charts/fleet-telemetry/values.yaml index a76ea52..8efdaa2 100644 --- a/charts/fleet-telemetry/values.yaml +++ b/charts/fleet-telemetry/values.yaml @@ -5,7 +5,7 @@ tlsSecret: tlsKey: "" image: repository: tesla/fleet-telemetry - tag: v0.0.3 + tag: v0.1.8 resources: {} nodeSelector: {} tolerations: [] From 1b32be2366fe01a06dea2c74169ca061b7063864 Mon Sep 17 00:00:00 2001 From: Julien Date: Tue, 14 Nov 2023 00:33:10 +0100 Subject: [PATCH 02/11] up --- charts/fleet-telemetry/Chart.yaml | 2 +- charts/fleet-telemetry/values.yaml | 46 ++++++++++++++++++++++++++++-- 2 files changed, 44 insertions(+), 4 deletions(-) diff --git a/charts/fleet-telemetry/Chart.yaml b/charts/fleet-telemetry/Chart.yaml index c4487f3..59bef04 100644 --- a/charts/fleet-telemetry/Chart.yaml +++ b/charts/fleet-telemetry/Chart.yaml @@ -18,6 +18,6 @@ version: 0.1.0 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "0.0.3" +appVersion: "0.1.8" maintainers: - name: nathwang diff --git a/charts/fleet-telemetry/values.yaml b/charts/fleet-telemetry/values.yaml index 8efdaa2..637548c 100644 --- a/charts/fleet-telemetry/values.yaml +++ b/charts/fleet-telemetry/values.yaml @@ -1,8 +1,14 @@ tlsSecret: name: "" create: false - tlsCrt: "" - tlsKey: "" + tlsCrt: | + -----BEGIN CERTIFICATE----- + MIICJzCCAYigAwIBAgIUUtY6HtACZ9GOlh/R2qriIQ2/5uwwCgYIKoZIzj0EAwIw FDESMBAGA1UEAwwJbG9jYWxob3N0MB4XDTIzMTExMzIzMDU1MVoXDTMzMTExMDIz MDU1MVowFDESMBAGA1UEAwwJbG9jYWxob3N0MIGbMBAGByqGSM49AgEGBSuBBAAj A4GGAAQBI6les+4Xm01K68dOcq32uqljnaCv5jJ3Z1Fao+YsGx5l6dA9wrbeYTig v4gp+erh+TOyOMTQWcWzK2mqoIf3VtIAZwdGKqWVyKhdxwBBR4Vq/xF4XyX7w96x QXihkPMGGCSmD+B9MKvi2+tksJtrblxHyoNbBppovHgJusAq7PvD12ijdTBzMB0G A1UdDgQWBBTNLV+CLWXUCFnUZO3MOW2Uqf2JNDAfBgNVHSMEGDAWgBTNLV+CLWXU CFnUZO3MOW2Uqf2JNDAPBgNVHRMBAf8EBTADAQH/MBMGA1UdJQQMMAoGCCsGAQUF BwMBMAsGA1UdDwQEAwICjDAKBggqhkjOPQQDAgOBjAAwgYgCQgCcWI03jd/P+2NX GQJ5iCf9S7cQoGStjaIRrXuaqYIZyfp3ji2eZYQ+TaX14vSuJA9ZVu4K/zx/4f/k Omq3gbnBfgJCAK/bceAqnXdcxlslTP0cr3t41exZzyEcMjcALXUQIJs4JbqIpMe4 YE/yMyMpIcR1sAL8mrnem/Tz3sSf2+ixfnFN + -----END CERTIFICATE----- + tlsKey: | + -----BEGIN PRIVATE KEY----- + MIHuAgEAMBAGByqGSM49AgEGBSuBBAAjBIHWMIHTAgEBBEIA61Jp679avDFcJwiJ t1p/wdg5mZrPDH3uDV0oBAg/ErlmlaADoWEcGFoDjo53FNAwcTmwk8Vt/erQI/1p DEAR6JqhgYkDgYYABAEjqV6z7hebTUrrx05yrfa6qWOdoK/mMndnUVqj5iwbHmXp 0D3Ctt5hOKC/iCn56uH5M7I4xNBZxbMraaqgh/dW0gBnB0YqpZXIqF3HAEFHhWr/ EXhfJfvD3rFBeKGQ8wYYJKYP4H0wq+Lb62Swm2tuXEfKg1sGmmi8eAm6wCrs+8PX aA== + -----END PRIVATE KEY----- image: repository: tesla/fleet-telemetry tag: v0.1.8 @@ -30,7 +36,41 @@ serviceInternal: targetPort: 4269 type: ClusterIP config: - data: "" + data: | + { + "host": "0.0.0.0", + "port": 8443, + "status_port": 8080, + "log_level": "info", + "json_log_enable": true, + "namespace": "tesla_telemetry", + "reliable_ack": false, + "monitoring": { + "prometheus_metrics_port": 9273, + "profiler_port": 4269, + "profiling_path": "/tmp/trace.out" + }, + "rate_limit": { + "enabled": true, + "message_interval_time": 30, + "message_limit": 1000 + }, + "records": { + "alerts": [ + "logger" + ], + "errors": [ + "logger" + ], + "V": [ + "logger" + ] + }, + "tls": { + "server_cert": "/etc/certs/server/tls.crt", + "server_key": "/etc/certs/server/tls.key" + } + } port: 8443 status: port: 8080 From 179967d769f7163e90bb377ae5aab38abd9794c5 Mon Sep 17 00:00:00 2001 From: Julien Date: Sun, 14 Apr 2024 01:30:22 +0200 Subject: [PATCH 03/11] feat: Add dynamic env --- charts/fleet-telemetry/templates/2-deployment.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/charts/fleet-telemetry/templates/2-deployment.yaml b/charts/fleet-telemetry/templates/2-deployment.yaml index dc5e7c7..5b69bf0 100644 --- a/charts/fleet-telemetry/templates/2-deployment.yaml +++ b/charts/fleet-telemetry/templates/2-deployment.yaml @@ -27,6 +27,10 @@ spec: env: - name: KUBERNETES_CLUSTER_DOMAIN value: {{ quote .Values.kubernetesClusterDomain }} + {{- range $key, $val := .Values.env }} + - name: {{ $key }} + value: {{ $val | quote }} + {{- end}} image: {{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }} livenessProbe: failureThreshold: 5 From cd9e39e0a5ed70ce16bfb6f689a7d66548c0116c Mon Sep 17 00:00:00 2001 From: Julien Date: Sun, 14 Apr 2024 01:48:14 +0200 Subject: [PATCH 04/11] add env --- charts/fleet-telemetry/values.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/charts/fleet-telemetry/values.yaml b/charts/fleet-telemetry/values.yaml index 637548c..6006e34 100644 --- a/charts/fleet-telemetry/values.yaml +++ b/charts/fleet-telemetry/values.yaml @@ -79,3 +79,4 @@ config: profile: port: 4269 kubernetesClusterDomain: cluster.local +env: [] \ No newline at end of file From 6574e78c9085dd13019973a851596e47205e8701 Mon Sep 17 00:00:00 2001 From: Julien Date: Sun, 14 Apr 2024 02:17:36 +0200 Subject: [PATCH 05/11] up --- .../fleet-telemetry/templates/2-deployment.yaml | 17 ++++++++++++++--- charts/fleet-telemetry/values.yaml | 3 ++- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/charts/fleet-telemetry/templates/2-deployment.yaml b/charts/fleet-telemetry/templates/2-deployment.yaml index 5b69bf0..93f9890 100644 --- a/charts/fleet-telemetry/templates/2-deployment.yaml +++ b/charts/fleet-telemetry/templates/2-deployment.yaml @@ -27,9 +27,9 @@ spec: env: - name: KUBERNETES_CLUSTER_DOMAIN value: {{ quote .Values.kubernetesClusterDomain }} - {{- range $key, $val := .Values.env }} - - name: {{ $key }} - value: {{ $val | quote }} + {{- if .Values.gcpSecret }} + - name: GOOGLE_APPLICATION_CREDENTIALS + value: /etc/gcp/key.json {{- end}} image: {{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }} livenessProbe: @@ -65,6 +65,10 @@ spec: name: config - mountPath: /etc/certs/server name: server-certs + {{ if .Values.gcpSecret }} + - mountPath: /etc/gcp + name: gcp-secret + {{ end }} nodeSelector: {{- toYaml .Values.nodeSelector | nindent 8 }} tolerations: {{- toYaml .Values.tolerations | nindent 8 }} volumes: @@ -78,3 +82,10 @@ spec: sources: - secret: name: {{ .Values.tlsSecret.name | default (printf "%s" (include "fleet-telemetry.fullname" .)) }} + {{ if .Values.gcpSecret }} + - name: gcp-secret + projected: + sources: + - secret: + name: {{ .Values.gcpSecret }} + {{ end }} \ No newline at end of file diff --git a/charts/fleet-telemetry/values.yaml b/charts/fleet-telemetry/values.yaml index bc5bc16..1d82f0c 100644 --- a/charts/fleet-telemetry/values.yaml +++ b/charts/fleet-telemetry/values.yaml @@ -79,4 +79,5 @@ config: profile: port: 4269 kubernetesClusterDomain: cluster.local -env: [] \ No newline at end of file + +gcpSecret: null \ No newline at end of file From 42bcac1fb66e8fce8dd62602777ab46ccca2ba0c Mon Sep 17 00:00:00 2001 From: jlestel Date: Mon, 15 Apr 2024 14:51:53 +0200 Subject: [PATCH 06/11] Update values.yaml --- charts/fleet-telemetry/values.yaml | 49 +++--------------------------- 1 file changed, 4 insertions(+), 45 deletions(-) diff --git a/charts/fleet-telemetry/values.yaml b/charts/fleet-telemetry/values.yaml index 1d82f0c..454dec9 100644 --- a/charts/fleet-telemetry/values.yaml +++ b/charts/fleet-telemetry/values.yaml @@ -1,14 +1,8 @@ tlsSecret: name: "" create: false - tlsCrt: | - -----BEGIN CERTIFICATE----- - MIICJzCCAYigAwIBAgIUUtY6HtACZ9GOlh/R2qriIQ2/5uwwCgYIKoZIzj0EAwIw FDESMBAGA1UEAwwJbG9jYWxob3N0MB4XDTIzMTExMzIzMDU1MVoXDTMzMTExMDIz MDU1MVowFDESMBAGA1UEAwwJbG9jYWxob3N0MIGbMBAGByqGSM49AgEGBSuBBAAj A4GGAAQBI6les+4Xm01K68dOcq32uqljnaCv5jJ3Z1Fao+YsGx5l6dA9wrbeYTig v4gp+erh+TOyOMTQWcWzK2mqoIf3VtIAZwdGKqWVyKhdxwBBR4Vq/xF4XyX7w96x QXihkPMGGCSmD+B9MKvi2+tksJtrblxHyoNbBppovHgJusAq7PvD12ijdTBzMB0G A1UdDgQWBBTNLV+CLWXUCFnUZO3MOW2Uqf2JNDAfBgNVHSMEGDAWgBTNLV+CLWXU CFnUZO3MOW2Uqf2JNDAPBgNVHRMBAf8EBTADAQH/MBMGA1UdJQQMMAoGCCsGAQUF BwMBMAsGA1UdDwQEAwICjDAKBggqhkjOPQQDAgOBjAAwgYgCQgCcWI03jd/P+2NX GQJ5iCf9S7cQoGStjaIRrXuaqYIZyfp3ji2eZYQ+TaX14vSuJA9ZVu4K/zx/4f/k Omq3gbnBfgJCAK/bceAqnXdcxlslTP0cr3t41exZzyEcMjcALXUQIJs4JbqIpMe4 YE/yMyMpIcR1sAL8mrnem/Tz3sSf2+ixfnFN - -----END CERTIFICATE----- - tlsKey: | - -----BEGIN PRIVATE KEY----- - MIHuAgEAMBAGByqGSM49AgEGBSuBBAAjBIHWMIHTAgEBBEIA61Jp679avDFcJwiJ t1p/wdg5mZrPDH3uDV0oBAg/ErlmlaADoWEcGFoDjo53FNAwcTmwk8Vt/erQI/1p DEAR6JqhgYkDgYYABAEjqV6z7hebTUrrx05yrfa6qWOdoK/mMndnUVqj5iwbHmXp 0D3Ctt5hOKC/iCn56uH5M7I4xNBZxbMraaqgh/dW0gBnB0YqpZXIqF3HAEFHhWr/ EXhfJfvD3rFBeKGQ8wYYJKYP4H0wq+Lb62Swm2tuXEfKg1sGmmi8eAm6wCrs+8PX aA== - -----END PRIVATE KEY----- + tlsCrt: "" + tlsKey: "" image: repository: tesla/fleet-telemetry tag: v0.2.0 @@ -36,41 +30,7 @@ serviceInternal: targetPort: 4269 type: ClusterIP config: - data: | - { - "host": "0.0.0.0", - "port": 8443, - "status_port": 8080, - "log_level": "info", - "json_log_enable": true, - "namespace": "tesla_telemetry", - "reliable_ack": false, - "monitoring": { - "prometheus_metrics_port": 9273, - "profiler_port": 4269, - "profiling_path": "/tmp/trace.out" - }, - "rate_limit": { - "enabled": true, - "message_interval_time": 30, - "message_limit": 1000 - }, - "records": { - "alerts": [ - "logger" - ], - "errors": [ - "logger" - ], - "V": [ - "logger" - ] - }, - "tls": { - "server_cert": "/etc/certs/server/tls.crt", - "server_key": "/etc/certs/server/tls.key" - } - } + data: "" port: 8443 status: port: 8080 @@ -79,5 +39,4 @@ config: profile: port: 4269 kubernetesClusterDomain: cluster.local - -gcpSecret: null \ No newline at end of file +gcpSecret: null From a9610adab44a129c6dd316b4456551edc7c4f6b3 Mon Sep 17 00:00:00 2001 From: jlestel Date: Mon, 15 Apr 2024 14:52:31 +0200 Subject: [PATCH 07/11] Update Chart.yaml --- charts/fleet-telemetry/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/fleet-telemetry/Chart.yaml b/charts/fleet-telemetry/Chart.yaml index 59bef04..c4487f3 100644 --- a/charts/fleet-telemetry/Chart.yaml +++ b/charts/fleet-telemetry/Chart.yaml @@ -18,6 +18,6 @@ version: 0.1.0 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "0.1.8" +appVersion: "0.0.3" maintainers: - name: nathwang From 4b9128d5e23777dd2d88960c8854faf4e5dbcfa4 Mon Sep 17 00:00:00 2001 From: jlestel Date: Mon, 15 Apr 2024 14:55:30 +0200 Subject: [PATCH 08/11] Update README.md --- charts/fleet-telemetry/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/charts/fleet-telemetry/README.md b/charts/fleet-telemetry/README.md index cd5083f..29eeee6 100644 --- a/charts/fleet-telemetry/README.md +++ b/charts/fleet-telemetry/README.md @@ -44,6 +44,7 @@ helm upgrade fleet-telemetry teslamotors/fleet-telemetry -n fleet-telemetry | `replicas` | Number of pods | `1` | | `service.annotations` | Service Annotations | {} | | `service.type` | Service Type | ClusterIP | +| `gcpSecret` | Name of existing secret if you use GCP PubSub (SA key must be set in the key.json) | `nil` | ## Example * Set `config.data` in `values.yaml` From 806647514f50c8dbb508c77502691edd2ae77ba7 Mon Sep 17 00:00:00 2001 From: jlestel Date: Wed, 17 Apr 2024 01:57:11 +0200 Subject: [PATCH 09/11] Add comment --- charts/fleet-telemetry/values.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/charts/fleet-telemetry/values.yaml b/charts/fleet-telemetry/values.yaml index 454dec9..4d59c90 100644 --- a/charts/fleet-telemetry/values.yaml +++ b/charts/fleet-telemetry/values.yaml @@ -39,4 +39,5 @@ config: profile: port: 4269 kubernetesClusterDomain: cluster.local +# Secret name. It must contain a "key.json" key having as value the contents of the JSON key of the service account used to manage the PubSub gcpSecret: null From 90ec7da8d0a06386a5e747f5bea460fa9f5c7410 Mon Sep 17 00:00:00 2001 From: jlestel Date: Wed, 17 Apr 2024 02:10:34 +0200 Subject: [PATCH 10/11] Remove useless default value --- charts/fleet-telemetry/values.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/charts/fleet-telemetry/values.yaml b/charts/fleet-telemetry/values.yaml index 4d59c90..74d96d1 100644 --- a/charts/fleet-telemetry/values.yaml +++ b/charts/fleet-telemetry/values.yaml @@ -39,5 +39,3 @@ config: profile: port: 4269 kubernetesClusterDomain: cluster.local -# Secret name. It must contain a "key.json" key having as value the contents of the JSON key of the service account used to manage the PubSub -gcpSecret: null From a5a5ecee628e454602d3c683045f622153b1fd51 Mon Sep 17 00:00:00 2001 From: jlestel Date: Wed, 17 Apr 2024 02:12:43 +0200 Subject: [PATCH 11/11] revert --- charts/fleet-telemetry/values.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/charts/fleet-telemetry/values.yaml b/charts/fleet-telemetry/values.yaml index 74d96d1..454dec9 100644 --- a/charts/fleet-telemetry/values.yaml +++ b/charts/fleet-telemetry/values.yaml @@ -39,3 +39,4 @@ config: profile: port: 4269 kubernetesClusterDomain: cluster.local +gcpSecret: null