Skip to content

Commit de3fe9c

Browse files
authored
Merge pull request #64 from cdapio/feature/CDAP-17721-k8s-kerberos
(CDAP-17721) Added support for extra Hadoop configuration
2 parents c02e1e9 + dfef9d6 commit de3fe9c

File tree

3 files changed

+25
-7
lines changed

3 files changed

+25
-7
lines changed

controllers/cdapmaster_controller.go

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,15 @@ limitations under the License.
1616
package controllers
1717

1818
import (
19-
"cdap.io/cdap-operator/controllers/cdapmaster"
2019
"fmt"
21-
batchv1 "k8s.io/api/batch/v1"
22-
"sigs.k8s.io/controller-reconciler/pkg/finalizer"
2320
"strconv"
2421
"strings"
2522
"text/template"
2623

24+
"cdap.io/cdap-operator/controllers/cdapmaster"
25+
batchv1 "k8s.io/api/batch/v1"
26+
"sigs.k8s.io/controller-reconciler/pkg/finalizer"
27+
2728
"github.com/go-logr/logr"
2829
"k8s.io/apimachinery/pkg/runtime"
2930
gr "sigs.k8s.io/controller-reconciler/pkg/genericreconciler"
@@ -165,12 +166,19 @@ func (h *ConfigMapHandler) Objects(rsrc interface{}, rsrclabels map[string]strin
165166
}
166167

167168
fillTemplate := func(templateFile string) (string, error) {
168-
template, err := template.New(templateFile).ParseFiles(templateDir + templateFile)
169+
tmpl, err := template.New(templateFile).Funcs(template.FuncMap{
170+
"hasPrefix": func(str, prefix string) bool {
171+
return strings.HasPrefix(str, prefix)
172+
},
173+
"trimPrefix": func(str, prefix string) string {
174+
return strings.TrimPrefix(str, prefix)
175+
},
176+
}).ParseFiles(templateDir + templateFile)
169177
if err != nil {
170178
return "", err
171179
}
172180
var output strings.Builder
173-
if err := template.Execute(&output, templateData); err != nil {
181+
if err := tmpl.Execute(&output, templateData); err != nil {
174182
return "", err
175183
}
176184
return output.String(), nil

templates/cdap-site.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,12 @@
1515
the License.
1616
-->
1717
<configuration>
18-
{{range $k,$v := .Master.Spec.Config}}
18+
{{range $k,$v := .Master.Spec.Config -}}
19+
{{if not (hasPrefix $k "hadoop:")}}
1920
<property>
2021
<name>{{html $k}}</name>
2122
<value>{{html $v}}</value>
2223
</property>
23-
{{end}}
24+
{{end}}
25+
{{- end}}
2426
</configuration>

templates/core-site.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,12 @@
1919
<name>fs.defaultFS</name>
2020
<value>{{html .Master.Spec.LocationURI}}</value>
2121
</property>
22+
{{range $k,$v := .Master.Spec.Config -}}
23+
{{if hasPrefix $k "hadoop:"}}
24+
<property>
25+
<name>{{html (trimPrefix $k "hadoop:")}}</name>
26+
<value>{{html $v}}</value>
27+
</property>
28+
{{end}}
29+
{{- end}}
2230
</configuration>

0 commit comments

Comments
 (0)