@@ -208,10 +208,7 @@ angular.module('openshiftConsole')

       angular.forEach($scope.deployments, function(deployment, depName){

         var foundMatch = false;

         var deploymentSelector = new LabelSelector(deployment.spec.selector);

-        var depConfigName = "";

-        if (deployment.metadata.annotations) {

-          depConfigName = deployment.metadata.annotations.deploymentConfig || "";

-        }

+        var depConfigName = $filter('annotation')(deployment, 'deploymentConfig') || "";

         angular.forEach($scope.unfilteredServices, function(service, name){

           bySvc[name] = bySvc[name] || {};

@@ -236,9 +233,10 @@ angular.module('openshiftConsole')

     };

     function parseEncodedDeploymentConfig(deployment) {

-      if (deployment.metadata.annotations && deployment.metadata.annotations.encodedDeploymentConfig) {

+      var configJson = $filter('annotation')(deployment, 'encodedDeploymentConfig')

+      if (configJson) {

         try {

-          var depConfig = $.parseJSON(deployment.metadata.annotations.encodedDeploymentConfig);

+          var depConfig = $.parseJSON(configJson);

           deployment.details = depConfig.details;

         }

         catch (e) {

@@ -14,6 +14,16 @@ angular.module('openshiftConsole')

     }

   })

   .filter('annotation', function() {

+    // This maps a an annotation key to all known synonymous keys to insulate

+    // the referring code from key renames across API versions.

+    var annotationMap = {

+      "deploymentConfig": ["openshift.io/deployment-config.name"],

+      "deployment": ["openshift.io/deployment.name"],

+      "pod": ["openshift.io/deployer-pod.name"],

+      "deploymentStatus": ["openshift.io/deployment.phase"],

+      "encodedDeploymentConfig": ["openshift.io/encoded-deployment-config"],

+      "deploymentVersion": ["openshift.io/deployment-config.latest-version"]

+    };

     return function(resource, key) {

       if (resource && resource.spec && resource.spec.tags && key.indexOf(".") !== -1){

         var tagAndKey = key.split(".");

@@ -28,7 +38,20 @@ angular.module('openshiftConsole')

         }

       }

       if (resource && resource.metadata && resource.metadata.annotations) {

-        return resource.metadata.annotations[key];

+        // If the key's already in the annotation map, return it.

+        if (resource.metadata.annotations[key] !== undefined) {

+          return resource.metadata.annotations[key]

+        }

+        // Try and return a value for a mapped key.

+        var mappings = annotationMap[key] || [];

+        for (var i=0; i < mappings.length; i++) {

+          var mappedKey = mappings[i];

+          if (resource.metadata.annotations[mappedKey] !== undefined) {

+            return resource.metadata.annotations[mappedKey];

+          }

+        }

+        // Couldn't find anything.

+        return null;

       }

       return null;

     };

@@ -11,10 +11,10 @@

         </div>

       </div>      

       <div style="margin-bottom: 10px;" ng-repeat="deployment in deployments">

-        <h3>{{deployment.metadata.annotations.deploymentConfig}} <span class="small">({{deployment.metadata.name}})</span></h3>

+        <h3>{{deployment | annotation:'deploymentConfig'}} <span class="small">({{deployment.metadata.name}})</span></h3>

         <div>Created: <relative-timestamp timestamp="deployment.metadata.creationTimestamp"></relative-timestamp></div>

-        <div>Status: {{deployment.metadata.annotations.deploymentStatus}}</div>

-        <div>Version: {{deployment.metadata.annotations.deploymentVersion}}</div>

+        <div>Status: {{deployment | annotation:'deploymentStatus'}}</div>

+        <div>Version: {{deployment | annotation:'deploymentVersion'}}</div>

         <div>Replicas: {{deployment.spec.replicas}}</div>

         <pod-template ng-init="podTemplate = deployment.spec.template"></pod-template>

       </div>      

@@ -2,7 +2,6 @@ package graph

 import (

 	"sort"

-	"strconv"

 	"github.com/gonum/graph"

 	"github.com/gonum/graph/search"

@@ -11,6 +10,7 @@ import (

 	build "github.com/openshift/origin/pkg/build/api"

 	deploy "github.com/openshift/origin/pkg/deploy/api"

+	deployutil "github.com/openshift/origin/pkg/deploy/util"

 	image "github.com/openshift/origin/pkg/image/api"

 )

@@ -348,15 +348,7 @@ type RecentDeploymentReferences []*kapi.ReplicationController

 func (m RecentDeploymentReferences) Len() int      { return len(m) }

 func (m RecentDeploymentReferences) Swap(i, j int) { m[i], m[j] = m[j], m[i] }

 func (m RecentDeploymentReferences) Less(i, j int) bool {

-	a, err := strconv.Atoi(m[i].Annotations[deploy.DeploymentVersionAnnotation])

-	if err != nil {

-		return false

-	}

-	b, err := strconv.Atoi(m[j].Annotations[deploy.DeploymentVersionAnnotation])

-	if err != nil {

-		return true

-	}

-	return a > b

+	return deployutil.DeploymentVersionFor(m[i]) > deployutil.DeploymentVersionFor(m[j])

 }

 func CompareObjectMeta(a, b *kapi.ObjectMeta) bool {

@@ -3,7 +3,6 @@ package graph

 import (

 	"fmt"

 	"sort"

-	"strconv"

 	"strings"

 	"github.com/golang/glog"

@@ -15,6 +14,7 @@ import (

 	build "github.com/openshift/origin/pkg/build/api"

 	buildutil "github.com/openshift/origin/pkg/build/util"

 	deploy "github.com/openshift/origin/pkg/deploy/api"

+	deployutil "github.com/openshift/origin/pkg/deploy/util"

 	image "github.com/openshift/origin/pkg/image/api"

 )

@@ -402,7 +402,7 @@ func JoinDeployments(node *DeploymentConfigNode, deploys []kapi.ReplicationContr

 		return

 	}

 	sort.Sort(RecentDeploymentReferences(matches))

-	if strconv.Itoa(node.DeploymentConfig.LatestVersion) == matches[0].Annotations[deploy.DeploymentVersionAnnotation] {

+	if node.DeploymentConfig.LatestVersion == deployutil.DeploymentVersionFor(matches[0]) {

 		node.ActiveDeployment = matches[0]

 		node.Deployments = matches[1:]

 		return

@@ -422,7 +422,7 @@ func belongsToBuildConfig(config *build.BuildConfig, b *build.Build) bool {

 func belongsToDeploymentConfig(config *deploy.DeploymentConfig, b *kapi.ReplicationController) bool {

 	if b.Annotations != nil {

-		return config.Name == b.Annotations[deploy.DeploymentConfigAnnotation]

+		return config.Name == deployutil.DeploymentConfigNameFor(b)

 	}

 	return false

 }

@@ -15837,24 +15837,25 @@ h.covers(e) && (a.deploymentConfigsByService[g][c] = b, d = !0);

 function j() {

 var b = a.deploymentsByService = {

 "":{}

-}, c = a.deploymentsByServiceByDeploymentConfig = {

+}, d = a.deploymentsByServiceByDeploymentConfig = {

 "":{}

 };

-angular.forEach(a.deployments, function(d, e) {

-var f = !1, g = new LabelSelector(d.spec.selector), h = "";

-d.metadata.annotations && (h = d.metadata.annotations.deploymentConfig || ""), angular.forEach(a.unfilteredServices, function(a, i) {

-b[i] = b[i] || {}, c[i] = c[i] || {};

+angular.forEach(a.deployments, function(e, f) {

+var g = !1, h = new LabelSelector(e.spec.selector), i = c("annotation")(e, "deploymentConfig") || "";

+angular.forEach(a.unfilteredServices, function(a, c) {

+b[c] = b[c] || {}, d[c] = d[c] || {};

 var j = new LabelSelector(a.spec.selector);

-j.covers(g) && (b[i][e] = d, c[i][h] = c[i][h] || {}, c[i][h][e] = d, f = !0);

-}), f || (b[""][e] = d, c[""][h] = c[""][h] || {}, c[""][h][e] = d);

+j.covers(h) && (b[c][f] = e, d[c][i] = d[c][i] || {}, d[c][i][f] = e, g = !0);

+}), g || (b[""][f] = e, d[""][i] = d[""][i] || {}, d[""][i][f] = e);

 });

 }

 function k(a) {

-if (a.metadata.annotations && a.metadata.annotations.encodedDeploymentConfig) try {

-var b = $.parseJSON(a.metadata.annotations.encodedDeploymentConfig);

-a.details = b.details;

-} catch (c) {

-e.error("Failed to parse encoded deployment config", c);

+var b = c("annotation")(a, "encodedDeploymentConfig");

+if (b) try {

+var d = $.parseJSON(b);

+a.details = d.details;

+} catch (f) {

+e.error("Failed to parse encoded deployment config", f);

 }

 }

 function l(a, b) {

@@ -16949,12 +16950,28 @@ return function(a) {

 return a && a.metadata && a.metadata.uid ? a.metadata.uid :a;

 };

 }).filter("annotation", function() {

-return function(a, b) {

-if (a && a.spec && a.spec.tags && -1 !== b.indexOf(".")) for (var c = b.split("."), d = a.spec.tags, e = 0; e < d.length; ++e) {

-var f = d[e], g = c[0], h = c[1];

-if (g === f.name && f.annotations) return f.annotations[h];

+var a = {

+deploymentConfig:[ "openshift.io/deployment-config.name" ],

+deployment:[ "openshift.io/deployment.name" ],

+pod:[ "openshift.io/deployer-pod.name" ],

+deploymentStatus:[ "openshift.io/deployment.phase" ],

+encodedDeploymentConfig:[ "openshift.io/encoded-deployment-config" ],

+deploymentVersion:[ "openshift.io/deployment-config.latest-version" ]

+};

+return function(b, c) {

+if (b && b.spec && b.spec.tags && -1 !== c.indexOf(".")) for (var d = c.split("."), e = b.spec.tags, f = 0; f < e.length; ++f) {

+var g = e[f], h = d[0], i = d[1];

+if (h === g.name && g.annotations) return g.annotations[i];

+}

+if (b && b.metadata && b.metadata.annotations) {

+if (void 0 !== b.metadata.annotations[c]) return b.metadata.annotations[c];

+for (var j = a[c] || [], f = 0; f < j.length; f++) {

+var k = j[f];

+if (void 0 !== b.metadata.annotations[k]) return b.metadata.annotations[k];

 }

-return a && a.metadata && a.metadata.annotations ? a.metadata.annotations[b] :null;

+return null;

+}

+return null;

 };

 }).filter("description", [ "annotationFilter", function(a) {

 return function(b) {

@@ -63901,10 +63918,10 @@ var _views_deployments_html = []byte(`<div ng-controller="ProjectController" cla

 </div>

 </div>

 <div style="margin-bottom: 10px" ng-repeat="deployment in deployments">

-<h3>{{deployment.metadata.annotations.deploymentConfig}} <span class="small">({{deployment.metadata.name}})</span></h3>

+<h3>{{deployment | annotation:'deploymentConfig'}} <span class="small">({{deployment.metadata.name}})</span></h3>

 <div>Created: <relative-timestamp timestamp="deployment.metadata.creationTimestamp"></relative-timestamp></div>

-<div>Status: {{deployment.metadata.annotations.deploymentStatus}}</div>

-<div>Version: {{deployment.metadata.annotations.deploymentVersion}}</div>

+<div>Status: {{deployment | annotation:'deploymentStatus'}}</div>

+<div>Version: {{deployment | annotation:'deploymentVersion'}}</div>

 <div>Replicas: {{deployment.spec.replicas}}</div>

 <pod-template ng-init="podTemplate = deployment.spec.template"></pod-template>

 </div>

@@ -174,7 +174,7 @@ func (c *deployLatestCommand) deploy(config *deployapi.DeploymentConfig, out io.

 		}

 	} else {

 		// Reject attempts to start a concurrent deployment.

-		status := statusFor(deployment)

+		status := deployutil.DeploymentStatusFor(deployment)

 		if status != deployapi.DeploymentStatusComplete && status != deployapi.DeploymentStatusFailed {

 			return fmt.Errorf("#%d is already in progress (%s)", config.LatestVersion, status)

 		}

@@ -206,9 +206,7 @@ func (c *retryDeploymentCommand) retry(config *deployapi.DeploymentConfig, out i

 		return err

 	}

-	status := statusFor(deployment)

-

-	if status != deployapi.DeploymentStatusFailed {

+	if status := deployutil.DeploymentStatusFor(deployment); status != deployapi.DeploymentStatusFailed {

 		return fmt.Errorf("#%d is %s; only failed deployments can be retried", config.LatestVersion, status)

 	}

@@ -220,10 +218,6 @@ func (c *retryDeploymentCommand) retry(config *deployapi.DeploymentConfig, out i

 	return err

 }

-func statusFor(deployment *kapi.ReplicationController) deployapi.DeploymentStatus {

-	return deployapi.DeploymentStatus(deployment.Annotations[deployapi.DeploymentStatusAnnotation])

-}

-

 // deployCommandClientImpl is a pluggable deployCommandClient.

 type deployCommandClientImpl struct {

 	GetDeploymentFn          func(namespace, name string) (*kapi.ReplicationController, error)

@@ -157,7 +157,7 @@ func TestCmdDeploy_retryOk(t *testing.T) {

 		t.Fatalf("expected updated config")

 	}

-	if e, a := deployapi.DeploymentStatusNew, statusFor(updatedDeployment); e != a {

+	if e, a := deployapi.DeploymentStatusNew, deployutil.DeploymentStatusFor(updatedDeployment); e != a {

 		t.Fatalf("expected deployment status %s, got %s", e, a)

 	}

 }

@@ -139,7 +139,7 @@ func (d *DeploymentConfigDescriber) Describe(namespace, name string) (string, er

 				formatString(out, "Latest Deployment", fmt.Sprintf("error: %v", err))

 			}

 		} else {

-			header := fmt.Sprintf("Deployment #%v (latest)", deployment.Annotations[deployapi.DeploymentVersionAnnotation])

+			header := fmt.Sprintf("Deployment #%d (latest)", deployutil.DeploymentVersionFor(deployment))

 			printDeploymentRc(deployment, d.client, out, header, true)

 		}

 		deploymentsHistory, err := d.client.listDeployments(namespace, labels.Everything())

@@ -148,8 +148,8 @@ func (d *DeploymentConfigDescriber) Describe(namespace, name string) (string, er

 			sorted = append(sorted, deploymentsHistory.Items...)

 			sort.Sort(sorted)

 			for _, item := range sorted {

-				if item.Name != deploymentName && deploymentConfig.Name == item.Annotations[deployapi.DeploymentConfigAnnotation] {

-					header := fmt.Sprintf("Deployment #%v", item.Annotations[deployapi.DeploymentVersionAnnotation])

+				if item.Name != deploymentName && deploymentConfig.Name == deployutil.DeploymentConfigNameFor(&item) {

+					header := fmt.Sprintf("Deployment #%d", deployutil.DeploymentVersionFor(&item))

 					printDeploymentRc(&item, d.client, out, header, false)

 				}

 			}

@@ -249,7 +249,7 @@ func printDeploymentRc(deployment *kapi.ReplicationController, client deployment

 	}

 	timeAt := strings.ToLower(formatRelativeTime(deployment.CreationTimestamp.Time))

 	fmt.Fprintf(w, "\tCreated:\t%s ago\n", timeAt)

-	fmt.Fprintf(w, "\tStatus:\t%s\n", deployment.Annotations[deployapi.DeploymentStatusAnnotation])

+	fmt.Fprintf(w, "\tStatus:\t%s\n", deployutil.DeploymentStatusFor(deployment))

 	fmt.Fprintf(w, "\tReplicas:\t%d current / %d desired\n", deployment.Status.Replicas, deployment.Spec.Replicas)

 	if verbose {

@@ -16,6 +16,7 @@ import (

 	buildapi "github.com/openshift/origin/pkg/build/api"

 	"github.com/openshift/origin/pkg/client"

 	deployapi "github.com/openshift/origin/pkg/deploy/api"

+	deployutil "github.com/openshift/origin/pkg/deploy/util"

 )

 // ProjectStatusDescriber generates extended information about a Project

@@ -374,8 +375,7 @@ func describeDeployments(node *graph.DeploymentConfigNode, count int) []string {

 		switch {

 		case count == -1:

-			status := deployment.Annotations[deployapi.DeploymentStatusAnnotation]

-			if deployapi.DeploymentStatus(status) == deployapi.DeploymentStatusComplete {

+			if deployutil.DeploymentStatusFor(deployment) == deployapi.DeploymentStatusComplete {

 				return out

 			}

 		default:

@@ -389,15 +389,17 @@ func describeDeployments(node *graph.DeploymentConfigNode, count int) []string {

 func describeDeploymentStatus(deploy *kapi.ReplicationController) string {

 	timeAt := strings.ToLower(formatRelativeTime(deploy.CreationTimestamp.Time))

-	switch s := deploy.Annotations[deployapi.DeploymentStatusAnnotation]; deployapi.DeploymentStatus(s) {

+	status := deployutil.DeploymentStatusFor(deploy)

+	version := deployutil.DeploymentVersionFor(deploy)

+	switch status {

 	case deployapi.DeploymentStatusFailed:

 		// TODO: encode fail time in the rc

-		return fmt.Sprintf("#%s deployment failed %s ago. You can restart this deployment with osc deploy --retry.", deploy.Annotations[deployapi.DeploymentVersionAnnotation], timeAt)

+		return fmt.Sprintf("#%d deployment failed %s ago. You can restart this deployment with osc deploy --retry.", version, timeAt)

 	case deployapi.DeploymentStatusComplete:

 		// TODO: pod status output

-		return fmt.Sprintf("#%s deployed %s ago", deploy.Annotations[deployapi.DeploymentVersionAnnotation], timeAt)

+		return fmt.Sprintf("#%d deployed %s ago", version, timeAt)

 	default:

-		return fmt.Sprintf("#%s deployment %s %s ago", deploy.Annotations[deployapi.DeploymentVersionAnnotation], strings.ToLower(s), timeAt)

+		return fmt.Sprintf("#%d deployment %s %s ago", version, strings.ToLower(string(status)), timeAt)

 	}

 }

@@ -2,7 +2,6 @@ package deployer

 import (

 	"fmt"

-	"strconv"

 	kapi "github.com/GoogleCloudPlatform/kubernetes/pkg/api"

 	kclient "github.com/GoogleCloudPlatform/kubernetes/pkg/client"

@@ -136,20 +135,12 @@ func getDeployerContext(controllerGetter replicationControllerGetter, namespace,

 	glog.Infof("Inspecting %d potential prior deployments", len(allControllers.Items))

 	for i, controller := range allControllers.Items {

-		if configName, hasConfigName := controller.Annotations[deployapi.DeploymentConfigAnnotation]; !hasConfigName {

-			glog.Infof("Disregarding replicationController %s (not a deployment)", controller.Name)

+		if oldName := deployutil.DeploymentConfigNameFor(&controller); oldName != newConfig.Name {

+			glog.Infof("Disregarding deployment %s (doesn't match target deploymentConfig %s)", controller.Name, oldName)

 			continue

-		} else if configName != newConfig.Name {

-			glog.Infof("Disregarding deployment %s (doesn't match target deploymentConfig %s)", controller.Name, configName)

-			continue

-		}

-

-		var oldVersion int

-		if oldVersion, err = strconv.Atoi(controller.Annotations[deployapi.DeploymentVersionAnnotation]); err != nil {

-			return nil, nil, fmt.Errorf("Couldn't determine version of deployment %s: %v", controller.Name, err)

 		}

-		if oldVersion < newConfig.LatestVersion {

+		if deployutil.DeploymentVersionFor(&controller) < newConfig.LatestVersion {

 			glog.Infof("Marking deployment %s as a prior deployment", controller.Name)

 			oldDeployments = append(oldDeployments, &allControllers.Items[i])

 		} else {

@@ -158,44 +158,6 @@ func TestGetDeploymentContextWithPriorDeployments(t *testing.T) {

 	}

 }

-func TestGetDeploymentContextInvalidPriorDeployment(t *testing.T) {

-	getter := &testReplicationControllerGetter{

-		getFunc: func(namespace, name string) (*kapi.ReplicationController, error) {

-			deployment, _ := deployutil.MakeDeployment(deploytest.OkDeploymentConfig(1), kapi.Codec)

-			return deployment, nil

-		},

-		listFunc: func(namespace string, selector labels.Selector) (*kapi.ReplicationControllerList, error) {

-			return &kapi.ReplicationControllerList{

-				Items: []kapi.ReplicationController{

-					{

-						ObjectMeta: kapi.ObjectMeta{

-							Name: "corrupt-deployment",

-							Annotations: map[string]string{

-								deployapi.DeploymentConfigAnnotation:  "config",

-								deployapi.DeploymentVersionAnnotation: "junk",

-							},

-						},

-					},

-				},

-			}, nil

-		},

-	}

-

-	newDeployment, oldDeployments, err := getDeployerContext(getter, kapi.NamespaceDefault, "deployment")

-

-	if newDeployment != nil {

-		t.Fatalf("unexpected newDeployment: %#v", newDeployment)

-	}

-

-	if oldDeployments != nil {

-		t.Fatalf("unexpected oldDeployments: %#v", oldDeployments)

-	}

-

-	if err == nil {

-		t.Fatal("expected an error")

-	}

-}

-

 type testReplicationControllerGetter struct {

 	getFunc  func(namespace, name string) (*kapi.ReplicationController, error)

 	listFunc func(namespace string, selector labels.Selector) (*kapi.ReplicationControllerList, error)

@@ -153,24 +153,24 @@ type DeploymentList struct {

 const (

 	// DeploymentConfigAnnotation is an annotation name used to correlate a deployment with the

 	// DeploymentConfig on which the deployment is based.

-	DeploymentConfigAnnotation = "deploymentConfig"

+	DeploymentConfigAnnotation = "openshift.io/deployment-config.name"

 	// DeploymentAnnotation is an annotation on a deployer Pod. The annotation value is the name

 	// of the deployment (a ReplicationController) on which the deployer Pod acts.

-	DeploymentAnnotation = "deployment"

+	DeploymentAnnotation = "openshift.io/deployment.name"

 	// DeploymentPodAnnotation is an annotation on a deployment (a ReplicationController). The

 	// annotation value is the name of the deployer Pod which will act upon the ReplicationController

 	// to implement the deployment behavior.

-	DeploymentPodAnnotation = "pod"

-	// DeploymentStatusAnnotation is an annotation name used to retrieve the DeploymentStatus of

+	DeploymentPodAnnotation = "openshift.io/deployer-pod.name"

+	// DeploymentStatusAnnotation is an annotation name used to retrieve the DeploymentPhase of

 	// a deployment.

-	DeploymentStatusAnnotation = "deploymentStatus"

+	DeploymentStatusAnnotation = "openshift.io/deployment.phase"

 	// DeploymentEncodedConfigAnnotation is an annotation name used to retrieve specific encoded

 	// DeploymentConfig on which a given deployment is based.

-	DeploymentEncodedConfigAnnotation = "encodedDeploymentConfig"

+	DeploymentEncodedConfigAnnotation = "openshift.io/encoded-deployment-config"

 	// DeploymentVersionAnnotation is an annotation on a deployment (a ReplicationController). The

 	// annotation value is the LatestVersion value of the DeploymentConfig which was the basis for

 	// the deployment.

-	DeploymentVersionAnnotation = "deploymentVersion"

+	DeploymentVersionAnnotation = "openshift.io/deployment-config.latest-version"

 	// DeploymentLabel is the name of a label used to correlate a deployment with the Pod created

 	// to execute the deployment logic.

 	// TODO: This is a workaround for upstream's lack of annotation support on PodTemplate. Once

@@ -121,24 +121,24 @@ type RollingDeploymentStrategyParams struct {

 const (

 	// DeploymentConfigAnnotation is an annotation name used to correlate a deployment with the

 	// DeploymentConfig on which the deployment is based.

-	DeploymentConfigAnnotation = "deploymentConfig"

+	DeploymentConfigAnnotation = "openshift.io/deployment-config.name"

 	// DeploymentAnnotation is an annotation on a deployer Pod. The annotation value is the name

 	// of the deployment (a ReplicationController) on which the deployer Pod acts.

-	DeploymentAnnotation = "deployment"

+	DeploymentAnnotation = "openshift.io/deployment.name"

 	// DeploymentPodAnnotation is an annotation on a deployment (a ReplicationController). The

 	// annotation value is the name of the deployer Pod which will act upon the ReplicationController

 	// to implement the deployment behavior.

-	DeploymentPodAnnotation = "pod"

+	DeploymentPodAnnotation = "openshift.io/deployer-pod.name"

 	// DeploymentPhaseAnnotation is an annotation name used to retrieve the DeploymentPhase of

 	// a deployment.

-	DeploymentPhaseAnnotation = "deploymentStatus"

+	DeploymentPhaseAnnotation = "openshift.io/deployment.phase"

 	// DeploymentEncodedConfigAnnotation is an annotation name used to retrieve specific encoded

 	// DeploymentConfig on which a given deployment is based.

-	DeploymentEncodedConfigAnnotation = "encodedDeploymentConfig"

+	DeploymentEncodedConfigAnnotation = "openshift.io/encoded-deployment-config"

 	// DeploymentVersionAnnotation is an annotation on a deployment (a ReplicationController). The

 	// annotation value is the LatestVersion value of the DeploymentConfig which was the basis for

 	// the deployment.

-	DeploymentVersionAnnotation = "deploymentVersion"

+	DeploymentVersionAnnotation = "openshift.io/deployment-config.latest-version"

 	// DeploymentLabel is the name of a label used to correlate a deployment with the Pod created

 	// to execute the deployment logic.

 	// TODO: This is a workaround for upstream's lack of annotation support on PodTemplate. Once

@@ -23,8 +23,8 @@ type DeployerPodController struct {

 // Handle syncs pod's status with any associated deployment.

 func (c *DeployerPodController) Handle(pod *kapi.Pod) error {

 	// Verify the assumption that we'll be given only pods correlated to a deployment

-	deploymentName, hasDeploymentName := pod.Annotations[deployapi.DeploymentAnnotation]

-	if !hasDeploymentName {

+	deploymentName := deployutil.DeploymentNameFor(pod)

+	if len(deploymentName) == 0 {

 		glog.V(2).Infof("Ignoring pod %s; no deployment annotation found", pod.Name)

 		return nil

 	}

@@ -34,7 +34,7 @@ func (c *DeployerPodController) Handle(pod *kapi.Pod) error {

 		return fmt.Errorf("couldn't get deployment %s/%s associated with pod %s", pod.Namespace, deploymentName, pod.Name)

 	}

-	currentStatus := deployutil.StatusForDeployment(deployment)

+	currentStatus := deployutil.DeploymentStatusFor(deployment)

 	nextStatus := currentStatus

 	switch pod.Status.Phase {

@@ -85,7 +85,7 @@ func TestHandle_runningPod(t *testing.T) {

 		t.Fatalf("expected deployment update")

 	}

-	if e, a := deployapi.DeploymentStatusRunning, deployutil.StatusForDeployment(updatedDeployment); e != a {

+	if e, a := deployapi.DeploymentStatusRunning, deployutil.DeploymentStatusFor(updatedDeployment); e != a {

 		t.Fatalf("expected updated deployment status %s, got %s", e, a)

 	}

 }

@@ -120,7 +120,7 @@ func TestHandle_podTerminatedOk(t *testing.T) {

 		t.Fatalf("expected deployment update")

 	}

-	if e, a := deployapi.DeploymentStatusComplete, deployutil.StatusForDeployment(updatedDeployment); e != a {

+	if e, a := deployapi.DeploymentStatusComplete, deployutil.DeploymentStatusFor(updatedDeployment); e != a {

 		t.Fatalf("expected updated deployment status %s, got %s", e, a)

 	}

 }

@@ -155,7 +155,7 @@ func TestHandle_podTerminatedFail(t *testing.T) {

 		t.Fatalf("expected deployment update")

 	}

-	if e, a := deployapi.DeploymentStatusFailed, deployutil.StatusForDeployment(updatedDeployment); e != a {

+	if e, a := deployapi.DeploymentStatusFailed, deployutil.DeploymentStatusFor(updatedDeployment); e != a {

 		t.Fatalf("expected updated deployment status %s, got %s", e, a)

 	}

 }

@@ -91,11 +91,11 @@ func pollPods(deploymentStore cache.Store, kClient kclient.PodsNamespacer) (cach

 	for _, obj := range deploymentStore.List() {

 		deployment := obj.(*kapi.ReplicationController)

-		switch deployapi.DeploymentStatus(deployment.Annotations[deployapi.DeploymentStatusAnnotation]) {

+		switch deployutil.DeploymentStatusFor(deployment) {

 		case deployapi.DeploymentStatusPending, deployapi.DeploymentStatusRunning:

 			// Validate the correlating pod annotation

-			podID, hasPodID := deployment.Annotations[deployapi.DeploymentPodAnnotation]

-			if !hasPodID {

+			podID := deployutil.DeployerPodNameFor(deployment)

+			if len(podID) == 0 {

 				glog.V(2).Infof("Unexpected state: deployment %s has no pod annotation; skipping pod polling", deployment.Name)

 				continue

 			}

@@ -44,7 +44,7 @@ func (e fatalError) Error() string { return "fatal error handling deployment: "

 // Handle processes deployment and either creates a deployer pod or responds

 // to a terminal deployment status.

 func (c *DeploymentController) Handle(deployment *kapi.ReplicationController) error {

-	currentStatus := deployutil.StatusForDeployment(deployment)

+	currentStatus := deployutil.DeploymentStatusFor(deployment)

 	nextStatus := currentStatus

 	switch currentStatus {

@@ -76,7 +76,7 @@ func (c *DeploymentController) Handle(deployment *kapi.ReplicationController) er

 		// Automatically clean up successful pods

 		// TODO: Could probably do a lookup here to skip the delete call, but it's not worth adding

 		// yet since (delete retries will only normally occur during full a re-sync).

-		podName := deployment.Annotations[deployapi.DeploymentPodAnnotation]

+		podName := deployutil.DeployerPodNameFor(deployment)

 		if err := c.podClient.deletePod(deployment.Namespace, podName); err != nil {

 			if !kerrors.IsNotFound(err) {

 				return fmt.Errorf("couldn't delete completed deployer pod %s/%s for deployment %s: %v", deployment.Namespace, podName, deployutil.LabelForDeployment(deployment), err)

@@ -37,6 +37,7 @@ func TestHandle_createPodOk(t *testing.T) {

 		podClient: &podClientImpl{

 			createPodFunc: func(namespace string, pod *kapi.Pod) (*kapi.Pod, error) {

 				createdPod = pod

+				pod.Name = pod.GenerateName

 				return pod, nil

 			},

 		},

@@ -60,7 +61,7 @@ func TestHandle_createPodOk(t *testing.T) {

 		t.Fatalf("expected an updated deployment")

 	}

-	if e, a := string(deployapi.DeploymentStatusPending), updatedDeployment.Annotations[deployapi.DeploymentStatusAnnotation]; e != a {

+	if e, a := deployapi.DeploymentStatusPending, deployutil.DeploymentStatusFor(updatedDeployment); e != a {

 		t.Fatalf("expected updated deployment status %s, got %s", e, a)

 	}

@@ -68,19 +69,19 @@ func TestHandle_createPodOk(t *testing.T) {

 		t.Fatalf("expected a pod to be created")

 	}

-	if _, hasPodAnnotation := updatedDeployment.Annotations[deployapi.DeploymentPodAnnotation]; !hasPodAnnotation {

+	if e := deployutil.DeployerPodNameFor(updatedDeployment); len(e) == 0 {

 		t.Fatalf("missing deployment pod annotation")

 	}

-	if e, a := createdPod.Name, updatedDeployment.Annotations[deployapi.DeploymentPodAnnotation]; e != a {

+	if e, a := createdPod.Name, deployutil.DeployerPodNameFor(updatedDeployment); e != a {

 		t.Fatalf("expected deployment pod annotation %s, got %s", e, a)

 	}

-	if _, hasDeploymentAnnotation := createdPod.Annotations[deployapi.DeploymentAnnotation]; !hasDeploymentAnnotation {

+	if e := deployutil.DeploymentNameFor(createdPod); len(e) == 0 {

 		t.Fatalf("missing deployment annotation")

 	}

-	if e, a := updatedDeployment.Name, createdPod.Annotations[deployapi.DeploymentAnnotation]; e != a {

+	if e, a := updatedDeployment.Name, deployutil.DeploymentNameFor(createdPod); e != a {

 		t.Fatalf("expected pod deployment annotation %s, got %s", e, a)

 	}

@@ -71,7 +71,7 @@ func (c *DeploymentConfigController) Handle(config *deployapi.DeploymentConfig)

 		return fmt.Errorf("couldn't list deployments for config %s: %v", deployutil.LabelForDeploymentConfig(config), err)

 	}

 	for _, deployment := range existingDeployments.Items {

-		deploymentStatus := deployutil.StatusForDeployment(&deployment)

+		deploymentStatus := deployutil.DeploymentStatusFor(&deployment)

 		switch deploymentStatus {

 		case deployapi.DeploymentStatusFailed,

 			deployapi.DeploymentStatusComplete:

@@ -2,7 +2,6 @@ package rolling

 import (

 	"fmt"

-	"strconv"

 	"time"

 	"github.com/golang/glog"

@@ -14,7 +13,6 @@ import (

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/util/wait"

-	deployapi "github.com/openshift/origin/pkg/deploy/api"

 	"github.com/openshift/origin/pkg/deploy/strategy"

 	deployutil "github.com/openshift/origin/pkg/deploy/util"

 )

@@ -158,17 +156,10 @@ func (s *RollingDeploymentStrategy) findLatestDeployment(oldDeployments []*kapi.

 	var latest *kapi.ReplicationController

 	latestVersion := 0

 	for _, deployment := range oldDeployments {

-		if val, hasVersion := deployment.Annotations[deployapi.DeploymentVersionAnnotation]; hasVersion {

-			version, err := strconv.Atoi(val)

-			if err != nil {

-				return nil, fmt.Errorf("deployment %s/%s has invalid version annotation value '%s': %v", deployment.Namespace, deployment.Name, val, err)

-			}

-			if version > latestVersion {

-				latest = deployment

-				latestVersion = version

-			}

-		} else {

-			glog.Infof("Ignoring deployment with missing version annotation: %s/%s", deployment.Namespace, deployment.Name)

+		version := deployutil.DeploymentVersionFor(deployment)

+		if version > latestVersion {

+			latest = deployment

+			latestVersion = version

 		}

 	}

 	if latest != nil {

@@ -142,10 +142,6 @@ func TestRolling_findLatestDeployment(t *testing.T) {

 		deployments[deployment.Name] = deployment

 	}

-	ignoredDeployment, _ := deployutil.MakeDeployment(deploytest.OkDeploymentConfig(12), kapi.Codec)

-	delete(ignoredDeployment.Annotations, deployapi.DeploymentVersionAnnotation)

-	deployments[ignoredDeployment.Name] = ignoredDeployment

-

 	strategy := &RollingDeploymentStrategy{

 		codec: api.Codec,

 		client: &rollingUpdaterClient{

@@ -178,7 +174,6 @@ func TestRolling_findLatestDeployment(t *testing.T) {

 				"config-3",

 				"config-1",

 				"config-7",

-				ignoredDeployment.Name,

 			},

 			latest: "config-7",

 		},

@@ -206,24 +201,6 @@ func TestRolling_findLatestDeployment(t *testing.T) {

 	}

 }

-func TestRolling_findLatestDeploymentInvalidDeployment(t *testing.T) {

-	deployment, _ := deployutil.MakeDeployment(deploytest.OkDeploymentConfig(1), kapi.Codec)

-	deployment.Annotations[deployapi.DeploymentVersionAnnotation] = ""

-

-	strategy := &RollingDeploymentStrategy{

-		codec: api.Codec,

-		client: &rollingUpdaterClient{

-			GetReplicationControllerFn: func(namespace, name string) (*kapi.ReplicationController, error) {

-				return deployment, nil

-			},

-		},

-	}

-	_, err := strategy.findLatestDeployment([]*kapi.ReplicationController{deployment})

-	if err == nil {

-		t.Errorf("expected an error")

-	}

-}

-

 type testStrategy struct {

 	deployFn func(deployment *kapi.ReplicationController, oldDeployments []*kapi.ReplicationController) error

 }

@@ -14,8 +14,38 @@ import (

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/watch"

 	deployapi "github.com/openshift/origin/pkg/deploy/api"

+	deployv1 "github.com/openshift/origin/pkg/deploy/api/v1beta1"

+	deployv3 "github.com/openshift/origin/pkg/deploy/api/v1beta3"

 )

+// Maps the latest annotation keys to all known previous key names.

+var annotationMap = map[string][]string{

+	deployapi.DeploymentConfigAnnotation: {

+		deployv1.DeploymentConfigAnnotation,

+		deployv3.DeploymentConfigAnnotation,

+	},

+	deployapi.DeploymentAnnotation: {

+		deployv1.DeploymentAnnotation,

+		deployv3.DeploymentAnnotation,

+	},

+	deployapi.DeploymentPodAnnotation: {

+		deployv1.DeploymentPodAnnotation,

+		deployv3.DeploymentPodAnnotation,

+	},

+	deployapi.DeploymentStatusAnnotation: {

+		deployv1.DeploymentStatusAnnotation,

+		deployv3.DeploymentPhaseAnnotation,

+	},

+	deployapi.DeploymentEncodedConfigAnnotation: {

+		deployv1.DeploymentEncodedConfigAnnotation,

+		deployv3.DeploymentEncodedConfigAnnotation,

+	},

+	deployapi.DeploymentVersionAnnotation: {

+		deployv1.DeploymentVersionAnnotation,

+		deployv3.DeploymentVersionAnnotation,

+	},

+}

+

 // LatestDeploymentNameForConfig returns a stable identifier for config based on its version.

 func LatestDeploymentNameForConfig(config *deployapi.DeploymentConfig) string {

 	return config.Name + "-" + strconv.Itoa(config.LatestVersion)

@@ -25,11 +55,6 @@ func DeployerPodNameForDeployment(deployment *api.ReplicationController) string

 	return fmt.Sprintf("deploy-%s", deployment.Name)

 }

-// StatusForDeployment gets the DeploymentStatus for deployment from its annotations.

-func StatusForDeployment(deployment *api.ReplicationController) deployapi.DeploymentStatus {

-	return deployapi.DeploymentStatus(deployment.Annotations[deployapi.DeploymentStatusAnnotation])

-}

-

 // LabelForDeployment builds a string identifier for a Deployment.

 func LabelForDeployment(deployment *api.ReplicationController) string {

 	return fmt.Sprintf("%s/%s", deployment.Namespace, deployment.Name)

@@ -67,7 +92,7 @@ func PodSpecsEqual(a, b api.PodSpec) bool {

 // DecodeDeploymentConfig decodes a DeploymentConfig from controller using codec. An error is returned

 // if the controller doesn't contain an encoded config.

 func DecodeDeploymentConfig(controller *api.ReplicationController, codec runtime.Codec) (*deployapi.DeploymentConfig, error) {

-	encodedConfig := []byte(controller.Annotations[deployapi.DeploymentEncodedConfigAnnotation])

+	encodedConfig := []byte(EncodedDeploymentConfigFor(controller))

 	if decoded, err := codec.Decode(encodedConfig); err == nil {

 		if config, ok := decoded.(*deployapi.DeploymentConfig); ok {

 			return config, nil

@@ -177,3 +202,47 @@ func (lw *ListWatcherImpl) List() (runtime.Object, error) {

 func (lw *ListWatcherImpl) Watch(resourceVersion string) (watch.Interface, error) {

 	return lw.WatchFunc(resourceVersion)

 }

+

+func DeploymentConfigNameFor(obj runtime.Object) string {

+	return mappedAnnotationFor(obj, deployapi.DeploymentConfigAnnotation)

+}

+

+func DeploymentNameFor(obj runtime.Object) string {

+	return mappedAnnotationFor(obj, deployapi.DeploymentAnnotation)

+}

+

+func DeployerPodNameFor(obj runtime.Object) string {

+	return mappedAnnotationFor(obj, deployapi.DeploymentPodAnnotation)

+}

+

+func DeploymentStatusFor(obj runtime.Object) deployapi.DeploymentStatus {

+	return deployapi.DeploymentStatus(mappedAnnotationFor(obj, deployapi.DeploymentStatusAnnotation))

+}

+

+func EncodedDeploymentConfigFor(obj runtime.Object) string {

+	return mappedAnnotationFor(obj, deployapi.DeploymentEncodedConfigAnnotation)

+}

+

+func DeploymentVersionFor(obj runtime.Object) int {

+	v, err := strconv.Atoi(mappedAnnotationFor(obj, deployapi.DeploymentVersionAnnotation))

+	if err != nil {

+		return -1

+	}

+	return v

+}

+

+// mappedAnnotationFor finds the given annotation in obj using the annotation

+// map to search all known key variants.

+func mappedAnnotationFor(obj runtime.Object, key string) string {

+	meta, err := api.ObjectMetaFor(obj)

+	if err != nil {

+		return ""

+	}

+	for _, mappedKey := range annotationMap[key] {

+		val, hasVal := meta.Annotations[mappedKey]

+		if hasVal {

+			return val

+		}

+	}

+	return ""

+}

@@ -108,7 +108,7 @@ func TestMakeDeploymentOk(t *testing.T) {

 		}

 	}

-	if len(deployment.Annotations[deployapi.DeploymentEncodedConfigAnnotation]) == 0 {

+	if len(EncodedDeploymentConfigFor(deployment)) == 0 {

 		t.Fatalf("expected deployment with DeploymentEncodedConfigAnnotation annotation")

 	}

@@ -35,6 +35,7 @@ import (

 	deployconfiggenerator "github.com/openshift/origin/pkg/deploy/generator"

 	deployconfigregistry "github.com/openshift/origin/pkg/deploy/registry/deployconfig"

 	deployetcd "github.com/openshift/origin/pkg/deploy/registry/etcd"

+	deployutil "github.com/openshift/origin/pkg/deploy/util"

 	imageapi "github.com/openshift/origin/pkg/image/api"

 	"github.com/openshift/origin/pkg/image/registry/image"

 	imageetcd "github.com/openshift/origin/pkg/image/registry/image/etcd"

@@ -97,10 +98,10 @@ func TestTriggers_manual(t *testing.T) {

 	}

 	deployment := event.Object.(*kapi.ReplicationController)

-	if e, a := config.Name, deployment.Annotations[deployapi.DeploymentConfigAnnotation]; e != a {

+	if e, a := config.Name, deployutil.DeploymentConfigNameFor(deployment); e != a {

 		t.Fatalf("Expected deployment annotated with deploymentConfig '%s', got '%s'", e, a)

 	}

-	if e, a := "1", deployment.Annotations[deployapi.DeploymentVersionAnnotation]; e != a {

+	if e, a := 1, deployutil.DeploymentVersionFor(deployment); e != a {

 		t.Fatalf("Deployment annotation version does not match: %#v", deployment)

 	}

 }

@@ -201,7 +202,7 @@ waitForNewRC:

 		}

 	}

-	if e, a := config.Name, deployment.Annotations[deployapi.DeploymentConfigAnnotation]; e != a {

+	if e, a := config.Name, deployutil.DeploymentConfigNameFor(deployment); e != a {

 		t.Fatalf("Expected deployment annotated with deploymentConfig '%s', got '%s'", e, a)

 	}

@@ -217,7 +218,7 @@ waitForPendingStatus:

 			}

 		}

 	}

-	if e, a := string(deployapi.DeploymentStatusPending), deployment.Annotations[deployapi.DeploymentStatusAnnotation]; e != a {

+	if e, a := deployapi.DeploymentStatusPending, deployutil.DeploymentStatusFor(deployment); e != a {

 		t.Fatalf("expected deployment status %q, got %q", e, a)

 	}

@@ -287,7 +288,7 @@ func TestTriggers_configChange(t *testing.T) {

 	deployment := event.Object.(*kapi.ReplicationController)

-	if e, a := config.Name, deployment.Annotations[deployapi.DeploymentConfigAnnotation]; e != a {

+	if e, a := config.Name, deployutil.DeploymentConfigNameFor(deployment); e != a {

 		t.Fatalf("Expected deployment annotated with deploymentConfig '%s', got '%s'", e, a)

 	}