github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 10:51:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #84477 from yutedz/csi-node-v1

Browse Source 
Switch storage version to use v1.CSINode in 1.18
This commit is contained in:
Kubernetes Prow Robot 2019-11-26 12:17:21 -08:00 committed by GitHub
commit 8b05cec276
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubeapiserver/default_storage_factory_builder.go
View File

@ -55,8 +55,6 @@ func NewStorageFactoryConfig() *StorageFactoryConfig {
resources := []schema.GroupVersionResource{ resources := []schema.GroupVersionResource{
batch.Resource("cronjobs").WithVersion("v1beta1"), batch.Resource("cronjobs").WithVersion("v1beta1"),
networking.Resource("ingresses").WithVersion("v1beta1"), networking.Resource("ingresses").WithVersion("v1beta1"),
// TODO #83513 csinodes override can be removed in 1.18
apisstorage.Resource("csinodes").WithVersion("v1beta1"),
apisstorage.Resource("csidrivers").WithVersion("v1beta1"), apisstorage.Resource("csidrivers").WithVersion("v1beta1"),
} }

2
test/integration/etcd/data.go
View File

@ -550,13 +550,13 @@ func GetEtcdStorageDataForNamespace(namespace string) map[schema.GroupVersionRes
etcdStorageData[gvr("storage.k8s.io", "v1beta1", "csinodes")] = StorageData{ etcdStorageData[gvr("storage.k8s.io", "v1beta1", "csinodes")] = StorageData{
Stub: `{"metadata": {"name": "csini1"}, "spec": {"drivers": [{"name": "test-driver", "nodeID": "localhost", "topologyKeys": ["company.com/zone1", "company.com/zone2"]}]}}`, Stub: `{"metadata": {"name": "csini1"}, "spec": {"drivers": [{"name": "test-driver", "nodeID": "localhost", "topologyKeys": ["company.com/zone1", "company.com/zone2"]}]}}`,
ExpectedEtcdPath: "/registry/csinodes/csini1", ExpectedEtcdPath: "/registry/csinodes/csini1",
ExpectedGVK: gvkP("storage.k8s.io", "v1", "CSINode"),
} }
// k8s.io/kubernetes/pkg/apis/storage/v1 // k8s.io/kubernetes/pkg/apis/storage/v1
etcdStorageData[gvr("storage.k8s.io", "v1", "csinodes")] = StorageData{ etcdStorageData[gvr("storage.k8s.io", "v1", "csinodes")] = StorageData{
Stub: `{"metadata": {"name": "csini2"}, "spec": {"drivers": [{"name": "test-driver", "nodeID": "localhost", "topologyKeys": ["company.com/zone1", "company.com/zone2"]}]}}`, Stub: `{"metadata": {"name": "csini2"}, "spec": {"drivers": [{"name": "test-driver", "nodeID": "localhost", "topologyKeys": ["company.com/zone1", "company.com/zone2"]}]}}`,
ExpectedEtcdPath: "/registry/csinodes/csini2", ExpectedEtcdPath: "/registry/csinodes/csini2",
ExpectedGVK: gvkP("storage.k8s.io", "v1beta1", "CSINode"),
} }
} }