[datadog] Fixing failed lint when deployment is enabled. (#8343)

* Fixing regression where the service values are not set when the deployment is enabled.
This can be tested by setting deployment.enabled: True and running helm
lint

Signed-off-by: Andrew Suderman <andrew@sudermanjr.com>

* Changing chart version

Signed-off-by: Andrew Suderman <andrew@sudermanjr.com>

* Changing deployment to default false.  Moving service back to top level

Signed-off-by: Andrew Suderman <andrew@sudermanjr.com>

* Moving service under deployment

Signed-off-by: Andrew Suderman <andrew@sudermanjr.com>
This commit is contained in:
Andrew Suderman
2018-10-12 01:25:25 -07:00
committed by k8s-ci-robot
parent 9e8a4dd6e5
commit 2390a32f53
3 changed files with 8 additions and 9 deletions
+1 -1
View File
@@ -1,5 +1,5 @@
name: datadog
version: 1.5.0
version: 1.5.1
appVersion: 6.5.2
description: DataDog Agent
keywords:
+3 -3
View File
@@ -8,12 +8,12 @@ metadata:
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
release: {{ .Release.Name | quote }}
heritage: {{ .Release.Service | quote }}
{{- if .Values.service.annotations }}
{{- if .Values.deployment.service.annotations }}
annotations:
{{ toYaml .Values.service.annotations | indent 4 }}
{{ toYaml .Values.deployment.service.annotations | indent 4 }}
{{- end }}
spec:
type: {{ .Values.serviceType }}
type: {{ .Values.deployment.service.type }}
selector:
app: {{ template "datadog.fullname" . }}
type: deployment
+4 -5
View File
@@ -72,13 +72,12 @@ deployment:
# dogstatsdNodePort: 8125
# traceNodePort: 8126
service:
type: ClusterIP
annotations: {}
## deploy the kube-state-metrics deployment
## ref: https://github.com/kubernetes/charts/tree/master/stable/kube-state-metrics
##
# service:
# type: LoadBalancer
# annotations: {}
kubeStateMetrics:
enabled: true