Merge pull request #67 from cdapio/bugfix/PPR-Bugfixes

dli357 · web-flow · commit 2d36d9e8d9a1 · 2021-06-08T21:44:15.000-04:00
Set proper default value when local.data.dir is not specified
diff --git a/controllers/cdapmaster_controller.go b/controllers/cdapmaster_controller.go
@@ -130,7 +130,7 @@ func ApplyDefaults(resource interface{}) {
 
 	// Set the default local data directory if it is not set in cdap-cr.
 	if _, ok := spec.Config[confLocalDataDirKey]; !ok {
-		spec.Config[confLocalDataDirKey] = spec.Config[confLocalDataDirVal]
+		spec.Config[confLocalDataDirKey] = confLocalDataDirVal
 	}
 
 	// Disable explore

Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ func ApplyDefaults(resource interface{}) {`
`130`	`130`
`131`	`131`	`// Set the default local data directory if it is not set in cdap-cr.`
`132`	`132`	`if _, ok := spec.Config[confLocalDataDirKey]; !ok {`
`133`		`- spec.Config[confLocalDataDirKey] = spec.Config[confLocalDataDirVal]`
	`133`	`+ spec.Config[confLocalDataDirKey] = confLocalDataDirVal`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`// Disable explore`