mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-01 07:47:56 +00:00
move restclient/watch
This commit is contained in:
parent
cdb2934bbc
commit
6c6616b41c
@ -26,7 +26,6 @@ go_library(
|
|||||||
"//pkg/api/v1:go_default_library",
|
"//pkg/api/v1:go_default_library",
|
||||||
"//pkg/api/validation/path:go_default_library",
|
"//pkg/api/validation/path:go_default_library",
|
||||||
"//pkg/client/metrics:go_default_library",
|
"//pkg/client/metrics:go_default_library",
|
||||||
"//pkg/client/restclient/watch:go_default_library",
|
|
||||||
"//pkg/fields:go_default_library",
|
"//pkg/fields:go_default_library",
|
||||||
"//pkg/util/cert:go_default_library",
|
"//pkg/util/cert:go_default_library",
|
||||||
"//pkg/util/flowcontrol:go_default_library",
|
"//pkg/util/flowcontrol:go_default_library",
|
||||||
@ -42,6 +41,7 @@ go_library(
|
|||||||
"//vendor:k8s.io/apimachinery/pkg/util/net",
|
"//vendor:k8s.io/apimachinery/pkg/util/net",
|
||||||
"//vendor:k8s.io/apimachinery/pkg/util/sets",
|
"//vendor:k8s.io/apimachinery/pkg/util/sets",
|
||||||
"//vendor:k8s.io/apimachinery/pkg/watch",
|
"//vendor:k8s.io/apimachinery/pkg/watch",
|
||||||
|
"//vendor:k8s.io/client-go/rest/watch",
|
||||||
"//vendor:k8s.io/client-go/tools/clientcmd/api",
|
"//vendor:k8s.io/client-go/tools/clientcmd/api",
|
||||||
"//vendor:k8s.io/client-go/transport",
|
"//vendor:k8s.io/client-go/transport",
|
||||||
],
|
],
|
||||||
@ -63,7 +63,6 @@ go_test(
|
|||||||
"//pkg/api:go_default_library",
|
"//pkg/api:go_default_library",
|
||||||
"//pkg/api/testapi:go_default_library",
|
"//pkg/api/testapi:go_default_library",
|
||||||
"//pkg/api/v1:go_default_library",
|
"//pkg/api/v1:go_default_library",
|
||||||
"//pkg/client/restclient/watch:go_default_library",
|
|
||||||
"//pkg/util/clock:go_default_library",
|
"//pkg/util/clock:go_default_library",
|
||||||
"//pkg/util/flowcontrol:go_default_library",
|
"//pkg/util/flowcontrol:go_default_library",
|
||||||
"//pkg/util/httpstream:go_default_library",
|
"//pkg/util/httpstream:go_default_library",
|
||||||
@ -79,6 +78,7 @@ go_test(
|
|||||||
"//vendor:k8s.io/apimachinery/pkg/types",
|
"//vendor:k8s.io/apimachinery/pkg/types",
|
||||||
"//vendor:k8s.io/apimachinery/pkg/util/diff",
|
"//vendor:k8s.io/apimachinery/pkg/util/diff",
|
||||||
"//vendor:k8s.io/apimachinery/pkg/watch",
|
"//vendor:k8s.io/apimachinery/pkg/watch",
|
||||||
|
"//vendor:k8s.io/client-go/rest/watch",
|
||||||
"//vendor:k8s.io/client-go/tools/clientcmd/api",
|
"//vendor:k8s.io/client-go/tools/clientcmd/api",
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
@ -95,7 +95,6 @@ filegroup(
|
|||||||
srcs = [
|
srcs = [
|
||||||
":package-srcs",
|
":package-srcs",
|
||||||
"//pkg/client/restclient/fake:all-srcs",
|
"//pkg/client/restclient/fake:all-srcs",
|
||||||
"//pkg/client/restclient/watch:all-srcs",
|
|
||||||
],
|
],
|
||||||
tags = ["automanaged"],
|
tags = ["automanaged"],
|
||||||
)
|
)
|
||||||
|
@ -42,10 +42,10 @@ import (
|
|||||||
"k8s.io/apimachinery/pkg/util/net"
|
"k8s.io/apimachinery/pkg/util/net"
|
||||||
"k8s.io/apimachinery/pkg/util/sets"
|
"k8s.io/apimachinery/pkg/util/sets"
|
||||||
"k8s.io/apimachinery/pkg/watch"
|
"k8s.io/apimachinery/pkg/watch"
|
||||||
|
restclientwatch "k8s.io/client-go/rest/watch"
|
||||||
"k8s.io/kubernetes/pkg/api/v1"
|
"k8s.io/kubernetes/pkg/api/v1"
|
||||||
pathvalidation "k8s.io/kubernetes/pkg/api/validation/path"
|
pathvalidation "k8s.io/kubernetes/pkg/api/validation/path"
|
||||||
"k8s.io/kubernetes/pkg/client/metrics"
|
"k8s.io/kubernetes/pkg/client/metrics"
|
||||||
restclientwatch "k8s.io/kubernetes/pkg/client/restclient/watch"
|
|
||||||
"k8s.io/kubernetes/pkg/fields"
|
"k8s.io/kubernetes/pkg/fields"
|
||||||
"k8s.io/kubernetes/pkg/util/flowcontrol"
|
"k8s.io/kubernetes/pkg/util/flowcontrol"
|
||||||
)
|
)
|
||||||
|
@ -42,10 +42,10 @@ import (
|
|||||||
"k8s.io/apimachinery/pkg/runtime/serializer/streaming"
|
"k8s.io/apimachinery/pkg/runtime/serializer/streaming"
|
||||||
"k8s.io/apimachinery/pkg/util/diff"
|
"k8s.io/apimachinery/pkg/util/diff"
|
||||||
"k8s.io/apimachinery/pkg/watch"
|
"k8s.io/apimachinery/pkg/watch"
|
||||||
|
restclientwatch "k8s.io/client-go/rest/watch"
|
||||||
"k8s.io/kubernetes/pkg/api"
|
"k8s.io/kubernetes/pkg/api"
|
||||||
"k8s.io/kubernetes/pkg/api/testapi"
|
"k8s.io/kubernetes/pkg/api/testapi"
|
||||||
"k8s.io/kubernetes/pkg/api/v1"
|
"k8s.io/kubernetes/pkg/api/v1"
|
||||||
restclientwatch "k8s.io/kubernetes/pkg/client/restclient/watch"
|
|
||||||
"k8s.io/kubernetes/pkg/util/clock"
|
"k8s.io/kubernetes/pkg/util/clock"
|
||||||
"k8s.io/kubernetes/pkg/util/flowcontrol"
|
"k8s.io/kubernetes/pkg/util/flowcontrol"
|
||||||
"k8s.io/kubernetes/pkg/util/httpstream"
|
"k8s.io/kubernetes/pkg/util/httpstream"
|
||||||
|
@ -1,56 +0,0 @@
|
|||||||
package(default_visibility = ["//visibility:public"])
|
|
||||||
|
|
||||||
licenses(["notice"])
|
|
||||||
|
|
||||||
load(
|
|
||||||
"@io_bazel_rules_go//go:def.bzl",
|
|
||||||
"go_library",
|
|
||||||
"go_test",
|
|
||||||
)
|
|
||||||
|
|
||||||
go_library(
|
|
||||||
name = "go_default_library",
|
|
||||||
srcs = [
|
|
||||||
"decoder.go",
|
|
||||||
"encoder.go",
|
|
||||||
],
|
|
||||||
tags = ["automanaged"],
|
|
||||||
deps = [
|
|
||||||
"//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
|
|
||||||
"//vendor:k8s.io/apimachinery/pkg/runtime",
|
|
||||||
"//vendor:k8s.io/apimachinery/pkg/runtime/serializer/streaming",
|
|
||||||
"//vendor:k8s.io/apimachinery/pkg/watch",
|
|
||||||
],
|
|
||||||
)
|
|
||||||
|
|
||||||
go_test(
|
|
||||||
name = "go_default_xtest",
|
|
||||||
srcs = [
|
|
||||||
"decoder_test.go",
|
|
||||||
"encoder_test.go",
|
|
||||||
],
|
|
||||||
tags = ["automanaged"],
|
|
||||||
deps = [
|
|
||||||
"//pkg/api:go_default_library",
|
|
||||||
"//pkg/api/testapi:go_default_library",
|
|
||||||
"//pkg/client/restclient/watch:go_default_library",
|
|
||||||
"//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
|
|
||||||
"//vendor:k8s.io/apimachinery/pkg/runtime",
|
|
||||||
"//vendor:k8s.io/apimachinery/pkg/runtime/serializer/streaming",
|
|
||||||
"//vendor:k8s.io/apimachinery/pkg/util/wait",
|
|
||||||
"//vendor:k8s.io/apimachinery/pkg/watch",
|
|
||||||
],
|
|
||||||
)
|
|
||||||
|
|
||||||
filegroup(
|
|
||||||
name = "package-srcs",
|
|
||||||
srcs = glob(["**"]),
|
|
||||||
tags = ["automanaged"],
|
|
||||||
visibility = ["//visibility:private"],
|
|
||||||
)
|
|
||||||
|
|
||||||
filegroup(
|
|
||||||
name = "all-srcs",
|
|
||||||
srcs = [":package-srcs"],
|
|
||||||
tags = ["automanaged"],
|
|
||||||
)
|
|
@ -1,72 +0,0 @@
|
|||||||
/*
|
|
||||||
Copyright 2014 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 versioned
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
|
|
||||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
|
||||||
"k8s.io/apimachinery/pkg/runtime"
|
|
||||||
"k8s.io/apimachinery/pkg/runtime/serializer/streaming"
|
|
||||||
"k8s.io/apimachinery/pkg/watch"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Decoder implements the watch.Decoder interface for io.ReadClosers that
|
|
||||||
// have contents which consist of a series of watchEvent objects encoded
|
|
||||||
// with the given streaming decoder. The internal objects will be then
|
|
||||||
// decoded by the embedded decoder.
|
|
||||||
type Decoder struct {
|
|
||||||
decoder streaming.Decoder
|
|
||||||
embeddedDecoder runtime.Decoder
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewDecoder creates an Decoder for the given writer and codec.
|
|
||||||
func NewDecoder(decoder streaming.Decoder, embeddedDecoder runtime.Decoder) *Decoder {
|
|
||||||
return &Decoder{
|
|
||||||
decoder: decoder,
|
|
||||||
embeddedDecoder: embeddedDecoder,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Decode blocks until it can return the next object in the reader. Returns an error
|
|
||||||
// if the reader is closed or an object can't be decoded.
|
|
||||||
func (d *Decoder) Decode() (watch.EventType, runtime.Object, error) {
|
|
||||||
var got metav1.WatchEvent
|
|
||||||
res, _, err := d.decoder.Decode(nil, &got)
|
|
||||||
if err != nil {
|
|
||||||
return "", nil, err
|
|
||||||
}
|
|
||||||
if res != &got {
|
|
||||||
return "", nil, fmt.Errorf("unable to decode to metav1.Event")
|
|
||||||
}
|
|
||||||
switch got.Type {
|
|
||||||
case string(watch.Added), string(watch.Modified), string(watch.Deleted), string(watch.Error):
|
|
||||||
default:
|
|
||||||
return "", nil, fmt.Errorf("got invalid watch event type: %v", got.Type)
|
|
||||||
}
|
|
||||||
|
|
||||||
obj, err := runtime.Decode(d.embeddedDecoder, got.Object.Raw)
|
|
||||||
if err != nil {
|
|
||||||
return "", nil, fmt.Errorf("unable to decode watch event: %v", err)
|
|
||||||
}
|
|
||||||
return watch.EventType(got.Type), obj, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Close closes the underlying r.
|
|
||||||
func (d *Decoder) Close() {
|
|
||||||
d.decoder.Close()
|
|
||||||
}
|
|
@ -1,114 +0,0 @@
|
|||||||
/*
|
|
||||||
Copyright 2014 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 versioned_test
|
|
||||||
|
|
||||||
import (
|
|
||||||
"encoding/json"
|
|
||||||
"io"
|
|
||||||
"testing"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
|
||||||
"k8s.io/apimachinery/pkg/runtime"
|
|
||||||
"k8s.io/apimachinery/pkg/runtime/serializer/streaming"
|
|
||||||
"k8s.io/apimachinery/pkg/util/wait"
|
|
||||||
"k8s.io/apimachinery/pkg/watch"
|
|
||||||
"k8s.io/kubernetes/pkg/api"
|
|
||||||
"k8s.io/kubernetes/pkg/api/testapi"
|
|
||||||
restclientwatch "k8s.io/kubernetes/pkg/client/restclient/watch"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TestDecoder(t *testing.T) {
|
|
||||||
table := []watch.EventType{watch.Added, watch.Deleted, watch.Modified, watch.Error}
|
|
||||||
|
|
||||||
for _, eventType := range table {
|
|
||||||
out, in := io.Pipe()
|
|
||||||
codec := testapi.Default.Codec()
|
|
||||||
decoder := restclientwatch.NewDecoder(streaming.NewDecoder(out, codec), codec)
|
|
||||||
|
|
||||||
expect := &api.Pod{ObjectMeta: metav1.ObjectMeta{Name: "foo"}}
|
|
||||||
encoder := json.NewEncoder(in)
|
|
||||||
go func() {
|
|
||||||
data, err := runtime.Encode(testapi.Default.Codec(), expect)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("Unexpected error %v", err)
|
|
||||||
}
|
|
||||||
event := metav1.WatchEvent{
|
|
||||||
Type: string(eventType),
|
|
||||||
Object: runtime.RawExtension{Raw: json.RawMessage(data)},
|
|
||||||
}
|
|
||||||
if err := encoder.Encode(&event); err != nil {
|
|
||||||
t.Errorf("Unexpected error %v", err)
|
|
||||||
}
|
|
||||||
in.Close()
|
|
||||||
}()
|
|
||||||
|
|
||||||
done := make(chan struct{})
|
|
||||||
go func() {
|
|
||||||
action, got, err := decoder.Decode()
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("Unexpected error %v", err)
|
|
||||||
}
|
|
||||||
if e, a := eventType, action; e != a {
|
|
||||||
t.Errorf("Expected %v, got %v", e, a)
|
|
||||||
}
|
|
||||||
if e, a := expect, got; !api.Semantic.DeepDerivative(e, a) {
|
|
||||||
t.Errorf("Expected %v, got %v", e, a)
|
|
||||||
}
|
|
||||||
t.Logf("Exited read")
|
|
||||||
close(done)
|
|
||||||
}()
|
|
||||||
<-done
|
|
||||||
|
|
||||||
done = make(chan struct{})
|
|
||||||
go func() {
|
|
||||||
_, _, err := decoder.Decode()
|
|
||||||
if err == nil {
|
|
||||||
t.Errorf("Unexpected nil error")
|
|
||||||
}
|
|
||||||
close(done)
|
|
||||||
}()
|
|
||||||
<-done
|
|
||||||
|
|
||||||
decoder.Close()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestDecoder_SourceClose(t *testing.T) {
|
|
||||||
out, in := io.Pipe()
|
|
||||||
codec := testapi.Default.Codec()
|
|
||||||
decoder := restclientwatch.NewDecoder(streaming.NewDecoder(out, codec), codec)
|
|
||||||
|
|
||||||
done := make(chan struct{})
|
|
||||||
|
|
||||||
go func() {
|
|
||||||
_, _, err := decoder.Decode()
|
|
||||||
if err == nil {
|
|
||||||
t.Errorf("Unexpected nil error")
|
|
||||||
}
|
|
||||||
close(done)
|
|
||||||
}()
|
|
||||||
|
|
||||||
in.Close()
|
|
||||||
|
|
||||||
select {
|
|
||||||
case <-done:
|
|
||||||
break
|
|
||||||
case <-time.After(wait.ForeverTestTimeout):
|
|
||||||
t.Error("Timeout")
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,56 +0,0 @@
|
|||||||
/*
|
|
||||||
Copyright 2014 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 versioned
|
|
||||||
|
|
||||||
import (
|
|
||||||
"encoding/json"
|
|
||||||
|
|
||||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
|
||||||
"k8s.io/apimachinery/pkg/runtime"
|
|
||||||
"k8s.io/apimachinery/pkg/runtime/serializer/streaming"
|
|
||||||
"k8s.io/apimachinery/pkg/watch"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Encoder serializes watch.Events into io.Writer. The internal objects
|
|
||||||
// are encoded using embedded encoder, and the outer Event is serialized
|
|
||||||
// using encoder.
|
|
||||||
// TODO: this type is only used by tests
|
|
||||||
type Encoder struct {
|
|
||||||
encoder streaming.Encoder
|
|
||||||
embeddedEncoder runtime.Encoder
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewEncoder(encoder streaming.Encoder, embeddedEncoder runtime.Encoder) *Encoder {
|
|
||||||
return &Encoder{
|
|
||||||
encoder: encoder,
|
|
||||||
embeddedEncoder: embeddedEncoder,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Encode writes an event to the writer. Returns an error
|
|
||||||
// if the writer is closed or an object can't be encoded.
|
|
||||||
func (e *Encoder) Encode(event *watch.Event) error {
|
|
||||||
data, err := runtime.Encode(e.embeddedEncoder, event.Object)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
// FIXME: get rid of json.RawMessage.
|
|
||||||
return e.encoder.Encode(&metav1.WatchEvent{
|
|
||||||
Type: string(event.Type),
|
|
||||||
Object: runtime.RawExtension{Raw: json.RawMessage(data)},
|
|
||||||
})
|
|
||||||
}
|
|
@ -1,79 +0,0 @@
|
|||||||
/*
|
|
||||||
Copyright 2014 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 versioned_test
|
|
||||||
|
|
||||||
import (
|
|
||||||
"bytes"
|
|
||||||
"io/ioutil"
|
|
||||||
"testing"
|
|
||||||
|
|
||||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
|
||||||
"k8s.io/apimachinery/pkg/runtime"
|
|
||||||
"k8s.io/apimachinery/pkg/runtime/serializer/streaming"
|
|
||||||
"k8s.io/apimachinery/pkg/watch"
|
|
||||||
"k8s.io/kubernetes/pkg/api"
|
|
||||||
"k8s.io/kubernetes/pkg/api/testapi"
|
|
||||||
restclientwatch "k8s.io/kubernetes/pkg/client/restclient/watch"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TestEncodeDecodeRoundTrip(t *testing.T) {
|
|
||||||
testCases := []struct {
|
|
||||||
Type watch.EventType
|
|
||||||
Object runtime.Object
|
|
||||||
Codec runtime.Codec
|
|
||||||
}{
|
|
||||||
{
|
|
||||||
watch.Added,
|
|
||||||
&api.Pod{ObjectMeta: metav1.ObjectMeta{Name: "foo"}},
|
|
||||||
testapi.Default.Codec(),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
watch.Modified,
|
|
||||||
&api.Pod{ObjectMeta: metav1.ObjectMeta{Name: "foo"}},
|
|
||||||
testapi.Default.Codec(),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
watch.Deleted,
|
|
||||||
&api.Pod{ObjectMeta: metav1.ObjectMeta{Name: "foo"}},
|
|
||||||
testapi.Default.Codec(),
|
|
||||||
},
|
|
||||||
}
|
|
||||||
for i, testCase := range testCases {
|
|
||||||
buf := &bytes.Buffer{}
|
|
||||||
|
|
||||||
codec := testCase.Codec
|
|
||||||
encoder := restclientwatch.NewEncoder(streaming.NewEncoder(buf, codec), codec)
|
|
||||||
if err := encoder.Encode(&watch.Event{Type: testCase.Type, Object: testCase.Object}); err != nil {
|
|
||||||
t.Errorf("%d: unexpected error: %v", i, err)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
rc := ioutil.NopCloser(buf)
|
|
||||||
decoder := restclientwatch.NewDecoder(streaming.NewDecoder(rc, codec), codec)
|
|
||||||
event, obj, err := decoder.Decode()
|
|
||||||
if err != nil {
|
|
||||||
t.Errorf("%d: unexpected error: %v", i, err)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if !api.Semantic.DeepDerivative(testCase.Object, obj) {
|
|
||||||
t.Errorf("%d: expected %#v, got %#v", i, testCase.Object, obj)
|
|
||||||
}
|
|
||||||
if event != testCase.Type {
|
|
||||||
t.Errorf("%d: unexpected type: %#v", i, event)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -44,7 +44,6 @@ go_test(
|
|||||||
deps = [
|
deps = [
|
||||||
"//pkg/api/v1:go_default_library",
|
"//pkg/api/v1:go_default_library",
|
||||||
"//pkg/client/restclient:go_default_library",
|
"//pkg/client/restclient:go_default_library",
|
||||||
"//pkg/client/restclient/watch:go_default_library",
|
|
||||||
"//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
|
"//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
|
||||||
"//vendor:k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
|
"//vendor:k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
|
||||||
"//vendor:k8s.io/apimachinery/pkg/runtime",
|
"//vendor:k8s.io/apimachinery/pkg/runtime",
|
||||||
@ -52,6 +51,7 @@ go_test(
|
|||||||
"//vendor:k8s.io/apimachinery/pkg/runtime/serializer/streaming",
|
"//vendor:k8s.io/apimachinery/pkg/runtime/serializer/streaming",
|
||||||
"//vendor:k8s.io/apimachinery/pkg/types",
|
"//vendor:k8s.io/apimachinery/pkg/types",
|
||||||
"//vendor:k8s.io/apimachinery/pkg/watch",
|
"//vendor:k8s.io/apimachinery/pkg/watch",
|
||||||
|
"//vendor:k8s.io/client-go/rest/watch",
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -32,9 +32,9 @@ import (
|
|||||||
"k8s.io/apimachinery/pkg/runtime/serializer/streaming"
|
"k8s.io/apimachinery/pkg/runtime/serializer/streaming"
|
||||||
"k8s.io/apimachinery/pkg/types"
|
"k8s.io/apimachinery/pkg/types"
|
||||||
"k8s.io/apimachinery/pkg/watch"
|
"k8s.io/apimachinery/pkg/watch"
|
||||||
|
restclientwatch "k8s.io/client-go/rest/watch"
|
||||||
"k8s.io/kubernetes/pkg/api/v1"
|
"k8s.io/kubernetes/pkg/api/v1"
|
||||||
"k8s.io/kubernetes/pkg/client/restclient"
|
"k8s.io/kubernetes/pkg/client/restclient"
|
||||||
restclientwatch "k8s.io/kubernetes/pkg/client/restclient/watch"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func getJSON(version, kind, name string) []byte {
|
func getJSON(version, kind, name string) []byte {
|
||||||
|
@ -183,7 +183,6 @@ go_test(
|
|||||||
"//pkg/apis/policy:go_default_library",
|
"//pkg/apis/policy:go_default_library",
|
||||||
"//pkg/client/restclient:go_default_library",
|
"//pkg/client/restclient:go_default_library",
|
||||||
"//pkg/client/restclient/fake:go_default_library",
|
"//pkg/client/restclient/fake:go_default_library",
|
||||||
"//pkg/client/restclient/watch:go_default_library",
|
|
||||||
"//pkg/client/typed/dynamic:go_default_library",
|
"//pkg/client/typed/dynamic:go_default_library",
|
||||||
"//pkg/kubectl:go_default_library",
|
"//pkg/kubectl:go_default_library",
|
||||||
"//pkg/kubectl/cmd/testing:go_default_library",
|
"//pkg/kubectl/cmd/testing:go_default_library",
|
||||||
@ -205,6 +204,7 @@ go_test(
|
|||||||
"//vendor:k8s.io/apimachinery/pkg/types",
|
"//vendor:k8s.io/apimachinery/pkg/types",
|
||||||
"//vendor:k8s.io/apimachinery/pkg/util/wait",
|
"//vendor:k8s.io/apimachinery/pkg/util/wait",
|
||||||
"//vendor:k8s.io/apimachinery/pkg/watch",
|
"//vendor:k8s.io/apimachinery/pkg/watch",
|
||||||
|
"//vendor:k8s.io/client-go/rest/watch",
|
||||||
"//vendor:k8s.io/heapster/metrics/apis/metrics/v1alpha1",
|
"//vendor:k8s.io/heapster/metrics/apis/metrics/v1alpha1",
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
@ -33,12 +33,12 @@ import (
|
|||||||
"k8s.io/apimachinery/pkg/runtime/serializer/json"
|
"k8s.io/apimachinery/pkg/runtime/serializer/json"
|
||||||
"k8s.io/apimachinery/pkg/runtime/serializer/streaming"
|
"k8s.io/apimachinery/pkg/runtime/serializer/streaming"
|
||||||
"k8s.io/apimachinery/pkg/watch"
|
"k8s.io/apimachinery/pkg/watch"
|
||||||
|
restclientwatch "k8s.io/client-go/rest/watch"
|
||||||
"k8s.io/kubernetes/pkg/api"
|
"k8s.io/kubernetes/pkg/api"
|
||||||
"k8s.io/kubernetes/pkg/api/testapi"
|
"k8s.io/kubernetes/pkg/api/testapi"
|
||||||
apitesting "k8s.io/kubernetes/pkg/api/testing"
|
apitesting "k8s.io/kubernetes/pkg/api/testing"
|
||||||
"k8s.io/kubernetes/pkg/client/restclient"
|
"k8s.io/kubernetes/pkg/client/restclient"
|
||||||
"k8s.io/kubernetes/pkg/client/restclient/fake"
|
"k8s.io/kubernetes/pkg/client/restclient/fake"
|
||||||
restclientwatch "k8s.io/kubernetes/pkg/client/restclient/watch"
|
|
||||||
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing"
|
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -65,7 +65,6 @@ go_test(
|
|||||||
"//pkg/api/testing:go_default_library",
|
"//pkg/api/testing:go_default_library",
|
||||||
"//pkg/api/v1:go_default_library",
|
"//pkg/api/v1:go_default_library",
|
||||||
"//pkg/client/restclient/fake:go_default_library",
|
"//pkg/client/restclient/fake:go_default_library",
|
||||||
"//pkg/client/restclient/watch:go_default_library",
|
|
||||||
"//pkg/util/testing:go_default_library",
|
"//pkg/util/testing:go_default_library",
|
||||||
"//vendor:github.com/ghodss/yaml",
|
"//vendor:github.com/ghodss/yaml",
|
||||||
"//vendor:github.com/stretchr/testify/assert",
|
"//vendor:github.com/stretchr/testify/assert",
|
||||||
@ -76,6 +75,7 @@ go_test(
|
|||||||
"//vendor:k8s.io/apimachinery/pkg/runtime/serializer/streaming",
|
"//vendor:k8s.io/apimachinery/pkg/runtime/serializer/streaming",
|
||||||
"//vendor:k8s.io/apimachinery/pkg/util/errors",
|
"//vendor:k8s.io/apimachinery/pkg/util/errors",
|
||||||
"//vendor:k8s.io/apimachinery/pkg/watch",
|
"//vendor:k8s.io/apimachinery/pkg/watch",
|
||||||
|
"//vendor:k8s.io/client-go/rest/watch",
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -37,13 +37,13 @@ import (
|
|||||||
"k8s.io/apimachinery/pkg/runtime/serializer/streaming"
|
"k8s.io/apimachinery/pkg/runtime/serializer/streaming"
|
||||||
utilerrors "k8s.io/apimachinery/pkg/util/errors"
|
utilerrors "k8s.io/apimachinery/pkg/util/errors"
|
||||||
"k8s.io/apimachinery/pkg/watch"
|
"k8s.io/apimachinery/pkg/watch"
|
||||||
|
restclientwatch "k8s.io/client-go/rest/watch"
|
||||||
"k8s.io/kubernetes/pkg/api"
|
"k8s.io/kubernetes/pkg/api"
|
||||||
"k8s.io/kubernetes/pkg/api/resource"
|
"k8s.io/kubernetes/pkg/api/resource"
|
||||||
"k8s.io/kubernetes/pkg/api/testapi"
|
"k8s.io/kubernetes/pkg/api/testapi"
|
||||||
apitesting "k8s.io/kubernetes/pkg/api/testing"
|
apitesting "k8s.io/kubernetes/pkg/api/testing"
|
||||||
"k8s.io/kubernetes/pkg/api/v1"
|
"k8s.io/kubernetes/pkg/api/v1"
|
||||||
"k8s.io/kubernetes/pkg/client/restclient/fake"
|
"k8s.io/kubernetes/pkg/client/restclient/fake"
|
||||||
restclientwatch "k8s.io/kubernetes/pkg/client/restclient/watch"
|
|
||||||
utiltesting "k8s.io/kubernetes/pkg/util/testing"
|
utiltesting "k8s.io/kubernetes/pkg/util/testing"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -71,6 +71,7 @@ function save() {
|
|||||||
# save everything for which the staging directory is the source of truth
|
# save everything for which the staging directory is the source of truth
|
||||||
save "transport"
|
save "transport"
|
||||||
save "tools/clientcmd/api"
|
save "tools/clientcmd/api"
|
||||||
|
save "rest/watch"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
79
vendor/BUILD
vendored
79
vendor/BUILD
vendored
@ -13638,3 +13638,82 @@ go_library(
|
|||||||
"//vendor:k8s.io/client-go/pkg/apis/rbac",
|
"//vendor:k8s.io/client-go/pkg/apis/rbac",
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
go_library(
|
||||||
|
name = "k8s.io/client-go/kubernetes/typed/rbac/v1beta1",
|
||||||
|
srcs = [
|
||||||
|
"k8s.io/client-go/kubernetes/typed/rbac/v1beta1/clusterrole.go",
|
||||||
|
"k8s.io/client-go/kubernetes/typed/rbac/v1beta1/clusterrolebinding.go",
|
||||||
|
"k8s.io/client-go/kubernetes/typed/rbac/v1beta1/doc.go",
|
||||||
|
"k8s.io/client-go/kubernetes/typed/rbac/v1beta1/generated_expansion.go",
|
||||||
|
"k8s.io/client-go/kubernetes/typed/rbac/v1beta1/rbac_client.go",
|
||||||
|
"k8s.io/client-go/kubernetes/typed/rbac/v1beta1/role.go",
|
||||||
|
"k8s.io/client-go/kubernetes/typed/rbac/v1beta1/rolebinding.go",
|
||||||
|
],
|
||||||
|
tags = ["automanaged"],
|
||||||
|
deps = [
|
||||||
|
"//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
|
||||||
|
"//vendor:k8s.io/apimachinery/pkg/runtime/schema",
|
||||||
|
"//vendor:k8s.io/apimachinery/pkg/runtime/serializer",
|
||||||
|
"//vendor:k8s.io/apimachinery/pkg/types",
|
||||||
|
"//vendor:k8s.io/apimachinery/pkg/watch",
|
||||||
|
"//vendor:k8s.io/client-go/pkg/api",
|
||||||
|
"//vendor:k8s.io/client-go/pkg/api/v1",
|
||||||
|
"//vendor:k8s.io/client-go/pkg/apis/rbac/v1beta1",
|
||||||
|
"//vendor:k8s.io/client-go/rest",
|
||||||
|
],
|
||||||
|
)
|
||||||
|
|
||||||
|
go_library(
|
||||||
|
name = "k8s.io/client-go/kubernetes/typed/rbac/v1beta1/fake",
|
||||||
|
srcs = [
|
||||||
|
"k8s.io/client-go/kubernetes/typed/rbac/v1beta1/fake/doc.go",
|
||||||
|
"k8s.io/client-go/kubernetes/typed/rbac/v1beta1/fake/fake_clusterrole.go",
|
||||||
|
"k8s.io/client-go/kubernetes/typed/rbac/v1beta1/fake/fake_clusterrolebinding.go",
|
||||||
|
"k8s.io/client-go/kubernetes/typed/rbac/v1beta1/fake/fake_rbac_client.go",
|
||||||
|
"k8s.io/client-go/kubernetes/typed/rbac/v1beta1/fake/fake_role.go",
|
||||||
|
"k8s.io/client-go/kubernetes/typed/rbac/v1beta1/fake/fake_rolebinding.go",
|
||||||
|
],
|
||||||
|
tags = ["automanaged"],
|
||||||
|
deps = [
|
||||||
|
"//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
|
||||||
|
"//vendor:k8s.io/apimachinery/pkg/labels",
|
||||||
|
"//vendor:k8s.io/apimachinery/pkg/runtime/schema",
|
||||||
|
"//vendor:k8s.io/apimachinery/pkg/types",
|
||||||
|
"//vendor:k8s.io/apimachinery/pkg/watch",
|
||||||
|
"//vendor:k8s.io/client-go/kubernetes/typed/rbac/v1beta1",
|
||||||
|
"//vendor:k8s.io/client-go/pkg/api/v1",
|
||||||
|
"//vendor:k8s.io/client-go/pkg/apis/rbac/v1beta1",
|
||||||
|
"//vendor:k8s.io/client-go/rest",
|
||||||
|
"//vendor:k8s.io/client-go/testing",
|
||||||
|
],
|
||||||
|
)
|
||||||
|
|
||||||
|
go_library(
|
||||||
|
name = "k8s.io/client-go/pkg/apis/rbac/v1beta1",
|
||||||
|
srcs = [
|
||||||
|
"k8s.io/client-go/pkg/apis/rbac/v1beta1/defaults.go",
|
||||||
|
"k8s.io/client-go/pkg/apis/rbac/v1beta1/doc.go",
|
||||||
|
"k8s.io/client-go/pkg/apis/rbac/v1beta1/generated.pb.go",
|
||||||
|
"k8s.io/client-go/pkg/apis/rbac/v1beta1/helpers.go",
|
||||||
|
"k8s.io/client-go/pkg/apis/rbac/v1beta1/register.go",
|
||||||
|
"k8s.io/client-go/pkg/apis/rbac/v1beta1/types.generated.go",
|
||||||
|
"k8s.io/client-go/pkg/apis/rbac/v1beta1/types.go",
|
||||||
|
"k8s.io/client-go/pkg/apis/rbac/v1beta1/types_swagger_doc_generated.go",
|
||||||
|
"k8s.io/client-go/pkg/apis/rbac/v1beta1/zz_generated.conversion.go",
|
||||||
|
"k8s.io/client-go/pkg/apis/rbac/v1beta1/zz_generated.deepcopy.go",
|
||||||
|
"k8s.io/client-go/pkg/apis/rbac/v1beta1/zz_generated.defaults.go",
|
||||||
|
],
|
||||||
|
tags = ["automanaged"],
|
||||||
|
deps = [
|
||||||
|
"//vendor:github.com/gogo/protobuf/proto",
|
||||||
|
"//vendor:github.com/ugorji/go/codec",
|
||||||
|
"//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
|
||||||
|
"//vendor:k8s.io/apimachinery/pkg/conversion",
|
||||||
|
"//vendor:k8s.io/apimachinery/pkg/runtime",
|
||||||
|
"//vendor:k8s.io/apimachinery/pkg/runtime/schema",
|
||||||
|
"//vendor:k8s.io/apimachinery/pkg/types",
|
||||||
|
"//vendor:k8s.io/client-go/pkg/api/v1",
|
||||||
|
"//vendor:k8s.io/client-go/pkg/apis/rbac",
|
||||||
|
],
|
||||||
|
)
|
||||||
|
Loading…
Reference in New Issue
Block a user