Merge pull request #50643 from kow3ns/enableappsv1beta2

pkg/master/BUILD

@@ -66,6 +66,7 @@ go_library(
         "//vendor/github.com/golang/glog:go_default_library",
         "//vendor/github.com/prometheus/client_golang/prometheus:go_default_library",
         "//vendor/k8s.io/api/apps/v1beta1:go_default_library",
+        "//vendor/k8s.io/api/apps/v1beta2:go_default_library",
         "//vendor/k8s.io/api/authentication/v1:go_default_library",
         "//vendor/k8s.io/api/authentication/v1beta1:go_default_library",
         "//vendor/k8s.io/api/authorization/v1:go_default_library",

pkg/master/master.go

@@ -25,6 +25,7 @@ import (
 	"time"
 
 	appsv1beta1 "k8s.io/api/apps/v1beta1"
+	appsv1beta2 "k8s.io/api/apps/v1beta2"
 	authenticationv1 "k8s.io/api/authentication/v1"
 	authenticationv1beta1 "k8s.io/api/authentication/v1beta1"
 	authorizationapiv1 "k8s.io/api/authorization/v1"
@@ -393,8 +394,7 @@ func DefaultAPIResourceConfigSource() *serverstorage.ResourceConfig {
 		authenticationv1beta1.SchemeGroupVersion,
 		autoscalingapiv1.SchemeGroupVersion,
 		appsv1beta1.SchemeGroupVersion,
-		// TODO: enable apps/v1beta2 by default before 1.8 release, after the API changes are done
-		// appsv1beta2.SchemeGroupVersion,
+		appsv1beta2.SchemeGroupVersion,
 		policyapiv1beta1.SchemeGroupVersion,
 		rbacv1.SchemeGroupVersion,
 		rbacv1beta1.SchemeGroupVersion,

staging/src/k8s.io/api/apps/v1beta2/generated.proto

@@ -31,7 +31,6 @@ import "k8s.io/apimachinery/pkg/util/intstr/generated.proto";
 // Package-wide variables from generator "generated".
 option go_package = "v1beta2";
 
-// WIP: This is not ready to be used and we plan to make breaking changes to it.
 // DaemonSet represents the configuration of a daemon set.
 message DaemonSet {
   // Standard object's metadata.
@@ -53,7 +52,6 @@ message DaemonSet {
   optional DaemonSetStatus status = 3;
 }
 
-// WIP: This is not ready to be used and we plan to make breaking changes to it.
 // DaemonSetList is a collection of daemon sets.
 message DaemonSetList {
   // Standard list metadata.
@@ -65,7 +63,6 @@ message DaemonSetList {
   repeated DaemonSet items = 2;
 }
 
-// WIP: This is not ready to be used and we plan to make breaking changes to it.
 // DaemonSetSpec is the specification of a daemon set.
 message DaemonSetSpec {
   // A label query over pods that are managed by the daemon set.
@@ -100,7 +97,6 @@ message DaemonSetSpec {
   optional int32 revisionHistoryLimit = 6;
 }
 
-// WIP: This is not ready to be used and we plan to make breaking changes to it.
 // DaemonSetStatus represents the current status of a daemon set.
 message DaemonSetStatus {
   // The number of nodes that are running at least 1
@@ -149,7 +145,7 @@ message DaemonSetStatus {
   optional int64 collisionCount = 9;
 }
 
-// WIP: This is not ready to be used and we plan to make breaking changes to it.
+// DaemonSetUpdateStrategy is a struct used to control the update strategy for a DaemonSet.
 message DaemonSetUpdateStrategy {
   // Type of daemon set update. Can be "RollingUpdate" or "OnDelete". Default is RollingUpdate.
   // +optional
@@ -164,7 +160,6 @@ message DaemonSetUpdateStrategy {
   optional RollingUpdateDaemonSet rollingUpdate = 2;
 }
 
-// WIP: This is not ready to be used and we plan to make breaking changes to it.
 // Deployment enables declarative updates for Pods and ReplicaSets.
 message Deployment {
   // Standard object metadata.
@@ -180,7 +175,6 @@ message Deployment {
   optional DeploymentStatus status = 3;
 }
 
-// WIP: This is not ready to be used and we plan to make breaking changes to it.
 // DeploymentCondition describes the state of a deployment at a certain point.
 message DeploymentCondition {
   // Type of deployment condition.
@@ -202,7 +196,6 @@ message DeploymentCondition {
   optional string message = 5;
 }
 
-// WIP: This is not ready to be used and we plan to make breaking changes to it.
 // DeploymentList is a list of Deployments.
 message DeploymentList {
   // Standard list metadata.
@@ -213,7 +206,6 @@ message DeploymentList {
   repeated Deployment items = 2;
 }
 
-// WIP: This is not ready to be used and we plan to make breaking changes to it.
 // DeploymentSpec is the specification of the desired behavior of the Deployment.
 message DeploymentSpec {
   // Number of desired pods. This is a pointer to distinguish between explicit
@@ -259,7 +251,6 @@ message DeploymentSpec {
   optional int32 progressDeadlineSeconds = 9;
 }
 
-// WIP: This is not ready to be used and we plan to make breaking changes to it.
 // DeploymentStatus is the most recently observed status of the Deployment.
 message DeploymentStatus {
   // The generation observed by the deployment controller.
@@ -298,7 +289,6 @@ message DeploymentStatus {
   optional int64 collisionCount = 8;
 }
 
-// WIP: This is not ready to be used and we plan to make breaking changes to it.
 // DeploymentStrategy describes how to replace existing pods with new ones.
 message DeploymentStrategy {
   // Type of deployment. Can be "Recreate" or "RollingUpdate". Default is RollingUpdate.
@@ -314,7 +304,6 @@ message DeploymentStrategy {
   optional RollingUpdateDeployment rollingUpdate = 2;
 }
 
-// WIP: This is not ready to be used and we plan to make breaking changes to it.
 // ReplicaSet represents the configuration of a ReplicaSet.
 message ReplicaSet {
   // If the Labels of a ReplicaSet are empty, they are defaulted to
@@ -337,7 +326,6 @@ message ReplicaSet {
   optional ReplicaSetStatus status = 3;
 }
 
-// WIP: This is not ready to be used and we plan to make breaking changes to it.
 // ReplicaSetCondition describes the state of a replica set at a certain point.
 message ReplicaSetCondition {
   // Type of replica set condition.
@@ -359,7 +347,6 @@ message ReplicaSetCondition {
   optional string message = 5;
 }
 
-// WIP: This is not ready to be used and we plan to make breaking changes to it.
 // ReplicaSetList is a collection of ReplicaSets.
 message ReplicaSetList {
   // Standard list metadata.
@@ -372,7 +359,6 @@ message ReplicaSetList {
   repeated ReplicaSet items = 2;
 }
 
-// WIP: This is not ready to be used and we plan to make breaking changes to it.
 // ReplicaSetSpec is the specification of a ReplicaSet.
 message ReplicaSetSpec {
   // Replicas is the number of desired replicas.
@@ -402,7 +388,6 @@ message ReplicaSetSpec {
   optional k8s.io.api.core.v1.PodTemplateSpec template = 3;
 }
 
-// WIP: This is not ready to be used and we plan to make breaking changes to it.
 // ReplicaSetStatus represents the current status of a ReplicaSet.
 message ReplicaSetStatus {
   // Replicas is the most recently oberved number of replicas.
@@ -432,7 +417,6 @@ message ReplicaSetStatus {
   repeated ReplicaSetCondition conditions = 6;
 }
 
-// WIP: This is not ready to be used and we plan to make breaking changes to it.
 // Spec to control the desired behavior of daemon set rolling update.
 message RollingUpdateDaemonSet {
   // The maximum number of DaemonSet pods that can be unavailable during the
@@ -453,7 +437,6 @@ message RollingUpdateDaemonSet {
   optional k8s.io.apimachinery.pkg.util.intstr.IntOrString maxUnavailable = 1;
 }
 
-// WIP: This is not ready to be used and we plan to make breaking changes to it.
 // Spec to control the desired behavior of rolling update.
 message RollingUpdateDeployment {
   // The maximum number of pods that can be unavailable during the update.
@@ -484,7 +467,6 @@ message RollingUpdateDeployment {
   optional k8s.io.apimachinery.pkg.util.intstr.IntOrString maxSurge = 2;
 }
 
-// WIP: This is not ready to be used and we plan to make breaking changes to it.
 // RollingUpdateStatefulSetStrategy is used to communicate parameter for RollingUpdateStatefulSetStrategyType.
 message RollingUpdateStatefulSetStrategy {
   // Partition indicates the ordinal at which the StatefulSet should be
@@ -494,7 +476,6 @@ message RollingUpdateStatefulSetStrategy {
   optional int32 partition = 1;
 }
 
-// WIP: This is not ready to be used and we plan to make breaking changes to it.
 // Scale represents a scaling request for a resource.
 message Scale {
   // Standard object metadata; More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#metadata.
@@ -510,7 +491,6 @@ message Scale {
   optional ScaleStatus status = 3;
 }
 
-// WIP: This is not ready to be used and we plan to make breaking changes to it.
 // ScaleSpec describes the attributes of a scale subresource
 message ScaleSpec {
   // desired number of instances for the scaled object.
@@ -518,7 +498,6 @@ message ScaleSpec {
   optional int32 replicas = 1;
 }
 
-// WIP: This is not ready to be used and we plan to make breaking changes to it.
 // ScaleStatus represents the current status of a scale subresource.
 message ScaleStatus {
   // actual number of observed instances of the scaled object.
@@ -538,7 +517,6 @@ message ScaleStatus {
   optional string targetSelector = 3;
 }
 
-// WIP: This is not ready to be used and we plan to make breaking changes to it.
 // StatefulSet represents a set of pods with consistent identities.
 // Identities are defined as:
 //  - Network: A single stable DNS and hostname.
@@ -559,7 +537,6 @@ message StatefulSet {
   optional StatefulSetStatus status = 3;
 }
 
-// WIP: This is not ready to be used and we plan to make breaking changes to it.
 // StatefulSetList is a collection of StatefulSets.
 message StatefulSetList {
   // +optional
@@ -568,7 +545,6 @@ message StatefulSetList {
   repeated StatefulSet items = 2;
 }
 
-// WIP: This is not ready to be used and we plan to make breaking changes to it.
 // A StatefulSetSpec is the specification of a StatefulSet.
 message StatefulSetSpec {
   // replicas is the desired number of replicas of the given Template.
@@ -631,7 +607,6 @@ message StatefulSetSpec {
   optional int32 revisionHistoryLimit = 8;
 }
 
-// WIP: This is not ready to be used and we plan to make breaking changes to it.
 // StatefulSetStatus represents the current state of a StatefulSet.
 message StatefulSetStatus {
   // observedGeneration is the most recent generation observed for this StatefulSet. It corresponds to the
@@ -668,7 +643,6 @@ message StatefulSetStatus {
   optional int64 collisionCount = 9;
 }
 
-// WIP: This is not ready to be used and we plan to make breaking changes to it.
 // StatefulSetUpdateStrategy indicates the strategy that the StatefulSet
 // controller will use to perform updates. It includes any additional parameters
 // necessary to perform the update for the indicated strategy.