Bug 1883847: Fix subscription name issue for OCS #6860

a2batic · 2020-10-07T12:09:30Z

Removes subscription name dependencies for feature detection in OCS

bipuladh · 2020-10-08T04:15:33Z

frontend/packages/ceph-storage-plugin/src/features.ts

+    // eslint-disable-next-line dot-notation
+    const ocsItems = ocsCSV['items'] as ClusterServiceVersionKind[];


Suggested change

// eslint-disable-next-line dot-notation

const ocsItems = ocsCSV['items'] as ClusterServiceVersionKind[];

const csvItems = ocsList.items as ClusterServiceVersionKind[];

csvItems will not be an array by type, so using dot-notation will throw compile-time error.

bipuladh · 2020-10-08T04:19:35Z

frontend/packages/ceph-storage-plugin/src/features.ts

+    const ocsCSV = await fetchK8s(ClusterServiceVersionModel, '', CEPH_STORAGE_NAMESPACE);
+    // eslint-disable-next-line dot-notation
+    const ocsItems = ocsCSV['items'] as ClusterServiceVersionKind[];
+    const ocsObj = ocsItems.find((obj) => getName(obj).includes(OCS_OPERATOR));


Suggested change

const ocsObj = ocsItems.find((obj) => getName(obj).includes(OCS_OPERATOR));

const ocsCSV = csvItems.find((obj) => getName(obj).includes(OCS_OPERATOR));

bipuladh · 2020-10-08T04:19:44Z

frontend/packages/ceph-storage-plugin/src/features.ts


-    const support = getAnnotations(ocsCSV)[OCS_SUPPORT_ANNOTATION];
+    const support = getAnnotations(ocsObj)[OCS_SUPPORT_ANNOTATION];


Suggested change

const support = getAnnotations(ocsObj)[OCS_SUPPORT_ANNOTATION];

const support = getAnnotations(ocsCSV)[OCS_SUPPORT_ANNOTATION];

bipuladh · 2020-10-08T04:20:12Z

frontend/packages/ceph-storage-plugin/src/features.ts

-      subscription?.status?.currentCSV,
-      CEPH_STORAGE_NAMESPACE,
-    );
+    const ocsCSV = await fetchK8s(ClusterServiceVersionModel, '', CEPH_STORAGE_NAMESPACE);


Suggested change

const ocsCSV = await fetchK8s(ClusterServiceVersionModel, '', CEPH_STORAGE_NAMESPACE);

const csvList = await fetchK8s(ClusterServiceVersionModel, '', CEPH_STORAGE_NAMESPACE);

bipuladh

Why not do this?

bipuladh · 2020-10-08T13:41:45Z

frontend/packages/ceph-storage-plugin/src/features.ts

+    // eslint-disable-next-line dot-notation
+    const csvItems = csvList['items'] as ClusterServiceVersionKind[];


Suggested change

// eslint-disable-next-line dot-notation

const csvItems = csvList['items'] as ClusterServiceVersionKind[];

const csvItems = csvList?.items as ClusterServiceVersionKind[];

csvItems will not be an array by type, so using dot-notation will throw compile-time error.

openshift-ci-robot · 2020-10-08T14:16:24Z

@a2batic: This pull request references Bugzilla bug 1883847, which is invalid:

expected the bug to target the "4.7.0" release, but it targets "4.6.0" instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

Bug 1883847: Fix subscription name issue for OCS

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

bipuladh · 2020-10-08T14:28:03Z

/bugzilla refresh

openshift-ci-robot · 2020-10-08T14:28:11Z

@bipuladh: This pull request references Bugzilla bug 1883847, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.7.0) matches configured target release for branch (4.7.0)
bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

/bugzilla refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

bipuladh · 2020-10-08T14:34:40Z

frontend/packages/ceph-storage-plugin/src/features.ts

+    const csvList = await fetchK8s(ClusterServiceVersionModel, '', CEPH_STORAGE_NAMESPACE);
+    // eslint-disable-next-line dot-notation
+    const csvItems = csvList['items'] as ClusterServiceVersionKind[];


Suggested change

const csvList = await fetchK8s(ClusterServiceVersionModel, '', CEPH_STORAGE_NAMESPACE);

// eslint-disable-next-line dot-notation

const csvItems = csvList['items'] as ClusterServiceVersionKind[];

const csvList: any = await fetchK8s(ClusterServiceVersionModel, '', CEPH_STORAGE_NAMESPACE);

const csvItems = csvList.items as ClusterServiceVersionKind[];

Signed-off-by: Kanika Murarka <kmurarka@redhat.com>

a2batic · 2020-10-08T15:07:04Z

/retest

bipuladh · 2020-10-08T15:14:15Z

/lgtm

openshift-ci-robot · 2020-10-08T15:14:33Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: a2batic, bipuladh

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~frontend/packages/ceph-storage-plugin/OWNERS~~ [bipuladh]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

bipuladh · 2020-10-08T15:15:54Z

/cherrypick release-4.6

openshift-cherrypick-robot · 2020-10-08T15:15:55Z

@bipuladh: once the present PR merges, I will cherry-pick it on top of release-4.6 in a new PR and assign it to you.

In response to this:

/cherrypick release-4.6

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

bipuladh · 2020-10-08T15:16:08Z

@bipuladh: once the present PR merges, I will cherry-pick it on top of release-4.6 in a new PR and assign it to you.

Thank you

openshift-bot · 2020-10-08T15:21:01Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-10-08T15:33:32Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-10-08T16:25:25Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-10-08T16:38:23Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-10-08T17:56:24Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-ci-robot · 2020-10-08T23:36:00Z

