diff --git a/pkg/BUILD b/pkg/BUILD index 0351d6e22e3..8f08d5274df 100644 --- a/pkg/BUILD +++ b/pkg/BUILD @@ -77,7 +77,6 @@ filegroup( "//pkg/ssh:all-srcs", "//pkg/util:all-srcs", "//pkg/volume:all-srcs", - "//pkg/watch/json:all-srcs", "//pkg/windows/service:all-srcs", ], tags = ["automanaged"], diff --git a/pkg/watch/json/BUILD b/pkg/watch/json/BUILD deleted file mode 100644 index 3a0a730b958..00000000000 --- a/pkg/watch/json/BUILD +++ /dev/null @@ -1,32 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = [ - "doc.go", - "types.go", - ], - importpath = "k8s.io/kubernetes/pkg/watch/json", - deps = [ - "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/watch:go_default_library", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/pkg/watch/json/doc.go b/pkg/watch/json/doc.go deleted file mode 100644 index 5e84c43a557..00000000000 --- a/pkg/watch/json/doc.go +++ /dev/null @@ -1,19 +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 json implements a simple encoder and decoder for streams -// of watch events over io.Writer/Readers -package json // import "k8s.io/kubernetes/pkg/watch/json" diff --git a/pkg/watch/json/types.go b/pkg/watch/json/types.go deleted file mode 100644 index 8fad6210d49..00000000000 --- a/pkg/watch/json/types.go +++ /dev/null @@ -1,55 +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 json - -import ( - "encoding/json" - "fmt" - "reflect" - - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/watch" -) - -// WatchEvent objects are streamed from the api server in response to a watch request. -// These are not API objects and may not be changed in a backward-incompatible way. -// TODO: move to a public, versioned object now that RawExtension conversions are possible -// in the schema. -type WatchEvent struct { - // The type of the watch event; added, modified, deleted, or error. - // +optional - Type watch.EventType `json:"type,omitempty" description:"the type of watch event; may be ADDED, MODIFIED, DELETED, BOOKMARK or ERROR"` - - // For added or modified objects, this is the new object; for deleted objects, - // it's the state of the object immediately prior to its deletion. - // For errors, it's an api.Status. - // +optional - Object runtime.RawExtension `json:"object,omitempty" description:"the object being watched; will match the type of the resource endpoint or be a Status object if the type is ERROR"` -} - -// Object converts a watch.Event into an appropriately serializable JSON object -func Object(encoder runtime.Encoder, event *watch.Event) (interface{}, error) { - obj, ok := event.Object.(runtime.Object) - if !ok { - return nil, fmt.Errorf("the event object cannot be safely converted to JSON: %v", reflect.TypeOf(event.Object).Name()) - } - data, err := runtime.Encode(encoder, obj) - if err != nil { - return nil, err - } - return &WatchEvent{event.Type, runtime.RawExtension{Raw: json.RawMessage(data)}}, nil -}