[stable/openldap] Fix for "spec.clusterIP: Invalid value" error on up…

…grade see - helm#13646 Signed-off-by: Jyrno Ader <jyrno42@gmail.com>
Jyrno42 · Dec 6, 2019 · f73fd3b · f73fd3b
1 parent 49b2a46
commit f73fd3b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/stable/openldap/Chart.yaml b/stable/openldap/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: openldap
 home: https://www.openldap.org
-version: 1.2.2
+version: 1.2.3
 appVersion: 2.4.48
 description: Community developed LDAP software
 icon: http://www.openldap.org/images/headers/LDAPworm.gif

diff --git a/stable/openldap/README.md b/stable/openldap/README.md
@@ -34,7 +34,7 @@ The following table lists the configurable parameters of the openldap chart and
 | `podAnnotations`                   | Annotations to add to the pod                                                                                                             | `{}`                |
 | `existingSecret`                   | Use an existing secret for admin and config user passwords                                                                                | `""`                |
 | `service.annotations`              | Annotations to add to the service                                                                                                         | `{}`                |
-| `service.clusterIP`                | IP address to assign to the service                                                                                                       | `""`                |
+| `service.clusterIP`                | IP address to assign to the service                                                                                                       | `nil`                |
 | `service.externalIPs`              | Service external IP addresses                                                                                                             | `[]`                |
 | `service.ldapPort`                 | External service port for LDAP                                                                                                            | `389`               |
 | `service.loadBalancerIP`           | IP address to assign to load balancer (if supported)                                                                                      | `""`                |

diff --git a/stable/openldap/templates/service.yaml b/stable/openldap/templates/service.yaml
@@ -15,7 +15,7 @@ metadata:
 {{ toYaml .Values.extraLabels | indent 4 }}
 {{- end }}
 spec:
-  clusterIP: {{ .Values.service.clusterIP | quote }}
+  {{ with .Values.service.clusterIP }}clusterIP: {{ . }}{{ end }}
 {{- if .Values.service.externalIPs }}
   externalIPs:
 {{ toYaml .Values.service.externalIPs | indent 4 }}

diff --git a/stable/openldap/values.yaml b/stable/openldap/values.yaml
@@ -38,7 +38,7 @@ extraLabels: {}
 podAnnotations: {}
 service:
   annotations: {}
-  clusterIP: ""
+  clusterIP: nil
 
   ldapPort: 389
   sslLdapPort: 636  # Only used if tls.enabled is true