fix: clientset scheme

api/v1/roomingress.go

@@ -50,10 +50,9 @@ type RoomIngressPlayerStatus struct {
 	//+kubebuilder:validation:Minimum=0
 	//+kubebuilder:validation:Maximum=4294967295
 	Token     int64        `json:"token"`
-	//+kubebuilder:validation:MinItems=1
-	Externals []string     `json:"externals"`
-	Timestamp metav1.Time  `json:"timestamp"`
-	Expire    metav1.Time  `json:"expire"`
+	Externals []string     `json:"externals,omitempty"`
+	Timestamp *metav1.Time  `json:"timestamp,omitempty"`
+	Expire    *metav1.Time  `json:"expire,omitempty"`
 	Status    PlayerStatus `json:"status"`
 	Detail    string       `json:"detail"`
 }

api/v1/version.go

@@ -8,8 +8,8 @@ import (
 )
 
 var (
-	GroupVersion = schema.GroupVersion{Group: "projectdavinci.com", Version: "v1"}
-	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
-	AddToScheme = SchemeBuilder.AddToScheme
+	GroupVersion     = schema.GroupVersion{Group: "projectdavinci.com", Version: "v1"}
+	GroupVersionKind = schema.GroupVersionKind{Group: "projectdavinci.com", Version: "v1", Kind: "RoomIngress"}
+	SchemeBuilder    = &scheme.Builder{GroupVersion: GroupVersion}
+	AddToScheme      = SchemeBuilder.AddToScheme
 )
-

client/v1/client.go

@@ -5,12 +5,12 @@ import (
 	"time"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime/serializer"
 	types "k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/watch"
-	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/rest"
 	v1 "github.com/LilithGames/spiracle/api/v1"
+
+	"github.com/LilithGames/spiracle/client/v1/scheme"
 )
 
 type SpiracleV1Interface interface {
@@ -24,10 +24,12 @@ type SpiracleV1Client struct {
 
 func NewForConfig(c *rest.Config) (*SpiracleV1Client, error) {
 	config := *c
-	config.ContentConfig.GroupVersion = &v1.GroupVersion
+	config.GroupVersion = &v1.GroupVersion
 	config.APIPath = "/apis"
-	config.NegotiatedSerializer = serializer.NewCodecFactory(scheme.Scheme)
-	config.UserAgent = rest.DefaultKubernetesUserAgent()
+	config.NegotiatedSerializer = scheme.Codecs.WithoutConversion()
+	if config.UserAgent == "" {
+		config.UserAgent = rest.DefaultKubernetesUserAgent()
+	}
 
 	client, err := rest.RESTClientFor(&config)
 	if err != nil {

client/v1/fake_client.go

@@ -11,13 +11,44 @@ import (
 	watch "k8s.io/apimachinery/pkg/watch"
 	types "k8s.io/apimachinery/pkg/types"
 	v1 "github.com/LilithGames/spiracle/api/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
+	serializer "k8s.io/apimachinery/pkg/runtime/serializer"
 )
 
 var ringsResource = schema.GroupVersionResource{Group: "projectdavinci.com", Version: "v1", Resource: "roomingresses"}
 var ringsKind = schema.GroupVersionKind{Group: "projectdavinci.com", Version: "v1", Kind: "RoomIngress"}
+var fakescheme = runtime.NewScheme()
+var codecs = serializer.NewCodecFactory(fakescheme)
+
+func init() {
+	utilruntime.Must(v1.AddToScheme(fakescheme))
+}
 
 type FakeSpiracleV1 struct {
-	*testing.Fake
+	tracker testing.ObjectTracker
+	testing.Fake
+}
+
+func NewNewSimpleClientset(objects ...runtime.Object) *FakeSpiracleV1 {
+	o := testing.NewObjectTracker(fakescheme, codecs.UniversalDecoder())
+	for _, obj := range objects {
+		if err := o.Add(obj); err != nil {
+			panic(err)
+		}
+	}
+	cs := &FakeSpiracleV1{tracker: o}
+	cs.AddReactor("*", "*", testing.ObjectReaction(o))
+	cs.AddWatchReactor("*", func(action testing.Action) (handled bool, ret watch.Interface, err error) {
+		gvr := action.GetResource()
+		ns := action.GetNamespace()
+		watch, err := o.Watch(gvr, ns)
+		if err != nil {
+			return false, nil, err
+		}
+		return true, watch, nil
+	})
+	return cs
 }
 
 func (it *FakeSpiracleV1) RESTClient() rest.Interface {

client/v1/scheme/register.go

@@ -0,0 +1,17 @@
+package scheme
+
+import (
+	runtime "k8s.io/apimachinery/pkg/runtime"
+	serializer "k8s.io/apimachinery/pkg/runtime/serializer"
+	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
+
+	v1 "github.com/LilithGames/spiracle/api/v1"
+)
+
+var Scheme = runtime.NewScheme()
+var Codecs = serializer.NewCodecFactory(Scheme)
+var ParameterCodec = runtime.NewParameterCodec(Scheme)
+
+func init() {
+	utilruntime.Must(v1.AddToScheme(Scheme))
+}

controllers/roomingress.go

@@ -86,25 +86,30 @@ func (it *RoomIngressReconciler) syncTokens(ring *v1.RoomIngress) (int, *time.Du
 			if !ok {
 				c.Player.Status = v1.PlayerStatusFailure
 				c.Player.Detail = "unknown room.server"
+				n++
 				continue
 			}
 			external, err := it.ExternalRepos.Get(c.Room.Server)
 			if err != nil {
 				c.Player.Status = v1.PlayerStatusFailure
 				c.Player.Detail = "get server external err: " + err.Error()
+				n++
+				continue
 			}
 			token, err := repo.Create(context.TODO(), repos.TokenCreationToken(uint32(c.Player.Token)))
 			if err != nil {
 				c.Player.Status = v1.PlayerStatusFailure
 				c.Player.Detail = err.Error()
+				n++
 				continue
 				// requeue = append(requeue, time.Minute)
 			}
 			c.Player.Status = v1.PlayerStatusSuccess
 			c.Player.Token = int64(token.TToken)
 			c.Player.Externals = external.HostPorts()
-			c.Player.Timestamp = metav1.NewTime(token.Timestamp)
-			c.Player.Expire = metav1.NewTime(token.Expire)
+			c.Player.Timestamp = ptr(metav1.NewTime(token.Timestamp))
+			c.Player.Expire = ptr(metav1.NewTime(token.Expire))
+			n++
 			requeue = append(requeue, token.Duration())
 		}
 		if diff.Type == DiffDeleted || diff.Type == DiffUpdated {
@@ -114,6 +119,9 @@ func (it *RoomIngressReconciler) syncTokens(ring *v1.RoomIngress) (int, *time.Du
 					repo.Delete(context.TODO(), uint32(p.Player.Token))
 				}
 			}
+			if diff.Type == DiffDeleted {
+				n++
+			}
 		}
 		if diff.Type == DiffUnchanged {
 			c := GetPlayerStatusByPos(curr, diff.Current)
@@ -131,8 +139,6 @@ func (it *RoomIngressReconciler) syncTokens(ring *v1.RoomIngress) (int, *time.Du
 					requeue = append(requeue, expire.Sub(now))
 				}
 			}
-		} else {
-			n++
 		}
 	}
 	ring.Status = *curr

controllers/util.go

@@ -3,6 +3,8 @@ package controllers
 import (
 	"reflect"
 	"time"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 func contains(items []string, x string) bool {
@@ -46,3 +48,7 @@ func min(a []time.Duration) *time.Duration {
 	}
 	return &m
 }
+
+func ptr(t metav1.Time) *metav1.Time {
+	return &t
+}

deploy/config.yaml

@@ -2,18 +2,18 @@ roomproxy:
   debug: false
   workers: 2
   servers:
-    - name: dev
+    - name: local
       host: 0.0.0.0
       port: 4000
       externals: ["47.103.191.190:15000"]
-    - name: alpha
+    - name: dev
       host: 0.0.0.0
       port: 5000
       externals: ["47.103.191.190:15001"]
 controller:
   reconciler:
-    enable: false
+    enable: true
   leaderelection:
-    enable: false
+    enable: true
     id: eed665e4.projectdavinci.com
 

deploy/crd/projectdavinci.com_roomingresses.yaml

@@ -91,7 +91,6 @@ spec:
                           externals:
                             items:
                               type: string
-                            minItems: 1
                             type: array
                           id:
                             type: string
@@ -113,11 +112,8 @@ spec:
                             type: integer
                         required:
                         - detail
-                        - expire
-                        - externals
                         - id
                         - status
-                        - timestamp
                         - token
                         type: object
                       type: array

deploy/samples/roomingress.yaml

@@ -6,7 +6,7 @@ metadata:
 spec:
   rooms:
     - id: room1
-      server: local
+      server: local1
       upstream: 127.0.0.1:9200
       players:
         - id: player1

deploy/spiracle.yaml

@@ -8,7 +8,7 @@ spec:
     matchLabels:
       app: spiracle
   serviceName: spiracle
-  replicas: &replicas 3
+  replicas: 3
   revisionHistoryLimit: 0
   template:
     metadata: