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

Workaround server-side apply not working #2911

Merged

Conversation

sathieu
Copy link
Contributor

@sathieu sathieu commented Dec 30, 2022

Description of the change:

Explicitly set container port protocol to TCP.

NB: This should have been fixed already while upgrading to k8s 1.20 (see kubernetes/kubernetes#92332 and probably kubernetes/kubernetes@d3e641e). Is there some tooling issue?

Motivation for the change:

Fixes:

error calculating structured merge diff:
error building typed value from config resource:
.spec.install.spec.deployments[0].spec.template.spec.containers[0].ports: element 0: associative list with keys has an element that omits key field "protocol" (and doesn't have default value)

Architectural changes:

Testing remarks:

Reviewer Checklist

  • Implementation matches the proposed design, or proposal is updated to match implementation
  • Sufficient unit test coverage
  • Sufficient end-to-end test coverage
  • Bug fixes are accompanied by regression test(s)
  • e2e tests and flake fixes are accompanied evidence of flake testing, e.g. executing the test 100(0) times
  • tech debt/todo is accompanied by issue link(s) in comments in the surrounding code
  • Tests are comprehensible, e.g. Ginkgo DSL is being used appropriately
  • Docs updated or added to /doc
  • Commit messages sensible and descriptive
  • Tests marked as [FLAKE] are truly flaky and have an issue
  • Code is properly formatted

@openshift-ci openshift-ci bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Dec 30, 2022
@openshift-ci
Copy link

openshift-ci bot commented Dec 30, 2022

Hi @sathieu. Thanks for your PR.

I'm waiting for a operator-framework member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@perdasilva
Copy link
Collaborator

@sathieu I've rebased your PR from this side

@perdasilva
Copy link
Collaborator

/ok-to-test

@openshift-ci openshift-ci bot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Feb 28, 2023
@perdasilva
Copy link
Collaborator

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 28, 2023
@sathieu
Copy link
Contributor Author

sathieu commented Mar 22, 2023

@perdasilva Thanks for your review. What can I do to move this forward?

@sathieu
Copy link
Contributor Author

sathieu commented Apr 3, 2023

@akihikokuroda @ecordell COuld you please review this one-ine PR?

Copy link
Collaborator

@perdasilva perdasilva left a comment

Choose a reason for hiding this comment

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

lgtm

error calculating structured merge diff:
error building typed value from config resource:
.spec.install.spec.deployments[0].spec.template.spec.containers[0].ports:
element 0: associative list with keys has an element that omits key
field "protocol" (and doesn't have default value)

Signed-off-by: Mathieu Parent <[email protected]>
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Apr 14, 2023
@openshift-ci
Copy link

openshift-ci bot commented Apr 14, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: perdasilva, sathieu

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 14, 2023
@openshift-ci
Copy link

openshift-ci bot commented Apr 14, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: perdasilva, sathieu

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

@perdasilva
Copy link
Collaborator

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 14, 2023
@openshift-merge-robot openshift-merge-robot merged commit b5a885e into operator-framework:master Apr 14, 2023
@sathieu sathieu deleted the server-side-apply branch April 14, 2023 09:09
@sathieu
Copy link
Contributor Author

sathieu commented Apr 14, 2023

Thanks @perdasilva 🙏 !

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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants