Merge pull request #132 from erikgb/serve-v2

feat: start serving v2 API

api/accurate/v2/conversion_test.go

@@ -0,0 +1,29 @@
+package v2
+
+import (
+	"testing"
+
+	accuratev2alpha1 "github.com/cybozu-go/accurate/api/accurate/v2alpha1"
+	utilconversion "github.com/cybozu-go/accurate/internal/util/conversion"
+	fuzz "github.com/google/gofuzz"
+	"k8s.io/apimachinery/pkg/api/apitesting/fuzzer"
+	runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer"
+)
+
+func TestFuzzyConversion(t *testing.T) {
+	t.Run("for SubNamespace", utilconversion.FuzzTestFunc(utilconversion.FuzzTestFuncInput{
+		Hub:         &accuratev2alpha1.SubNamespace{},
+		Spoke:       &SubNamespace{},
+		FuzzerFuncs: []fuzzer.FuzzerFuncs{SubNamespaceStatusFuzzFunc},
+	}))
+}
+
+func SubNamespaceStatusFuzzFunc(_ runtimeserializer.CodecFactory) []interface{} {
+	return []interface{}{
+		SubNamespaceStatusFuzzer,
+	}
+}
+
+func SubNamespaceStatusFuzzer(in *SubNamespace, c fuzz.Continue) {
+	c.FuzzNoCustom(in)
+}

api/accurate/v2/doc.go

@@ -1,3 +1,4 @@
 // +kubebuilder:object:generate=true
 // +groupName=accurate.cybozu.com
+// +k8s:conversion-gen=github.com/cybozu-go/accurate/api/accurate/v2alpha1
 package v2

api/accurate/v2/groupversion_info.go

@@ -15,4 +15,6 @@ var (
 
 	// AddToScheme adds the types in this group-version to the given scheme.
 	AddToScheme = SchemeBuilder.AddToScheme
+
+	localSchemeBuilder = SchemeBuilder.SchemeBuilder
 )

api/accurate/v2/subnamespace_conversion.go

@@ -0,0 +1,43 @@
+package v2
+
+import (
+	accuratev2alpha1 "github.com/cybozu-go/accurate/api/accurate/v2alpha1"
+	"github.com/go-logr/logr"
+	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/conversion"
+)
+
+// ConvertTo converts this SubNamespace to the Hub version (v2alpha1).
+func (src *SubNamespace) ConvertTo(dstRaw conversion.Hub) error {
+	dst := dstRaw.(*accuratev2alpha1.SubNamespace)
+
+	logger := getConversionLogger(src).WithValues(
+		"source", SchemeGroupVersion.Version,
+		"destination", accuratev2alpha1.SchemeGroupVersion.Version,
+	)
+	logger.V(5).Info("converting")
+
+	return Convert_v2_SubNamespace_To_v2alpha1_SubNamespace(src, dst, nil)
+}
+
+// ConvertFrom converts from the Hub version (v2alpha1) to this version.
+func (dst *SubNamespace) ConvertFrom(srcRaw conversion.Hub) error {
+	src := srcRaw.(*accuratev2alpha1.SubNamespace)
+
+	logger := getConversionLogger(src).WithValues(
+		"source", accuratev2alpha1.SchemeGroupVersion.Version,
+		"destination", SchemeGroupVersion.Version,
+	)
+	logger.V(5).Info("converting")
+
+	return Convert_v2alpha1_SubNamespace_To_v2_SubNamespace(src, dst, nil)
+}
+
+func getConversionLogger(obj client.Object) logr.Logger {
+	return ctrl.Log.WithName("conversion").WithValues(
+		"kind", "SubNamespace",
+		"namespace", obj.GetNamespace(),
+		"name", obj.GetName(),
+	)
+}

api/accurate/v2/subnamespace_types.go

@@ -32,7 +32,6 @@ type SubNamespaceSpec struct {
 }
 
 //+kubebuilder:object:root=true
-//+kubebuilder:unservedversion
 //+kubebuilder:subresource:status
 //+genclient
 

cmd/accurate-controller/sub/run.go

