DeploymentConfig replicas should be optional, other fields too

Make a set of fields truly optional in openapi, and also make replicas a
pointer so we can default it.

Author: smarterclayton

api/protobuf-spec/github_com_openshift_origin_pkg_apps_apis_apps_v1.proto

@@ -23170,8 +23170,7 @@
     "id": "v1.DeploymentConfig",
     "description": "Deployment Configs define the template for a pod and manages deploying new images or configuration changes. A single deployment configuration is usually analogous to a single micro-service. Can support many different deployment patterns, including full restart, customizable rolling updates, and  fully custom behaviors, as well as pre- and post- deployment hooks. Each individual deployment is represented as a replication controller.\n\nA deployment is \"triggered\" when its configuration is changed or a tag in an Image Stream is changed. Triggers can be disabled to allow manual control over a deployment. The \"strategy\" determines how the deployment is carried out and may be changed at any time. The `latestVersion` field is updated when a new deployment is triggered by any means.",
     "required": [
-     "spec",
-     "status"
+     "spec"
     ],
     "properties": {
      "kind": {

api/protobuf-spec/github_com_openshift_origin_pkg_image_apis_image_v1.proto

@@ -87032,8 +87032,7 @@
    "com.github.openshift.origin.pkg.apps.apis.apps.v1.DeploymentConfig": {
     "description": "Deployment Configs define the template for a pod and manages deploying new images or configuration changes. A single deployment configuration is usually analogous to a single micro-service. Can support many different deployment patterns, including full restart, customizable rolling updates, and  fully custom behaviors, as well as pre- and post- deployment hooks. Each individual deployment is represented as a replication controller.\n\nA deployment is \"triggered\" when its configuration is changed or a tag in an Image Stream is changed. Triggers can be disabled to allow manual control over a deployment. The \"strategy\" determines how the deployment is carried out and may be changed at any time. The `latestVersion` field is updated when a new deployment is triggered by any means.",
     "required": [
-     "spec",
-     "status"
+     "spec"
     ],
     "properties": {
      "apiVersion": {
@@ -87192,12 +87191,6 @@
    },
    "com.github.openshift.origin.pkg.apps.apis.apps.v1.DeploymentConfigSpec": {
     "description": "DeploymentConfigSpec represents the desired state of the deployment.",
-    "required": [
-     "strategy",
-     "triggers",
-     "replicas",
-     "test"
-    ],
     "properties": {
      "minReadySeconds": {
       "description": "MinReadySeconds is the minimum number of seconds for which a newly created pod should be ready without any of its container crashing, for it to be considered available. Defaults to 0 (pod will be considered available as soon as it is ready)",
@@ -90677,9 +90670,7 @@
    "com.github.openshift.origin.pkg.image.apis.image.v1.TagReference": {
     "description": "TagReference specifies optional annotations for images using this tag and an optional reference to an ImageStreamTag, ImageStreamImage, or DockerImage this tag should track.",
     "required": [
-     "name",
-     "annotations",
-     "generation"
+     "name"
     ],
     "properties": {
      "annotations": {

api/swagger-spec/oapi-v1.json

@@ -43,6 +43,10 @@ func SetDefaults_DeploymentConfigSpec(obj *DeploymentConfigSpec) {
 	if len(obj.Selector) == 0 && obj.Template != nil {
 		obj.Selector = obj.Template.Labels
 	}
+	if obj.Replicas == nil {
+		one := int32(1)
+		obj.Replicas = &one
+	}
 
 	// if you only specify a single container, default the TagImages hook to the container name
 	if obj.Template != nil && len(obj.Template.Spec.Containers) == 1 {

api/swagger-spec/openshift-openapi-spec.json

@@ -1,6 +1,7 @@
 package v1
 
 import (
+	"fmt"
 	"reflect"
 	"testing"
 
@@ -14,6 +15,7 @@ import (
 )
 
 func TestDefaults(t *testing.T) {
+	one := int32(1)
 	defaultIntOrString := intstr.FromString("25%")
 	differentIntOrString := intstr.FromInt(5)
 	tests := []struct {
@@ -24,6 +26,7 @@ func TestDefaults(t *testing.T) {
 			original: &DeploymentConfig{},
 			expected: &DeploymentConfig{
 				Spec: DeploymentConfigSpec{
+					Replicas: &one,
 					Strategy: DeploymentStrategy{
 						Type: DeploymentStrategyTypeRolling,
 						RollingParams: &RollingDeploymentStrategyParams{
@@ -92,6 +95,7 @@ func TestDefaults(t *testing.T) {
 			},
 			expected: &DeploymentConfig{
 				Spec: DeploymentConfigSpec{
+					Replicas: &one,
 					Strategy: DeploymentStrategy{
 						Type: DeploymentStrategyTypeRecreate,
 						RecreateParams: &RecreateDeploymentStrategyParams{
@@ -171,6 +175,7 @@ func TestDefaults(t *testing.T) {
 			},
 			expected: &DeploymentConfig{
 				Spec: DeploymentConfigSpec{
+					Replicas: &one,
 					Strategy: DeploymentStrategy{
 						Type: DeploymentStrategyTypeRolling,
 						RollingParams: &RollingDeploymentStrategyParams{
@@ -211,6 +216,7 @@ func TestDefaults(t *testing.T) {
 			},
 			expected: &DeploymentConfig{
 				Spec: DeploymentConfigSpec{
+					Replicas: &one,
 					Strategy: DeploymentStrategy{
 						Type: DeploymentStrategyTypeRolling,
 						RollingParams: &RollingDeploymentStrategyParams{
@@ -249,6 +255,7 @@ func TestDefaults(t *testing.T) {
 			},
 			expected: &DeploymentConfig{
 				Spec: DeploymentConfigSpec{
+					Replicas: &one,
 					Strategy: DeploymentStrategy{
 						Type: DeploymentStrategyTypeRolling,
 						RollingParams: &RollingDeploymentStrategyParams{
@@ -280,6 +287,7 @@ func TestDefaults(t *testing.T) {
 			},
 			expected: &DeploymentConfig{
 				Spec: DeploymentConfigSpec{
+					Replicas: &one,
 					Strategy: DeploymentStrategy{
 						Type: DeploymentStrategyTypeRolling,
 						RollingParams: &RollingDeploymentStrategyParams{
@@ -312,6 +320,7 @@ func TestDefaults(t *testing.T) {
 			},
 			expected: &DeploymentConfig{
 				Spec: DeploymentConfigSpec{
+					Replicas: &one,
 					Strategy: DeploymentStrategy{
 						Type: DeploymentStrategyTypeRecreate,
 						RecreateParams: &RecreateDeploymentStrategyParams{
@@ -339,6 +348,7 @@ func TestDefaults(t *testing.T) {
 			},
 			expected: &DeploymentConfig{
 				Spec: DeploymentConfigSpec{
+					Replicas: &one,
 					Strategy: DeploymentStrategy{
 						Type: DeploymentStrategyTypeRecreate,
 						RecreateParams: &RecreateDeploymentStrategyParams{
@@ -386,6 +396,7 @@ func TestDefaults(t *testing.T) {
 			},
 			expected: &DeploymentConfig{
 				Spec: DeploymentConfigSpec{
+					Replicas: &one,
 					Template: &kapiv1.PodTemplateSpec{
 						Spec: kapiv1.PodSpec{
 							Containers: []kapiv1.Container{
@@ -458,6 +469,7 @@ func TestDefaults(t *testing.T) {
 			},
 			expected: &DeploymentConfig{
 				Spec: DeploymentConfigSpec{
+					Replicas: &one,
 					Template: &kapiv1.PodTemplateSpec{
 						Spec: kapiv1.PodSpec{
 							Containers: []kapiv1.Container{
@@ -513,6 +525,7 @@ func TestDefaults(t *testing.T) {
 			},
 			expected: &DeploymentConfig{
 				Spec: DeploymentConfigSpec{
+					Replicas: &one,
 					Strategy: DeploymentStrategy{
 						Type: DeploymentStrategyTypeRolling,
 						RollingParams: &RollingDeploymentStrategyParams{
@@ -540,19 +553,20 @@ func TestDefaults(t *testing.T) {
 	}
 
 	for i, test := range tests {
-		t.Logf("test %d", i)
-		original := test.original
-		expected := test.expected
-		obj2 := roundTrip(t, runtime.Object(original))
-		got, ok := obj2.(*DeploymentConfig)
-		if !ok {
-			t.Errorf("unexpected object: %v", got)
-			t.FailNow()
-		}
-		// TODO(rebase): check that there are no fields which have different semantics for nil and []
-		if !equality.Semantic.DeepEqual(got.Spec, expected.Spec) {
-			t.Errorf("got different than expected:\nA:\t%#v\nB:\t%#v\n\nDiff:\n%s\n\n%s", got, expected, diff.ObjectDiff(expected, got), diff.ObjectGoPrintSideBySide(expected, got))
-		}
+		t.Run(fmt.Sprintf("%d", i), func(t *testing.T) {
+			t.Logf("test %d", i)
+			original := test.original
+			expected := test.expected
+			obj2 := roundTrip(t, runtime.Object(original))
+			got, ok := obj2.(*DeploymentConfig)
+			if !ok {
+				t.Fatalf("unexpected object: %v", got)
+			}
+			// TODO(rebase): check that there are no fields which have different semantics for nil and []
+			if !equality.Semantic.DeepEqual(got.Spec, expected.Spec) {
+				t.Errorf("got different than expected:\nA:\t%#v\nB:\t%#v\n\nDiff:\n%s\n\n%s", got, expected, diff.ObjectDiff(expected, got), diff.ObjectGoPrintSideBySide(expected, got))
+			}
+		})
 	}
 }