chore: refactor to use k8s yaml again

Author: tstirrat15

e2e/e2e_test.go

@@ -18,7 +18,6 @@ import (
 	"time"
 
 	"github.com/go-logr/zapr"
-	"github.com/goccy/go-yaml"
 	"github.com/jzelinskie/stringz"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
@@ -54,6 +53,7 @@ import (
 	"sigs.k8s.io/kind/pkg/cluster/nodeutils"
 	"sigs.k8s.io/kind/pkg/cmd"
 	"sigs.k8s.io/kind/pkg/fs"
+	"sigs.k8s.io/yaml"
 
 	"github.com/authzed/spicedb-operator/e2e/databases"
 	e2eutil "github.com/authzed/spicedb-operator/e2e/util"

e2e/go.sum

@@ -102,8 +102,8 @@ github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpv
 github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
 github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
 github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
-github.com/goccy/go-yaml v1.18.0 h1:8W7wMFS12Pcas7KU+VVkaiCng+kG8QiFeFwzFb+rwuw=
-github.com/goccy/go-yaml v1.18.0/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA=
+github.com/goccy/go-yaml v1.19.2 h1:PmFC1S6h8ljIz6gMRBopkjP1TVT7xuwrButHID66PoM=
+github.com/goccy/go-yaml v1.19.2/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=

go.mod

@@ -8,7 +8,6 @@ require (
 	github.com/evanphx/json-patch v5.9.11+incompatible
 	github.com/fatih/camelcase v1.0.0
 	github.com/go-logr/logr v1.4.3
-	github.com/goccy/go-yaml v1.19.2
 	github.com/gosimple/slug v1.15.0
 	github.com/jzelinskie/stringz v0.0.3
 	github.com/magefile/mage v1.15.0
@@ -28,6 +27,7 @@ require (
 	k8s.io/kubectl v0.36.0-alpha.0
 	k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
 	sigs.k8s.io/kind v0.31.0
+	sigs.k8s.io/yaml v1.6.0
 )
 
 require (
@@ -60,6 +60,7 @@ require (
 	github.com/go-openapi/swag v0.23.0 // indirect
 	github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
 	github.com/gobuffalo/flect v1.0.3 // indirect
+	github.com/goccy/go-yaml v1.19.2 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/btree v1.1.3 // indirect
@@ -148,7 +149,6 @@ require (
 	sigs.k8s.io/kustomize/kyaml v0.20.1 // indirect
 	sigs.k8s.io/randfill v1.0.0 // indirect
 	sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
-	sigs.k8s.io/yaml v1.6.0 // indirect
 )
 
 tool (

magefiles/magefile.go

@@ -12,7 +12,6 @@ import (
 	"strings"
 
 	"github.com/cespare/xxhash/v2"
-	"github.com/goccy/go-yaml"
 	"github.com/jzelinskie/stringz"
 	"github.com/magefile/mage/mg"
 	"github.com/magefile/mage/sh"
@@ -21,6 +20,7 @@ import (
 	kind "sigs.k8s.io/kind/pkg/cluster"
 	"sigs.k8s.io/kind/pkg/cmd"
 	"sigs.k8s.io/kind/pkg/fs"
+	"sigs.k8s.io/yaml"
 )
 
 const versionsYamlFile = "magefiles/versions.yaml"

pkg/config/global.go

@@ -4,8 +4,8 @@ import "github.com/authzed/spicedb-operator/pkg/updates"
 
 // OperatorConfig holds operator-wide config that is used across all objects
 type OperatorConfig struct {
-	ImageName           string `json:"imageName,omitempty" yaml:"imageName,omitempty"`
-	updates.UpdateGraph `yaml:",inline"`
+	ImageName string `json:"imageName,omitempty"`
+	updates.UpdateGraph
 }
 
 func NewOperatorConfig() OperatorConfig {

pkg/updates/file.go

@@ -19,17 +19,17 @@ const DatastoreMetadataKey = "datastore"
 // to the "head" of the channel from every node.
 type Channel struct {
 	// Name is the user-facing identifier for a graph of updates.
-	Name string `json:"name" yaml:"name"`
+	Name string `json:"name"`
 
 	// Metadata contains any additional properties about the channel.
 	// For example, the applicable datastore is stored as metadata.
-	Metadata map[string]string `json:"metadata,omitempty" yaml:"metadata,omitempty"`
+	Metadata map[string]string `json:"metadata,omitempty"`
 
 	// Edges are the transitions between states in the update graph.
-	Edges EdgeSet `json:"edges,omitempty" yaml:"edges,omitempty"`
+	Edges EdgeSet `json:"edges,omitempty"`
 
 	// Nodes are the possible states in an update graph.
-	Nodes []State `json:"nodes,omitempty" yaml:"nodes,omitempty"`
+	Nodes []State `json:"nodes,omitempty"`
 }
 
 // EqualIdentity determines if two channels represent the same stream of
@@ -80,19 +80,19 @@ func (c Channel) RemoveNodes(nodes []State) Channel {
 // State is a "node" in the channel graph, indicating how to run at that
 // release.
 type State struct {
-	ID        string `json:"id"                yaml:"id"`
-	Tag       string `json:"tag,omitempty"     yaml:"tag,omitempty"`
-	Migration string `json:"migration,omitempty" yaml:"migration,omitempty"`
-	Phase     string `json:"phase,omitempty"   yaml:"phase,omitempty"`
-	Digest    string `json:"digest,omitempty"  yaml:"digest,omitempty"`
+	ID        string `json:"id"`
+	Tag       string `json:"tag,omitempty"`
+	Migration string `json:"migration,omitempty"`
+	Phase     string `json:"phase,omitempty"`
+	Digest    string `json:"digest,omitempty"`
 
 	// Deprecated releases can be updated from, but not to
-	Deprecated bool `json:"-" yaml:"-"`
+	Deprecated bool `json:"-"`
 }
 
 // UpdateGraph holds a graph of required update edges
 type UpdateGraph struct {
-	Channels []Channel `json:"channels,omitempty" yaml:"channels,omitempty"`
+	Channels []Channel `json:"channels,omitempty"`
 }
 
 // DefaultChannelForDatastore returns the first channel for a specific datastore.