@a2batic: An error was encountered searching for bug 1883847 on the Bugzilla server at https://bugzilla.redhat.com:

response code 500 not 200
Please contact an administrator to resolve this issue, then request a bug refresh with /bugzilla refresh.

In response to this:

Bug 1883847: Fix subscription name issue for OCS

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

openshift-cherrypick-robot · 2020-10-08T23:36:20Z

@bipuladh: new pull request created: #6880

In response to this:

/cherrypick release-4.6

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

openshift-ci-robot added the component/ceph Related to ceph-storage-plugin label Oct 7, 2020

openshift-ci-robot requested review from gnehapk and rawagner October 7, 2020 12:09

bipuladh suggested changes Oct 8, 2020

View reviewed changes

a2batic force-pushed the feature branch from 6c99df9 to 34a8905 Compare October 8, 2020 12:26

bipuladh reviewed Oct 8, 2020

View reviewed changes

a2batic changed the title ~~Fix subscription name issue for OCS~~ Bug 1883847: Fix subscription name issue for OCS Oct 8, 2020

openshift-ci-robot added the bugzilla/severity-urgent Referenced Bugzilla bug's severity is urgent for the branch this PR is targeting. label Oct 8, 2020

openshift-ci-robot added the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Oct 8, 2020

openshift-ci-robot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Oct 8, 2020

openshift-ci-robot removed the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Oct 8, 2020

bipuladh suggested changes Oct 8, 2020

View reviewed changes

Fix subscription name issue for OCS

b76979d

Signed-off-by: Kanika Murarka <kmurarka@redhat.com>

a2batic force-pushed the feature branch from 34a8905 to b76979d Compare October 8, 2020 15:00

openshift-ci-robot assigned bipuladh Oct 8, 2020

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Oct 8, 2020

openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 8, 2020

openshift-merge-robot merged commit 96c2242 into openshift:master Oct 8, 2020

openshift-cherrypick-robot mentioned this pull request Oct 8, 2020

[release-4.6] Bug 1886651: Fix subscription name issue for OCS #6880

Merged

spadgett added this to the v4.7 milestone Oct 13, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bug 1883847: Fix subscription name issue for OCS #6860

Bug 1883847: Fix subscription name issue for OCS #6860

a2batic commented Oct 7, 2020

bipuladh Oct 8, 2020

a2batic Oct 8, 2020

bipuladh Oct 8, 2020

bipuladh Oct 8, 2020

bipuladh Oct 8, 2020

bipuladh left a comment

bipuladh Oct 8, 2020

a2batic Oct 8, 2020

openshift-ci-robot commented Oct 8, 2020

bipuladh commented Oct 8, 2020

openshift-ci-robot commented Oct 8, 2020

bipuladh Oct 8, 2020

a2batic commented Oct 8, 2020

bipuladh commented Oct 8, 2020

openshift-ci-robot commented Oct 8, 2020

bipuladh commented Oct 8, 2020

openshift-cherrypick-robot commented Oct 8, 2020

bipuladh commented Oct 8, 2020

openshift-bot commented Oct 8, 2020

openshift-bot commented Oct 8, 2020

openshift-bot commented Oct 8, 2020

openshift-bot commented Oct 8, 2020

openshift-bot commented Oct 8, 2020

openshift-ci-robot commented Oct 8, 2020

openshift-cherrypick-robot commented Oct 8, 2020

		// eslint-disable-next-line dot-notation
		const ocsItems = ocsCSV['items'] as ClusterServiceVersionKind[];

	// eslint-disable-next-line dot-notation
	const ocsItems = ocsCSV['items'] as ClusterServiceVersionKind[];
	const csvItems = ocsList.items as ClusterServiceVersionKind[];

	const ocsObj = ocsItems.find((obj) => getName(obj).includes(OCS_OPERATOR));
	const ocsCSV = csvItems.find((obj) => getName(obj).includes(OCS_OPERATOR));


		const support = getAnnotations(ocsCSV)[OCS_SUPPORT_ANNOTATION];
		const support = getAnnotations(ocsObj)[OCS_SUPPORT_ANNOTATION];

	const ocsCSV = await fetchK8s(ClusterServiceVersionModel, '', CEPH_STORAGE_NAMESPACE);
	const csvList = await fetchK8s(ClusterServiceVersionModel, '', CEPH_STORAGE_NAMESPACE);

		// eslint-disable-next-line dot-notation
		const csvItems = csvList['items'] as ClusterServiceVersionKind[];

	// eslint-disable-next-line dot-notation
	const csvItems = csvList['items'] as ClusterServiceVersionKind[];
	const csvItems = csvList?.items as ClusterServiceVersionKind[];

Bug 1883847: Fix subscription name issue for OCS #6860

Bug 1883847: Fix subscription name issue for OCS #6860

Conversation

a2batic commented Oct 7, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bipuladh left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

openshift-ci-robot commented Oct 8, 2020

bipuladh commented Oct 8, 2020

openshift-ci-robot commented Oct 8, 2020

Choose a reason for hiding this comment

a2batic commented Oct 8, 2020

bipuladh commented Oct 8, 2020

openshift-ci-robot commented Oct 8, 2020

bipuladh commented Oct 8, 2020

openshift-cherrypick-robot commented Oct 8, 2020

bipuladh commented Oct 8, 2020

openshift-bot commented Oct 8, 2020

openshift-bot commented Oct 8, 2020

openshift-bot commented Oct 8, 2020

openshift-bot commented Oct 8, 2020

openshift-bot commented Oct 8, 2020

openshift-ci-robot commented Oct 8, 2020

openshift-cherrypick-robot commented Oct 8, 2020