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 2000226: Unable to have multiple charts in one configmap #33

Merged
merged 6 commits into from Sep 1, 2021

Conversation

dagrayvid
Copy link
Contributor

This PR syncs the downstream repo with upstream, most importantly to fix the referenced BZ.

The other minor changes from upstream:

  • Make sure debug pods in e2e test are assigned to Ready nodes only.
  • Add olm skiprange to the "master copy" of the CSV config/manifests/bases/special-resource-operator.clusterserviceversion.yaml so that future bundle updates will keep the change from Bug 1995110: Set olm.skipRange in clusterserviceversion.yml #32
  • Add pacevedo to reviewers
  • Add upstream fix to infoscale special resource.

/cc @SchSeba

dagrayvid and others added 6 commits September 1, 2021 16:05
…psap#85)

Co-authored-by: Prasanna Deshmukh <Prasanna.deshmukh@veritas.com>
This commit fix and issue when there are multiple charts tgz in one configmap.

```
apiVersion: v1
binaryData:
  dpdk-kni-driver-0.0.1.tgz: .....
  iavf-driver-0.0.1.tgz: .....
  ice-driver-0.0.1.tgz: .....
data:
  index.yaml: |
    apiVersion: v1
    entries:
      dpdk-kni-driver:
      - apiVersion: v2
        appVersion: 1.0.0
        created: "2021-08-31T13:21:54.255042765-04:00"
        description: Simple out of tree driver building using SRO
        digest: 74db1a39bccac21780b5aa07d1414cf74139db0b9e3c25f3ab918a3525ac1f74
        icon: https://avatars.githubusercontent.com/u/55542927
        name: dpdk-kni-driver
        type: application
        urls:
        - cm://oot-driver/charts/dpdk-kni-driver-0.0.1.tgz
        version: 0.0.1
      iavf-driver:
      - apiVersion: v2
        appVersion: 1.0.0
        created: "2021-08-31T13:21:54.255460101-04:00"
        description: Simple out of tree driver building using SRO
        digest: 3340b764c487b0d65e99c6f3508568b90512794a409409e7b3576508c85e110b
        icon: https://avatars.githubusercontent.com/u/55542927
        name: iavf-driver
        type: application
        urls:
        - cm://oot-driver/charts/iavf-driver-0.0.1.tgz
        version: 0.0.1
      ice-driver:
      - apiVersion: v2
        appVersion: 1.0.0
        created: "2021-08-31T13:21:54.255839124-04:00"
        description: Simple out of tree driver building using SRO
        digest: be3fff26a6d96038ab2dd851789f0201515a74daec7c905097da3cba4d1ed16f
        icon: https://avatars.githubusercontent.com/u/55542927
        name: ice-driver
        type: application
        urls:
        - cm://oot-driver/charts/ice-driver-0.0.1.tgz
        version: 0.0.1
    generated: "2021-08-31T13:21:54.254398197-04:00"
kind: ConfigMap
metadata:
  creationTimestamp: "2021-08-31T17:21:54Z"
  name: charts
  namespace: oot-driver
  resourceVersion: "57179188"
  uid: 84b2bb57-4294-4fb8-920b-00450608a58f

```

Signed-off-by: Sebastian Sch <sebassch@gmail.com>
…ft-psap#89)

Co-authored-by: Pablo Acevedo Montserrat <pablo.acevedo.m@gmail.com>
@openshift-ci openshift-ci bot requested a review from SchSeba September 1, 2021 20:13
@openshift-ci
Copy link

openshift-ci bot commented Sep 1, 2021

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

Requesting review from QA contact:
/cc @wabouhamad

In response to this:

Bug 2000226: Unable to have multiple charts in one configmap

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 openshift-ci bot added bugzilla/severity-urgent Referenced Bugzilla bug's severity is urgent 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. labels Sep 1, 2021
@openshift-ci
Copy link

openshift-ci bot commented Sep 1, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dagrayvid

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 openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 1, 2021
Copy link

@wabouhamad wabouhamad 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 openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 1, 2021
@openshift-merge-robot openshift-merge-robot merged commit c0a3539 into openshift:master Sep 1, 2021
@openshift-ci
Copy link

openshift-ci bot commented Sep 1, 2021

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

Bugzilla bug 2000226 has been moved to the MODIFIED state.

In response to this:

Bug 2000226: Unable to have multiple charts in one configmap

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.

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-urgent Referenced Bugzilla bug's severity is urgent 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. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants