Clean up petset

parent a481a5bc
...@@ -273,7 +273,7 @@ spec: ...@@ -273,7 +273,7 @@ spec:
ports: ports:
- containerPort: 9000 - containerPort: 9000
hostPort: 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. # gets a volume mounted based on this field.
volumeMounts: volumeMounts:
- name: data - name: data
......
...@@ -31,7 +31,7 @@ spec: ...@@ -31,7 +31,7 @@ spec:
ports: ports:
- containerPort: 9000 - containerPort: 9000
hostPort: 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. # gets a volume mounted based on this field.
volumeMounts: volumeMounts:
- name: data - name: data
......
...@@ -24,8 +24,8 @@ filegroup( ...@@ -24,8 +24,8 @@ filegroup(
name = "all-srcs", name = "all-srcs",
srcs = [ srcs = [
":package-srcs", ":package-srcs",
"//pkg/registry/apps/petset:all-srcs",
"//pkg/registry/apps/rest:all-srcs", "//pkg/registry/apps/rest:all-srcs",
"//pkg/registry/apps/statefulset:all-srcs",
"//pkg/registry/authentication/rest:all-srcs", "//pkg/registry/authentication/rest:all-srcs",
"//pkg/registry/authentication/tokenreview:all-srcs", "//pkg/registry/authentication/tokenreview:all-srcs",
"//pkg/registry/authorization/localsubjectaccessreview:all-srcs", "//pkg/registry/authorization/localsubjectaccessreview:all-srcs",
......
...@@ -15,7 +15,7 @@ go_library( ...@@ -15,7 +15,7 @@ go_library(
"//pkg/api:go_default_library", "//pkg/api:go_default_library",
"//pkg/apis/apps:go_default_library", "//pkg/apis/apps:go_default_library",
"//pkg/apis/apps/v1beta1: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", "//pkg/registry/extensions/deployment/storage:go_default_library",
"//vendor/k8s.io/apiserver/pkg/registry/generic:go_default_library", "//vendor/k8s.io/apiserver/pkg/registry/generic:go_default_library",
"//vendor/k8s.io/apiserver/pkg/registry/rest:go_default_library", "//vendor/k8s.io/apiserver/pkg/registry/rest:go_default_library",
......
...@@ -24,7 +24,7 @@ import ( ...@@ -24,7 +24,7 @@ import (
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/apis/apps" "k8s.io/kubernetes/pkg/apis/apps"
appsapiv1beta1 "k8s.io/kubernetes/pkg/apis/apps/v1beta1" 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" deploymentstore "k8s.io/kubernetes/pkg/registry/extensions/deployment/storage"
) )
......
...@@ -57,7 +57,7 @@ filegroup( ...@@ -57,7 +57,7 @@ filegroup(
name = "all-srcs", name = "all-srcs",
srcs = [ srcs = [
":package-srcs", ":package-srcs",
"//pkg/registry/apps/petset/storage:all-srcs", "//pkg/registry/apps/statefulset/storage:all-srcs",
], ],
tags = ["automanaged"], tags = ["automanaged"],
) )
...@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and ...@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package petset // import "k8s.io/kubernetes/pkg/registry/apps/petset" package statefulset // import "k8s.io/kubernetes/pkg/registry/apps/statefulset"
...@@ -34,7 +34,7 @@ go_library( ...@@ -34,7 +34,7 @@ go_library(
deps = [ deps = [
"//pkg/api:go_default_library", "//pkg/api:go_default_library",
"//pkg/apis/apps: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", "//pkg/registry/cachesize:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
......
...@@ -25,7 +25,7 @@ import ( ...@@ -25,7 +25,7 @@ import (
"k8s.io/apiserver/pkg/registry/rest" "k8s.io/apiserver/pkg/registry/rest"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
appsapi "k8s.io/kubernetes/pkg/apis/apps" 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" "k8s.io/kubernetes/pkg/registry/cachesize"
) )
...@@ -40,21 +40,21 @@ func NewREST(optsGetter generic.RESTOptionsGetter) (*REST, *StatusREST) { ...@@ -40,21 +40,21 @@ func NewREST(optsGetter generic.RESTOptionsGetter) (*REST, *StatusREST) {
Copier: api.Scheme, Copier: api.Scheme,
NewFunc: func() runtime.Object { return &appsapi.StatefulSet{} }, NewFunc: func() runtime.Object { return &appsapi.StatefulSet{} },
NewListFunc: func() runtime.Object { return &appsapi.StatefulSetList{} }, NewListFunc: func() runtime.Object { return &appsapi.StatefulSetList{} },
PredicateFunc: petset.MatchStatefulSet, PredicateFunc: statefulset.MatchStatefulSet,
QualifiedResource: appsapi.Resource("statefulsets"), QualifiedResource: appsapi.Resource("statefulsets"),
WatchCacheSize: cachesize.GetWatchCacheSizeByResource("statefulsets"), WatchCacheSize: cachesize.GetWatchCacheSizeByResource("statefulsets"),
CreateStrategy: petset.Strategy, CreateStrategy: statefulset.Strategy,
UpdateStrategy: petset.Strategy, UpdateStrategy: statefulset.Strategy,
DeleteStrategy: petset.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 { if err := store.CompleteWithOptions(options); err != nil {
panic(err) // TODO: Propagate error up panic(err) // TODO: Propagate error up
} }
statusStore := *store statusStore := *store
statusStore.UpdateStrategy = petset.StatusStrategy statusStore.UpdateStrategy = statefulset.StatusStrategy
return &REST{store}, &StatusREST{store: &statusStore} return &REST{store}, &StatusREST{store: &statusStore}
} }
......
...@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and ...@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package petset package statefulset
import ( import (
"fmt" "fmt"
......
...@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and ...@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package petset package statefulset
import ( import (
"testing" "testing"
......
# 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. 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.
......
# 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. 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.
......
...@@ -769,8 +769,8 @@ k8s.io/kubernetes/pkg/proxy/util,knobunc,0, ...@@ -769,8 +769,8 @@ k8s.io/kubernetes/pkg/proxy/util,knobunc,0,
k8s.io/kubernetes/pkg/proxy/winuserspace,jbhurat,0, k8s.io/kubernetes/pkg/proxy/winuserspace,jbhurat,0,
k8s.io/kubernetes/pkg/quota,sttts,1, k8s.io/kubernetes/pkg/quota,sttts,1,
k8s.io/kubernetes/pkg/quota/evaluator/core,yifan-gu,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/statefulset,kevin-wangzefeng,1,
k8s.io/kubernetes/pkg/registry/apps/petset/storage,jlowdermilk,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/subjectaccessreview,liggitt,1,
k8s.io/kubernetes/pkg/registry/authorization/util,liggitt,1, k8s.io/kubernetes/pkg/registry/authorization/util,liggitt,1,
k8s.io/kubernetes/pkg/registry/autoscaling/horizontalpodautoscaler,bgrant0607,1, k8s.io/kubernetes/pkg/registry/autoscaling/horizontalpodautoscaler,bgrant0607,1,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment