Merge pull request kubernetes#39939 from resouer/statefulset

Automatic merge from submit-queue (batch tested with PRs 34763, 38706, 39939, 40020)

Use Statefulset instead in e2e and controller

Quick fix ref: kubernetes#35534

We should finish the issue to meet v1.6 milestone.

cmd/kube-controller-manager/app/BUILD

@@ -59,7 +59,6 @@ go_library(
         "//pkg/controller/job:go_default_library",
         "//pkg/controller/namespace:go_default_library",
         "//pkg/controller/node:go_default_library",
-        "//pkg/controller/petset:go_default_library",
         "//pkg/controller/podautoscaler:go_default_library",
         "//pkg/controller/podautoscaler/metrics:go_default_library",
         "//pkg/controller/podgc:go_default_library",
@@ -69,6 +68,7 @@ go_library(
         "//pkg/controller/route:go_default_library",
         "//pkg/controller/service:go_default_library",
         "//pkg/controller/serviceaccount:go_default_library",
+        "//pkg/controller/statefulset:go_default_library",
         "//pkg/controller/volume/attachdetach:go_default_library",
         "//pkg/controller/volume/persistentvolume:go_default_library",
         "//pkg/quota/install:go_default_library",

cmd/kube-controller-manager/app/apps.go

@@ -22,15 +22,15 @@ package app
 
 import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	petset "k8s.io/kubernetes/pkg/controller/petset"
+	"k8s.io/kubernetes/pkg/controller/statefulset"
 )
 
 func startStatefulSetController(ctx ControllerContext) (bool, error) {
 	if !ctx.AvailableResources[schema.GroupVersionResource{Group: "apps", Version: "v1beta1", Resource: "statefulsets"}] {
 		return false, nil
 	}
 	resyncPeriod := ResyncPeriod(&ctx.Options)()
-	go petset.NewStatefulSetController(
+	go statefulset.NewStatefulSetController(
 		ctx.InformerFactory.Pods().Informer(),
 		ctx.ClientBuilder.ClientOrDie("statefulset-controller"),
 		resyncPeriod,

pkg/controller/BUILD

@@ -94,7 +94,6 @@ filegroup(
         "//pkg/controller/job:all-srcs",
         "//pkg/controller/namespace:all-srcs",
         "//pkg/controller/node:all-srcs",
-        "//pkg/controller/petset:all-srcs",
         "//pkg/controller/podautoscaler:all-srcs",
         "//pkg/controller/podgc:all-srcs",
         "//pkg/controller/replicaset:all-srcs",
@@ -103,6 +102,7 @@ filegroup(
         "//pkg/controller/route:all-srcs",
         "//pkg/controller/service:all-srcs",
         "//pkg/controller/serviceaccount:all-srcs",
+        "//pkg/controller/statefulset:all-srcs",
         "//pkg/controller/volume/attachdetach:all-srcs",
         "//pkg/controller/volume/persistentvolume:all-srcs",
     ],

pkg/controller/petset/BUILD → pkg/controller/statefulset/BUILD

@@ -14,9 +14,9 @@ go_library(
         "fakes.go",
         "identity_mappers.go",
         "iterator.go",
-        "pet.go",
-        "pet_set.go",
-        "pet_set_utils.go",
+        "stateful_set.go",
+        "stateful_set_utils.go",
+        "statefulpod.go",
     ],
     tags = ["automanaged"],
     deps = [
@@ -50,8 +50,8 @@ go_test(
     srcs = [
         "identity_mappers_test.go",
         "iterator_test.go",
-        "pet_set_test.go",
-        "pet_test.go",
+        "stateful_set_test.go",
+        "statefulpod_test.go",
     ],
     library = ":go_default_library",
     tags = ["automanaged"],

pkg/controller/petset/fakes.go → pkg/controller/statefulset/fakes.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package petset
+package statefulset
 
 import (
 	"fmt"

pkg/controller/petset/identity_mappers.go → pkg/controller/statefulset/identity_mappers.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package petset
+package statefulset
 
 import (
 	"crypto/md5"

pkg/controller/petset/identity_mappers_test.go → pkg/controller/statefulset/identity_mappers_test.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package petset
+package statefulset
 
 import (
 	"fmt"

pkg/controller/petset/iterator.go → pkg/controller/statefulset/iterator.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package petset
+package statefulset
 
 import (
 	"fmt"

pkg/controller/petset/iterator_test.go → pkg/controller/statefulset/iterator_test.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package petset
+package statefulset
 
 import (
 	"fmt"

pkg/controller/petset/pet_set.go → pkg/controller/statefulset/stateful_set.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package petset
+package statefulset
 
 import (
 	"fmt"

pkg/controller/petset/pet_set_test.go → pkg/controller/statefulset/stateful_set_test.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package petset
+package statefulset
 
 import (
 	"fmt"

pkg/controller/petset/pet_set_utils.go → pkg/controller/statefulset/stateful_set_utils.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package petset
+package statefulset
 
 import (
 	"fmt"

pkg/controller/petset/pet.go → pkg/controller/statefulset/statefulpod.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package petset
+package statefulset
 
 import (
 	"fmt"

pkg/controller/petset/pet_test.go → pkg/controller/statefulset/statefulpod_test.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package petset
+package statefulset
 
 import (
 	"fmt"

test/e2e/BUILD

@@ -80,7 +80,6 @@ go_library(
         "pd.go",
         "persistent_volumes.go",
         "persistent_volumes-disruptive.go",
-        "petset.go",
         "pod_gc.go",
         "pods.go",
         "portforward.go",
@@ -100,6 +99,7 @@ go_library(
         "service_latency.go",
         "serviceloadbalancers.go",
         "ssh.go",
+        "statefulset.go",
         "third-party.go",
         "ubernetes_lite.go",
         "util_iperf.go",
@@ -145,9 +145,9 @@ go_library(
         "//pkg/controller/deployment/util:go_default_library",
         "//pkg/controller/endpoint:go_default_library",
         "//pkg/controller/job:go_default_library",
-        "//pkg/controller/petset:go_default_library",
         "//pkg/controller/replicaset:go_default_library",
         "//pkg/controller/replication:go_default_library",
+        "//pkg/controller/statefulset:go_default_library",
         "//pkg/fields:go_default_library",
         "//pkg/kubectl:go_default_library",
         "//pkg/kubectl/cmd/util:go_default_library",