diff --git a/.gitignore b/.gitignore index 2c38388..77a97df 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ phantomjsdriver.log .DS_Store test/test-results.xml npm-debug.log +Chrome_* diff --git a/dist/origin-web-common-services.js b/dist/origin-web-common-services.js index 0834ad8..d5931bb 100644 --- a/dist/origin-web-common-services.js +++ b/dist/origin-web-common-services.js @@ -3904,8 +3904,9 @@ angular.module('openshiftCommonServices') // group/kind. This is unusual, so we are special casing these. groups: [{group: 'authorization.openshift.io'}], kinds: [ + {group: 'extensions', kind: 'DaemonSet'}, {group: 'extensions', kind: 'HorizontalPodAutoscaler'}, - {group: 'extensions', kind: 'DaemonSet'} + {group: 'extensions', kind: 'NetworkPolicy'} ] }); ;'use strict'; diff --git a/dist/origin-web-common.js b/dist/origin-web-common.js index ee9d2d7..4a5b715 100644 --- a/dist/origin-web-common.js +++ b/dist/origin-web-common.js @@ -1425,8 +1425,9 @@ angular.module('openshiftCommonServices') // group/kind. This is unusual, so we are special casing these. groups: [{group: 'authorization.openshift.io'}], kinds: [ + {group: 'extensions', kind: 'DaemonSet'}, {group: 'extensions', kind: 'HorizontalPodAutoscaler'}, - {group: 'extensions', kind: 'DaemonSet'} + {group: 'extensions', kind: 'NetworkPolicy'} ] }); ;'use strict'; diff --git a/dist/origin-web-common.min.js b/dist/origin-web-common.min.js index 0f82203..e3bf98b 100644 --- a/dist/origin-web-common.min.js +++ b/dist/origin-web-common.min.js @@ -469,10 +469,13 @@ group: "authorization.openshift.io" } ], kinds: [ { group: "extensions", +kind: "DaemonSet" +}, { +group: "extensions", kind: "HorizontalPodAutoscaler" }, { group: "extensions", -kind: "DaemonSet" +kind: "NetworkPolicy" } ] }), angular.module("openshiftCommonServices").constant("API_PREFERRED_VERSIONS", { appliedclusterresourcequotas: { diff --git a/src/constants/apiDedupe.js b/src/constants/apiDedupe.js index 627dcbb..67f1e25 100644 --- a/src/constants/apiDedupe.js +++ b/src/constants/apiDedupe.js @@ -6,7 +6,8 @@ angular.module('openshiftCommonServices') // group/kind. This is unusual, so we are special casing these. groups: [{group: 'authorization.openshift.io'}], kinds: [ + {group: 'extensions', kind: 'DaemonSet'}, {group: 'extensions', kind: 'HorizontalPodAutoscaler'}, - {group: 'extensions', kind: 'DaemonSet'} + {group: 'extensions', kind: 'NetworkPolicy'} ] }); diff --git a/test/karma.conf.js b/test/karma.conf.js index f9ecc07..6ec6e8b 100644 --- a/test/karma.conf.js +++ b/test/karma.conf.js @@ -57,7 +57,7 @@ module.exports = function(config) { }, // web server port - port: 8443, + port: 9443, colors: true, diff --git a/test/spec/services/apiServiceSpec.js b/test/spec/services/apiServiceSpec.js index 9ce7c73..2f5ce93 100644 --- a/test/spec/services/apiServiceSpec.js +++ b/test/spec/services/apiServiceSpec.js @@ -461,6 +461,13 @@ describe("APIService", function() { expect(_.find(allKinds, toExclude)).toEqual(undefined); }); + it('should NOT return kind: NetworkPolicy with group: extensions', function() { + var allKinds = APIService.availableKinds(true); + var toExclude = { group: 'extensions', kind: 'NetworkPolicy' }; + + expect(_.find(allKinds, toExclude)).toEqual(undefined); + }); + it('should NOT return any resource with group: authorization.openshift.io', function() { var allKinds = APIService.availableKinds(true); var toExclude = { group: 'authorization.openshift.io' };