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

fix(yurt-manager): raven controller can't list calico blockaffinity #1676

Merged
merged 2 commits into from Sep 20, 2023
Merged

fix(yurt-manager): raven controller can't list calico blockaffinity #1676

merged 2 commits into from Sep 20, 2023

Conversation

luckymrwang
Copy link
Member

What type of PR is this?

Uncomment only one /kind <> line, hit enter to put that in a new line, and remove leading whitespace from that line:
/kind bug
/kind documentation
/kind enhancement
/kind good-first-issue
/kind feature
/kind question
/kind design
/sig ai
/sig iot
/sig network
/sig storage

/kind bug

What this PR does / why we need it:

The CR blockaffinity is defined as projectcalico.org/v3 in the new calico api package, but in fact calico use crd.projectcalico.org/v1 version.

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?

other Note

@openyurt-bot
Copy link
Collaborator

@luckymrwang: GitHub didn't allow me to assign the following users: your_reviewer.

Note that only openyurtio members, repo collaborators and people who have commented on this issue/PR can be assigned. Additionally, issues/PRs can only have 10 assignees at the same time.
For more information please see the contributor guide

In response to this:

What type of PR is this?

Uncomment only one /kind <> line, hit enter to put that in a new line, and remove leading whitespace from that line:
/kind bug
/kind documentation
/kind enhancement
/kind good-first-issue
/kind feature
/kind question
/kind design
/sig ai
/sig iot
/sig network
/sig storage

/kind bug

What this PR does / why we need it:

The CR blockaffinity is defined as projectcalico.org/v3 in the new calico api package, but in fact calico use crd.projectcalico.org/v1 version.

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?

other Note

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.

@openyurt-bot openyurt-bot added the kind/bug kind/bug label Aug 25, 2023
@openyurt-bot openyurt-bot added the size/L size/L: 100-499 label Aug 25, 2023
@codecov
Copy link

codecov bot commented Aug 25, 2023 •
edited

Codecov Report

Merging #1676 (8d54d5a) into master (f782021) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master    #1676   +/-   ##
=======================================
  Coverage   51.64%   51.64%           
=======================================
  Files         168      168           
  Lines       20063    20063           
=======================================
  Hits        10362    10362           
  Misses       8716     8716           
  Partials      985      985
Flag Coverage Δ
unittests 51.64% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Changed Coverage Δ
...r/raven/gatewaypickup/gateway_pickup_controller.go 24.89% <ø> (ø)

@luckymrwang luckymrwang force-pushed the fix_calico branch 2 times, most recently from a612306 to 2374e0f Compare August 28, 2023 01:53
@luckymrwang
Copy link
Member Author

/assign @rambohe-ch

@fighterhit
Copy link

hi @luckymrwang , thanks for your work! I met the same issue, has this PR completely fixed this problem?

@luckymrwang
Copy link
Member Author

hi @luckymrwang , thanks for your work! I met the same issue, has this PR completely fixed this problem?

Yes.

@fighterhit
Copy link

Hi @luckymrwang , I use your branch but yurt-manager report another error.

E0915 08:02:30.248561       1 deleg.go:144] setup "msg"="unable to setup controllers" "error"="no matches for raven.openyurt.io/v1beta1, Resource=gateways"

@luckymrwang
Copy link
Member Author

luckymrwang commented Sep 15, 2023 •
edited

Hi @luckymrwang , I use your branch but yurt-manager report another error.

E0915 08:02:30.248561       1 deleg.go:144] setup "msg"="unable to setup controllers" "error"="no matches for raven.openyurt.io/v1beta1, Resource=gateways"

Hello @fighterhit
Because I fix it on the lastest main branch which is not stable version. If you want to use it immediately, you can replace the yurt-manager image by luckymrwang/yurt-manager:hotfix-v1.3.4 which I fixed it on the stable version v1.3.4.

@luckymrwang
Merge branch 'master' of https://github.com/openyurtio/openyurt into …
8d54d5a 
…fix_calico

* 'master' of https://github.com/openyurtio/openyurt:
  Add status info to YurtAppSet/YurtAppDaemon (openyurtio#1702)
  fix: add the logic of removing the finalizer (openyurtio#1695)
  Fix work dir nested `yurthub/yurthub` (openyurtio#1693)
  Add yurtappoverrider (openyurtio#1684)
  modify the logic for judging static pods and combine the utils for pod and node (openyurtio#1689)
  chore: slice loop replace (openyurtio#1690)
  unified expression about DaemonSet (openyurtio#1698)
  improve controller names (openyurtio#1687)
  add gateway public service controller (openyurtio#1685)
  feat: add token format checking to yurtadm join process (openyurtio#1681)
  add gateway internal service controller (openyurtio#1677)
  fix: yurt-iot-dock cannot be dynamically deployed in platformadmin (openyurtio#1679)
  unserve v1alpha1 version of platformadmin crd (openyurtio#1659)
@sonarcloud
Copy link

sonarcloud bot commented Sep 20, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

@openyurt-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: luckymrwang, rambohe-ch

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

@openyurt-bot openyurt-bot added the approved approved label Sep 20, 2023
@rambohe-ch
Copy link
Member

/lgtm

@rambohe-ch rambohe-ch merged commit 424dcc2 into openyurtio:master Sep 20, 2023
14 of 15 checks passed
@LavenderQAQ LavenderQAQ mentioned this pull request Sep 24, 2023
Closed
@open-digger-bot open-digger-bot bot mentioned this pull request Sep 27, 2023
Closed
@luckymrwang luckymrwang deleted the fix_calico branch October 10, 2023 00:57
@fighterhit fighterhit mentioned this pull request Nov 7, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rambohe-ch rambohe-ch rambohe-ch approved these changes

@Peeknut Peeknut Awaiting requested review from Peeknut

@SataQiu SataQiu Awaiting requested review from SataQiu

Assignees

@rambohe-ch rambohe-ch

Labels
approved approved kind/bug kind/bug size/L size/L: 100-499
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@luckymrwang @openyurt-bot @fighterhit @rambohe-ch