Merge pull request #15422 from kargakis/fix-rwo-warning

Merged by openshift-bot
openshift · Jul 25, 2017 · 970dc61 · 970dc61
2 parents 49df2d6 + d00a7fe
commit 970dc61
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/pkg/api/graph/test/dc-with-claim.yaml b/pkg/api/graph/test/dc-with-claim.yaml
@@ -19,7 +19,7 @@ items:
     replicas: 1
     strategy:
       rollingParams:
-        maxSurge: 1
+        maxSurge: 25%
       type: Rolling
     template:
       metadata:

diff --git a/pkg/deploy/graph/analysis/dc.go b/pkg/deploy/graph/analysis/dc.go
@@ -6,6 +6,7 @@ import (
 	"github.com/gonum/graph"
 
 	kapi "k8s.io/kubernetes/pkg/api"
+	kdeplutil "k8s.io/kubernetes/pkg/controller/deployment/util"
 
 	osgraph "github.com/openshift/origin/pkg/api/graph"
 	kubegraph "github.com/openshift/origin/pkg/api/kubegraph/nodes"
@@ -162,10 +163,13 @@ func pvcMarker(g osgraph.Graph, f osgraph.Namer, dcNode *deploygraph.DeploymentC
 		}
 
 		dc := dcNode.DeploymentConfig
-		rollingParams := dc.Spec.Strategy.RollingParams
 		isBlockedBySize := dc.Spec.Replicas > 1
-		isBlockedRolling := rollingParams != nil && rollingParams.MaxSurge.IntValue() > 0
-
+		isBlockedRolling := false
+		rollingParams := dc.Spec.Strategy.RollingParams
+		if rollingParams != nil {
+			maxSurge, _, _ := kdeplutil.ResolveFenceposts(&rollingParams.MaxSurge, &rollingParams.MaxUnavailable, dc.Spec.Replicas)
+			isBlockedRolling = maxSurge > 0
+		}
 		// If the claim is not RWO or deployments will not have more than a pod running at any time
 		// then they should be fine.
 		if !hasRWOAccess(pvcNode) || (!isBlockedRolling && !isBlockedBySize) {