259e0743f1
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Default extensions/v1beta1 Deployment's ProgressDeadlineSeconds to MaxInt32 **What this PR does / why we need it**: Default values should be set in all API versions, because defaulting happens whenever a serialized version is read. When we switched to `apps/v1` as the storage version in `1.10` (#58854), `extensions/v1beta1` `DeploymentSpec.ProgressDeadlineSeconds` gets `apps/v1` default value (`600`) instead of being unset. **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes #66135 **Special notes for your reviewer**: We need to cherrypick this fix to 1.10 and 1.11. Note that this fix will only help people who haven't upgraded to 1.10 or 1.11 when the storage version is changed. @kubernetes/sig-apps-bugs **Release note**: ```release-note NONE ```
751 lines
21 KiB
Go
751 lines
21 KiB
Go
/*
|
|
Copyright 2015 The Kubernetes Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package v1beta1_test
|
|
|
|
import (
|
|
"math"
|
|
"reflect"
|
|
"testing"
|
|
|
|
extensionsv1beta1 "k8s.io/api/extensions/v1beta1"
|
|
|
|
"k8s.io/api/core/v1"
|
|
apiequality "k8s.io/apimachinery/pkg/api/equality"
|
|
"k8s.io/apimachinery/pkg/api/resource"
|
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
|
"k8s.io/apimachinery/pkg/runtime"
|
|
"k8s.io/apimachinery/pkg/util/intstr"
|
|
"k8s.io/kubernetes/pkg/api/legacyscheme"
|
|
api "k8s.io/kubernetes/pkg/apis/core"
|
|
_ "k8s.io/kubernetes/pkg/apis/core/install"
|
|
_ "k8s.io/kubernetes/pkg/apis/extensions/install"
|
|
. "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
|
|
utilpointer "k8s.io/utils/pointer"
|
|
)
|
|
|
|
func TestSetDefaultDaemonSetSpec(t *testing.T) {
|
|
defaultLabels := map[string]string{"foo": "bar"}
|
|
period := int64(v1.DefaultTerminationGracePeriodSeconds)
|
|
defaultTemplate := v1.PodTemplateSpec{
|
|
Spec: v1.PodSpec{
|
|
DNSPolicy: v1.DNSClusterFirst,
|
|
RestartPolicy: v1.RestartPolicyAlways,
|
|
SecurityContext: &v1.PodSecurityContext{},
|
|
TerminationGracePeriodSeconds: &period,
|
|
SchedulerName: api.DefaultSchedulerName,
|
|
},
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Labels: defaultLabels,
|
|
},
|
|
}
|
|
templateNoLabel := v1.PodTemplateSpec{
|
|
Spec: v1.PodSpec{
|
|
DNSPolicy: v1.DNSClusterFirst,
|
|
RestartPolicy: v1.RestartPolicyAlways,
|
|
SecurityContext: &v1.PodSecurityContext{},
|
|
TerminationGracePeriodSeconds: &period,
|
|
SchedulerName: api.DefaultSchedulerName,
|
|
},
|
|
}
|
|
tests := []struct {
|
|
original *extensionsv1beta1.DaemonSet
|
|
expected *extensionsv1beta1.DaemonSet
|
|
}{
|
|
{ // Labels change/defaulting test.
|
|
original: &extensionsv1beta1.DaemonSet{
|
|
Spec: extensionsv1beta1.DaemonSetSpec{
|
|
Template: defaultTemplate,
|
|
},
|
|
},
|
|
expected: &extensionsv1beta1.DaemonSet{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Labels: defaultLabels,
|
|
},
|
|
Spec: extensionsv1beta1.DaemonSetSpec{
|
|
Selector: &metav1.LabelSelector{
|
|
MatchLabels: defaultLabels,
|
|
},
|
|
Template: defaultTemplate,
|
|
UpdateStrategy: extensionsv1beta1.DaemonSetUpdateStrategy{
|
|
Type: extensionsv1beta1.OnDeleteDaemonSetStrategyType,
|
|
},
|
|
RevisionHistoryLimit: utilpointer.Int32Ptr(10),
|
|
},
|
|
},
|
|
},
|
|
{ // Labels change/defaulting test.
|
|
original: &extensionsv1beta1.DaemonSet{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Labels: map[string]string{
|
|
"bar": "foo",
|
|
},
|
|
},
|
|
Spec: extensionsv1beta1.DaemonSetSpec{
|
|
Template: defaultTemplate,
|
|
RevisionHistoryLimit: utilpointer.Int32Ptr(1),
|
|
},
|
|
},
|
|
expected: &extensionsv1beta1.DaemonSet{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Labels: map[string]string{
|
|
"bar": "foo",
|
|
},
|
|
},
|
|
Spec: extensionsv1beta1.DaemonSetSpec{
|
|
Selector: &metav1.LabelSelector{
|
|
MatchLabels: defaultLabels,
|
|
},
|
|
Template: defaultTemplate,
|
|
UpdateStrategy: extensionsv1beta1.DaemonSetUpdateStrategy{
|
|
Type: extensionsv1beta1.OnDeleteDaemonSetStrategyType,
|
|
},
|
|
RevisionHistoryLimit: utilpointer.Int32Ptr(1),
|
|
},
|
|
},
|
|
},
|
|
{ // Update strategy.
|
|
original: &extensionsv1beta1.DaemonSet{},
|
|
expected: &extensionsv1beta1.DaemonSet{
|
|
Spec: extensionsv1beta1.DaemonSetSpec{
|
|
Template: templateNoLabel,
|
|
UpdateStrategy: extensionsv1beta1.DaemonSetUpdateStrategy{
|
|
Type: extensionsv1beta1.OnDeleteDaemonSetStrategyType,
|
|
},
|
|
RevisionHistoryLimit: utilpointer.Int32Ptr(10),
|
|
},
|
|
},
|
|
},
|
|
{ // Custom unique label key.
|
|
original: &extensionsv1beta1.DaemonSet{
|
|
Spec: extensionsv1beta1.DaemonSetSpec{},
|
|
},
|
|
expected: &extensionsv1beta1.DaemonSet{
|
|
Spec: extensionsv1beta1.DaemonSetSpec{
|
|
Template: templateNoLabel,
|
|
UpdateStrategy: extensionsv1beta1.DaemonSetUpdateStrategy{
|
|
Type: extensionsv1beta1.OnDeleteDaemonSetStrategyType,
|
|
},
|
|
RevisionHistoryLimit: utilpointer.Int32Ptr(10),
|
|
},
|
|
},
|
|
},
|
|
}
|
|
|
|
for i, test := range tests {
|
|
original := test.original
|
|
expected := test.expected
|
|
obj2 := roundTrip(t, runtime.Object(original))
|
|
got, ok := obj2.(*extensionsv1beta1.DaemonSet)
|
|
if !ok {
|
|
t.Errorf("(%d) unexpected object: %v", i, got)
|
|
t.FailNow()
|
|
}
|
|
if !apiequality.Semantic.DeepEqual(got.Spec, expected.Spec) {
|
|
t.Errorf("(%d) got different than expected\ngot:\n\t%+v\nexpected:\n\t%+v", i, got.Spec, expected.Spec)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestSetDefaultDeployment(t *testing.T) {
|
|
defaultIntOrString := intstr.FromInt(1)
|
|
differentIntOrString := intstr.FromInt(5)
|
|
period := int64(v1.DefaultTerminationGracePeriodSeconds)
|
|
defaultTemplate := v1.PodTemplateSpec{
|
|
Spec: v1.PodSpec{
|
|
DNSPolicy: v1.DNSClusterFirst,
|
|
RestartPolicy: v1.RestartPolicyAlways,
|
|
SecurityContext: &v1.PodSecurityContext{},
|
|
TerminationGracePeriodSeconds: &period,
|
|
SchedulerName: api.DefaultSchedulerName,
|
|
},
|
|
}
|
|
tests := []struct {
|
|
original *extensionsv1beta1.Deployment
|
|
expected *extensionsv1beta1.Deployment
|
|
}{
|
|
{
|
|
original: &extensionsv1beta1.Deployment{},
|
|
expected: &extensionsv1beta1.Deployment{
|
|
Spec: extensionsv1beta1.DeploymentSpec{
|
|
Replicas: utilpointer.Int32Ptr(1),
|
|
Strategy: extensionsv1beta1.DeploymentStrategy{
|
|
Type: extensionsv1beta1.RollingUpdateDeploymentStrategyType,
|
|
RollingUpdate: &extensionsv1beta1.RollingUpdateDeployment{
|
|
MaxSurge: &defaultIntOrString,
|
|
MaxUnavailable: &defaultIntOrString,
|
|
},
|
|
},
|
|
Template: defaultTemplate,
|
|
ProgressDeadlineSeconds: utilpointer.Int32Ptr(math.MaxInt32),
|
|
},
|
|
},
|
|
},
|
|
{
|
|
original: &extensionsv1beta1.Deployment{
|
|
Spec: extensionsv1beta1.DeploymentSpec{
|
|
Replicas: utilpointer.Int32Ptr(5),
|
|
Strategy: extensionsv1beta1.DeploymentStrategy{
|
|
RollingUpdate: &extensionsv1beta1.RollingUpdateDeployment{
|
|
MaxSurge: &differentIntOrString,
|
|
},
|
|
},
|
|
},
|
|
},
|
|
expected: &extensionsv1beta1.Deployment{
|
|
Spec: extensionsv1beta1.DeploymentSpec{
|
|
Replicas: utilpointer.Int32Ptr(5),
|
|
Strategy: extensionsv1beta1.DeploymentStrategy{
|
|
Type: extensionsv1beta1.RollingUpdateDeploymentStrategyType,
|
|
RollingUpdate: &extensionsv1beta1.RollingUpdateDeployment{
|
|
MaxSurge: &differentIntOrString,
|
|
MaxUnavailable: &defaultIntOrString,
|
|
},
|
|
},
|
|
Template: defaultTemplate,
|
|
ProgressDeadlineSeconds: utilpointer.Int32Ptr(math.MaxInt32),
|
|
},
|
|
},
|
|
},
|
|
{
|
|
original: &extensionsv1beta1.Deployment{
|
|
Spec: extensionsv1beta1.DeploymentSpec{
|
|
Replicas: utilpointer.Int32Ptr(3),
|
|
Strategy: extensionsv1beta1.DeploymentStrategy{
|
|
Type: extensionsv1beta1.RollingUpdateDeploymentStrategyType,
|
|
RollingUpdate: nil,
|
|
},
|
|
},
|
|
},
|
|
expected: &extensionsv1beta1.Deployment{
|
|
Spec: extensionsv1beta1.DeploymentSpec{
|
|
Replicas: utilpointer.Int32Ptr(3),
|
|
Strategy: extensionsv1beta1.DeploymentStrategy{
|
|
Type: extensionsv1beta1.RollingUpdateDeploymentStrategyType,
|
|
RollingUpdate: &extensionsv1beta1.RollingUpdateDeployment{
|
|
MaxSurge: &defaultIntOrString,
|
|
MaxUnavailable: &defaultIntOrString,
|
|
},
|
|
},
|
|
Template: defaultTemplate,
|
|
ProgressDeadlineSeconds: utilpointer.Int32Ptr(math.MaxInt32),
|
|
},
|
|
},
|
|
},
|
|
{
|
|
original: &extensionsv1beta1.Deployment{
|
|
Spec: extensionsv1beta1.DeploymentSpec{
|
|
Replicas: utilpointer.Int32Ptr(5),
|
|
Strategy: extensionsv1beta1.DeploymentStrategy{
|
|
Type: extensionsv1beta1.RecreateDeploymentStrategyType,
|
|
},
|
|
},
|
|
},
|
|
expected: &extensionsv1beta1.Deployment{
|
|
Spec: extensionsv1beta1.DeploymentSpec{
|
|
Replicas: utilpointer.Int32Ptr(5),
|
|
Strategy: extensionsv1beta1.DeploymentStrategy{
|
|
Type: extensionsv1beta1.RecreateDeploymentStrategyType,
|
|
},
|
|
Template: defaultTemplate,
|
|
ProgressDeadlineSeconds: utilpointer.Int32Ptr(math.MaxInt32),
|
|
},
|
|
},
|
|
},
|
|
{
|
|
original: &extensionsv1beta1.Deployment{
|
|
Spec: extensionsv1beta1.DeploymentSpec{
|
|
Replicas: utilpointer.Int32Ptr(5),
|
|
Strategy: extensionsv1beta1.DeploymentStrategy{
|
|
Type: extensionsv1beta1.RecreateDeploymentStrategyType,
|
|
},
|
|
ProgressDeadlineSeconds: utilpointer.Int32Ptr(30),
|
|
},
|
|
},
|
|
expected: &extensionsv1beta1.Deployment{
|
|
Spec: extensionsv1beta1.DeploymentSpec{
|
|
Replicas: utilpointer.Int32Ptr(5),
|
|
Strategy: extensionsv1beta1.DeploymentStrategy{
|
|
Type: extensionsv1beta1.RecreateDeploymentStrategyType,
|
|
},
|
|
Template: defaultTemplate,
|
|
ProgressDeadlineSeconds: utilpointer.Int32Ptr(30),
|
|
},
|
|
},
|
|
},
|
|
}
|
|
|
|
for _, test := range tests {
|
|
original := test.original
|
|
expected := test.expected
|
|
obj2 := roundTrip(t, runtime.Object(original))
|
|
got, ok := obj2.(*extensionsv1beta1.Deployment)
|
|
if !ok {
|
|
t.Errorf("unexpected object: %v", got)
|
|
t.FailNow()
|
|
}
|
|
if !apiequality.Semantic.DeepEqual(got.Spec, expected.Spec) {
|
|
t.Errorf("object mismatch!\nexpected:\n\t%+v\ngot:\n\t%+v", got.Spec, expected.Spec)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestSetDefaultReplicaSet(t *testing.T) {
|
|
tests := []struct {
|
|
rs *extensionsv1beta1.ReplicaSet
|
|
expectLabels bool
|
|
expectSelector bool
|
|
}{
|
|
{
|
|
rs: &extensionsv1beta1.ReplicaSet{
|
|
Spec: extensionsv1beta1.ReplicaSetSpec{
|
|
Template: v1.PodTemplateSpec{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Labels: map[string]string{
|
|
"foo": "bar",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
expectLabels: true,
|
|
expectSelector: true,
|
|
},
|
|
{
|
|
rs: &extensionsv1beta1.ReplicaSet{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Labels: map[string]string{
|
|
"bar": "foo",
|
|
},
|
|
},
|
|
Spec: extensionsv1beta1.ReplicaSetSpec{
|
|
Template: v1.PodTemplateSpec{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Labels: map[string]string{
|
|
"foo": "bar",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
expectLabels: false,
|
|
expectSelector: true,
|
|
},
|
|
{
|
|
rs: &extensionsv1beta1.ReplicaSet{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Labels: map[string]string{
|
|
"bar": "foo",
|
|
},
|
|
},
|
|
Spec: extensionsv1beta1.ReplicaSetSpec{
|
|
Selector: &metav1.LabelSelector{
|
|
MatchLabels: map[string]string{
|
|
"some": "other",
|
|
},
|
|
},
|
|
Template: v1.PodTemplateSpec{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Labels: map[string]string{
|
|
"foo": "bar",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
expectLabels: false,
|
|
expectSelector: false,
|
|
},
|
|
{
|
|
rs: &extensionsv1beta1.ReplicaSet{
|
|
Spec: extensionsv1beta1.ReplicaSetSpec{
|
|
Selector: &metav1.LabelSelector{
|
|
MatchLabels: map[string]string{
|
|
"some": "other",
|
|
},
|
|
},
|
|
Template: v1.PodTemplateSpec{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Labels: map[string]string{
|
|
"foo": "bar",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
expectLabels: true,
|
|
expectSelector: false,
|
|
},
|
|
}
|
|
|
|
for _, test := range tests {
|
|
rs := test.rs
|
|
obj2 := roundTrip(t, runtime.Object(rs))
|
|
rs2, ok := obj2.(*extensionsv1beta1.ReplicaSet)
|
|
if !ok {
|
|
t.Errorf("unexpected object: %v", rs2)
|
|
t.FailNow()
|
|
}
|
|
if test.expectSelector != reflect.DeepEqual(rs2.Spec.Selector.MatchLabels, rs2.Spec.Template.Labels) {
|
|
if test.expectSelector {
|
|
t.Errorf("expected: %v, got: %v", rs2.Spec.Template.Labels, rs2.Spec.Selector)
|
|
} else {
|
|
t.Errorf("unexpected equality: %v", rs.Spec.Selector)
|
|
}
|
|
}
|
|
if test.expectLabels != reflect.DeepEqual(rs2.Labels, rs2.Spec.Template.Labels) {
|
|
if test.expectLabels {
|
|
t.Errorf("expected: %v, got: %v", rs2.Spec.Template.Labels, rs2.Labels)
|
|
} else {
|
|
t.Errorf("unexpected equality: %v", rs.Labels)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestSetDefaultReplicaSetReplicas(t *testing.T) {
|
|
tests := []struct {
|
|
rs extensionsv1beta1.ReplicaSet
|
|
expectReplicas int32
|
|
}{
|
|
{
|
|
rs: extensionsv1beta1.ReplicaSet{
|
|
Spec: extensionsv1beta1.ReplicaSetSpec{
|
|
Template: v1.PodTemplateSpec{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Labels: map[string]string{
|
|
"foo": "bar",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
expectReplicas: 1,
|
|
},
|
|
{
|
|
rs: extensionsv1beta1.ReplicaSet{
|
|
Spec: extensionsv1beta1.ReplicaSetSpec{
|
|
Replicas: utilpointer.Int32Ptr(0),
|
|
Template: v1.PodTemplateSpec{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Labels: map[string]string{
|
|
"foo": "bar",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
expectReplicas: 0,
|
|
},
|
|
{
|
|
rs: extensionsv1beta1.ReplicaSet{
|
|
Spec: extensionsv1beta1.ReplicaSetSpec{
|
|
Replicas: utilpointer.Int32Ptr(3),
|
|
Template: v1.PodTemplateSpec{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Labels: map[string]string{
|
|
"foo": "bar",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
expectReplicas: 3,
|
|
},
|
|
}
|
|
|
|
for _, test := range tests {
|
|
rs := &test.rs
|
|
obj2 := roundTrip(t, runtime.Object(rs))
|
|
rs2, ok := obj2.(*extensionsv1beta1.ReplicaSet)
|
|
if !ok {
|
|
t.Errorf("unexpected object: %v", rs2)
|
|
t.FailNow()
|
|
}
|
|
if rs2.Spec.Replicas == nil {
|
|
t.Errorf("unexpected nil Replicas")
|
|
} else if test.expectReplicas != *rs2.Spec.Replicas {
|
|
t.Errorf("expected: %d replicas, got: %d", test.expectReplicas, *rs2.Spec.Replicas)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestDefaultRequestIsNotSetForReplicaSet(t *testing.T) {
|
|
s := v1.PodSpec{}
|
|
s.Containers = []v1.Container{
|
|
{
|
|
Resources: v1.ResourceRequirements{
|
|
Limits: v1.ResourceList{
|
|
v1.ResourceCPU: resource.MustParse("100m"),
|
|
},
|
|
},
|
|
},
|
|
}
|
|
rs := &extensionsv1beta1.ReplicaSet{
|
|
Spec: extensionsv1beta1.ReplicaSetSpec{
|
|
Replicas: utilpointer.Int32Ptr(3),
|
|
Template: v1.PodTemplateSpec{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Labels: map[string]string{
|
|
"foo": "bar",
|
|
},
|
|
},
|
|
Spec: s,
|
|
},
|
|
},
|
|
}
|
|
output := roundTrip(t, runtime.Object(rs))
|
|
rs2 := output.(*extensionsv1beta1.ReplicaSet)
|
|
defaultRequest := rs2.Spec.Template.Spec.Containers[0].Resources.Requests
|
|
requestValue := defaultRequest[v1.ResourceCPU]
|
|
if requestValue.String() != "0" {
|
|
t.Errorf("Expected 0 request value, got: %s", requestValue.String())
|
|
}
|
|
}
|
|
|
|
func TestDefaultAllowPrivilegeEscalationForPodSecurityPolicy(t *testing.T) {
|
|
psp := &extensionsv1beta1.PodSecurityPolicy{}
|
|
output := roundTrip(t, runtime.Object(psp))
|
|
psp2 := output.(*extensionsv1beta1.PodSecurityPolicy)
|
|
if psp2.Spec.AllowPrivilegeEscalation == nil || *psp2.Spec.AllowPrivilegeEscalation != true {
|
|
t.Errorf("Expected default to true, got: %#v", psp2.Spec.AllowPrivilegeEscalation)
|
|
}
|
|
}
|
|
|
|
func TestSetDefaultNetworkPolicy(t *testing.T) {
|
|
tests := []struct {
|
|
original *extensionsv1beta1.NetworkPolicy
|
|
expected *extensionsv1beta1.NetworkPolicy
|
|
}{
|
|
{ // Empty NetworkPolicy should be set to PolicyTypes Ingress
|
|
original: &extensionsv1beta1.NetworkPolicy{
|
|
Spec: extensionsv1beta1.NetworkPolicySpec{
|
|
PodSelector: metav1.LabelSelector{
|
|
MatchLabels: map[string]string{"a": "b"},
|
|
},
|
|
},
|
|
},
|
|
expected: &extensionsv1beta1.NetworkPolicy{
|
|
Spec: extensionsv1beta1.NetworkPolicySpec{
|
|
PodSelector: metav1.LabelSelector{
|
|
MatchLabels: map[string]string{"a": "b"},
|
|
},
|
|
PolicyTypes: []extensionsv1beta1.PolicyType{extensionsv1beta1.PolicyTypeIngress},
|
|
},
|
|
},
|
|
},
|
|
{ // Empty Ingress NetworkPolicy should be set to PolicyTypes Ingress
|
|
original: &extensionsv1beta1.NetworkPolicy{
|
|
Spec: extensionsv1beta1.NetworkPolicySpec{
|
|
PodSelector: metav1.LabelSelector{
|
|
MatchLabels: map[string]string{"a": "b"},
|
|
},
|
|
Ingress: []extensionsv1beta1.NetworkPolicyIngressRule{},
|
|
},
|
|
},
|
|
expected: &extensionsv1beta1.NetworkPolicy{
|
|
Spec: extensionsv1beta1.NetworkPolicySpec{
|
|
PodSelector: metav1.LabelSelector{
|
|
MatchLabels: map[string]string{"a": "b"},
|
|
},
|
|
Ingress: []extensionsv1beta1.NetworkPolicyIngressRule{},
|
|
PolicyTypes: []extensionsv1beta1.PolicyType{extensionsv1beta1.PolicyTypeIngress},
|
|
},
|
|
},
|
|
},
|
|
{ // Defined Ingress and Egress should be set to Ingress,Egress
|
|
original: &extensionsv1beta1.NetworkPolicy{
|
|
Spec: extensionsv1beta1.NetworkPolicySpec{
|
|
PodSelector: metav1.LabelSelector{
|
|
MatchLabels: map[string]string{"a": "b"},
|
|
},
|
|
Ingress: []extensionsv1beta1.NetworkPolicyIngressRule{
|
|
{
|
|
From: []extensionsv1beta1.NetworkPolicyPeer{
|
|
{
|
|
PodSelector: &metav1.LabelSelector{
|
|
MatchLabels: map[string]string{"c": "d"},
|
|
},
|
|
NamespaceSelector: &metav1.LabelSelector{
|
|
MatchLabels: map[string]string{"c": "d"},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
Egress: []extensionsv1beta1.NetworkPolicyEgressRule{
|
|
{
|
|
To: []extensionsv1beta1.NetworkPolicyPeer{
|
|
{
|
|
NamespaceSelector: &metav1.LabelSelector{
|
|
MatchLabels: map[string]string{"c": "d"},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
expected: &extensionsv1beta1.NetworkPolicy{
|
|
Spec: extensionsv1beta1.NetworkPolicySpec{
|
|
PodSelector: metav1.LabelSelector{
|
|
MatchLabels: map[string]string{"a": "b"},
|
|
},
|
|
Ingress: []extensionsv1beta1.NetworkPolicyIngressRule{
|
|
{
|
|
From: []extensionsv1beta1.NetworkPolicyPeer{
|
|
{
|
|
PodSelector: &metav1.LabelSelector{
|
|
MatchLabels: map[string]string{"c": "d"},
|
|
},
|
|
NamespaceSelector: &metav1.LabelSelector{
|
|
MatchLabels: map[string]string{"c": "d"},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
Egress: []extensionsv1beta1.NetworkPolicyEgressRule{
|
|
{
|
|
To: []extensionsv1beta1.NetworkPolicyPeer{
|
|
{
|
|
NamespaceSelector: &metav1.LabelSelector{
|
|
MatchLabels: map[string]string{"c": "d"},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
PolicyTypes: []extensionsv1beta1.PolicyType{extensionsv1beta1.PolicyTypeIngress, extensionsv1beta1.PolicyTypeEgress},
|
|
},
|
|
},
|
|
},
|
|
{ // Egress only with unset PolicyTypes should be set to Ingress, Egress
|
|
original: &extensionsv1beta1.NetworkPolicy{
|
|
Spec: extensionsv1beta1.NetworkPolicySpec{
|
|
PodSelector: metav1.LabelSelector{
|
|
MatchLabels: map[string]string{"a": "b"},
|
|
},
|
|
Egress: []extensionsv1beta1.NetworkPolicyEgressRule{
|
|
{
|
|
To: []extensionsv1beta1.NetworkPolicyPeer{
|
|
{
|
|
NamespaceSelector: &metav1.LabelSelector{
|
|
MatchLabels: map[string]string{"c": "d"},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
expected: &extensionsv1beta1.NetworkPolicy{
|
|
Spec: extensionsv1beta1.NetworkPolicySpec{
|
|
PodSelector: metav1.LabelSelector{
|
|
MatchLabels: map[string]string{"a": "b"},
|
|
},
|
|
Egress: []extensionsv1beta1.NetworkPolicyEgressRule{
|
|
{
|
|
To: []extensionsv1beta1.NetworkPolicyPeer{
|
|
{
|
|
NamespaceSelector: &metav1.LabelSelector{
|
|
MatchLabels: map[string]string{"c": "d"},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
PolicyTypes: []extensionsv1beta1.PolicyType{extensionsv1beta1.PolicyTypeIngress, extensionsv1beta1.PolicyTypeEgress},
|
|
},
|
|
},
|
|
},
|
|
{ // Egress only with PolicyTypes set to Egress should be set to only Egress
|
|
original: &extensionsv1beta1.NetworkPolicy{
|
|
Spec: extensionsv1beta1.NetworkPolicySpec{
|
|
PodSelector: metav1.LabelSelector{
|
|
MatchLabels: map[string]string{"a": "b"},
|
|
},
|
|
Egress: []extensionsv1beta1.NetworkPolicyEgressRule{
|
|
{
|
|
To: []extensionsv1beta1.NetworkPolicyPeer{
|
|
{
|
|
NamespaceSelector: &metav1.LabelSelector{
|
|
MatchLabels: map[string]string{"Egress": "only"},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
PolicyTypes: []extensionsv1beta1.PolicyType{extensionsv1beta1.PolicyTypeEgress},
|
|
},
|
|
},
|
|
expected: &extensionsv1beta1.NetworkPolicy{
|
|
Spec: extensionsv1beta1.NetworkPolicySpec{
|
|
PodSelector: metav1.LabelSelector{
|
|
MatchLabels: map[string]string{"a": "b"},
|
|
},
|
|
Egress: []extensionsv1beta1.NetworkPolicyEgressRule{
|
|
{
|
|
To: []extensionsv1beta1.NetworkPolicyPeer{
|
|
{
|
|
NamespaceSelector: &metav1.LabelSelector{
|
|
MatchLabels: map[string]string{"Egress": "only"},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
PolicyTypes: []extensionsv1beta1.PolicyType{extensionsv1beta1.PolicyTypeEgress},
|
|
},
|
|
},
|
|
},
|
|
}
|
|
|
|
for i, test := range tests {
|
|
original := test.original
|
|
expected := test.expected
|
|
obj2 := roundTrip(t, runtime.Object(original))
|
|
got, ok := obj2.(*extensionsv1beta1.NetworkPolicy)
|
|
if !ok {
|
|
t.Errorf("(%d) unexpected object: %v", i, got)
|
|
t.FailNow()
|
|
}
|
|
if !apiequality.Semantic.DeepEqual(got.Spec, expected.Spec) {
|
|
t.Errorf("(%d) got different than expected\ngot:\n\t%+v\nexpected:\n\t%+v", i, got.Spec, expected.Spec)
|
|
}
|
|
}
|
|
}
|
|
|
|
func roundTrip(t *testing.T, obj runtime.Object) runtime.Object {
|
|
data, err := runtime.Encode(legacyscheme.Codecs.LegacyCodec(SchemeGroupVersion), obj)
|
|
if err != nil {
|
|
t.Errorf("%v\n %#v", err, obj)
|
|
return nil
|
|
}
|
|
obj2, err := runtime.Decode(legacyscheme.Codecs.UniversalDecoder(), data)
|
|
if err != nil {
|
|
t.Errorf("%v\nData: %s\nSource: %#v", err, string(data), obj)
|
|
return nil
|
|
}
|
|
obj3 := reflect.New(reflect.TypeOf(obj).Elem()).Interface().(runtime.Object)
|
|
err = legacyscheme.Scheme.Convert(obj2, obj3, nil)
|
|
if err != nil {
|
|
t.Errorf("%v\nSource: %#v", err, obj2)
|
|
return nil
|
|
}
|
|
return obj3
|
|
}
|