From ee45d91409638add7b3b74c9a2d58d4ffffaad5e Mon Sep 17 00:00:00 2001
From: Kacper Rzetelski <rzetelski.k@gmail.com>
Date: Thu, 19 Dec 2024 19:49:07 +0100
Subject: [PATCH 1/2] Fix ScyllaDBDatacenter template e2e fixture

---
 .../scylla/scylladbdatacenter.yaml.tmpl       | 36 ++++++++++---------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/test/e2e/fixture/scylla/scylladbdatacenter.yaml.tmpl b/test/e2e/fixture/scylla/scylladbdatacenter.yaml.tmpl
index 984b1a9b31..a20efd4d51 100644
--- a/test/e2e/fixture/scylla/scylladbdatacenter.yaml.tmpl
+++ b/test/e2e/fixture/scylla/scylladbdatacenter.yaml.tmpl
@@ -11,25 +11,9 @@ spec:
   datacenterName: us-east-1
   scyllaDB:
     image: "docker.io/scylladb/scylla:{{ .scyllaDBVersion }}"
-    developerMode: true
-    resources:
-      requests:
-        cpu: 10m
-        memory: 100Mi
-      limits:
-        cpu: 1
-        memory: 1Gi
-    storage:
-      capacity: 1Gi
-      {{- if .storageClassName }}
-      storageClassName: {{ .storageClassName }}
-      {{- end }}
+    enableDeveloperMode: true
   scyllaDBManagerAgent:
     image: "docker.io/scylladb/scylla-manager-agent:{{ .scyllaDBManagerVersion }}"
-    resources:
-      requests:
-        cpu: 10m
-        memory: 100Mi
   exposeOptions:
     nodeService:
       type: {{ .nodeServiceType }}
@@ -40,6 +24,24 @@ spec:
         type: {{ .clientsBroadcastAddressType }}
   rackTemplate:
     nodes: 1
+    scyllaDB:
+      resources:
+        requests:
+          cpu: 10m
+          memory: 100Mi
+        limits:
+          cpu: 1
+          memory: 1Gi
+      storage:
+        capacity: 1Gi
+        {{- if .storageClassName }}
+        storageClassName: {{ .storageClassName }}
+        {{- end }}
+    scyllaDBManagerAgent:
+      resources:
+        requests:
+          cpu: 10m
+          memory: 100Mi
     placement:
       nodeAffinity:
         requiredDuringSchedulingIgnoredDuringExecution:

From e3ecfa2ac204b4f886e9747e1a3ef4f694501bb8 Mon Sep 17 00:00:00 2001
From: Kacper Rzetelski <rzetelski.k@gmail.com>
Date: Fri, 20 Dec 2024 10:37:27 +0100
Subject: [PATCH 2/2] Use strict decoding in e2e tests' fixture registry

---
 test/e2e/scheme/scheme.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/e2e/scheme/scheme.go b/test/e2e/scheme/scheme.go
index 27f6f2b8de..4627b8fc76 100644
--- a/test/e2e/scheme/scheme.go
+++ b/test/e2e/scheme/scheme.go
@@ -8,7 +8,7 @@ import (
 
 var (
 	Scheme = runtime.NewScheme()
-	Codecs = serializer.NewCodecFactory(Scheme)
+	Codecs = serializer.NewCodecFactory(Scheme, serializer.EnableStrict)
 )
 
 func DefaultJSONEncoder() runtime.Encoder {