Skip to content

Commit 26b4b2d

Browse files
committed
Make sharder's scheme reusable
1 parent ef9548d commit 26b4b2d

File tree

2 files changed

+40
-11
lines changed

2 files changed

+40
-11
lines changed

cmd/sharder/app/options.go

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ import (
3232
"k8s.io/apimachinery/pkg/runtime/serializer"
3333
"k8s.io/apimachinery/pkg/selection"
3434
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
35-
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
3635
"k8s.io/client-go/rest"
3736
"k8s.io/utils/ptr"
3837
"sigs.k8s.io/controller-runtime/pkg/cache"
@@ -46,19 +45,11 @@ import (
4645

4746
configv1alpha1 "github.com/timebertt/kubernetes-controller-sharding/pkg/apis/config/v1alpha1"
4847
shardingv1alpha1 "github.com/timebertt/kubernetes-controller-sharding/pkg/apis/sharding/v1alpha1"
48+
utilclient "github.com/timebertt/kubernetes-controller-sharding/pkg/utils/client"
4949
"github.com/timebertt/kubernetes-controller-sharding/pkg/utils/routes"
5050
)
5151

52-
var scheme = runtime.NewScheme()
53-
54-
func init() {
55-
schemeBuilder := runtime.NewSchemeBuilder(
56-
clientgoscheme.AddToScheme,
57-
shardingv1alpha1.AddToScheme,
58-
configv1alpha1.AddToScheme,
59-
)
60-
utilruntime.Must(schemeBuilder.AddToScheme(scheme))
61-
}
52+
var scheme = utilclient.SharderScheme
6253

6354
type options struct {
6455
configFile string

pkg/utils/client/scheme.go

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
/*
2+
Copyright 2025 Tim Ebert.
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
*/
16+
17+
package client
18+
19+
import (
20+
"k8s.io/apimachinery/pkg/runtime"
21+
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
22+
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
23+
24+
configv1alpha1 "github.com/timebertt/kubernetes-controller-sharding/pkg/apis/config/v1alpha1"
25+
shardingv1alpha1 "github.com/timebertt/kubernetes-controller-sharding/pkg/apis/sharding/v1alpha1"
26+
)
27+
28+
// SharderScheme is the scheme that the sharder uses.
29+
var SharderScheme = runtime.NewScheme()
30+
31+
func init() {
32+
schemeBuilder := runtime.NewSchemeBuilder(
33+
clientgoscheme.AddToScheme,
34+
shardingv1alpha1.AddToScheme,
35+
configv1alpha1.AddToScheme,
36+
)
37+
utilruntime.Must(schemeBuilder.AddToScheme(SharderScheme))
38+
}

0 commit comments

Comments
 (0)