e2e: migrate DCs to Deployments

Author: ingvagabund

test/extended/idling/idling.go

@@ -237,7 +237,7 @@ var _ = g.Describe("[sig-network-edge][Feature:Idling]", func() {
 		})
 	})
 
-	g.Describe("Unidling [apigroup:apps.openshift.io][apigroup:route.openshift.io]", func() {
+	g.Describe("Unidling [apigroup:route.openshift.io]", func() {
 		g.BeforeEach(func() {
 			fixture = echoServerFixture
 		})

test/extended/scheduling/pods.go

@@ -136,7 +136,7 @@ var _ = g.Describe("[sig-scheduling][Early]", func() {
 		})
 	})
 
-	g.Describe("The openshift-apiserver pods [apigroup:apps.openshift.io][apigroup:authorization.openshift.io][apigroup:build.openshift.io][apigroup:image.openshift.io][apigroup:project.openshift.io][apigroup:quota.openshift.io][apigroup:route.openshift.io][apigroup:security.openshift.io][apigroup:template.openshift.io]", func() {
+	g.Describe("The openshift-apiserver pods [apigroup:authorization.openshift.io][apigroup:build.openshift.io][apigroup:image.openshift.io][apigroup:project.openshift.io][apigroup:quota.openshift.io][apigroup:route.openshift.io][apigroup:security.openshift.io][apigroup:template.openshift.io]", func() {
 		g.It("should be scheduled on different nodes", func() {
 			requirePodsOnDifferentNodesTest{namespace: "openshift-apiserver", deployment: "apiserver"}.run(oc)
 		})

test/extended/templates/templateinstance_readiness.go

@@ -9,17 +9,17 @@ import (
 	g "github.com/onsi/ginkgo/v2"
 	o "github.com/onsi/gomega"
 
+	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	v1 "k8s.io/api/core/v1"
 	kerrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/wait"
+	deploymentutil "k8s.io/kubernetes/pkg/controller/deployment/util"
 	admissionapi "k8s.io/pod-security-admission/api"
 
-	appsv1 "github.com/openshift/api/apps/v1"
 	buildv1 "github.com/openshift/api/build/v1"
 	templatev1 "github.com/openshift/api/template/v1"
-	"github.com/openshift/library-go/pkg/apps/appsutil"
 
 	exutil "github.com/openshift/origin/test/extended/util"
 )
@@ -38,7 +38,7 @@ var _ = g.Describe("[sig-devex][Feature:Templates] templateinstance readiness te
 	waitSettle := func() (bool, error) {
 		var err error
 
-		// must read the templateinstance before the build/dc
+		// must read the templateinstance before the build/deployment
 		templateinstance, err = cli.TemplateClient().TemplateV1().TemplateInstances(cli.Namespace()).Get(context.Background(), templateinstance.Name, metav1.GetOptions{})
 		if err != nil {
 			return false, err
@@ -52,7 +52,7 @@ var _ = g.Describe("[sig-devex][Feature:Templates] templateinstance readiness te
 			return false, err
 		}
 
-		dc, err := cli.AppsClient().AppsV1().DeploymentConfigs(cli.Namespace()).Get(context.Background(), "simple-example", metav1.GetOptions{})
+		deploymentObj, err := cli.AdminKubeClient().AppsV1().Deployments(cli.Namespace()).Get(context.Background(), "simple-example", metav1.GetOptions{})
 		if err != nil {
 			if kerrors.IsNotFound(err) {
 				err = nil
@@ -67,19 +67,19 @@ var _ = g.Describe("[sig-devex][Feature:Templates] templateinstance readiness te
 
 		case buildv1.BuildPhaseComplete:
 			var progressing, available *appsv1.DeploymentCondition
-			for i, condition := range dc.Status.Conditions {
+			for i, condition := range deploymentObj.Status.Conditions {
 				switch condition.Type {
 				case appsv1.DeploymentProgressing:
-					progressing = &dc.Status.Conditions[i]
+					progressing = &deploymentObj.Status.Conditions[i]
 
 				case appsv1.DeploymentAvailable:
-					available = &dc.Status.Conditions[i]
+					available = &deploymentObj.Status.Conditions[i]
 				}
 			}
 
 			if (progressing != nil &&
 				progressing.Status == corev1.ConditionTrue &&
-				progressing.Reason == appsutil.NewRcAvailableReason &&
+				progressing.Reason == deploymentutil.NewRSAvailableReason &&
 				available != nil &&
 				available.Status == corev1.ConditionTrue) ||
 				(progressing != nil &&
@@ -122,7 +122,7 @@ var _ = g.Describe("[sig-devex][Feature:Templates] templateinstance readiness te
 			}
 		})
 
-		g.It("should report ready soon after all annotated objects are ready [apigroup:template.openshift.io][apigroup:build.openshift.io][apigroup:apps.openshift.io]", func() {
+		g.It("should report ready soon after all annotated objects are ready [apigroup:template.openshift.io][apigroup:build.openshift.io]", func() {
 			var err error
 
 			templateinstance = &templatev1.TemplateInstance{
@@ -171,7 +171,7 @@ var _ = g.Describe("[sig-devex][Feature:Templates] templateinstance readiness te
 			o.Expect(err).NotTo(o.HaveOccurred())
 		})
 
-		g.It("should report failed soon after an annotated objects has failed [apigroup:template.openshift.io][apigroup:build.openshift.io][apigroup:apps.openshift.io]", func() {
+		g.It("should report failed soon after an annotated objects has failed [apigroup:template.openshift.io][apigroup:build.openshift.io]", func() {
 			var err error
 
 			secret, err := cli.KubeClient().CoreV1().Secrets(cli.Namespace()).Create(context.Background(), &v1.Secret{

test/extended/testdata/bindata.go

@@ -2,17 +2,18 @@ apiVersion: v1
 kind: List
 metadata: {}
 items:
-- apiVersion: apps.openshift.io/v1
-  kind: DeploymentConfig
+- apiVersion: apps/v1
+  kind: Deployment
   metadata:
     name: idling-echo
   spec:
     replicas: 2
     selector:
-      app: idling-echo
-      deploymentconfig: idling-echo
+      matchLabels:
+        app: idling-echo
+        deploymentconfig: idling-echo
     strategy:
-      type: Rolling
+      type: RollingUpdate
     template:
       metadata:
         labels:

test/extended/testdata/idling-echo-server.yaml

@@ -56,29 +56,21 @@ objects:
         name: "${NAME}:latest"
     triggers:
     - type: ConfigChange
-- kind: DeploymentConfig
-  apiVersion: apps.openshift.io/v1
+- kind: Deployment
+  apiVersion: apps/v1
   metadata:
     name: "${NAME}"
     annotations:
       description: Defines how to deploy the application server
       template.alpha.openshift.io/wait-for-ready: 'true'
+      image.openshift.io/triggers: "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"${NAME}:latest\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]"
   spec:
     strategy:
-      type: Rolling
-    triggers:
-    - type: ImageChange
-      imageChangeParams:
-        automatic: true
-        containerNames:
-        - simple-example
-        from:
-          kind: ImageStreamTag
-          name: "${NAME}:latest"
-    - type: ConfigChange
+      type: RollingUpdate
     replicas: 1
     selector:
-      name: "${NAME}"
+      matchLabels:
+        name: "${NAME}"
     template:
       metadata:
         name: "${NAME}"