Merge pull request #74 from yue9944882/fix/kine-resource-prefix

Fix: kine resource prefix
kubernetes-sigs · Apr 3, 2022 · 90c1cb3 · 90c1cb3
2 parents ac26540 + 41ce765
commit 90c1cb3
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 1 deletion.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -16,7 +16,7 @@ jobs:
     - name: Set up Go 1.x
       uses: actions/setup-go@v2
       with:
-        go-version: 1.16.6
+        go-version: 1.17.6
       id: go
 
     - run: go get github.com/golangci/golangci-lint/cmd/golangci-lint

diff --git a/internal/sample-apiserver/pkg/apis/wardle/v1alpha1/zz_generated.conversion.go b/internal/sample-apiserver/pkg/apis/wardle/v1alpha1/zz_generated.conversion.go
diff --git a/internal/sample-apiserver/pkg/apis/wardle/v1alpha1/zz_generated.deepcopy.go b/internal/sample-apiserver/pkg/apis/wardle/v1alpha1/zz_generated.deepcopy.go
diff --git a/internal/sample-apiserver/pkg/apis/wardle/v1alpha1/zz_generated.defaults.go b/internal/sample-apiserver/pkg/apis/wardle/v1alpha1/zz_generated.defaults.go
diff --git a/internal/sample-apiserver/pkg/apis/wardle/v1beta1/zz_generated.conversion.go b/internal/sample-apiserver/pkg/apis/wardle/v1beta1/zz_generated.conversion.go
diff --git a/internal/sample-apiserver/pkg/apis/wardle/v1beta1/zz_generated.deepcopy.go b/internal/sample-apiserver/pkg/apis/wardle/v1beta1/zz_generated.deepcopy.go
diff --git a/internal/sample-apiserver/pkg/apis/wardle/v1beta1/zz_generated.defaults.go b/internal/sample-apiserver/pkg/apis/wardle/v1beta1/zz_generated.defaults.go
diff --git a/internal/sample-apiserver/pkg/apis/wardle/zz_generated.deepcopy.go b/internal/sample-apiserver/pkg/apis/wardle/zz_generated.deepcopy.go
diff --git a/internal/sample-apiserver/pkg/generated/openapi/zz_generated.openapi.go b/internal/sample-apiserver/pkg/generated/openapi/zz_generated.openapi.go
diff --git a/pkg/experimental/storage/mysql/kine.go b/pkg/experimental/storage/mysql/kine.go
@@ -4,12 +4,14 @@ package mysql
 import (
 	"context"
 	"fmt"
+	"time"
 
 	"github.com/k3s-io/kine/pkg/endpoint"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apiserver/pkg/registry/generic"
 	genericregistry "k8s.io/apiserver/pkg/registry/generic/registry"
 	"k8s.io/apiserver/pkg/storage/storagebackend"
+	"k8s.io/apiserver/pkg/util/flowcontrol/request"
 	builderrest "sigs.k8s.io/apiserver-runtime/pkg/builder/rest"
 )
 
@@ -53,9 +55,17 @@ func (g *kineProxiedRESTOptionsGetter) GetRESTOptions(resource schema.GroupResou
 		return generic.RESTOptions{}, err
 	}
 	restOptions := generic.RESTOptions{
+		ResourcePrefix:            resource.String(),
+		Decorator:                 genericregistry.StorageWithCacher(),
+		EnableGarbageCollection:   true,
+		DeleteCollectionWorkers:   1,
+		CountMetricPollPeriod:     time.Minute,
+		StorageObjectCountTracker: request.NewStorageObjectCountTracker(context.Background().Done()),
+
 		StorageConfig: &storagebackend.ConfigForResource{
 			GroupResource: resource,
 			Config: storagebackend.Config{
+				Prefix: "/kine/",
 				Transport: storagebackend.TransportConfig{
 					ServerList:    etcdConfig.Endpoints,
 					TrustedCAFile: etcdConfig.TLSConfig.CAFile,

diff --git a/sample/pkg/apis/sample/v1alpha1/zz_generated.deepcopy.go b/sample/pkg/apis/sample/v1alpha1/zz_generated.deepcopy.go
diff --git a/sample/pkg/generated/openapi/zz_generated.openapi.go b/sample/pkg/generated/openapi/zz_generated.openapi.go