github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Drop PDB's beta from create command

Browse Source
This commit is contained in:
Maciej Szulik 2021-04-29 15:07:07 +02:00
parent 8b90dbdd44
commit 628321130b
No known key found for this signature in database
GPG Key ID: F15E55D276FA84C4
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
staging/src/k8s.io/kubectl/pkg/cmd/create/create_pdb.go
View File

@ -23,13 +23,13 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
policyv1beta1 "k8s.io/api/policy/v1beta1" policyv1 "k8s.io/api/policy/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/genericclioptions"
resourcecli "k8s.io/cli-runtime/pkg/resource" resourcecli "k8s.io/cli-runtime/pkg/resource"
policyclient "k8s.io/client-go/kubernetes/typed/policy/v1beta1" policyv1client "k8s.io/client-go/kubernetes/typed/policy/v1"
cmdutil "k8s.io/kubectl/pkg/cmd/util" cmdutil "k8s.io/kubectl/pkg/cmd/util"
"k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/scheme"
"k8s.io/kubectl/pkg/util" "k8s.io/kubectl/pkg/util"
@ -69,7 +69,7 @@ type PodDisruptionBudgetOpts struct {
Namespace string Namespace string
EnforceNamespace bool EnforceNamespace bool
Client *policyclient.PolicyV1beta1Client Client *policyv1client.PolicyV1Client
DryRunStrategy cmdutil.DryRunStrategy DryRunStrategy cmdutil.DryRunStrategy
DryRunVerifier *resourcecli.DryRunVerifier DryRunVerifier *resourcecli.DryRunVerifier
@ -127,7 +127,7 @@ func (o *PodDisruptionBudgetOpts) Complete(f cmdutil.Factory, cmd *cobra.Command
if err != nil { if err != nil {
return err return err
} }
o.Client, err = policyclient.NewForConfig(restConfig) o.Client, err = policyv1client.NewForConfig(restConfig)
if err != nil { if err != nil {
return err return err
} }
@ -230,15 +230,15 @@ func (o *PodDisruptionBudgetOpts) Run() error {
return o.PrintObj(podDisruptionBudget) return o.PrintObj(podDisruptionBudget)
} }
func (o *PodDisruptionBudgetOpts) createPodDisruptionBudgets() (*policyv1beta1.PodDisruptionBudget, error) { func (o *PodDisruptionBudgetOpts) createPodDisruptionBudgets() (*policyv1.PodDisruptionBudget, error) {
namespace := "" namespace := ""
if o.EnforceNamespace { if o.EnforceNamespace {
namespace = o.Namespace namespace = o.Namespace
} }
podDisruptionBudget := &policyv1beta1.PodDisruptionBudget{ podDisruptionBudget := &policyv1.PodDisruptionBudget{
TypeMeta: metav1.TypeMeta{ TypeMeta: metav1.TypeMeta{
APIVersion: policyv1beta1.SchemeGroupVersion.String(), APIVersion: policyv1.SchemeGroupVersion.String(),
Kind: "PodDisruptionBudget", Kind: "PodDisruptionBudget",
}, },
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{

28
staging/src/k8s.io/kubectl/pkg/cmd/create/create_pdb_test.go
View File

@ -19,7 +19,7 @@ package create
import ( import (
"testing" "testing"
policyv1beta1 "k8s.io/api/policy/v1beta1" policyv1 "k8s.io/api/policy/v1"
apiequality "k8s.io/apimachinery/pkg/api/equality" apiequality "k8s.io/apimachinery/pkg/api/equality"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/intstr"
@ -137,7 +137,7 @@ func TestCreatePdb(t *testing.T) {
tests := map[string]struct { tests := map[string]struct {
options *PodDisruptionBudgetOpts options *PodDisruptionBudgetOpts
expected *policyv1beta1.PodDisruptionBudget expected *policyv1.PodDisruptionBudget
}{ }{
"test-valid-min-available-pods-number": { "test-valid-min-available-pods-number": {
options: &PodDisruptionBudgetOpts{ options: &PodDisruptionBudgetOpts{
@ -145,15 +145,15 @@ func TestCreatePdb(t *testing.T) {
Selector: selectorOpts, Selector: selectorOpts,
MinAvailable: podAmountNumber, MinAvailable: podAmountNumber,
}, },
expected: &policyv1beta1.PodDisruptionBudget{ expected: &policyv1.PodDisruptionBudget{
TypeMeta: metav1.TypeMeta{ TypeMeta: metav1.TypeMeta{
Kind: "PodDisruptionBudget", Kind: "PodDisruptionBudget",
APIVersion: "policy/v1beta1", APIVersion: "policy/v1",
}, },
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: "my-pdb", Name: "my-pdb",
}, },
Spec: policyv1beta1.PodDisruptionBudgetSpec{ Spec: policyv1.PodDisruptionBudgetSpec{
Selector: selector, Selector: selector,
MinAvailable: &minAvailableNumber, MinAvailable: &minAvailableNumber,
}, },
@ -165,15 +165,15 @@ func TestCreatePdb(t *testing.T) {
Selector: selectorOpts, Selector: selectorOpts,
MinAvailable: podAmountPercent, MinAvailable: podAmountPercent,
}, },
expected: &policyv1beta1.PodDisruptionBudget{ expected: &policyv1.PodDisruptionBudget{
TypeMeta: metav1.TypeMeta{ TypeMeta: metav1.TypeMeta{
Kind: "PodDisruptionBudget", Kind: "PodDisruptionBudget",
APIVersion: "policy/v1beta1", APIVersion: "policy/v1",
}, },
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: "my-pdb", Name: "my-pdb",
}, },
Spec: policyv1beta1.PodDisruptionBudgetSpec{ Spec: policyv1.PodDisruptionBudgetSpec{
Selector: selector, Selector: selector,
MinAvailable: &minAvailablePercent, MinAvailable: &minAvailablePercent,
}, },
@ -185,15 +185,15 @@ func TestCreatePdb(t *testing.T) {
Selector: selectorOpts, Selector: selectorOpts,
MinAvailable: podAmountNumber, MinAvailable: podAmountNumber,
}, },
expected: &policyv1beta1.PodDisruptionBudget{ expected: &policyv1.PodDisruptionBudget{
TypeMeta: metav1.TypeMeta{ TypeMeta: metav1.TypeMeta{
Kind: "PodDisruptionBudget", Kind: "PodDisruptionBudget",
APIVersion: "policy/v1beta1", APIVersion: "policy/v1",
}, },
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: "my-pdb", Name: "my-pdb",
}, },
Spec: policyv1beta1.PodDisruptionBudgetSpec{ Spec: policyv1.PodDisruptionBudgetSpec{
Selector: selector, Selector: selector,
MinAvailable: &minUnavailableNumber, MinAvailable: &minUnavailableNumber,
}, },
@ -205,15 +205,15 @@ func TestCreatePdb(t *testing.T) {
Selector: selectorOpts, Selector: selectorOpts,
MinAvailable: podAmountPercent, MinAvailable: podAmountPercent,
}, },
expected: &policyv1beta1.PodDisruptionBudget{ expected: &policyv1.PodDisruptionBudget{
TypeMeta: metav1.TypeMeta{ TypeMeta: metav1.TypeMeta{
Kind: "PodDisruptionBudget", Kind: "PodDisruptionBudget",
APIVersion: "policy/v1beta1", APIVersion: "policy/v1",
}, },
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: "my-pdb", Name: "my-pdb",
}, },
Spec: policyv1beta1.PodDisruptionBudgetSpec{ Spec: policyv1.PodDisruptionBudgetSpec{
Selector: selector, Selector: selector,
MinAvailable: &minUnavailablePercent, MinAvailable: &minUnavailablePercent,
}, },