Merge pull request ceph#90 from Madhu-1/topolog

fix inline in json
red-hat-storage · Aug 5, 2024 · c19a1b4 · c19a1b4
2 parents 204ddfa + ca806e4
commit c19a1b4
Show file tree

Hide file tree

Showing 3 changed files with 11,457 additions and 11,597 deletions.
diff --git a/api/v1alpha1/driver_types.go b/api/v1alpha1/driver_types.go
@@ -148,7 +148,7 @@ type NodePluginResourcesSpec struct {
 
 type NodePluginSpec struct {
 	// Embedded common pods spec
-	PodCommonSpec `json:"inline"`
+	PodCommonSpec `json:",inline"`
 
 	// Driver's plugin daemonset update strategy, supported values are OnDelete and RollingUpdate.
 	// Default value is RollingUpdate with MaxAvailabile set to 1
@@ -199,7 +199,7 @@ type ControllerPluginResourcesSpec struct {
 
 type ControllerPluginSpec struct {
 	// Embedded common pods spec
-	PodCommonSpec `json:"inline"`
+	PodCommonSpec `json:",inline"`
 
 	// Set replicas for controller plugin's deployment. Defaults to 2
 	//+kubebuilder:validation:Optional