From 74423e1a2a2e0270c98d9b628053e33d67002821 Mon Sep 17 00:00:00 2001
From: Anthony Yeh <enisoc@google.com>
Date: Tue, 6 Dec 2016 15:11:25 -0800
Subject: [PATCH 1/3] Add deprecation warning on PetSet guide.

---
 docs/user-guide/petset.md   | 19 ++++++++++++++++++-
 docs/user-guide/petset.yaml |  4 ++--
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/docs/user-guide/petset.md b/docs/user-guide/petset.md
index c3a2085a97..0449c53812 100644
--- a/docs/user-guide/petset.md
+++ b/docs/user-guide/petset.md
@@ -1,10 +1,23 @@
 ---
 assignees:
 - bprashanth
+- enisoc
+- erictune
 - foxish
+- janetkuo
+- kow3ns
+- smarterclayton
 
 ---
 
+Starting in Kubernetes version 1.5, PetSet has been renamed to
+[StatefulSet](/docs/concepts/abstractions/controllers/statefulsets/).
+To use (or continue to use) PetSet in Kubernetes 1.5 or higher, you must
+[migrate your existing PetSets to StatefulSets](/docs/tasks/manage-stateful-set/upgrade-pet-set-to-stateful-set/).
+
+__This document has been deprecated__, but can still apply if you're using
+  Kubernetes version 1.4 or earlier.
+
 * TOC
 {:toc}
 
@@ -424,4 +437,8 @@ Deploying one RC of size 1/Service per pod is a popular alternative, as is simpl
 
 ## Next steps
 
-The deployment and maintenance of stateful applications is a vast topic. The next step is to explore cluster bootstrapping and initialization, [here](/docs/user-guide/petset/bootstrapping/).
+* Learn about [StatefulSet](/docs/concepts/abstractions/controllers/statefulsets/),
+  the replacement for PetSet introduced in Kubernetes version 1.5.
+* [Migrate your existing PetSets to StatefulSets](/docs/tasks/manage-stateful-set/upgrade-pet-set-to-stateful-set/)
+  when upgrading to Kubernetes version 1.5 or higher.
+
diff --git a/docs/user-guide/petset.yaml b/docs/user-guide/petset.yaml
index add3530077..5c29237c48 100644
--- a/docs/user-guide/petset.yaml
+++ b/docs/user-guide/petset.yaml
@@ -14,8 +14,8 @@ spec:
   selector:
     app: nginx
 ---
-apiVersion: apps/v1beta1
-kind: StatefulSet
+apiVersion: apps/v1alpha1
+kind: PetSet
 metadata:
   name: web
 spec:

From baf923951956eb16b7ea8dde5af5b18a61faf17e Mon Sep 17 00:00:00 2001
From: Anthony Yeh <enisoc@google.com>
Date: Tue, 6 Dec 2016 15:39:58 -0800
Subject: [PATCH 2/3] examples_test: Ignore PetSet object.

It cannot be decoded anymore, but the file is kept for legacy users.
---
 test/examples_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/examples_test.go b/test/examples_test.go
index 5ec1a94278..cb876db9ec 100644
--- a/test/examples_test.go
+++ b/test/examples_test.go
@@ -264,7 +264,7 @@ func TestExampleObjectSchemas(t *testing.T) {
 			"nginx-probe-deployment":     {&extensions.Deployment{}},
 			"nginx-secure-app":           {&api.Service{}, &extensions.Deployment{}},
 			"nginx-svc":                  {&api.Service{}},
-			"petset":                     {&api.Service{}, &apps.StatefulSet{}},
+			"petset":                     {&api.Service{}, nil},
 			"pod":                        {&api.Pod{}},
 			"pod-w-message":              {&api.Pod{}},
 			"redis-deployment":           {&extensions.Deployment{}},

From 2d046c3476b547bbb05f2f6eab1828db55e04569 Mon Sep 17 00:00:00 2001
From: devin-donnelly <ddonnelly@google.com>
Date: Tue, 6 Dec 2016 16:17:47 -0800
Subject: [PATCH 3/3] Update petset.md

---
 docs/user-guide/petset.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/user-guide/petset.md b/docs/user-guide/petset.md
index 0449c53812..6c205159bc 100644
--- a/docs/user-guide/petset.md
+++ b/docs/user-guide/petset.md
@@ -10,7 +10,7 @@ assignees:
 
 ---
 
-Starting in Kubernetes version 1.5, PetSet has been renamed to
+__Warning:__ Starting in Kubernetes version 1.5, PetSet has been renamed to
 [StatefulSet](/docs/concepts/abstractions/controllers/statefulsets/).
 To use (or continue to use) PetSet in Kubernetes 1.5 or higher, you must
 [migrate your existing PetSets to StatefulSets](/docs/tasks/manage-stateful-set/upgrade-pet-set-to-stateful-set/).