Skip to content

Sync 07/26 #343

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 16 commits into from
Jul 28, 2022
Merged

Sync 07/26 #343

merged 16 commits into from
Jul 28, 2022

Conversation

timflannagan
Copy link
Contributor

Downstream sync for the registry + API repositories. I excluded upstream OLM from this sync given it's just a single commit that requires explicit manifests changes, and we can tackle that in #326 after this lands.

Also includes the upstream OLM ginkgo v2 commit that was previously added to downstream's denylist of commits. I updated some of the downstream documentation, and silenced the markdown linting violations that were popping up in my local IDE.

@openshift-ci openshift-ci bot requested review from ankitathomas and benluddy July 26, 2022 20:12
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 26, 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 Jul 26, 2022
@timflannagan
Copy link
Contributor Author

/test unit-api

@timflannagan
Copy link
Contributor Author

The API unit tests are passing for me locally:

--- FAIL: Test_RunManifestInspect (0.00s)
    --- FAIL: Test_RunManifestInspect/should_return_the_data_from_the_manifest (0.00s)
        multiarch_test.go:255: runManifestInspect() error = docker pull quay.io/operator-framework/opm:latest failed with error: (exec: "docker": executable file not found in $PATH) , wantErr false

This seems like a potentially problematic test.

@timflannagan
Copy link
Contributor Author

The OLM e2e tests were failing as the ginkgo v2 commit still had ginkgo v1 and v2 modules as direct dependencies, which produced a panic when running in CI and local environments. It looks like this was because we merged some bug fixes during feature and code freeze, so there was some slight skew. I ended up just manually editing those files, and attaching them to the original upstream commit to appease the verify-commits Makefile check.

Removed the o-f/api commit that was producing unit test failures from this PR, and added to that repository's denylist commits. It doesn't feel like we need that to directly live in downstream OLM, at least in the short term, and we can re-evaluate whether that was the right approach over time. I ran the sync automation locally to verify that the api denylist works properly, and zero commits were found, so it looks like covered on that front too.

@timflannagan
Copy link
Contributor Author

/retest

perdasilva and others added 10 commits July 27, 2022 00:06
Signed-off-by: Per Goncalves da Silva <[email protected]>

Co-authored-by: Per Goncalves da Silva <[email protected]>
Signed-off-by: timflannagan <[email protected]>

Upstream-commit: 604825027920cdc52a489669b22f51910cabfa69
Upstream-repository: operator-lifecycle-manager
…enshift#238)

Upstream-repository: api
Upstream-commit: 1c4cba254ffd113aa9c8807f7cc515018e16763c
Signed-off-by: perdasilva <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: 825053335525961a47a66cbcf2c10d51af8186c6
Signed-off-by: perdasilva <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: 2d33c48bad5e099293b200ec0cf7961884765588
Problem: For some reason, a recent PR passed the Sanity check but master
has recorded that it fails the sanity check.

Solution: Update go dependencies

Signed-off-by: Alexander Greene <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: 8a159e87243835a41b281b6b7221c0dca9132561
…, or fail (openshift#988)

Signed-off-by: Jordan Keister <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: 05b1edcf7992c08cf46b87fc874df242a92f61ce
Signed-off-by: Jordan Keister <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: 524a11c9271d1b655d2427d4e7c5d39430faea80
Add the commit from operator-framework/api#233
that requires the 'docker' executable to be present in order to test
code paths added in that PR. Downstream CI doesn't have docker available
in the CI containers, and therefore, CI will fail when running the
staging API unit tests if this commit is present.

Signed-off-by: timflannagan <[email protected]>
Signed-off-by: timflannagan <[email protected]>

Upstream-commit: 0fa6f2930dfd00c43e8e99c821f73f392da26378
Upstream-repository: operator-lifecycle-manager
@timflannagan
Copy link
Contributor Author

It looks like there's no "oc" binary in the e2e test container? Weird.

@timflannagan
Copy link
Contributor Author

[AfterEach] Subscription
/go/src/github.com/openshift/operator-framework-olm/staging/operator-lifecycle-manager/test/e2e/subscription_e2e_test.go:63
collecting the subscription-e2e-gjhts namespace artifacts as the 'choose the dependent package from the catsrc in the same namespace as the installing operator' test case failed
collecting logs in the /logs/artifacts artifacts directory
unable to determine kubeconfig path so defaulting to the $KUBECONFIG value
failed to collect namespace artifacts: exit status 127
tearing down the subscription-e2e-gjhts namespace
resetting e2e kube client
deleting subscription-e2e-gjhts/subscription-e2e-gjhts-operatorgroup
deleting <global>/subscription-e2e-gjhts
garbage collecting CRDs
<< End Captured GinkgoWriter Output
Unexpected error:
<*errors.errorString | 0xc00024e0b0>: {
s: "timed out waiting for the condition",
}
timed out waiting for the condition
occurred
In [BeforeEach] at: /go/src/github.com/openshift/operator-framework-olm/staging/operator-lifecycle-manager/test/e2e/subscription_e2e_test.go:1904
Full Stack Trace
github.com/operator-framework/operator-lifecycle-manager/test/e2e.glob..func25.17.5.1()
/go/src/github.com/openshift/operator-framework-olm/staging/operator-lifecycle-manager/test/e2e/subscription_e2e_test.go:1904 +0x12e9

@timflannagan
Copy link
Contributor Author

It looks like kubectl is present downstream:

sh-4.4$ oc
sh: oc: command not found
sh-4.4$ kubectl

@timflannagan
Copy link
Contributor Author

And more fun in the catalog-operator container logs:

E0727 17:16:13.142754       1 queueinformer_operator.go:290] sync {"update" "subscription-e2e-k5mx2/catsrcdrr9q"} failed: couldn't ensure registry server - error ensuring pod: : error creating new pod: catsrcdrr9q-: pods "catsrcdrr9q-tl9kh" is forbidden: violates PodSecurity "restricted:v1.24": allowPrivilegeEscalation != false (container "configmap-registry-server" must set securityContext.allowPrivilegeEscalation=false), unrestricted capabilities (container "configmap-registry-server" must set securityContext.capabilities.drop=["ALL"]), runAsNonRoot != true (pod or container "configmap-registry-server" must set securityContext.runAsNonRoot=true), seccompProfile (pod or container "configmap-registry-server" must set securityContext.seccompProfile.type to "RuntimeDefault" or "Localhost")

