OCPBUGS-25339: [CARRY] Fix panic issue when annotations map is nil #634

dinhxuanvu · 2023-12-13T14:56:05Z

In some cases, secrets do not have any annotations and the annotations map are nil. The annotations map needs to be initialized to avoid panic error.

openshift-ci-robot · 2023-12-13T14:56:25Z

@dinhxuanvu: This pull request references Jira Issue OCPBUGS-25339, which is invalid:

expected the bug to target either version "4.16." or "openshift-4.16.", but it targets "4.15.0" instead

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

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

In some cases, secrets do not have any annotations and the annotations map are nil. The annotations map needs to be initialized to avoid panic error.

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.

dinhxuanvu · 2023-12-13T14:57:16Z

/jira refresh

openshift-ci-robot · 2023-12-13T14:57:19Z

@dinhxuanvu: This pull request references Jira Issue OCPBUGS-25339, which is invalid:

expected the bug to target either version "4.16." or "openshift-4.16.", but it targets "4.15.z" instead

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

In response to this:

/jira 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.

openshift-ci · 2023-12-13T14:58:52Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dinhxuanvu

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:

~~DOWNSTREAM_OWNERS~~ [dinhxuanvu]

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

dinhxuanvu · 2023-12-13T14:59:05Z

/jira refresh

openshift-ci-robot · 2023-12-13T14:59:11Z

@dinhxuanvu: This pull request references Jira Issue OCPBUGS-25339, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug

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

Requesting review from QA contact:
/cc @jianzhangbjz

In response to this:

/jira 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.

dinhxuanvu · 2023-12-13T15:03:21Z

@tmshort PTAL. Thanks

In some cases, secrets do not have any annotations and the annotations map are nil. The annotations map needs to be initialized to avoid panic error. Signed-off-by: Vu Dinh <[email protected]>

dinhxuanvu · 2023-12-13T15:48:13Z

/cherry-pick release-4.15

openshift-cherrypick-robot · 2023-12-13T15:48:15Z

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

In response to this:

/cherry-pick release-4.15

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.

dinhxuanvu · 2023-12-13T19:07:38Z

/retest

openshift-ci · 2023-12-13T20:19:46Z

@dinhxuanvu: all tests passed!

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

jianzhangbjz · 2023-12-14T02:21:29Z

LGTM, test details see: https://issues.redhat.com/browse/OCPBUGS-25339
/label qe-approved
/lgtm

openshift-ci-robot · 2023-12-14T02:21:36Z

@dinhxuanvu: This pull request references Jira Issue OCPBUGS-25339, which is valid.

3 validation(s) were run on this bug

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

Requesting review from QA contact:
/cc @jianzhangbjz

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

In some cases, secrets do not have any annotations and the annotations map are nil. The annotations map needs to be initialized to avoid panic error.

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 · 2023-12-14T02:26:13Z

@dinhxuanvu: Jira Issue OCPBUGS-25339: All pull requests linked via external trackers have merged:

openshift/operator-framework-olm#634

Jira Issue OCPBUGS-25339 has been moved to the MODIFIED state.

In response to this:

In some cases, secrets do not have any annotations and the annotations map are nil. The annotations map needs to be initialized to avoid panic error.

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 · 2023-12-14T02:27:19Z

@dinhxuanvu: new pull request created: #635

In response to this:

/cherry-pick release-4.15

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-bot · 2023-12-14T03:24:57Z

[ART PR BUILD NOTIFIER]

This PR has been included in build operator-registry-container-v4.16.0-202312140252.p0.g748ebaa.assembly.stream for distgit operator-registry.
All builds following this will include this PR.

openshift-bot · 2023-12-14T03:24:57Z

[ART PR BUILD NOTIFIER]

This PR has been included in build operator-lifecycle-manager-container-v4.16.0-202312140252.p0.g748ebaa.assembly.stream for distgit operator-lifecycle-manager.
All builds following this will include this PR.

grokspawn · 2023-12-14T15:04:08Z

staging/operator-lifecycle-manager/pkg/controller/operators/olm/operator.go