@@ -9,6 +9,7 @@ import (
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
 
 	accuratev1 "github.com/cybozu-go/accurate/api/accurate/v1"
+	accuratev2 "github.com/cybozu-go/accurate/api/accurate/v2"
 	accuratev2alpha1 "github.com/cybozu-go/accurate/api/accurate/v2alpha1"
 	"github.com/cybozu-go/accurate/controllers"
 	"github.com/cybozu-go/accurate/hooks"
@@ -44,6 +45,9 @@ func subMain(ns, addr string, port int) error {
 	if err := accuratev2alpha1.AddToScheme(scheme); err != nil {
 		return fmt.Errorf("unable to add Accurate v2alpha1 objects: %w", err)
 	}
+	if err := accuratev2.AddToScheme(scheme); err != nil {
+		return fmt.Errorf("unable to add Accurate v2 objects: %w", err)
+	}
 
 	cfgData, err := os.ReadFile(options.configFile)
 	if err != nil {

cmd/kubectl-accurate/sub/util.go

@@ -2,6 +2,7 @@ package sub
 
 import (
 	accuratev1 "github.com/cybozu-go/accurate/api/accurate/v1"
+	accuratev2 "github.com/cybozu-go/accurate/api/accurate/v2"
 	accuratev2alpha1 "github.com/cybozu-go/accurate/api/accurate/v2alpha1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
@@ -25,6 +26,9 @@ func makeClient(config *genericclioptions.ConfigFlags) (client.Client, error) {
 	if err := accuratev2alpha1.AddToScheme(scheme); err != nil {
 		return nil, err
 	}
+	if err := accuratev2.AddToScheme(scheme); err != nil {
+		return nil, err
+	}
 
 	return client.New(cfg, client.Options{Scheme: scheme})
 }

controllers/suite_test.go

@@ -21,6 +21,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
 	accuratev1 "github.com/cybozu-go/accurate/api/accurate/v1"
+	accuratev2 "github.com/cybozu-go/accurate/api/accurate/v2"
 	accuratev2alpha1 "github.com/cybozu-go/accurate/api/accurate/v2alpha1"
 	"github.com/cybozu-go/accurate/pkg/config"
 	"github.com/cybozu-go/accurate/pkg/constants"
@@ -75,6 +76,8 @@ var _ = BeforeSuite(func() {
 	Expect(err).NotTo(HaveOccurred())
 	err = accuratev2alpha1.AddToScheme(scheme)
 	Expect(err).NotTo(HaveOccurred())
+	err = accuratev2.AddToScheme(scheme)
+	Expect(err).NotTo(HaveOccurred())
 
 	//+kubebuilder:scaffold:scheme
 

e2e/e2e_test.go

@@ -246,7 +246,7 @@ var _ = Describe("kubectl accurate", func() {
 		kubectlSafe(nil, "get", "subnamespaces", "-n", "subroot1", "sn1")
 
 		Eventually(func() string {
-			out, err := kubectl(nil, "get", "-n", "subroot2", "subnamespaces", "sn1", "-o", "json")
+			out, err := kubectl(nil, "get", "-n", "subroot2", "subnamespaces.v1.accurate.cybozu.com", "sn1", "-o", "json")
 			if err != nil {
 				return ""
 			}

hooks/subnamespace.go

@@ -8,6 +8,7 @@ import (
 	"regexp"
 
 	accuratev1 "github.com/cybozu-go/accurate/api/accurate/v1"
+	accuratev2 "github.com/cybozu-go/accurate/api/accurate/v2"
 	accuratev2alpha1 "github.com/cybozu-go/accurate/api/accurate/v2alpha1"
 	"github.com/cybozu-go/accurate/pkg/config"
 	"github.com/cybozu-go/accurate/pkg/constants"
@@ -140,7 +141,7 @@ func (v *subNamespaceValidator) notMatchingNamingPolicy(ctx context.Context, ns,
 
 // SetupSubNamespaceWebhook registers the webhooks for SubNamespace
 func SetupSubNamespaceWebhook(mgr manager.Manager, dec admission.Decoder, namingPolicyRegexps []config.NamingPolicyRegexp) error {
-	for _, s := range []runtime.Object{&accuratev1.SubNamespace{}, &accuratev2alpha1.SubNamespace{}} {
+	for _, s := range []runtime.Object{&accuratev1.SubNamespace{}, &accuratev2alpha1.SubNamespace{}, &accuratev2.SubNamespace{}} {
 		err := ctrl.NewWebhookManagedBy(mgr).
 			For(s).
 			Complete()