From d35bb370622341508bca2889c05e9439f01f9681 Mon Sep 17 00:00:00 2001 From: Tamal Saha Date: Tue, 23 Nov 2021 17:09:07 -0800 Subject: [PATCH] Remove Google Analytics (#215) Signed-off-by: Tamal Saha --- apis/installer/v1alpha1/stash_community_types.go | 6 ++---- apis/installer/v1alpha1/stash_enterprise_types.go | 6 ++---- charts/stash-community/README.md | 1 - charts/stash-community/templates/deployment.yaml | 1 - charts/stash-community/values.openapiv3_schema.yaml | 2 -- charts/stash-community/values.yaml | 2 -- charts/stash-enterprise/README.md | 1 - charts/stash-enterprise/templates/deployment.yaml | 1 - charts/stash-enterprise/values.openapiv3_schema.yaml | 2 -- charts/stash-enterprise/values.yaml | 2 -- charts/stash/values.openapiv3_schema.yaml | 4 ---- 11 files changed, 4 insertions(+), 24 deletions(-) diff --git a/apis/installer/v1alpha1/stash_community_types.go b/apis/installer/v1alpha1/stash_community_types.go index 3cb502523..c9d71abce 100644 --- a/apis/installer/v1alpha1/stash_community_types.go +++ b/apis/installer/v1alpha1/stash_community_types.go @@ -78,10 +78,8 @@ type StashCommunitySpec struct { PodSecurityContext *core.PodSecurityContext `json:"podSecurityContext"` ServiceAccount ServiceAccountSpec `json:"serviceAccount"` Apiserver WebHookSpec `json:"apiserver"` - //+optional - EnableAnalytics bool `json:"enableAnalytics"` - Monitoring Monitoring `json:"monitoring"` - Security SecuritySpec `json:"security"` + Monitoring Monitoring `json:"monitoring"` + Security SecuritySpec `json:"security"` //+optional Platform Platform `json:"platform"` // +optional diff --git a/apis/installer/v1alpha1/stash_enterprise_types.go b/apis/installer/v1alpha1/stash_enterprise_types.go index 9ca3fc4c9..e30e16652 100644 --- a/apis/installer/v1alpha1/stash_enterprise_types.go +++ b/apis/installer/v1alpha1/stash_enterprise_types.go @@ -78,10 +78,8 @@ type StashEnterpriseSpec struct { PodSecurityContext *core.PodSecurityContext `json:"podSecurityContext"` ServiceAccount ServiceAccountSpec `json:"serviceAccount"` Apiserver WebHookSpec `json:"apiserver"` - //+optional - EnableAnalytics bool `json:"enableAnalytics"` - Monitoring Monitoring `json:"monitoring"` - Security SecuritySpec `json:"security"` + Monitoring Monitoring `json:"monitoring"` + Security SecuritySpec `json:"security"` //+optional Platform Platform `json:"platform"` //+optional diff --git a/charts/stash-community/README.md b/charts/stash-community/README.md index 668de00bf..73d3def20 100644 --- a/charts/stash-community/README.md +++ b/charts/stash-community/README.md @@ -91,7 +91,6 @@ The following table lists the configurable parameters of the `stash-community` c | apiserver.servingCerts.caCrt | CA certficate used by serving certificate of webhook server. | `""` | | apiserver.servingCerts.serverCrt | Serving certficate used by webhook server. | `""` | | apiserver.servingCerts.serverKey | Private key for the serving certificate used by webhook server. | `""` | -| enableAnalytics | If true, sends usage analytics | `true` | | monitoring.agent | Name of monitoring agent (either "prometheus.io/operator" or "prometheus.io/builtin") | `"none"` | | monitoring.backup | Specify whether to monitor Stash backup and recovery | `false` | | monitoring.operator | Specify whether to monitor Stash operator | `false` | diff --git a/charts/stash-community/templates/deployment.yaml b/charts/stash-community/templates/deployment.yaml index 172c23280..096d85d9a 100644 --- a/charts/stash-community/templates/deployment.yaml +++ b/charts/stash-community/templates/deployment.yaml @@ -56,7 +56,6 @@ spec: - --enable-validating-webhook={{ .Values.apiserver.enableValidatingWebhook }} - --bypass-validating-webhook-xray={{ .Values.apiserver.bypassValidatingWebhookXray }} - --use-kubeapiserver-fqdn-for-aks={{ .Values.apiserver.useKubeapiserverFqdnForAks }} - - --enable-analytics={{ .Values.enableAnalytics }} - --cron-job-psp={{ .Values.security.podSecurityPolicies | join "," }} - --backup-job-psp={{ .Values.security.podSecurityPolicies | join "," }} - --restore-job-psp={{ .Values.security.podSecurityPolicies | join "," }} diff --git a/charts/stash-community/values.openapiv3_schema.yaml b/charts/stash-community/values.openapiv3_schema.yaml index 10f7fc4db..a995f601c 100644 --- a/charts/stash-community/values.openapiv3_schema.yaml +++ b/charts/stash-community/values.openapiv3_schema.yaml @@ -813,8 +813,6 @@ properties: type: object criticalAddon: type: boolean - enableAnalytics: - type: boolean fullnameOverride: type: string imagePullPolicy: diff --git a/charts/stash-community/values.yaml b/charts/stash-community/values.yaml index 898a18e10..244048d09 100644 --- a/charts/stash-community/values.yaml +++ b/charts/stash-community/values.yaml @@ -136,8 +136,6 @@ apiserver: serverCrt: "" # Private key for the serving certificate used by webhook server. serverKey: "" -# If true, sends usage analytics -enableAnalytics: true monitoring: # Name of monitoring agent (either "prometheus.io/operator" or "prometheus.io/builtin") agent: "none" diff --git a/charts/stash-enterprise/README.md b/charts/stash-enterprise/README.md index 720130794..5948de252 100644 --- a/charts/stash-enterprise/README.md +++ b/charts/stash-enterprise/README.md @@ -91,7 +91,6 @@ The following table lists the configurable parameters of the `stash-enterprise` | apiserver.servingCerts.caCrt | CA certficate used by serving certificate of webhook server. | `""` | | apiserver.servingCerts.serverCrt | Serving certficate used by webhook server. | `""` | | apiserver.servingCerts.serverKey | Private key for the serving certificate used by webhook server. | `""` | -| enableAnalytics | If true, sends usage analytics | `true` | | monitoring.agent | Name of monitoring agent (either "prometheus.io/operator" or "prometheus.io/builtin") | `"none"` | | monitoring.backup | Specify whether to monitor Stash backup and recovery | `false` | | monitoring.operator | Specify whether to monitor Stash operator | `false` | diff --git a/charts/stash-enterprise/templates/deployment.yaml b/charts/stash-enterprise/templates/deployment.yaml index a24a6d020..d1ac8c21e 100644 --- a/charts/stash-enterprise/templates/deployment.yaml +++ b/charts/stash-enterprise/templates/deployment.yaml @@ -56,7 +56,6 @@ spec: - --enable-validating-webhook={{ .Values.apiserver.enableValidatingWebhook }} - --bypass-validating-webhook-xray={{ .Values.apiserver.bypassValidatingWebhookXray }} - --use-kubeapiserver-fqdn-for-aks={{ .Values.apiserver.useKubeapiserverFqdnForAks }} - - --enable-analytics={{ .Values.enableAnalytics }} - --cron-job-psp={{ .Values.security.podSecurityPolicies | join "," }} - --backup-job-psp={{ .Values.security.podSecurityPolicies | join "," }} - --restore-job-psp={{ .Values.security.podSecurityPolicies | join "," }} diff --git a/charts/stash-enterprise/values.openapiv3_schema.yaml b/charts/stash-enterprise/values.openapiv3_schema.yaml index 273aebdfa..36b4486bf 100644 --- a/charts/stash-enterprise/values.openapiv3_schema.yaml +++ b/charts/stash-enterprise/values.openapiv3_schema.yaml @@ -813,8 +813,6 @@ properties: type: object criticalAddon: type: boolean - enableAnalytics: - type: boolean fullnameOverride: type: string imagePullPolicy: diff --git a/charts/stash-enterprise/values.yaml b/charts/stash-enterprise/values.yaml index 895cb0b6c..300eb9684 100644 --- a/charts/stash-enterprise/values.yaml +++ b/charts/stash-enterprise/values.yaml @@ -136,8 +136,6 @@ apiserver: serverCrt: "" # Private key for the serving certificate used by webhook server. serverKey: "" -# If true, sends usage analytics -enableAnalytics: true monitoring: # Name of monitoring agent (either "prometheus.io/operator" or "prometheus.io/builtin") agent: "none" diff --git a/charts/stash/values.openapiv3_schema.yaml b/charts/stash/values.openapiv3_schema.yaml index b5b38b1be..21a740444 100644 --- a/charts/stash/values.openapiv3_schema.yaml +++ b/charts/stash/values.openapiv3_schema.yaml @@ -1117,8 +1117,6 @@ properties: type: object criticalAddon: type: boolean - enableAnalytics: - type: boolean fullnameOverride: type: string imagePullPolicy: @@ -2592,8 +2590,6 @@ properties: type: object criticalAddon: type: boolean - enableAnalytics: - type: boolean fullnameOverride: type: string imagePullPolicy: