Merge pull request #312 from openshift-cherrypick-robot/cherry-pick-311-to-enterprise-3.9

[enterprise-3.9] Bug 1551904 - Deduplicate NetworkPolicy from availableKinds

Author: spadgett

.gitignore

@@ -8,3 +8,4 @@ phantomjsdriver.log
 .DS_Store
 test/test-results.xml
 npm-debug.log
+Chrome_*

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';

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';

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: {

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'}
     ]
   });

test/karma.conf.js

@@ -57,7 +57,7 @@ module.exports = function(config) {
     },
 
     // web server port
-    port: 8443,
+    port: 9443,
 
     colors: true,
 

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' };