feat(crd): 数值字段加上下限校验,rcon.port 用 CEL 限定默认端口,文档写明 v1beta1 演进与多节点前提

This commit is contained in:
Lemon-miaow committed 2026-09-25 19:49:09 +08:00
1 parent 925cfcf8f8
commit b384f6281f
8 files changed
+186 -13

No files matched your search

+105
View File
@@ -0,0 +1,105 @@
package v1alpha1_test
import (
"encoding/json"
"os"
"testing"
"k8s.io/kube-openapi/pkg/validation/spec"
"k8s.io/kube-openapi/pkg/validation/strfmt"
"k8s.io/kube-openapi/pkg/validation/validate"
"sigs.k8s.io/yaml"
)
// crdSchema loads the openAPIV3Schema the cluster enforces, from the same YAML
// `felis bootstrap-assets crd` applies. The x-kubernetes-validations (CEL) rules
// ride along as extensions and are checked live with a server-side dry run.
func crdSchema(t *testing.T) *spec.Schema {
t.Helper()
raw, err := os.ReadFile("../../../../deploy/crd/felis.lolicon.best_minecraftservers.yaml")
if err != nil {
t.Fatal(err)
}
var crd struct {
Spec struct {
Versions []struct {
Schema struct {
OpenAPIV3Schema json.RawMessage `json:"openAPIV3Schema"`
} `json:"schema"`
} `json:"versions"`
} `json:"spec"`
}
if err := yaml.Unmarshal(raw, &crd); err != nil {
t.Fatal(err)
}
if len(crd.Spec.Versions) != 1 {
t.Fatalf("versions = %d, want the single v1alpha1", len(crd.Spec.Versions))
}
var s spec.Schema
if err := json.Unmarshal(crd.Spec.Versions[0].Schema.OpenAPIV3Schema, &s); err != nil {
t.Fatal(err)
}
return &s
}
// server is a minimal valid MinecraftServer with one extra spec section.
func server(section string, body map[string]any) map[string]any {
sp := map[string]any{"image": "paper", "subdomain": "survival"}
if section != "" {
sp[section] = body
}
return map[string]any{
"apiVersion": "felis.lolicon.best/v1alpha1",
"kind": "MinecraftServer",
"metadata": map[string]any{"name": "survival"},
"spec": sp,
}
}
func TestCRDBoundsNumericFields(t *testing.T) {
schema := crdSchema(t)
cases := []struct {
name string
section string
body map[string]any
ok bool
}{
{"defaults", "", nil, true},
{"rcon port 0 means default", "rcon", map[string]any{"port": 0}, true},
{"rcon port 25575", "rcon", map[string]any{"port": 25575}, true},
{"rcon port negative", "rcon", map[string]any{"port": -1}, false},
{"rcon port past 65535", "rcon", map[string]any{"port": 70000}, false},
{"grace period 3600", "lifecycle", map[string]any{"terminationGracePeriodSeconds": 3600}, true},
{"grace period negative", "lifecycle", map[string]any{"terminationGracePeriodSeconds": -1}, false},
{"grace period past an hour", "lifecycle", map[string]any{"terminationGracePeriodSeconds": 3601}, false},
{"startup timeout a day", "startup", map[string]any{"timeoutSeconds": 86400}, true},
{"startup timeout negative", "startup", map[string]any{"timeoutSeconds": -5}, false},
{"startup timeout past a day", "startup", map[string]any{"timeoutSeconds": 100000}, false},
{"readiness timeout negative", "startup", map[string]any{"readinessTimeoutSeconds": -1}, false},
{"readiness timeout past a day", "startup", map[string]any{"readinessTimeoutSeconds": 86401}, false},
{"health port 8080", "startup", map[string]any{"healthHTTPPort": 8080}, true},
{"health port past 65535", "startup", map[string]any{"healthHTTPPort": 70000}, false},
{"health port negative", "startup", map[string]any{"healthHTTPPort": -1}, false},
{"idle a week", "idle", map[string]any{"emptySecondsBeforeStop": 604800}, true},
{"idle negative", "idle", map[string]any{"emptySecondsBeforeStop": -1}, false},
{"idle past a week", "idle", map[string]any{"emptySecondsBeforeStop": 604801}, false},
}
for _, tc := range cases {
t.Run(tc.name, func(t *testing.T) {
// Round-trip through JSON so numbers arrive as the float64 the
// apiserver's decoder hands the validator.
raw, _ := json.Marshal(server(tc.section, tc.body))
var obj any
if err := json.Unmarshal(raw, &obj); err != nil {
t.Fatal(err)
}
err := validate.AgainstSchema(schema, obj, strfmt.Default)
if tc.ok && err != nil {
t.Fatalf("rejected a valid spec: %v", err)
}
if !tc.ok && err == nil {
t.Fatal("accepted an out-of-range value")
}
})
}
}
@@ -174,10 +174,17 @@ type MotdSpec struct {
}
// RconSpec configures RCON (spec §4 spec.rcon).
//
// The port stays the default: the allow-rcon NetworkPolicy (internal/platform
// netpol.go) admits the operator and felis-api on 25575 only, so any other port
// would leave the server unprobeable and stuck in Starting.
// +kubebuilder:validation:XValidation:rule="!has(self.port) || self.port == 0 || self.port == 25575",message="the allow-rcon NetworkPolicy admits only port 25575; leave port unset"
type RconSpec struct {
// Enabled must be true for readiness probing and graceful shutdown.
Enabled bool `json:"enabled,omitempty"`
// Port is the RCON TCP port (default 25575).
// +kubebuilder:validation:Minimum=0
// +kubebuilder:validation:Maximum=65535
Port int32 `json:"port,omitempty"`
// SecretRef points at the Secret holding the RCON password.
SecretRef SecretKeyRef `json:"secretRef,omitempty"`
@@ -202,14 +209,20 @@ type StorageSpec struct {
// then the time the server has to finish its own shutdown save after SIGTERM.
type LifecycleSpec struct {
// TerminationGracePeriodSeconds is the pod grace period (default 300).
// +kubebuilder:validation:Minimum=0
// +kubebuilder:validation:Maximum=3600
TerminationGracePeriodSeconds int64 `json:"terminationGracePeriodSeconds,omitempty"`
}
// StartupSpec bounds the Starting phase (spec §5).
type StartupSpec struct {
// TimeoutSeconds is the overall budget before the server is marked Failed.
// +kubebuilder:validation:Minimum=0
// +kubebuilder:validation:Maximum=86400
TimeoutSeconds int32 `json:"timeoutSeconds,omitempty"`
// ReadinessTimeoutSeconds is the budget for the first successful RCON probe.
// +kubebuilder:validation:Minimum=0
// +kubebuilder:validation:Maximum=86400
ReadinessTimeoutSeconds int32 `json:"readinessTimeoutSeconds,omitempty"`
// HealthHTTPPort, when > 0, switches the pod readiness probe from the default
// plain-TCP check on the game port to an HTTP GET on this container port. It
@@ -219,6 +232,8 @@ type StartupSpec struct {
// only after the first server tick. The operator's readiness path is otherwise
// unchanged — with rcon disabled, passing this probe (readyReplicas >= 1) is
// what marks the server Ready.
// +kubebuilder:validation:Minimum=0
// +kubebuilder:validation:Maximum=65535
HealthHTTPPort int32 `json:"healthHTTPPort,omitempty"`
// HealthHTTPPath is the path for the HTTP readiness probe (default "/healthz"
// when HealthHTTPPort is set).
@@ -246,7 +261,10 @@ type IdleSpec struct {
// AutoStopEnabled turns on idle auto-stop.
AutoStopEnabled bool `json:"autoStopEnabled,omitempty"`
// EmptySecondsBeforeStop is how long the server may sit empty before the
// operator scales it down.
// operator scales it down. The API caps what the panel sets well below the
// schema's week.
// +kubebuilder:validation:Minimum=0
// +kubebuilder:validation:Maximum=604800
EmptySecondsBeforeStop int32 `json:"emptySecondsBeforeStop,omitempty"`
}