[blue][RHPAM-4147] - baseFilter(AUTH_LDAP_BASE_FILTER) is incompatibl…

…e with versions earlier than 7.12.0 Signed-off-by: spolti <[email protected]>
kiegroup · Nov 8, 2022 · 402299c · 402299c
1 parent 52ea4e3
commit 402299c
Show file tree

Hide file tree

Showing 8 changed files with 126 additions and 72 deletions.
diff --git a/deploy/crds/kieapp.crd.yaml b/deploy/crds/kieapp.crd.yaml
@@ -64,11 +64,14 @@ spec:
                           the user search.
                         type: string
                       baseFilter:
-                        description: DAP search filter used to locate the context
-                          of the user to authenticate. The input username or userDN
-                          obtained from the login module callback is substituted into
-                          the filter anywhere a {0} expression is used. A common example
-                          for the search filter is (uid={0}).
+                        description: Legacy LDAP search filter used to locate the
+                          context of the user to authenticate. The input username
+                          or userDN obtained from the login module callback is substituted
+                          into the filter anywhere a {0} expression is used. A common
+                          example for the search filter is (uid={0}). For Elytron
+                          based subsystem this property should be configured only
+                          with the search filter parameter, without any search expression.
+                          Example  (uid={0}) became just uid.
                         type: string
                       bindCredential:
                         description: LDAP Credentials used for authentication
@@ -162,7 +165,7 @@ spec:
                           obtained from the login module callback is substituted into
                           the filter anywhere a {0} expression is used. The authenticated
                           userDN is substituted into the filter anywhere a {1} is
-                          used. An example search filter that matches on the input
+                          used. An example search filter that , matches on the input
                           username is (member={0}). An alternative that matches on
                           the authenticated userDN is (member={1}).
                         type: string
@@ -3035,11 +3038,15 @@ spec:
                               begin the user search.
                             type: string
                           baseFilter:
-                            description: DAP search filter used to locate the context
-                              of the user to authenticate. The input username or userDN
-                              obtained from the login module callback is substituted
-                              into the filter anywhere a {0} expression is used. A
-                              common example for the search filter is (uid={0}).
+                            description: Legacy LDAP search filter used to locate
+                              the context of the user to authenticate. The input username
+                              or userDN obtained from the login module callback is
+                              substituted into the filter anywhere a {0} expression
+                              is used. A common example for the search filter is (uid={0}).
+                              For Elytron based subsystem this property should be
+                              configured only with the search filter parameter, without
+                              any search expression. Example  (uid={0}) became just
+                              uid.
                             type: string
                           bindCredential:
                             description: LDAP Credentials used for authentication
@@ -3138,7 +3145,7 @@ spec:
                               substituted into the filter anywhere a {0} expression
                               is used. The authenticated userDN is substituted into
                               the filter anywhere a {1} is used. An example search
-                              filter that matches on the input username is (member={0}).
+                              filter that , matches on the input username is (member={0}).
                               An alternative that matches on the authenticated userDN
                               is (member={1}).
                             type: string

diff --git a/...atalog/dev/8.0.1-1/manifests/bamoe-businessautomation-operator.clusterserviceversion.yaml b/...atalog/dev/8.0.1-1/manifests/bamoe-businessautomation-operator.clusterserviceversion.yaml
@@ -7,7 +7,7 @@ metadata:
     categories: Integration & Delivery
     certified: "false"
     containerImage: quay.io/kiegroup/kie-cloud-operator:8.0.1
-    createdAt: "2022-10-20 14:43:44"
+    createdAt: "2022-11-08 16:39:24"
     description: Deploys and manages IBM Business Automation Manager Open Editions
       environment.
     operators.openshift.io/infrastructure-features: '["Disconnected"]'
@@ -18,7 +18,7 @@ metadata:
     operator-bamoe-businessautomation: "true"
     operatorframework.io/arch.amd64: supported
     operatorframework.io/os.linux: supported
-  name: bamoe-businessautomation-operator.8.0.1-1-dev-6sxfhtw4j6
+  name: bamoe-businessautomation-operator.8.0.1-1-dev-bszd8n8ghk
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -405,7 +405,7 @@ spec:
   - operator
   labels:
     alm-owner-bamoe-businessautomation: bamoe-businessautomation-operator
-    operated-by: bamoe-businessautomation-operator.8.0.1-1-dev-6sxfhtw4j6
+    operated-by: bamoe-businessautomation-operator.8.0.1-1-dev-bszd8n8ghk
   links:
   - name: Product Page
     url: https://ibm.com
@@ -421,5 +421,5 @@ spec:
   selector:
     matchLabels:
       alm-owner-bamoe-businessautomation: bamoe-businessautomation-operator
-      operated-by: bamoe-businessautomation-operator.8.0.1-1-dev-6sxfhtw4j6
-  version: 8.0.1-1+6sxfhtw4j6
+      operated-by: bamoe-businessautomation-operator.8.0.1-1-dev-bszd8n8ghk
+  version: 8.0.1-1+bszd8n8ghk
diff --git a/deploy/olm-catalog/dev/8.0.1-1/manifests/kieapp.crd.yaml b/deploy/olm-catalog/dev/8.0.1-1/manifests/kieapp.crd.yaml
@@ -64,11 +64,14 @@ spec:
                           the user search.
                         type: string
                       baseFilter:
-                        description: DAP search filter used to locate the context
-                          of the user to authenticate. The input username or userDN
-                          obtained from the login module callback is substituted into
-                          the filter anywhere a {0} expression is used. A common example
-                          for the search filter is (uid={0}).
+                        description: Legacy LDAP search filter used to locate the
+                          context of the user to authenticate. The input username
+                          or userDN obtained from the login module callback is substituted
+                          into the filter anywhere a {0} expression is used. A common
+                          example for the search filter is (uid={0}). For Elytron
+                          based subsystem this property should be configured only
+                          with the search filter parameter, without any search expression.
+                          Example  (uid={0}) became just uid.
                         type: string
                       bindCredential:
                         description: LDAP Credentials used for authentication
@@ -162,7 +165,7 @@ spec:
                           obtained from the login module callback is substituted into
                           the filter anywhere a {0} expression is used. The authenticated
                           userDN is substituted into the filter anywhere a {1} is
-                          used. An example search filter that matches on the input
+                          used. An example search filter that , matches on the input
                           username is (member={0}). An alternative that matches on
                           the authenticated userDN is (member={1}).
                         type: string
@@ -3035,11 +3038,15 @@ spec:
                               begin the user search.
                             type: string
                           baseFilter:
-                            description: DAP search filter used to locate the context
-                              of the user to authenticate. The input username or userDN
-                              obtained from the login module callback is substituted
-                              into the filter anywhere a {0} expression is used. A
-                              common example for the search filter is (uid={0}).
+                            description: Legacy LDAP search filter used to locate
+                              the context of the user to authenticate. The input username
+                              or userDN obtained from the login module callback is
+                              substituted into the filter anywhere a {0} expression
+                              is used. A common example for the search filter is (uid={0}).
+                              For Elytron based subsystem this property should be
+                              configured only with the search filter parameter, without
+                              any search expression. Example  (uid={0}) became just
+                              uid.
                             type: string
                           bindCredential:
                             description: LDAP Credentials used for authentication
@@ -3138,7 +3145,7 @@ spec:
                               substituted into the filter anywhere a {0} expression
                               is used. The authenticated userDN is substituted into
                               the filter anywhere a {1} is used. An example search
-                              filter that matches on the input username is (member={0}).
+                              filter that , matches on the input username is (member={0}).
                               An alternative that matches on the authenticated userDN
                               is (member={1}).
                             type: string

diff --git a/...talog/prod/8.0.1-1/manifests/bamoe-businessautomation-operator.clusterserviceversion.yaml b/...talog/prod/8.0.1-1/manifests/bamoe-businessautomation-operator.clusterserviceversion.yaml
@@ -7,7 +7,7 @@ metadata:
     categories: Integration & Delivery
     certified: "true"
     containerImage: registry.stage.redhat.io/ibm-bamoe/bamoe-rhel8-operator:8.0.1
-    createdAt: "2022-10-20 14:43:44"
+    createdAt: "2022-11-08 16:39:24"
     description: Deploys and manages IBM Business Automation Manager Open Editions
       environment.
     operators.openshift.io/infrastructure-features: '["Disconnected"]'

diff --git a/deploy/olm-catalog/prod/8.0.1-1/manifests/kieapp.crd.yaml b/deploy/olm-catalog/prod/8.0.1-1/manifests/kieapp.crd.yaml
@@ -64,11 +64,14 @@ spec:
                           the user search.
                         type: string
                       baseFilter:
-                        description: DAP search filter used to locate the context
-                          of the user to authenticate. The input username or userDN
-                          obtained from the login module callback is substituted into
-                          the filter anywhere a {0} expression is used. A common example
-                          for the search filter is (uid={0}).
+                        description: Legacy LDAP search filter used to locate the
+                          context of the user to authenticate. The input username
+                          or userDN obtained from the login module callback is substituted
+                          into the filter anywhere a {0} expression is used. A common
+                          example for the search filter is (uid={0}). For Elytron
+                          based subsystem this property should be configured only
+                          with the search filter parameter, without any search expression.
+                          Example  (uid={0}) became just uid.
                         type: string
                       bindCredential:
                         description: LDAP Credentials used for authentication
@@ -162,7 +165,7 @@ spec:
                           obtained from the login module callback is substituted into
                           the filter anywhere a {0} expression is used. The authenticated
                           userDN is substituted into the filter anywhere a {1} is
-                          used. An example search filter that matches on the input
+                          used. An example search filter that , matches on the input
                           username is (member={0}). An alternative that matches on
                           the authenticated userDN is (member={1}).
                         type: string
@@ -3035,11 +3038,15 @@ spec:
                               begin the user search.
                             type: string
                           baseFilter:
-                            description: DAP search filter used to locate the context
-                              of the user to authenticate. The input username or userDN
-                              obtained from the login module callback is substituted
-                              into the filter anywhere a {0} expression is used. A
-                              common example for the search filter is (uid={0}).
+                            description: Legacy LDAP search filter used to locate
+                              the context of the user to authenticate. The input username
+                              or userDN obtained from the login module callback is
+                              substituted into the filter anywhere a {0} expression
+                              is used. A common example for the search filter is (uid={0}).
+                              For Elytron based subsystem this property should be
+                              configured only with the search filter parameter, without
+                              any search expression. Example  (uid={0}) became just
+                              uid.
                             type: string
                           bindCredential:
                             description: LDAP Credentials used for authentication
@@ -3138,7 +3145,7 @@ spec:
                               substituted into the filter anywhere a {0} expression
                               is used. The authenticated userDN is substituted into
                               the filter anywhere a {1} is used. An example search
-                              filter that matches on the input username is (member={0}).
+                              filter that , matches on the input username is (member={0}).
                               An alternative that matches on the authenticated userDN
                               is (member={1}).
                             type: string

diff --git a/...talog/test/8.0.1-1/manifests/bamoe-businessautomation-operator.clusterserviceversion.yaml b/...talog/test/8.0.1-1/manifests/bamoe-businessautomation-operator.clusterserviceversion.yaml
@@ -7,7 +7,7 @@ metadata:
     categories: Integration & Delivery
     certified: "true"
     containerImage: registry-proxy.engineering.redhat.com/rh-osbs/bamoe-8-rhpam-rhel8-operator:8.0.1
-    createdAt: "2022-10-20 14:43:44"
+    createdAt: "2022-11-08 16:39:24"
     description: Deploys and manages IBM Business Automation Manager Open Editions
       environment.
     operators.openshift.io/infrastructure-features: '["Disconnected"]'
