Skip to content

sync: Update staging directories 04-05 #278

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

Merged
merged 6 commits into from
Apr 6, 2022

Conversation

timflannagan
Copy link
Contributor

Update all of the staging directories with the changes that have landed since the initial u/d sync PR.

timflannagan and others added 6 commits April 5, 2022 13:23
Signed-off-by: timflannagan <[email protected]>

Upstream-repository: operator-lifecycle-manager
Upstream-commit: ac3aa278ddc8d59add546bf9e33e583f17d62bb0
The thread-safety logic is flawed and can prevent Operator resources
from being reconciled when component resources are updated. It also
ensures idempotence when enqueuing a resource for reconciliation; In
other words, enqueuing no-ops if the given resource is already in the queue.

The underlying queue will ensure a reconciler never races itself when
processing a given resource event.

Signed-off-by: Nick Hale <[email protected]>

Upstream-repository: operator-lifecycle-manager
Upstream-commit: 3807cc1a01619ddf857009c72ca1712746e8fc01
Signed-off-by: Anik Bhattacharjee <[email protected]>

Upstream-repository: operator-registry
Upstream-commit: b4264e2bfdf9045f79d359c0b09d2b5ffffe620e
While generating a diff from a catalog that has operators that specify dependencies
that are cyclic in nature, eg a->b, b->a, the `opm alpha diff` command hangs. This
was happening because while generating the diff, the command does a breadth-first
search of the dependency graph generated by the operator bundles, but did not keep
a track of the already visited bundles. As a result, when there was a cycle in the
dependency graph, the command was stuck in an infinite loop.

This PR fixes the issue by keeping track of the already visited bundles during the
search, and moving the search forward with only the bundles that haven't been visited
before.

Fixes openshift#936

Signed-off-by: Anik Bhattacharjee <[email protected]>

Upstream-repository: operator-registry
Upstream-commit: de36104087733013025629d80bf8445045a8a6e7
* fix: check for warning when the channel naming does not follow the convention

* applying nit suggestions

* fix-channel-check

* adressing nit review

Upstream-repository: api
Upstream-commit: f718c911ae218fa4362ee60670b6dfc6503a6388
This adds a check to the good practices validator that ensures all CRDs
declared in the bundle have non-empty descriptions. Both owned and
required CRDs will be checked. Note that this validates the CRD
definition in the CSV, not any field in the CRD itself.

Signed-off-by: Ryan King <[email protected]>

Upstream-repository: api
Upstream-commit: a7ebc81c9577a300814448a901edae74c6e6e44e
@openshift-ci openshift-ci bot requested review from awgreene and exdx April 5, 2022 17:29
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 5, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: timflannagan

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 Apr 5, 2022
@timflannagan
Copy link
Contributor Author

/retest-required

2 similar comments
@timflannagan
Copy link
Contributor Author

/retest-required

@timflannagan
Copy link
Contributor Author

/retest-required

@timflannagan
Copy link
Contributor Author

/retest0required

@kevinrizza
Copy link
Member

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 6, 2022
Copy link
Member

@dinhxuanvu dinhxuanvu left a comment

Choose a reason for hiding this comment

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

/lgtm

@timflannagan
Copy link
Contributor Author

: [sig-arch] ocp payload should be based on existing source OLM version should contain the source commit id [Suite:openshift/conformance/parallel]
[It] OLM version should contain the source commit id [Suite:openshift/conformance/parallel]
  github.com/openshift/origin/test/extended/olm/olm.go:141
