Merge pull request #35731 from janetkuo/statefulset-v1beta1

Automatic merge from submit-queue Move Statefulset (previously PetSet) to v1beta1 **What this PR does / why we need it**: #28718 **Which issue this PR fixes** _(optional, in `fixes #<issue number>(, #<issue_number>, ...)` format, will close that issue when PR gets merged)_: fixes # **Special notes for your reviewer**: depends on #35663 (PetSet rename) cc @erictune @foxish @kubernetes/sig-apps **Release note**: ``` release-note v1beta1/StatefulSet replaces v1alpha1/PetSet. ```
kubernetes · Nov 3, 2016 · e817594 · e817594
2 parents 8c67d08 + c25455e
commit e817594
Show file tree

Hide file tree

Showing 163 changed files with 3,861 additions and 990 deletions.
diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json
diff --git a/api/swagger-spec/apps_v1beta1.json b/api/swagger-spec/apps_v1beta1.json
diff --git a/api/swagger-spec/resourceListing.json b/api/swagger-spec/resourceListing.json
@@ -22,8 +22,8 @@
     "description": "get available API versions"
    },
    {
-    "path": "/apis/apps/v1alpha1",
-    "description": "API at /apis/apps/v1alpha1"
+    "path": "/apis/apps/v1beta1",
+    "description": "API at /apis/apps/v1beta1"
    },
    {
     "path": "/apis/apps",

diff --git a/cluster/addons/calico-policy-controller/calico-etcd-petset.yaml b/cluster/addons/calico-policy-controller/calico-etcd-petset.yaml
@@ -1,4 +1,4 @@
-apiVersion: "apps/v1alpha1"
+apiVersion: "apps/v1beta1"
 kind: StatefulSet
 metadata:
   name: calico-etcd

diff --git a/cmd/kube-controller-manager/app/controllermanager.go b/cmd/kube-controller-manager/app/controllermanager.go
@@ -438,7 +438,7 @@ func StartControllers(s *options.CMServer, kubeconfig *restclient.Config, rootCl
 		}
 	}
 
-	groupVersion = "apps/v1alpha1"
+	groupVersion = "apps/v1beta1"
 	resources, found = resourceMap[groupVersion]
 	glog.Infof("Attempting to start statefulset, full resource map %+v", resourceMap)
 	if containsVersion(versions, groupVersion) && found {

diff --git a/cmd/libs/go2idl/go-to-protobuf/protobuf/cmd.go b/cmd/libs/go2idl/go-to-protobuf/protobuf/cmd.go
@@ -72,7 +72,7 @@ func New() *Generator {
 			`k8s.io/kubernetes/pkg/apis/authorization/v1beta1`,
 			`k8s.io/kubernetes/pkg/apis/batch/v1`,
 			`k8s.io/kubernetes/pkg/apis/batch/v2alpha1`,
-			`k8s.io/kubernetes/pkg/apis/apps/v1alpha1`,
+			`k8s.io/kubernetes/pkg/apis/apps/v1beta1`,
 			`k8s.io/kubernetes/pkg/apis/authentication/v1beta1`,
 			`k8s.io/kubernetes/pkg/apis/rbac/v1alpha1`,
 			`k8s.io/kubernetes/federation/apis/federation/v1beta1`,

diff --git a/...-reference/apps/v1alpha1/definitions.html → ...i-reference/apps/v1beta1/definitions.html b/...-reference/apps/v1alpha1/definitions.html → ...i-reference/apps/v1beta1/definitions.html