diff --git a/examples/storage/minio/README.md b/examples/storage/minio/README.md index 6a45c683f9..5910dfa8da 100644 --- a/examples/storage/minio/README.md +++ b/examples/storage/minio/README.md @@ -273,7 +273,7 @@ spec: ports: - containerPort: 9000 hostPort: 9000 - # These volume mounts are persistent. Each pod in the PetSet + # These volume mounts are persistent. Each pod in the Statefulset # gets a volume mounted based on this field. volumeMounts: - name: data diff --git a/examples/storage/minio/minio-distributed-statefulset.yaml b/examples/storage/minio/minio-distributed-statefulset.yaml index 0d3f3adcf8..9e50e7e026 100644 --- a/examples/storage/minio/minio-distributed-statefulset.yaml +++ b/examples/storage/minio/minio-distributed-statefulset.yaml @@ -31,7 +31,7 @@ spec: ports: - containerPort: 9000 hostPort: 9000 - # These volume mounts are persistent. Each pod in the PetSet + # These volume mounts are persistent. Each pod in the StatefulSet # gets a volume mounted based on this field. volumeMounts: - name: data diff --git a/pkg/registry/BUILD b/pkg/registry/BUILD index 5aa7c79d62..c54063e901 100644 --- a/pkg/registry/BUILD +++ b/pkg/registry/BUILD @@ -24,8 +24,8 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/registry/apps/petset:all-srcs", "//pkg/registry/apps/rest:all-srcs", + "//pkg/registry/apps/statefulset:all-srcs", "//pkg/registry/authentication/rest:all-srcs", "//pkg/registry/authentication/tokenreview:all-srcs", "//pkg/registry/authorization/localsubjectaccessreview:all-srcs", diff --git a/pkg/registry/apps/rest/BUILD b/pkg/registry/apps/rest/BUILD index a48a2a8e7b..6fb03c3fe5 100644 --- a/pkg/registry/apps/rest/BUILD +++ b/pkg/registry/apps/rest/BUILD @@ -15,7 +15,7 @@ go_library( "//pkg/api:go_default_library", "//pkg/apis/apps:go_default_library", "//pkg/apis/apps/v1beta1:go_default_library", - "//pkg/registry/apps/petset/storage:go_default_library", + "//pkg/registry/apps/statefulset/storage:go_default_library", "//pkg/registry/extensions/deployment/storage:go_default_library", "//vendor/k8s.io/apiserver/pkg/registry/generic:go_default_library", "//vendor/k8s.io/apiserver/pkg/registry/rest:go_default_library", diff --git a/pkg/registry/apps/rest/storage_apps.go b/pkg/registry/apps/rest/storage_apps.go index fdf5e3a71c..0ae81cadb4 100644 --- a/pkg/registry/apps/rest/storage_apps.go +++ b/pkg/registry/apps/rest/storage_apps.go @@ -24,7 +24,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/apps" appsapiv1beta1 "k8s.io/kubernetes/pkg/apis/apps/v1beta1" - statefulsetstore "k8s.io/kubernetes/pkg/registry/apps/petset/storage" + statefulsetstore "k8s.io/kubernetes/pkg/registry/apps/statefulset/storage" deploymentstore "k8s.io/kubernetes/pkg/registry/extensions/deployment/storage" ) diff --git a/pkg/registry/apps/petset/BUILD b/pkg/registry/apps/statefulset/BUILD similarity index 96% rename from pkg/registry/apps/petset/BUILD rename to pkg/registry/apps/statefulset/BUILD index fb2f8298a4..ca2c3e5814 100644 --- a/pkg/registry/apps/petset/BUILD +++ b/pkg/registry/apps/statefulset/BUILD @@ -57,7 +57,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/registry/apps/petset/storage:all-srcs", + "//pkg/registry/apps/statefulset/storage:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/registry/apps/petset/doc.go b/pkg/registry/apps/statefulset/doc.go similarity index 87% rename from pkg/registry/apps/petset/doc.go rename to pkg/registry/apps/statefulset/doc.go index c7b368854c..b99adae811 100644 --- a/pkg/registry/apps/petset/doc.go +++ b/pkg/registry/apps/statefulset/doc.go @@ -14,4 +14,4 @@ See the License for the specific language governing permissions and limitations under the License. */ -package petset // import "k8s.io/kubernetes/pkg/registry/apps/petset" +package statefulset // import "k8s.io/kubernetes/pkg/registry/apps/statefulset" diff --git a/pkg/registry/apps/petset/storage/BUILD b/pkg/registry/apps/statefulset/storage/BUILD similarity index 96% rename from pkg/registry/apps/petset/storage/BUILD rename to pkg/registry/apps/statefulset/storage/BUILD index 6fd5f94219..9efc691e4f 100644 --- a/pkg/registry/apps/petset/storage/BUILD +++ b/pkg/registry/apps/statefulset/storage/BUILD @@ -34,7 +34,7 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/apis/apps:go_default_library", - "//pkg/registry/apps/petset:go_default_library", + "//pkg/registry/apps/statefulset:go_default_library", "//pkg/registry/cachesize:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", diff --git a/pkg/registry/apps/petset/storage/storage.go b/pkg/registry/apps/statefulset/storage/storage.go similarity index 89% rename from pkg/registry/apps/petset/storage/storage.go rename to pkg/registry/apps/statefulset/storage/storage.go index f8d5205cc0..f7ba0c7e51 100644 --- a/pkg/registry/apps/petset/storage/storage.go +++ b/pkg/registry/apps/statefulset/storage/storage.go @@ -25,7 +25,7 @@ import ( "k8s.io/apiserver/pkg/registry/rest" "k8s.io/kubernetes/pkg/api" appsapi "k8s.io/kubernetes/pkg/apis/apps" - "k8s.io/kubernetes/pkg/registry/apps/petset" + "k8s.io/kubernetes/pkg/registry/apps/statefulset" "k8s.io/kubernetes/pkg/registry/cachesize" ) @@ -40,21 +40,21 @@ func NewREST(optsGetter generic.RESTOptionsGetter) (*REST, *StatusREST) { Copier: api.Scheme, NewFunc: func() runtime.Object { return &appsapi.StatefulSet{} }, NewListFunc: func() runtime.Object { return &appsapi.StatefulSetList{} }, - PredicateFunc: petset.MatchStatefulSet, + PredicateFunc: statefulset.MatchStatefulSet, QualifiedResource: appsapi.Resource("statefulsets"), WatchCacheSize: cachesize.GetWatchCacheSizeByResource("statefulsets"), - CreateStrategy: petset.Strategy, - UpdateStrategy: petset.Strategy, - DeleteStrategy: petset.Strategy, + CreateStrategy: statefulset.Strategy, + UpdateStrategy: statefulset.Strategy, + DeleteStrategy: statefulset.Strategy, } - options := &generic.StoreOptions{RESTOptions: optsGetter, AttrFunc: petset.GetAttrs} + options := &generic.StoreOptions{RESTOptions: optsGetter, AttrFunc: statefulset.GetAttrs} if err := store.CompleteWithOptions(options); err != nil { panic(err) // TODO: Propagate error up } statusStore := *store - statusStore.UpdateStrategy = petset.StatusStrategy + statusStore.UpdateStrategy = statefulset.StatusStrategy return &REST{store}, &StatusREST{store: &statusStore} } diff --git a/pkg/registry/apps/petset/storage/storage_test.go b/pkg/registry/apps/statefulset/storage/storage_test.go similarity index 100% rename from pkg/registry/apps/petset/storage/storage_test.go rename to pkg/registry/apps/statefulset/storage/storage_test.go diff --git a/pkg/registry/apps/petset/strategy.go b/pkg/registry/apps/statefulset/strategy.go similarity index 99% rename from pkg/registry/apps/petset/strategy.go rename to pkg/registry/apps/statefulset/strategy.go index 46c337c195..3dc2c7031e 100644 --- a/pkg/registry/apps/petset/strategy.go +++ b/pkg/registry/apps/statefulset/strategy.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" diff --git a/pkg/registry/apps/petset/strategy_test.go b/pkg/registry/apps/statefulset/strategy_test.go similarity index 99% rename from pkg/registry/apps/petset/strategy_test.go rename to pkg/registry/apps/statefulset/strategy_test.go index 99065690b0..8769037bc7 100644 --- a/pkg/registry/apps/petset/strategy_test.go +++ b/pkg/registry/apps/statefulset/strategy_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 ( "testing" diff --git a/test/images/pets/redis/README.md b/test/images/pets/redis/README.md index 070b8bf2c7..04024c1359 100644 --- a/test/images/pets/redis/README.md +++ b/test/images/pets/redis/README.md @@ -1,4 +1,4 @@ -# Redis petset e2e tester +# Redis statefulset e2e tester The image in this directory is the init container for contrib/pets/redis but for one difference, it bakes a specific version of redis into the base image so we get deterministic test results without having to depend on a redis download server. Discussing the tradeoffs to either approach (download the version at runtime, or maintain an image per version) are outside the scope of this document. diff --git a/test/images/pets/zookeeper/README.md b/test/images/pets/zookeeper/README.md index 6f7cc80f9a..071bc7aa48 100644 --- a/test/images/pets/zookeeper/README.md +++ b/test/images/pets/zookeeper/README.md @@ -1,4 +1,4 @@ -# Zookeeper petset e2e tester +# Zookeeper statefulset e2e tester The image in this directory is the init container for contrib/pets/zookeeper but for one difference, it bakes a specific version of zookeeper into the base image so we get deterministic test results without having to depend on a zookeeper download server. Discussing the tradeoffs to either approach (download the version at runtime, or maintain an image per version) are outside the scope of this document. diff --git a/test/test_owners.csv b/test/test_owners.csv index 7a22c359d5..9486bf6aa7 100644 --- a/test/test_owners.csv +++ b/test/test_owners.csv @@ -769,8 +769,8 @@ k8s.io/kubernetes/pkg/proxy/util,knobunc,0, k8s.io/kubernetes/pkg/proxy/winuserspace,jbhurat,0, k8s.io/kubernetes/pkg/quota,sttts,1, k8s.io/kubernetes/pkg/quota/evaluator/core,yifan-gu,1, -k8s.io/kubernetes/pkg/registry/apps/petset,kevin-wangzefeng,1, -k8s.io/kubernetes/pkg/registry/apps/petset/storage,jlowdermilk,1, +k8s.io/kubernetes/pkg/registry/apps/statefulset,kevin-wangzefeng,1, +k8s.io/kubernetes/pkg/registry/apps/statefulset/storage,jlowdermilk,1, k8s.io/kubernetes/pkg/registry/authorization/subjectaccessreview,liggitt,1, k8s.io/kubernetes/pkg/registry/authorization/util,liggitt,1, k8s.io/kubernetes/pkg/registry/autoscaling/horizontalpodautoscaler,bgrant0607,1,