Support uninstallation on intra-dependency

Makefile

@@ -100,9 +100,6 @@ BUNDLE_DEFAULT_CHANNEL := --default-channel=$(DEFAULT_CHANNEL)
 endif
 BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL)
 
-# Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
-CRD_OPTIONS ?= "crd:trivialVersions=true"
-
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))
 GOBIN=$(shell go env GOPATH)/bin
@@ -199,7 +196,7 @@ deploy-e2e: kustomize ## Deploy controller in the configured Kubernetes cluster
 ##@ Generate code and manifests
 
 manifests: controller-gen ## Generate manifests e.g. CRD, RBAC etc.
-	$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=operand-deployment-lifecycle-manager webhook paths="./..." output:crd:artifacts:config=config/crd/bases
+	$(CONTROLLER_GEN) crd rbac:roleName=operand-deployment-lifecycle-manager webhook paths="./..." output:crd:artifacts:config=config/crd/bases
 
 generate: controller-gen ## Generate code e.g. API etc.
 	$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."

api/v1alpha1/operandbindinfo_types.go

@@ -118,7 +118,7 @@ type OperandBindInfoStatus struct {
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
 
-// OperandBindInfo is the Schema for the operandbindinfoes API.
+// OperandBindInfo is the Schema for the operandbindinfoes API. Documentation For additional details regarding install parameters check https://ibm.biz/icpfs39install. License By installing this product you accept the license terms https://ibm.biz/icpfs39license
 // +kubebuilder:subresource:status
 // +kubebuilder:resource:path=operandbindinfos,shortName=opbi,scope=Namespaced
 // +kubebuilder:printcolumn:name="Age",type=date,JSONPath=.metadata.creationTimestamp

api/v1alpha1/operandconfig_types.go

@@ -117,7 +117,7 @@ type CrStatus struct {
 	CrStatus map[string]ServicePhase `json:"customResourceStatus,omitempty"`
 }
 
-// OperandConfig is the Schema for the operandconfigs API.
+// OperandConfig is the Schema for the operandconfigs API. Documentation For additional details regarding install parameters check https://ibm.biz/icpfs39install. License By installing this product you accept the license terms https://ibm.biz/icpfs39license
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
 // +kubebuilder:resource:path=operandconfigs,shortName=opcon,scope=Namespaced

api/v1alpha1/operandregistry_types.go

@@ -148,7 +148,7 @@ type ReconcileRequest struct {
 // +kubebuilder:printcolumn:name="Created At",type=string,JSONPath=.metadata.creationTimestamp
 // +operator-sdk:csv:customresourcedefinitions:displayName="OperandRegistry"
 
-// OperandRegistry is the Schema for the operandregistries API.
+// OperandRegistry is the Schema for the operandregistries API. Documentation For additional details regarding install parameters check https://ibm.biz/icpfs39install. License By installing this product you accept the license terms https://ibm.biz/icpfs39license
 type OperandRegistry struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`

api/v1alpha1/operandrequest_types.go

@@ -245,7 +245,7 @@ type MemberStatus struct {
 // +kubebuilder:printcolumn:name="Created At",type=string,JSONPath=.metadata.creationTimestamp
 // +operator-sdk:csv:customresourcedefinitions:displayName="OperandRequest"
 
-// OperandRequest is the Schema for the operandrequests API.
+// OperandRequest is the Schema for the operandrequests API. Documentation For additional details regarding install parameters check https://ibm.biz/icpfs39install. License By installing this product you accept the license terms https://ibm.biz/icpfs39license
 type OperandRequest struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`

api/v1alpha1/operatorconfig_types.go

@@ -68,7 +68,7 @@ type OperatorConfigStatus struct {
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
 
-// OperatorConfig is the Schema for the operatorconfigs API
+// OperatorConfig is the Schema for the operatorconfigs API. Documentation For additional details regarding install parameters check https://ibm.biz/icpfs39install. License By installing this product you accept the license terms https://ibm.biz/icpfs39license
 type OperatorConfig struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`

bundle.Dockerfile

@@ -7,7 +7,7 @@ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
 LABEL operators.operatorframework.io.bundle.package.v1=ibm-odlm
 LABEL operators.operatorframework.io.bundle.channels.v1=v4.3
 LABEL operators.operatorframework.io.bundle.channel.default.v1=v4.3
-LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.29.0
+LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.32.0
 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3
 

bundle/manifests/operand-deployment-lifecycle-manager.clusterserviceversion.yaml

@@ -129,12 +129,12 @@ metadata:
     categories: Developer Tools, Monitoring, Logging & Tracing, Security
     certified: "false"
     containerImage: icr.io/cpopen/odlm:latest
-    createdAt: "2024-03-29T03:10:47Z"
+    createdAt: "2024-04-02T02:16:34Z"
     description: The Operand Deployment Lifecycle Manager provides a Kubernetes CRD-based API to manage the lifecycle of operands.
     nss.operator.ibm.com/managed-operators: ibm-odlm
     olm.skipRange: '>=1.2.0 <4.3.0'
     operators.openshift.io/infrastructure-features: '["disconnected"]'
-    operators.operatorframework.io/builder: operator-sdk-v1.29.0
+    operators.operatorframework.io/builder: operator-sdk-v1.32.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: https://github.com/IBM/operand-deployment-lifecycle-manager
     support: IBM
@@ -149,7 +149,7 @@ spec:
   apiservicedefinitions: {}
   customresourcedefinitions:
     owned:
-      - description: OperandBindInfo is the Schema for the operandbindinfoes API.
+      - description: OperandBindInfo is the Schema for the operandbindinfoes API. Documentation For additional details regarding install parameters check https://ibm.biz/icpfs39install. License By installing this product you accept the license terms https://ibm.biz/icpfs39license
         displayName: OperandBindInfo
         kind: OperandBindInfo
         name: operandbindinfos.operator.ibm.com
@@ -160,7 +160,7 @@ spec:
             x-descriptors:
               - urn:alm:descriptor:io.kubernetes.phase
         version: v1alpha1
-      - description: OperandConfig is the Schema for the operandconfigs API.
+      - description: OperandConfig is the Schema for the operandconfigs API. Documentation For additional details regarding install parameters check https://ibm.biz/icpfs39install. License By installing this product you accept the license terms https://ibm.biz/icpfs39license
         displayName: OperandConfig
         kind: OperandConfig
         name: operandconfigs.operator.ibm.com
@@ -175,7 +175,7 @@ spec:
             x-descriptors:
               - urn:alm:descriptor:io.kubernetes.phase
         version: v1alpha1
-      - description: OperandRegistry is the Schema for the operandregistries API.
+      - description: OperandRegistry is the Schema for the operandregistries API. Documentation For additional details regarding install parameters check https://ibm.biz/icpfs39install. License By installing this product you accept the license terms https://ibm.biz/icpfs39license
         displayName: OperandRegistry
         kind: OperandRegistry
         name: operandregistries.operator.ibm.com
@@ -195,7 +195,7 @@ spec:
             x-descriptors:
               - urn:alm:descriptor:io.kubernetes.phase
         version: v1alpha1
-      - description: OperandRequest is the Schema for the operandrequests API.
+      - description: OperandRequest is the Schema for the operandrequests API. Documentation For additional details regarding install parameters check https://ibm.biz/icpfs39install. License By installing this product you accept the license terms https://ibm.biz/icpfs39license
         displayName: OperandRequest
         kind: OperandRequest
         name: operandrequests.operator.ibm.com
@@ -215,7 +215,9 @@ spec:
             x-descriptors:
               - urn:alm:descriptor:io.kubernetes.phase
         version: v1alpha1
-      - kind: OperatorConfig
+      - description: OperatorConfig is the Schema for the operatorconfigs API
+        displayName: Operator Config
+        kind: OperatorConfig
         name: operatorconfigs.operator.ibm.com
         version: v1alpha1
   description: |-
@@ -567,19 +569,19 @@ spec:
       clusterPermissions:
         - rules:
             - apiGroups:
-                - operators.coreos.com
+                - operator.ibm.com
               resources:
-                - catalogsources
+                - auditloggings
+                - certmanagers
               verbs:
+                - delete
                 - get
             - apiGroups:
-                - operator.ibm.com
+                - operators.coreos.com
               resources:
-                - certmanagers
-                - auditloggings
+                - catalogsources
               verbs:
                 - get
-                - delete
           serviceAccountName: operand-deployment-lifecycle-manager
       deployments:
         - label:
@@ -674,6 +676,21 @@ spec:
                 terminationGracePeriodSeconds: 10
       permissions:
         - rules:
+            - apiGroups:
+                - ""
+              resources:
+                - configmaps
+                - namespaces
+                - secrets
+                - services
+              verbs:
+                - create
+                - delete
+                - get
+                - list
+                - patch
+                - update
+                - watch
             - apiGroups:
                 - '*'
               resources:
@@ -686,24 +703,39 @@ spec:
                 - patch
                 - update
                 - watch
+            - apiGroups:
+                - k8s.keycloak.org
+              resources:
+                - keycloakrealmimports
+                - keycloaks
+              verbs:
+                - create
+                - delete
+                - get
+                - list
+                - patch
+                - update
+                - watch
             - apiGroups:
                 - operator.ibm.com
               resources:
                 - operandconfigs
-                - operandconfigs/status
                 - operandconfigs/finalizers
+                - operandconfigs/status
+              verbs:
+                - create
+                - delete
+                - get
+                - list
+                - patch
+                - update
+                - watch
+            - apiGroups:
+                - operator.ibm.com
+              resources:
                 - operandregistries
-                - operandregistries/status
                 - operandregistries/finalizers
-                - operandrequests
-                - operandrequests/status
-                - operandrequests/finalizers
-                - operandbindinfos
-                - operandbindinfos/status
-                - operandbindinfos/finalizers
-                - operatorconfigs
-                - operatorconfigs/status
-                - operatorconfigs/finalizers
+                - operandregistries/status
               verbs:
                 - create
                 - delete
@@ -713,12 +745,11 @@ spec:
                 - update
                 - watch
             - apiGroups:
-                - ""
+                - operator.ibm.com
               resources:
-                - configmaps
-                - secrets
-                - services
-                - namespaces
+                - operandrequests
+                - operandrequests/finalizers
+                - operandrequests/status
               verbs:
                 - create
                 - delete
@@ -728,9 +759,11 @@ spec:
                 - update
                 - watch
             - apiGroups:
-                - route.openshift.io
+                - operator.ibm.com
               resources:
-                - routes
+                - operatorconfigs
+                - operatorconfigs/finalizers
+                - operatorconfigs/status
               verbs:
                 - create
                 - delete
@@ -742,8 +775,8 @@ spec:
             - apiGroups:
                 - operators.coreos.com
               resources:
-                - operatorgroups
-                - installplans
+                - clusterserviceversions
+                - subscriptions
               verbs:
                 - create
                 - delete
@@ -753,9 +786,10 @@ spec:
                 - update
                 - watch
             - apiGroups:
-                - k8s.keycloak.org
+                - operators.coreos.com
               resources:
-                - keycloaks
+                - installplans
+                - operatorgroups
               verbs:
                 - create
                 - delete
@@ -774,6 +808,18 @@ spec:
                 - patch
                 - update
                 - watch
+            - apiGroups:
+                - route.openshift.io
+              resources:
+                - routes
+              verbs:
+                - create
+                - delete
+                - get
+                - list
+                - patch
+                - update
+                - watch
           serviceAccountName: operand-deployment-lifecycle-manager
     strategy: deployment
   installModes: