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

Bump libcalico go #1814

Merged
merged 2 commits into from
Mar 1, 2018
Merged

Bump libcalico go #1814

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96a204d
bump libcalico-go
ozdanborne Mar 1, 2018
46bed62
Make dummy rules pass icmp validation
ozdanborne Mar 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions glide.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion glide.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import:
- ssh/terminal
- package: github.com/projectcalico/go-yaml-wrapper
- package: github.com/projectcalico/libcalico-go
version: 26b83dc3ccceeff9312eaf339386e6599c89c63b
version: 2fa2887d917b41342f9beaae745dff2355e4f47c
subpackages:
- lib/apis/v3
- lib/clientv3
Expand Down
3 changes: 0 additions & 3 deletions test-data/v1/policy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@
ingress:
- action: allow
protocol: udp
icmp:
type: 10
code: 100
source:
tag: web
net: 1.2.3.4/10
Expand Down
3 changes: 3 additions & 0 deletions tests/st/calicoctl/test_crud.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1864,6 +1864,7 @@ class InvalidData(TestBase):
'ICMP': {'type': 256, # max value 255
'code': 255},
'action': 'Deny',
'protocol': 'ICMP',
'destination': {},
'source': {}}],
}
Expand All @@ -1882,6 +1883,7 @@ class InvalidData(TestBase):
'ICMP': {'type': 19,
'code': 256}, # max value 255
'action': 'Deny',
'protocol': 'ICMP',
'destination': {},
'source': {}}],
}
Expand Down Expand Up @@ -1912,6 +1914,7 @@ class InvalidData(TestBase):
'ICMP': {'type': 256, # 1-byte field
'code': 255},
'action': 'Deny',
'protocol': 'ICMP',
'destination': {},
'source': {}}],
},
Expand Down
6 changes: 0 additions & 6 deletions tests/st/utils/data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,6 @@
],
'ingress': [
{
'notICMP': {'type': 19, 'code': 255},
'ipVersion': 4,
'action': 'Deny',
'destination': {
Expand All @@ -143,7 +142,6 @@
'ports': ['100:200'],
'selector': "type=='application'",
},
'icmp': {'type': 10, 'code': 6},
'protocol': 'TCP',
'source': {
'notNets': ['10.1.0.0/16'],
Expand Down Expand Up @@ -260,7 +258,6 @@
],
'ingress': [
{
'notICMP': {'type': 19, 'code': 255},
Copy link
Member

Choose a reason for hiding this comment

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

Why are we removing these? Which part of validation does this fail?

Copy link
Member

Choose a reason for hiding this comment

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

There's a proto: TCP just below.

Copy link
Member Author

Choose a reason for hiding this comment

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

These rules have both ICMP rules and Ports rules, which is invalid now:

  • If includes port rules, protocol needs to be TCP.
  • If it includes ICMP rules, protocol needs to be ICMP

'ipVersion': 4,
'action': 'Deny',
'destination': {
Expand All @@ -271,7 +268,6 @@
'ports': ['100:200'],
'selector': "type=='application'",
},
'icmp': {'type': 10, 'code': 6},
'protocol': 'TCP',
'source': {
'notNets': ['10.1.0.0/16'],
Expand Down Expand Up @@ -426,7 +422,6 @@
],
'ingress': [
{
'notICMP': {'type': 19, 'code': 255},
'ipVersion': 4,
'action': 'Deny',
'destination': {
Expand All @@ -436,7 +431,6 @@
'nets': ['10.2.0.0/16'],
'ports': ['100:200'],
'selector': "type=='application'"},
'icmp': {'type': 10, 'code': 6},
'protocol': 'TCP',
'source': {
'notNets': ['10.1.0.0/16'],
Expand Down