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

Jump to bottom

chore: remove deprecated datadog options #522

Merged
merged 1 commit into from
Oct 7, 2022
Merged

chore: remove deprecated datadog options #522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 0 additions & 16 deletions helm/charts/hydra/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,22 +98,6 @@ spec:
port: {{ .Values.hydra.config.serve.admin.port }}
{{- toYaml .Values.deployment.readinessProbe | nindent 12 }}
env:
{{- if .Values.deployment.tracing.datadog.enabled }}
- name: TRACING_PROVIDER
value: datadog
- name: DD_ENV
value: {{ .Values.deployment.tracing.datadog.env | default "none" | quote }}
- name: DD_VERSION
value: {{ .Values.deployment.tracing.datadog.version | default .Values.image.tag | quote }}
- name: DD_SERVICE
value: {{ .Values.deployment.tracing.datadog.service | default "ory/hydra" | quote }}
{{- if .Values.deployment.tracing.datadog.useHostIP }}
- name: DD_AGENT_HOST
valueFrom:
fieldRef:
fieldPath: status.hostIP
{{- end }}
{{- end }}
{{- $issuer := include "hydra.config.urls.issuer" . -}}
{{- if $issuer }}
- name: URLS_SELF_ISSUER
Expand Down
23 changes: 0 additions & 23 deletions helm/charts/hydra/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,29 +222,6 @@ deployment:
# value: http://$(JAEGER_AGENT_HOST):5778
extraEnv: []

# -- Configuration for tracing providers. Only datadog is currently supported through this block.
# -- If you need to use a different tracing provider, please manually set the configuration values via "hydra.config" or via "deployment.extraEnv".
tracing:
datadog:
enabled: false

# -- Sets the datadog DD_ENV environment variable. This value indicates the environment where hydra is running.
# Default value: "none".
# env: production

# -- Sets the datadog DD_VERSION environment variable. This value indicates the version that hydra is running.
# Default value: .Values.image.tag (i.e. the tag used for the docker image).
# version: X.Y.Z

# -- Sets the datadog DD_SERVICE environment variable. This value indicates the name of the service running.
# Default value: "ory/hydra".
# service: ory/hydra

# -- Sets the datadog DD_AGENT_HOST environment variable. This value indicates the host address of the datadog agent.
# If set to true, this configuration will automatically set DD_AGENT_HOST to the field "status.hostIP" of the pod.
# Default value: false.
# useHostIP: true

# -- Configure node tolerations.
tolerations: []

Expand Down
17 changes: 0 additions & 17 deletions helm/charts/keto/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
{{- $livenessProbe := ternary .Values.deployment.livenessProbe .Values.livenessProbe (not (empty .Values.deployment.livenessProbe )) -}}
{{- $readinessProbe := ternary .Values.deployment.readinessProbe .Values.readinessProbe (not (empty .Values.deployment.readinessProbe )) -}}
{{- $autoscaling := ternary .Values.deployment.autoscaling .Values.autoscaling (not (empty .Values.deployment.autoscaling )) -}}
{{- $tracing := ternary .Values.deployment.tracing .Values.tracing (not (empty .Values.deployment.tracing )) -}}
{{- $resources := ternary .Values.deployment.resources .Values.resources (not (empty .Values.deployment.resources )) -}}
{{- $extraInitContainers := ternary .Values.deployment.extraInitContainers .Values.extraInitContainers (not (empty .Values.deployment.extraInitContainers )) -}}
{{- $extraContainers := ternary .Values.deployment.extraContainers .Values.extraContainers (not (empty .Values.deployment.extraContainers )) -}}
Expand Down Expand Up @@ -135,22 +134,6 @@ spec:
resources:
{{- toYaml $resources | nindent 12 }}
env:
{{- if $tracing.datadog.enabled }}
- name: TRACING_PROVIDER
value: datadog
- name: DD_ENV
value: {{ $tracing.datadog.env | default "none" | quote }}
- name: DD_VERSION
value: {{ $tracing.datadog.version | default .Chart.AppVersion | quote }}
- name: DD_SERVICE
value: {{ $tracing.datadog.service | default "ory/keto" | quote }}
{{- if $tracing.datadog.useHostIP }}
- name: DD_AGENT_HOST
valueFrom:
fieldRef:
fieldPath: status.hostIP
{{- end }}
{{- end }}
- name: DSN
valueFrom:
secretKeyRef:
Expand Down
24 changes: 0 additions & 24 deletions helm/charts/keto/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,30 +297,6 @@ deployment:
# my.special.label/type: value
extraLabels: {}

# -- Configuration for tracing providers. Only datadog is currently supported through this block.
# If you need to use a different tracing provider, please manually set the configuration values
# via "keto.config" or via "extraEnv".
tracing:
datadog:
enabled: false

# Sets the datadog DD_ENV environment variable. This value indicates the environment where keto is running.
# Default value: "none".
# env: production

# Sets the datadog DD_VERSION environment variable. This value indicates the version that keto is running.
# Default value: .Chart.AppVersion (i.e. the tag used for the docker image).
# version: X.Y.Z

# Sets the datadog DD_SERVICE environment variable. This value indicates the name of the service running.
# Default value: "ory/keto".
# service: ory/keto

# Sets the datadog DD_AGENT_HOST environment variable. This value indicates the host address of the datadog agent.
# If set to true, this configuration will automatically set DD_AGENT_HOST to the field "status.hostIP" of the pod.
# Default value: false.
# useHostIP: true

tolerations: []

affinity: {}
Expand Down
16 changes: 0 additions & 16 deletions helm/charts/kratos/templates/deployment-kratos.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,22 +170,6 @@ spec:
- name: DEV_DISABLE_API_FLOW_ENFORCEMENT
value: "true"
{{- end }}
{{- if .Values.deployment.tracing.datadog.enabled }}
- name: TRACING_PROVIDER
value: datadog
- name: DD_ENV
value: {{ .Values.deployment.tracing.datadog.env | default "none" | quote }}
- name: DD_VERSION
value: {{ .Values.deployment.tracing.datadog.version | default .Values.image.tag | quote }}
- name: DD_SERVICE
value: {{ .Values.deployment.tracing.datadog.service | default "ory/kratos" | quote }}
{{- if .Values.deployment.tracing.datadog.useHostIP }}
- name: DD_AGENT_HOST
valueFrom:
fieldRef:
fieldPath: status.hostIP
{{- end }}
{{- end }}
{{- if .Values.deployment.extraEnv }}
{{ toYaml .Values.deployment.extraEnv | indent 12 }}
{{- end }}
Expand Down
27 changes: 2 additions & 25 deletions helm/charts/kratos/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,35 +241,12 @@ deployment:
# - name: ...
# image: ...

# -- Configuration for tracing providers. Only datadog is currently supported through this block.
# If you need to use a different tracing provider, please manually set the configuration values
# via "kratos.config" or via "deployment.extraEnv".
tracing:
datadog:
enabled: false

# Sets the datadog DD_ENV environment variable. This value indicates the environment where kratos is running.
# Default value: "none".
# env: production

# Sets the datadog DD_VERSION environment variable. This value indicates the version that kratos is running.
# Default value: .Values.image.tag (i.e. the tag used for the docker image).
# version: X.Y.Z

# Sets the datadog DD_SERVICE environment variable. This value indicates the name of the service running.
# Default value: "ory/kratos".
# service: ory/kratos

# Sets the datadog DD_AGENT_HOST environment variable. This value indicates the host address of the datadog agent.
# If set to true, this configuration will automatically set DD_AGENT_HOST to the field "status.hostIP" of the pod.
# Default value: false.
# useHostIP: true

