Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move cri/streaming to k8s.io/kubelet staging repository #118253

Merged
merged 1 commit into from Jun 6, 2023
Merged

Move cri/streaming to k8s.io/kubelet staging repository #118253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 0 additions & 3 deletions hack/testdata/levee/levee-config.yaml
View file
Open in desktop
Expand Up @@ -92,9 +92,6 @@ Sources:
- PackageRE: "k8s.io/kubernetes/pkg/kubelet/client"
TypeRE: "KubeletClientConfig"
FieldRE: "BearerToken"
- PackageRE: "k8s.io/kubernetes/pkg/kubelet/cri/streaming"
TypeRE: "cacheEntry"
FieldRE: "token"

# The following fields are tagged in #96005
- PackageRE: "k8s.io/api/authentication/v1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/client/tests/portfoward_test.go
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@ import (
restclient "k8s.io/client-go/rest"
. "k8s.io/client-go/tools/portforward"
"k8s.io/client-go/transport/spdy"
"k8s.io/kubernetes/pkg/kubelet/cri/streaming/portforward"
"k8s.io/kubelet/pkg/cri/streaming/portforward"
)

// fakePortForwarder simulates port forwarding for testing. It implements
Expand Down
2 changes: 1 addition & 1 deletion pkg/client/tests/remotecommand_test.go
View file
Open in desktop
Expand Up @@ -40,9 +40,9 @@ import (
restclient "k8s.io/client-go/rest"
remoteclient "k8s.io/client-go/tools/remotecommand"
"k8s.io/client-go/transport/spdy"
"k8s.io/kubelet/pkg/cri/streaming/remotecommand"
"k8s.io/kubernetes/pkg/api/legacyscheme"
api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/kubelet/cri/streaming/remotecommand"
)

type fakeExecutor struct {
Expand Down
4 changes: 2 additions & 2 deletions pkg/kubelet/kubelet_pods.go
View file
Open in desktop
Expand Up @@ -40,6 +40,8 @@ import (
utilfeature "k8s.io/apiserver/pkg/util/feature"
runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
"k8s.io/klog/v2"
"k8s.io/kubelet/pkg/cri/streaming/portforward"
remotecommandserver "k8s.io/kubelet/pkg/cri/streaming/remotecommand"
podutil "k8s.io/kubernetes/pkg/api/v1/pod"
"k8s.io/kubernetes/pkg/api/v1/resource"
podshelper "k8s.io/kubernetes/pkg/apis/core/pods"
Expand All @@ -49,8 +51,6 @@ import (
"k8s.io/kubernetes/pkg/fieldpath"
"k8s.io/kubernetes/pkg/kubelet/cm"
kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
"k8s.io/kubernetes/pkg/kubelet/cri/streaming/portforward"
remotecommandserver "k8s.io/kubernetes/pkg/kubelet/cri/streaming/remotecommand"
"k8s.io/kubernetes/pkg/kubelet/envvars"
"k8s.io/kubernetes/pkg/kubelet/images"
"k8s.io/kubernetes/pkg/kubelet/metrics"
Expand Down
4 changes: 2 additions & 2 deletions pkg/kubelet/kubelet_pods_test.go
View file
Open in desktop
Expand Up @@ -46,12 +46,12 @@ import (
featuregatetesting "k8s.io/component-base/featuregate/testing"
"k8s.io/component-base/metrics/testutil"
runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
"k8s.io/kubelet/pkg/cri/streaming/portforward"
"k8s.io/kubelet/pkg/cri/streaming/remotecommand"
_ "k8s.io/kubernetes/pkg/apis/core/install"
"k8s.io/kubernetes/pkg/features"
kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
containertest "k8s.io/kubernetes/pkg/kubelet/container/testing"
"k8s.io/kubernetes/pkg/kubelet/cri/streaming/portforward"
"k8s.io/kubernetes/pkg/kubelet/cri/streaming/remotecommand"
"k8s.io/kubernetes/pkg/kubelet/metrics"
"k8s.io/kubernetes/pkg/kubelet/prober/results"
"k8s.io/kubernetes/pkg/kubelet/status"
Expand Down
6 changes: 3 additions & 3 deletions pkg/kubelet/server/server.go
View file
Open in desktop
Expand Up @@ -69,6 +69,9 @@ import (
runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
podresourcesapi "k8s.io/kubelet/pkg/apis/podresources/v1"
podresourcesapiv1alpha1 "k8s.io/kubelet/pkg/apis/podresources/v1alpha1"
"k8s.io/kubelet/pkg/cri/streaming"
"k8s.io/kubelet/pkg/cri/streaming/portforward"
remotecommandserver "k8s.io/kubelet/pkg/cri/streaming/remotecommand"
"k8s.io/kubernetes/pkg/api/legacyscheme"
api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/apis/core/v1/validation"
Expand All @@ -77,9 +80,6 @@ import (
"k8s.io/kubernetes/pkg/kubelet/apis/podresources"
podresourcesgrpc "k8s.io/kubernetes/pkg/kubelet/apis/podresources/grpc"
kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
"k8s.io/kubernetes/pkg/kubelet/cri/streaming"
"k8s.io/kubernetes/pkg/kubelet/cri/streaming/portforward"
remotecommandserver "k8s.io/kubernetes/pkg/kubelet/cri/streaming/remotecommand"
"k8s.io/kubernetes/pkg/kubelet/prober"
servermetrics "k8s.io/kubernetes/pkg/kubelet/server/metrics"
"k8s.io/kubernetes/pkg/kubelet/server/stats"
Expand Down
6 changes: 3 additions & 3 deletions pkg/kubelet/server/server_test.go
View file
Open in desktop
Expand Up @@ -55,13 +55,13 @@ import (
// Do some initialization to decode the query parameters correctly.
utilfeature "k8s.io/apiserver/pkg/util/feature"
featuregatetesting "k8s.io/component-base/featuregate/testing"
"k8s.io/kubelet/pkg/cri/streaming"
"k8s.io/kubelet/pkg/cri/streaming/portforward"
remotecommandserver "k8s.io/kubelet/pkg/cri/streaming/remotecommand"
_ "k8s.io/kubernetes/pkg/apis/core/install"
"k8s.io/kubernetes/pkg/features"
kubeletconfiginternal "k8s.io/kubernetes/pkg/kubelet/apis/config"
"k8s.io/kubernetes/pkg/kubelet/cm"
"k8s.io/kubernetes/pkg/kubelet/cri/streaming"
"k8s.io/kubernetes/pkg/kubelet/cri/streaming/portforward"
remotecommandserver "k8s.io/kubernetes/pkg/kubelet/cri/streaming/remotecommand"
"k8s.io/kubernetes/pkg/kubelet/server/stats"
"k8s.io/kubernetes/pkg/volume"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/kubelet/server/server_websocket_test.go
View file
Open in desktop
Expand Up @@ -29,7 +29,7 @@ import (
"golang.org/x/net/websocket"

"k8s.io/apimachinery/pkg/types"
"k8s.io/kubernetes/pkg/kubelet/cri/streaming/portforward"
"k8s.io/kubelet/pkg/cri/streaming/portforward"
)

const (
Expand Down
5 changes: 4 additions & 1 deletion staging/publishing/import-restrictions.yaml
View file
Open in desktop
Expand Up @@ -216,9 +216,13 @@
allowedImports:
- k8s.io/api
- k8s.io/apimachinery
- k8s.io/apiserver
- k8s.io/client-go
- k8s.io/cri-api
- k8s.io/klog
- k8s.io/component-base
- k8s.io/kubelet
- k8s.io/utils

- baseImportPath: "./vendor/k8s.io/cluster-bootstrap/"
allowedImports:
Expand Down Expand Up @@ -302,4 +306,3 @@
- k8s.io/klog
- k8s.io/kms
- k8s.io/utils

64 changes: 37 additions & 27 deletions staging/publishing/rules.yaml
View file
Open in desktop
Expand Up @@ -1098,18 +1098,51 @@ rules:
branch: release-1.27
dir: staging/src/k8s.io/kube-proxy
library: true
- destination: cri-api
branches:
- name: master
source:
branch: master
dir: staging/src/k8s.io/cri-api
- name: release-1.24
go: 1.19.9
source:
branch: release-1.24
dir: staging/src/k8s.io/cri-api
- name: release-1.25
go: 1.19.9
source:
branch: release-1.25
dir: staging/src/k8s.io/cri-api
- name: release-1.26
go: 1.19.9
source:
branch: release-1.26
dir: staging/src/k8s.io/cri-api
- name: release-1.27
go: 1.20.4
source:
branch: release-1.27
dir: staging/src/k8s.io/cri-api
library: true
- destination: kubelet
branches:
- name: master
dependencies:
- repository: apimachinery
branch: master
- repository: apiserver
branch: master
- repository: api
branch: master
- repository: client-go
branch: master
- repository: cri-api
branch: master
- repository: component-base
branch: master
- repository: kms
branch: master
source:
branch: master
dir: staging/src/k8s.io/kubelet
Expand Down Expand Up @@ -1817,33 +1850,6 @@ rules:
branch: release-1.27
dir: staging/src/k8s.io/legacy-cloud-providers
library: true
- destination: cri-api
branches:
- name: master
source:
branch: master
dir: staging/src/k8s.io/cri-api
- name: release-1.24
go: 1.19.9
source:
branch: release-1.24
dir: staging/src/k8s.io/cri-api
- name: release-1.25
go: 1.19.9
source:
branch: release-1.25
dir: staging/src/k8s.io/cri-api
- name: release-1.26
go: 1.19.9
source:
branch: release-1.26
dir: staging/src/k8s.io/cri-api
- name: release-1.27
go: 1.20.4
source:
branch: release-1.27
dir: staging/src/k8s.io/cri-api
library: true
- destination: kubectl
branches:
- name: master
Expand Down Expand Up @@ -2050,10 +2056,14 @@ rules:
dependencies:
- repository: apimachinery
branch: master
- repository: apiserver
branch: master
- repository: api
branch: master
- repository: client-go
branch: master
- repository: cri-api
branch: master
- repository: component-base
branch: master
- repository: kubelet
Expand Down
2 changes: 2 additions & 0 deletions staging/src/k8s.io/dynamic-resource-allocation/go.mod
View file
Open in desktop
Expand Up @@ -59,8 +59,10 @@ require (
replace (
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/apiserver => ../apiserver
k8s.io/client-go => ../client-go
k8s.io/component-base => ../component-base
k8s.io/cri-api => ../cri-api
k8s.io/dynamic-resource-allocation => ../dynamic-resource-allocation
k8s.io/kubelet => ../kubelet
)
20 changes: 18 additions & 2 deletions staging/src/k8s.io/kubelet/go.mod
View file
Open in desktop
Expand Up @@ -5,41 +5,54 @@ module k8s.io/kubelet
go 1.20

require (
github.com/emicklei/go-restful/v3 v3.9.0
github.com/gogo/protobuf v1.3.2
github.com/stretchr/testify v1.8.2
google.golang.org/grpc v1.54.0
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/apiserver v0.0.0
k8s.io/client-go v0.0.0
k8s.io/component-base v0.0.0
k8s.io/cri-api v0.0.0
k8s.io/klog/v2 v2.100.1
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
)

require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
github.com/moby/spdystream v0.2.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.14.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.37.0 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
github.com/spf13/cobra v1.7.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
golang.org/x/net v0.9.0 // indirect
golang.org/x/oauth2 v0.6.0 // indirect
golang.org/x/sys v0.8.0 // indirect
golang.org/x/term v0.7.0 // indirect
golang.org/x/text v0.9.0 // indirect
golang.org/x/time v0.3.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect
google.golang.org/protobuf v1.30.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/klog/v2 v2.100.1 // indirect
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
Expand All @@ -48,7 +61,10 @@ require (
replace (
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/apiserver => ../apiserver
k8s.io/client-go => ../client-go
k8s.io/component-base => ../component-base
k8s.io/cri-api => ../cri-api
k8s.io/kms => ../kms
k8s.io/kubelet => ../kubelet
)