Merge pull request #52 from liggitt/dedupe-extensions-hpas

Dedupe extensions HPAs

dist/origin-web-common-services.js

@@ -499,7 +499,7 @@ angular.module('openshiftCommonServices')
 
         // Exclude duplicate kinds we know about that map to the same storage as another group/kind
         // This is unusual, so we are special casing these
-        if (group.name === "autoscaling" && resource.kind === "HorizontalPodAutoscaler" ||
+        if (group.name === "extensions" && resource.kind === "HorizontalPodAutoscaler" ||
             group.name === "batch" && resource.kind === "Job"
         ) {
           return;

dist/origin-web-common.js

@@ -1792,7 +1792,7 @@ angular.module('openshiftCommonServices')
 
         // Exclude duplicate kinds we know about that map to the same storage as another group/kind
         // This is unusual, so we are special casing these
-        if (group.name === "autoscaling" && resource.kind === "HorizontalPodAutoscaler" ||
+        if (group.name === "extensions" && resource.kind === "HorizontalPodAutoscaler" ||
             group.name === "batch" && resource.kind === "Job"
         ) {
           return;

dist/origin-web-common.min.js

@@ -737,7 +737,7 @@ kind:resource.kind
 }), _.each(APIS_CFG.groups, function(group) {
 var preferredVersion = defaultVersion[group.name] || group.preferredVersion;
 _.each(group.versions[preferredVersion].resources, function(resource) {
-resource.name.indexOf("/") >= 0 || _.contains(rejectedKinds, resource.kind) || "autoscaling" === group.name && "HorizontalPodAutoscaler" === resource.kind || "batch" === group.name && "Job" === resource.kind || (resource.namespaced || includeClusterScoped) && kinds.push({
+resource.name.indexOf("/") >= 0 || _.contains(rejectedKinds, resource.kind) || "extensions" === group.name && "HorizontalPodAutoscaler" === resource.kind || "batch" === group.name && "Job" === resource.kind || (resource.namespaced || includeClusterScoped) && kinds.push({
 kind:resource.kind,
 group:group.name
 });

src/services/apiService.js

@@ -296,7 +296,7 @@ angular.module('openshiftCommonServices')
 
         // Exclude duplicate kinds we know about that map to the same storage as another group/kind
         // This is unusual, so we are special casing these
-        if (group.name === "autoscaling" && resource.kind === "HorizontalPodAutoscaler" ||
+        if (group.name === "extensions" && resource.kind === "HorizontalPodAutoscaler" ||
             group.name === "batch" && resource.kind === "Job"
         ) {
           return;