resources: {}
# -- Set desired resource parameters
# We usually recommend not to specify default resources and to leave this as a conscious
# choice for the user. This also increases chances charts run on environments with little
# resources, such as Minikube. If you do want to specify resources, uncomment the following
# lines, adjust them as necessary, and remove the curly braces after 'resources:'.
resources: {}
# limits:
# cpu: 100m
# memory: 128Mi
Expand Down
16 changes: 0 additions & 16 deletions helm/charts/oathkeeper/templates/deployment-controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,22 +84,6 @@ spec:
- name: MUTATORS_ID_TOKEN_CONFIG_JWKS_URL
value: "file://{{ .Values.secret.mountPath }}/{{ .Values.secret.filename }}"
{{- end }}
{{- if .Values.deployment.tracing.datadog.enabled }}
- name: TRACING_PROVIDER
value: datadog
- name: DD_ENV
value: {{ .Values.deployment.tracing.datadog.env | default "none" | quote }}
- name: DD_VERSION
value: {{ .Values.deployment.tracing.datadog.version | default .Values.image.tag | quote }}
- name: DD_SERVICE
value: {{ .Values.deployment.tracing.datadog.service | default "ory/oathkeeper" | quote }}
{{- if .Values.deployment.tracing.datadog.useHostIP }}
- name: DD_AGENT_HOST
valueFrom:
fieldRef:
fieldPath: status.hostIP
{{- end }}
{{- end }}
{{- with .Values.deployment.extraEnv }}
{{- toYaml . | nindent 12 }}
{{- end }}
Expand Down
16 changes: 0 additions & 16 deletions helm/charts/oathkeeper/templates/deployment-sidecar.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,22 +89,6 @@ spec:
- name: MUTATORS_ID_TOKEN_CONFIG_JWKS_URL
value: "file://{{ .Values.secret.mountPath }}/{{ .Values.secret.filename }}"
{{- end }}
{{- if .Values.deployment.tracing.datadog.enabled }}
- name: TRACING_PROVIDER
value: datadog
- name: DD_ENV
value: {{ .Values.deployment.tracing.datadog.env | default "none" | quote }}
- name: DD_VERSION
value: {{ .Values.deployment.tracing.datadog.version | default .Values.image.tag | quote }}
- name: DD_SERVICE
value: {{ .Values.deployment.tracing.datadog.service | default "ory/oathkeeper" | quote }}
{{- if .Values.deployment.tracing.datadog.useHostIP }}
- name: DD_AGENT_HOST
valueFrom:
fieldRef:
fieldPath: status.hostIP
{{- end }}
{{- end }}
{{- with .Values.deployment.extraEnv }}
{{- toYaml . | nindent 12 }}
{{- end }}
Expand Down
24 changes: 0 additions & 24 deletions helm/charts/oathkeeper/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,30 +252,6 @@ deployment:
# - name: ...
# image: ...

# -- Configuration for tracing providers. Only datadog is currently supported through this block.
# If you need to use a different tracing provider, please manually set the configuration values
# via "oathkeeper.config" or via "deployment.extraEnv".
tracing:
datadog:
enabled: false

# -- Sets the datadog DD_ENV environment variable. This value indicates the environment where oathkeeper is running.
# Default value: "none".
# env: production

# -- Sets the datadog DD_VERSION environment variable. This value indicates the version that oathkeeper is running.
# Default value: .Values.image.tag (i.e. the tag used for the docker image).
# version: X.Y.Z

# -- Sets the datadog DD_SERVICE environment variable. This value indicates the name of the service running.
# Default value: "ory/oathkeeper".
# service: ory/oathkeeper

# -- Sets the datadog DD_AGENT_HOST environment variable. This value indicates the host address of the datadog agent.
# If set to true, this configuration will automatically set DD_AGENT_HOST to the field "status.hostIP" of the pod.
# Default value: false.
# useHostIP: true

# -- Configure node tolerations.
tolerations: []

Expand Down