Skip to content

Add packagemanifest CRD in test ENV #1080

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ibm-ci-bot merged 2 commits into from
Sep 18, 2024
Merged

Add packagemanifest CRD in test ENV #1080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7cd9ba
Add packagemanifest CRD in test ENV
Daniel-Fan Sep 16, 2024
f1f61bf
update test cases
Daniel-Fan Sep 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions common/Makefile.common.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,9 @@ fetch-test-crds:
tar -zxf v${NAMESPACESCOPE_VERSION}.tar.gz ibm-namespace-scope-operator-${NAMESPACESCOPE_VERSION}/bundle/manifests && mv ibm-namespace-scope-operator-${NAMESPACESCOPE_VERSION}/bundle/manifests/operator.ibm.com_namespacescopes.yaml ${ENVCRDS_DIR}/operator.ibm.com_namespacescopes.yaml ;\
rm -rf ibm-namespace-scope-operator-${NAMESPACESCOPE_VERSION} v${NAMESPACESCOPE_VERSION}.tar.gz ;\
}
@{ \
cp ./controllers/testutil/packagemanifests_crd.yaml ${ENVCRDS_DIR}/packagemanifests_crd.yaml ;\
}


CONTROLLER_GEN ?= $(shell pwd)/common/bin/controller-gen
Expand Down
5 changes: 4 additions & 1 deletion controllers/operandrequest/operandrequest_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,9 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (_ ctrl.Re
if err := r.Client.Status().Patch(ctx, requestInstance, client.MergeFrom(existingInstance)); err != nil && !apierrors.IsNotFound(err) {
reconcileErr = utilerrors.NewAggregate([]error{reconcileErr, fmt.Errorf("error while patching OperandRequest.Status: %v", err)})
}
if reconcileErr != nil {
klog.Errorf("failed to patch status for OperandRequest %s: %v", req.NamespacedName.String(), reconcileErr)
}
}()

// Remove finalizer when DeletionTimestamp none zero
Expand Down Expand Up @@ -180,7 +183,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (_ ctrl.Re
}

klog.V(1).Infof("Finished reconciling OperandRequest: %s", req.NamespacedName)
return ctrl.Result{RequeueAfter: constant.DefaultSyncPeriod}, nil
return ctrl.Result{RequeueAfter: constant.DefaultSyncPeriod}, reconcileErr
}

func (r *Reconciler) checkPermission(ctx context.Context, req ctrl.Request) bool {
Expand Down
2 changes: 1 addition & 1 deletion controllers/operandrequest/reconcile_operator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -763,7 +763,7 @@ func checkSubAnnotationsForUninstall(reqName, reqNs, opName, installMode string,
uninstallOperator = false
}

if _, ok := sub.Labels[constant.OpreqLabel]; !ok {
if value, ok := sub.Labels[constant.OpreqLabel]; !ok || value != "true" {
uninstallOperator = false
}

Expand Down
39 changes: 39 additions & 0 deletions controllers/operandrequest/reconcile_operator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,9 @@ func TestCheckSubAnnotationsForUninstall(t *testing.T) {
reqNsNew + "." + reqNameB + "." + opNameV4 + "/request": opChannelV4,
reqNsNew + "." + reqNameB + "." + opNameV4 + "/operatorNamespace": reqNsNew,
},
Labels: map[string]string{
constant.OpreqLabel: "true",
},
},
}

Expand All @@ -198,6 +201,9 @@ func TestCheckSubAnnotationsForUninstall(t *testing.T) {
reqNsNew + "." + reqNameB + "." + opNameV4 + "/request": opChannelV4,
reqNsNew + "." + reqNameB + "." + opNameV4 + "/operatorNamespace": reqNsNew,
},
Labels: map[string]string{
constant.OpreqLabel: "true",
},
},
}

Expand All @@ -224,6 +230,9 @@ func TestCheckSubAnnotationsForUninstall(t *testing.T) {
reqNsOld + "." + reqNameD + "." + opNameD + "/request": opChannelD,
reqNsOld + "." + reqNameD + "." + opNameD + "/operatorNamespace": reqNsOld,
},
Labels: map[string]string{
constant.OpreqLabel: "true",
},
},
}

Expand All @@ -250,6 +259,9 @@ func TestCheckSubAnnotationsForUninstall(t *testing.T) {
reqNsOld + "." + reqNameB + "." + opNameV4 + "/request": opChannelV4,
reqNsOld + "." + reqNameB + "." + opNameV4 + "/operatorNamespace": reqNsOld,
},
Labels: map[string]string{
constant.OpreqLabel: "true",
},
},
}

