Merge pull request #18 from jp-gouin/dev

Dev
jp-gouin · Mar 13, 2021 · 656a1ab · 656a1ab
2 parents ca2edee + 868583c
commit 656a1ab
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/Chart.yaml b/Chart.yaml
@@ -8,8 +8,8 @@ dependencies:
     version: 0.1.x
     condition: phpldapadmin.enabled
 home: https://www.openldap.org
-version: 2.1.1
-appVersion: 2.4.47
+version: 2.1.2
+appVersion: 2.4.57
 description: Community developed LDAP software
 icon: https://raw.githubusercontent.com/jp-gouin/helm-openldap/master/logo.png
 keywords:

diff --git a/README.md b/README.md
@@ -50,9 +50,9 @@ The following table lists the configurable parameters of the openldap chart and
 | `service.type`                     | Service type can be ClusterIP, NodePort, LoadBalancer                                                                                                                              | `ClusterIP`         |
 | `env`                              | List of key value pairs as env variables to be sent to the docker image. See https://github.com/osixia/docker-openldap for available ones | `[see values.yaml]` |
 | `logLevel`                         | Set the container log level. Valid values: `none`, `error`, `warning`, `info`, `debug`, `trace`                                           | `info`              |
-| `tls.enabled`                      | Set to enable TLS/LDAPS with custom certificate - should also set `tls.secret`                                                                                    | `false`             |
-| `tls.secret`                       | Secret containing TLS cert and key must contain the keys tls.key , tls.crt and ca.crt (if tls.CA.enabled: true)                                                                       | `""`                |
-| `tls.CA.enabled`                   | Set to enable custom CA crt file                                                                         | `false`             |
+| `customTLS.enabled`                      | Set to enable TLS/LDAPS with custom certificate - should also set `tls.secret`                                                                                    | `false`             |
+| `customTLS.secret`                       | Secret containing TLS cert and key must contain the keys tls.key , tls.crt and ca.crt (if tls.CA.enabled: true)                                                                       | `""`                |
+| `customTLS.CA.enabled`                   | Set to enable custom CA crt file                                                                         | `false`             |
 | `adminPassword`                    | Password for admin user. Unset to auto-generate the password                                                                              | None                |
 | `configPassword`                   | Password for config user. Unset to auto-generate the password                                                                             | None                |
 | `customLdifFiles`                  | Custom ldif files to seed the LDAP server. List of filename -> data pairs                                                                 | None                |

diff --git a/templates/statefullset.yaml b/templates/statefullset.yaml
@@ -36,7 +36,7 @@ spec:
         release: {{ .Release.Name }}
     spec:
       initContainers:
-      {{- if .Values.tls.enabled }}
+      {{- if .Values.customTLS.enabled }}
         - name: init-chmod-secret
           image: alpine
           imagePullPolicy: {{ .Values.image.pullPolicy }}
@@ -80,7 +80,7 @@ spec:
             - name: data
               mountPath: /etc/ldap/slapd.d
               subPath: config-data
-{{- if .Values.tls.enabled }}
+{{- if .Values.customTLS.enabled }}
             - name: certs
               mountPath: "/container/service/slapd/assets/certs"
 {{- else }}
@@ -99,12 +99,12 @@ spec:
                   fieldPath: metadata.name
             #- name: HOSTNAME
             #  value: $(POD_NAME).{{ template "openldap.fullname" . }}-headless
-          {{- if .Values.tls.enabled }}
+          {{- if .Values.customTLS.enabled }}
             - name: LDAP_TLS_CRT_FILENAME
               value: tls.crt
             - name: LDAP_TLS_KEY_FILENAME
               value: tls.key
-          {{- if .Values.tls.CA.enabled }}
+          {{- if .Values.customTLS.CA.enabled }}
             - name: LDAP_TLS_CA_CRT_FILENAME
               value: ca.crt
           {{- end }}
@@ -149,10 +149,10 @@ spec:
           configMap:
             name: {{ template "openldap.fullname" . }}-customldif
 {{- end }}
-{{- if .Values.tls.enabled }}
+{{- if .Values.customTLS.enabled }}
         - name: secret-certs
           secret:
-            secretName: {{.Values.tls.secret}}
+            secretName: {{.Values.customTLS.secret}}
         - name: certs
           emptyDir:
             medium: Memory

diff --git a/values.yaml b/values.yaml
@@ -26,7 +26,7 @@ updateStrategy: {}
 image:
   # From repository https://github.com/osixia/docker-openldap
   repository: osixia/openldap
-  tag: 1.4.0
+  tag: 1.5.0
   pullPolicy: Always
   # pullSecret: harbor
 
@@ -37,8 +37,8 @@ logLevel: info
 # Spcifies an existing secret to be used for admin and config user passwords
 existingSecret: ""
 # settings for enabling TLS with custom certificate
-tls:
-  enabled: true
+customTLS:
+  enabled: false
   secret: ""  # The name of a kubernetes.io/tls type secret to use for TLS
   CA:
     enabled: false
@@ -155,7 +155,7 @@ ltb-passwd:
     hosts:
     - "ssl-ldap2.example"
   ldap:
-    server: ldap://openldap-stack-ha
+    server: ldap://openldap-openldap-stack-ha
     searchBase: dc=example,dc=org
     # existingSecret: openldaptest
     bindDN: cn=admin,dc=example,dc=org
@@ -171,7 +171,7 @@ phpldapadmin:
     hosts:
     - phpldapadmin.example
   env:
-    PHPLDAPADMIN_LDAP_HOSTS: openldap-stack-ha
+    PHPLDAPADMIN_LDAP_HOSTS: openldap-openldap-stack-ha
  # TODO make it works
  #     "#PYTHON2BASH:
  #       [{'openldap.openldap':