Merge pull request #11913 from kargakis/cleanup-strategy-code

Merged by openshift-bot

Author: OpenShift Bot

pkg/deploy/strategy/recreate/recreate.go

@@ -48,7 +48,7 @@ type RecreateDeploymentStrategy struct {
 	// codec is used to decode DeploymentConfigs contained in deployments.
 	decoder runtime.Decoder
 	// hookExecutor can execute a lifecycle hook.
-	hookExecutor hookExecutor
+	hookExecutor stratsupport.HookExecutor
 	// retryTimeout is how long to wait for the replica count update to succeed
 	// before giving up.
 	retryTimeout time.Duration
@@ -58,9 +58,9 @@ type RecreateDeploymentStrategy struct {
 	events record.EventSink
 }
 
-// AcceptorInterval is how often the UpdateAcceptor should check for
+// acceptorInterval is how often the UpdateAcceptor should check for
 // readiness.
-const AcceptorInterval = 1 * time.Second
+const acceptorInterval = 1 * time.Second
 
 // NewRecreateDeploymentStrategy makes a RecreateDeploymentStrategy backed by
 // a real HookExecutor and client.
@@ -82,7 +82,7 @@ func NewRecreateDeploymentStrategy(oldClient kclient.Interface, tagClient client
 		rcClient:    client.Core(),
 		eventClient: client.Core(),
 		getUpdateAcceptor: func(timeout time.Duration, minReadySeconds int32) strat.UpdateAcceptor {
-			return stratsupport.NewAcceptNewlyObservedReadyPods(out, client.Core(), timeout, AcceptorInterval, minReadySeconds)
+			return stratsupport.NewAcceptAvailablePods(out, client.Core(), timeout, acceptorInterval, minReadySeconds)
 		},
 		scaler:       scaler,
 		decoder:      decoder,
@@ -221,18 +221,3 @@ func (s *RecreateDeploymentStrategy) scaleAndWait(deployment *kapi.ReplicationCo
 
 	return s.rcClient.ReplicationControllers(deployment.Namespace).Get(deployment.Name)
 }
-
-// hookExecutor knows how to execute a deployment lifecycle hook.
-type hookExecutor interface {
-	Execute(hook *deployapi.LifecycleHook, deployment *kapi.ReplicationController, suffix, label string) error
-}
-
-// hookExecutorImpl is a pluggable hookExecutor.
-type hookExecutorImpl struct {
-	executeFunc func(hook *deployapi.LifecycleHook, deployment *kapi.ReplicationController, suffix, label string) error
-}
-
-// Execute executes the provided lifecycle hook
-func (i *hookExecutorImpl) Execute(hook *deployapi.LifecycleHook, deployment *kapi.ReplicationController, suffix, label string) error {
-	return i.executeFunc(hook, deployment, suffix, label)
-}

pkg/deploy/strategy/recreate/recreate_test.go

@@ -29,6 +29,14 @@ func (c *fakeControllerClient) ReplicationControllers(ns string) kcoreclient.Rep
 	return fake.NewSimpleClientset(c.deployment).Core().ReplicationControllers(ns)
 }
 
+type hookExecutorImpl struct {
+	executeFunc func(hook *deployapi.LifecycleHook, deployment *kapi.ReplicationController, suffix, label string) error
+}
+
+func (h *hookExecutorImpl) Execute(hook *deployapi.LifecycleHook, rc *kapi.ReplicationController, suffix, label string) error {
+	return h.executeFunc(hook, rc, suffix, label)
+}
+
 func TestRecreate_initialDeployment(t *testing.T) {
 	var deployment *kapi.ReplicationController
 	scaler := &cmdtest.FakeScaler{}

pkg/deploy/strategy/rolling/rolling.go

@@ -26,12 +26,17 @@ import (
 	deployutil "github.com/openshift/origin/pkg/deploy/util"
 )
 
-// TODO: This should perhaps be made public upstream. See:
-// https://github.com/kubernetes/kubernetes/issues/7851
-const sourceIdAnnotation = "kubectl.kubernetes.io/update-source-id"
+const (
+	// TODO: This should perhaps be made public upstream. See:
+	// https://github.com/kubernetes/kubernetes/issues/7851
+	sourceIdAnnotation = "kubectl.kubernetes.io/update-source-id"
 
-const DefaultApiRetryPeriod = 1 * time.Second
-const DefaultApiRetryTimeout = 10 * time.Second
+	defaultApiRetryPeriod  = 1 * time.Second
+	defaultApiRetryTimeout = 10 * time.Second
+	// acceptorInterval is how often the UpdateAcceptor should check for
+	// readiness.
+	acceptorInterval = 1 * time.Second
+)
 
 // RollingDeploymentStrategy is a Strategy which implements rolling
 // deployments using the upstream Kubernetes RollingUpdater.
@@ -65,7 +70,7 @@ type RollingDeploymentStrategy struct {
 	// decoder is used to access the encoded config on a deployment.
 	decoder runtime.Decoder
 	// hookExecutor can execute a lifecycle hook.
-	hookExecutor hookExecutor
+	hookExecutor stratsupport.HookExecutor
 	// getUpdateAcceptor returns an UpdateAcceptor to verify the first replica
 	// of the deployment.
 	getUpdateAcceptor func(time.Duration, int32) strat.UpdateAcceptor
@@ -84,10 +89,6 @@ type acceptingDeploymentStrategy interface {
 	DeployWithAcceptor(from *kapi.ReplicationController, to *kapi.ReplicationController, desiredReplicas int, updateAcceptor strat.UpdateAcceptor) error
 }
 
-// AcceptorInterval is how often the UpdateAcceptor should check for
-// readiness.
-const AcceptorInterval = 1 * time.Second
-
 // NewRollingDeploymentStrategy makes a new RollingDeploymentStrategy.
 func NewRollingDeploymentStrategy(namespace string, oldClient kclient.Interface, tags client.ImageStreamTagsNamespacer, events record.EventSink, decoder runtime.Decoder, initialStrategy acceptingDeploymentStrategy, out, errOut io.Writer, until string) *RollingDeploymentStrategy {
 	if out == nil {
@@ -107,15 +108,15 @@ func NewRollingDeploymentStrategy(namespace string, oldClient kclient.Interface,
 		rcClient:        client.Core(),
 		eventClient:     client.Core(),
 		tags:            tags,
-		apiRetryPeriod:  DefaultApiRetryPeriod,
-		apiRetryTimeout: DefaultApiRetryTimeout,
+		apiRetryPeriod:  defaultApiRetryPeriod,
+		apiRetryTimeout: defaultApiRetryTimeout,
 		rollingUpdate: func(config *kubectl.RollingUpdaterConfig) error {
 			updater := kubectl.NewRollingUpdater(namespace, oldClient)
 			return updater.Update(config)
 		},
 		hookExecutor: stratsupport.NewHookExecutor(client.Core(), tags, client.Core(), os.Stdout, decoder),
 		getUpdateAcceptor: func(timeout time.Duration, minReadySeconds int32) strat.UpdateAcceptor {
-			return stratsupport.NewAcceptNewlyObservedReadyPods(out, client.Core(), timeout, AcceptorInterval, minReadySeconds)
+			return stratsupport.NewAcceptAvailablePods(out, client.Core(), timeout, acceptorInterval, minReadySeconds)
 		},
 	}
 }
@@ -282,18 +283,3 @@ func (w *rollingUpdaterWriter) Write(p []byte) (n int, err error) {
 	}
 	return n, nil
 }
-
-// hookExecutor knows how to execute a deployment lifecycle hook.
-type hookExecutor interface {
-	Execute(hook *deployapi.LifecycleHook, deployment *kapi.ReplicationController, suffix, label string) error
-}
-
-// hookExecutorImpl is a pluggable hookExecutor.
-type hookExecutorImpl struct {
-	executeFunc func(hook *deployapi.LifecycleHook, deployment *kapi.ReplicationController, suffix, label string) error
-}
-
-// Execute executes the provided lifecycle hook
-func (i *hookExecutorImpl) Execute(hook *deployapi.LifecycleHook, deployment *kapi.ReplicationController, suffix, label string) error {
-	return i.executeFunc(hook, deployment, suffix, label)
-}

pkg/deploy/strategy/rolling/rolling_test.go

@@ -145,6 +145,14 @@ func TestRolling_deployRolling(t *testing.T) {
 	}
 }
 
+type hookExecutorImpl struct {
+	executeFunc func(hook *deployapi.LifecycleHook, deployment *kapi.ReplicationController, suffix, label string) error
+}
+
+func (h *hookExecutorImpl) Execute(hook *deployapi.LifecycleHook, rc *kapi.ReplicationController, suffix, label string) error {
+	return h.executeFunc(hook, rc, suffix, label)
+}
+
 func TestRolling_deployRollingHooks(t *testing.T) {
 	config := deploytest.OkDeploymentConfig(1)
 	config.Spec.Strategy = deploytest.OkRollingStrategy()