Apr  6 02:28:46.829: INFO: Running 'oc --kubeconfig=/tmp/kubeconfig-3379498260 get -n openshift-operator-lifecycle-manager pods -l app=catalog-operator -o=jsonpath={.items[0].metadata.name}'
STEP: get olm version from pod catalog-operator-5668fd9856-tjpzn
Apr  6 02:28:47.026: INFO: Running 'oc --kubeconfig=/tmp/kubeconfig-3379498260 exec -n openshift-operator-lifecycle-manager catalog-operator-5668fd9856-tjpzn -c catalog-operator -- olm --version'
Apr  6 02:28:48.370: INFO: olm source git commit ID:cd62315c8fa127132456fff0dcd8dac25f6907ae
Apr  6 02:28:48.370: INFO: Running 'oc --kubeconfig=/tmp/kubeconfig-3379498260 get -n openshift-operator-lifecycle-manager pods -l app=olm-operator -o=jsonpath={.items[0].metadata.name}'
STEP: get olm version from pod olm-operator-d7c55c657-mstn5
Apr  6 02:28:48.666: INFO: Running 'oc --kubeconfig=/tmp/kubeconfig-3379498260 exec -n openshift-operator-lifecycle-manager olm-operator-d7c55c657-mstn5 -c olm-operator -- olm --version'
Apr  6 02:28:49.689: INFO: olm source git commit ID:cd62315c8fa127132456fff0dcd8dac25f6907ae
Apr  6 02:28:49.689: INFO: Running 'oc --kubeconfig=/tmp/kubeconfig-3379498260 get -n openshift-operator-lifecycle-manager pods -l app=packageserver -o=jsonpath={.items[0].metadata.name}'
STEP: get olm version from pod packageserver-76fd8f74c6-6vqht
Apr  6 02:28:49.918: INFO: Running 'oc --kubeconfig=/tmp/kubeconfig-3379498260 exec -n openshift-operator-lifecycle-manager packageserver-76fd8f74c6-6vqht -c packageserver -- olm --version'
Apr  6 02:30:59.782: INFO: Error running /usr/bin/oc --kubeconfig=/tmp/kubeconfig-3379498260 exec -n openshift-operator-lifecycle-manager packageserver-76fd8f74c6-6vqht -c packageserver -- olm --version:
StdOut>
error: error sending request: Post "https://api.ci-op-ftt0msdp-b08f5.XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX:6443/api/v1/namespaces/openshift-operator-lifecycle-manager/pods/packageserver-76fd8f74c6-6vqht/exec?command=olm&command=--version&container=packageserver&stderr=true&stdout=true": dial tcp 35.222.78.106:6443: connect: connection timed out
StdErr>
error: error sending request: Post "https://api.ci-op-ftt0msdp-b08f5.XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX:6443/api/v1/namespaces/openshift-operator-lifecycle-manager/pods/packageserver-76fd8f74c6-6vqht/exec?command=olm&command=--version&container=packageserver&stderr=true&stdout=true": dial tcp 35.222.78.106:6443: connect: connection timed out

Looking at both of those package-server replica logs, it's unclear to me what's the root cause there.

@timflannagan
Copy link
Contributor Author

/override ci/prow/e2e-gcp

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 6, 2022

@timflannagan: Overrode contexts on behalf of timflannagan: ci/prow/e2e-gcp

In response to this:

/override ci/prow/e2e-gcp

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
Copy link
Contributor

openshift-ci bot commented Apr 6, 2022

@timflannagan: 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.

@openshift-merge-robot openshift-merge-robot merged commit 491ea01 into openshift:master Apr 6, 2022
@timflannagan timflannagan deleted the sync/04-05 branch April 6, 2022 12:59
@tylerslaton
Copy link
Contributor

/cherry-pick release-4.10

@openshift-cherrypick-robot

@tylerslaton: #278 failed to apply on top of branch "release-4.10":

Applying: .github: Update the golangci-lint version (#2724)
Using index info to reconstruct a base tree...
M	staging/operator-lifecycle-manager/.github/workflows/sanity.yaml
A	staging/operator-lifecycle-manager/.golangci.yaml
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): staging/operator-lifecycle-manager/.golangci.yaml deleted in HEAD and modified in .github: Update the golangci-lint version (#2724). Version .github: Update the golangci-lint version (#2724) of staging/operator-lifecycle-manager/.golangci.yaml left in tree.
Auto-merging staging/operator-lifecycle-manager/.github/workflows/sanity.yaml
CONFLICT (content): Merge conflict in staging/operator-lifecycle-manager/.github/workflows/sanity.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 .github: Update the golangci-lint version (#2724)
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.10

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. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants