rancher/norman
1
0
Fork 0
mirror of https://github.com/rancher/norman.git synced 2025-09-09 19:19:42 +00:00
Code Issues Releases Wiki Activity

Add support for k8s 1.12

Browse Source
This commit is contained in:
Darren Shepherd
2018-10-09 19:27:02 -07:00
parent c580ac3ab0
commit 611d7cb0f1
6 changed files with 139 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
objectclient/object_client.go
View File

@@ -16,7 +16,6 @@ import (
"k8s.io/apimachinery/pkg/runtime/serializer/streaming"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/watch"
"k8s.io/client-go/dynamic"
"k8s.io/client-go/rest"
restclientwatch "k8s.io/client-go/rest/watch"
)
@@ -138,7 +137,7 @@ func (p *ObjectClient) GetNamespaced(namespace, name string, opts metav1.GetOpti
}
err := req.
Resource(p.resource.Name).
VersionedParams(&opts, dynamic.VersionedParameterEncoderWithV1Fallback).
VersionedParams(&opts, metav1.ParameterCodec).
Name(name).
Do().
Into(result)
@@ -153,7 +152,7 @@ func (p *ObjectClient) Get(name string, opts metav1.GetOptions) (runtime.Object,
Prefix(p.getAPIPrefix(), p.gvk.Group, p.gvk.Version).
NamespaceIfScoped(p.ns, p.resource.Namespaced).
Resource(p.resource.Name).
VersionedParams(&opts, dynamic.VersionedParameterEncoderWithV1Fallback).
VersionedParams(&opts, metav1.ParameterCodec).
Name(name).
Do().
Into(result)
@@ -215,7 +214,7 @@ func (p *ObjectClient) List(opts metav1.ListOptions) (runtime.Object, error) {
Prefix(p.getAPIPrefix(), p.gvk.Group, p.gvk.Version).
NamespaceIfScoped(p.ns, p.resource.Namespaced).
Resource(p.resource.Name).
VersionedParams(&opts, dynamic.VersionedParameterEncoderWithV1Fallback).
VersionedParams(&opts, metav1.ParameterCodec).
Do().
Into(result)
}
@@ -231,7 +230,7 @@ func (p *ObjectClient) Watch(opts metav1.ListOptions) (watch.Interface, error) {
Prefix("watch").
NamespaceIfScoped(p.ns, p.resource.Namespaced).
Resource(p.resource.Name).
VersionedParams(&opts, dynamic.VersionedParameterEncoderWithV1Fallback).
VersionedParams(&opts, metav1.ParameterCodec).
Stream()
if err != nil {
return nil, err
@@ -279,7 +278,7 @@ func (p *ObjectClient) DeleteCollection(deleteOptions *metav1.DeleteOptions, lis
Prefix(p.getAPIPrefix(), p.gvk.Group, p.gvk.Version).
NamespaceIfScoped(p.ns, p.resource.Namespaced).
Resource(p.resource.Name).
VersionedParams(&listOptions, dynamic.VersionedParameterEncoderWithV1Fallback).
VersionedParams(&listOptions, metav1.ParameterCodec).
Body(deleteOptions).
Do().
Error()