Merge pull request #3131 from spadgett/overview-dc-labels

Bug 1717028: Fix edge case evaluating services for deployment config
openshift · Jun 5, 2019 · a820396 · a820396
2 parents e156298 + 7093d2b
commit a820396
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/app/scripts/controllers/overview.js b/app/scripts/controllers/overview.js
@@ -922,6 +922,17 @@ function OverviewController($scope,
       var services = [];
       var uid = getUID(apiObject);
       var podTemplate = getPodTemplate(apiObject);
+      if (apiObject.kind === 'DeploymentConfig') {
+        // Include labels automatically added to deployment config pods since
+        // the service might select them.
+        podTemplate = _.defaultsDeep({
+          metadata: {
+            labels: {
+              deploymentconfig: apiObject.metadata.name
+            }
+          }
+        }, podTemplate);
+      }
       _.each(selectorsByService, function(selector, serviceName) {
         if (selector.matches(podTemplate)) {
           services.push(state.allServices[serviceName]);

diff --git a/dist/scripts/scripts.js b/dist/scripts/scripts.js
@@ -278,7 +278,13 @@ B.replicaSetsByDeploymentUID[t] = a, B.currentByDeploymentUID[t] = _.head(a);
 }, lt = {}, ut = function(e) {
 e && be.allServices && _.each(e, function(e) {
 var t = [], n = _e(e), r = G(e);
-_.each(lt, function(e, n) {
+"DeploymentConfig" === e.kind && (r = _.defaultsDeep({
+metadata: {
+labels: {
+deploymentconfig: e.metadata.name
+}
+}
+}, r)), _.each(lt, function(e, n) {
 e.matches(r) && t.push(be.allServices[n]);
 }), be.servicesByObjectUID[n] = _.sortBy(t, "metadata.name");
 });