Skip to content
This repository was archived by the owner on Nov 19, 2020. It is now read-only.

Commit 6fa0160

Browse files
committed
Remove stale generated file (watch/versioned/)
watch/versioned/generated.pb.go was generated from `k8s.io/kubernetes/pkg/watch/versioned`. But in kubernetes/kubernetes@b7d03ed that package was merged in to `k8s.io/kubernetes/pkg/apis/meta/v1`. Since then, the generate scripts in this repository have been updated, and forgot all about that package, and it just sits there, growing stale; claiming to be generated, but having no script to generate it. Effectively, this accomplished: copy from github.com/ericchiang/k8s/watch/versioned.Event to github.com/ericchiang/k8s/apis/meta/v1.WatchEvent So, remove 'watch/versioned/`, and replace its use with meta/v1.
1 parent 0ce9992 commit 6fa0160

File tree

2 files changed

+3
-408
lines changed

2 files changed

+3
-408
lines changed

watch.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
"io"
1111
"io/ioutil"
1212

13+
metav1 "github.com/ericchiang/k8s/apis/meta/v1"
1314
"github.com/ericchiang/k8s/runtime"
14-
"github.com/ericchiang/k8s/watch/versioned"
1515
"github.com/golang/protobuf/proto"
1616
)
1717

@@ -95,7 +95,7 @@ func (w *watcherPB) Close() error {
9595
return w.r.Close()
9696
}
9797

98-
func (w *watcherPB) next() (*versioned.Event, *runtime.Unknown, error) {
98+
func (w *watcherPB) next() (*metav1.WatchEvent, *runtime.Unknown, error) {
9999
length := make([]byte, 4)
100100
if _, err := io.ReadFull(w.r, length); err != nil {
101101
return nil, nil, err
@@ -106,7 +106,7 @@ func (w *watcherPB) next() (*versioned.Event, *runtime.Unknown, error) {
106106
return nil, nil, fmt.Errorf("read frame body: %v", err)
107107
}
108108

109-
var event versioned.Event
109+
var event metav1.WatchEvent
110110
if err := proto.Unmarshal(body, &event); err != nil {
111111
return nil, nil, err
112112
}

0 commit comments

Comments
 (0)