From 2390a32f53e239a6969ca6c01e56af243790e505 Mon Sep 17 00:00:00 2001
From: Andrew Suderman <andrew@sudermanjr.com>
Date: Fri, 12 Oct 2018 02:25:25 -0600
Subject: [PATCH] [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>
---
 stable/datadog/Chart.yaml             | 2 +-
 stable/datadog/templates/service.yaml | 6 +++---
 stable/datadog/values.yaml            | 9 ++++-----
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/stable/datadog/Chart.yaml b/stable/datadog/Chart.yaml
index f2f2f6de97..601f5e8e45 100755
--- a/stable/datadog/Chart.yaml
+++ b/stable/datadog/Chart.yaml
@@ -1,5 +1,5 @@
 name: datadog
-version: 1.5.0
+version: 1.5.1
 appVersion: 6.5.2
 description: DataDog Agent
 keywords:
diff --git a/stable/datadog/templates/service.yaml b/stable/datadog/templates/service.yaml
index a096cb17dd..3465d1acb6 100644
--- a/stable/datadog/templates/service.yaml
+++ b/stable/datadog/templates/service.yaml
@@ -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
diff --git a/stable/datadog/values.yaml b/stable/datadog/values.yaml
index ea99af392c..2e72e71be4 100644
--- a/stable/datadog/values.yaml
+++ b/stable/datadog/values.yaml
@@ -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