Skip to content

Commit

Permalink
Merge pull request scylladb#2288 from rzetelskik/use-strict-decoding-e2e
Browse files Browse the repository at this point in the history
Use strict decoding in e2e tests' fixture registry
  • Loading branch information
scylla-operator-bot[bot] authored Dec 23, 2024
2 parents 6597aea + e3ecfa2 commit 342d352
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 18 deletions.
36 changes: 19 additions & 17 deletions test/e2e/fixture/scylla/scylladbdatacenter.yaml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/scheme/scheme.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

var (
Scheme = runtime.NewScheme()
Codecs = serializer.NewCodecFactory(Scheme)
Codecs = serializer.NewCodecFactory(Scheme, serializer.EnableStrict)
)

func DefaultJSONEncoder() runtime.Encoder {
Expand Down

0 comments on commit 342d352

Please sign in to comment.