improve ci and add memberOf test

.bin/kind-conf.yml

@@ -14,7 +14,7 @@ nodes:
     hostPort: 8080
     protocol: TCP
   - containerPort: 443
-    hostPort: 8443
+    hostPort: 8444
     protocol: TCP
   - containerPort: 30636
     hostPort: 30636

.bin/myval.yaml

@@ -14,18 +14,20 @@ phpldapadmin:
     - "phpldapadmin.example"
 customSchemaFiles:
   00-memberof.ldif: |-
+    # Load memberof module
     dn: cn=module,cn=config
     cn: module
     objectClass: olcModuleList
     olcModuleLoad: memberof
     olcModulePath: /opt/bitnami/openldap/lib/openldap
-  01-memberof.ldif: |-
+
     dn: olcOverlay=memberof,olcDatabase={2}mdb,cn=config
     changetype: add
     objectClass: olcOverlayConfig
     objectClass: olcMemberOf
     olcOverlay: memberof
     olcMemberOfRefint: TRUE
+    
   10_owncloud_schema.ldif: |-
     # This LDIF files describes the ownCloud schema and can be used to
     # add two optional attributes: ownCloudQuota and ownCloudUUID

.bin/singleNode.yaml

@@ -1,4 +1,6 @@
 logLevel: debug
+global:
+  ldapDomain: "singlenode.org"
 resources: 
   limits:
     cpu: "128m"

.github/workflows/ci.yml

@@ -46,7 +46,7 @@ jobs:
         run: |
            echo "test access to openldap database"
            sudo apt-get install -y ldap-utils
-           sleep 30
+           sleep 10
            LDAPTLS_REQCERT=never ldapsearch -x -D 'cn=admin,dc=example,dc=org' -w Not@SecurePassw0rd -H ldaps://localhost:30636 -b 'dc=example,dc=org'
       - name: test phpldapadmin access
         shell: bash
@@ -63,7 +63,8 @@ jobs:
         shell: bash
         run: |
            echo "verify certificate"
-           openssl s_client -showcerts -connect localhost:30636 </dev/null | grep "issuer=CN = example.com"
+           echo | openssl s_client -showcerts -servername example.com -connect localhost:30636 2>/dev/null | openssl x509 -inform pem -noout -text > /tmp/test-cert.txt
+           if ! grep -q "CN = example.com" /tmp/test-cert.txt; then  echo exit 1; fi
       - name: apply chaos tests
         shell: bash
         run: |
@@ -75,7 +76,7 @@ jobs:
            echo "Write test to openldap database"
            LDAPTLS_REQCERT=never ldapadd -x -D 'cn=admin,dc=example,dc=org' -w Not@SecurePassw0rd -H ldaps://localhost:30636 -f  .bin/user.ldif
            LDAPTLS_REQCERT=never ldapsearch -o nettimeout=20 -x -D 'cn=admin,dc=example,dc=org' -w Not@SecurePassw0rd -H ldaps://localhost:30636 -b 'dc=example,dc=org' > /tmp/test-write.txt
-           if [ $(grep "numResponses" /tmp/test-write.txt | cut -d ":" -f 2 | tr -d ' ') -ne 5 ]; then exit 1 ; fi
+           if [ $(grep "numResponses" /tmp/test-write.txt | cut -d ":" -f 2 | tr -d ' ') -ne 9 ]; then exit 1 ; fi
            if ! grep -q "objectClass: ownCloud" /tmp/test-write.txt; then  echo exit 1; fi
       - name: test memberOf
         shell: bash
@@ -101,7 +102,7 @@ jobs:
         run: |
            echo "test access to openldap database"
            sudo apt-get install -y ldap-utils
-           LDAPTLS_REQCERT=never ldapsearch -x -D 'cn=admin,dc=example,dc=org' -w Not@SecurePassw0rd -H ldaps://localhost:30636 -b 'dc=example,dc=org' > /tmp/test-single-node.txt
+           LDAPTLS_REQCERT=never ldapsearch -x -D 'cn=admin,dc=singlenode,dc=org' -w Not@SecurePassw0rd -H ldaps://localhost:30636 -b 'dc=singlenode,dc=org' > /tmp/test-single-node.txt
            cat /tmp/test-single-node.txt
            if [ $(grep "numResponses" /tmp/test-single-node.txt | cut -d ":" -f 2 | tr -d ' ') -ne 6 ]; then exit 1 ; fi
 

advanced_examples/MemberOf.md

@@ -73,7 +73,6 @@ customSchemaFiles:
     olcModuleLoad: memberof
     olcModulePath: /opt/bitnami/openldap/lib/openldap
 
-  01-memberof.ldif: |-
     dn: olcOverlay=memberof,olcDatabase={2}mdb,cn=config
     changetype: add
     objectClass: olcOverlayConfig

values.yaml

@@ -56,8 +56,8 @@ image:
   #repository: bitnami/openldap
   #tag: 2.6.3
   # Temporary fix
-  repository: bitnami/openldap
-  tag: 2.6.6
+  repository: jpgouin/openldap
+  tag: 2.6.6-fix
   pullPolicy: Always
   pullSecrets: []