+		if secret.Annotations != nil {
+			if secret.Annotations[install.OpenShiftComponent] == "" {
+				secret.Annotations[install.OpenShiftComponent] = install.OLMOwnershipAnnotation
+			} else {
+				continue
 			}
+		} else {
+			secret.Annotations = map[string]string{}
+			secret.Annotations[install.OpenShiftComponent] = install.OLMOwnershipAnnotation
+		}
+		logger.Debug("injecting ownership annotations to existing secret")
+		if _, updateErr := a.opClient.UpdateSecret(secret); updateErr != nil {
+			logger.WithError(err).Warn("error adding ownership annotations to existing secret")
+			return err


Suggested change

if secret.Annotations != nil {

if secret.Annotations[install.OpenShiftComponent] == "" {

secret.Annotations[install.OpenShiftComponent] = install.OLMOwnershipAnnotation

} else {

continue

}

} else {

secret.Annotations = map[string]string{}

secret.Annotations[install.OpenShiftComponent] = install.OLMOwnershipAnnotation

}

logger.Debug("injecting ownership annotations to existing secret")

if _, updateErr := a.opClient.UpdateSecret(secret); updateErr != nil {

logger.WithError(err).Warn("error adding ownership annotations to existing secret")

return err

if secret.Annotations == nil {

secret.Annotations = map[string]string{}

}

if secret.Annotations[install.OpenShiftComponent] == "" {

secret.Annotations[install.OpenShiftComponent] = install.OLMOwnershipAnnotation

}

logger.Debug("injecting ownership annotations to existing secret")

if _, updateErr := a.opClient.UpdateSecret(secret); updateErr != nil {

logger.WithError(err).Warn("error adding ownership annotations to existing secret")

return err

why not as ^^ ?
(with apologies for the whitespace)

A bit too late but this is a good suggestion. Would have been cleaner. Will correct this if I need to make some further changes on cert ownership area in the future.

tmshort · 2023-12-18T15:47:43Z

@tmshort PTAL. Thanks

Sorry, was on vacation.

dinhxuanvu · 2023-12-18T15:48:26Z

@tmshort PTAL. Thanks

Sorry, was on vacation.

All good. Everything was taken off.

dinhxuanvu changed the title ~~[carry] Fix panic issue when annotations map is nil~~ OCPBUGS-25339: [carry] Fix panic issue when annotations map is nil Dec 13, 2023

openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Dec 13, 2023

openshift-ci bot requested review from ankitathomas and perdasilva December 13, 2023 14:58

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 13, 2023

openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Dec 13, 2023

openshift-ci bot requested a review from jianzhangbjz December 13, 2023 14:59

dinhxuanvu force-pushed the annotations-fix branch 2 times, most recently from fe70a70 to 75ae6c2 Compare December 13, 2023 15:17

[CARRY] Fix panic issue when annotations map is nil

8c7611d

In some cases, secrets do not have any annotations and the annotations map are nil. The annotations map needs to be initialized to avoid panic error. Signed-off-by: Vu Dinh <[email protected]>

dinhxuanvu force-pushed the annotations-fix branch from 75ae6c2 to 8c7611d Compare December 13, 2023 15:47

dinhxuanvu changed the title ~~OCPBUGS-25339: [carry] Fix panic issue when annotations map is nil~~ OCPBUGS-25339: [CARRY] Fix panic issue when annotations map is nil Dec 13, 2023

openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Dec 14, 2023

openshift-ci bot assigned jianzhangbjz Dec 14, 2023

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 14, 2023

openshift-merge-bot bot merged commit 748ebaa into openshift:master Dec 14, 2023

openshift-cherrypick-robot mentioned this pull request Dec 14, 2023

[release-4.15] OCPBUGS-25367: [CARRY] Fix panic issue when annotations map is nil #635

Closed

grokspawn reviewed Dec 14, 2023

View reviewed changes

OCPBUGS-25339: [CARRY] Fix panic issue when annotations map is nil #634

OCPBUGS-25339: [CARRY] Fix panic issue when annotations map is nil #634

Uh oh!

Conversation

dinhxuanvu commented Dec 13, 2023

Uh oh!

openshift-ci-robot commented Dec 13, 2023

Uh oh!

dinhxuanvu commented Dec 13, 2023

Uh oh!

openshift-ci-robot commented Dec 13, 2023

Uh oh!

openshift-ci bot commented Dec 13, 2023

Uh oh!

dinhxuanvu commented Dec 13, 2023

Uh oh!

openshift-ci-robot commented Dec 13, 2023

Uh oh!

dinhxuanvu commented Dec 13, 2023

Uh oh!

dinhxuanvu commented Dec 13, 2023

Uh oh!

openshift-cherrypick-robot commented Dec 13, 2023

Uh oh!

dinhxuanvu commented Dec 13, 2023

Uh oh!

openshift-ci bot commented Dec 13, 2023

Uh oh!

jianzhangbjz commented Dec 14, 2023

Uh oh!

openshift-ci-robot commented Dec 14, 2023

Uh oh!

openshift-ci-robot commented Dec 14, 2023

Uh oh!

openshift-cherrypick-robot commented Dec 14, 2023

Uh oh!

openshift-bot commented Dec 14, 2023

Uh oh!

openshift-bot commented Dec 14, 2023

Uh oh!

grokspawn Dec 14, 2023

Choose a reason for hiding this comment

Uh oh!

dinhxuanvu Dec 14, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

tmshort commented Dec 18, 2023

Uh oh!

dinhxuanvu commented Dec 18, 2023

Uh oh!

Uh oh!

dinhxuanvu Dec 14, 2023 •

edited

Loading