support calico #13
support calico #13
Conversation
luckymrwang
force-pushed
the
calico_supported
branch
from
f1c8c71 to
ed56336
Compare
|
Please deal with |
luckymrwang
force-pushed
the
calico_supported
branch
from
ed56336 to
4b3e9b6
Compare
The latest code has been commited. |
|
Thanks for the enhancement. Quite busy these days, I will start to review this Friday. |
| k8s.io/client-go v0.19.2 | ||
| k8s.io/klog/v2 v2.2.0 | ||
| sigs.k8s.io/controller-runtime v0.7.2 | ||
| k8s.io/api v0.23.2 |
There was a problem hiding this comment.
The latest kubernetes version that OpenYurt currently supports is 1.22 and most of the OpenYurt components use v0.22.3 as kubernetes library version.
So how about downgrading the version to v0.22.3.
There was a problem hiding this comment.
The latest code has been commited. k8s components have been downgraded to v0.22.3.
There was a problem hiding this comment.
github.com/projectcalico/api@v0.0.0-20220505235232-ce7a5122e146 requires k8s.io/api@v0.23.2.
repalce v0.22.3 to v0.23.2 will generate rest.HTTPClientFor in clientset (make generate) which is not supported in v0.22.3
| @@ -0,0 +1,81 @@ | |||
| // Copyright (c) 2019 Tigera, Inc. All rights reserved. | |||
There was a problem hiding this comment.
Please add OpenYurt Copyright to the files in pkg/ravencontroller/apis/calico/v3/ directory.
For example:
// Copyright 2020 The OpenYurt Authors.
// Copyright (c) 2019 Tigera, Inc. All rights reserved.
There was a problem hiding this comment.
The latest code has been commited. Copyright 2020 The OpenYurt Authors have been added.
| if v.Spec.Node != node.Name || v.Spec.State != "confirmed" { | ||
| continue | ||
| } | ||
| podCIDR = v.Spec.CIDR |
There was a problem hiding this comment.
It is possible for nodes in calico to have multiple cidr block, so there can be multiple blockaffinities referring the same node.
Currently, the Gateway CR cannot handle multiple podCIDR circumstances well(NodeInfo.Subnet is a string). I think we may add a subnet slice to Gateway CR to handle this, and the raven-agent also needs some adjustments.
There was a problem hiding this comment.
@DrmagicE You are right. I have realized it too when adding calico cidr block. As you mentioned that raven-agent and gateway CR must be adjusted, so I just get one cidr block to adapt current case. When raven-agent supported multiple cidr block, I will adjust calico to adapt it again.
There was a problem hiding this comment.
how about changing NodeInfo.Subnet(string) to NodeInfo.Subnets(slice)，this field is obtained by the controller and will not affect the way users use it.
There was a problem hiding this comment.
@luckymrwang Can you change it together in this PR?
luckymrwang
force-pushed
the
calico_supported
branch
from
4b3e9b6 to
73e8a61
Compare
|
lgtm |
|
@luckymrwang Please fix the conflict. |
luckymrwang
force-pushed
the
calico_supported
branch
2 times, most recently
from
95b3c44 to
e601ecb
Compare
@DrmagicE The latest code has been commited. Conflict has been fixed. |
|
@luckymrwang Please remove the binary file |
luckymrwang
force-pushed
the
calico_supported
branch
from
e601ecb to
4450a4f
Compare
@DrmagicE The latest code has been commited. |
Fix the bug which not absolutely compatible with calico openyurtio/raven#38