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.

Sign up for GitHub

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

Jump to bottom

chore: update operator-sdk v1.31.0 #361

Merged
merged 1 commit into from Sep 19, 2023
Merged

chore: update operator-sdk v1.31.0 #361

merged 1 commit into from Sep 19, 2023

Conversation

marioferh
Copy link
Contributor

@marioferh marioferh commented Sep 18, 2023 •
edited

Operator-sdk needs this update: operator-framework/operator-sdk#6408 in order to fix this:

observability-operator/deploy/dependencies/kustomization.yaml

Lines 6 to 21 in b6b11bb

# CRDs
# HACK: This hack to use stripped-down-crds works around the following operator-sdk
# limitation when running a catalog (FBC) image.
#
# ❯ ./tmp/bin/operator-sdk run bundle <bundle-image> --install-mode AllNamespaces --namespace operators --skip-tls
# INFO[0016] Creating a File-Based Catalog of the bundle <bundle-image>
# INFO[0020] Generated a valid File-Based Catalog
# FATA[0020] Failed to run bundle
# : create catalog
# : error creating registry pod: error building registry pod definition
# : configMap error: error updating ConfigMap
# : error creating ConfigMap
# : ConfigMap "operator-sdk-run-bundle-config" is invalid
# : []: Too long: must have at most 1048576 bytes

@marioferh marioferh requested a review from a team as a code owner September 18, 2023 11:39
@marioferh marioferh requested review from slashpai and JoaoBraveCoding and removed request for a team September 18, 2023 11:39
jan--f
jan--f previously requested changes Sep 18, 2023
View reviewed changes
Copy link
Collaborator

@jan--f jan--f left a comment

Choose a reason for hiding this comment

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

The commit linter actually looks at the commit message, not the PR message. I'd recommend squashin bot into one commit and adding chore: to the title.

The generate job looks like it needs a change after updating operator-sdk. The created-at annotation makes this test fail, since it gets regenerated. Maybe we can prevent operator-sdk to add that?

@danielmellado
Copy link
Contributor

Same comment as @jan--f , please do a squash of both commits and fix violations. I'd recommend triggering the linter locally before pushing, thanks!

danielmellado
danielmellado requested changes Sep 18, 2023
View reviewed changes
Copy link
Contributor

@danielmellado danielmellado left a comment

Choose a reason for hiding this comment

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

Small nit already explained

@marioferh marioferh changed the title fix: update operator-sdk v1.31.0 chore: update operator-sdk v1.31.0 Sep 18, 2023
@danielmellado
Copy link
Contributor

The commit linter actually looks at the commit message, not the PR message. I'd recommend squashin bot into one commit and adding chore: to the title.

The generate job looks like it needs a change after updating operator-sdk. The created-at annotation makes this test fail, since it gets regenerated. Maybe we can prevent operator-sdk to add that?

operator-framework/operator-sdk#6285 Seems related to this, we'll probably need to actively ignore that.

@jan--f
Copy link
Collaborator

jan--f commented Sep 18, 2023

operator-framework/operator-sdk#6285 (comment) might be solution.

@marioferh marioferh force-pushed the update_operator-sdk_to_v1.31.0 branch 6 times, most recently from 094f071 to b3c9115 Compare September 18, 2023 15:16
@marioferh
Copy link
Contributor Author

operator-framework/operator-sdk#6285 (comment) might be solution.

thanks, done

@marioferh
chore: update operator-sdk v1.31.0
8666459 
Signed-off-by: Mario Fernandez <mariofer@redhat.com>
@jan--f
Copy link
Collaborator

jan--f commented Sep 19, 2023

/lgtm
Thanks!

@openshift-ci openshift-ci bot added the lgtm label Sep 19, 2023
@danielmellado
Copy link
Contributor

/lgtm

@jan--f
Copy link
Collaborator

jan--f commented Sep 19, 2023

/approve

danielmellado
danielmellado approved these changes Sep 19, 2023
View reviewed changes
Copy link
Contributor

@danielmellado danielmellado 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
Copy link

openshift-ci bot commented Sep 19, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: danielmellado, jan--f, marioferh

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:
  • OWNERS [danielmellado,jan--f]

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

@danielmellado danielmellado merged commit a1e6509 into rhobs:main Sep 19, 2023
8 checks passed
@marioferh marioferh mentioned this pull request Sep 19, 2023
Merged
jan--f added a commit to jan--f/observability-operator that referenced this pull request Sep 27, 2023
@jan--f
chore: update bundle.Dockerfile with new operator-sdk version
298526e 
Not sure how rhobs#361
could merge without hitting this, but maybe there was some unfortunate
overlap of changes.

Signed-off-by: Jan Fajerski <jfajersk@redhat.com>
openshift-merge-robot pushed a commit that referenced this pull request Sep 27, 2023
@jan--f
chore: drop defunct team from CODEOWNERS (#365)
5cc74ba 
* chore: drop defunct team from CODEOWNERS

Signed-off-by: Jan Fajerski <jfajersk@redhat.com>

* chore: update bundle.Dockerfile with new operator-sdk version

Not sure how #361
could merge without hitting this, but maybe there was some unfortunate
overlap of changes.

Signed-off-by: Jan Fajerski <jfajersk@redhat.com>

---------

Signed-off-by: Jan Fajerski <jfajersk@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@danielmellado danielmellado danielmellado approved these changes

@slashpai slashpai Awaiting requested review from slashpai slashpai is a code owner automatically assigned from rhobs/observability-operator-maintainers

@JoaoBraveCoding JoaoBraveCoding Awaiting requested review from JoaoBraveCoding JoaoBraveCoding is a code owner automatically assigned from rhobs/observability-operator-maintainers

@jan--f jan--f Awaiting requested review from jan--f

Assignees

@jan--f jan--f

@danielmellado danielmellado

Labels
approved lgtm
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@marioferh @danielmellado @jan--f