Skip to content

Commit 676b4db

Browse files
authored
K8SPSMDB-1294: Use server's preferred version of MCS APIs (#1892)
1 parent fdcf12b commit 676b4db

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

cmd/manager/main.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,9 @@ func main() {
136136
}
137137

138138
if mcs.IsAvailable() {
139+
setupLog.Info("Multi cluster services available",
140+
"group", mcs.MCSSchemeGroupVersion.Group,
141+
"version", mcs.MCSSchemeGroupVersion.Version)
139142
if err := mcs.AddToScheme(mgr.GetScheme()); err != nil {
140143
setupLog.Error(err, "")
141144
os.Exit(1)

pkg/mcs/register.go

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package mcs
22

33
import (
4-
"strings"
5-
64
"github.com/pkg/errors"
75
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
86
"k8s.io/apimachinery/pkg/runtime"
@@ -36,7 +34,7 @@ func addKnownTypes(scheme *runtime.Scheme) error {
3634
}
3735

3836
func Register(dc *discovery.DiscoveryClient) error {
39-
_, resources, err := dc.ServerGroupsAndResources()
37+
resources, err := dc.ServerPreferredResources()
4038
if err != nil {
4139
return errors.Wrap(err, "get api groups and resources")
4240
}
@@ -45,10 +43,8 @@ outer:
4543
for _, r := range resources {
4644
for _, resource := range r.APIResources {
4745
if resource.Kind == "ServiceExport" {
48-
gv := strings.Split(r.GroupVersion, "/")
49-
50-
MCSSchemeGroupVersion.Group = gv[0]
51-
MCSSchemeGroupVersion.Version = gv[1]
46+
MCSSchemeGroupVersion.Group = resource.Group
47+
MCSSchemeGroupVersion.Version = resource.Version
5248

5349
break outer
5450
}

0 commit comments

Comments
 (0)