scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-10-31 02:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add ipv6 examples for network policy API

Browse Source 
Add IPv6 examples to the network policy API
This commit is contained in:
Antonio Ojea
2019-12-21 18:02:21 +01:00
parent ff975e865d
commit 31e59fd5e3
8 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/openapi-spec/swagger.json generated
View File

@@ -11497,14 +11497,14 @@
"type": "object" "type": "object"
}, },
"io.k8s.api.networking.v1.IPBlock": { "io.k8s.api.networking.v1.IPBlock": {
"description": "IPBlock describes a particular CIDR (Ex. \"192.168.1.1/24\") that is allowed to the pods matched by a NetworkPolicySpec's podSelector. The except entry describes CIDRs that should not be included within this rule.", "description": "IPBlock describes a particular CIDR (Ex. \"192.168.1.1/24\",\"2001:db9::/64\") that is allowed to the pods matched by a NetworkPolicySpec's podSelector. The except entry describes CIDRs that should not be included within this rule.",
"properties": { "properties": {
"cidr": { "cidr": {
"description": "CIDR is a string representing the IP Block Valid examples are \"192.168.1.1/24\"", "description": "CIDR is a string representing the IP Block Valid examples are \"192.168.1.1/24\" or \"2001:db9::/64\"",
"type": "string" "type": "string"
}, },
"except": { "except": {
"description": "Except is a slice of CIDRs that should not be included within an IP Block Valid examples are \"192.168.1.1/24\" Except values will be rejected if they are outside the CIDR range", "description": "Except is a slice of CIDRs that should not be included within an IP Block Valid examples are \"192.168.1.1/24\" or \"2001:db9::/64\" Except values will be rejected if they are outside the CIDR range",
"items": { "items": {
"type": "string" "type": "string"
}, },

10
pkg/apis/networking/types.go
View File

@@ -144,15 +144,15 @@ type NetworkPolicyPort struct {
Port *intstr.IntOrString Port *intstr.IntOrString
} }
// IPBlock describes a particular CIDR (Ex. "192.168.1.1/24") that is allowed to the pods // IPBlock describes a particular CIDR (Ex. "192.168.1.1/24","2001:db9::/64") that is allowed
// matched by a NetworkPolicySpec's podSelector. The except entry describes CIDRs that should // to the pods matched by a NetworkPolicySpec's podSelector. The except entry describes CIDRs
// not be included within this rule. // that should not be included within this rule.
type IPBlock struct { type IPBlock struct {
// CIDR is a string representing the IP Block // CIDR is a string representing the IP Block
// Valid examples are "192.168.1.1/24" // Valid examples are "192.168.1.1/24" or "2001:db9::/64"
CIDR string CIDR string
// Except is a slice of CIDRs that should not be included within an IP Block // Except is a slice of CIDRs that should not be included within an IP Block
// Valid examples are "192.168.1.1/24" // Valid examples are "192.168.1.1/24" or "2001:db9::/64"
// Except values will be rejected if they are outside the CIDR range // Except values will be rejected if they are outside the CIDR range
// +optional // +optional
Except []string Except []string

10
staging/src/k8s.io/api/extensions/v1beta1/generated.proto
View File

@@ -458,16 +458,16 @@ message IDRange {
} }
// DEPRECATED 1.9 - This group version of IPBlock is deprecated by networking/v1/IPBlock. // DEPRECATED 1.9 - This group version of IPBlock is deprecated by networking/v1/IPBlock.
// IPBlock describes a particular CIDR (Ex. "192.168.1.1/24") that is allowed to the pods // IPBlock describes a particular CIDR (Ex. "192.168.1.1/24","2001:db9::/64") that is allowed
// matched by a NetworkPolicySpec's podSelector. The except entry describes CIDRs that should // to the pods matched by a NetworkPolicySpec's podSelector. The except entry describes CIDRs
// not be included within this rule. // that should not be included within this rule.
message IPBlock { message IPBlock {
// CIDR is a string representing the IP Block // CIDR is a string representing the IP Block
// Valid examples are "192.168.1.1/24" // Valid examples are "192.168.1.1/24" or "2001:db9::/64"
optional string cidr = 1; optional string cidr = 1;
// Except is a slice of CIDRs that should not be included within an IP Block // Except is a slice of CIDRs that should not be included within an IP Block
// Valid examples are "192.168.1.1/24" // Valid examples are "192.168.1.1/24" or "2001:db9::/64"
// Except values will be rejected if they are outside the CIDR range // Except values will be rejected if they are outside the CIDR range
// +optional // +optional
repeated string except = 2; repeated string except = 2;

10
staging/src/k8s.io/api/extensions/v1beta1/types.go
View File

@@ -1334,15 +1334,15 @@ type NetworkPolicyPort struct {
} }
// DEPRECATED 1.9 - This group version of IPBlock is deprecated by networking/v1/IPBlock. // DEPRECATED 1.9 - This group version of IPBlock is deprecated by networking/v1/IPBlock.
// IPBlock describes a particular CIDR (Ex. "192.168.1.1/24") that is allowed to the pods // IPBlock describes a particular CIDR (Ex. "192.168.1.1/24","2001:db9::/64") that is allowed
// matched by a NetworkPolicySpec's podSelector. The except entry describes CIDRs that should // to the pods matched by a NetworkPolicySpec's podSelector. The except entry describes CIDRs
// not be included within this rule. // that should not be included within this rule.
type IPBlock struct { type IPBlock struct {
// CIDR is a string representing the IP Block // CIDR is a string representing the IP Block
// Valid examples are "192.168.1.1/24" // Valid examples are "192.168.1.1/24" or "2001:db9::/64"
CIDR string `json:"cidr" protobuf:"bytes,1,name=cidr"` CIDR string `json:"cidr" protobuf:"bytes,1,name=cidr"`
// Except is a slice of CIDRs that should not be included within an IP Block // Except is a slice of CIDRs that should not be included within an IP Block
// Valid examples are "192.168.1.1/24" // Valid examples are "192.168.1.1/24" or "2001:db9::/64"
// Except values will be rejected if they are outside the CIDR range // Except values will be rejected if they are outside the CIDR range
// +optional // +optional
Except []string `json:"except,omitempty" protobuf:"bytes,2,rep,name=except"` Except []string `json:"except,omitempty" protobuf:"bytes,2,rep,name=except"`

6
staging/src/k8s.io/api/extensions/v1beta1/types_swagger_doc_generated.go generated
View File

@@ -269,9 +269,9 @@ func (IDRange) SwaggerDoc() map[string]string {
} }
var map_IPBlock = map[string]string{ var map_IPBlock = map[string]string{
"": "DEPRECATED 1.9 - This group version of IPBlock is deprecated by networking/v1/IPBlock. IPBlock describes a particular CIDR (Ex. \"192.168.1.1/24\") that is allowed to the pods matched by a NetworkPolicySpec's podSelector. The except entry describes CIDRs that should not be included within this rule.", "": "DEPRECATED 1.9 - This group version of IPBlock is deprecated by networking/v1/IPBlock. IPBlock describes a particular CIDR (Ex. \"192.168.1.1/24\",\"2001:db9::/64\") that is allowed to the pods matched by a NetworkPolicySpec's podSelector. The except entry describes CIDRs that should not be included within this rule.",
"cidr": "CIDR is a string representing the IP Block Valid examples are \"192.168.1.1/24\"", "cidr": "CIDR is a string representing the IP Block Valid examples are \"192.168.1.1/24\" or \"2001:db9::/64\"",
"except": "Except is a slice of CIDRs that should not be included within an IP Block Valid examples are \"192.168.1.1/24\" Except values will be rejected if they are outside the CIDR range", "except": "Except is a slice of CIDRs that should not be included within an IP Block Valid examples are \"192.168.1.1/24\" or \"2001:db9::/64\" Except values will be rejected if they are outside the CIDR range",
} }
func (IPBlock) SwaggerDoc() map[string]string { func (IPBlock) SwaggerDoc() map[string]string {

10
staging/src/k8s.io/api/networking/v1/generated.proto
View File

@@ -30,16 +30,16 @@ import "k8s.io/apimachinery/pkg/util/intstr/generated.proto";
// Package-wide variables from generator "generated". // Package-wide variables from generator "generated".
option go_package = "v1"; option go_package = "v1";
// IPBlock describes a particular CIDR (Ex. "192.168.1.1/24") that is allowed to the pods // IPBlock describes a particular CIDR (Ex. "192.168.1.1/24","2001:db9::/64") that is allowed
// matched by a NetworkPolicySpec's podSelector. The except entry describes CIDRs that should // to the pods matched by a NetworkPolicySpec's podSelector. The except entry describes CIDRs
// not be included within this rule. // that should not be included within this rule.
message IPBlock { message IPBlock {
// CIDR is a string representing the IP Block // CIDR is a string representing the IP Block
// Valid examples are "192.168.1.1/24" // Valid examples are "192.168.1.1/24" or "2001:db9::/64"
optional string cidr = 1; optional string cidr = 1;
// Except is a slice of CIDRs that should not be included within an IP Block // Except is a slice of CIDRs that should not be included within an IP Block
// Valid examples are "192.168.1.1/24" // Valid examples are "192.168.1.1/24" or "2001:db9::/64"
// Except values will be rejected if they are outside the CIDR range // Except values will be rejected if they are outside the CIDR range
// +optional // +optional
repeated string except = 2; repeated string except = 2;

10
staging/src/k8s.io/api/networking/v1/types.go
View File

@@ -147,15 +147,15 @@ type NetworkPolicyPort struct {
Port *intstr.IntOrString `json:"port,omitempty" protobuf:"bytes,2,opt,name=port"` Port *intstr.IntOrString `json:"port,omitempty" protobuf:"bytes,2,opt,name=port"`
} }
// IPBlock describes a particular CIDR (Ex. "192.168.1.1/24") that is allowed to the pods // IPBlock describes a particular CIDR (Ex. "192.168.1.1/24","2001:db9::/64") that is allowed
// matched by a NetworkPolicySpec's podSelector. The except entry describes CIDRs that should // to the pods matched by a NetworkPolicySpec's podSelector. The except entry describes CIDRs
// not be included within this rule. // that should not be included within this rule.
type IPBlock struct { type IPBlock struct {
// CIDR is a string representing the IP Block // CIDR is a string representing the IP Block
// Valid examples are "192.168.1.1/24" // Valid examples are "192.168.1.1/24" or "2001:db9::/64"
CIDR string `json:"cidr" protobuf:"bytes,1,name=cidr"` CIDR string `json:"cidr" protobuf:"bytes,1,name=cidr"`
// Except is a slice of CIDRs that should not be included within an IP Block // Except is a slice of CIDRs that should not be included within an IP Block
// Valid examples are "192.168.1.1/24" // Valid examples are "192.168.1.1/24" or "2001:db9::/64"
// Except values will be rejected if they are outside the CIDR range // Except values will be rejected if they are outside the CIDR range
// +optional // +optional
Except []string `json:"except,omitempty" protobuf:"bytes,2,rep,name=except"` Except []string `json:"except,omitempty" protobuf:"bytes,2,rep,name=except"`

6
staging/src/k8s.io/api/networking/v1/types_swagger_doc_generated.go generated
View File

@@ -28,9 +28,9 @@ package v1
// AUTO-GENERATED FUNCTIONS START HERE. DO NOT EDIT. // AUTO-GENERATED FUNCTIONS START HERE. DO NOT EDIT.
var map_IPBlock = map[string]string{ var map_IPBlock = map[string]string{
"": "IPBlock describes a particular CIDR (Ex. \"192.168.1.1/24\") that is allowed to the pods matched by a NetworkPolicySpec's podSelector. The except entry describes CIDRs that should not be included within this rule.", "": "IPBlock describes a particular CIDR (Ex. \"192.168.1.1/24\",\"2001:db9::/64\") that is allowed to the pods matched by a NetworkPolicySpec's podSelector. The except entry describes CIDRs that should not be included within this rule.",
"cidr": "CIDR is a string representing the IP Block Valid examples are \"192.168.1.1/24\"", "cidr": "CIDR is a string representing the IP Block Valid examples are \"192.168.1.1/24\" or \"2001:db9::/64\"",
"except": "Except is a slice of CIDRs that should not be included within an IP Block Valid examples are \"192.168.1.1/24\" Except values will be rejected if they are outside the CIDR range", "except": "Except is a slice of CIDRs that should not be included within an IP Block Valid examples are \"192.168.1.1/24\" or \"2001:db9::/64\" Except values will be rejected if they are outside the CIDR range",
} }
func (IPBlock) SwaggerDoc() map[string]string { func (IPBlock) SwaggerDoc() map[string]string {