From 2909022a6e0cb173a0f6e75063c180cc24dfac6c Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Mon, 22 Jun 2020 13:54:34 -0400 Subject: [PATCH 1/7] Make local copy of kubelet/cri/streaming Signed-off-by: Davanum Srinivas --- pkg/config/config_unix.go | 2 +- pkg/config/config_windows.go | 2 +- pkg/server/service.go | 2 +- pkg/server/streaming.go | 2 +- .../kubernetes/pkg/kubelet/cri => pkg}/streaming/errors.go | 0 .../kubelet/cri => pkg}/streaming/portforward/constants.go | 0 .../kubelet/cri => pkg}/streaming/portforward/httpstream.go | 0 .../kubelet/cri => pkg}/streaming/portforward/portforward.go | 0 .../kubelet/cri => pkg}/streaming/portforward/websocket.go | 0 .../kubelet/cri => pkg}/streaming/remotecommand/attach.go | 0 .../pkg/kubelet/cri => pkg}/streaming/remotecommand/doc.go | 0 .../pkg/kubelet/cri => pkg}/streaming/remotecommand/exec.go | 0 .../cri => pkg}/streaming/remotecommand/httpstream.go | 0 .../kubelet/cri => pkg}/streaming/remotecommand/websocket.go | 0 .../pkg/kubelet/cri => pkg}/streaming/request_cache.go | 0 .../kubernetes/pkg/kubelet/cri => pkg}/streaming/server.go | 5 +++-- 16 files changed, 7 insertions(+), 6 deletions(-) rename {vendor/k8s.io/kubernetes/pkg/kubelet/cri => pkg}/streaming/errors.go (100%) rename {vendor/k8s.io/kubernetes/pkg/kubelet/cri => pkg}/streaming/portforward/constants.go (100%) rename {vendor/k8s.io/kubernetes/pkg/kubelet/cri => pkg}/streaming/portforward/httpstream.go (100%) rename {vendor/k8s.io/kubernetes/pkg/kubelet/cri => pkg}/streaming/portforward/portforward.go (100%) rename {vendor/k8s.io/kubernetes/pkg/kubelet/cri => pkg}/streaming/portforward/websocket.go (100%) rename {vendor/k8s.io/kubernetes/pkg/kubelet/cri => pkg}/streaming/remotecommand/attach.go (100%) rename {vendor/k8s.io/kubernetes/pkg/kubelet/cri => pkg}/streaming/remotecommand/doc.go (100%) rename {vendor/k8s.io/kubernetes/pkg/kubelet/cri => pkg}/streaming/remotecommand/exec.go (100%) rename {vendor/k8s.io/kubernetes/pkg/kubelet/cri => pkg}/streaming/remotecommand/httpstream.go (100%) rename {vendor/k8s.io/kubernetes/pkg/kubelet/cri => pkg}/streaming/remotecommand/websocket.go (100%) rename {vendor/k8s.io/kubernetes/pkg/kubelet/cri => pkg}/streaming/request_cache.go (100%) rename {vendor/k8s.io/kubernetes/pkg/kubelet/cri => pkg}/streaming/server.go (98%) diff --git a/pkg/config/config_unix.go b/pkg/config/config_unix.go index 77c9b2d93..5fa869a54 100644 --- a/pkg/config/config_unix.go +++ b/pkg/config/config_unix.go @@ -20,7 +20,7 @@ package config import ( "github.com/containerd/containerd" - "k8s.io/kubernetes/pkg/kubelet/cri/streaming" + "github.com/containerd/cri/pkg/streaming" ) // DefaultConfig returns default configurations of cri plugin. diff --git a/pkg/config/config_windows.go b/pkg/config/config_windows.go index 737b66e7a..9f8378678 100644 --- a/pkg/config/config_windows.go +++ b/pkg/config/config_windows.go @@ -23,7 +23,7 @@ import ( "path/filepath" "github.com/containerd/containerd" - "k8s.io/kubernetes/pkg/kubelet/cri/streaming" + "github.com/containerd/cri/pkg/streaming" ) // DefaultConfig returns default configurations of cri plugin. diff --git a/pkg/server/service.go b/pkg/server/service.go index bc22d3a5b..94e02591a 100644 --- a/pkg/server/service.go +++ b/pkg/server/service.go @@ -28,12 +28,12 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/oci" "github.com/containerd/containerd/plugin" + "github.com/containerd/cri/pkg/streaming" cni "github.com/containerd/go-cni" "github.com/pkg/errors" "github.com/sirupsen/logrus" "google.golang.org/grpc" runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" - "k8s.io/kubernetes/pkg/kubelet/cri/streaming" "github.com/containerd/cri/pkg/store/label" diff --git a/pkg/server/streaming.go b/pkg/server/streaming.go index 7c5ecf04f..d0089cc89 100644 --- a/pkg/server/streaming.go +++ b/pkg/server/streaming.go @@ -30,10 +30,10 @@ import ( "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/client-go/tools/remotecommand" k8scert "k8s.io/client-go/util/cert" - "k8s.io/kubernetes/pkg/kubelet/cri/streaming" "k8s.io/utils/exec" ctrdutil "github.com/containerd/cri/pkg/containerd/util" + "github.com/containerd/cri/pkg/streaming" ) type streamListenerMode int diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/errors.go b/pkg/streaming/errors.go similarity index 100% rename from vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/errors.go rename to pkg/streaming/errors.go diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/portforward/constants.go b/pkg/streaming/portforward/constants.go similarity index 100% rename from vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/portforward/constants.go rename to pkg/streaming/portforward/constants.go diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/portforward/httpstream.go b/pkg/streaming/portforward/httpstream.go similarity index 100% rename from vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/portforward/httpstream.go rename to pkg/streaming/portforward/httpstream.go diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/portforward/portforward.go b/pkg/streaming/portforward/portforward.go similarity index 100% rename from vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/portforward/portforward.go rename to pkg/streaming/portforward/portforward.go diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/portforward/websocket.go b/pkg/streaming/portforward/websocket.go similarity index 100% rename from vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/portforward/websocket.go rename to pkg/streaming/portforward/websocket.go diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/remotecommand/attach.go b/pkg/streaming/remotecommand/attach.go similarity index 100% rename from vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/remotecommand/attach.go rename to pkg/streaming/remotecommand/attach.go diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/remotecommand/doc.go b/pkg/streaming/remotecommand/doc.go similarity index 100% rename from vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/remotecommand/doc.go rename to pkg/streaming/remotecommand/doc.go diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/remotecommand/exec.go b/pkg/streaming/remotecommand/exec.go similarity index 100% rename from vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/remotecommand/exec.go rename to pkg/streaming/remotecommand/exec.go diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/remotecommand/httpstream.go b/pkg/streaming/remotecommand/httpstream.go similarity index 100% rename from vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/remotecommand/httpstream.go rename to pkg/streaming/remotecommand/httpstream.go diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/remotecommand/websocket.go b/pkg/streaming/remotecommand/websocket.go similarity index 100% rename from vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/remotecommand/websocket.go rename to pkg/streaming/remotecommand/websocket.go diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/request_cache.go b/pkg/streaming/request_cache.go similarity index 100% rename from vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/request_cache.go rename to pkg/streaming/request_cache.go diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/server.go b/pkg/streaming/server.go similarity index 98% rename from vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/server.go rename to pkg/streaming/server.go index d5cacbbf7..8cdb0fda5 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/server.go +++ b/pkg/streaming/server.go @@ -35,8 +35,9 @@ import ( remotecommandconsts "k8s.io/apimachinery/pkg/util/remotecommand" "k8s.io/client-go/tools/remotecommand" runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" - "k8s.io/kubernetes/pkg/kubelet/cri/streaming/portforward" - remotecommandserver "k8s.io/kubernetes/pkg/kubelet/cri/streaming/remotecommand" + + "github.com/containerd/cri/pkg/streaming/portforward" + remotecommandserver "github.com/containerd/cri/pkg/streaming/remotecommand" ) // Server is the library interface to serve the stream requests. From bb828a9f841cc6d1a8630101f2dcfb3f624eac80 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Mon, 22 Jun 2020 14:00:08 -0400 Subject: [PATCH 2/7] Make copy of pkg/kubelet/cri/remote Signed-off-by: Davanum Srinivas --- integration/main_test.go | 2 +- .../kubernetes/pkg/kubelet/cri => integration}/remote/doc.go | 0 .../pkg/kubelet/cri => integration}/remote/remote_image.go | 3 ++- .../pkg/kubelet/cri => integration}/remote/remote_runtime.go | 3 ++- .../pkg/kubelet/cri => integration}/remote/util/util_unix.go | 0 .../cri => integration}/remote/util/util_unsupported.go | 0 .../kubelet/cri => integration}/remote/util/util_windows.go | 0 .../kubernetes/pkg/kubelet/cri => integration}/remote/utils.go | 0 8 files changed, 5 insertions(+), 3 deletions(-) rename {vendor/k8s.io/kubernetes/pkg/kubelet/cri => integration}/remote/doc.go (100%) rename {vendor/k8s.io/kubernetes/pkg/kubelet/cri => integration}/remote/remote_image.go (98%) rename {vendor/k8s.io/kubernetes/pkg/kubelet/cri => integration}/remote/remote_runtime.go (99%) rename {vendor/k8s.io/kubernetes/pkg/kubelet/cri => integration}/remote/util/util_unix.go (100%) rename {vendor/k8s.io/kubernetes/pkg/kubelet/cri => integration}/remote/util/util_unsupported.go (100%) rename {vendor/k8s.io/kubernetes/pkg/kubelet/cri => integration}/remote/util/util_windows.go (100%) rename {vendor/k8s.io/kubernetes/pkg/kubelet/cri => integration}/remote/utils.go (100%) diff --git a/integration/main_test.go b/integration/main_test.go index d31583a12..a03fe99c1 100644 --- a/integration/main_test.go +++ b/integration/main_test.go @@ -36,9 +36,9 @@ import ( "google.golang.org/grpc" "k8s.io/cri-api/pkg/apis" runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" - "k8s.io/kubernetes/pkg/kubelet/cri/remote" kubeletutil "k8s.io/kubernetes/pkg/kubelet/util" + "github.com/containerd/cri/integration/remote" criconfig "github.com/containerd/cri/pkg/config" "github.com/containerd/cri/pkg/constants" "github.com/containerd/cri/pkg/server" diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cri/remote/doc.go b/integration/remote/doc.go similarity index 100% rename from vendor/k8s.io/kubernetes/pkg/kubelet/cri/remote/doc.go rename to integration/remote/doc.go diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cri/remote/remote_image.go b/integration/remote/remote_image.go similarity index 98% rename from vendor/k8s.io/kubernetes/pkg/kubelet/cri/remote/remote_image.go rename to integration/remote/remote_image.go index e8089f666..7e68b0fbb 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/cri/remote/remote_image.go +++ b/integration/remote/remote_image.go @@ -27,7 +27,8 @@ import ( internalapi "k8s.io/cri-api/pkg/apis" runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" - "k8s.io/kubernetes/pkg/kubelet/cri/remote/util" + + "github.com/containerd/cri/integration/remote/util" ) // RemoteImageService is a gRPC implementation of internalapi.ImageManagerService. diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cri/remote/remote_runtime.go b/integration/remote/remote_runtime.go similarity index 99% rename from vendor/k8s.io/kubernetes/pkg/kubelet/cri/remote/remote_runtime.go rename to integration/remote/remote_runtime.go index 24b6012b9..b8a2c28a4 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/cri/remote/remote_runtime.go +++ b/integration/remote/remote_runtime.go @@ -29,8 +29,9 @@ import ( "k8s.io/component-base/logs/logreduction" internalapi "k8s.io/cri-api/pkg/apis" runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" - "k8s.io/kubernetes/pkg/kubelet/cri/remote/util" utilexec "k8s.io/utils/exec" + + "github.com/containerd/cri/integration/remote/util" ) // RemoteRuntimeService is a gRPC implementation of internalapi.RuntimeService. diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cri/remote/util/util_unix.go b/integration/remote/util/util_unix.go similarity index 100% rename from vendor/k8s.io/kubernetes/pkg/kubelet/cri/remote/util/util_unix.go rename to integration/remote/util/util_unix.go diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cri/remote/util/util_unsupported.go b/integration/remote/util/util_unsupported.go similarity index 100% rename from vendor/k8s.io/kubernetes/pkg/kubelet/cri/remote/util/util_unsupported.go rename to integration/remote/util/util_unsupported.go diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cri/remote/util/util_windows.go b/integration/remote/util/util_windows.go similarity index 100% rename from vendor/k8s.io/kubernetes/pkg/kubelet/cri/remote/util/util_windows.go rename to integration/remote/util/util_windows.go diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cri/remote/utils.go b/integration/remote/utils.go similarity index 100% rename from vendor/k8s.io/kubernetes/pkg/kubelet/cri/remote/utils.go rename to integration/remote/utils.go From e2072b71ccdbf62a38e5e1b583cd403c66cdf727 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Mon, 22 Jun 2020 14:20:57 -0400 Subject: [PATCH 3/7] Copy kubernetes/pkg/util/bandwidth Signed-off-by: Davanum Srinivas --- .../k8s.io/kubernetes/pkg/util => pkg/server}/bandwidth/doc.go | 2 +- .../kubernetes/pkg/util => pkg/server}/bandwidth/fake_shaper.go | 0 .../kubernetes/pkg/util => pkg/server}/bandwidth/interfaces.go | 0 .../kubernetes/pkg/util => pkg/server}/bandwidth/linux.go | 0 .../kubernetes/pkg/util => pkg/server}/bandwidth/unsupported.go | 0 .../kubernetes/pkg/util => pkg/server}/bandwidth/utils.go | 0 pkg/server/sandbox_run.go | 2 +- 7 files changed, 2 insertions(+), 2 deletions(-) rename {vendor/k8s.io/kubernetes/pkg/util => pkg/server}/bandwidth/doc.go (90%) rename {vendor/k8s.io/kubernetes/pkg/util => pkg/server}/bandwidth/fake_shaper.go (100%) rename {vendor/k8s.io/kubernetes/pkg/util => pkg/server}/bandwidth/interfaces.go (100%) rename {vendor/k8s.io/kubernetes/pkg/util => pkg/server}/bandwidth/linux.go (100%) rename {vendor/k8s.io/kubernetes/pkg/util => pkg/server}/bandwidth/unsupported.go (100%) rename {vendor/k8s.io/kubernetes/pkg/util => pkg/server}/bandwidth/utils.go (100%) diff --git a/vendor/k8s.io/kubernetes/pkg/util/bandwidth/doc.go b/pkg/server/bandwidth/doc.go similarity index 90% rename from vendor/k8s.io/kubernetes/pkg/util/bandwidth/doc.go rename to pkg/server/bandwidth/doc.go index 3c26aebbf..289b17fe2 100644 --- a/vendor/k8s.io/kubernetes/pkg/util/bandwidth/doc.go +++ b/pkg/server/bandwidth/doc.go @@ -15,4 +15,4 @@ limitations under the License. */ // Package bandwidth provides utilities for bandwidth shaping -package bandwidth // import "k8s.io/kubernetes/pkg/util/bandwidth" +package bandwidth diff --git a/vendor/k8s.io/kubernetes/pkg/util/bandwidth/fake_shaper.go b/pkg/server/bandwidth/fake_shaper.go similarity index 100% rename from vendor/k8s.io/kubernetes/pkg/util/bandwidth/fake_shaper.go rename to pkg/server/bandwidth/fake_shaper.go diff --git a/vendor/k8s.io/kubernetes/pkg/util/bandwidth/interfaces.go b/pkg/server/bandwidth/interfaces.go similarity index 100% rename from vendor/k8s.io/kubernetes/pkg/util/bandwidth/interfaces.go rename to pkg/server/bandwidth/interfaces.go diff --git a/vendor/k8s.io/kubernetes/pkg/util/bandwidth/linux.go b/pkg/server/bandwidth/linux.go similarity index 100% rename from vendor/k8s.io/kubernetes/pkg/util/bandwidth/linux.go rename to pkg/server/bandwidth/linux.go diff --git a/vendor/k8s.io/kubernetes/pkg/util/bandwidth/unsupported.go b/pkg/server/bandwidth/unsupported.go similarity index 100% rename from vendor/k8s.io/kubernetes/pkg/util/bandwidth/unsupported.go rename to pkg/server/bandwidth/unsupported.go diff --git a/vendor/k8s.io/kubernetes/pkg/util/bandwidth/utils.go b/pkg/server/bandwidth/utils.go similarity index 100% rename from vendor/k8s.io/kubernetes/pkg/util/bandwidth/utils.go rename to pkg/server/bandwidth/utils.go diff --git a/pkg/server/sandbox_run.go b/pkg/server/sandbox_run.go index 942388369..1fc92adbf 100644 --- a/pkg/server/sandbox_run.go +++ b/pkg/server/sandbox_run.go @@ -33,13 +33,13 @@ import ( "github.com/sirupsen/logrus" "golang.org/x/net/context" runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" - "k8s.io/kubernetes/pkg/util/bandwidth" "github.com/containerd/cri/pkg/annotations" criconfig "github.com/containerd/cri/pkg/config" customopts "github.com/containerd/cri/pkg/containerd/opts" ctrdutil "github.com/containerd/cri/pkg/containerd/util" "github.com/containerd/cri/pkg/netns" + "github.com/containerd/cri/pkg/server/bandwidth" sandboxstore "github.com/containerd/cri/pkg/store/sandbox" "github.com/containerd/cri/pkg/util" selinux "github.com/opencontainers/selinux/go-selinux" From 6007c354a6e3514ee28f717658b6233b8aaa815b Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Mon, 22 Jun 2020 14:23:45 -0400 Subject: [PATCH 4/7] Copy kubernetes/pkg/kubelet/util Signed-off-by: Davanum Srinivas --- integration/main_test.go | 4 ++-- .../pkg/kubelet => integration}/util/boottime_util_darwin.go | 0 .../pkg/kubelet => integration}/util/boottime_util_linux.go | 0 .../k8s.io/kubernetes/pkg/kubelet => integration}/util/doc.go | 2 +- .../kubernetes/pkg/kubelet => integration}/util/util.go | 0 .../kubernetes/pkg/kubelet => integration}/util/util_unix.go | 0 .../pkg/kubelet => integration}/util/util_unsupported.go | 0 .../pkg/kubelet => integration}/util/util_windows.go | 0 8 files changed, 3 insertions(+), 3 deletions(-) rename {vendor/k8s.io/kubernetes/pkg/kubelet => integration}/util/boottime_util_darwin.go (100%) rename {vendor/k8s.io/kubernetes/pkg/kubelet => integration}/util/boottime_util_linux.go (100%) rename {vendor/k8s.io/kubernetes/pkg/kubelet => integration}/util/doc.go (91%) rename {vendor/k8s.io/kubernetes/pkg/kubelet => integration}/util/util.go (100%) rename {vendor/k8s.io/kubernetes/pkg/kubelet => integration}/util/util_unix.go (100%) rename {vendor/k8s.io/kubernetes/pkg/kubelet => integration}/util/util_unsupported.go (100%) rename {vendor/k8s.io/kubernetes/pkg/kubelet => integration}/util/util_windows.go (100%) diff --git a/integration/main_test.go b/integration/main_test.go index a03fe99c1..4f04e4261 100644 --- a/integration/main_test.go +++ b/integration/main_test.go @@ -36,9 +36,9 @@ import ( "google.golang.org/grpc" "k8s.io/cri-api/pkg/apis" runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" - kubeletutil "k8s.io/kubernetes/pkg/kubelet/util" "github.com/containerd/cri/integration/remote" + dialer "github.com/containerd/cri/integration/util" criconfig "github.com/containerd/cri/pkg/config" "github.com/containerd/cri/pkg/constants" "github.com/containerd/cri/pkg/server" @@ -346,7 +346,7 @@ func PidOf(name string) (int, error) { // RawRuntimeClient returns a raw grpc runtime service client. func RawRuntimeClient() (runtime.RuntimeServiceClient, error) { - addr, dialer, err := kubeletutil.GetAddressAndDialer(*criEndpoint) + addr, dialer, err := dialer.GetAddressAndDialer(*criEndpoint) if err != nil { return nil, errors.Wrap(err, "failed to get dialer") } diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/util/boottime_util_darwin.go b/integration/util/boottime_util_darwin.go similarity index 100% rename from vendor/k8s.io/kubernetes/pkg/kubelet/util/boottime_util_darwin.go rename to integration/util/boottime_util_darwin.go diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/util/boottime_util_linux.go b/integration/util/boottime_util_linux.go similarity index 100% rename from vendor/k8s.io/kubernetes/pkg/kubelet/util/boottime_util_linux.go rename to integration/util/boottime_util_linux.go diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/util/doc.go b/integration/util/doc.go similarity index 91% rename from vendor/k8s.io/kubernetes/pkg/kubelet/util/doc.go rename to integration/util/doc.go index eaccd63a3..0f119d2f5 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/util/doc.go +++ b/integration/util/doc.go @@ -15,4 +15,4 @@ limitations under the License. */ // Package util holds utility functions. -package util // import "k8s.io/kubernetes/pkg/kubelet/util" +package util diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/util/util.go b/integration/util/util.go similarity index 100% rename from vendor/k8s.io/kubernetes/pkg/kubelet/util/util.go rename to integration/util/util.go diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/util/util_unix.go b/integration/util/util_unix.go similarity index 100% rename from vendor/k8s.io/kubernetes/pkg/kubelet/util/util_unix.go rename to integration/util/util_unix.go diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/util/util_unsupported.go b/integration/util/util_unsupported.go similarity index 100% rename from vendor/k8s.io/kubernetes/pkg/kubelet/util/util_unsupported.go rename to integration/util/util_unsupported.go diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/util/util_windows.go b/integration/util/util_windows.go similarity index 100% rename from vendor/k8s.io/kubernetes/pkg/kubelet/util/util_windows.go rename to integration/util/util_windows.go From 0d18d1ee38afad93fcbe1411bee82e4960703e55 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Mon, 22 Jun 2020 14:27:49 -0400 Subject: [PATCH 5/7] Drop k8s.io/kubernetes Signed-off-by: Davanum Srinivas --- vendor.conf | 1 - vendor/k8s.io/kubernetes/LICENSE | 202 ----- vendor/k8s.io/kubernetes/README.md | 89 -- vendor/k8s.io/kubernetes/build/README.md | 131 --- vendor/k8s.io/kubernetes/build/pause/orphan.c | 36 - vendor/k8s.io/kubernetes/build/pause/pause.c | 68 -- vendor/k8s.io/kubernetes/go.mod | 503 ----------- .../google/protobuf/compiler/plugin.proto | 150 ---- .../protobuf/google/protobuf/descriptor.proto | 779 ------------------ 9 files changed, 1959 deletions(-) delete mode 100644 vendor/k8s.io/kubernetes/LICENSE delete mode 100644 vendor/k8s.io/kubernetes/README.md delete mode 100644 vendor/k8s.io/kubernetes/build/README.md delete mode 100644 vendor/k8s.io/kubernetes/build/pause/orphan.c delete mode 100644 vendor/k8s.io/kubernetes/build/pause/pause.c delete mode 100644 vendor/k8s.io/kubernetes/go.mod delete mode 100644 vendor/k8s.io/kubernetes/third_party/protobuf/google/protobuf/compiler/plugin.proto delete mode 100644 vendor/k8s.io/kubernetes/third_party/protobuf/google/protobuf/descriptor.proto diff --git a/vendor.conf b/vendor.conf index f2a105500..5b21e5aa5 100644 --- a/vendor.conf +++ b/vendor.conf @@ -83,7 +83,6 @@ k8s.io/client-go v0.19.0-beta.2 k8s.io/component-base v0.19.0-beta.2 k8s.io/cri-api v0.19.0-beta.2 k8s.io/klog/v2 v2.2.0 -k8s.io/kubernetes v1.19.0-beta.2 k8s.io/utils 2df71ebbae66f39338aed4cd0bb82d2212ee33cc sigs.k8s.io/structured-merge-diff/v3 v3.0.0 sigs.k8s.io/yaml v1.2.0 diff --git a/vendor/k8s.io/kubernetes/LICENSE b/vendor/k8s.io/kubernetes/LICENSE deleted file mode 100644 index d64569567..000000000 --- a/vendor/k8s.io/kubernetes/LICENSE +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - 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. diff --git a/vendor/k8s.io/kubernetes/README.md b/vendor/k8s.io/kubernetes/README.md deleted file mode 100644 index dc85376c6..000000000 --- a/vendor/k8s.io/kubernetes/README.md +++ /dev/null @@ -1,89 +0,0 @@ -# Kubernetes - -[![GoDoc Widget]][GoDoc] [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/569/badge)](https://bestpractices.coreinfrastructure.org/projects/569) - - - ----- - -Kubernetes is an open source system for managing [containerized applications] -across multiple hosts. It provides basic mechanisms for deployment, maintenance, -and scaling of applications. - -Kubernetes builds upon a decade and a half of experience at Google running -production workloads at scale using a system called [Borg], -combined with best-of-breed ideas and practices from the community. - -Kubernetes is hosted by the Cloud Native Computing Foundation ([CNCF]). -If your company wants to help shape the evolution of -technologies that are container-packaged, dynamically scheduled, -and microservices-oriented, consider joining the CNCF. -For details about who's involved and how Kubernetes plays a role, -read the CNCF [announcement]. - ----- - -## To start using Kubernetes - -See our documentation on [kubernetes.io]. - -Try our [interactive tutorial]. - -Take a free course on [Scalable Microservices with Kubernetes]. - -To use Kubernetes code as a library in other applications, see the [list of published components](https://git.k8s.io/kubernetes/staging/README.md). -Use of the `k8s.io/kubernetes` module or `k8s.io/kubernetes/...` packages as libraries is not supported. - -## To start developing Kubernetes - -The [community repository] hosts all information about -building Kubernetes from source, how to contribute code -and documentation, who to contact about what, etc. - -If you want to build Kubernetes right away there are two options: - -##### You have a working [Go environment]. - -``` -mkdir -p $GOPATH/src/k8s.io -cd $GOPATH/src/k8s.io -git clone https://github.com/kubernetes/kubernetes -cd kubernetes -make -``` - -##### You have a working [Docker environment]. - -``` -git clone https://github.com/kubernetes/kubernetes -cd kubernetes -make quick-release -``` - -For the full story, head over to the [developer's documentation]. - -## Support - -If you need support, start with the [troubleshooting guide], -and work your way through the process that we've outlined. - -That said, if you have questions, reach out to us -[one way or another][communication]. - -[announcement]: https://cncf.io/news/announcement/2015/07/new-cloud-native-computing-foundation-drive-alignment-among-container -[Borg]: https://research.google.com/pubs/pub43438.html -[CNCF]: https://www.cncf.io/about -[communication]: https://git.k8s.io/community/communication -[community repository]: https://git.k8s.io/community -[containerized applications]: https://kubernetes.io/docs/concepts/overview/what-is-kubernetes/ -[developer's documentation]: https://git.k8s.io/community/contributors/devel#readme -[Docker environment]: https://docs.docker.com/engine -[Go environment]: https://golang.org/doc/install -[GoDoc]: https://godoc.org/k8s.io/kubernetes -[GoDoc Widget]: https://godoc.org/k8s.io/kubernetes?status.svg -[interactive tutorial]: https://kubernetes.io/docs/tutorials/kubernetes-basics -[kubernetes.io]: https://kubernetes.io -[Scalable Microservices with Kubernetes]: https://www.udacity.com/course/scalable-microservices-with-kubernetes--ud615 -[troubleshooting guide]: https://kubernetes.io/docs/tasks/debug-application-cluster/troubleshooting/ - -[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/README.md?pixel)]() diff --git a/vendor/k8s.io/kubernetes/build/README.md b/vendor/k8s.io/kubernetes/build/README.md deleted file mode 100644 index db21897f4..000000000 --- a/vendor/k8s.io/kubernetes/build/README.md +++ /dev/null @@ -1,131 +0,0 @@ -# Building Kubernetes - -Building Kubernetes is easy if you take advantage of the containerized build environment. This document will help guide you through understanding this build process. - -## Requirements - -1. Docker, using one of the following configurations: - * **macOS** You can either use Docker for Mac or docker-machine. See installation instructions [here](https://docs.docker.com/docker-for-mac/). - **Note**: You will want to set the Docker VM to have at least 8GB of initial memory or building will likely fail. (See: [#11852]( http://issue.k8s.io/11852)). - * **Linux with local Docker** Install Docker according to the [instructions](https://docs.docker.com/installation/#installation) for your OS. - * **Windows with Docker Desktop WSL2 backend** Install Docker according to the [instructions](https://docs.docker.com/docker-for-windows/wsl-tech-preview/). Be sure to store your sources in the local Linux file system, not the Windows remote mount at `/mnt/c`. - * **Remote Docker engine** Use a big machine in the cloud to build faster. This is a little trickier so look at the section later on. -2. **Optional** [Google Cloud SDK](https://developers.google.com/cloud/sdk/) - -You must install and configure Google Cloud SDK if you want to upload your release to Google Cloud Storage and may safely omit this otherwise. - -## Overview - -While it is possible to build Kubernetes using a local golang installation, we have a build process that runs in a Docker container. This simplifies initial set up and provides for a very consistent build and test environment. - -## Key scripts - -The following scripts are found in the [`build/`](.) directory. Note that all scripts must be run from the Kubernetes root directory. - -* [`build/run.sh`](run.sh): Run a command in a build docker container. Common invocations: - * `build/run.sh make`: Build just linux binaries in the container. Pass options and packages as necessary. - * `build/run.sh make cross`: Build all binaries for all platforms. To build only a specific platform, add `KUBE_BUILD_PLATFORMS=/` - * `build/run.sh make kubectl KUBE_BUILD_PLATFORMS=darwin/amd64`: Build the specific binary for the specific platform (`kubectl` and `darwin/amd64` respectively in this example) - * `build/run.sh make test`: Run all unit tests - * `build/run.sh make test-integration`: Run integration test - * `build/run.sh make test-cmd`: Run CLI tests -* [`build/copy-output.sh`](copy-output.sh): This will copy the contents of `_output/dockerized/bin` from the Docker container to the local `_output/dockerized/bin`. It will also copy out specific file patterns that are generated as part of the build process. This is run automatically as part of `build/run.sh`. -* [`build/make-clean.sh`](make-clean.sh): Clean out the contents of `_output`, remove any locally built container images and remove the data container. -* [`build/shell.sh`](shell.sh): Drop into a `bash` shell in a build container with a snapshot of the current repo code. - -## Basic Flow - -The scripts directly under [`build/`](.) are used to build and test. They will ensure that the `kube-build` Docker image is built (based on [`build/build-image/Dockerfile`](build-image/Dockerfile) and after base image's `KUBE_BUILD_IMAGE_CROSS_TAG` from Dockerfile is replaced with one of those actual tags of the base image, like `v1.13.9-2`) and then execute the appropriate command in that container. These scripts will both ensure that the right data is cached from run to run for incremental builds and will copy the results back out of the container. - -The `kube-build` container image is built by first creating a "context" directory in `_output/images/build-image`. It is done there instead of at the root of the Kubernetes repo to minimize the amount of data we need to package up when building the image. - -There are 3 different containers instances that are run from this image. The first is a "data" container to store all data that needs to persist across to support incremental builds. Next there is an "rsync" container that is used to transfer data in and out to the data container. Lastly there is a "build" container that is used for actually doing build actions. The data container persists across runs while the rsync and build containers are deleted after each use. - -`rsync` is used transparently behind the scenes to efficiently move data in and out of the container. This will use an ephemeral port picked by Docker. You can modify this by setting the `KUBE_RSYNC_PORT` env variable. - -All Docker names are suffixed with a hash derived from the file path (to allow concurrent usage on things like CI machines) and a version number. When the version number changes all state is cleared and clean build is started. This allows the build infrastructure to be changed and signal to CI systems that old artifacts need to be deleted. - -## Proxy Settings - -If you are behind a proxy and you are letting these scripts use `docker-machine` to set up your local VM for you on macOS, you need to export proxy settings for Kubernetes build, the following environment variables should be defined. - -``` -export KUBERNETES_HTTP_PROXY=http://username:password@proxyaddr:proxyport -export KUBERNETES_HTTPS_PROXY=https://username:password@proxyaddr:proxyport -``` - -Optionally, you can specify addresses of no proxy for Kubernetes build, for example - -``` -export KUBERNETES_NO_PROXY=127.0.0.1 -``` - -If you are using sudo to make Kubernetes build for example make quick-release, you need run `sudo -E make quick-release` to pass the environment variables. - -## Really Remote Docker Engine - -It is possible to use a Docker Engine that is running remotely (under your desk or in the cloud). Docker must be configured to connect to that machine and the local rsync port must be forwarded (via SSH or nc) from localhost to the remote machine. - -To do this easily with GCE and `docker-machine`, do something like this: -``` -# Create the remote docker machine on GCE. This is a pretty beefy machine with SSD disk. -KUBE_BUILD_VM=k8s-build -KUBE_BUILD_GCE_PROJECT= -docker-machine create \ - --driver=google \ - --google-project=${KUBE_BUILD_GCE_PROJECT} \ - --google-zone=us-west1-a \ - --google-machine-type=n1-standard-8 \ - --google-disk-size=50 \ - --google-disk-type=pd-ssd \ - ${KUBE_BUILD_VM} - -# Set up local docker to talk to that machine -eval $(docker-machine env ${KUBE_BUILD_VM}) - -# Pin down the port that rsync will be exposed on the remote machine -export KUBE_RSYNC_PORT=8730 - -# forward local 8730 to that machine so that rsync works -docker-machine ssh ${KUBE_BUILD_VM} -L ${KUBE_RSYNC_PORT}:localhost:${KUBE_RSYNC_PORT} -N & -``` - -Look at `docker-machine stop`, `docker-machine start` and `docker-machine rm` to manage this VM. - -## Releasing - -The [`build/release.sh`](release.sh) script will build a release. It will build binaries, run tests, (optionally) build runtime Docker images. - -The main output is a tar file: `kubernetes.tar.gz`. This includes: -* Cross compiled client utilities. -* Script (`kubectl`) for picking and running the right client binary based on platform. -* Examples -* Cluster deployment scripts for various clouds -* Tar file containing all server binaries - -In addition, there are some other tar files that are created: -* `kubernetes-client-*.tar.gz` Client binaries for a specific platform. -* `kubernetes-server-*.tar.gz` Server binaries for a specific platform. - -When building final release tars, they are first staged into `_output/release-stage` before being tar'd up and put into `_output/release-tars`. - -## Reproducibility -`make release`, its variant `make quick-release`, and Bazel all provide a -hermetic build environment which should provide some level of reproducibility -for builds. `make` itself is **not** hermetic. - -The Kubernetes build environment supports the [`SOURCE_DATE_EPOCH` environment -variable](https://reproducible-builds.org/specs/source-date-epoch/) specified by -the Reproducible Builds project, which can be set to a UNIX epoch timestamp. -This will be used for the build timestamps embedded in compiled Go binaries, -and maybe someday also Docker images. - -One reasonable setting for this variable is to use the commit timestamp from the -tip of the tree being built; this is what the Kubernetes CI system uses. For -example, you could use the following one-liner: - -```bash -SOURCE_DATE_EPOCH=$(git show -s --format=format:%ct HEAD) -``` - -[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/build/README.md?pixel)]() diff --git a/vendor/k8s.io/kubernetes/build/pause/orphan.c b/vendor/k8s.io/kubernetes/build/pause/orphan.c deleted file mode 100644 index 07f490de9..000000000 --- a/vendor/k8s.io/kubernetes/build/pause/orphan.c +++ /dev/null @@ -1,36 +0,0 @@ -/* -Copyright 2016 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. -*/ - -/* Creates a zombie to be reaped by init. Useful for testing. */ - -#include -#include - -int main() { - pid_t pid; - pid = fork(); - if (pid == 0) { - while (getppid() > 1) - ; - printf("Child exiting: pid=%d ppid=%d\n", getpid(), getppid()); - return 0; - } else if (pid > 0) { - printf("Parent exiting: pid=%d ppid=%d\n", getpid(), getppid()); - return 0; - } - perror("Could not create child"); - return 1; -} diff --git a/vendor/k8s.io/kubernetes/build/pause/pause.c b/vendor/k8s.io/kubernetes/build/pause/pause.c deleted file mode 100644 index 95966f438..000000000 --- a/vendor/k8s.io/kubernetes/build/pause/pause.c +++ /dev/null @@ -1,68 +0,0 @@ -/* -Copyright 2016 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. -*/ - -#include -#include -#include -#include -#include -#include -#include - -#define STRINGIFY(x) #x -#define VERSION_STRING(x) STRINGIFY(x) - -#ifndef VERSION -#define VERSION HEAD -#endif - -static void sigdown(int signo) { - psignal(signo, "Shutting down, got signal"); - exit(0); -} - -static void sigreap(int signo) { - while (waitpid(-1, NULL, WNOHANG) > 0) - ; -} - -int main(int argc, char **argv) { - int i; - for (i = 1; i < argc; ++i) { - if (!strcasecmp(argv[i], "-v")) { - printf("pause.c %s\n", VERSION_STRING(VERSION)); - return 0; - } - } - - if (getpid() != 1) - /* Not an error because pause sees use outside of infra containers. */ - fprintf(stderr, "Warning: pause should be the first process\n"); - - if (sigaction(SIGINT, &(struct sigaction){.sa_handler = sigdown}, NULL) < 0) - return 1; - if (sigaction(SIGTERM, &(struct sigaction){.sa_handler = sigdown}, NULL) < 0) - return 2; - if (sigaction(SIGCHLD, &(struct sigaction){.sa_handler = sigreap, - .sa_flags = SA_NOCLDSTOP}, - NULL) < 0) - return 3; - - for (;;) - pause(); - fprintf(stderr, "Error: infinite loop terminated\n"); - return 42; -} diff --git a/vendor/k8s.io/kubernetes/go.mod b/vendor/k8s.io/kubernetes/go.mod deleted file mode 100644 index 268098466..000000000 --- a/vendor/k8s.io/kubernetes/go.mod +++ /dev/null @@ -1,503 +0,0 @@ -// This is a generated file. Do not edit directly. -// Ensure you've carefully read -// https://git.k8s.io/community/contributors/devel/sig-architecture/vendor.md -// Run hack/pin-dependency.sh to change pinned dependency versions. -// Run hack/update-vendor.sh to update go.mod files and the vendor directory. - -module k8s.io/kubernetes - -go 1.13 - -require ( - bitbucket.org/bertimus9/systemstat v0.0.0-20180207000608-0eeff89b0690 - github.com/Azure/azure-sdk-for-go v43.0.0+incompatible - github.com/Azure/go-autorest/autorest v0.9.6 - github.com/Azure/go-autorest/autorest/adal v0.8.2 - github.com/Azure/go-autorest/autorest/to v0.2.0 - github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20200415212048-7901bc822317 - github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab - github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5 - github.com/Microsoft/hcsshim v0.8.9 - github.com/PuerkitoBio/purell v1.1.1 - github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e - github.com/auth0/go-jwt-middleware v0.0.0-20170425171159-5493cabe49f7 // indirect - github.com/aws/aws-sdk-go v1.28.2 - github.com/blang/semver v3.5.0+incompatible - github.com/boltdb/bolt v1.3.1 // indirect - github.com/caddyserver/caddy v1.0.3 - github.com/clusterhq/flocker-go v0.0.0-20160920122132-2b8b7259d313 - github.com/codegangsta/negroni v1.0.0 // indirect - github.com/container-storage-interface/spec v1.2.0 - github.com/containernetworking/cni v0.7.1 - github.com/coredns/corefile-migration v1.0.8 - github.com/coreos/go-oidc v2.1.0+incompatible - github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e - github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f - github.com/cpuguy83/go-md2man v1.0.10 - github.com/cyphar/filepath-securejoin v0.2.2 // indirect - github.com/davecgh/go-spew v1.1.1 - github.com/docker/distribution v2.7.1+incompatible - github.com/docker/docker v1.4.2-0.20200309214505-aa6a9891b09c - github.com/docker/go-connections v0.3.0 - github.com/docker/go-units v0.4.0 - github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153 - github.com/emicklei/go-restful v2.9.5+incompatible - github.com/evanphx/json-patch v4.2.0+incompatible - github.com/fsnotify/fsnotify v1.4.9 - github.com/go-bindata/go-bindata v3.1.1+incompatible - github.com/go-openapi/analysis v0.19.5 - github.com/go-openapi/loads v0.19.4 - github.com/go-openapi/spec v0.19.3 - github.com/go-openapi/strfmt v0.19.3 - github.com/go-openapi/validate v0.19.5 - github.com/go-ozzo/ozzo-validation v3.5.0+incompatible // indirect - github.com/gogo/protobuf v1.3.1 - github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7 - github.com/golang/mock v1.3.1 - github.com/google/cadvisor v0.36.1-0.20200513160741-6a8d61401ea9 - github.com/google/go-cmp v0.4.0 - github.com/google/gofuzz v1.1.0 - github.com/google/uuid v1.1.1 - github.com/googleapis/gnostic v0.4.1 - github.com/gorilla/context v1.1.1 // indirect - github.com/hashicorp/golang-lru v0.5.1 - github.com/heketi/heketi v9.0.1-0.20190917153846-c2e2a4ab7ab9+incompatible - github.com/heketi/tests v0.0.0-20151005000721-f3775cbcefd6 // indirect - github.com/ishidawataru/sctp v0.0.0-20190723014705-7c296d48a2b5 - github.com/json-iterator/go v1.1.9 - github.com/libopenstorage/openstorage v1.0.0 - github.com/lithammer/dedent v1.1.0 - github.com/lpabon/godbc v0.1.1 // indirect - github.com/magiconair/properties v1.8.1 // indirect - github.com/miekg/dns v1.1.4 - github.com/moby/ipvs v1.0.1 - github.com/mohae/deepcopy v0.0.0-20170603005431-491d3605edfb // indirect - github.com/mrunalp/fileutils v0.0.0-20171103030105-7d4729fb3618 - github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 - github.com/mvdan/xurls v1.1.0 - github.com/onsi/ginkgo v1.11.0 - github.com/onsi/gomega v1.7.0 - github.com/opencontainers/go-digest v1.0.0-rc1 - github.com/opencontainers/runc v1.0.0-rc10 - github.com/opencontainers/selinux v1.3.3 - github.com/pkg/errors v0.9.1 - github.com/pmezard/go-difflib v1.0.0 - github.com/prometheus/client_golang v1.6.0 - github.com/prometheus/client_model v0.2.0 - github.com/prometheus/common v0.9.1 - github.com/quobyte/api v0.1.2 - github.com/robfig/cron v1.1.0 - github.com/seccomp/libseccomp-golang v0.9.1 // indirect - github.com/spf13/afero v1.2.2 - github.com/spf13/cobra v1.0.0 - github.com/spf13/jwalterweatherman v1.1.0 // indirect - github.com/spf13/pflag v1.0.5 - github.com/spf13/viper v1.4.0 - github.com/storageos/go-api v0.0.0-20180912212459-343b3eff91fc - github.com/stretchr/testify v1.4.0 - github.com/thecodeteam/goscaleio v0.1.0 - github.com/urfave/negroni v1.0.0 // indirect - github.com/vishvananda/netlink v1.1.0 - github.com/vmware/govmomi v0.20.3 - go.etcd.io/etcd v0.5.0-alpha.5.0.20200401174654-e694b7bb0875 - golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975 - golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e - golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6 - golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f - golang.org/x/time v0.0.0-20191024005414-555d28b269f0 - golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4 - gonum.org/v1/gonum v0.6.2 - gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e // indirect - google.golang.org/api v0.15.1 - google.golang.org/grpc v1.26.0 - gopkg.in/gcfg.v1 v1.2.0 - gopkg.in/square/go-jose.v2 v2.2.2 - gopkg.in/yaml.v2 v2.2.8 - k8s.io/api v0.0.0 - k8s.io/apiextensions-apiserver v0.0.0 - k8s.io/apimachinery v0.0.0 - k8s.io/apiserver v0.0.0 - k8s.io/cli-runtime v0.0.0 - k8s.io/client-go v0.0.0 - k8s.io/cloud-provider v0.0.0 - k8s.io/cluster-bootstrap v0.0.0 - k8s.io/code-generator v0.0.0 - k8s.io/component-base v0.0.0 - k8s.io/cri-api v0.0.0 - k8s.io/csi-translation-lib v0.0.0 - k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14 - k8s.io/heapster v1.2.0-beta.1 - k8s.io/klog/v2 v2.1.0 - k8s.io/kube-aggregator v0.0.0 - k8s.io/kube-controller-manager v0.0.0 - k8s.io/kube-openapi v0.0.0-20200427153329-656914f816f9 - k8s.io/kube-proxy v0.0.0 - k8s.io/kube-scheduler v0.0.0 - k8s.io/kubectl v0.0.0 - k8s.io/kubelet v0.0.0 - k8s.io/legacy-cloud-providers v0.0.0 - k8s.io/metrics v0.0.0 - k8s.io/sample-apiserver v0.0.0 - k8s.io/system-validators v1.1.2 - k8s.io/utils v0.0.0-20200414100711-2df71ebbae66 - sigs.k8s.io/kustomize v2.0.3+incompatible - sigs.k8s.io/yaml v1.2.0 -) - -replace ( - bitbucket.org/bertimus9/systemstat => bitbucket.org/bertimus9/systemstat v0.0.0-20180207000608-0eeff89b0690 - cloud.google.com/go => cloud.google.com/go v0.51.0 - cloud.google.com/go/bigquery => cloud.google.com/go/bigquery v1.0.1 - cloud.google.com/go/datastore => cloud.google.com/go/datastore v1.0.0 - cloud.google.com/go/pubsub => cloud.google.com/go/pubsub v1.0.1 - cloud.google.com/go/storage => cloud.google.com/go/storage v1.0.0 - dmitri.shuralyov.com/gpu/mtl => dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9 - github.com/Azure/azure-sdk-for-go => github.com/Azure/azure-sdk-for-go v43.0.0+incompatible - github.com/Azure/go-ansiterm => github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 - github.com/Azure/go-autorest/autorest => github.com/Azure/go-autorest/autorest v0.9.6 - github.com/Azure/go-autorest/autorest/adal => github.com/Azure/go-autorest/autorest/adal v0.8.2 - github.com/Azure/go-autorest/autorest/date => github.com/Azure/go-autorest/autorest/date v0.2.0 - github.com/Azure/go-autorest/autorest/mocks => github.com/Azure/go-autorest/autorest/mocks v0.3.0 - github.com/Azure/go-autorest/autorest/to => github.com/Azure/go-autorest/autorest/to v0.2.0 - github.com/Azure/go-autorest/autorest/validation => github.com/Azure/go-autorest/autorest/validation v0.1.0 - github.com/Azure/go-autorest/logger => github.com/Azure/go-autorest/logger v0.1.0 - github.com/Azure/go-autorest/tracing => github.com/Azure/go-autorest/tracing v0.5.0 - github.com/BurntSushi/toml => github.com/BurntSushi/toml v0.3.1 - github.com/BurntSushi/xgb => github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802 - github.com/GoogleCloudPlatform/k8s-cloud-provider => github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20200415212048-7901bc822317 - github.com/JeffAshton/win_pdh => github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab - github.com/MakeNowJust/heredoc => github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd - github.com/Microsoft/go-winio => github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5 - github.com/Microsoft/hcsshim => github.com/Microsoft/hcsshim v0.8.9 - github.com/NYTimes/gziphandler => github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46 - github.com/PuerkitoBio/purell => github.com/PuerkitoBio/purell v1.1.1 - github.com/PuerkitoBio/urlesc => github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 - github.com/agnivade/levenshtein => github.com/agnivade/levenshtein v1.0.1 - github.com/ajstarks/svgo => github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af - github.com/alecthomas/template => github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 - github.com/alecthomas/units => github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4 - github.com/andreyvit/diff => github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 - github.com/armon/circbuf => github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e - github.com/armon/consul-api => github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6 - github.com/asaskevich/govalidator => github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a - github.com/auth0/go-jwt-middleware => github.com/auth0/go-jwt-middleware v0.0.0-20170425171159-5493cabe49f7 - github.com/aws/aws-sdk-go => github.com/aws/aws-sdk-go v1.28.2 - github.com/beorn7/perks => github.com/beorn7/perks v1.0.1 - github.com/bgentry/speakeasy => github.com/bgentry/speakeasy v0.1.0 - github.com/bifurcation/mint => github.com/bifurcation/mint v0.0.0-20180715133206-93c51c6ce115 - github.com/blang/semver => github.com/blang/semver v3.5.0+incompatible - github.com/boltdb/bolt => github.com/boltdb/bolt v1.3.1 - github.com/caddyserver/caddy => github.com/caddyserver/caddy v1.0.3 - github.com/cenkalti/backoff => github.com/cenkalti/backoff v2.1.1+incompatible - github.com/census-instrumentation/opencensus-proto => github.com/census-instrumentation/opencensus-proto v0.2.1 - github.com/cespare/xxhash/v2 => github.com/cespare/xxhash/v2 v2.1.1 - github.com/chai2010/gettext-go => github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 - github.com/checkpoint-restore/go-criu => github.com/checkpoint-restore/go-criu v0.0.0-20190109184317-bdb7599cd87b - github.com/cheekybits/genny => github.com/cheekybits/genny v0.0.0-20170328200008-9127e812e1e9 - github.com/chzyer/logex => github.com/chzyer/logex v1.1.10 - github.com/chzyer/readline => github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e - github.com/chzyer/test => github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1 - github.com/cilium/ebpf => github.com/cilium/ebpf v0.0.0-20191113100448-d9fb101ca1fb - github.com/clusterhq/flocker-go => github.com/clusterhq/flocker-go v0.0.0-20160920122132-2b8b7259d313 - github.com/cockroachdb/datadriven => github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa - github.com/codegangsta/negroni => github.com/codegangsta/negroni v1.0.0 - github.com/container-storage-interface/spec => github.com/container-storage-interface/spec v1.2.0 - github.com/containerd/cgroups => github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f - github.com/containerd/console => github.com/containerd/console v1.0.0 - github.com/containerd/containerd => github.com/containerd/containerd v1.3.3 - github.com/containerd/continuity => github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc - github.com/containerd/fifo => github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448 - github.com/containerd/go-runc => github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3 - github.com/containerd/ttrpc => github.com/containerd/ttrpc v1.0.0 - github.com/containerd/typeurl => github.com/containerd/typeurl v1.0.0 - github.com/containernetworking/cni => github.com/containernetworking/cni v0.7.1 - github.com/coredns/corefile-migration => github.com/coredns/corefile-migration v1.0.8 - github.com/coreos/bbolt => github.com/coreos/bbolt v1.3.2 - github.com/coreos/etcd => github.com/coreos/etcd v3.3.10+incompatible - github.com/coreos/go-oidc => github.com/coreos/go-oidc v2.1.0+incompatible - github.com/coreos/go-semver => github.com/coreos/go-semver v0.3.0 - github.com/coreos/go-systemd => github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e - github.com/coreos/pkg => github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f - github.com/cpuguy83/go-md2man => github.com/cpuguy83/go-md2man v1.0.10 - github.com/cpuguy83/go-md2man/v2 => github.com/cpuguy83/go-md2man/v2 v2.0.0 - github.com/creack/pty => github.com/creack/pty v1.1.7 - github.com/cyphar/filepath-securejoin => github.com/cyphar/filepath-securejoin v0.2.2 - github.com/davecgh/go-spew => github.com/davecgh/go-spew v1.1.1 - github.com/daviddengcn/go-colortext => github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd - github.com/dgrijalva/jwt-go => github.com/dgrijalva/jwt-go v3.2.0+incompatible - github.com/dnaeon/go-vcr => github.com/dnaeon/go-vcr v1.0.1 - github.com/docker/distribution => github.com/docker/distribution v2.7.1+incompatible - github.com/docker/docker => github.com/docker/docker v1.4.2-0.20200309214505-aa6a9891b09c - github.com/docker/go-connections => github.com/docker/go-connections v0.3.0 - github.com/docker/go-units => github.com/docker/go-units v0.4.0 - github.com/docker/spdystream => github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96 - github.com/docopt/docopt-go => github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815 - github.com/dustin/go-humanize => github.com/dustin/go-humanize v1.0.0 - github.com/elazarl/goproxy => github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153 // 947c36da3153 is the SHA for git tag v1.11 - github.com/emicklei/go-restful => github.com/emicklei/go-restful v2.9.5+incompatible - github.com/envoyproxy/go-control-plane => github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473 - github.com/envoyproxy/protoc-gen-validate => github.com/envoyproxy/protoc-gen-validate v0.1.0 - github.com/euank/go-kmsg-parser => github.com/euank/go-kmsg-parser v2.0.0+incompatible - github.com/evanphx/json-patch => github.com/evanphx/json-patch v4.2.0+incompatible - github.com/exponent-io/jsonpath => github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d - github.com/fatih/camelcase => github.com/fatih/camelcase v1.0.0 - github.com/fatih/color => github.com/fatih/color v1.7.0 - github.com/flynn/go-shlex => github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 - github.com/fogleman/gg => github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90 - github.com/fsnotify/fsnotify => github.com/fsnotify/fsnotify v1.4.9 - github.com/ghodss/yaml => github.com/ghodss/yaml v1.0.0 - github.com/go-acme/lego => github.com/go-acme/lego v2.5.0+incompatible - github.com/go-bindata/go-bindata => github.com/go-bindata/go-bindata v3.1.1+incompatible - github.com/go-gl/glfw/v3.3/glfw => github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72 - github.com/go-ini/ini => github.com/go-ini/ini v1.9.0 - github.com/go-kit/kit => github.com/go-kit/kit v0.9.0 - github.com/go-logfmt/logfmt => github.com/go-logfmt/logfmt v0.4.0 - github.com/go-logr/logr => github.com/go-logr/logr v0.1.0 - github.com/go-openapi/analysis => github.com/go-openapi/analysis v0.19.5 - github.com/go-openapi/errors => github.com/go-openapi/errors v0.19.2 - github.com/go-openapi/jsonpointer => github.com/go-openapi/jsonpointer v0.19.3 - github.com/go-openapi/jsonreference => github.com/go-openapi/jsonreference v0.19.3 - github.com/go-openapi/loads => github.com/go-openapi/loads v0.19.4 - github.com/go-openapi/runtime => github.com/go-openapi/runtime v0.19.4 - github.com/go-openapi/spec => github.com/go-openapi/spec v0.19.3 - github.com/go-openapi/strfmt => github.com/go-openapi/strfmt v0.19.3 - github.com/go-openapi/swag => github.com/go-openapi/swag v0.19.5 - github.com/go-openapi/validate => github.com/go-openapi/validate v0.19.5 - github.com/go-ozzo/ozzo-validation => github.com/go-ozzo/ozzo-validation v3.5.0+incompatible - github.com/go-stack/stack => github.com/go-stack/stack v1.8.0 - github.com/godbus/dbus => github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e - github.com/gogo/protobuf => github.com/gogo/protobuf v1.3.1 - github.com/golang/freetype => github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 - github.com/golang/glog => github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b - github.com/golang/groupcache => github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7 - github.com/golang/mock => github.com/golang/mock v1.3.1 - github.com/golang/protobuf => github.com/golang/protobuf v1.4.2 - github.com/golangplus/bytes => github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450 - github.com/golangplus/fmt => github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995 - github.com/golangplus/testing => github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e - github.com/google/btree => github.com/google/btree v1.0.0 - github.com/google/cadvisor => github.com/google/cadvisor v0.36.1-0.20200513160741-6a8d61401ea9 - github.com/google/go-cmp => github.com/google/go-cmp v0.4.0 - github.com/google/gofuzz => github.com/google/gofuzz v1.1.0 - github.com/google/martian => github.com/google/martian v2.1.0+incompatible - github.com/google/pprof => github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc - github.com/google/renameio => github.com/google/renameio v0.1.0 - github.com/google/uuid => github.com/google/uuid v1.1.1 - github.com/googleapis/gax-go/v2 => github.com/googleapis/gax-go/v2 v2.0.5 - github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.4.1 - github.com/gophercloud/gophercloud => github.com/gophercloud/gophercloud v0.1.0 - github.com/gopherjs/gopherjs => github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 - github.com/gorilla/context => github.com/gorilla/context v1.1.1 - github.com/gorilla/mux => github.com/gorilla/mux v1.7.3 - github.com/gorilla/websocket => github.com/gorilla/websocket v1.4.0 - github.com/gregjones/httpcache => github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 - github.com/grpc-ecosystem/go-grpc-middleware => github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4 - github.com/grpc-ecosystem/go-grpc-prometheus => github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 - github.com/grpc-ecosystem/grpc-gateway => github.com/grpc-ecosystem/grpc-gateway v1.9.5 - github.com/hashicorp/go-syslog => github.com/hashicorp/go-syslog v1.0.0 - github.com/hashicorp/golang-lru => github.com/hashicorp/golang-lru v0.5.1 - github.com/hashicorp/hcl => github.com/hashicorp/hcl v1.0.0 - github.com/heketi/heketi => github.com/heketi/heketi v9.0.1-0.20190917153846-c2e2a4ab7ab9+incompatible - github.com/heketi/tests => github.com/heketi/tests v0.0.0-20151005000721-f3775cbcefd6 - github.com/hpcloud/tail => github.com/hpcloud/tail v1.0.0 - github.com/ianlancetaylor/demangle => github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6 - github.com/imdario/mergo => github.com/imdario/mergo v0.3.5 - github.com/inconshreveable/mousetrap => github.com/inconshreveable/mousetrap v1.0.0 - github.com/ishidawataru/sctp => github.com/ishidawataru/sctp v0.0.0-20190723014705-7c296d48a2b5 - github.com/jimstudt/http-authentication => github.com/jimstudt/http-authentication v0.0.0-20140401203705-3eca13d6893a - github.com/jmespath/go-jmespath => github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af - github.com/jonboulle/clockwork => github.com/jonboulle/clockwork v0.1.0 - github.com/json-iterator/go => github.com/json-iterator/go v1.1.9 - github.com/jstemmer/go-junit-report => github.com/jstemmer/go-junit-report v0.9.1 - github.com/jtolds/gls => github.com/jtolds/gls v4.20.0+incompatible - github.com/julienschmidt/httprouter => github.com/julienschmidt/httprouter v1.2.0 - github.com/jung-kurt/gofpdf => github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5 - github.com/karrick/godirwalk => github.com/karrick/godirwalk v1.7.5 - github.com/kisielk/errcheck => github.com/kisielk/errcheck v1.2.0 - github.com/kisielk/gotool => github.com/kisielk/gotool v1.0.0 - github.com/klauspost/cpuid => github.com/klauspost/cpuid v1.2.0 - github.com/konsorten/go-windows-terminal-sequences => github.com/konsorten/go-windows-terminal-sequences v1.0.2 - github.com/kr/logfmt => github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 - github.com/kr/pretty => github.com/kr/pretty v0.2.0 - github.com/kr/pty => github.com/kr/pty v1.1.5 - github.com/kr/text => github.com/kr/text v0.1.0 - github.com/kylelemons/godebug => github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348 - github.com/libopenstorage/openstorage => github.com/libopenstorage/openstorage v1.0.0 - github.com/liggitt/tabwriter => github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de - github.com/lithammer/dedent => github.com/lithammer/dedent v1.1.0 - github.com/lpabon/godbc => github.com/lpabon/godbc v0.1.1 - github.com/lucas-clemente/aes12 => github.com/lucas-clemente/aes12 v0.0.0-20171027163421-cd47fb39b79f - github.com/lucas-clemente/quic-clients => github.com/lucas-clemente/quic-clients v0.1.0 - github.com/lucas-clemente/quic-go => github.com/lucas-clemente/quic-go v0.10.2 - github.com/lucas-clemente/quic-go-certificates => github.com/lucas-clemente/quic-go-certificates v0.0.0-20160823095156-d2f86524cced - github.com/magiconair/properties => github.com/magiconair/properties v1.8.1 - github.com/mailru/easyjson => github.com/mailru/easyjson v0.7.0 - github.com/marten-seemann/qtls => github.com/marten-seemann/qtls v0.2.3 - github.com/mattn/go-colorable => github.com/mattn/go-colorable v0.0.9 - github.com/mattn/go-isatty => github.com/mattn/go-isatty v0.0.4 - github.com/mattn/go-runewidth => github.com/mattn/go-runewidth v0.0.2 - github.com/matttproud/golang_protobuf_extensions => github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 - github.com/mholt/certmagic => github.com/mholt/certmagic v0.6.2-0.20190624175158-6a42ef9fe8c2 - github.com/miekg/dns => github.com/miekg/dns v1.1.4 - github.com/mindprince/gonvml => github.com/mindprince/gonvml v0.0.0-20190828220739-9ebdce4bb989 - github.com/mistifyio/go-zfs => github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible - github.com/mitchellh/go-homedir => github.com/mitchellh/go-homedir v1.1.0 - github.com/mitchellh/go-wordwrap => github.com/mitchellh/go-wordwrap v1.0.0 - github.com/mitchellh/mapstructure => github.com/mitchellh/mapstructure v1.1.2 - github.com/moby/ipvs => github.com/moby/ipvs v1.0.1 - github.com/moby/term => github.com/moby/term v0.0.0-20200312100748-672ec06f55cd - github.com/modern-go/concurrent => github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd - github.com/modern-go/reflect2 => github.com/modern-go/reflect2 v1.0.1 - github.com/mohae/deepcopy => github.com/mohae/deepcopy v0.0.0-20170603005431-491d3605edfb - github.com/morikuni/aec => github.com/morikuni/aec v1.0.0 - github.com/mrunalp/fileutils => github.com/mrunalp/fileutils v0.0.0-20171103030105-7d4729fb3618 - github.com/munnerz/goautoneg => github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 - github.com/mvdan/xurls => github.com/mvdan/xurls v1.1.0 - github.com/mwitkow/go-conntrack => github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223 - github.com/mxk/go-flowrate => github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f - github.com/naoina/go-stringutil => github.com/naoina/go-stringutil v0.1.0 - github.com/naoina/toml => github.com/naoina/toml v0.1.1 - github.com/olekukonko/tablewriter => github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5 - github.com/onsi/ginkgo => github.com/onsi/ginkgo v1.11.0 - github.com/onsi/gomega => github.com/onsi/gomega v1.7.0 - github.com/opencontainers/go-digest => github.com/opencontainers/go-digest v1.0.0-rc1 - github.com/opencontainers/image-spec => github.com/opencontainers/image-spec v1.0.1 - github.com/opencontainers/runc => github.com/opencontainers/runc v1.0.0-rc10 - github.com/opencontainers/runtime-spec => github.com/opencontainers/runtime-spec v1.0.2 - github.com/opencontainers/selinux => github.com/opencontainers/selinux v1.3.3 - github.com/pelletier/go-toml => github.com/pelletier/go-toml v1.2.0 - github.com/peterbourgon/diskv => github.com/peterbourgon/diskv v2.0.1+incompatible - github.com/pkg/errors => github.com/pkg/errors v0.9.1 - github.com/pmezard/go-difflib => github.com/pmezard/go-difflib v1.0.0 - github.com/pquerna/cachecontrol => github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021 - github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.6.0 - github.com/prometheus/client_model => github.com/prometheus/client_model v0.2.0 - github.com/prometheus/common => github.com/prometheus/common v0.9.1 - github.com/prometheus/procfs => github.com/prometheus/procfs v0.0.11 - github.com/quobyte/api => github.com/quobyte/api v0.1.2 - github.com/remyoudompheng/bigfft => github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446 - github.com/robfig/cron => github.com/robfig/cron v1.1.0 - github.com/rogpeppe/fastuuid => github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af - github.com/rogpeppe/go-internal => github.com/rogpeppe/go-internal v1.3.0 - github.com/rubiojr/go-vhd => github.com/rubiojr/go-vhd v0.0.0-20160810183302-0bfd3b39853c - github.com/russross/blackfriday => github.com/russross/blackfriday v1.5.2 - github.com/russross/blackfriday/v2 => github.com/russross/blackfriday/v2 v2.0.1 - github.com/satori/go.uuid => github.com/satori/go.uuid v1.2.0 - github.com/seccomp/libseccomp-golang => github.com/seccomp/libseccomp-golang v0.9.1 - github.com/sergi/go-diff => github.com/sergi/go-diff v1.0.0 - github.com/shurcooL/sanitized_anchor_name => github.com/shurcooL/sanitized_anchor_name v1.0.0 - github.com/sirupsen/logrus => github.com/sirupsen/logrus v1.4.2 - github.com/smartystreets/assertions => github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d - github.com/smartystreets/goconvey => github.com/smartystreets/goconvey v1.6.4 - github.com/soheilhy/cmux => github.com/soheilhy/cmux v0.1.4 - github.com/spf13/afero => github.com/spf13/afero v1.2.2 - github.com/spf13/cast => github.com/spf13/cast v1.3.0 - github.com/spf13/cobra => github.com/spf13/cobra v1.0.0 - github.com/spf13/jwalterweatherman => github.com/spf13/jwalterweatherman v1.1.0 - github.com/spf13/pflag => github.com/spf13/pflag v1.0.5 - github.com/spf13/viper => github.com/spf13/viper v1.4.0 - github.com/storageos/go-api => github.com/storageos/go-api v0.0.0-20180912212459-343b3eff91fc - github.com/stretchr/objx => github.com/stretchr/objx v0.2.0 - github.com/stretchr/testify => github.com/stretchr/testify v1.4.0 - github.com/syndtr/gocapability => github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2 - github.com/thecodeteam/goscaleio => github.com/thecodeteam/goscaleio v0.1.0 - github.com/tidwall/pretty => github.com/tidwall/pretty v1.0.0 - github.com/tmc/grpc-websocket-proxy => github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5 - github.com/ugorji/go => github.com/ugorji/go v1.1.4 - github.com/urfave/cli => github.com/urfave/cli v1.20.0 - github.com/urfave/negroni => github.com/urfave/negroni v1.0.0 - github.com/vektah/gqlparser => github.com/vektah/gqlparser v1.1.2 - github.com/vishvananda/netlink => github.com/vishvananda/netlink v1.1.0 - github.com/vishvananda/netns => github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df - github.com/vmware/govmomi => github.com/vmware/govmomi v0.20.3 - github.com/xiang90/probing => github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 - github.com/xlab/handysort => github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1 - github.com/xordataexchange/crypt => github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77 - go.etcd.io/bbolt => go.etcd.io/bbolt v1.3.3 - go.etcd.io/etcd => go.etcd.io/etcd v0.5.0-alpha.5.0.20200401174654-e694b7bb0875 // e694b7bb0875 is the SHA for git tag v3.4.7 - go.mongodb.org/mongo-driver => go.mongodb.org/mongo-driver v1.1.2 - go.opencensus.io => go.opencensus.io v0.22.2 - go.uber.org/atomic => go.uber.org/atomic v1.4.0 - go.uber.org/multierr => go.uber.org/multierr v1.1.0 - go.uber.org/zap => go.uber.org/zap v1.10.0 - golang.org/x/crypto => golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975 - golang.org/x/exp => golang.org/x/exp v0.0.0-20191227195350-da58074b4299 - golang.org/x/image => golang.org/x/image v0.0.0-20190802002840-cff245a6509b - golang.org/x/lint => golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f - golang.org/x/mobile => golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028 - golang.org/x/mod => golang.org/x/mod v0.1.0 - golang.org/x/net => golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e - golang.org/x/oauth2 => golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6 - golang.org/x/sync => golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e - golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // pinned to release-branch.go1.13 - golang.org/x/text => golang.org/x/text v0.3.2 - golang.org/x/time => golang.org/x/time v0.0.0-20191024005414-555d28b269f0 - golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 // pinned to release-branch.go1.13 - golang.org/x/xerrors => golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 - gonum.org/v1/gonum => gonum.org/v1/gonum v0.6.2 - gonum.org/v1/netlib => gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e - gonum.org/v1/plot => gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b - google.golang.org/api => google.golang.org/api v0.15.1 - google.golang.org/appengine => google.golang.org/appengine v1.6.5 - google.golang.org/genproto => google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba - google.golang.org/grpc => google.golang.org/grpc v1.26.0 - google.golang.org/protobuf => google.golang.org/protobuf v1.23.0 - gopkg.in/alecthomas/kingpin.v2 => gopkg.in/alecthomas/kingpin.v2 v2.2.6 - gopkg.in/check.v1 => gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 - gopkg.in/cheggaaa/pb.v1 => gopkg.in/cheggaaa/pb.v1 v1.0.25 - gopkg.in/errgo.v2 => gopkg.in/errgo.v2 v2.1.0 - gopkg.in/fsnotify.v1 => gopkg.in/fsnotify.v1 v1.4.7 - gopkg.in/gcfg.v1 => gopkg.in/gcfg.v1 v1.2.0 - gopkg.in/inf.v0 => gopkg.in/inf.v0 v0.9.1 - gopkg.in/mcuadros/go-syslog.v2 => gopkg.in/mcuadros/go-syslog.v2 v2.2.1 - gopkg.in/natefinch/lumberjack.v2 => gopkg.in/natefinch/lumberjack.v2 v2.0.0 - gopkg.in/resty.v1 => gopkg.in/resty.v1 v1.12.0 - gopkg.in/square/go-jose.v2 => gopkg.in/square/go-jose.v2 v2.2.2 - gopkg.in/tomb.v1 => gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 - gopkg.in/warnings.v0 => gopkg.in/warnings.v0 v0.1.1 - gopkg.in/yaml.v2 => gopkg.in/yaml.v2 v2.2.8 - gotest.tools => gotest.tools v2.2.0+incompatible - gotest.tools/v3 => gotest.tools/v3 v3.0.2 - honnef.co/go/tools => honnef.co/go/tools v0.0.1-2019.2.3 - k8s.io/api => ./staging/src/k8s.io/api - k8s.io/apiextensions-apiserver => ./staging/src/k8s.io/apiextensions-apiserver - k8s.io/apimachinery => ./staging/src/k8s.io/apimachinery - k8s.io/apiserver => ./staging/src/k8s.io/apiserver - k8s.io/cli-runtime => ./staging/src/k8s.io/cli-runtime - k8s.io/client-go => ./staging/src/k8s.io/client-go - k8s.io/cloud-provider => ./staging/src/k8s.io/cloud-provider - k8s.io/cluster-bootstrap => ./staging/src/k8s.io/cluster-bootstrap - k8s.io/code-generator => ./staging/src/k8s.io/code-generator - k8s.io/component-base => ./staging/src/k8s.io/component-base - k8s.io/controller-manager => ./staging/src/k8s.io/controller-manager - k8s.io/cri-api => ./staging/src/k8s.io/cri-api - k8s.io/csi-translation-lib => ./staging/src/k8s.io/csi-translation-lib - k8s.io/gengo => k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14 - k8s.io/heapster => k8s.io/heapster v1.2.0-beta.1 - k8s.io/klog/v2 => k8s.io/klog/v2 v2.1.0 - k8s.io/kube-aggregator => ./staging/src/k8s.io/kube-aggregator - k8s.io/kube-controller-manager => ./staging/src/k8s.io/kube-controller-manager - k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20200427153329-656914f816f9 - k8s.io/kube-proxy => ./staging/src/k8s.io/kube-proxy - k8s.io/kube-scheduler => ./staging/src/k8s.io/kube-scheduler - k8s.io/kubectl => ./staging/src/k8s.io/kubectl - k8s.io/kubelet => ./staging/src/k8s.io/kubelet - k8s.io/legacy-cloud-providers => ./staging/src/k8s.io/legacy-cloud-providers - k8s.io/metrics => ./staging/src/k8s.io/metrics - k8s.io/sample-apiserver => ./staging/src/k8s.io/sample-apiserver - k8s.io/sample-cli-plugin => ./staging/src/k8s.io/sample-cli-plugin - k8s.io/sample-controller => ./staging/src/k8s.io/sample-controller - k8s.io/system-validators => k8s.io/system-validators v1.1.2 - k8s.io/utils => k8s.io/utils v0.0.0-20200414100711-2df71ebbae66 - modernc.org/cc => modernc.org/cc v1.0.0 - modernc.org/golex => modernc.org/golex v1.0.0 - modernc.org/mathutil => modernc.org/mathutil v1.0.0 - modernc.org/strutil => modernc.org/strutil v1.0.0 - modernc.org/xc => modernc.org/xc v1.0.0 - rsc.io/pdf => rsc.io/pdf v0.1.1 - sigs.k8s.io/apiserver-network-proxy/konnectivity-client => sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.9-0.20200513220823-33b997865007 - sigs.k8s.io/kustomize => sigs.k8s.io/kustomize v2.0.3+incompatible - sigs.k8s.io/structured-merge-diff/v3 => sigs.k8s.io/structured-merge-diff/v3 v3.0.0 - sigs.k8s.io/yaml => sigs.k8s.io/yaml v1.2.0 - vbom.ml/util => vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc -) diff --git a/vendor/k8s.io/kubernetes/third_party/protobuf/google/protobuf/compiler/plugin.proto b/vendor/k8s.io/kubernetes/third_party/protobuf/google/protobuf/compiler/plugin.proto deleted file mode 100644 index 5116167e0..000000000 --- a/vendor/k8s.io/kubernetes/third_party/protobuf/google/protobuf/compiler/plugin.proto +++ /dev/null @@ -1,150 +0,0 @@ -// Protocol Buffers - Google's data interchange format -// Copyright 2008 Google Inc. All rights reserved. -// https://developers.google.com/protocol-buffers/ -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -// Author: kenton@google.com (Kenton Varda) -// -// WARNING: The plugin interface is currently EXPERIMENTAL and is subject to -// change. -// -// protoc (aka the Protocol Compiler) can be extended via plugins. A plugin is -// just a program that reads a CodeGeneratorRequest from stdin and writes a -// CodeGeneratorResponse to stdout. -// -// Plugins written using C++ can use google/protobuf/compiler/plugin.h instead -// of dealing with the raw protocol defined here. -// -// A plugin executable needs only to be placed somewhere in the path. The -// plugin should be named "protoc-gen-$NAME", and will then be used when the -// flag "--${NAME}_out" is passed to protoc. - -syntax = "proto2"; -package google.protobuf.compiler; -option java_package = "com.google.protobuf.compiler"; -option java_outer_classname = "PluginProtos"; - -option go_package = "plugin_go"; - -import "google/protobuf/descriptor.proto"; - -// An encoded CodeGeneratorRequest is written to the plugin's stdin. -message CodeGeneratorRequest { - // The .proto files that were explicitly listed on the command-line. The - // code generator should generate code only for these files. Each file's - // descriptor will be included in proto_file, below. - repeated string file_to_generate = 1; - - // The generator parameter passed on the command-line. - optional string parameter = 2; - - // FileDescriptorProtos for all files in files_to_generate and everything - // they import. The files will appear in topological order, so each file - // appears before any file that imports it. - // - // protoc guarantees that all proto_files will be written after - // the fields above, even though this is not technically guaranteed by the - // protobuf wire format. This theoretically could allow a plugin to stream - // in the FileDescriptorProtos and handle them one by one rather than read - // the entire set into memory at once. However, as of this writing, this - // is not similarly optimized on protoc's end -- it will store all fields in - // memory at once before sending them to the plugin. - repeated FileDescriptorProto proto_file = 15; -} - -// The plugin writes an encoded CodeGeneratorResponse to stdout. -message CodeGeneratorResponse { - // Error message. If non-empty, code generation failed. The plugin process - // should exit with status code zero even if it reports an error in this way. - // - // This should be used to indicate errors in .proto files which prevent the - // code generator from generating correct code. Errors which indicate a - // problem in protoc itself -- such as the input CodeGeneratorRequest being - // unparseable -- should be reported by writing a message to stderr and - // exiting with a non-zero status code. - optional string error = 1; - - // Represents a single generated file. - message File { - // The file name, relative to the output directory. The name must not - // contain "." or ".." components and must be relative, not be absolute (so, - // the file cannot lie outside the output directory). "/" must be used as - // the path separator, not "\". - // - // If the name is omitted, the content will be appended to the previous - // file. This allows the generator to break large files into small chunks, - // and allows the generated text to be streamed back to protoc so that large - // files need not reside completely in memory at one time. Note that as of - // this writing protoc does not optimize for this -- it will read the entire - // CodeGeneratorResponse before writing files to disk. - optional string name = 1; - - // If non-empty, indicates that the named file should already exist, and the - // content here is to be inserted into that file at a defined insertion - // point. This feature allows a code generator to extend the output - // produced by another code generator. The original generator may provide - // insertion points by placing special annotations in the file that look - // like: - // @@protoc_insertion_point(NAME) - // The annotation can have arbitrary text before and after it on the line, - // which allows it to be placed in a comment. NAME should be replaced with - // an identifier naming the point -- this is what other generators will use - // as the insertion_point. Code inserted at this point will be placed - // immediately above the line containing the insertion point (thus multiple - // insertions to the same point will come out in the order they were added). - // The double-@ is intended to make it unlikely that the generated code - // could contain things that look like insertion points by accident. - // - // For example, the C++ code generator places the following line in the - // .pb.h files that it generates: - // // @@protoc_insertion_point(namespace_scope) - // This line appears within the scope of the file's package namespace, but - // outside of any particular class. Another plugin can then specify the - // insertion_point "namespace_scope" to generate additional classes or - // other declarations that should be placed in this scope. - // - // Note that if the line containing the insertion point begins with - // whitespace, the same whitespace will be added to every line of the - // inserted text. This is useful for languages like Python, where - // indentation matters. In these languages, the insertion point comment - // should be indented the same amount as any inserted code will need to be - // in order to work correctly in that context. - // - // The code generator that generates the initial file and the one which - // inserts into it must both run as part of a single invocation of protoc. - // Code generators are executed in the order in which they appear on the - // command line. - // - // If |insertion_point| is present, |name| must also be present. - optional string insertion_point = 2; - - // The file contents. - optional string content = 15; - } - repeated File file = 15; -} \ No newline at end of file diff --git a/vendor/k8s.io/kubernetes/third_party/protobuf/google/protobuf/descriptor.proto b/vendor/k8s.io/kubernetes/third_party/protobuf/google/protobuf/descriptor.proto deleted file mode 100644 index 14594a8c6..000000000 --- a/vendor/k8s.io/kubernetes/third_party/protobuf/google/protobuf/descriptor.proto +++ /dev/null @@ -1,779 +0,0 @@ -// Protocol Buffers - Google's data interchange format -// Copyright 2008 Google Inc. All rights reserved. -// https://developers.google.com/protocol-buffers/ -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -// Author: kenton@google.com (Kenton Varda) -// Based on original Protocol Buffers design by -// Sanjay Ghemawat, Jeff Dean, and others. -// -// The messages in this file describe the definitions found in .proto files. -// A valid .proto file can be translated directly to a FileDescriptorProto -// without any other information (e.g. without reading its imports). - - -syntax = "proto2"; - -package google.protobuf; -option go_package = "descriptor"; -option java_package = "com.google.protobuf"; -option java_outer_classname = "DescriptorProtos"; -option csharp_namespace = "Google.Protobuf.Reflection"; -option objc_class_prefix = "GPB"; - -// descriptor.proto must be optimized for speed because reflection-based -// algorithms don't work during bootstrapping. -option optimize_for = SPEED; - -// The protocol compiler can output a FileDescriptorSet containing the .proto -// files it parses. -message FileDescriptorSet { - repeated FileDescriptorProto file = 1; -} - -// Describes a complete .proto file. -message FileDescriptorProto { - optional string name = 1; // file name, relative to root of source tree - optional string package = 2; // e.g. "foo", "foo.bar", etc. - - // Names of files imported by this file. - repeated string dependency = 3; - // Indexes of the public imported files in the dependency list above. - repeated int32 public_dependency = 10; - // Indexes of the weak imported files in the dependency list. - // For Google-internal migration only. Do not use. - repeated int32 weak_dependency = 11; - - // All top-level definitions in this file. - repeated DescriptorProto message_type = 4; - repeated EnumDescriptorProto enum_type = 5; - repeated ServiceDescriptorProto service = 6; - repeated FieldDescriptorProto extension = 7; - - optional FileOptions options = 8; - - // This field contains optional information about the original source code. - // You may safely remove this entire field without harming runtime - // functionality of the descriptors -- the information is needed only by - // development tools. - optional SourceCodeInfo source_code_info = 9; - - // The syntax of the proto file. - // The supported values are "proto2" and "proto3". - optional string syntax = 12; -} - -// Describes a message type. -message DescriptorProto { - optional string name = 1; - - repeated FieldDescriptorProto field = 2; - repeated FieldDescriptorProto extension = 6; - - repeated DescriptorProto nested_type = 3; - repeated EnumDescriptorProto enum_type = 4; - - message ExtensionRange { - optional int32 start = 1; - optional int32 end = 2; - } - repeated ExtensionRange extension_range = 5; - - repeated OneofDescriptorProto oneof_decl = 8; - - optional MessageOptions options = 7; - - // Range of reserved tag numbers. Reserved tag numbers may not be used by - // fields or extension ranges in the same message. Reserved ranges may - // not overlap. - message ReservedRange { - optional int32 start = 1; // Inclusive. - optional int32 end = 2; // Exclusive. - } - repeated ReservedRange reserved_range = 9; - // Reserved field names, which may not be used by fields in the same message. - // A given name may only be reserved once. - repeated string reserved_name = 10; -} - -// Describes a field within a message. -message FieldDescriptorProto { - enum Type { - // 0 is reserved for errors. - // Order is weird for historical reasons. - TYPE_DOUBLE = 1; - TYPE_FLOAT = 2; - // Not ZigZag encoded. Negative numbers take 10 bytes. Use TYPE_SINT64 if - // negative values are likely. - TYPE_INT64 = 3; - TYPE_UINT64 = 4; - // Not ZigZag encoded. Negative numbers take 10 bytes. Use TYPE_SINT32 if - // negative values are likely. - TYPE_INT32 = 5; - TYPE_FIXED64 = 6; - TYPE_FIXED32 = 7; - TYPE_BOOL = 8; - TYPE_STRING = 9; - TYPE_GROUP = 10; // Tag-delimited aggregate. - TYPE_MESSAGE = 11; // Length-delimited aggregate. - - // New in version 2. - TYPE_BYTES = 12; - TYPE_UINT32 = 13; - TYPE_ENUM = 14; - TYPE_SFIXED32 = 15; - TYPE_SFIXED64 = 16; - TYPE_SINT32 = 17; // Uses ZigZag encoding. - TYPE_SINT64 = 18; // Uses ZigZag encoding. - }; - - enum Label { - // 0 is reserved for errors - LABEL_OPTIONAL = 1; - LABEL_REQUIRED = 2; - LABEL_REPEATED = 3; - // TODO(sanjay): Should we add LABEL_MAP? - }; - - optional string name = 1; - optional int32 number = 3; - optional Label label = 4; - - // If type_name is set, this need not be set. If both this and type_name - // are set, this must be one of TYPE_ENUM, TYPE_MESSAGE or TYPE_GROUP. - optional Type type = 5; - - // For message and enum types, this is the name of the type. If the name - // starts with a '.', it is fully-qualified. Otherwise, C++-like scoping - // rules are used to find the type (i.e. first the nested types within this - // message are searched, then within the parent, on up to the root - // namespace). - optional string type_name = 6; - - // For extensions, this is the name of the type being extended. It is - // resolved in the same manner as type_name. - optional string extendee = 2; - - // For numeric types, contains the original text representation of the value. - // For booleans, "true" or "false". - // For strings, contains the default text contents (not escaped in any way). - // For bytes, contains the C escaped value. All bytes >= 128 are escaped. - // TODO(kenton): Base-64 encode? - optional string default_value = 7; - - // If set, gives the index of a oneof in the containing type's oneof_decl - // list. This field is a member of that oneof. - optional int32 oneof_index = 9; - - // JSON name of this field. The value is set by protocol compiler. If the - // user has set a "json_name" option on this field, that option's value - // will be used. Otherwise, it's deduced from the field's name by converting - // it to camelCase. - optional string json_name = 10; - - optional FieldOptions options = 8; -} - -// Describes a oneof. -message OneofDescriptorProto { - optional string name = 1; -} - -// Describes an enum type. -message EnumDescriptorProto { - optional string name = 1; - - repeated EnumValueDescriptorProto value = 2; - - optional EnumOptions options = 3; -} - -// Describes a value within an enum. -message EnumValueDescriptorProto { - optional string name = 1; - optional int32 number = 2; - - optional EnumValueOptions options = 3; -} - -// Describes a service. -message ServiceDescriptorProto { - optional string name = 1; - repeated MethodDescriptorProto method = 2; - - optional ServiceOptions options = 3; -} - -// Describes a method of a service. -message MethodDescriptorProto { - optional string name = 1; - - // Input and output type names. These are resolved in the same way as - // FieldDescriptorProto.type_name, but must refer to a message type. - optional string input_type = 2; - optional string output_type = 3; - - optional MethodOptions options = 4; - - // Identifies if client streams multiple client messages - optional bool client_streaming = 5 [default=false]; - // Identifies if server streams multiple server messages - optional bool server_streaming = 6 [default=false]; -} - - -// =================================================================== -// Options - -// Each of the definitions above may have "options" attached. These are -// just annotations which may cause code to be generated slightly differently -// or may contain hints for code that manipulates protocol messages. -// -// Clients may define custom options as extensions of the *Options messages. -// These extensions may not yet be known at parsing time, so the parser cannot -// store the values in them. Instead it stores them in a field in the *Options -// message called uninterpreted_option. This field must have the same name -// across all *Options messages. We then use this field to populate the -// extensions when we build a descriptor, at which point all protos have been -// parsed and so all extensions are known. -// -// Extension numbers for custom options may be chosen as follows: -// * For options which will only be used within a single application or -// organization, or for experimental options, use field numbers 50000 -// through 99999. It is up to you to ensure that you do not use the -// same number for multiple options. -// * For options which will be published and used publicly by multiple -// independent entities, e-mail protobuf-global-extension-registry@google.com -// to reserve extension numbers. Simply provide your project name (e.g. -// Objective-C plugin) and your project website (if available) -- there's no -// need to explain how you intend to use them. Usually you only need one -// extension number. You can declare multiple options with only one extension -// number by putting them in a sub-message. See the Custom Options section of -// the docs for examples: -// https://developers.google.com/protocol-buffers/docs/proto#options -// If this turns out to be popular, a web service will be set up -// to automatically assign option numbers. - - -message FileOptions { - - // Sets the Java package where classes generated from this .proto will be - // placed. By default, the proto package is used, but this is often - // inappropriate because proto packages do not normally start with backwards - // domain names. - optional string java_package = 1; - - - // If set, all the classes from the .proto file are wrapped in a single - // outer class with the given name. This applies to both Proto1 - // (equivalent to the old "--one_java_file" option) and Proto2 (where - // a .proto always translates to a single class, but you may want to - // explicitly choose the class name). - optional string java_outer_classname = 8; - - // If set true, then the Java code generator will generate a separate .java - // file for each top-level message, enum, and service defined in the .proto - // file. Thus, these types will *not* be nested inside the outer class - // named by java_outer_classname. However, the outer class will still be - // generated to contain the file's getDescriptor() method as well as any - // top-level extensions defined in the file. - optional bool java_multiple_files = 10 [default=false]; - - // If set true, then the Java code generator will generate equals() and - // hashCode() methods for all messages defined in the .proto file. - // This increases generated code size, potentially substantially for large - // protos, which may harm a memory-constrained application. - // - In the full runtime this is a speed optimization, as the - // AbstractMessage base class includes reflection-based implementations of - // these methods. - // - In the lite runtime, setting this option changes the semantics of - // equals() and hashCode() to more closely match those of the full runtime; - // the generated methods compute their results based on field values rather - // than object identity. (Implementations should not assume that hashcodes - // will be consistent across runtimes or versions of the protocol compiler.) - optional bool java_generate_equals_and_hash = 20 [default=false]; - - // If set true, then the Java2 code generator will generate code that - // throws an exception whenever an attempt is made to assign a non-UTF-8 - // byte sequence to a string field. - // Message reflection will do the same. - // However, an extension field still accepts non-UTF-8 byte sequences. - // This option has no effect on when used with the lite runtime. - optional bool java_string_check_utf8 = 27 [default=false]; - - - // Generated classes can be optimized for speed or code size. - enum OptimizeMode { - SPEED = 1; // Generate complete code for parsing, serialization, - // etc. - CODE_SIZE = 2; // Use ReflectionOps to implement these methods. - LITE_RUNTIME = 3; // Generate code using MessageLite and the lite runtime. - } - optional OptimizeMode optimize_for = 9 [default=SPEED]; - - // Sets the Go package where structs generated from this .proto will be - // placed. If omitted, the Go package will be derived from the following: - // - The basename of the package import path, if provided. - // - Otherwise, the package statement in the .proto file, if present. - // - Otherwise, the basename of the .proto file, without extension. - optional string go_package = 11; - - - - // Should generic services be generated in each language? "Generic" services - // are not specific to any particular RPC system. They are generated by the - // main code generators in each language (without additional plugins). - // Generic services were the only kind of service generation supported by - // early versions of google.protobuf. - // - // Generic services are now considered deprecated in favor of using plugins - // that generate code specific to your particular RPC system. Therefore, - // these default to false. Old code which depends on generic services should - // explicitly set them to true. - optional bool cc_generic_services = 16 [default=false]; - optional bool java_generic_services = 17 [default=false]; - optional bool py_generic_services = 18 [default=false]; - - // Is this file deprecated? - // Depending on the target platform, this can emit Deprecated annotations - // for everything in the file, or it will be completely ignored; in the very - // least, this is a formalization for deprecating files. - optional bool deprecated = 23 [default=false]; - - // Enables the use of arenas for the proto messages in this file. This applies - // only to generated classes for C++. - optional bool cc_enable_arenas = 31 [default=false]; - - - // Sets the objective c class prefix which is prepended to all objective c - // generated classes from this .proto. There is no default. - optional string objc_class_prefix = 36; - - // Namespace for generated classes; defaults to the package. - optional string csharp_namespace = 37; - - // Whether the nano proto compiler should generate in the deprecated non-nano - // suffixed package. - optional bool javanano_use_deprecated_package = 38; - - // The parser stores options it doesn't recognize here. See above. - repeated UninterpretedOption uninterpreted_option = 999; - - // Clients can define custom options in extensions of this message. See above. - extensions 1000 to max; -} - -message MessageOptions { - // Set true to use the old proto1 MessageSet wire format for extensions. - // This is provided for backwards-compatibility with the MessageSet wire - // format. You should not use this for any other reason: It's less - // efficient, has fewer features, and is more complicated. - // - // The message must be defined exactly as follows: - // message Foo { - // option message_set_wire_format = true; - // extensions 4 to max; - // } - // Note that the message cannot have any defined fields; MessageSets only - // have extensions. - // - // All extensions of your type must be singular messages; e.g. they cannot - // be int32s, enums, or repeated messages. - // - // Because this is an option, the above two restrictions are not enforced by - // the protocol compiler. - optional bool message_set_wire_format = 1 [default=false]; - - // Disables the generation of the standard "descriptor()" accessor, which can - // conflict with a field of the same name. This is meant to make migration - // from proto1 easier; new code should avoid fields named "descriptor". - optional bool no_standard_descriptor_accessor = 2 [default=false]; - - // Is this message deprecated? - // Depending on the target platform, this can emit Deprecated annotations - // for the message, or it will be completely ignored; in the very least, - // this is a formalization for deprecating messages. - optional bool deprecated = 3 [default=false]; - - // Whether the message is an automatically generated map entry type for the - // maps field. - // - // For maps fields: - // map map_field = 1; - // The parsed descriptor looks like: - // message MapFieldEntry { - // option map_entry = true; - // optional KeyType key = 1; - // optional ValueType value = 2; - // } - // repeated MapFieldEntry map_field = 1; - // - // Implementations may choose not to generate the map_entry=true message, but - // use a native map in the target language to hold the keys and values. - // The reflection APIs in such implementions still need to work as - // if the field is a repeated message field. - // - // NOTE: Do not set the option in .proto files. Always use the maps syntax - // instead. The option should only be implicitly set by the proto compiler - // parser. - optional bool map_entry = 7; - - // The parser stores options it doesn't recognize here. See above. - repeated UninterpretedOption uninterpreted_option = 999; - - // Clients can define custom options in extensions of this message. See above. - extensions 1000 to max; -} - -message FieldOptions { - // The ctype option instructs the C++ code generator to use a different - // representation of the field than it normally would. See the specific - // options below. This option is not yet implemented in the open source - // release -- sorry, we'll try to include it in a future version! - optional CType ctype = 1 [default = STRING]; - enum CType { - // Default mode. - STRING = 0; - - CORD = 1; - - STRING_PIECE = 2; - } - // The packed option can be enabled for repeated primitive fields to enable - // a more efficient representation on the wire. Rather than repeatedly - // writing the tag and type for each element, the entire array is encoded as - // a single length-delimited blob. In proto3, only explicit setting it to - // false will avoid using packed encoding. - optional bool packed = 2; - - - // The jstype option determines the JavaScript type used for values of the - // field. The option is permitted only for 64 bit integral and fixed types - // (int64, uint64, sint64, fixed64, sfixed64). By default these types are - // represented as JavaScript strings. This avoids loss of precision that can - // happen when a large value is converted to a floating point JavaScript - // numbers. Specifying JS_NUMBER for the jstype causes the generated - // JavaScript code to use the JavaScript "number" type instead of strings. - // This option is an enum to permit additional types to be added, - // e.g. goog.math.Integer. - optional JSType jstype = 6 [default = JS_NORMAL]; - enum JSType { - // Use the default type. - JS_NORMAL = 0; - - // Use JavaScript strings. - JS_STRING = 1; - - // Use JavaScript numbers. - JS_NUMBER = 2; - } - - // Should this field be parsed lazily? Lazy applies only to message-type - // fields. It means that when the outer message is initially parsed, the - // inner message's contents will not be parsed but instead stored in encoded - // form. The inner message will actually be parsed when it is first accessed. - // - // This is only a hint. Implementations are free to choose whether to use - // eager or lazy parsing regardless of the value of this option. However, - // setting this option true suggests that the protocol author believes that - // using lazy parsing on this field is worth the additional bookkeeping - // overhead typically needed to implement it. - // - // This option does not affect the public interface of any generated code; - // all method signatures remain the same. Furthermore, thread-safety of the - // interface is not affected by this option; const methods remain safe to - // call from multiple threads concurrently, while non-const methods continue - // to require exclusive access. - // - // - // Note that implementations may choose not to check required fields within - // a lazy sub-message. That is, calling IsInitialized() on the outher message - // may return true even if the inner message has missing required fields. - // This is necessary because otherwise the inner message would have to be - // parsed in order to perform the check, defeating the purpose of lazy - // parsing. An implementation which chooses not to check required fields - // must be consistent about it. That is, for any particular sub-message, the - // implementation must either *always* check its required fields, or *never* - // check its required fields, regardless of whether or not the message has - // been parsed. - optional bool lazy = 5 [default=false]; - - // Is this field deprecated? - // Depending on the target platform, this can emit Deprecated annotations - // for accessors, or it will be completely ignored; in the very least, this - // is a formalization for deprecating fields. - optional bool deprecated = 3 [default=false]; - - // For Google-internal migration only. Do not use. - optional bool weak = 10 [default=false]; - - - // The parser stores options it doesn't recognize here. See above. - repeated UninterpretedOption uninterpreted_option = 999; - - // Clients can define custom options in extensions of this message. See above. - extensions 1000 to max; -} - -message EnumOptions { - - // Set this option to true to allow mapping different tag names to the same - // value. - optional bool allow_alias = 2; - - // Is this enum deprecated? - // Depending on the target platform, this can emit Deprecated annotations - // for the enum, or it will be completely ignored; in the very least, this - // is a formalization for deprecating enums. - optional bool deprecated = 3 [default=false]; - - // The parser stores options it doesn't recognize here. See above. - repeated UninterpretedOption uninterpreted_option = 999; - - // Clients can define custom options in extensions of this message. See above. - extensions 1000 to max; -} - -message EnumValueOptions { - // Is this enum value deprecated? - // Depending on the target platform, this can emit Deprecated annotations - // for the enum value, or it will be completely ignored; in the very least, - // this is a formalization for deprecating enum values. - optional bool deprecated = 1 [default=false]; - - // The parser stores options it doesn't recognize here. See above. - repeated UninterpretedOption uninterpreted_option = 999; - - // Clients can define custom options in extensions of this message. See above. - extensions 1000 to max; -} - -message ServiceOptions { - - // Note: Field numbers 1 through 32 are reserved for Google's internal RPC - // framework. We apologize for hoarding these numbers to ourselves, but - // we were already using them long before we decided to release Protocol - // Buffers. - - // Is this service deprecated? - // Depending on the target platform, this can emit Deprecated annotations - // for the service, or it will be completely ignored; in the very least, - // this is a formalization for deprecating services. - optional bool deprecated = 33 [default=false]; - - // The parser stores options it doesn't recognize here. See above. - repeated UninterpretedOption uninterpreted_option = 999; - - // Clients can define custom options in extensions of this message. See above. - extensions 1000 to max; -} - -message MethodOptions { - - // Note: Field numbers 1 through 32 are reserved for Google's internal RPC - // framework. We apologize for hoarding these numbers to ourselves, but - // we were already using them long before we decided to release Protocol - // Buffers. - - // Is this method deprecated? - // Depending on the target platform, this can emit Deprecated annotations - // for the method, or it will be completely ignored; in the very least, - // this is a formalization for deprecating methods. - optional bool deprecated = 33 [default=false]; - - // The parser stores options it doesn't recognize here. See above. - repeated UninterpretedOption uninterpreted_option = 999; - - // Clients can define custom options in extensions of this message. See above. - extensions 1000 to max; -} - - -// A message representing a option the parser does not recognize. This only -// appears in options protos created by the compiler::Parser class. -// DescriptorPool resolves these when building Descriptor objects. Therefore, -// options protos in descriptor objects (e.g. returned by Descriptor::options(), -// or produced by Descriptor::CopyTo()) will never have UninterpretedOptions -// in them. -message UninterpretedOption { - // The name of the uninterpreted option. Each string represents a segment in - // a dot-separated name. is_extension is true iff a segment represents an - // extension (denoted with parentheses in options specs in .proto files). - // E.g.,{ ["foo", false], ["bar.baz", true], ["qux", false] } represents - // "foo.(bar.baz).qux". - message NamePart { - required string name_part = 1; - required bool is_extension = 2; - } - repeated NamePart name = 2; - - // The value of the uninterpreted option, in whatever type the tokenizer - // identified it as during parsing. Exactly one of these should be set. - optional string identifier_value = 3; - optional uint64 positive_int_value = 4; - optional int64 negative_int_value = 5; - optional double double_value = 6; - optional bytes string_value = 7; - optional string aggregate_value = 8; -} - -// =================================================================== -// Optional source code info - -// Encapsulates information about the original source file from which a -// FileDescriptorProto was generated. -message SourceCodeInfo { - // A Location identifies a piece of source code in a .proto file which - // corresponds to a particular definition. This information is intended - // to be useful to IDEs, code indexers, documentation generators, and similar - // tools. - // - // For example, say we have a file like: - // message Foo { - // optional string foo = 1; - // } - // Let's look at just the field definition: - // optional string foo = 1; - // ^ ^^ ^^ ^ ^^^ - // a bc de f ghi - // We have the following locations: - // span path represents - // [a,i) [ 4, 0, 2, 0 ] The whole field definition. - // [a,b) [ 4, 0, 2, 0, 4 ] The label (optional). - // [c,d) [ 4, 0, 2, 0, 5 ] The type (string). - // [e,f) [ 4, 0, 2, 0, 1 ] The name (foo). - // [g,h) [ 4, 0, 2, 0, 3 ] The number (1). - // - // Notes: - // - A location may refer to a repeated field itself (i.e. not to any - // particular index within it). This is used whenever a set of elements are - // logically enclosed in a single code segment. For example, an entire - // extend block (possibly containing multiple extension definitions) will - // have an outer location whose path refers to the "extensions" repeated - // field without an index. - // - Multiple locations may have the same path. This happens when a single - // logical declaration is spread out across multiple places. The most - // obvious example is the "extend" block again -- there may be multiple - // extend blocks in the same scope, each of which will have the same path. - // - A location's span is not always a subset of its parent's span. For - // example, the "extendee" of an extension declaration appears at the - // beginning of the "extend" block and is shared by all extensions within - // the block. - // - Just because a location's span is a subset of some other location's span - // does not mean that it is a descendent. For example, a "group" defines - // both a type and a field in a single declaration. Thus, the locations - // corresponding to the type and field and their components will overlap. - // - Code which tries to interpret locations should probably be designed to - // ignore those that it doesn't understand, as more types of locations could - // be recorded in the future. - repeated Location location = 1; - message Location { - // Identifies which part of the FileDescriptorProto was defined at this - // location. - // - // Each element is a field number or an index. They form a path from - // the root FileDescriptorProto to the place where the definition. For - // example, this path: - // [ 4, 3, 2, 7, 1 ] - // refers to: - // file.message_type(3) // 4, 3 - // .field(7) // 2, 7 - // .name() // 1 - // This is because FileDescriptorProto.message_type has field number 4: - // repeated DescriptorProto message_type = 4; - // and DescriptorProto.field has field number 2: - // repeated FieldDescriptorProto field = 2; - // and FieldDescriptorProto.name has field number 1: - // optional string name = 1; - // - // Thus, the above path gives the location of a field name. If we removed - // the last element: - // [ 4, 3, 2, 7 ] - // this path refers to the whole field declaration (from the beginning - // of the label to the terminating semicolon). - repeated int32 path = 1 [packed=true]; - - // Always has exactly three or four elements: start line, start column, - // end line (optional, otherwise assumed same as start line), end column. - // These are packed into a single field for efficiency. Note that line - // and column numbers are zero-based -- typically you will want to add - // 1 to each before displaying to a user. - repeated int32 span = 2 [packed=true]; - - // If this SourceCodeInfo represents a complete declaration, these are any - // comments appearing before and after the declaration which appear to be - // attached to the declaration. - // - // A series of line comments appearing on consecutive lines, with no other - // tokens appearing on those lines, will be treated as a single comment. - // - // leading_detached_comments will keep paragraphs of comments that appear - // before (but not connected to) the current element. Each paragraph, - // separated by empty lines, will be one comment element in the repeated - // field. - // - // Only the comment content is provided; comment markers (e.g. //) are - // stripped out. For block comments, leading whitespace and an asterisk - // will be stripped from the beginning of each line other than the first. - // Newlines are included in the output. - // - // Examples: - // - // optional int32 foo = 1; // Comment attached to foo. - // // Comment attached to bar. - // optional int32 bar = 2; - // - // optional string baz = 3; - // // Comment attached to baz. - // // Another line attached to baz. - // - // // Comment attached to qux. - // // - // // Another line attached to qux. - // optional double qux = 4; - // - // // Detached comment for corge. This is not leading or trailing comments - // // to qux or corge because there are blank lines separating it from - // // both. - // - // // Detached comment for corge paragraph 2. - // - // optional string corge = 5; - // /* Block comment attached - // * to corge. Leading asterisks - // * will be removed. */ - // /* Block comment attached to - // * grault. */ - // optional int32 grault = 6; - // - // // ignored detached comments. - optional string leading_comments = 3; - optional string trailing_comments = 4; - repeated string leading_detached_comments = 6; - } -} \ No newline at end of file From cbb7c28f195ea256fce8b5e21e7ae1403901438c Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Mon, 22 Jun 2020 14:49:06 -0400 Subject: [PATCH 6/7] Add copyright headers Signed-off-by: Davanum Srinivas --- integration/remote/doc.go | 16 ++++++++++++++++ integration/remote/remote_image.go | 16 ++++++++++++++++ integration/remote/remote_runtime.go | 16 ++++++++++++++++ integration/remote/util/util_unix.go | 16 ++++++++++++++++ integration/remote/util/util_unsupported.go | 16 ++++++++++++++++ integration/remote/util/util_windows.go | 16 ++++++++++++++++ integration/remote/utils.go | 16 ++++++++++++++++ integration/util/boottime_util_darwin.go | 16 ++++++++++++++++ integration/util/boottime_util_linux.go | 16 ++++++++++++++++ integration/util/doc.go | 16 ++++++++++++++++ integration/util/util.go | 16 ++++++++++++++++ integration/util/util_unix.go | 16 ++++++++++++++++ integration/util/util_unsupported.go | 16 ++++++++++++++++ integration/util/util_windows.go | 16 ++++++++++++++++ pkg/server/bandwidth/doc.go | 16 ++++++++++++++++ pkg/server/bandwidth/fake_shaper.go | 16 ++++++++++++++++ pkg/server/bandwidth/interfaces.go | 16 ++++++++++++++++ pkg/server/bandwidth/linux.go | 16 ++++++++++++++++ pkg/server/bandwidth/unsupported.go | 16 ++++++++++++++++ pkg/server/bandwidth/utils.go | 16 ++++++++++++++++ pkg/streaming/errors.go | 16 ++++++++++++++++ pkg/streaming/portforward/constants.go | 16 ++++++++++++++++ pkg/streaming/portforward/httpstream.go | 16 ++++++++++++++++ pkg/streaming/portforward/portforward.go | 16 ++++++++++++++++ pkg/streaming/portforward/websocket.go | 16 ++++++++++++++++ pkg/streaming/remotecommand/attach.go | 16 ++++++++++++++++ pkg/streaming/remotecommand/doc.go | 16 ++++++++++++++++ pkg/streaming/remotecommand/exec.go | 16 ++++++++++++++++ pkg/streaming/remotecommand/httpstream.go | 16 ++++++++++++++++ pkg/streaming/remotecommand/websocket.go | 16 ++++++++++++++++ pkg/streaming/request_cache.go | 16 ++++++++++++++++ pkg/streaming/server.go | 16 ++++++++++++++++ 32 files changed, 512 insertions(+) diff --git a/integration/remote/doc.go b/integration/remote/doc.go index 9571cbc59..5b8260831 100644 --- a/integration/remote/doc.go +++ b/integration/remote/doc.go @@ -1,3 +1,19 @@ +/* + Copyright The containerd 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. +*/ + /* Copyright 2016 The Kubernetes Authors. diff --git a/integration/remote/remote_image.go b/integration/remote/remote_image.go index 7e68b0fbb..32d26342a 100644 --- a/integration/remote/remote_image.go +++ b/integration/remote/remote_image.go @@ -1,3 +1,19 @@ +/* + Copyright The containerd 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. +*/ + /* Copyright 2016 The Kubernetes Authors. diff --git a/integration/remote/remote_runtime.go b/integration/remote/remote_runtime.go index b8a2c28a4..9e1842c83 100644 --- a/integration/remote/remote_runtime.go +++ b/integration/remote/remote_runtime.go @@ -1,3 +1,19 @@ +/* + Copyright The containerd 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. +*/ + /* Copyright 2016 The Kubernetes Authors. diff --git a/integration/remote/util/util_unix.go b/integration/remote/util/util_unix.go index b8097ff57..cc3f85814 100644 --- a/integration/remote/util/util_unix.go +++ b/integration/remote/util/util_unix.go @@ -1,5 +1,21 @@ // +build freebsd linux darwin +/* + Copyright The containerd 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. +*/ + /* Copyright 2017 The Kubernetes Authors. diff --git a/integration/remote/util/util_unsupported.go b/integration/remote/util/util_unsupported.go index dbf86a5a4..81f412172 100644 --- a/integration/remote/util/util_unsupported.go +++ b/integration/remote/util/util_unsupported.go @@ -1,5 +1,21 @@ // +build !freebsd,!linux,!windows,!darwin +/* + Copyright The containerd 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. +*/ + /* Copyright 2017 The Kubernetes Authors. diff --git a/integration/remote/util/util_windows.go b/integration/remote/util/util_windows.go index bc62eaa36..979ebf2fc 100644 --- a/integration/remote/util/util_windows.go +++ b/integration/remote/util/util_windows.go @@ -1,5 +1,21 @@ // +build windows +/* + Copyright The containerd 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. +*/ + /* Copyright 2017 The Kubernetes Authors. diff --git a/integration/remote/utils.go b/integration/remote/utils.go index ca2c165d8..a1390c57b 100644 --- a/integration/remote/utils.go +++ b/integration/remote/utils.go @@ -1,3 +1,19 @@ +/* + Copyright The containerd 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. +*/ + /* Copyright 2016 The Kubernetes Authors. diff --git a/integration/util/boottime_util_darwin.go b/integration/util/boottime_util_darwin.go index 09d3b8865..74abe9fb9 100644 --- a/integration/util/boottime_util_darwin.go +++ b/integration/util/boottime_util_darwin.go @@ -1,5 +1,21 @@ // +build darwin +/* + Copyright The containerd 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. +*/ + /* Copyright 2018 The Kubernetes Authors. diff --git a/integration/util/boottime_util_linux.go b/integration/util/boottime_util_linux.go index f00e7c06b..2699ae5fe 100644 --- a/integration/util/boottime_util_linux.go +++ b/integration/util/boottime_util_linux.go @@ -1,5 +1,21 @@ // +build freebsd linux +/* + Copyright The containerd 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. +*/ + /* Copyright 2018 The Kubernetes Authors. diff --git a/integration/util/doc.go b/integration/util/doc.go index 0f119d2f5..307fa03c2 100644 --- a/integration/util/doc.go +++ b/integration/util/doc.go @@ -1,3 +1,19 @@ +/* + Copyright The containerd 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. +*/ + /* Copyright 2015 The Kubernetes Authors. diff --git a/integration/util/util.go b/integration/util/util.go index ba52058a1..334cb8b24 100644 --- a/integration/util/util.go +++ b/integration/util/util.go @@ -1,3 +1,19 @@ +/* + Copyright The containerd 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. +*/ + /* Copyright 2017 The Kubernetes Authors. diff --git a/integration/util/util_unix.go b/integration/util/util_unix.go index 0350e4387..713df4b63 100644 --- a/integration/util/util_unix.go +++ b/integration/util/util_unix.go @@ -1,5 +1,21 @@ // +build freebsd linux darwin +/* + Copyright The containerd 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. +*/ + /* Copyright 2017 The Kubernetes Authors. diff --git a/integration/util/util_unsupported.go b/integration/util/util_unsupported.go index dbf86a5a4..81f412172 100644 --- a/integration/util/util_unsupported.go +++ b/integration/util/util_unsupported.go @@ -1,5 +1,21 @@ // +build !freebsd,!linux,!windows,!darwin +/* + Copyright The containerd 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. +*/ + /* Copyright 2017 The Kubernetes Authors. diff --git a/integration/util/util_windows.go b/integration/util/util_windows.go index b0aec540e..850a50f81 100644 --- a/integration/util/util_windows.go +++ b/integration/util/util_windows.go @@ -1,5 +1,21 @@ // +build windows +/* + Copyright The containerd 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. +*/ + /* Copyright 2017 The Kubernetes Authors. diff --git a/pkg/server/bandwidth/doc.go b/pkg/server/bandwidth/doc.go index 289b17fe2..1fd55229d 100644 --- a/pkg/server/bandwidth/doc.go +++ b/pkg/server/bandwidth/doc.go @@ -1,3 +1,19 @@ +/* + Copyright The containerd 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. +*/ + /* Copyright 2015 The Kubernetes Authors. diff --git a/pkg/server/bandwidth/fake_shaper.go b/pkg/server/bandwidth/fake_shaper.go index 78577185d..e987ceca6 100644 --- a/pkg/server/bandwidth/fake_shaper.go +++ b/pkg/server/bandwidth/fake_shaper.go @@ -1,3 +1,19 @@ +/* + Copyright The containerd 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. +*/ + /* Copyright 2015 The Kubernetes Authors. diff --git a/pkg/server/bandwidth/interfaces.go b/pkg/server/bandwidth/interfaces.go index ec29d5d10..9eb4bfb60 100644 --- a/pkg/server/bandwidth/interfaces.go +++ b/pkg/server/bandwidth/interfaces.go @@ -1,3 +1,19 @@ +/* + Copyright The containerd 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. +*/ + /* Copyright 2015 The Kubernetes Authors. diff --git a/pkg/server/bandwidth/linux.go b/pkg/server/bandwidth/linux.go index c105fdea5..e8d710825 100644 --- a/pkg/server/bandwidth/linux.go +++ b/pkg/server/bandwidth/linux.go @@ -1,5 +1,21 @@ // +build linux +/* + Copyright The containerd 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. +*/ + /* Copyright 2015 The Kubernetes Authors. diff --git a/pkg/server/bandwidth/unsupported.go b/pkg/server/bandwidth/unsupported.go index 929f5e058..12c5ad83b 100644 --- a/pkg/server/bandwidth/unsupported.go +++ b/pkg/server/bandwidth/unsupported.go @@ -1,5 +1,21 @@ // +build !linux +/* + Copyright The containerd 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. +*/ + /* Copyright 2015 The Kubernetes Authors. diff --git a/pkg/server/bandwidth/utils.go b/pkg/server/bandwidth/utils.go index b29825bdf..f90718b6b 100644 --- a/pkg/server/bandwidth/utils.go +++ b/pkg/server/bandwidth/utils.go @@ -1,3 +1,19 @@ +/* + Copyright The containerd 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. +*/ + /* Copyright 2015 The Kubernetes Authors. diff --git a/pkg/streaming/errors.go b/pkg/streaming/errors.go index 5cbe9d505..874064054 100644 --- a/pkg/streaming/errors.go +++ b/pkg/streaming/errors.go @@ -1,3 +1,19 @@ +/* + Copyright The containerd 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. +*/ + /* Copyright 2016 The Kubernetes Authors. diff --git a/pkg/streaming/portforward/constants.go b/pkg/streaming/portforward/constants.go index 62b14f205..217a0b114 100644 --- a/pkg/streaming/portforward/constants.go +++ b/pkg/streaming/portforward/constants.go @@ -1,3 +1,19 @@ +/* + Copyright The containerd 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. +*/ + /* Copyright 2015 The Kubernetes Authors. diff --git a/pkg/streaming/portforward/httpstream.go b/pkg/streaming/portforward/httpstream.go index 419113054..4054d5619 100644 --- a/pkg/streaming/portforward/httpstream.go +++ b/pkg/streaming/portforward/httpstream.go @@ -1,3 +1,19 @@ +/* + Copyright The containerd 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. +*/ + /* Copyright 2016 The Kubernetes Authors. diff --git a/pkg/streaming/portforward/portforward.go b/pkg/streaming/portforward/portforward.go index 905fc8a78..89a39ea66 100644 --- a/pkg/streaming/portforward/portforward.go +++ b/pkg/streaming/portforward/portforward.go @@ -1,3 +1,19 @@ +/* + Copyright The containerd 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. +*/ + /* Copyright 2016 The Kubernetes Authors. diff --git a/pkg/streaming/portforward/websocket.go b/pkg/streaming/portforward/websocket.go index 8b5428cb6..1b1c0151a 100644 --- a/pkg/streaming/portforward/websocket.go +++ b/pkg/streaming/portforward/websocket.go @@ -1,3 +1,19 @@ +/* + Copyright The containerd 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. +*/ + /* Copyright 2016 The Kubernetes Authors. diff --git a/pkg/streaming/remotecommand/attach.go b/pkg/streaming/remotecommand/attach.go index e266f34fe..2b127bdf9 100644 --- a/pkg/streaming/remotecommand/attach.go +++ b/pkg/streaming/remotecommand/attach.go @@ -1,3 +1,19 @@ +/* + Copyright The containerd 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. +*/ + /* Copyright 2016 The Kubernetes Authors. diff --git a/pkg/streaming/remotecommand/doc.go b/pkg/streaming/remotecommand/doc.go index bf0d010b9..6034cdc8e 100644 --- a/pkg/streaming/remotecommand/doc.go +++ b/pkg/streaming/remotecommand/doc.go @@ -1,3 +1,19 @@ +/* + Copyright The containerd 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. +*/ + /* Copyright 2016 The Kubernetes Authors. diff --git a/pkg/streaming/remotecommand/exec.go b/pkg/streaming/remotecommand/exec.go index 8eaf82a6f..5111521ba 100644 --- a/pkg/streaming/remotecommand/exec.go +++ b/pkg/streaming/remotecommand/exec.go @@ -1,3 +1,19 @@ +/* + Copyright The containerd 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. +*/ + /* Copyright 2016 The Kubernetes Authors. diff --git a/pkg/streaming/remotecommand/httpstream.go b/pkg/streaming/remotecommand/httpstream.go index 9be6c4345..0417a1a9e 100644 --- a/pkg/streaming/remotecommand/httpstream.go +++ b/pkg/streaming/remotecommand/httpstream.go @@ -1,3 +1,19 @@ +/* + Copyright The containerd 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. +*/ + /* Copyright 2016 The Kubernetes Authors. diff --git a/pkg/streaming/remotecommand/websocket.go b/pkg/streaming/remotecommand/websocket.go index 4a6be372d..99c0af7c3 100644 --- a/pkg/streaming/remotecommand/websocket.go +++ b/pkg/streaming/remotecommand/websocket.go @@ -1,3 +1,19 @@ +/* + Copyright The containerd 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. +*/ + /* Copyright 2016 The Kubernetes Authors. diff --git a/pkg/streaming/request_cache.go b/pkg/streaming/request_cache.go index 32f9bf58f..36d6921f6 100644 --- a/pkg/streaming/request_cache.go +++ b/pkg/streaming/request_cache.go @@ -1,3 +1,19 @@ +/* + Copyright The containerd 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. +*/ + /* Copyright 2016 The Kubernetes Authors. diff --git a/pkg/streaming/server.go b/pkg/streaming/server.go index 8cdb0fda5..589c9a8ca 100644 --- a/pkg/streaming/server.go +++ b/pkg/streaming/server.go @@ -1,3 +1,19 @@ +/* + Copyright The containerd 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. +*/ + /* Copyright 2016 The Kubernetes Authors. From 3ee62de2bf318939c38a863dd6e61fe18f790225 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Mon, 22 Jun 2020 15:03:47 -0400 Subject: [PATCH 7/7] remove unused method Signed-off-by: Davanum Srinivas --- pkg/streaming/portforward/httpstream.go | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/pkg/streaming/portforward/httpstream.go b/pkg/streaming/portforward/httpstream.go index 4054d5619..f961cdb6f 100644 --- a/pkg/streaming/portforward/httpstream.go +++ b/pkg/streaming/portforward/httpstream.go @@ -164,16 +164,6 @@ func (h *httpStreamHandler) monitorStreamPair(p *httpStreamPair, timeout <-chan h.removeStreamPair(p.requestID) } -// hasStreamPair returns a bool indicating if a stream pair for requestID -// exists. -func (h *httpStreamHandler) hasStreamPair(requestID string) bool { - h.streamPairsLock.RLock() - defer h.streamPairsLock.RUnlock() - - _, ok := h.streamPairs[requestID] - return ok -} - // removeStreamPair removes the stream pair identified by requestID from streamPairs. func (h *httpStreamHandler) removeStreamPair(requestID string) { h.streamPairsLock.Lock()