Skip to content
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.

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

Bug 1862500: Use initialization-resource annotation for yaml #6393

Merged
merged 1 commit into from
Sep 8, 2020

Conversation

zherman0
Copy link
Member

@zherman0 zherman0 commented Aug 20, 2020

If the initialization-resource annotation value is set for a CR, use it on the yaml pages instead of the alm-example annotation.

Screenshot_2020-08-20 Create StorageCluster · OKD

Note to self: For testing, use TW's operators that have CR values set in the initialization-resource annotation and then do a patch to change the values from the alm-example: oc patch csv portworx-operator.v1.3.1 --patch "$(cat ~/openshift/portworx-test.json)" --type=merge
and portworx-test.json looks like:

{
  "metadata": {
    "annotations": {
      "operatorframework.io/initialization-resource": "{\n    \"apiVersion\": \"core.libopenstorage.org/v1alpha1\",\n    \"kind\": \"StorageCluster\",\n    \"metadata\": {\n      \"name\": \"portworx-initvalue\",\n      \"namespace\": \"test-operator\"\n    },\n    \"spec\": {\n      \"userInterface\": {\n        \"enabled\": true\n      },\n      \"autopilot\": {\n        \"enabled\": false\n      }\n    }\n  }\n"
    }
  }
}

@openshift-ci-robot openshift-ci-robot added the bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. label Aug 20, 2020
@openshift-ci-robot
Copy link
Contributor

@zherman0: This pull request references Bugzilla bug 1862500, 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.6.0) matches configured target release for branch (4.6.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1862500: Use initialization-resource annotation for yaml

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 openshift-ci-robot added bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. component/olm Related to OLM labels Aug 20, 2020
@openshift-ci-robot
Copy link
Contributor

@zherman0: This pull request references Bugzilla bug 1862500, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.6.0) matches configured target release for branch (4.6.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1862500: Use initialization-resource annotation for yaml

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.

@zherman0
Copy link
Member Author

@spadgett - Reworked my logic and now I handle the combination of almExamples and Initialization-resource examples.

@zherman0
Copy link
Member Author

/retest

Copy link
Member

@spadgett spadgett left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@zherman0 I think it's simpler just to have a query parameter that is passed in the URL saying to use the initialization resource. If it's set, use the initialization resource. Otherwise always use alm-examples like before.

@openshift-ci-robot
Copy link
Contributor

@zherman0: This pull request references Bugzilla bug 1862500, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.6.0) matches configured target release for branch (4.6.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1862500: Use initialization-resource annotation for yaml

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.

@zherman0
Copy link
Member Author

zherman0 commented Sep 4, 2020

/retest

@zherman0
Copy link
Member Author

zherman0 commented Sep 4, 2020

@spadgett - Switched logic to use URL flag. Ready for review.

@zherman0
Copy link
Member Author

zherman0 commented Sep 4, 2020

@spadgett - Moved the check for the URL flag out of the parse helper function.

Copy link
Member

@spadgett spadgett left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Sep 8, 2020
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: spadgett, zherman0

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:

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

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 8, 2020
@openshift-merge-robot openshift-merge-robot merged commit 0a95aa3 into openshift:master Sep 8, 2020
@openshift-ci-robot
Copy link
Contributor

@zherman0: All pull requests linked via external trackers have merged:

Bugzilla bug 1862500 has been moved to the MODIFIED state.

In response to this:

Bug 1862500: Use initialization-resource annotation for yaml

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.

@spadgett spadgett added this to the v4.6 milestone Sep 11, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. component/knative Related to knative-plugin component/olm Related to OLM lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants