Skip to content

Up down sync #251

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

Closed
wants to merge 96 commits into from
Closed

Up down sync #251

wants to merge 96 commits into from

Conversation

awgreene
Copy link
Contributor

@awgreene awgreene commented Feb 2, 2022

No description provided.

Upstream-repository: api
Upstream-commit: ff6b5ebe3c251e09ef4bf11a6fcd1bd8464be1d6
…penshift#207)

Upstream-repository: api
Upstream-commit: 319988037fc8077cb01cf75005771bc17653059a
@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 2, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 2, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: awgreene

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 approved Indicates a PR has been approved by an approver from all required OWNERS files. do-not-merge/invalid-owners-file Indicates that a PR should not merge because it has an invalid OWNERS file in it. labels Feb 2, 2022
@awgreene awgreene changed the title WIP: Up down sync Up down sync Feb 22, 2022
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 22, 2022
@awgreene awgreene force-pushed the up-down-sync branch 2 times, most recently from c21ca7c to a2a5afb Compare February 22, 2022 20:42
@awgreene
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 Feb 22, 2022
varshaprasad96 and others added 16 commits February 22, 2022 12:47
Some notable bumps in versions:
1. Controller-runtime to 0.11.0
2. Controller-tools to 0.8.0
3. K8s modules to 1.23+
4. Go to 1.17

