From 41f55d711781c48d8b1365bce087009ceef2f1e9 Mon Sep 17 00:00:00 2001 From: Ben Luddy Date: Tue, 29 Oct 2024 13:38:12 -0400 Subject: [PATCH] Regenerate clients to support application/apply-patch+cbor. --- .../kubernetes/typed/apps/v1/deployment.go | 7 +++---- .../kubernetes/typed/apps/v1/replicaset.go | 7 +++---- .../kubernetes/typed/apps/v1/statefulset.go | 7 +++---- .../typed/apps/v1beta2/statefulset.go | 7 +++---- .../typed/extensions/v1beta1/deployment.go | 7 +++---- .../typed/extensions/v1beta1/replicaset.go | 7 +++---- .../versioned/typed/extensions/v1/testtype.go | 18 ++++++++---------- 7 files changed, 26 insertions(+), 34 deletions(-) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1/deployment.go b/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1/deployment.go index 98665eb9de7..cc06ccf3a93 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1/deployment.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1/deployment.go @@ -20,7 +20,6 @@ package v1 import ( context "context" - json "encoding/json" fmt "fmt" appsv1 "k8s.io/api/apps/v1" @@ -32,6 +31,7 @@ import ( applyconfigurationsautoscalingv1 "k8s.io/client-go/applyconfigurations/autoscaling/v1" gentype "k8s.io/client-go/gentype" scheme "k8s.io/client-go/kubernetes/scheme" + apply "k8s.io/client-go/util/apply" ) // DeploymentsGetter has a method to return a DeploymentInterface. @@ -120,20 +120,19 @@ func (c *deployments) ApplyScale(ctx context.Context, deploymentName string, sca return nil, fmt.Errorf("scale provided to ApplyScale must not be nil") } patchOpts := opts.ToPatchOptions() - data, err := json.Marshal(scale) + request, err := apply.NewRequest(c.GetClient(), scale) if err != nil { return nil, err } result = &autoscalingv1.Scale{} - err = c.GetClient().Patch(types.ApplyPatchType). + err = request. UseProtobufAsDefault(). Namespace(c.GetNamespace()). Resource("deployments"). Name(deploymentName). SubResource("scale"). VersionedParams(&patchOpts, scheme.ParameterCodec). - Body(data). Do(ctx). Into(result) return diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1/replicaset.go b/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1/replicaset.go index b3efc668476..db0fed952c1 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1/replicaset.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1/replicaset.go @@ -20,7 +20,6 @@ package v1 import ( context "context" - json "encoding/json" fmt "fmt" appsv1 "k8s.io/api/apps/v1" @@ -32,6 +31,7 @@ import ( applyconfigurationsautoscalingv1 "k8s.io/client-go/applyconfigurations/autoscaling/v1" gentype "k8s.io/client-go/gentype" scheme "k8s.io/client-go/kubernetes/scheme" + apply "k8s.io/client-go/util/apply" ) // ReplicaSetsGetter has a method to return a ReplicaSetInterface. @@ -120,20 +120,19 @@ func (c *replicaSets) ApplyScale(ctx context.Context, replicaSetName string, sca return nil, fmt.Errorf("scale provided to ApplyScale must not be nil") } patchOpts := opts.ToPatchOptions() - data, err := json.Marshal(scale) + request, err := apply.NewRequest(c.GetClient(), scale) if err != nil { return nil, err } result = &autoscalingv1.Scale{} - err = c.GetClient().Patch(types.ApplyPatchType). + err = request. UseProtobufAsDefault(). Namespace(c.GetNamespace()). Resource("replicasets"). Name(replicaSetName). SubResource("scale"). VersionedParams(&patchOpts, scheme.ParameterCodec). - Body(data). Do(ctx). Into(result) return diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1/statefulset.go b/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1/statefulset.go index e135c34089e..e52cc6159ac 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1/statefulset.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1/statefulset.go @@ -20,7 +20,6 @@ package v1 import ( context "context" - json "encoding/json" fmt "fmt" appsv1 "k8s.io/api/apps/v1" @@ -32,6 +31,7 @@ import ( applyconfigurationsautoscalingv1 "k8s.io/client-go/applyconfigurations/autoscaling/v1" gentype "k8s.io/client-go/gentype" scheme "k8s.io/client-go/kubernetes/scheme" + apply "k8s.io/client-go/util/apply" ) // StatefulSetsGetter has a method to return a StatefulSetInterface. @@ -120,20 +120,19 @@ func (c *statefulSets) ApplyScale(ctx context.Context, statefulSetName string, s return nil, fmt.Errorf("scale provided to ApplyScale must not be nil") } patchOpts := opts.ToPatchOptions() - data, err := json.Marshal(scale) + request, err := apply.NewRequest(c.GetClient(), scale) if err != nil { return nil, err } result = &autoscalingv1.Scale{} - err = c.GetClient().Patch(types.ApplyPatchType). + err = request. UseProtobufAsDefault(). Namespace(c.GetNamespace()). Resource("statefulsets"). Name(statefulSetName). SubResource("scale"). VersionedParams(&patchOpts, scheme.ParameterCodec). - Body(data). Do(ctx). Into(result) return diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta2/statefulset.go b/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta2/statefulset.go index 879d86bc8dd..c71e93494b4 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta2/statefulset.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta2/statefulset.go @@ -20,7 +20,6 @@ package v1beta2 import ( context "context" - json "encoding/json" fmt "fmt" appsv1beta2 "k8s.io/api/apps/v1beta2" @@ -30,6 +29,7 @@ import ( applyconfigurationsappsv1beta2 "k8s.io/client-go/applyconfigurations/apps/v1beta2" gentype "k8s.io/client-go/gentype" scheme "k8s.io/client-go/kubernetes/scheme" + apply "k8s.io/client-go/util/apply" ) // StatefulSetsGetter has a method to return a StatefulSetInterface. @@ -118,20 +118,19 @@ func (c *statefulSets) ApplyScale(ctx context.Context, statefulSetName string, s return nil, fmt.Errorf("scale provided to ApplyScale must not be nil") } patchOpts := opts.ToPatchOptions() - data, err := json.Marshal(scale) + request, err := apply.NewRequest(c.GetClient(), scale) if err != nil { return nil, err } result = &appsv1beta2.Scale{} - err = c.GetClient().Patch(types.ApplyPatchType). + err = request. UseProtobufAsDefault(). Namespace(c.GetNamespace()). Resource("statefulsets"). Name(statefulSetName). SubResource("scale"). VersionedParams(&patchOpts, scheme.ParameterCodec). - Body(data). Do(ctx). Into(result) return diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/deployment.go b/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/deployment.go index d7ca65b14cd..1bcf3cbc81b 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/deployment.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/deployment.go @@ -20,7 +20,6 @@ package v1beta1 import ( context "context" - json "encoding/json" fmt "fmt" extensionsv1beta1 "k8s.io/api/extensions/v1beta1" @@ -30,6 +29,7 @@ import ( applyconfigurationsextensionsv1beta1 "k8s.io/client-go/applyconfigurations/extensions/v1beta1" gentype "k8s.io/client-go/gentype" scheme "k8s.io/client-go/kubernetes/scheme" + apply "k8s.io/client-go/util/apply" ) // DeploymentsGetter has a method to return a DeploymentInterface. @@ -118,20 +118,19 @@ func (c *deployments) ApplyScale(ctx context.Context, deploymentName string, sca return nil, fmt.Errorf("scale provided to ApplyScale must not be nil") } patchOpts := opts.ToPatchOptions() - data, err := json.Marshal(scale) + request, err := apply.NewRequest(c.GetClient(), scale) if err != nil { return nil, err } result = &extensionsv1beta1.Scale{} - err = c.GetClient().Patch(types.ApplyPatchType). + err = request. UseProtobufAsDefault(). Namespace(c.GetNamespace()). Resource("deployments"). Name(deploymentName). SubResource("scale"). VersionedParams(&patchOpts, scheme.ParameterCodec). - Body(data). Do(ctx). Into(result) return diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/replicaset.go b/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/replicaset.go index 4640521af32..f918be417bd 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/replicaset.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/replicaset.go @@ -20,7 +20,6 @@ package v1beta1 import ( context "context" - json "encoding/json" fmt "fmt" extensionsv1beta1 "k8s.io/api/extensions/v1beta1" @@ -30,6 +29,7 @@ import ( applyconfigurationsextensionsv1beta1 "k8s.io/client-go/applyconfigurations/extensions/v1beta1" gentype "k8s.io/client-go/gentype" scheme "k8s.io/client-go/kubernetes/scheme" + apply "k8s.io/client-go/util/apply" ) // ReplicaSetsGetter has a method to return a ReplicaSetInterface. @@ -118,20 +118,19 @@ func (c *replicaSets) ApplyScale(ctx context.Context, replicaSetName string, sca return nil, fmt.Errorf("scale provided to ApplyScale must not be nil") } patchOpts := opts.ToPatchOptions() - data, err := json.Marshal(scale) + request, err := apply.NewRequest(c.GetClient(), scale) if err != nil { return nil, err } result = &extensionsv1beta1.Scale{} - err = c.GetClient().Patch(types.ApplyPatchType). + err = request. UseProtobufAsDefault(). Namespace(c.GetNamespace()). Resource("replicasets"). Name(replicaSetName). SubResource("scale"). VersionedParams(&patchOpts, scheme.ParameterCodec). - Body(data). Do(ctx). Into(result) return diff --git a/staging/src/k8s.io/code-generator/examples/crd/clientset/versioned/typed/extensions/v1/testtype.go b/staging/src/k8s.io/code-generator/examples/crd/clientset/versioned/typed/extensions/v1/testtype.go index 6a62aa00d73..4fb4edb4a31 100644 --- a/staging/src/k8s.io/code-generator/examples/crd/clientset/versioned/typed/extensions/v1/testtype.go +++ b/staging/src/k8s.io/code-generator/examples/crd/clientset/versioned/typed/extensions/v1/testtype.go @@ -20,7 +20,6 @@ package v1 import ( context "context" - json "encoding/json" fmt "fmt" time "time" @@ -28,6 +27,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" gentype "k8s.io/client-go/gentype" + apply "k8s.io/client-go/util/apply" consistencydetector "k8s.io/client-go/util/consistencydetector" watchlist "k8s.io/client-go/util/watchlist" extensionsv1 "k8s.io/code-generator/examples/crd/apis/extensions/v1" @@ -204,21 +204,20 @@ func (c *testTypes) ApplyExtended(ctx context.Context, testType *applyconfigurat return nil, fmt.Errorf("testType provided to ApplyExtended must not be nil") } patchOpts := opts.ToPatchOptions() - data, err := json.Marshal(testType) - if err != nil { - return nil, err - } name := testType.Name if name == nil { return nil, fmt.Errorf("testType.Name must be provided to ApplyExtended") } + request, err := apply.NewRequest(c.GetClient(), testType) + if err != nil { + return nil, err + } result = &extensionsv1.TestType{} - err = c.GetClient().Patch(types.ApplyPatchType). + err = request. Namespace(c.GetNamespace()). Resource("testtypes"). Name(*name). VersionedParams(&patchOpts, scheme.ParameterCodec). - Body(data). Do(ctx). Into(result) return @@ -275,19 +274,18 @@ func (c *testTypes) ApplySubresource(ctx context.Context, testTypeName string, t return nil, fmt.Errorf("testSubresource provided to ApplySubresource must not be nil") } patchOpts := opts.ToPatchOptions() - data, err := json.Marshal(testSubresource) + request, err := apply.NewRequest(c.GetClient(), testSubresource) if err != nil { return nil, err } result = &extensionsv1.TestSubresource{} - err = c.GetClient().Patch(types.ApplyPatchType). + err = request. Namespace(c.GetNamespace()). Resource("testtypes"). Name(testTypeName). SubResource("subresource"). VersionedParams(&patchOpts, scheme.ParameterCodec). - Body(data). Do(ctx). Into(result) return