Expand All @@ -275,6 +287,9 @@ func TestCheckSubAnnotationsForUninstall(t *testing.T) {
reqNsNew + "." + reqNameB + "." + opNameV4 + "/request": opChannelV4,
reqNsNew + "." + reqNameB + "." + opNameV4 + "/operatorNamespace": reqNsNew,
},
Labels: map[string]string{
constant.OpreqLabel: "true",
},
},
}

Expand All @@ -287,4 +302,28 @@ func TestCheckSubAnnotationsForUninstall(t *testing.T) {
assert.NotContains(t, sub.Annotations, reqNsNew+"."+reqNameA+"."+opNameV4+"/operatorNamespace")
assert.Contains(t, sub.Annotations, reqNsNew+"."+reqNameB+"."+opNameV4+"/request")
assert.Contains(t, sub.Annotations, reqNsNew+"."+reqNameB+"."+opNameV4+"/operatorNamespace")

// Test case 8: uninstallOperator is false, uninstallOperand is true for operator with general installMode
// The operator should be NOT uninstalled because operator is not been managed by ODLM.
// The operand should be uninstalled because no other OperandRequest is requesting the same operand.
sub = &olmv1alpha1.Subscription{
ObjectMeta: metav1.ObjectMeta{
Namespace: reqNsOld,
Annotations: map[string]string{
reqNsOld + "." + reqNameA + "." + opNameV4 + "/request": opChannelV4,
reqNsOld + "." + reqNameA + "." + opNameV4 + "/operatorNamespace": reqNsOld,
},
Labels: map[string]string{
constant.OpreqLabel: "false",
},
},
}

uninstallOperator, uninstallOperand = checkSubAnnotationsForUninstall(reqNameA, reqNsOld, opNameV4, operatorv1alpha1.InstallModeNamespace, sub)

assert.False(t, uninstallOperator)
assert.True(t, uninstallOperand)

assert.NotContains(t, sub.Annotations, reqNsOld+"."+reqNameA+"."+opNameV4+"/request")
assert.NotContains(t, sub.Annotations, reqNsOld+"."+reqNameA+"."+opNameV4+"/operatorNamespace")
}
2 changes: 1 addition & 1 deletion controllers/operator/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ func (m *ODLMOperator) GetCatalogSourceAndChannelFromPackage(ctx context.Context
switch number {
case 0:
klog.V(2).Infof("Not found PackageManifest %s in the namespace %s has channel %s", packageName, namespace, channel)
return "", "", "", nil
return opregCatalog, opregCatalogNs, channel, nil
default:
// Check if the CatalogSource and CatalogSource namespace are specified in OperandRegistry
if opregCatalog != "" && opregCatalogNs != "" {
Expand Down
164 changes: 164 additions & 0 deletions controllers/testutil/packagemanifests_crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,164 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
name: packagemanifests.packages.operators.coreos.com
spec:
group: packages.operators.coreos.com
versions:
- name: v1
served: true
storage: true
schema:
openAPIV3Schema:
type: object
properties:
spec:
type: object
status:
type: object
properties:
catalogSource:
type: string
catalogSourceDisplayName:
type: string
catalogSourcePublisher:
type: string
catalogSourceNamespace:
type: string
provider:
type: object
properties:
name:
type: string
url:
type: string
packageName:
type: string
deprecation:
type: object
properties:
message:
type: string
channels:
type: array
items:
type: object
properties:
name:
type: string
currentCSV:
type: string
currentCSVDesc:
type: object
properties:
displayName:
type: string
icon:
type: array
items:
type: object
properties:
base64data:
type: string
mediatype:
type: string
version:
type: object
properties:
version:
type: string
provider:
type: object
properties:
name:
type: string
url:
type: string
annotations:
type: object
additionalProperties:
type: string
keywords:
type: array
items:
type: string
links:
type: array
items:
type: object
properties:
name:
type: string
url:
type: string
maintainers:
type: array
items:
type: object
properties:
name:
type: string
email:
type: string
maturity:
type: string
longDescription:
type: string
installModes:
type: array
items:
type: object
properties:
type:
type: string
supported:
type: boolean
customResourceDefinitions:
type: object
apiServiceDefinitions:
type: object
nativeAPIs:
type: array
items:
type: object
properties:
group:
type: string
version:
type: string
kind:
type: string
minKubeVersion:
type: string
relatedImages:
type: array
items:
type: string
deprecation:
type: object
properties:
message:
type: string
entries:
type: array
items:
type: object
properties:
name:
type: string
version:
type: string
deprecation:
type: object
properties:
message:
type: string
defaultChannel:
type: string
names:
plural: packagemanifests
singular: packagemanifest
kind: PackageManifest
shortNames:
- pm
scope: Namespaced