Skip to content

Commit 90c1cb3

Browse files
authored
Merge pull request #74 from yue9944882/fix/kine-resource-prefix
Fix: kine resource prefix
2 parents ac26540 + 41ce765 commit 90c1cb3

File tree

12 files changed

+21
-1
lines changed

12 files changed

+21
-1
lines changed

.github/workflows/go.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Set up Go 1.x
1717
uses: actions/setup-go@v2
1818
with:
19-
go-version: 1.16.6
19+
go-version: 1.17.6
2020
id: go
2121

2222
- run: go get github.com/golangci/golangci-lint/cmd/golangci-lint

internal/sample-apiserver/pkg/apis/wardle/v1alpha1/zz_generated.conversion.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/sample-apiserver/pkg/apis/wardle/v1alpha1/zz_generated.deepcopy.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/sample-apiserver/pkg/apis/wardle/v1alpha1/zz_generated.defaults.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/sample-apiserver/pkg/apis/wardle/v1beta1/zz_generated.conversion.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/sample-apiserver/pkg/apis/wardle/v1beta1/zz_generated.deepcopy.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/sample-apiserver/pkg/apis/wardle/v1beta1/zz_generated.defaults.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/sample-apiserver/pkg/apis/wardle/zz_generated.deepcopy.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/sample-apiserver/pkg/generated/openapi/zz_generated.openapi.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/experimental/storage/mysql/kine.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,14 @@ package mysql
44
import (
55
"context"
66
"fmt"
7+
"time"
78

89
"github.com/k3s-io/kine/pkg/endpoint"
910
"k8s.io/apimachinery/pkg/runtime/schema"
1011
"k8s.io/apiserver/pkg/registry/generic"
1112
genericregistry "k8s.io/apiserver/pkg/registry/generic/registry"
1213
"k8s.io/apiserver/pkg/storage/storagebackend"
14+
"k8s.io/apiserver/pkg/util/flowcontrol/request"
1315
builderrest "sigs.k8s.io/apiserver-runtime/pkg/builder/rest"
1416
)
1517

@@ -53,9 +55,17 @@ func (g *kineProxiedRESTOptionsGetter) GetRESTOptions(resource schema.GroupResou
5355
return generic.RESTOptions{}, err
5456
}
5557
restOptions := generic.RESTOptions{
58+
ResourcePrefix: resource.String(),
59+
Decorator: genericregistry.StorageWithCacher(),
60+
EnableGarbageCollection: true,
61+
DeleteCollectionWorkers: 1,
62+
CountMetricPollPeriod: time.Minute,
63+
StorageObjectCountTracker: request.NewStorageObjectCountTracker(context.Background().Done()),
64+
5665
StorageConfig: &storagebackend.ConfigForResource{
5766
GroupResource: resource,
5867
Config: storagebackend.Config{
68+
Prefix: "/kine/",
5969
Transport: storagebackend.TransportConfig{
6070
ServerList: etcdConfig.Endpoints,
6171
TrustedCAFile: etcdConfig.TLSConfig.CAFile,

0 commit comments

Comments
 (0)