Merge pull request #734 from spolti/RHPAM-4158

[RHPAM-4158] - CRD conflicts when installing different version of ope…

deploy/olm-catalog/dev/7.12.0-1/manifests/businessautomation-operator.clusterserviceversion.yaml

@@ -7,7 +7,7 @@ metadata:
     categories: Integration & Delivery
     certified: "false"
     containerImage: quay.io/kiegroup/kie-cloud-operator:7.12.0
-    createdAt: "2022-01-12 15:17:07"
+    createdAt: "2022-02-07 17:34:49"
     description: Deploys and manages Red Hat Process Automation Manager and Red Hat
       Decision Manager environments.
     operators.openshift.io/infrastructure-features: '["Disconnected"]'
@@ -18,7 +18,7 @@ metadata:
     operator-businessautomation: "true"
     operatorframework.io/arch.amd64: supported
     operatorframework.io/os.linux: supported
-  name: businessautomation-operator.7.12.0-1-dev-dwmlpnpfrn
+  name: businessautomation-operator.7.12.0-1-dev-l725kgqctp
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -408,7 +408,7 @@ spec:
   - operator
   labels:
     alm-owner-businessautomation: businessautomation-operator
-    operated-by: businessautomation-operator.7.12.0-1-dev-dwmlpnpfrn
+    operated-by: businessautomation-operator.7.12.0-1-dev-l725kgqctp
   links:
   - name: Product Page
     url: https://access.redhat.com/products/red-hat-process-automation-manager
@@ -424,5 +424,5 @@ spec:
   selector:
     matchLabels:
       alm-owner-businessautomation: businessautomation-operator
-      operated-by: businessautomation-operator.7.12.0-1-dev-dwmlpnpfrn
-  version: 7.12.0-1+dwmlpnpfrn
+      operated-by: businessautomation-operator.7.12.0-1-dev-l725kgqctp
+  version: 7.12.0-1+l725kgqctp

deploy/olm-catalog/prod/7.12.0-1/manifests/businessautomation-operator.clusterserviceversion.yaml

@@ -7,7 +7,7 @@ metadata:
     categories: Integration & Delivery
     certified: "true"
     containerImage: registry.stage.redhat.io/rhpam-7/rhpam-rhel8-operator:7.12.0
-    createdAt: "2022-01-12 15:17:07"
+    createdAt: "2022-02-07 17:34:49"
     description: Deploys and manages Red Hat Process Automation Manager and Red Hat
       Decision Manager environments.
     operators.openshift.io/infrastructure-features: '["Disconnected"]'

deploy/olm-catalog/test/7.12.0-1/manifests/businessautomation-operator.clusterserviceversion.yaml

@@ -7,7 +7,7 @@ metadata:
     categories: Integration & Delivery
     certified: "true"
     containerImage: registry-proxy.engineering.redhat.com/rh-osbs/rhpam-7-rhpam-rhel8-operator:7.12.0
-    createdAt: "2022-01-12 15:17:07"
+    createdAt: "2022-02-07 17:34:49"
     description: Deploys and manages Red Hat Process Automation Manager and Red Hat
       Decision Manager environments.
     operators.openshift.io/infrastructure-features: '["Disconnected"]'
@@ -18,7 +18,7 @@ metadata:
     operator-businessautomation: "true"
     operatorframework.io/arch.amd64: supported
     operatorframework.io/os.linux: supported
-  name: businessautomation-operator.7.12.0-1-dev-9sdl7qg8v4
+  name: businessautomation-operator.7.12.0-1-dev-fvqd84gk9c
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -408,7 +408,7 @@ spec:
   - operator
   labels:
     alm-owner-businessautomation: businessautomation-operator
-    operated-by: businessautomation-operator.7.12.0-1-dev-9sdl7qg8v4
+    operated-by: businessautomation-operator.7.12.0-1-dev-fvqd84gk9c
   links:
   - name: Product Page
     url: https://access.redhat.com/products/red-hat-process-automation-manager
@@ -424,5 +424,5 @@ spec:
   selector:
     matchLabels:
       alm-owner-businessautomation: businessautomation-operator
-      operated-by: businessautomation-operator.7.12.0-1-dev-9sdl7qg8v4
-  version: 7.12.0-1+9sdl7qg8v4
+      operated-by: businessautomation-operator.7.12.0-1-dev-fvqd84gk9c
+  version: 7.12.0-1+fvqd84gk9c

pkg/apis/app/v2/kieapp_types.go

