Skip to content

O
origin-web-common
Commit fc334547 by Sam Padgett Committed by GitHub
Options

Merge pull request #206 from… 

Merge pull request #206 from benjaminapetersen/bpetersen/trello/api-groups/add-version-to-preferred-version

Add version to constant API_PREFERRED_VERSIONS
parents e951addf 5804ed59
Showing with 166 additions and 111 deletions
dist/origin-web-common-services.js
...@@ -3663,37 +3663,38 @@ angular.module('openshiftCommonServices') ...@@ -3663,37 +3663,38 @@ angular.module('openshiftCommonServices')
angular.module('openshiftCommonServices') angular.module('openshiftCommonServices')
.constant('API_PREFERRED_VERSIONS', { .constant('API_PREFERRED_VERSIONS', {
appliedclusterresourcequotas: {group: 'quota.openshift.io', resource: 'appliedclusterresourcequotas' }, appliedclusterresourcequotas: {group: 'quota.openshift.io', version: 'v1', resource: 'appliedclusterresourcequotas' },
builds: {group: 'build.openshift.io', resource: 'builds' }, builds: {group: 'build.openshift.io', version: 'v1', resource: 'builds' },
'builds/clone': {group: 'build.openshift.io', resource: 'builds/clone' }, 'builds/clone': {group: 'build.openshift.io', version: 'v1', resource: 'builds/clone' },
'buildconfigs/instantiate': {group: 'build.openshift.io', resource: 'buildconfigs/instantiate' }, 'buildconfigs/instantiate': {group: 'build.openshift.io', version: 'v1', resource: 'buildconfigs/instantiate' },
buildconfigs: {group: 'build.openshift.io', resource: 'buildconfigs' }, buildconfigs: {group: 'build.openshift.io', version: 'v1', resource: 'buildconfigs' },
configmaps: 'configmaps', configmaps: {version: 'v1', resource: 'configmaps' },
deployments: {group: 'apps', resource: 'deployments' }, deployments: {group: 'apps', version: 'v1beta1', resource: 'deployments' },
deploymentconfigs: {group: 'apps.openshift.io', resource: 'deploymentconfigs' }, deploymentconfigs: {group: 'apps.openshift.io', version: 'v1', resource: 'deploymentconfigs' },
'deploymentconfigs/instantiate': {group: 'apps.openshift.io', resource: 'deploymentconfigs/instantiate' }, 'deploymentconfigs/instantiate': {group: 'apps.openshift.io', version: 'v1', resource: 'deploymentconfigs/instantiate' },
'deploymentconfigs/rollback': {group: 'apps.openshift.io', resource: 'deploymentconfigs/rollback' }, 'deploymentconfigs/rollback': {group: 'apps.openshift.io', version: 'v1', resource: 'deploymentconfigs/rollback' },
events: 'events', events: {version: 'v1', resource: 'events' },
horizontalpodautoscalers: {group: 'autoscaling', resource: 'horizontalpodautoscalers' }, horizontalpodautoscalers: {group: 'autoscaling', version: 'v1', resource: 'horizontalpodautoscalers' },
imagestreams: {group: 'image.openshift.io', resource: 'imagestreams' }, imagestreams: {group: 'image.openshift.io', version: 'v1', resource: 'imagestreams' },
imagestreamtags: {group: 'image.openshift.io', resource: 'imagestreamtags' }, imagestreamtags: {group: 'image.openshift.io', version: 'v1', resource: 'imagestreamtags' },
limitranges: 'limitranges', limitranges: {version: 'v1', resource: 'limitranges' },
pods: 'pods', pods: {version: 'v1', resource: 'pods' },
projects: {group: 'project.openshift.io', resource: 'projects'}, projects: {group: 'project.openshift.io', version: 'v1', resource: 'projects' },
projectrequests: {group: 'project.openshift.io', resource: 'projectrequests'}, projectrequests: {group: 'project.openshift.io', version: 'v1', resource: 'projectrequests' },
persistentvolumeclaims: 'persistentvolumeclaims', persistentvolumeclaims: {version: 'v1', resource: 'persistentvolumeclaims' },
replicasets: {group: 'extensions', resource: 'replicasets' }, replicasets: {group: 'extensions', version: 'v1beta1', resource: 'replicasets' },
replicationcontrollers: 'replicationcontrollers', replicationcontrollers: {version: 'v1', resource: 'replicationcontrollers' },
resourcequotas: 'resourcequotas', resourcequotas: {version: 'v1', resource: 'resourcequotas' },
rolebindings: 'rolebindings', rolebindings: {version: 'v1', resource: 'rolebindings' },
routes: {group: 'route.openshift.io', resource: 'routes' }, routes: {group: 'route.openshift.io', version: 'v1', resource: 'routes' },
secrets: 'secrets', secrets: {version: 'v1', resource: 'secrets' },
selfsubjectrulesreviews: {group: 'authorization.k8s.io', resource: 'selfsubjectrulesreviews'}, selfsubjectrulesreviews: {group: 'authorization.openshift.io', version: 'v1', resource: 'selfsubjectrulesreviews' },
services: 'services', services: {version: 'v1', resource: 'services' },
serviceaccounts: 'serviceaccounts', serviceaccounts: {version: 'v1', resource: 'serviceaccounts' },
serviceclasses: {group: 'servicecatalog.k8s.io', resource: 'serviceclasses' }, // TODO: add version once these reach beta
serviceinstancecredentials: {group: 'servicecatalog.k8s.io', resource: 'serviceinstancecredentials' }, serviceclasses: {group: 'servicecatalog.k8s.io', resource: 'serviceclasses' },
serviceinstances: {group: 'servicecatalog.k8s.io', resource: 'serviceinstances' }, serviceinstancecredentials: {group: 'servicecatalog.k8s.io', resource: 'serviceinstancecredentials' },
statefulsets: {group: 'apps', resource: 'statefulsets' }, serviceinstances: {group: 'servicecatalog.k8s.io', resource: 'serviceinstances' },
templates: {group: 'template.openshift.io', resource: 'templates'} statefulsets: {group: 'apps', version: 'v1beta1', resource: 'statefulsets' },
templates: {group: 'template.openshift.io', verison: 'v1', resource: 'templates' }
}); });
dist/origin-web-common.js
...@@ -1425,39 +1425,40 @@ angular.module('openshiftCommonUI') ...@@ -1425,39 +1425,40 @@ angular.module('openshiftCommonUI')
angular.module('openshiftCommonServices') angular.module('openshiftCommonServices')
.constant('API_PREFERRED_VERSIONS', { .constant('API_PREFERRED_VERSIONS', {
appliedclusterresourcequotas: {group: 'quota.openshift.io', resource: 'appliedclusterresourcequotas' }, appliedclusterresourcequotas: {group: 'quota.openshift.io', version: 'v1', resource: 'appliedclusterresourcequotas' },
builds: {group: 'build.openshift.io', resource: 'builds' }, builds: {group: 'build.openshift.io', version: 'v1', resource: 'builds' },
'builds/clone': {group: 'build.openshift.io', resource: 'builds/clone' }, 'builds/clone': {group: 'build.openshift.io', version: 'v1', resource: 'builds/clone' },
'buildconfigs/instantiate': {group: 'build.openshift.io', resource: 'buildconfigs/instantiate' }, 'buildconfigs/instantiate': {group: 'build.openshift.io', version: 'v1', resource: 'buildconfigs/instantiate' },
buildconfigs: {group: 'build.openshift.io', resource: 'buildconfigs' }, buildconfigs: {group: 'build.openshift.io', version: 'v1', resource: 'buildconfigs' },
configmaps: 'configmaps', configmaps: {version: 'v1', resource: 'configmaps' },
deployments: {group: 'apps', resource: 'deployments' }, deployments: {group: 'apps', version: 'v1beta1', resource: 'deployments' },
deploymentconfigs: {group: 'apps.openshift.io', resource: 'deploymentconfigs' }, deploymentconfigs: {group: 'apps.openshift.io', version: 'v1', resource: 'deploymentconfigs' },
'deploymentconfigs/instantiate': {group: 'apps.openshift.io', resource: 'deploymentconfigs/instantiate' }, 'deploymentconfigs/instantiate': {group: 'apps.openshift.io', version: 'v1', resource: 'deploymentconfigs/instantiate' },
'deploymentconfigs/rollback': {group: 'apps.openshift.io', resource: 'deploymentconfigs/rollback' }, 'deploymentconfigs/rollback': {group: 'apps.openshift.io', version: 'v1', resource: 'deploymentconfigs/rollback' },
events: 'events', events: {version: 'v1', resource: 'events' },
horizontalpodautoscalers: {group: 'autoscaling', resource: 'horizontalpodautoscalers' }, horizontalpodautoscalers: {group: 'autoscaling', version: 'v1', resource: 'horizontalpodautoscalers' },
imagestreams: {group: 'image.openshift.io', resource: 'imagestreams' }, imagestreams: {group: 'image.openshift.io', version: 'v1', resource: 'imagestreams' },
imagestreamtags: {group: 'image.openshift.io', resource: 'imagestreamtags' }, imagestreamtags: {group: 'image.openshift.io', version: 'v1', resource: 'imagestreamtags' },
limitranges: 'limitranges', limitranges: {version: 'v1', resource: 'limitranges' },
pods: 'pods', pods: {version: 'v1', resource: 'pods' },
projects: {group: 'project.openshift.io', resource: 'projects'}, projects: {group: 'project.openshift.io', version: 'v1', resource: 'projects' },
projectrequests: {group: 'project.openshift.io', resource: 'projectrequests'}, projectrequests: {group: 'project.openshift.io', version: 'v1', resource: 'projectrequests' },
persistentvolumeclaims: 'persistentvolumeclaims', persistentvolumeclaims: {version: 'v1', resource: 'persistentvolumeclaims' },
replicasets: {group: 'extensions', resource: 'replicasets' }, replicasets: {group: 'extensions', version: 'v1beta1', resource: 'replicasets' },
replicationcontrollers: 'replicationcontrollers', replicationcontrollers: {version: 'v1', resource: 'replicationcontrollers' },
resourcequotas: 'resourcequotas', resourcequotas: {version: 'v1', resource: 'resourcequotas' },
rolebindings: 'rolebindings', rolebindings: {version: 'v1', resource: 'rolebindings' },
routes: {group: 'route.openshift.io', resource: 'routes' }, routes: {group: 'route.openshift.io', version: 'v1', resource: 'routes' },
secrets: 'secrets', secrets: {version: 'v1', resource: 'secrets' },
selfsubjectrulesreviews: {group: 'authorization.k8s.io', resource: 'selfsubjectrulesreviews'}, selfsubjectrulesreviews: {group: 'authorization.openshift.io', version: 'v1', resource: 'selfsubjectrulesreviews' },
services: 'services', services: {version: 'v1', resource: 'services' },
serviceaccounts: 'serviceaccounts', serviceaccounts: {version: 'v1', resource: 'serviceaccounts' },
serviceclasses: {group: 'servicecatalog.k8s.io', resource: 'serviceclasses' }, // TODO: add version once these reach beta
serviceinstancecredentials: {group: 'servicecatalog.k8s.io', resource: 'serviceinstancecredentials' }, serviceclasses: {group: 'servicecatalog.k8s.io', resource: 'serviceclasses' },
serviceinstances: {group: 'servicecatalog.k8s.io', resource: 'serviceinstances' }, serviceinstancecredentials: {group: 'servicecatalog.k8s.io', resource: 'serviceinstancecredentials' },
statefulsets: {group: 'apps', resource: 'statefulsets' }, serviceinstances: {group: 'servicecatalog.k8s.io', resource: 'serviceinstances' },
templates: {group: 'template.openshift.io', resource: 'templates'} statefulsets: {group: 'apps', version: 'v1beta1', resource: 'statefulsets' },
templates: {group: 'template.openshift.io', verison: 'v1', resource: 'templates' }
}); });
;'use strict'; ;'use strict';
......
dist/origin-web-common.min.js
...@@ -488,83 +488,133 @@ content ? (scope.truncatedContent = truncateFilter(content, scope.limit, scope.u ...@@ -488,83 +488,133 @@ content ? (scope.truncatedContent = truncateFilter(content, scope.limit, scope.u
} ]), angular.module("openshiftCommonServices").constant("API_PREFERRED_VERSIONS", { } ]), angular.module("openshiftCommonServices").constant("API_PREFERRED_VERSIONS", {
appliedclusterresourcequotas:{ appliedclusterresourcequotas:{
group:"quota.openshift.io", group:"quota.openshift.io",
version:"v1",
resource:"appliedclusterresourcequotas" resource:"appliedclusterresourcequotas"
}, },
builds:{ builds:{
group:"build.openshift.io", group:"build.openshift.io",
version:"v1",
resource:"builds" resource:"builds"
}, },
"builds/clone":{ "builds/clone":{
group:"build.openshift.io", group:"build.openshift.io",
version:"v1",
resource:"builds/clone" resource:"builds/clone"
}, },
"buildconfigs/instantiate":{ "buildconfigs/instantiate":{
group:"build.openshift.io", group:"build.openshift.io",
version:"v1",
resource:"buildconfigs/instantiate" resource:"buildconfigs/instantiate"
}, },
buildconfigs:{ buildconfigs:{
group:"build.openshift.io", group:"build.openshift.io",
version:"v1",
resource:"buildconfigs" resource:"buildconfigs"
}, },
configmaps:"configmaps", configmaps:{
version:"v1",
resource:"configmaps"
},
deployments:{ deployments:{
group:"apps", group:"apps",
version:"v1beta1",
resource:"deployments" resource:"deployments"
}, },
deploymentconfigs:{ deploymentconfigs:{
group:"apps.openshift.io", group:"apps.openshift.io",
version:"v1",
resource:"deploymentconfigs" resource:"deploymentconfigs"
}, },
"deploymentconfigs/instantiate":{ "deploymentconfigs/instantiate":{
group:"apps.openshift.io", group:"apps.openshift.io",
version:"v1",
resource:"deploymentconfigs/instantiate" resource:"deploymentconfigs/instantiate"
}, },
"deploymentconfigs/rollback":{ "deploymentconfigs/rollback":{
group:"apps.openshift.io", group:"apps.openshift.io",
version:"v1",
resource:"deploymentconfigs/rollback" resource:"deploymentconfigs/rollback"
}, },
events:"events", events:{
version:"v1",
resource:"events"
},
horizontalpodautoscalers:{ horizontalpodautoscalers:{
group:"autoscaling", group:"autoscaling",
version:"v1",
resource:"horizontalpodautoscalers" resource:"horizontalpodautoscalers"
}, },
imagestreams:{ imagestreams:{
group:"image.openshift.io", group:"image.openshift.io",
version:"v1",
resource:"imagestreams" resource:"imagestreams"
}, },
imagestreamtags:{ imagestreamtags:{
group:"image.openshift.io", group:"image.openshift.io",
version:"v1",
resource:"imagestreamtags" resource:"imagestreamtags"
}, },
limitranges:"limitranges", limitranges:{
pods:"pods", version:"v1",
resource:"limitranges"
},
pods:{
version:"v1",
resource:"pods"
},
projects:{ projects:{
group:"project.openshift.io", group:"project.openshift.io",
version:"v1",
resource:"projects" resource:"projects"
}, },
projectrequests:{ projectrequests:{
group:"project.openshift.io", group:"project.openshift.io",
version:"v1",
resource:"projectrequests" resource:"projectrequests"
}, },
persistentvolumeclaims:"persistentvolumeclaims", persistentvolumeclaims:{
version:"v1",
resource:"persistentvolumeclaims"
},
replicasets:{ replicasets:{
group:"extensions", group:"extensions",
version:"v1beta1",
resource:"replicasets" resource:"replicasets"
}, },
replicationcontrollers:"replicationcontrollers", replicationcontrollers:{
resourcequotas:"resourcequotas", version:"v1",
rolebindings:"rolebindings", resource:"replicationcontrollers"
},
resourcequotas:{
version:"v1",
resource:"resourcequotas"
},
rolebindings:{
version:"v1",
resource:"rolebindings"
},
routes:{ routes:{
group:"route.openshift.io", group:"route.openshift.io",
version:"v1",
resource:"routes" resource:"routes"
}, },
secrets:"secrets", secrets:{
version:"v1",
resource:"secrets"
},
selfsubjectrulesreviews:{ selfsubjectrulesreviews:{
group:"authorization.k8s.io", group:"authorization.openshift.io",
version:"v1",
resource:"selfsubjectrulesreviews" resource:"selfsubjectrulesreviews"
}, },
services:"services", services:{
serviceaccounts:"serviceaccounts", version:"v1",
resource:"services"
},
serviceaccounts:{
version:"v1",
resource:"serviceaccounts"
},
serviceclasses:{ serviceclasses:{
group:"servicecatalog.k8s.io", group:"servicecatalog.k8s.io",
resource:"serviceclasses" resource:"serviceclasses"
...@@ -579,10 +629,12 @@ resource:"serviceinstances" ...@@ -579,10 +629,12 @@ resource:"serviceinstances"
}, },
statefulsets:{ statefulsets:{
group:"apps", group:"apps",
version:"v1beta1",
resource:"statefulsets" resource:"statefulsets"
}, },
templates:{ templates:{
group:"template.openshift.io", group:"template.openshift.io",
verison:"v1",
resource:"templates" resource:"templates"
} }
}), angular.module("openshiftCommonUI").filter("alertStatus", function() { }), angular.module("openshiftCommonUI").filter("alertStatus", function() {
......
src/constants/apiPreferredVersions.js
...@@ -2,37 +2,38 @@ ...@@ -2,37 +2,38 @@
angular.module('openshiftCommonServices') angular.module('openshiftCommonServices')
.constant('API_PREFERRED_VERSIONS', { .constant('API_PREFERRED_VERSIONS', {
appliedclusterresourcequotas: {group: 'quota.openshift.io', resource: 'appliedclusterresourcequotas' }, appliedclusterresourcequotas: {group: 'quota.openshift.io', version: 'v1', resource: 'appliedclusterresourcequotas' },
builds: {group: 'build.openshift.io', resource: 'builds' }, builds: {group: 'build.openshift.io', version: 'v1', resource: 'builds' },
'builds/clone': {group: 'build.openshift.io', resource: 'builds/clone' }, 'builds/clone': {group: 'build.openshift.io', version: 'v1', resource: 'builds/clone' },
'buildconfigs/instantiate': {group: 'build.openshift.io', resource: 'buildconfigs/instantiate' }, 'buildconfigs/instantiate': {group: 'build.openshift.io', version: 'v1', resource: 'buildconfigs/instantiate' },
buildconfigs: {group: 'build.openshift.io', resource: 'buildconfigs' }, buildconfigs: {group: 'build.openshift.io', version: 'v1', resource: 'buildconfigs' },
configmaps: 'configmaps', configmaps: {version: 'v1', resource: 'configmaps' },
deployments: {group: 'apps', resource: 'deployments' }, deployments: {group: 'apps', version: 'v1beta1', resource: 'deployments' },
deploymentconfigs: {group: 'apps.openshift.io', resource: 'deploymentconfigs' }, deploymentconfigs: {group: 'apps.openshift.io', version: 'v1', resource: 'deploymentconfigs' },
'deploymentconfigs/instantiate': {group: 'apps.openshift.io', resource: 'deploymentconfigs/instantiate' }, 'deploymentconfigs/instantiate': {group: 'apps.openshift.io', version: 'v1', resource: 'deploymentconfigs/instantiate' },
'deploymentconfigs/rollback': {group: 'apps.openshift.io', resource: 'deploymentconfigs/rollback' }, 'deploymentconfigs/rollback': {group: 'apps.openshift.io', version: 'v1', resource: 'deploymentconfigs/rollback' },
events: 'events', events: {version: 'v1', resource: 'events' },
horizontalpodautoscalers: {group: 'autoscaling', resource: 'horizontalpodautoscalers' }, horizontalpodautoscalers: {group: 'autoscaling', version: 'v1', resource: 'horizontalpodautoscalers' },
imagestreams: {group: 'image.openshift.io', resource: 'imagestreams' }, imagestreams: {group: 'image.openshift.io', version: 'v1', resource: 'imagestreams' },
imagestreamtags: {group: 'image.openshift.io', resource: 'imagestreamtags' }, imagestreamtags: {group: 'image.openshift.io', version: 'v1', resource: 'imagestreamtags' },
limitranges: 'limitranges', limitranges: {version: 'v1', resource: 'limitranges' },
pods: 'pods', pods: {version: 'v1', resource: 'pods' },
projects: {group: 'project.openshift.io', resource: 'projects'}, projects: {group: 'project.openshift.io', version: 'v1', resource: 'projects' },
projectrequests: {group: 'project.openshift.io', resource: 'projectrequests'}, projectrequests: {group: 'project.openshift.io', version: 'v1', resource: 'projectrequests' },
persistentvolumeclaims: 'persistentvolumeclaims', persistentvolumeclaims: {version: 'v1', resource: 'persistentvolumeclaims' },
replicasets: {group: 'extensions', resource: 'replicasets' }, replicasets: {group: 'extensions', version: 'v1beta1', resource: 'replicasets' },
replicationcontrollers: 'replicationcontrollers', replicationcontrollers: {version: 'v1', resource: 'replicationcontrollers' },
resourcequotas: 'resourcequotas', resourcequotas: {version: 'v1', resource: 'resourcequotas' },
rolebindings: 'rolebindings', rolebindings: {version: 'v1', resource: 'rolebindings' },
routes: {group: 'route.openshift.io', resource: 'routes' }, routes: {group: 'route.openshift.io', version: 'v1', resource: 'routes' },
secrets: 'secrets', secrets: {version: 'v1', resource: 'secrets' },
selfsubjectrulesreviews: {group: 'authorization.k8s.io', resource: 'selfsubjectrulesreviews'}, selfsubjectrulesreviews: {group: 'authorization.openshift.io', version: 'v1', resource: 'selfsubjectrulesreviews' },
services: 'services', services: {version: 'v1', resource: 'services' },
serviceaccounts: 'serviceaccounts', serviceaccounts: {version: 'v1', resource: 'serviceaccounts' },
serviceclasses: {group: 'servicecatalog.k8s.io', resource: 'serviceclasses' }, // TODO: add version once these reach beta
serviceinstancecredentials: {group: 'servicecatalog.k8s.io', resource: 'serviceinstancecredentials' }, serviceclasses: {group: 'servicecatalog.k8s.io', resource: 'serviceclasses' },
serviceinstances: {group: 'servicecatalog.k8s.io', resource: 'serviceinstances' }, serviceinstancecredentials: {group: 'servicecatalog.k8s.io', resource: 'serviceinstancecredentials' },
statefulsets: {group: 'apps', resource: 'statefulsets' }, serviceinstances: {group: 'servicecatalog.k8s.io', resource: 'serviceinstances' },
templates: {group: 'template.openshift.io', resource: 'templates'} statefulsets: {group: 'apps', version: 'v1beta1', resource: 'statefulsets' },
templates: {group: 'template.openshift.io', verison: 'v1', resource: 'templates' }
}); });
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment