Merge pull request #110398 from ardaguclu/flatten-rollout-status

Enable resource builder flattening in rollout status

staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_status.go

@@ -134,12 +134,7 @@ func (o *RolloutStatusOptions) Complete(f cmdutil.Factory, args []string) error
 	o.BuilderArgs = args
 	o.StatusViewerFn = polymorphichelpers.StatusViewerFn
 
-	clientConfig, err := f.ToRESTConfig()
+	o.DynamicClient, err = f.DynamicClient()
-	if err != nil {
-		return err
-	}
-
-	o.DynamicClient, err = dynamic.NewForConfig(clientConfig)
 	if err != nil {
 		return err
 	}
@@ -170,6 +165,7 @@ func (o *RolloutStatusOptions) Run() error {
 		ResourceTypeOrNameArgs(true, o.BuilderArgs...).
 		ContinueOnError().
 		Latest().
+		Flatten().
 		Do()
 
 	err := r.Err()

staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_status_test.go

@@ -0,0 +1,260 @@
+/*
+Copyright 2022 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 rollout
+
+import (
+	"bytes"
+	"io/ioutil"
+	appsv1 "k8s.io/api/apps/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/watch"
+	"k8s.io/client-go/rest/fake"
+	cgtesting "k8s.io/client-go/testing"
+	"k8s.io/kubectl/pkg/scheme"
+	"net/http"
+	"testing"
+
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/cli-runtime/pkg/genericclioptions"
+	cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
+)
+
+var rolloutStatusGroupVersionEncoder = schema.GroupVersion{Group: "apps", Version: "v1"}
+
+func TestRolloutStatus(t *testing.T) {
+	deploymentName := "deployment/nginx-deployment"
+	ns := scheme.Codecs.WithoutConversion()
+	tf := cmdtesting.NewTestFactory().WithNamespace("test")
+	tf.ClientConfigVal = cmdtesting.DefaultClientConfig()
+
+	info, _ := runtime.SerializerInfoForMediaType(ns.SupportedMediaTypes(), runtime.ContentTypeJSON)
+	encoder := ns.EncoderForVersion(info.Serializer, rolloutStatusGroupVersionEncoder)
+	tf.Client = &fake.RESTClient{
+		GroupVersion:         rolloutStatusGroupVersionEncoder,
+		NegotiatedSerializer: ns,
+		Client: fake.CreateHTTPClient(func(req *http.Request) (*http.Response, error) {
+			dep := &appsv1.Deployment{}
+			dep.Name = deploymentName
+			body := ioutil.NopCloser(bytes.NewReader([]byte(runtime.EncodeOrDie(encoder, dep))))
+			return &http.Response{StatusCode: http.StatusOK, Header: cmdtesting.DefaultHeader(), Body: body}, nil
+		}),
+	}
+
+	tf.FakeDynamicClient.WatchReactionChain = nil
+	tf.FakeDynamicClient.AddWatchReactor("*", func(action cgtesting.Action) (handled bool, ret watch.Interface, err error) {
+		fw := watch.NewFake()
+		dep := &appsv1.Deployment{}
+		dep.Name = deploymentName
+		dep.Status = appsv1.DeploymentStatus{
+			Replicas:            1,
+			UpdatedReplicas:     1,
+			ReadyReplicas:       1,
+			AvailableReplicas:   1,
+			UnavailableReplicas: 0,
+			Conditions: []appsv1.DeploymentCondition{{
+				Type: appsv1.DeploymentAvailable,
+			}},
+		}
+		c, err := runtime.DefaultUnstructuredConverter.ToUnstructured(dep.DeepCopyObject())
+		if err != nil {
+			t.Errorf("unexpected err %s", err)
+		}
+		u := &unstructured.Unstructured{}
+		u.SetUnstructuredContent(c)
+		go fw.Add(u)
+		return true, fw, nil
+	})
+
+	streams, _, buf, _ := genericclioptions.NewTestIOStreams()
+	cmd := NewCmdRolloutStatus(tf, streams)
+	cmd.Run(cmd, []string{deploymentName})
+
+	expectedMsg := "deployment \"deployment/nginx-deployment\" successfully rolled out\n"
+	if buf.String() != expectedMsg {
+		t.Errorf("expected output: %s, but got: %s", expectedMsg, buf.String())
+	}
+}
+
+func TestRolloutStatusWithSelector(t *testing.T) {
+	deploymentName := "deployment"
+	ns := scheme.Codecs.WithoutConversion()
+	tf := cmdtesting.NewTestFactory().WithNamespace("test")
+	tf.ClientConfigVal = cmdtesting.DefaultClientConfig()
+
+	info, _ := runtime.SerializerInfoForMediaType(ns.SupportedMediaTypes(), runtime.ContentTypeJSON)
+	encoder := ns.EncoderForVersion(info.Serializer, rolloutStatusGroupVersionEncoder)
+	tf.Client = &fake.RESTClient{
+		GroupVersion:         rolloutStatusGroupVersionEncoder,
+		NegotiatedSerializer: ns,
+		Client: fake.CreateHTTPClient(func(req *http.Request) (*http.Response, error) {
+			dep := &appsv1.Deployment{}
+			dep.Name = deploymentName
+			dep.Labels = make(map[string]string)
+			dep.Labels["app"] = "api"
+			body := ioutil.NopCloser(bytes.NewReader([]byte(runtime.EncodeOrDie(encoder, dep))))
+			return &http.Response{StatusCode: http.StatusOK, Header: cmdtesting.DefaultHeader(), Body: body}, nil
+		}),
+	}
+
+	tf.FakeDynamicClient.WatchReactionChain = nil
+	tf.FakeDynamicClient.AddWatchReactor("*", func(action cgtesting.Action) (handled bool, ret watch.Interface, err error) {
+		fw := watch.NewFake()
+		dep := &appsv1.Deployment{}
+		dep.Name = deploymentName
+		dep.Status = appsv1.DeploymentStatus{
+			Replicas:            1,
+			UpdatedReplicas:     1,
+			ReadyReplicas:       1,
+			AvailableReplicas:   1,
+			UnavailableReplicas: 0,
+			Conditions: []appsv1.DeploymentCondition{{
+				Type: appsv1.DeploymentAvailable,
+			}},
+		}
+		dep.Labels = make(map[string]string)
+		dep.Labels["app"] = "api"
+		c, err := runtime.DefaultUnstructuredConverter.ToUnstructured(dep.DeepCopyObject())
+		if err != nil {
+			t.Errorf("unexpected err %s", err)
+		}
+		u := &unstructured.Unstructured{}
+		u.SetUnstructuredContent(c)
+		go fw.Add(u)
+		return true, fw, nil
+	})
+
+	streams, _, buf, _ := genericclioptions.NewTestIOStreams()
+	cmd := NewCmdRolloutStatus(tf, streams)
+	cmd.Flags().Set("selector", "app=api")
+	cmd.Run(cmd, []string{deploymentName})
+
+	expectedMsg := "deployment \"deployment\" successfully rolled out\n"
+	if buf.String() != expectedMsg {
+		t.Errorf("expected output: %s, but got: %s", expectedMsg, buf.String())
+	}
+}
+
+func TestRolloutStatusWatchDisabled(t *testing.T) {
+	deploymentName := "deployment/nginx-deployment"
+	ns := scheme.Codecs.WithoutConversion()
+	tf := cmdtesting.NewTestFactory().WithNamespace("test")
+	tf.ClientConfigVal = cmdtesting.DefaultClientConfig()
+
+	info, _ := runtime.SerializerInfoForMediaType(ns.SupportedMediaTypes(), runtime.ContentTypeJSON)
+	encoder := ns.EncoderForVersion(info.Serializer, rolloutStatusGroupVersionEncoder)
+	tf.Client = &fake.RESTClient{
+		GroupVersion:         rolloutStatusGroupVersionEncoder,
+		NegotiatedSerializer: ns,
+		Client: fake.CreateHTTPClient(func(req *http.Request) (*http.Response, error) {
+			dep := &appsv1.Deployment{}
+			dep.Name = deploymentName
+			body := ioutil.NopCloser(bytes.NewReader([]byte(runtime.EncodeOrDie(encoder, dep))))
+			return &http.Response{StatusCode: http.StatusOK, Header: cmdtesting.DefaultHeader(), Body: body}, nil
+		}),
+	}
+
+	tf.FakeDynamicClient.WatchReactionChain = nil
+	tf.FakeDynamicClient.AddWatchReactor("*", func(action cgtesting.Action) (handled bool, ret watch.Interface, err error) {
+		fw := watch.NewFake()
+		dep := &appsv1.Deployment{}
+		dep.Name = deploymentName
+		dep.Status = appsv1.DeploymentStatus{
+			Replicas:            1,
+			UpdatedReplicas:     1,
+			ReadyReplicas:       1,
+			AvailableReplicas:   1,
+			UnavailableReplicas: 0,
+			Conditions: []appsv1.DeploymentCondition{{
+				Type: appsv1.DeploymentAvailable,
+			}},
+		}
+		c, err := runtime.DefaultUnstructuredConverter.ToUnstructured(dep.DeepCopyObject())
+		if err != nil {
+			t.Errorf("unexpected err %s", err)
+		}
+		u := &unstructured.Unstructured{}
+		u.SetUnstructuredContent(c)
+		go fw.Add(u)
+		return true, fw, nil
+	})
+
+	streams, _, buf, _ := genericclioptions.NewTestIOStreams()
+	cmd := NewCmdRolloutStatus(tf, streams)
+	cmd.Flags().Set("watch", "false")
+	cmd.Run(cmd, []string{deploymentName})
+
+	expectedMsg := "deployment \"deployment/nginx-deployment\" successfully rolled out\n"
+	if buf.String() != expectedMsg {
+		t.Errorf("expected output: %s, but got: %s", expectedMsg, buf.String())
+	}
+}
+
+func TestRolloutStatusWatchDisabledUnavailable(t *testing.T) {
+	deploymentName := "deployment/nginx-deployment"
+	ns := scheme.Codecs.WithoutConversion()
+	tf := cmdtesting.NewTestFactory().WithNamespace("test")
+	tf.ClientConfigVal = cmdtesting.DefaultClientConfig()
+
+	info, _ := runtime.SerializerInfoForMediaType(ns.SupportedMediaTypes(), runtime.ContentTypeJSON)
+	encoder := ns.EncoderForVersion(info.Serializer, rolloutStatusGroupVersionEncoder)
+	tf.Client = &fake.RESTClient{
+		GroupVersion:         rolloutStatusGroupVersionEncoder,
+		NegotiatedSerializer: ns,
+		Client: fake.CreateHTTPClient(func(req *http.Request) (*http.Response, error) {
+			dep := &appsv1.Deployment{}
+			dep.Name = deploymentName
+			body := ioutil.NopCloser(bytes.NewReader([]byte(runtime.EncodeOrDie(encoder, dep))))
+			return &http.Response{StatusCode: http.StatusOK, Header: cmdtesting.DefaultHeader(), Body: body}, nil
+		}),
+	}
+
+	tf.FakeDynamicClient.WatchReactionChain = nil
+	tf.FakeDynamicClient.AddWatchReactor("*", func(action cgtesting.Action) (handled bool, ret watch.Interface, err error) {
+		fw := watch.NewFake()
+		dep := &appsv1.Deployment{}
+		dep.Name = deploymentName
+		dep.Status = appsv1.DeploymentStatus{
+			Replicas:            1,
+			UpdatedReplicas:     1,
+			ReadyReplicas:       1,
+			AvailableReplicas:   0,
+			UnavailableReplicas: 0,
+			Conditions: []appsv1.DeploymentCondition{{
+				Type: appsv1.DeploymentAvailable,
+			}},
+		}
+		c, err := runtime.DefaultUnstructuredConverter.ToUnstructured(dep.DeepCopyObject())
+		if err != nil {
+			t.Errorf("unexpected err %s", err)
+		}
+		u := &unstructured.Unstructured{}
+		u.SetUnstructuredContent(c)
+		go fw.Add(u)
+		return true, fw, nil
+	})
+
+	streams, _, buf, _ := genericclioptions.NewTestIOStreams()
+	cmd := NewCmdRolloutStatus(tf, streams)
+	cmd.Flags().Set("watch", "false")
+	cmd.Run(cmd, []string{deploymentName})
+
+	expectedMsg := "Waiting for deployment \"deployment/nginx-deployment\" rollout to finish: 0 of 1 updated replicas are available...\n"
+	if buf.String() != expectedMsg {
+		t.Errorf("expected output: %s, but got: %s", expectedMsg, buf.String())
+	}
+}