@tylerslaton
Copy link
Contributor

/retest

@timflannagan
Copy link
Contributor Author

/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 27, 2022
@timflannagan
Copy link
Contributor Author

/retest-required

@timflannagan
Copy link
Contributor Author

/test ci/prow/e2e-gcp-olm

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 28, 2022

@timflannagan: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

  • /test e2e-gcp
  • /test e2e-gcp-console-olm
  • /test e2e-gcp-olm
  • /test e2e-upgrade
  • /test images
  • /test unit-api
  • /test unit-olm
  • /test unit-psm
  • /test unit-registry
  • /test verify

The following commands are available to trigger optional jobs:

  • /test e2e-gcp-olm-flaky

Use /test all to run all jobs.

In response to this:

/test ci/prow/e2e-gcp-olm

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.

@timflannagan
Copy link
Contributor Author

The in-flight e2e-gcp-olm is going to fail after poking around the build cluster's console.

/test e2e-gcp-olm

@timflannagan
Copy link
Contributor Author

I cherry-picked the upstream registry ginkgo bump PR, and bumped the root tools.go ginkgo module version so now the root module uses ginkgo v2 for all the staging components.

@openshift-ci openshift-ci bot added the do-not-merge/invalid-owners-file Indicates that a PR should not merge because it has an invalid OWNERS file in it. label Jul 28, 2022
timflannagan and others added 5 commits July 28, 2022 12:47
Signed-off-by: Jordan Keister <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: 2a21178b40325c2082f91f5c5a5ba585770f1196
* go.*,vendor: Bump the github.com/onsi/ginkgo dependency to v2

Signed-off-by: timflannagan <[email protected]>

* *: Migrate the repository to ginkgo v2

Signed-off-by: timflannagan <[email protected]>

Upstream-commit: 6ac352f5ea458ce408c4b987b7946f96aff33ea1
Upstream-repository: operator-registry
* *: Bump go version from 1.17 to 1.18

Signed-off-by: timflannagan <[email protected]>

* Makefile: Install tool dependency using 'go install'

Signed-off-by: timflannagan <[email protected]>

Upstream-repository: api
Upstream-commit: 145f476213bac78aecccbaeabaa34a00843a660f
@openshift-ci openshift-ci bot removed the do-not-merge/invalid-owners-file Indicates that a PR should not merge because it has an invalid OWNERS file in it. label Jul 28, 2022
@timflannagan
Copy link
Contributor Author

/retest

@timflannagan
Copy link
Contributor Author

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 28, 2022
@timflannagan
Copy link
Contributor Author

The upgrade test previously passed but ran into some infra issues. Overriding it in the meantime to try and squeeze this in before the PSA policy changes are re-reverted.

/override ci/prow/e2e-upgrade

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 28, 2022

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

In response to this:

The upgrade test previously passed but ran into some infra issues. Overriding it in the meantime to try and squeeze this in before the PSA policy changes are re-reverted.

/override ci/prow/e2e-upgrade

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.

@tylerslaton
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 28, 2022
@openshift-merge-robot openshift-merge-robot merged commit 3e1dc5c into openshift:master Jul 28, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 28, 2022

@timflannagan: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-gcp-olm-flaky c8ae912 link false /test e2e-gcp-olm-flaky

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.

@timflannagan timflannagan deleted the ginkgo-v2 branch July 28, 2022 19:47
openshift-bot pushed a commit to openshift-bot/operator-framework-olm that referenced this pull request Sep 13, 2024
Upstream-repository: api
Upstream-commit: e12258812235d18efdfa67fe7c0520d2ab3ee639
openshift-bot pushed a commit to openshift-bot/operator-framework-olm that referenced this pull request Sep 21, 2024
Upstream-repository: api
Upstream-commit: e12258812235d18efdfa67fe7c0520d2ab3ee639
openshift-bot pushed a commit to openshift-bot/operator-framework-olm that referenced this pull request Sep 25, 2024
Upstream-repository: api
Upstream-commit: e12258812235d18efdfa67fe7c0520d2ab3ee639
openshift-bot pushed a commit to openshift-bot/operator-framework-olm that referenced this pull request Sep 26, 2024
Upstream-repository: api
Upstream-commit: e12258812235d18efdfa67fe7c0520d2ab3ee639
perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Jan 10, 2025
Upstream-repository: api
Upstream-commit: e12258812235d18efdfa67fe7c0520d2ab3ee639
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.

7 participants