@@ -18,7 +18,7 @@ metadata:
     operator-bamoe-businessautomation: "true"
     operatorframework.io/arch.amd64: supported
     operatorframework.io/os.linux: supported
-  name: bamoe-businessautomation-operator.8.0.1-1-dev-7xj86rglwn
+  name: bamoe-businessautomation-operator.8.0.1-1-dev-9cp9bt5qrb
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -405,7 +405,7 @@ spec:
   - operator
   labels:
     alm-owner-bamoe-businessautomation: bamoe-businessautomation-operator
-    operated-by: bamoe-businessautomation-operator.8.0.1-1-dev-7xj86rglwn
+    operated-by: bamoe-businessautomation-operator.8.0.1-1-dev-9cp9bt5qrb
   links:
   - name: Product Page
     url: https://ibm.com
@@ -421,5 +421,5 @@ spec:
   selector:
     matchLabels:
       alm-owner-bamoe-businessautomation: bamoe-businessautomation-operator
-      operated-by: bamoe-businessautomation-operator.8.0.1-1-dev-7xj86rglwn
-  version: 8.0.1-1+7xj86rglwn
+      operated-by: bamoe-businessautomation-operator.8.0.1-1-dev-9cp9bt5qrb
+  version: 8.0.1-1+9cp9bt5qrb
diff --git a/deploy/olm-catalog/test/8.0.1-1/manifests/kieapp.crd.yaml b/deploy/olm-catalog/test/8.0.1-1/manifests/kieapp.crd.yaml
@@ -64,11 +64,14 @@ spec:
                           the user search.
                         type: string
                       baseFilter:
-                        description: DAP search filter used to locate the context
-                          of the user to authenticate. The input username or userDN
-                          obtained from the login module callback is substituted into
-                          the filter anywhere a {0} expression is used. A common example
-                          for the search filter is (uid={0}).
+                        description: Legacy LDAP search filter used to locate the
+                          context of the user to authenticate. The input username
+                          or userDN obtained from the login module callback is substituted
+                          into the filter anywhere a {0} expression is used. A common
+                          example for the search filter is (uid={0}). For Elytron
+                          based subsystem this property should be configured only
+                          with the search filter parameter, without any search expression.
+                          Example  (uid={0}) became just uid.
                         type: string
                       bindCredential:
                         description: LDAP Credentials used for authentication
@@ -162,7 +165,7 @@ spec:
                           obtained from the login module callback is substituted into
                           the filter anywhere a {0} expression is used. The authenticated
                           userDN is substituted into the filter anywhere a {1} is
-                          used. An example search filter that matches on the input
+                          used. An example search filter that , matches on the input
                           username is (member={0}). An alternative that matches on
                           the authenticated userDN is (member={1}).
                         type: string
@@ -3035,11 +3038,15 @@ spec:
                               begin the user search.
                             type: string
                           baseFilter:
-                            description: DAP search filter used to locate the context
-                              of the user to authenticate. The input username or userDN
-                              obtained from the login module callback is substituted
-                              into the filter anywhere a {0} expression is used. A
-                              common example for the search filter is (uid={0}).
+                            description: Legacy LDAP search filter used to locate
+                              the context of the user to authenticate. The input username
+                              or userDN obtained from the login module callback is
+                              substituted into the filter anywhere a {0} expression
+                              is used. A common example for the search filter is (uid={0}).
+                              For Elytron based subsystem this property should be
+                              configured only with the search filter parameter, without
+                              any search expression. Example  (uid={0}) became just
+                              uid.
                             type: string
                           bindCredential:
                             description: LDAP Credentials used for authentication
@@ -3138,7 +3145,7 @@ spec:
                               substituted into the filter anywhere a {0} expression
                               is used. The authenticated userDN is substituted into
                               the filter anywhere a {1} is used. An example search
-                              filter that matches on the input username is (member={0}).
+                              filter that , matches on the input username is (member={0}).
                               An alternative that matches on the authenticated userDN
                               is (member={1}).
                             type: string