Merge branch 'stable' into hotfix-1.1.8

Author: BertrandGouny

README.md

@@ -102,7 +102,7 @@ in case the image should be delivered complete with test data - this is especial
 
 For more information about docker data volume, please refer to:
 
-> [https://docs.docker.com/userguide/dockervolumes/](https://docs.docker.com/userguide/dockervolumes/)
+> [https://docs.docker.com/engine/tutorials/dockervolumes/](https://docs.docker.com/engine/tutorials/dockervolumes/)
 
 
 #### Edit your server configuration
@@ -121,7 +121,7 @@ simply mount this directories as a volume to `/var/lib/ldap` and `/etc/ldap/slap
 	--detach osixia/openldap:1.1.7
 
 You can also use data volume containers. Please refer to:
-> [https://docs.docker.com/userguide/dockervolumes/](https://docs.docker.com/userguide/dockervolumes/)
+> [https://docs.docker.com/engine/tutorials/dockervolumes/](https://docs.docker.com/engine/tutorials/dockervolumes/)
 
 Note: By default this image is waiting an **hdb**  database backend, if you want to use any other database backend set backend type via the LDAP_BACKEND environement variable.
 

example/kubernetes/simple/ldap-rc.yaml …e/kubernetes/simple/ldap-deployment.yamlexample/kubernetes/simple/ldap-rc.yaml renamed to example/kubernetes/simple/ldap-deployment.yaml example/kubernetes/simple/ldap-rc.yaml renamed to example/kubernetes/simple/ldap-deployment.yaml

@@ -1,13 +1,11 @@
-apiVersion: v1
-kind: ReplicationController
+apiVersion: extensions/v1beta1
+kind: Deployment
 metadata:
-  name: ldap-controller
+  name: ldap
   labels:
     app: ldap
 spec:
   replicas: 1
-  selector:
-    app: ldap
   template:
     metadata:
       labels:
@@ -71,32 +69,13 @@ spec:
               value: "true"
             - name: LDAP_SSL_HELPER_PREFIX
               value: "ldap"
-        - name: ldap-backup
-          image: osixia/openldap-backup:0.1.11
-          volumeMounts:
-            - name: ldap-data
-              mountPath: /var/lib/ldap
-            - name: ldap-config
-              mountPath: /etc/ldap/slapd.d
-            - name: ldap-backup
-              mountPath: /data/backup
-          env:
-            - name: LDAP_BACKUP_CONFIG_CRON_EXP
-              value: "15 1 * * *"
-            - name: LDAP_BACKUP_DATA_CRON_EXP
-              value: "20 1 * * *"
-            - name: LDAP_BACKUP_TTL
-              value: "15"
       volumes:
         - name: ldap-data
           hostPath:
             path: "/data/ldap/db"
         - name: ldap-config
           hostPath:
             path: "/data/ldap/config"
-        - name: ldap-backup
-          hostPath:
-            path: "/data/ldap/backup"
         - name: ldap-certs
           hostPath:
             path: "/data/ldap/certs"

example/kubernetes/simple/ldap-svc.yaml …mple/kubernetes/simple/ldap-service.yamlexample/kubernetes/simple/ldap-svc.yaml renamed to example/kubernetes/simple/ldap-service.yaml example/kubernetes/simple/ldap-svc.yaml renamed to example/kubernetes/simple/ldap-service.yaml

@@ -1,13 +1,11 @@
-apiVersion: v1
-kind: ReplicationController
+apiVersion: extensions/v1beta1
+kind: Deployment
 metadata:
-  name: ldap-controller
+  name: ldap
   labels:
     app: ldap
 spec:
   replicas: 1
-  selector:
-    app: ldap
   template:
     metadata:
       labels:
@@ -31,32 +29,13 @@ spec:
           ports:
             - containerPort: 389
               name: openldap
-        - name: ldap-backup
-          image: osixia/openldap-backup:0.1.11
-          volumeMounts:
-            - name: ldap-data
-              mountPath: /var/lib/ldap
-            - name: ldap-config
-              mountPath: /etc/ldap/slapd.d
-            - name: ldap-backup
-              mountPath: /data/backup
-          env:
-            - name: LDAP_BACKUP_CONFIG_CRON_EXP
-              value: "15 1 * * *"
-            - name: LDAP_BACKUP_DATA_CRON_EXP
-              value: "20 1 * * *"
-            - name: LDAP_BACKUP_TTL
-              value: "15"
       volumes:
         - name: ldap-data
           hostPath:
             path: "/data/ldap/db"
         - name: ldap-config
           hostPath:
             path: "/data/ldap/config"
-        - name: ldap-backup
-          hostPath:
-            path: "/data/ldap/backup"
         - name: ldap-certs
           hostPath:
             path: "/data/ldap/certs"