diff --git a/.gitignore b/.gitignore index 6bf41fec9..a044a8300 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,5 @@ _testmain.go /.idea /.crds /charts/kubedb/charts + +.DS_Store diff --git a/apis/installer/v1alpha1/kubedb_autoscaler_types.go b/apis/installer/v1alpha1/kubedb_autoscaler_types.go index ca8e84a73..3dd2c340b 100644 --- a/apis/installer/v1alpha1/kubedb_autoscaler_types.go +++ b/apis/installer/v1alpha1/kubedb_autoscaler_types.go @@ -74,9 +74,7 @@ type KubedbAutoscalerSpec struct { PodSecurityContext *core.PodSecurityContext `json:"podSecurityContext"` ServiceAccount ServiceAccountSpec `json:"serviceAccount"` Apiserver WebHookSpec `json:"apiserver"` - // +optional - EnableAnalytics bool `json:"enableAnalytics"` - Monitoring Monitoring `json:"monitoring"` + Monitoring Monitoring `json:"monitoring"` // +optional AdditionalPodSecurityPolicies []string `json:"additionalPodSecurityPolicies"` // +optional diff --git a/apis/installer/v1alpha1/kubedb_community_types.go b/apis/installer/v1alpha1/kubedb_community_types.go index 1b3ebd2bd..e90ae2314 100644 --- a/apis/installer/v1alpha1/kubedb_community_types.go +++ b/apis/installer/v1alpha1/kubedb_community_types.go @@ -75,10 +75,8 @@ type KubedbCommunitySpec struct { ServiceAccount ServiceAccountSpec `json:"serviceAccount"` Apiserver WebHookSpec `json:"apiserver"` // +optional - EnforceTerminationPolicy bool `json:"enforceTerminationPolicy"` - // +optional - EnableAnalytics bool `json:"enableAnalytics"` - Monitoring Monitoring `json:"monitoring"` + EnforceTerminationPolicy bool `json:"enforceTerminationPolicy"` + Monitoring Monitoring `json:"monitoring"` // +optional AdditionalPodSecurityPolicies []string `json:"additionalPodSecurityPolicies"` // +optional diff --git a/apis/installer/v1alpha1/kubedb_enterprise_types.go b/apis/installer/v1alpha1/kubedb_enterprise_types.go index c6bdc4e84..ec5b77bcb 100644 --- a/apis/installer/v1alpha1/kubedb_enterprise_types.go +++ b/apis/installer/v1alpha1/kubedb_enterprise_types.go @@ -74,9 +74,7 @@ type KubedbEnterpriseSpec struct { PodSecurityContext *core.PodSecurityContext `json:"podSecurityContext"` ServiceAccount ServiceAccountSpec `json:"serviceAccount"` Apiserver WebHookSpec `json:"apiserver"` - // +optional - EnableAnalytics bool `json:"enableAnalytics"` - Monitoring Monitoring `json:"monitoring"` + Monitoring Monitoring `json:"monitoring"` // +optional AdditionalPodSecurityPolicies []string `json:"additionalPodSecurityPolicies"` // +optional diff --git a/charts/kubedb-autoscaler/README.md b/charts/kubedb-autoscaler/README.md index 0b2b88a7f..d753038da 100644 --- a/charts/kubedb-autoscaler/README.md +++ b/charts/kubedb-autoscaler/README.md @@ -87,7 +87,6 @@ The following table lists the configurable parameters of the `kubedb-autoscaler` | 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.enabled | If true, enables monitoring KubeDB operator | `false` | | monitoring.agent | Name of monitoring agent ("prometheus.io" or "prometheus.io/operator" or "prometheus.io/builtin") | `""` | | monitoring.serviceMonitor.labels | Specify the labels for ServiceMonitor. Prometheus crd will select ServiceMonitor using these labels. Only usable when monitoring agent is `prometheus.io/operator`. | `{}` | diff --git a/charts/kubedb-autoscaler/templates/deployment.yaml b/charts/kubedb-autoscaler/templates/deployment.yaml index 94511b99a..90a365b95 100644 --- a/charts/kubedb-autoscaler/templates/deployment.yaml +++ b/charts/kubedb-autoscaler/templates/deployment.yaml @@ -48,7 +48,6 @@ spec: - --enable-mutating-webhook={{ .Values.apiserver.enableMutatingWebhook }} - --enable-validating-webhook={{ .Values.apiserver.enableValidatingWebhook }} - --use-kubeapiserver-fqdn-for-aks={{ .Values.apiserver.useKubeapiserverFqdnForAks }} - - --enable-analytics={{ .Values.enableAnalytics }} - --update-interval={{ .Values.updateInterval }} - --prometheus-address={{.Values.storageAutoscaler.prometheus.address}} {{- if .Values.storageAutoscaler.prometheus.caCert }} diff --git a/charts/kubedb-autoscaler/values.openapiv3_schema.yaml b/charts/kubedb-autoscaler/values.openapiv3_schema.yaml index 87630b93e..49a761565 100644 --- a/charts/kubedb-autoscaler/values.openapiv3_schema.yaml +++ b/charts/kubedb-autoscaler/values.openapiv3_schema.yaml @@ -821,8 +821,6 @@ properties: type: object criticalAddon: type: boolean - enableAnalytics: - type: boolean fullnameOverride: type: string imagePullPolicy: diff --git a/charts/kubedb-autoscaler/values.yaml b/charts/kubedb-autoscaler/values.yaml index 438984102..797a6264d 100644 --- a/charts/kubedb-autoscaler/values.yaml +++ b/charts/kubedb-autoscaler/values.yaml @@ -123,8 +123,6 @@ apiserver: serverCrt: "" # Private key for the serving certificate used by webhook server. serverKey: "" -# If true, sends usage analytics -enableAnalytics: true monitoring: # If true, enables monitoring KubeDB operator enabled: false diff --git a/charts/kubedb-community/README.md b/charts/kubedb-community/README.md index 564389a05..25f8376e7 100644 --- a/charts/kubedb-community/README.md +++ b/charts/kubedb-community/README.md @@ -87,7 +87,6 @@ The following table lists the configurable parameters of the `kubedb-community` | apiserver.servingCerts.serverCrt | Serving certficate used by webhook server. | `""` | | apiserver.servingCerts.serverKey | Private key for the serving certificate used by webhook server. | `""` | | enforceTerminationPolicy | If true, namespace deletion will fail if it has a KubeDB resource with terminationPolicy DoNotTerminate | `true` | -| enableAnalytics | If true, sends usage analytics | `true` | | monitoring.enabled | If true, enables monitoring KubeDB operator | `false` | | monitoring.agent | Name of monitoring agent ("prometheus.io" or "prometheus.io/operator" or "prometheus.io/builtin") | `""` | | monitoring.serviceMonitor.labels | Specify the labels for ServiceMonitor. Prometheus crd will select ServiceMonitor using these labels. Only usable when monitoring agent is `prometheus.io/operator`. | `{}` | diff --git a/charts/kubedb-community/templates/deployment.yaml b/charts/kubedb-community/templates/deployment.yaml index b7896bb24..e366b0255 100644 --- a/charts/kubedb-community/templates/deployment.yaml +++ b/charts/kubedb-community/templates/deployment.yaml @@ -49,7 +49,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 }} {{- if include "appscode.license" . }} - --license-file=/var/run/secrets/appscode/license/key.txt {{- end }} diff --git a/charts/kubedb-community/values.openapiv3_schema.yaml b/charts/kubedb-community/values.openapiv3_schema.yaml index 89967eef3..82345956b 100644 --- a/charts/kubedb-community/values.openapiv3_schema.yaml +++ b/charts/kubedb-community/values.openapiv3_schema.yaml @@ -821,8 +821,6 @@ properties: type: object criticalAddon: type: boolean - enableAnalytics: - type: boolean enforceTerminationPolicy: type: boolean fullnameOverride: diff --git a/charts/kubedb-community/values.yaml b/charts/kubedb-community/values.yaml index 821ff507a..260adc050 100644 --- a/charts/kubedb-community/values.yaml +++ b/charts/kubedb-community/values.yaml @@ -123,8 +123,6 @@ apiserver: serverKey: "" # If true, namespace deletion will fail if it has a KubeDB resource with terminationPolicy DoNotTerminate enforceTerminationPolicy: true -# If true, sends usage analytics -enableAnalytics: true monitoring: # If true, enables monitoring KubeDB operator enabled: false diff --git a/charts/kubedb-enterprise/README.md b/charts/kubedb-enterprise/README.md index d0ce2d3a9..cb956ca92 100644 --- a/charts/kubedb-enterprise/README.md +++ b/charts/kubedb-enterprise/README.md @@ -86,7 +86,6 @@ The following table lists the configurable parameters of the `kubedb-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.enabled | If true, enables monitoring KubeDB operator | `false` | | monitoring.agent | Name of monitoring agent ("prometheus.io" or "prometheus.io/operator" or "prometheus.io/builtin") | `""` | | monitoring.serviceMonitor.labels | Specify the labels for ServiceMonitor. Prometheus crd will select ServiceMonitor using these labels. Only usable when monitoring agent is `prometheus.io/operator`. | `{}` | diff --git a/charts/kubedb-enterprise/templates/deployment.yaml b/charts/kubedb-enterprise/templates/deployment.yaml index 8ca88374f..f3c7be8c5 100644 --- a/charts/kubedb-enterprise/templates/deployment.yaml +++ b/charts/kubedb-enterprise/templates/deployment.yaml @@ -49,7 +49,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 }} {{- if include "appscode.license" . }} - --license-file=/var/run/secrets/appscode/license/key.txt {{- end }} diff --git a/charts/kubedb-enterprise/values.openapiv3_schema.yaml b/charts/kubedb-enterprise/values.openapiv3_schema.yaml index d304373d3..20c7ecddd 100644 --- a/charts/kubedb-enterprise/values.openapiv3_schema.yaml +++ b/charts/kubedb-enterprise/values.openapiv3_schema.yaml @@ -821,8 +821,6 @@ properties: type: object criticalAddon: type: boolean - enableAnalytics: - type: boolean fullnameOverride: type: string imagePullPolicy: diff --git a/charts/kubedb-enterprise/values.yaml b/charts/kubedb-enterprise/values.yaml index 58c573020..4de622147 100644 --- a/charts/kubedb-enterprise/values.yaml +++ b/charts/kubedb-enterprise/values.yaml @@ -121,8 +121,6 @@ apiserver: serverCrt: "" # Private key for the serving certificate used by webhook server. serverKey: "" -# If true, sends usage analytics -enableAnalytics: true monitoring: # If true, enables monitoring KubeDB operator enabled: false diff --git a/charts/kubedb/values.openapiv3_schema.yaml b/charts/kubedb/values.openapiv3_schema.yaml index daab494a9..7e12ec256 100644 --- a/charts/kubedb/values.openapiv3_schema.yaml +++ b/charts/kubedb/values.openapiv3_schema.yaml @@ -888,8 +888,6 @@ properties: type: object criticalAddon: type: boolean - enableAnalytics: - type: boolean fullnameOverride: type: string imagePullPolicy: @@ -2230,8 +2228,6 @@ properties: type: object criticalAddon: type: boolean - enableAnalytics: - type: boolean enforceTerminationPolicy: type: boolean fullnameOverride: @@ -3504,8 +3500,6 @@ properties: type: object criticalAddon: type: boolean - enableAnalytics: - type: boolean fullnameOverride: type: string imagePullPolicy: