Fix UnmarshalJSON to remove hcd field before doing double unmarshalling

k8ssandra · Oct 22, 2024 · 74ec96d · 74ec96d
1 parent fb9eb8c
commit 74ec96d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/apis/config/v1beta1/imageconfig_types.go b/apis/config/v1beta1/imageconfig_types.go
@@ -84,6 +84,7 @@ func (i *Images) UnmarshalJSON(b []byte) error {
 
 	delete(otherFields, CassandraImageComponent)
 	delete(otherFields, DSEImageComponent)
+	delete(otherFields, HCDImageComponent)
 	delete(otherFields, SystemLoggerImageComponent)
 	delete(otherFields, ConfigBuilderImageComponent)
 	delete(otherFields, ClientImageComponent)

diff --git a/tests/testdata/image_config_parsing_more_options.yaml b/tests/testdata/image_config_parsing_more_options.yaml
@@ -9,8 +9,9 @@ images:
   cassandra:
       "4.0.0": "k8ssandra/cassandra-ubi:latest"
   dse:
-    # How to detect between two different formats?
       "6.8.999": "datastax/dse-server-prototype:latest"
+  hcd:
+      "1.0.0": "datastax/hcd:latest"
   medusa: "k8ssandra/medusa:latest"
   reaper: "k8ssandra/reaper:latest"
 imageRegistry: "localhost:5000"