Add apiService.getPreferredVersion, and constant apiPreferredVersions #161

benjaminapetersen · 2017-08-28T19:39:29Z

Concept for Switch to use openshift APIs under API groups - phase 1

benjaminapetersen · 2017-08-28T19:40:35Z

If the approach is right, I may work on this PR first & get as many entries in here as possible, then merge & work on updates to using this feature in follow-on PRs.

spadgett

@benjaminapetersen Looks good, I like the approach.

I'm wondering if we shouldn't add in specific versions, but that is easy to change later if we do this way. I'd leave it as-is for now.

Thanks @benjaminapetersen

spadgett · 2017-09-01T15:23:31Z

src/constants/apiPreferredVersions.js

+'use strict';
+
+angular.module('openshiftCommonServices')
+  .constant('apiPreferredVersions', (function(undefined) {


All caps since it's a constant?

I'd rather not start declaring functions as taking undefined since we don't do that anywhere else. Let's stick to the styles we've established when it makes sense for consistency in our code. Even if we don't have a README declaring the code style, we've established a certain style over time.

.constant('API_PREFERRED_VERSIONS', function() { // ... });

oh def, sorry, copy paste oops (forgot if constants had any special treatment), def don't need that.

spadgett · 2017-09-01T15:27:05Z

src/constants/apiPreferredVersions.js

+      deployments: { group: 'apps', resource: 'deployments'},
+      pods: 'pods',
+      replicasets: {group: 'extensions', resource: 'replicasets'},
+      // bindings: must be manually deduplicated


I'd remove this comment since it will no longer be an issue.

spadgett · 2017-09-01T15:27:40Z

src/constants/apiPreferredVersions.js

+angular.module('openshiftCommonServices')
+  .constant('apiPreferredVersions', (function(undefined) {
+    return {
+      builds: 'builds',


{resource: 'builds', group: 'build.openshift.io'}

spadgett · 2017-09-01T15:27:58Z

src/constants/apiPreferredVersions.js

+  .constant('apiPreferredVersions', (function(undefined) {
+    return {
+      builds: 'builds',
+      buildconfigs: 'buildconfigs',


{resource: 'buildconfigs', group: 'build.openshift.io'}

spadgett · 2017-09-01T15:28:43Z

src/services/apiService.js

+  var getPreferredVersion = function(resource) {
+    return apiPreferredVersions[resource];
+    // TODO: if missing or needs dedupe, should we:
+    // new Error(resource + ' must be manually deduplicated, please create your own {resource:"", group:"", version: "" object.}');


I think just log it and return null.

spadgett · 2017-09-01T15:31:08Z

src/services/apiService.js

@@ -339,6 +340,12 @@ angular.module('openshiftCommonServices')
    return includeClusterScoped ? allKinds : namespacedKinds;
  };

+  var getPreferredVersion = function(resource) {


Let's add a comment explaining what this is and why.

Sounds good.

spadgett · 2017-09-06T15:21:21Z

src/constants/apiPreferredVersions.js

+      buildconfigs:                 {group: 'build.openshift.io',     resource: 'buildconfigs'},
+      configmaps:                   'configmaps',
+      deployments:                  {group: 'apps',                   resource: 'deployments'},
+      deploymentconfigs:            'deploymentconfigs',


group: 'apps.openshift.io',

spadgett · 2017-09-06T15:21:40Z

src/constants/apiPreferredVersions.js

+      configmaps:                   'configmaps',
+      deployments:                  {group: 'apps',                   resource: 'deployments'},
+      deploymentconfigs:            'deploymentconfigs',
+      imagestreams:                 'imagestreams',


group: 'image.openshift.io'

spadgett · 2017-09-06T15:21:49Z

src/constants/apiPreferredVersions.js

+      deployments:                  {group: 'apps',                   resource: 'deployments'},
+      deploymentconfigs:            'deploymentconfigs',
+      imagestreams:                 'imagestreams',
+      imagestreamtags:              'imagestreamtags',


group: 'image.openshift.io'

spadgett · 2017-09-06T15:22:51Z

src/constants/apiPreferredVersions.js

+      replicationcontrollers:       'replicationcontrollers',
+      resourcequotas:               'resourcequotas',
+      rolebindings:                 'rolebindings',
+      routes:                       'routes',


group: 'route.openshift.io'

spadgett · 2017-09-06T15:24:56Z

src/constants/apiPreferredVersions.js

+      instances:                    {group: 'servicecatalog.k8s.io',  resource: 'instances'},
+      limitranges:                  'limitranges',
+      pods:                         'pods',
+      projects:                     'projects',


group: 'project.openshift.io'

spadgett · 2017-09-06T15:27:43Z

src/constants/apiPreferredVersions.js

+      services:                     'services',
+      serviceaccounts:              'serviceaccounts',
+      serviceclasses:               {group: 'servicecatalog.k8s.io',  resource: 'serviceclasses'},
+      statefulsets:                 {group: 'apps',                   resource: 'statefulsets'},


Add

storageclasses: {group: 'storage.k8s.io', resource: 'storageclasses'}

spadgett · 2017-09-06T15:28:19Z

src/constants/apiPreferredVersions.js

+      rolebindings:                 'rolebindings',
+      routes:                       'routes',
+      secrets:                      'secrets',
+      selfsubjectrulesreviews:      'selfsubjectrulesreviews',


group: 'authorization.openshift.io'

spadgett · 2017-09-06T15:28:33Z

src/services/apiService.js

+  console.log('available kinds:');
+  console.log('available kinds:');
+  console.log(calculateAvailableKinds(true));
+  console.log(JSON.stringify(calculateAvailableKinds(true)))


Remove log messages

OOp, sorry, should have said "Do not review" on the last one, just pushed it to switch gears back to drawer. 🙁

This will get cleaned up in my next pass.

spadgett · 2017-09-06T15:29:18Z

src/constants/apiPreferredVersions.js

+      replicasets:                  {group: 'extensions',             resource: 'replicasets'},
+      replicationcontrollers:       'replicationcontrollers',
+      resourcequotas:               'resourcequotas',
+      rolebindings:                 'rolebindings',


group: 'authorization.openshift.io'

spadgett · 2017-09-06T15:30:09Z

src/constants/apiPreferredVersions.js

+      configmaps:                   'configmaps',
+      deployments:                  {group: 'apps',                   resource: 'deployments'},
+      deploymentconfigs:            'deploymentconfigs',
+      imagestreams:                 'imagestreams',


Add

horizontalpodautoscalers: {group: 'autoscaling', resource: 'horizontalpodautoscalers'}

benjaminapetersen · 2017-09-06T15:31:10Z

Thinking again about API_PREFERRED_VERSIONS & if we want a CONSOLE_API_PREFERRED_VERSIONS, CATALOG_ API_PREFERRED_VERSIONS... & put them in each repo, rather than tight coupling across all 3. Thoughts? Pros and cons both ways.

benjaminapetersen · 2017-09-06T20:52:00Z

Updated.
The only think that feels a little wonky to me is the method name getPreferredVersion when it only returns {resource, group} at this point. Not sure its a big deal, I commented that we intentionally will default to the api preferredVersion.

benjaminapetersen · 2017-09-15T14:24:59Z

@spadgett this should be good to go. I can always add more to the config if I find something missing with the follow-up PRs to update controllers, etc. Thoughts?

spadgett · 2017-09-18T11:41:42Z

Hey @benjaminapetersen see my comment openshift/origin-web-console#2098 (comment)

I think we'll want to go ahead and create a filter for preferred version. Let's do it in this PR to avoid cutting multiple releases.

benjaminapetersen · 2017-09-18T13:46:33Z

@spadgett agree, will do.

benjaminapetersen · 2017-09-18T14:00:53Z

@spadgett filter added.

spadgett · 2017-09-18T14:35:48Z

src/filters/getPreferredVersion.js

+
+angular
+  .module('openshiftCommonUI')
+  .filter('getPreferredVersion', function(APIService) {


Maybe just

.filter('preferredVersion', function(APIService) { return APIService.getPreferredVersion; };

works for me, updated.

updated again 😃

spadgett · 2017-09-18T15:40:56Z

Closing and reopening to kick travis tests

benjaminapetersen mentioned this pull request Aug 28, 2017

[WIP] Update builds page to use APIService.getPreferredVersion openshift/origin-web-console#1978

Closed

spadgett reviewed Sep 1, 2017

View reviewed changes

spadgett mentioned this pull request Sep 6, 2017

Bump version to 0.0.53 #172

Merged

spadgett requested changes Sep 6, 2017

View reviewed changes

benjaminapetersen force-pushed the bpeterse/trello/switch-oapi-to-api-groups branch 2 times, most recently from 5becb12 to 3b3d67b Compare September 6, 2017 20:50

benjaminapetersen changed the title ~~[WIP] Add apiService.getPreferredVersion, and constant apiPreferredVersions~~ Add apiService.getPreferredVersion, and constant apiPreferredVersions Sep 6, 2017

spadgett mentioned this pull request Sep 18, 2017

Bump to version 0.0.57 #190

Merged

benjaminapetersen force-pushed the bpeterse/trello/switch-oapi-to-api-groups branch from 3b3d67b to ffa8187 Compare September 18, 2017 13:59

spadgett reviewed Sep 18, 2017

View reviewed changes

benjaminapetersen force-pushed the bpeterse/trello/switch-oapi-to-api-groups branch 2 times, most recently from 6ffb82e to e0bd42c Compare September 18, 2017 15:14

Add apiService.getPreferredVersion, and constant apiPreferredVersions

c45e325

benjaminapetersen force-pushed the bpeterse/trello/switch-oapi-to-api-groups branch from e0bd42c to c45e325 Compare September 18, 2017 15:15

spadgett approved these changes Sep 18, 2017

View reviewed changes

spadgett closed this Sep 18, 2017

spadgett reopened this Sep 18, 2017

spadgett merged commit 5e5ba73 into openshift:master Sep 18, 2017

benjaminapetersen deleted the bpeterse/trello/switch-oapi-to-api-groups branch September 18, 2017 17:16

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add apiService.getPreferredVersion, and constant apiPreferredVersions #161

Add apiService.getPreferredVersion, and constant apiPreferredVersions #161

benjaminapetersen commented Aug 28, 2017

benjaminapetersen commented Aug 28, 2017

spadgett left a comment

spadgett Sep 1, 2017

benjaminapetersen Sep 1, 2017

spadgett Sep 1, 2017

spadgett Sep 1, 2017

spadgett Sep 1, 2017

spadgett Sep 1, 2017

spadgett Sep 1, 2017

benjaminapetersen Sep 1, 2017

spadgett Sep 6, 2017

spadgett Sep 6, 2017

spadgett Sep 6, 2017

spadgett Sep 6, 2017

spadgett Sep 6, 2017

spadgett Sep 6, 2017

spadgett Sep 6, 2017

spadgett Sep 6, 2017

benjaminapetersen Sep 6, 2017

spadgett Sep 6, 2017

spadgett Sep 6, 2017

benjaminapetersen commented Sep 6, 2017

benjaminapetersen commented Sep 6, 2017

benjaminapetersen commented Sep 15, 2017

spadgett commented Sep 18, 2017

benjaminapetersen commented Sep 18, 2017

benjaminapetersen commented Sep 18, 2017

spadgett Sep 18, 2017

benjaminapetersen Sep 18, 2017

benjaminapetersen Sep 18, 2017

spadgett commented Sep 18, 2017

Add apiService.getPreferredVersion, and constant apiPreferredVersions #161

Add apiService.getPreferredVersion, and constant apiPreferredVersions #161

Conversation

benjaminapetersen commented Aug 28, 2017

benjaminapetersen commented Aug 28, 2017

spadgett left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

benjaminapetersen commented Sep 6, 2017

benjaminapetersen commented Sep 6, 2017

benjaminapetersen commented Sep 15, 2017

spadgett commented Sep 18, 2017

benjaminapetersen commented Sep 18, 2017

benjaminapetersen commented Sep 18, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

spadgett commented Sep 18, 2017