Upstream-repository: api
Upstream-commit: 12a70c0e4176b7ec7922e2ce3a6b3c94b4f3062d
…mpty (openshift#215)

* fix: alm-example parse check should not fail when the annotation if empty

* applying review

Upstream-repository: api
Upstream-commit: 77b398430e0168ac9339d3a1620715d26ab876d2
Signed-off-by: Frederic Giloux <[email protected]>

Upstream-repository: api
Upstream-commit: 6b187a1d09082142fa12758e1748a132bfe2d79c
Upstream-repository: api
Upstream-commit: 330a17e17dcad64d42756656a4e5f3c278829b4d
Upstream-repository: api
Upstream-commit: b69651fa673019d242c9dfd9f9cf2d04d89b1013
…t#169)

This PR implements a custom unmarshaller for the CatalogSourceSpec.UpdateStrategy.
When a value that cannot be unmarshalled to *metav1.Duration was being passed to
UpdateStrategy.RegistryPoll.Interval, the catalogSource sync loops in the catalog
operator was stuck in an infinite loop instead of backing off and performing other
syncs. The custom unmarshaller tries to unmarshall the input to the field to
*metav1.Duration, and if it fails, it sets a default value of 15m for the field.
Otherwise it accepts the value passed to the field.

Upstream-repository: api
Upstream-commit: 7c97612f258921a973da23fb55dcd77892401be4
Signed-off-by: perdasilva <[email protected]>

Upstream-repository: api
Upstream-commit: 75c6c246f48166b6fa856af769270d828d693091
…openshift#208)

Upstream-repository: api
Upstream-commit: bfa93d1e8c6e0bcc792a85cab5fb8f3086727834
* Ignore the root vendor directory

* Remove the root vendor directory

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

* Ignore the root bin directory

* Remove tool dependencies that are installed at runtime from root module

* Update workflows and Makefile to avoid referencing the vendor directory

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

Upstream-repository: api
Upstream-commit: 73f2f9e7f359194b8f38f62406920669eb85c37f
Update the go/verify workflows and specify the `workflow_dispatch` event
trigger, so operator-framework members can trigger CI runs of these
workflow definitions without having to open "empty" PRs.

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

Upstream-repository: api
Upstream-commit: 97011d2734fcfe687ed2875da670b552c775359b
openshift#217)

Signed-off-by: Tyler Slaton <[email protected]>

Upstream-repository: api
Upstream-commit: 82aa2d40a842d73d317298585c2fcca1e45b3553
openshift#224)

Update the Go workflow and update the pull_request trigger to run GHA
checks on any branches to remain consistent with the verify workflow
behavior.

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

Upstream-repository: api
Upstream-commit: 8e593f1c42b91ec75bf0787a28100a5f31690898
In PR openshift#888, there's vendoring of the cel-go package, one of which
is named "debug" (github.com/google/cel-go/common/debug). Due to
the .gitignore file ignoring all [Dd]bug folders, the vendored
package isn't being checked in by git, causing the build to fail.
This PR removes the instruction to ignore [Dd]bug/ folders.

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

Upstream-repository: operator-registry
Upstream-commit: 7a09b48dba29e8d063916f276740a1d737b40121
…openshift#888)

* feat(constraint): Add constraint type validation to bundle validation

A new type of dependency named constraint (olm.constraint) which uses
CEL expression is introduced in OLM. This new type is added to
dependencies.json file in the bundle just like gvk and package
dependencies. As a result, a new validation for constraint type
is added to ensure this type will be validated for bundle
dependencies.

Signed-off-by: Vu Dinh <[email protected]>

Vendor the constraints pkg from api repo

Signed-off-by: Vu Dinh <[email protected]>

Upstream-repository: operator-registry
Upstream-commit: 384af6b9235dc718268cb3e148a8c5f2c58e64bc

Signed-off-by: Vu Dinh <[email protected]>

* Add unit test for cel-go constraint validation

Signed-off-by: Vu Dinh <[email protected]>
Updating for reader experience.

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

Upstream-repository: operator-registry
Upstream-commit: 611525be3bd7374d1e55d43c519e5664e0e91c2c
This commit bumps operator-framework/operator-registry requirement
go-sqlite3 from v1.10.0 to v1.14.10

Signed-off-by: Noah Sapse <[email protected]>
Co-authored-by: Noah Sapse <[email protected]>

Upstream-repository: operator-registry
Upstream-commit: 4e3865a5cf1a2b1048d3752071ae1e932953f29c
timflannagan and others added 15 commits February 22, 2022 12:48
* cmd/catalog: Migrate to using cobra for CLI flag management

Update the cmd/catalog/main.go and use cobra's CLI library for managing
CLI executables and parsing flags.

Introduce cmd/catalog/start.go which is responsible for returning a
populated command.Command structure that the main function can call and
execute.

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

* deploy/chart: Use double-hyphen for CLI catalog operator flags

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

Upstream-repository: operator-lifecycle-manager
Upstream-commit: 8119718ab5d2e36b0881d3b605c8f97dbf0fcdfa
Nothing of consequence has used OperatorSet in ages, but it's been
lingering in tests and as the result type of the main resolution
method.

Signed-off-by: Ben Luddy <[email protected]>

Upstream-repository: operator-lifecycle-manager
Upstream-commit: 40ee3dee84ded2fbb59398491eb56661d40ff3fb
The cache itself isn't responsible for snapshot invalidation anymore,
but this field has been left behind.

Signed-off-by: Ben Luddy <[email protected]>

Upstream-repository: operator-lifecycle-manager
Upstream-commit: 094ae7bd1111188368e78ce872af86498894fd18
…ction (#2660)

* .github: Avoid disabling go mod cache for the golangci-lint action

Update the sanity workflow and avoid setting the 'skip-pkg-cache' option
to true so the golangci-lint action can start caching and restoring the
~/go/pkg directory during CI runs.

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

* .github: Separate the golangci-lint step into it's own job

As advertised in the action's official documentation, it's easier to
separate this action into it's own job so it can run in parallel with
other jobs defined within an individual workflow. When removing this
flag in the previous commit, the action was silently failing as it
couldn't access the go module package cache due to what appeared to be
permissions-related failures. Moving the golangci-lint action to it's
own job fixed those silent failures.

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

Upstream-repository: operator-lifecycle-manager
Upstream-commit: a76e61020abd1383ae13cbb92c67e4625b217b6b
…#2661)

A test double was missed when cache.SourcePriorityProvider was
introduced. These resolver-to-nonresolver package imports will make it
difficult for the resolution component to stand on its own as a
library module.

Signed-off-by: Ben Luddy <[email protected]>

Upstream-repository: operator-lifecycle-manager
Upstream-commit: 515b3ae10f1e8f9b71e004433e6b971823ecaa01
Signed-off-by: perdasilva <[email protected]>

Upstream-repository: operator-lifecycle-manager
Upstream-commit: acf3db022f8cc8944d4dcc220a9595f0ec44c241
- logr updated from v0.4.0 to v1.2.0 (cascading implications)
- Bumped to go 1.17 in Dockerfile
- Amended the github action for unit tests:
  - the envtest binaries were very very old (K8 1.16)
  - the distribution of kubebuilder binaries and envtest changed in the meantime
  - kubebuilder is not really needed for the tests and not part of the envtest installation ->  check disabled in Makefile
- Used `kubectl create` instead of `kubectl apply` to avoid too long annotations for CRDs

Signed-off-by: Frederic Giloux <[email protected]>

Upstream-repository: operator-lifecycle-manager
Upstream-commit: 23d80f3b54cefa9a74e5a76df5af424531048751
When creating a catalogSource with the versioned client used by OLM,
the catalogSource.spec.updateStrategy.registryPoll.Interval field
can sometimes be lost. This is particularly detrimental when the
test creating the catalog uses a short poll duration in order to
test functionality.

Signed-off-by: Alexander Greene <[email protected]>

Upstream-repository: operator-lifecycle-manager
Upstream-commit: 4802ae6bf5f3e1329aee6e1b2626107c94873f0c
Upstream-repository: api
Upstream-commit: 2e47b5a3bedaab35db362dff3ecb56133af16af7
* add bundle size validator check

Co-authored-by: Brett Tofel [email protected]

* applying suggetions - review

* add operator-registry as dep and use gzip method to check bundle size

* go mod vendor

* go fmt

* add enconding to the api

* refac name

Upstream-repository: api
Upstream-commit: e8208e3dcf33173266b49767d774970077f406be
…onfigs (openshift#914)

Signed-off-by: Joe Lanford <[email protected]>

Upstream-repository: operator-registry
Upstream-commit: 0b008deff332346247624ccc54df64b75cfe9777
…ontents (openshift#915)

Signed-off-by: Joe Lanford <[email protected]>

Upstream-repository: operator-registry
Upstream-commit: 7827c48d1a09fe320af46afe5e19491784b7f89e
Signed-off-by: Ankita Thomas <[email protected]>

Upstream-repository: operator-registry
Upstream-commit: d59081db05ae040ebacf74f3ccfefd3bbdd9cdca
Signed-off-by: akihikokuroda <[email protected]>

Upstream-repository: operator-registry
Upstream-commit: 5566e4b6832a7fc08c12d3c79fc0a0b8c6a2e7aa
* Upgrade github.com/docker/cli to v20.10.12

Signed-off-by: Jan Boehm <[email protected]>

* Synchronize docker config loading

This prevents data races during testing. The root cause
are unsecured globals in the docker cli lib.

Signed-off-by: Jan Boehm <[email protected]>

* Mention upstream issue that fixes the data race

Upstream-repository: operator-registry
Upstream-commit: c496cf028568091b18633a9ee59dadcc6d4b4edb

Signed-off-by: Jan Boehm <[email protected]>
@awgreene awgreene force-pushed the up-down-sync branch 2 times, most recently from 6df7913 to 3027760 Compare February 22, 2022 20:51
exdx and others added 4 commits February 23, 2022 07:14
Signed-off-by: Daniel Sover <[email protected]>

Upstream-repository: operator-lifecycle-manager
Upstream-commit: 75504b98d6ca5be472c620629d5946ccb3472fe2
This commit updates the operator-registry's go version
to v1.17.

Signed-off-by: Alexander Greene <[email protected]>

Upstream-repository: operator-registry
Upstream-commit: c970d617ce2d77c096102e2d881a15ef680bacf9
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 23, 2022

The following users are mentioned in OWNERS file(s) but are untrusted for the following reasons. One way to make the user trusted is to add them as members of the openshift org. You can then trigger verification by writing /verify-owners in a comment.

  • akihikokuroda
    • User is not a member of the org. User is not a collaborator. Satisfy at least one of these conditions to make the user trusted.

@openshift-ci openshift-ci bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 6, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 6, 2022

@awgreene: PR needs rebase.

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 Mar 24, 2022

@awgreene: The following tests 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/unit-olm ceb72ef link true /test unit-olm
ci/prow/e2e-aws-console-olm ceb72ef link true /test e2e-aws-console-olm
ci/prow/unit-registry ceb72ef link true /test unit-registry
ci/prow/e2e-upgrade ceb72ef link true /test e2e-upgrade
ci/prow/unit-api ceb72ef link true /test unit-api
ci/prow/e2e-gcp ceb72ef link true /test e2e-gcp
ci/prow/e2e-aws-olm ceb72ef link true /test e2e-aws-olm
ci/prow/verify ceb72ef link true /test verify
ci/prow/e2e-gcp-olm ceb72ef link true /test e2e-gcp-olm
ci/prow/e2e-gcp-console-olm ceb72ef link true /test e2e-gcp-console-olm

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

#269 merged - closing as a duplicate.

/close

@openshift-ci openshift-ci bot closed this Mar 25, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 25, 2022

@timflannagan: Closed this PR.

In response to this:

#269 merged - closing as a duplicate.

/close

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 added a commit to timflannagan/operator-framework-olm that referenced this pull request Jul 28, 2022
* *: 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
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. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. do-not-merge/invalid-owners-file Indicates that a PR should not merge because it has an invalid OWNERS file in it. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD.
Projects
None yet
Development

Successfully merging this pull request may close these issues.