Merge pull request #91485 from knight42/fix/fake-pod-logs

fix: make fake.Clientset support streaming logs

Kubernetes-commit: a054010d032b301e495d1a421f53b9a37a0a0109
This commit is contained in:
Kubernetes Publisher 2020-06-06 09:47:45 -07:00
commit e2038ac220
2 changed files with 71 additions and 2 deletions

View File

@ -18,11 +18,17 @@ package fake
import (
"context"
"fmt"
"io/ioutil"
"net/http"
"strings"
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
policy "k8s.io/api/policy/v1beta1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes/scheme"
restclient "k8s.io/client-go/rest"
fakerest "k8s.io/client-go/rest/fake"
core "k8s.io/client-go/testing"
)
@ -57,7 +63,19 @@ func (c *FakePods) GetLogs(name string, opts *v1.PodLogOptions) *restclient.Requ
action.Value = opts
_, _ = c.Fake.Invokes(action, &v1.Pod{})
return &restclient.Request{}
fakeClient := &fakerest.RESTClient{
Client: fakerest.CreateHTTPClient(func(request *http.Request) (*http.Response, error) {
resp := &http.Response{
StatusCode: http.StatusOK,
Body: ioutil.NopCloser(strings.NewReader("fake logs")),
}
return resp, nil
}),
NegotiatedSerializer: scheme.Codecs.WithoutConversion(),
GroupVersion: podsKind.GroupVersion(),
VersionedAPIPath: fmt.Sprintf("/api/v1/namespaces/%s/pods/%s/log", c.ns, name),
}
return fakeClient.Request()
}
func (c *FakePods) Evict(ctx context.Context, eviction *policy.Eviction) error {

View File

@ -0,0 +1,51 @@
/*
Copyright 2020 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 fake
import (
"bytes"
"context"
"io"
"testing"
corev1 "k8s.io/api/core/v1"
cgtesting "k8s.io/client-go/testing"
)
func TestFakePodsGetLogs(t *testing.T) {
fp := FakePods{
Fake: &FakeCoreV1{Fake: &cgtesting.Fake{}},
ns: "default",
}
req := fp.GetLogs("foo", &corev1.PodLogOptions{})
body, err := req.Stream(context.Background())
if err != nil {
t.Fatal("Stream pod logs:", err)
}
var buf bytes.Buffer
n, err := io.Copy(&buf, body)
if err != nil {
t.Fatal("Read pod logs:", err)
}
if n == 0 {
t.Fatal("Empty log")
}
err = body.Close()
if err != nil {
t.Fatal("Close response body:", err)
}
}