Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[TT-10134] Fixed backward compatibility issue caused by analyticsEnabled #123

Merged
merged 4 commits into from
Oct 13, 2023
Merged

[TT-10134] Fixed backward compatibility issue caused by analyticsEnabled #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b749ff1
Enable analytics only if analyticsEnabled or global.components.pump i…
komalsukhani Oct 4, 2023
798eec0
Set analyticsEnabled to empty string by default
komalsukhani Oct 4, 2023
6a25744
Minor fix in indentation
komalsukhani Oct 4, 2023
67b542f
Merge branch 'main' into fix/TT-10134/fix_backward_compatibility_issue
singhpr Oct 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion components/tyk-gateway/templates/deployment-gw-repset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,17 @@ spec:
{{- else}}
value: "file"
{{- end}}

# Set this environment variable only if either analyticsEnabled or global.components.pump is set
{{ if or .Values.gateway.analyticsEnabled ((.Values.global.components).pump) }}
- name: TYK_GW_ENABLEANALYTICS
value: "{{.Values.gateway.analyticsEnabled}}"
{{- if .Values.gateway.analyticsEnabled }}
value: "{{ .Values.gateway.analyticsEnabled }}"
{{- else }}
value: "{{ .Values.global.components.pump }}"
{{- end}}
{{- end}}

- name: TYK_GW_ANALYTICSCONFIG_TYPE
value: "{{.Values.gateway.analyticsConfigType}}"
{{- if .Values.global.remoteControlPlane.enabled }}
Expand Down
5 changes: 3 additions & 2 deletions components/tyk-gateway/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,8 +275,9 @@ gateway:
## readOnly: true
extraVolumeMounts: []

# analyticsEnabled property is used to enable or disable analytics.
analyticsEnabled: "false"
# analyticsEnabled property is used to enable/disable analytics.
# If set to empty or nil, analytics will be enabled/disabled based on `global.components.pump`.
analyticsEnabled: ""

# used to decide whether to send the results back directly to Tyk without a hybrid pump
# if you want to send analytics to control plane instead of pump, change analyticsConfigType to "rpc"
Expand Down
5 changes: 3 additions & 2 deletions tyk-mdcb-data-plane/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,8 +269,9 @@ tyk-gateway:
enabled: false
tags: ""

# analyticsEnabled property is used to enable or disable analytics.
analyticsEnabled: "true"
# analyticsEnabled property is used to enable/disable analytics.
# If set to empty or nil, analytics will be enabled/disabled based on `global.components.pump`.
analyticsEnabled: ""

# used to decide whether to send the results back directly to Tyk without a hybrid pump
# if you want to send analytics to control plane instead of pump, change value to "rpc"
Expand Down
5 changes: 3 additions & 2 deletions tyk-oss/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,8 +230,9 @@ tyk-gateway:
# affinity for gateway pod assignment
affinity: {}

# analyticsEnabled property is used to enable or disable analytics.
analyticsEnabled: "false"
# analyticsEnabled property is used to enable/disable analytics.
# If set to empty or nil, analytics will be enabled/disabled based on `global.components.pump`.
analyticsEnabled: ""

# extraEnvs is used to set gateway env variables
# - name: TYK_GW_HTTPSERVEROPTIONS_SSLINSECURESKIPVERIFY
Expand Down
5 changes: 3 additions & 2 deletions tyk-single-dc/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,8 +222,9 @@ tyk-gateway:
# replicaCount specifies number of replicas to be created if kind is Deployment.
replicaCount: 1

# analyticsEnabled property is used to enable or disable analytics.
analyticsEnabled: "true"
# analyticsEnabled property is used to enable/disable analytics.
# If set to empty or nil, analytics will be enabled/disabled based on `global.components.pump`.
analyticsEnabled: ""

image:
# image repository for Tyk Gateway
Expand Down