Merge pull request kubernetes#48746 from janetkuo/apps-v1beta2

Automatic merge from submit-queue

Add a new API version apps/v1beta2

xref: kubernetes#49135
This PR adds a new API version `apps/v1beta2` which contains a copy (of types, conversions, and defaults) of `apps/v1beta1` StatefulSet, Deployment, and their subresources. Note that `apps/v1beta2` is still WIP and we will make breaking changes to it before releasing 1.8.

Moving core controllers (StatefulSet, Deployment, ReplicaSet, DaemonSet) to `apps/v1beta2` is the first step of moving them to `apps/v1` (GA). 

This PR is a starting point for DaemonSet and ReplicaSet to move from `/extensions` to `/apps` and for Deployment and StatefulSet to make some breaking changes (e.g. new defaults and/or remove deprecated fields).

```release-note
Add a new API version apps/v1beta2
```

api/swagger-spec/resourceListing.json

@@ -145,6 +145,10 @@
     "path": "/apis/apps/v1beta1",
     "description": "API at /apis/apps/v1beta1"
    },
+   {
+    "path": "/apis/apps/v1beta2",
+    "description": "API at /apis/apps/v1beta2"
+   },
    {
     "path": "/apis/apps",
     "description": "get information of a group"

cmd/kube-apiserver/app/aggregator.go

@@ -174,6 +174,7 @@ var apiVersionPriorities = map[schema.GroupVersion]priority{
 	{Group: "extensions", Version: "v1beta1"}: {group: 17900, version: 1},
 	// to my knowledge, nothing below here collides
 	{Group: "apps", Version: "v1beta1"}:                          {group: 17800, version: 1},
+	{Group: "apps", Version: "v1beta2"}:                          {group: 17800, version: 1},
 	{Group: "authentication.k8s.io", Version: "v1"}:              {group: 17700, version: 15},
 	{Group: "authentication.k8s.io", Version: "v1beta1"}:         {group: 17700, version: 9},
 	{Group: "authorization.k8s.io", Version: "v1"}:               {group: 17600, version: 15},

federation/apis/openapi-spec/swagger.json

@@ -13245,6 +13245,11 @@
       "version": "v1beta1",
       "kind": "DeleteOptions"
      },
+     {
+      "group": "apps",
+      "version": "v1beta2",
+      "kind": "DeleteOptions"
+     },
      {
       "group": "authentication.k8s.io",
       "version": "v1",
@@ -13738,6 +13743,11 @@
       "version": "v1beta1",
       "kind": "WatchEvent"
      },
+     {
+      "group": "apps",
+      "version": "v1beta2",
+      "kind": "WatchEvent"
+     },
      {
       "group": "authentication.k8s.io",
       "version": "v1",

hack/.golint_failures

@@ -521,6 +521,7 @@ staging
 staging/src/k8s.io/api/admission/v1alpha1
 staging/src/k8s.io/api/admissionregistration/v1alpha1
 staging/src/k8s.io/api/apps/v1beta1
+staging/src/k8s.io/api/apps/v1beta2
 staging/src/k8s.io/api/authentication/v1
 staging/src/k8s.io/api/authentication/v1beta1
 staging/src/k8s.io/api/authorization/v1
@@ -699,6 +700,8 @@ staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1
 staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/fake
 staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta1
 staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta1/fake
+staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta2
+staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta2/fake
 staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1
 staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1/fake
 staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1beta1

hack/lib/init.sh

@@ -55,6 +55,7 @@ v1 \
 admissionregistration.k8s.io/v1alpha1 \
 admission.k8s.io/v1alpha1 \
 apps/v1beta1 \
+apps/v1beta2 \
 authentication.k8s.io/v1 \
 authentication.k8s.io/v1beta1 \
 authorization.k8s.io/v1 \

pkg/BUILD

@@ -50,6 +50,7 @@ filegroup(
         "//pkg/client/listers/admissionregistration/v1alpha1:all-srcs",
         "//pkg/client/listers/apps/internalversion:all-srcs",
         "//pkg/client/listers/apps/v1beta1:all-srcs",
+        "//pkg/client/listers/apps/v1beta2:all-srcs",
         "//pkg/client/listers/authentication/internalversion:all-srcs",
         "//pkg/client/listers/authentication/v1:all-srcs",
         "//pkg/client/listers/authentication/v1beta1:all-srcs",

pkg/api/defaulting_test.go

@@ -82,6 +82,8 @@ func TestDefaulting(t *testing.T) {
 		{Group: "", Version: "v1", Kind: "ServiceList"}:                                           {},
 		{Group: "apps", Version: "v1beta1", Kind: "StatefulSet"}:                                  {},
 		{Group: "apps", Version: "v1beta1", Kind: "StatefulSetList"}:                              {},
+		{Group: "apps", Version: "v1beta2", Kind: "StatefulSet"}:                                  {},
+		{Group: "apps", Version: "v1beta2", Kind: "StatefulSetList"}:                              {},
 		{Group: "autoscaling", Version: "v1", Kind: "HorizontalPodAutoscaler"}:                    {},
 		{Group: "autoscaling", Version: "v1", Kind: "HorizontalPodAutoscalerList"}:                {},
 		{Group: "autoscaling", Version: "v2alpha1", Kind: "HorizontalPodAutoscaler"}:              {},
@@ -110,6 +112,8 @@ func TestDefaulting(t *testing.T) {
 		{Group: "extensions", Version: "v1beta1", Kind: "DeploymentList"}:                                            {},
 		{Group: "apps", Version: "v1beta1", Kind: "Deployment"}:                                                      {},
 		{Group: "apps", Version: "v1beta1", Kind: "DeploymentList"}:                                                  {},
+		{Group: "apps", Version: "v1beta2", Kind: "Deployment"}:                                                      {},
+		{Group: "apps", Version: "v1beta2", Kind: "DeploymentList"}:                                                  {},
 		{Group: "extensions", Version: "v1beta1", Kind: "ReplicaSet"}:                                                {},
 		{Group: "extensions", Version: "v1beta1", Kind: "ReplicaSetList"}:                                            {},
 		{Group: "rbac.authorization.k8s.io", Version: "v1alpha1", Kind: "ClusterRoleBinding"}:                        {},

pkg/apis/apps/BUILD

@@ -39,6 +39,7 @@ filegroup(
         ":package-srcs",
         "//pkg/apis/apps/install:all-srcs",
         "//pkg/apis/apps/v1beta1:all-srcs",
+        "//pkg/apis/apps/v1beta2:all-srcs",
         "//pkg/apis/apps/validation:all-srcs",
     ],
     tags = ["automanaged"],

pkg/apis/apps/install/BUILD

@@ -15,6 +15,7 @@ go_library(
         "//pkg/api:go_default_library",
         "//pkg/apis/apps:go_default_library",
         "//pkg/apis/apps/v1beta1:go_default_library",
+        "//pkg/apis/apps/v1beta2:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apimachinery/announced:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apimachinery/registered:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",

pkg/apis/apps/install/install.go

@@ -25,6 +25,7 @@ import (
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/apis/apps"
 	"k8s.io/kubernetes/pkg/apis/apps/v1beta1"
+	"k8s.io/kubernetes/pkg/apis/apps/v1beta2"
 )
 
 func init() {
@@ -36,12 +37,13 @@ func Install(groupFactoryRegistry announced.APIGroupFactoryRegistry, registry *r
 	if err := announced.NewGroupMetaFactory(
 		&announced.GroupMetaFactoryArgs{
 			GroupName:                  apps.GroupName,
-			VersionPreferenceOrder:     []string{v1beta1.SchemeGroupVersion.Version},
+			VersionPreferenceOrder:     []string{v1beta1.SchemeGroupVersion.Version, v1beta2.SchemeGroupVersion.Version},
 			ImportPrefix:               "k8s.io/api/apps",
 			AddInternalObjectsToScheme: apps.AddToScheme,
 		},
 		announced.VersionToSchemeFunc{
 			v1beta1.SchemeGroupVersion.Version: v1beta1.AddToScheme,
+			v1beta2.SchemeGroupVersion.Version: v1beta2.AddToScheme,
 		},
 	).Announce(groupFactoryRegistry).RegisterAndEnable(registry, scheme); err != nil {
 		panic(err)

pkg/apis/apps/v1beta1/conversion.go

@@ -20,7 +20,6 @@ import (
 	"fmt"
 
 	appsv1beta1 "k8s.io/api/apps/v1beta1"
-
 	"k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/conversion"

pkg/apis/apps/v1beta2/BUILD

@@ -0,0 +1,65 @@
+package(default_visibility = ["//visibility:public"])
+
+licenses(["notice"])
+
+load(
+    "@io_bazel_rules_go//go:def.bzl",
+    "go_library",
+    "go_test",
+)
+
+go_library(
+    name = "go_default_library",
+    srcs = [
+        "conversion.go",
+        "defaults.go",
+        "doc.go",
+        "register.go",
+        "zz_generated.conversion.go",
+        "zz_generated.defaults.go",
+    ],
+    tags = ["automanaged"],
+    deps = [
+        "//pkg/api:go_default_library",
+        "//pkg/api/v1:go_default_library",
+        "//pkg/apis/apps:go_default_library",
+        "//pkg/apis/extensions:go_default_library",
+        "//vendor/k8s.io/api/apps/v1beta2:go_default_library",
+        "//vendor/k8s.io/api/core/v1:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/conversion:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/util/intstr:go_default_library",
+    ],
+)
+
+filegroup(
+    name = "package-srcs",
+    srcs = glob(["**"]),
+    tags = ["automanaged"],
+    visibility = ["//visibility:private"],
+)
+
+filegroup(
+    name = "all-srcs",
+    srcs = [":package-srcs"],
+    tags = ["automanaged"],
+)
+
+go_test(
+    name = "go_default_xtest",
+    srcs = ["defaults_test.go"],
+    tags = ["automanaged"],
+    deps = [
+        "//pkg/api:go_default_library",
+        "//pkg/api/install:go_default_library",
+        "//pkg/apis/apps/install:go_default_library",
+        "//pkg/apis/apps/v1beta2:go_default_library",
+        "//vendor/k8s.io/api/apps/v1beta2:go_default_library",
+        "//vendor/k8s.io/api/core/v1:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/api/equality:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/util/intstr:go_default_library",
+    ],
+)