From 8dbfd4620e26be1c0e9361e716cf1c780c0564ea Mon Sep 17 00:00:00 2001 From: Niladri Halder Date: Tue, 10 Sep 2024 13:19:09 +0530 Subject: [PATCH] Cherry-pick PR 575 into release/2.6 branch (#584) * chore(deps): update analytics dependency Signed-off-by: Niladri Halder * feat(charts): add analytics ID and KEY envs to csi controller Signed-off-by: Niladri Halder --------- Signed-off-by: Niladri Halder --- deploy/helm/charts/templates/zfs-controller.yaml | 8 ++++++++ go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/deploy/helm/charts/templates/zfs-controller.yaml b/deploy/helm/charts/templates/zfs-controller.yaml index 81a942de1..60e8a53c3 100644 --- a/deploy/helm/charts/templates/zfs-controller.yaml +++ b/deploy/helm/charts/templates/zfs-controller.yaml @@ -131,6 +131,14 @@ spec: value: "{{ if (not (hasKey .Values.analytics "installerType")) }}zfs-localpv-helm{{ else }}{{ .Values.analytics.installerType }}{{ end }}" - name: OPENEBS_IO_ENABLE_ANALYTICS value: "{{ .Values.analytics.enabled }}" + {{- if .Values.analytics.gaId }} + - name: GA_ID + value: {{ .Values.analytics.gaId | quote }} + {{- end }} + {{- if .Values.analytics.gaKey }} + - name: GA_KEY + value: {{ .Values.analytics.gaKey | quote }} + {{- end }} args : - "--endpoint=$(OPENEBS_CSI_ENDPOINT)" - "--plugin=$(OPENEBS_CONTROLLER_DRIVER)" diff --git a/go.mod b/go.mod index bac81ea2a..9c3fa52ae 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/kubernetes-csi/csi-lib-utils v0.9.0 github.com/onsi/ginkgo v1.16.5 github.com/onsi/gomega v1.27.7 - github.com/openebs/google-analytics-4 v0.2.1 + github.com/openebs/google-analytics-4 v0.3.0 github.com/openebs/lib-csi v0.8.2 github.com/pkg/errors v0.9.1 github.com/spf13/cobra v1.6.0 diff --git a/go.sum b/go.sum index b929702f2..afd808bc2 100644 --- a/go.sum +++ b/go.sum @@ -309,8 +309,8 @@ github.com/onsi/gomega v1.27.3/go.mod h1:5vG284IBtfDAmDyrK+eGyZmUgUlmi+Wngqo557c github.com/onsi/gomega v1.27.4/go.mod h1:riYq/GJKh8hhoM01HN6Vmuy93AarCXCBGpvFDK3q3fQ= github.com/onsi/gomega v1.27.7 h1:fVih9JD6ogIiHUN6ePK7HJidyEDpWGVB5mzM7cWNXoU= github.com/onsi/gomega v1.27.7/go.mod h1:1p8OOlwo2iUUDsHnOrjE5UKYJ+e3W8eQ3qSlRahPmr4= -github.com/openebs/google-analytics-4 v0.2.1 h1:+DgJjcPM3uVyWp9VxvNQgNXCWWv0OFhopijFdPVVX9Q= -github.com/openebs/google-analytics-4 v0.2.1/go.mod h1:lKjvRs6HAYOlOTYjtOUp35iTutoXzRL0hOeVAvLAfZI= +github.com/openebs/google-analytics-4 v0.3.0 h1:rAv9BC476ennyGPWAy4D3vU7TlxEKiynbLUP3VgeBUc= +github.com/openebs/google-analytics-4 v0.3.0/go.mod h1:lKjvRs6HAYOlOTYjtOUp35iTutoXzRL0hOeVAvLAfZI= github.com/openebs/lib-csi v0.8.2 h1:HmoiZX3VXFPglwqnRPnRus7K58ixDWBa19OpPZGk2Ws= github.com/openebs/lib-csi v0.8.2/go.mod h1:4yc0Q1thH+oU80z73zGELfrOw2yeLdLNIRmcrxBxsBc= github.com/pborman/uuid v0.0.0-20170612153648-e790cca94e6c/go.mod h1:VyrYX9gd7irzKovcSS6BIIEwPRkP2Wm2m9ufcdFSJ34=