@@ -438,6 +438,46 @@ type LDAPAuthConfig struct {
 	// +kubebuilder:validation:Enum:=FOLLOW;IGNORE;THROW
 	// If LDAP referrals should be followed.
 	ReferralMode ReferralModeType `json:"referralMode,omitempty"`
+
+	// +kubebuilder:deprecatedversion
+	// Deprecated - parameter not supported by Elytron
+	// Whether or not the roleAttributeID contains the fully-qualified DN of a role object. If false, the role name is taken from the value of the roleNameAttributeId attribute of the context name. Certain directory schemas, such as Microsoft Active Directory, require this attribute to be set to true.
+	RoleAttributeIsDN bool `json:"roleAttributeIsDN,omitempty"`
+	// +kubebuilder:deprecatedversion
+	// Deprecated - parameter not supported by Elytron
+	// Name of the attribute within the roleCtxDN context which contains the role name. If the roleAttributeIsDN property is set to true, this property is used to find the role object’s name attribute.
+	RoleNameAttributeID string `json:"roleNameAttributeID,omitempty"`
+	// +kubebuilder:deprecatedversion
+	// Deprecated - parameter not supported by Elytron
+	SearchScope string `json:"searchScope,omitempty"`
+	// +kubebuilder:deprecatedversion
+	// Deprecated - parameter not supported by Elytron
+	// The JMX ObjectName of the JaasSecurityDomain used to decrypt the password.
+	JAASSecurityDomain string `json:"jaasSecurityDomain,omitempty"`
+	// +kubebuilder:deprecatedversion
+	// Deprecated - parameter not supported by Elytron
+	// The name of the attribute in the user entry that contains the DN of the user. This may be necessary if the DN of the user itself contains special characters, backslash for example, that prevent correct user mapping. If the attribute does not exist, the entry’s DN is used.
+	DistinguishedNameAttribute string `json:"distinguishedNameAttribute,omitempty"`
+	// +kubebuilder:deprecatedversion
+	// Deprecated - parameter not supported by Elytron
+	// A flag indicating if the DN is to be parsed for the username. If set to true, the DN is parsed for the username. If set to false the DN is not parsed for the username. This option is used together with usernameBeginString and usernameEndString.
+	ParseUsername bool `json:"parseUsername,omitempty"`
+	// +kubebuilder:deprecatedversion
+	// Deprecated - parameter not supported by Elytron
+	// Defines the String which is to be removed from the start of the DN to reveal the username. This option is used together with usernameEndString and only taken into account if parseUsername is set to true.
+	UsernameBeginString string `json:"usernameBeginString,omitempty"`
+	// +kubebuilder:deprecatedversion
+	// Deprecated - parameter not supported by Elytron
+	// Defines the String which is to be removed from the end of the DN to reveal the username. This option is used together with usernameBeginString and only taken into account if parseUsername is set to true.
+	UsernameEndString string `json:"usernameEndString,omitempty"`
+	// +kubebuilder:deprecatedversion
+	// Deprecated - parameter not supported by Elytron
+	// A flag indicating if the DN returned by a query contains the roleNameAttributeID. If set to true, the DN is checked for the roleNameAttributeID. If set to false, the DN is not checked for the roleNameAttributeID. This flag can improve the performance of LDAP queries.
+	ParseRoleNameFromDN bool `json:"parseRoleNameFromDN,omitempty"`
+	// +kubebuilder:deprecatedversion
+	// Deprecated - parameter not supported by Elytron
+	// If you are not using referrals, you can ignore this option. When using referrals, this option denotes the attribute name which contains users defined for a certain role, for example member, if the role object is inside the referral. Users are checked against the content of this attribute name. If this option is not set, the check will always fail, so role objects cannot be stored in a referral tree.
+	ReferralUserAttributeIDToCheck string `json:"referralUserAttributeIDToCheck,omitempty"`
 }
 
 // AuthTemplate Authentication definition used in the template
@@ -464,8 +504,11 @@ type RoleMapperAuthConfig struct {
 	// When set to 'true' the mapped roles will retain all roles, that have defined mappings. Defaults to false.
 	RolesKeepMapped bool `json:"rolesKeepMapped,omitempty"`
 	// When set to 'true' the mapped roles will retain all roles, that have no defined mappings. Defaults to false.
-	RolesKeepNonMapped bool    `json:"rolesKeepNonMapped,omitempty"`
-	From               *ObjRef `json:"from,omitempty"`
+	RolesKeepNonMapped bool `json:"rolesKeepNonMapped,omitempty"`
+	// +kubebuilder:deprecatedversion
+	// Deprecated - parameter not supported by Elytron, instead use RolesKeepMapped and RolesKeepNonMapped
+	ReplaceRole bool    `json:"replaceRole,omitempty"`
+	From        *ObjRef `json:"from,omitempty"`
 }
 
 // ReferralModeType Type used to define how the LDAP will follow referrals