Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
1940941d
Commit
1940941d
authored
Dec 16, 2016
by
Dan Winship
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update NetworkPolicy comments to reflect reality.
NetworkPolicy has been implemented with no distinction between nil and empty Ports/From, and we don't intend to change that now.
parent
19b8be8b
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
18 deletions
+4
-18
types.go
pkg/apis/extensions/types.go
+2
-8
defaults.go
pkg/apis/extensions/v1beta1/defaults.go
+0
-1
types.go
pkg/apis/extensions/v1beta1/types.go
+2
-8
validation.go
pkg/apis/extensions/validation/validation.go
+0
-1
No files found.
pkg/apis/extensions/types.go
View file @
1940941d
...
@@ -1061,21 +1061,17 @@ type NetworkPolicySpec struct {
...
@@ -1061,21 +1061,17 @@ type NetworkPolicySpec struct {
type
NetworkPolicyIngressRule
struct
{
type
NetworkPolicyIngressRule
struct
{
// List of ports which should be made accessible on the pods selected for this rule.
// List of ports which should be made accessible on the pods selected for this rule.
// Each item in this list is combined using a logical OR.
// Each item in this list is combined using a logical OR.
// If this field is not provided, this rule matches all ports (traffic not restricted by port).
// If this field is empty or missing, this rule matches all ports (traffic not restricted by port).
// If this field is empty, this rule matches no ports (no traffic matches).
// If this field is present and contains at least one item, then this rule allows traffic
// If this field is present and contains at least one item, then this rule allows traffic
// only if the traffic matches at least one port in the list.
// only if the traffic matches at least one port in the list.
// TODO: Update this to be a pointer to slice as soon as auto-generation supports it.
// +optional
// +optional
Ports
[]
NetworkPolicyPort
Ports
[]
NetworkPolicyPort
// List of sources which should be able to access the pods selected for this rule.
// List of sources which should be able to access the pods selected for this rule.
// Items in this list are combined using a logical OR operation.
// Items in this list are combined using a logical OR operation.
// If this field is not provided, this rule matches all sources (traffic not restricted by source).
// If this field is empty or missing, this rule matches all sources (traffic not restricted by source).
// If this field is empty, this rule matches no sources (no traffic matches).
// If this field is present and contains at least on item, this rule allows traffic only if the
// If this field is present and contains at least on item, this rule allows traffic only if the
// traffic matches at least one item in the from list.
// traffic matches at least one item in the from list.
// TODO: Update this to be a pointer to slice as soon as auto-generation supports it.
// +optional
// +optional
From
[]
NetworkPolicyPeer
From
[]
NetworkPolicyPeer
}
}
...
@@ -1100,7 +1096,6 @@ type NetworkPolicyPeer struct {
...
@@ -1100,7 +1096,6 @@ type NetworkPolicyPeer struct {
// This is a label selector which selects Pods in this namespace.
// This is a label selector which selects Pods in this namespace.
// This field follows standard label selector semantics.
// This field follows standard label selector semantics.
// If not provided, this selector selects no pods.
// If present but empty, this selector selects all pods in this namespace.
// If present but empty, this selector selects all pods in this namespace.
// +optional
// +optional
PodSelector
*
metav1
.
LabelSelector
PodSelector
*
metav1
.
LabelSelector
...
@@ -1108,7 +1103,6 @@ type NetworkPolicyPeer struct {
...
@@ -1108,7 +1103,6 @@ type NetworkPolicyPeer struct {
// Selects Namespaces using cluster scoped-labels. This
// Selects Namespaces using cluster scoped-labels. This
// matches all pods in all namespaces selected by this label selector.
// matches all pods in all namespaces selected by this label selector.
// This field follows standard label selector semantics.
// This field follows standard label selector semantics.
// If omitted, this selector selects no namespaces.
// If present but empty, this selector selects all namespaces.
// If present but empty, this selector selects all namespaces.
// +optional
// +optional
NamespaceSelector
*
metav1
.
LabelSelector
NamespaceSelector
*
metav1
.
LabelSelector
...
...
pkg/apis/extensions/v1beta1/defaults.go
View file @
1940941d
...
@@ -127,7 +127,6 @@ func SetDefaults_ReplicaSet(obj *ReplicaSet) {
...
@@ -127,7 +127,6 @@ func SetDefaults_ReplicaSet(obj *ReplicaSet) {
func
SetDefaults_NetworkPolicy
(
obj
*
NetworkPolicy
)
{
func
SetDefaults_NetworkPolicy
(
obj
*
NetworkPolicy
)
{
// Default any undefined Protocol fields to TCP.
// Default any undefined Protocol fields to TCP.
for
_
,
i
:=
range
obj
.
Spec
.
Ingress
{
for
_
,
i
:=
range
obj
.
Spec
.
Ingress
{
// TODO: Update Ports to be a pointer to slice as soon as auto-generation supports it.
for
_
,
p
:=
range
i
.
Ports
{
for
_
,
p
:=
range
i
.
Ports
{
if
p
.
Protocol
==
nil
{
if
p
.
Protocol
==
nil
{
proto
:=
v1
.
ProtocolTCP
proto
:=
v1
.
ProtocolTCP
...
...
pkg/apis/extensions/v1beta1/types.go
View file @
1940941d
...
@@ -1085,21 +1085,17 @@ type NetworkPolicySpec struct {
...
@@ -1085,21 +1085,17 @@ type NetworkPolicySpec struct {
type
NetworkPolicyIngressRule
struct
{
type
NetworkPolicyIngressRule
struct
{
// List of ports which should be made accessible on the pods selected for this rule.
// List of ports which should be made accessible on the pods selected for this rule.
// Each item in this list is combined using a logical OR.
// Each item in this list is combined using a logical OR.
// If this field is not provided, this rule matches all ports (traffic not restricted by port).
// If this field is empty or missing, this rule matches all ports (traffic not restricted by port).
// If this field is empty, this rule matches no ports (no traffic matches).
// If this field is present and contains at least one item, then this rule allows traffic
// If this field is present and contains at least one item, then this rule allows traffic
// only if the traffic matches at least one port in the list.
// only if the traffic matches at least one port in the list.
// TODO: Update this to be a pointer to slice as soon as auto-generation supports it.
// +optional
// +optional
Ports
[]
NetworkPolicyPort
`json:"ports,omitempty" protobuf:"bytes,1,rep,name=ports"`
Ports
[]
NetworkPolicyPort
`json:"ports,omitempty" protobuf:"bytes,1,rep,name=ports"`
// List of sources which should be able to access the pods selected for this rule.
// List of sources which should be able to access the pods selected for this rule.
// Items in this list are combined using a logical OR operation.
// Items in this list are combined using a logical OR operation.
// If this field is not provided, this rule matches all sources (traffic not restricted by source).
// If this field is empty or missing, this rule matches all sources (traffic not restricted by source).
// If this field is empty, this rule matches no sources (no traffic matches).
// If this field is present and contains at least on item, this rule allows traffic only if the
// If this field is present and contains at least on item, this rule allows traffic only if the
// traffic matches at least one item in the from list.
// traffic matches at least one item in the from list.
// TODO: Update this to be a pointer to slice as soon as auto-generation supports it.
// +optional
// +optional
From
[]
NetworkPolicyPeer
`json:"from,omitempty" protobuf:"bytes,2,rep,name=from"`
From
[]
NetworkPolicyPeer
`json:"from,omitempty" protobuf:"bytes,2,rep,name=from"`
}
}
...
@@ -1124,7 +1120,6 @@ type NetworkPolicyPeer struct {
...
@@ -1124,7 +1120,6 @@ type NetworkPolicyPeer struct {
// This is a label selector which selects Pods in this namespace.
// This is a label selector which selects Pods in this namespace.
// This field follows standard label selector semantics.
// This field follows standard label selector semantics.
// If not provided, this selector selects no pods.
// If present but empty, this selector selects all pods in this namespace.
// If present but empty, this selector selects all pods in this namespace.
// +optional
// +optional
PodSelector
*
metav1
.
LabelSelector
`json:"podSelector,omitempty" protobuf:"bytes,1,opt,name=podSelector"`
PodSelector
*
metav1
.
LabelSelector
`json:"podSelector,omitempty" protobuf:"bytes,1,opt,name=podSelector"`
...
@@ -1132,7 +1127,6 @@ type NetworkPolicyPeer struct {
...
@@ -1132,7 +1127,6 @@ type NetworkPolicyPeer struct {
// Selects Namespaces using cluster scoped-labels. This
// Selects Namespaces using cluster scoped-labels. This
// matches all pods in all namespaces selected by this label selector.
// matches all pods in all namespaces selected by this label selector.
// This field follows standard label selector semantics.
// This field follows standard label selector semantics.
// If omitted, this selector selects no namespaces.
// If present but empty, this selector selects all namespaces.
// If present but empty, this selector selects all namespaces.
// +optional
// +optional
NamespaceSelector
*
metav1
.
LabelSelector
`json:"namespaceSelector,omitempty" protobuf:"bytes,2,opt,name=namespaceSelector"`
NamespaceSelector
*
metav1
.
LabelSelector
`json:"namespaceSelector,omitempty" protobuf:"bytes,2,opt,name=namespaceSelector"`
...
...
pkg/apis/extensions/validation/validation.go
View file @
1940941d
...
@@ -921,7 +921,6 @@ func ValidateNetworkPolicySpec(spec *extensions.NetworkPolicySpec, fldPath *fiel
...
@@ -921,7 +921,6 @@ func ValidateNetworkPolicySpec(spec *extensions.NetworkPolicySpec, fldPath *fiel
}
}
}
}
}
}
// TODO: Update From to be a pointer to slice as soon as auto-generation supports it.
for
i
,
from
:=
range
ingress
.
From
{
for
i
,
from
:=
range
ingress
.
From
{
fromPath
:=
ingressPath
.
Child
(
"from"
)
.
Index
(
i
)
fromPath
:=
ingressPath
.
Child
(
"from"
)
.
Index
(
i
)
numFroms
:=
0
numFroms
:=
0
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment