Drop DeploymentConfigAnnotation from appsapi entirely

pkg/apps/apis/apps/types.go

@@ -27,9 +27,6 @@ const (
 
 // These constants represent keys used for correlating objects related to deployments.
 const (
-	// DeploymentConfigAnnotation is an annotation name used to correlate a deployment with the
-	// DeploymentConfig on which the deployment is based.
-	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 = "openshift.io/deployment.name"

pkg/apps/metrics/prometheus/metrics_test.go

@@ -14,7 +14,7 @@ import (
 	kcorelisters "k8s.io/client-go/listers/core/v1"
 	"k8s.io/client-go/tools/cache"
 
-	appsapi "github.com/openshift/origin/pkg/apps/apis/apps"
+	appsutil "github.com/openshift/origin/pkg/apps/util"
 )
 
 var (
@@ -24,7 +24,7 @@ var (
 
 func mockRC(name string, version int, annotations map[string]string, generation int64, creationTime metav1.Time) *kapiv1.ReplicationController {
 	r := &kapiv1.ReplicationController{}
-	annotations[appsapi.DeploymentConfigAnnotation] = name
+	annotations[appsutil.DeploymentConfigAnnotation] = name
 	r.SetName(name + fmt.Sprintf("-%d", version))
 	r.SetNamespace("test")
 	r.SetCreationTimestamp(creationTime)

pkg/oc/cli/admin/diagnostics/diagnostics/cluster/aggregated_logging/deploymentconfigs.go

@@ -10,7 +10,7 @@ import (
 	kapi "k8s.io/kubernetes/pkg/apis/core"
 
 	appsv1 "github.com/openshift/api/apps/v1"
-	appsapi "github.com/openshift/origin/pkg/apps/apis/apps"
+	appsutil "github.com/openshift/origin/pkg/apps/util"
 )
 
 const (
@@ -113,7 +113,7 @@ func checkDeploymentConfigPods(r diagnosticReporter, adapter deploymentConfigAda
 
 	for _, pod := range podList.Items {
 		r.Debug("AGL0082", fmt.Sprintf("Checking status of Pod '%s'...", pod.ObjectMeta.Name))
-		dcName, hasDcName := pod.ObjectMeta.Annotations[appsapi.DeploymentConfigAnnotation]
+		dcName, hasDcName := pod.ObjectMeta.Annotations[appsutil.DeploymentConfigAnnotation]
 		if !hasDcName {
 			r.Warn("AGL0085", nil, fmt.Sprintf("Found Pod '%s' that that does not reference a logging deployment config which may be acceptable. Skipping check to see if its running.", pod.ObjectMeta.Name))
 			continue

pkg/oc/cli/admin/prune/deployments/data.go

@@ -9,7 +9,6 @@ import (
 	"k8s.io/client-go/tools/cache"
 
 	appsv1 "github.com/openshift/api/apps/v1"
-	appsapi "github.com/openshift/origin/pkg/apps/apis/apps"
 	appsutil "github.com/openshift/origin/pkg/apps/util"
 )
 
@@ -146,7 +145,7 @@ func (d *dataSet) ListDeploymentsByDeploymentConfig(deploymentConfig *appsv1.Dep
 	key := &corev1.ReplicationController{
 		ObjectMeta: metav1.ObjectMeta{
 			Namespace:   deploymentConfig.Namespace,
-			Annotations: map[string]string{appsapi.DeploymentConfigAnnotation: deploymentConfig.Name},
+			Annotations: map[string]string{appsutil.DeploymentConfigAnnotation: deploymentConfig.Name},
 		},
 	}
 	items, err := d.deploymentIndexer.Index("deploymentConfig", key)

pkg/oc/cli/admin/prune/deployments/data_test.go

@@ -11,6 +11,7 @@ import (
 
 	appsv1 "github.com/openshift/api/apps/v1"
 	appsapi "github.com/openshift/origin/pkg/apps/apis/apps"
+	appsutil "github.com/openshift/origin/pkg/apps/util"
 )
 
 func mockDeploymentConfig(namespace, name string) *appsv1.DeploymentConfig {
@@ -29,7 +30,7 @@ func withCreated(item *corev1.ReplicationController, creationTimestamp metav1.Ti
 }
 
 func withStatus(item *corev1.ReplicationController, status appsapi.DeploymentStatus) *corev1.ReplicationController {
-	item.Annotations[appsapi.DeploymentStatusAnnotation] = string(status)
+	item.Annotations[appsutil.DeploymentStatusAnnotation] = string(status)
 	return item
 }
 
@@ -40,9 +41,9 @@ func mockDeployment(namespace, name string, deploymentConfig *appsv1.DeploymentC
 		Spec:       corev1.ReplicationControllerSpec{Replicas: &zero},
 	}
 	if deploymentConfig != nil {
-		item.Annotations[appsapi.DeploymentConfigAnnotation] = deploymentConfig.Name
+		item.Annotations[appsutil.DeploymentConfigAnnotation] = deploymentConfig.Name
 	}
-	item.Annotations[appsapi.DeploymentStatusAnnotation] = string(appsapi.DeploymentStatusNew)
+	item.Annotations[appsutil.DeploymentStatusAnnotation] = string(appsutil.DeploymentStatusNew)
 	return item
 }
 
@@ -132,7 +133,7 @@ func TestPopulatedDataSet(t *testing.T) {
 	dataSet := NewDataSet(deploymentConfigs, deployments)
 	for _, deployment := range deployments {
 		deploymentConfig, exists, err := dataSet.GetDeploymentConfig(deployment)
-		config, hasConfig := deployment.Annotations[appsapi.DeploymentConfigAnnotation]
+		config, hasConfig := deployment.Annotations[appsutil.DeploymentConfigAnnotation]
 		if hasConfig {
 			if err != nil {
 				t.Errorf("Item %v, unexpected error: %v", deployment, err)

pkg/oc/cli/debug/debug.go

@@ -42,7 +42,6 @@ import (
 	imagev1 "github.com/openshift/api/image/v1"
 	appsv1client "github.com/openshift/client-go/apps/clientset/versioned/typed/apps/v1"
 	imagev1client "github.com/openshift/client-go/image/clientset/versioned/typed/image/v1"
-	appsapi "github.com/openshift/origin/pkg/apps/apis/apps"
 	appsutil "github.com/openshift/origin/pkg/apps/util"
 	imageapi "github.com/openshift/origin/pkg/image/apis/image"
 	imageutil "github.com/openshift/origin/pkg/image/util"
@@ -486,7 +485,7 @@ func (o *DebugOptions) getContainerImageViaDeploymentConfig(pod *corev1.Pod, con
 		return nil, nil // ID is needed for later lookup
 	}
 
-	dcname := pod.Annotations[appsapi.DeploymentConfigAnnotation]
+	dcname := pod.Annotations[appsutil.DeploymentConfigAnnotation]
 	if dcname == "" {
 		return nil, nil // Pod doesn't appear to have been created by a DeploymentConfig
 	}