fix(update-collection-v3): fix migration of configuration with missin…

…g sumologic key

 and additional configuration under fluentd.logs key

src/go/cmd/update-collection-v3/migrations/fluentd-logs-configs/fluentd.go

@@ -7,7 +7,11 @@ func createSumologic(valuesInput *ValuesInput) *SumologicOutput {
 
 	sumoLogicOutput := &SumologicOutput{}
 	if valuesInput.Fluentd != nil {
-		sumoLogicOutput.Logs = createSumologicLogs(valuesInput.Fluentd.Logs, valuesInput.Sumologic.Logs)
+		var valuesInputSumologicLogs *SumologicLogsInput
+		if valuesInput.Sumologic != nil {
+			valuesInputSumologicLogs = valuesInput.Sumologic.Logs
+		}
+		sumoLogicOutput.Logs = createSumologicLogs(valuesInput.Fluentd.Logs, valuesInputSumologicLogs)
 	}
 
 	if valuesInput.Sumologic != nil {
@@ -130,7 +134,8 @@ func isFluentdOutputEmpty(fluentdInput *Fluentd) bool {
 			isContainersLogRestEmpty(fluentdInput.Logs.Containers) &&
 			isLogRestEmpty(fluentdInput.Logs.Systemd) &&
 			isLogRestEmpty(fluentdInput.Logs.Kubelet) &&
-			isLogRestEmpty(fluentdInput.Logs.Default)) {
+			isLogRestEmpty(fluentdInput.Logs.Default)) &&
+			fluentdInput.Logs.Rest == nil {
 		return true
 	}
 	return false
@@ -170,6 +175,7 @@ func createFluentdLogs(valuesInput *ValuesInput) *Fluentd {
 			Systemd:    createFluentdLogsConfig(valuesInput.Fluentd.Logs.Systemd),
 			Kubelet:    createFluentdLogsConfig(valuesInput.Fluentd.Logs.Kubelet),
 			Default:    createFluentdLogsConfig(valuesInput.Fluentd.Logs.Default),
+			Rest:       valuesInput.Fluentd.Logs.Rest,
 		},
 	}
 }

src/go/cmd/update-collection-v3/migrations/fluentd-logs-configs/testdata/fluent-config-additional-logs-config.input.yaml

@@ -0,0 +1,13 @@
+fluentd:
+  logs:
+    autoscaling:
+      enabled: true
+      maxReplicas: 10
+      minReplicas: 3
+      targetCPUUtilizationPercentage: 50
+    containers:
+      sourceCategoryReplaceDash: _
+    kubelet:
+      sourceCategoryReplaceDash: _
+    systemd:
+      sourceCategoryReplaceDash: _

src/go/cmd/update-collection-v3/migrations/fluentd-logs-configs/testdata/fluent-config-additional-logs-config.output.yaml

@@ -0,0 +1,15 @@
+sumologic:
+  logs:
+    container:
+      sourceCategoryReplaceDash: _
+    systemd:
+      sourceCategoryReplaceDash: _
+    kubelet:
+      sourceCategoryReplaceDash: _
+fluentd:
+  logs:
+    autoscaling:
+      enabled: true
+      maxReplicas: 10
+      minReplicas: 3
+      targetCPUUtilizationPercentage: 50