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.

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

Add backward compatibility for missing kind #214

Merged
merged 1 commit into from
Dec 5, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,9 @@ You can also load your JSONified config in from an ENV variable (e.g. `KUBE_CONF
```
Kubeclient::Config.new(JSON.parse(ENV['KUBE_CONFIG']), nil)
```
###Supported kubernetes versions

For 1.1 only the core api v1 is supported, all api groups are supported in later versions.

## Examples:

Expand Down
1 change: 1 addition & 0 deletions lib/kubeclient.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
require 'kubeclient/watch_stream'
require 'kubeclient/common'
require 'kubeclient/config'
require 'kubeclient/missing_kind_compatibility'

module Kubeclient
# Kubernetes Client
Expand Down
4 changes: 3 additions & 1 deletion lib/kubeclient/common.rb
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,9 @@ def api
def load_entities
@entities = {}
fetch_entities['resources'].each do |resource|
next if resource['name'].include?('/') || resource['kind'].nil?
next if resource['name'].include?('/')
resource['kind'] = Kubeclient::Common::MissingKindCompatibility
.resource_kind(resource['name']) if resource['kind'].nil?
entity = ClientMixin.parse_definition(resource['kind'], resource['name'])
@entities[entity.method_names[0]] = entity if entity
end
Expand Down
68 changes: 68 additions & 0 deletions lib/kubeclient/missing_kind_compatibility.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
module Kubeclient
module Common
# Backward compatibility for old versions where kind is missing (e.g. OpenShift Enterprise 3.1)
class MissingKindCompatibility
MAPPING = {
'bindings' => 'Binding',
'componentstatuses' => 'ComponentStatus',
'endpoints' => 'Endpoints',
'events' => 'Event',
'limitranges' => 'LimitRange',
'namespaces' => 'Namespace',
'nodes' => 'Node',
'persistentvolumeclaims' => 'PersistentVolumeClaim',
'persistentvolumes' => 'PersistentVolume',
'pods' => 'Pod',
'podtemplates' => 'PodTemplate',
'replicationcontrollers' => 'ReplicationController',
'resourcequotas' => 'ResourceQuota',
'secrets' => 'Secret',
'securitycontextconstraints' => 'SecurityContextConstraints',
'serviceaccounts' => 'ServiceAccount',
'services' => 'Service',
'buildconfigs' => 'BuildConfig',
'builds' => 'Build',
'clusternetworks' => 'ClusterNetwork',
'clusterpolicies' => 'ClusterPolicy',
'clusterpolicybindings' => 'ClusterPolicyBinding',
'clusterrolebindings' => 'ClusterRoleBinding',
'clusterroles' => 'ClusterRole',
'deploymentconfigrollbacks' => 'DeploymentConfigRollback',
'deploymentconfigs' => 'DeploymentConfig',
'generatedeploymentconfigs' => 'DeploymentConfig',
'groups' => 'Group',
'hostsubnets' => 'HostSubnet',
'identities' => 'Identity',
'images' => 'Image',
'imagestreamimages' => 'ImageStreamImage',
'imagestreammappings' => 'ImageStreamMapping',
'imagestreams' => 'ImageStream',
'imagestreamtags' => 'ImageStreamTag',
'localresourceaccessreviews' => 'LocalResourceAccessReview',
'localsubjectaccessreviews' => 'LocalSubjectAccessReview',
'netnamespaces' => 'NetNamespace',
'oauthaccesstokens' => 'OAuthAccessToken',
'oauthauthorizetokens' => 'OAuthAuthorizeToken',
'oauthclientauthorizations' => 'OAuthClientAuthorization',
'oauthclients' => 'OAuthClient',
'policies' => 'Policy',
'policybindings' => 'PolicyBinding',
'processedtemplates' => 'Template',
'projectrequests' => 'ProjectRequest',
'projects' => 'Project',
'resourceaccessreviews' => 'ResourceAccessReview',
'rolebindings' => 'RoleBinding',
'roles' => 'Role',
'routes' => 'Route',
'subjectaccessreviews' => 'SubjectAccessReview',
'templates' => 'Template',
'useridentitymappings' => 'UserIdentityMapping',
'users' => 'User'
}

def self.resource_kind(name)
MAPPING[name]
end
end
end
end
129 changes: 129 additions & 0 deletions test/json/core_api_resource_list_without_kind.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
{
"groupVersion": "v1",
"resources": [
{
"name": "bindings",
"namespaced": true
},
{
"name": "componentstatuses",
"namespaced": true
},
{
"name": "endpoints",
"namespaced": true
},
{
"name": "events",
"namespaced": true
},
{
"name": "limitranges",
"namespaced": true
},
{
"name": "namespaces",
"namespaced": false
},
{
"name": "namespaces/finalize",
"namespaced": false
},
{
"name": "namespaces/status",
"namespaced": false
},
{
"name": "nodes",
"namespaced": false
},
{
"name": "nodes/status",
"namespaced": false
},
{
"name": "persistentvolumeclaims",
"namespaced": true
},
{
"name": "persistentvolumeclaims/status",
"namespaced": true
},
{
"name": "persistentvolumes",
"namespaced": false
},
{
"name": "persistentvolumes/status",
"namespaced": false
},
{
"name": "pods",
"namespaced": true
},
{
"name": "pods/attach",
"namespaced": true
},
{
"name": "pods/binding",
"namespaced": true
},
{
"name": "pods/exec",
"namespaced": true
},
{
"name": "pods/log",
"namespaced": true
},
{
"name": "pods/portforward",
"namespaced": true
},
{
"name": "pods/proxy",
"namespaced": true
},
{
"name": "pods/status",
"namespaced": true
},
{
"name": "podtemplates",
"namespaced": true
},
{
"name": "replicationcontrollers",
"namespaced": true
},
{
"name": "replicationcontrollers/status",
"namespaced": true
},
{
"name": "resourcequotas",
"namespaced": true
},
{
"name": "resourcequotas/status",
"namespaced": true
},
{
"name": "secrets",
"namespaced": true
},
{
"name": "securitycontextconstraints",
"namespaced": false
},
{
"name": "serviceaccounts",
"namespaced": true
},
{
"name": "services",
"namespaced": true
}
]
}
Loading