direktil
/
local-server
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: don't require ssl config

This commit is contained in:
Mikaël Cluseau 2018-06-25 20:36:34 +11:00
parent 7bb71d6da3
commit ecb3e9c868
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
render-context.go
View File

@ -66,13 +66,7 @@ func (ctx *renderContext) Config() (ba []byte, cfg *config.Config, err error) {
ctxMap := ctx.asMap()
// FIXME duplicate
sslCfg, err := cfsslconfig.LoadConfig([]byte(ctx.clusterConfig.SSLConfig))
if err != nil {
return
}
secretData, err := loadSecretData(sslCfg)
secretData, err := ctx.secretData()
if err != nil {
return
}
@ -118,14 +112,24 @@ func (ctx *renderContext) Config() (ba []byte, cfg *config.Config, err error) {
return
}
func (ctx *renderContext) StaticPods() (ba []byte, err error) {
// FIXME duplicate
sslCfg, err := cfsslconfig.LoadConfig([]byte(ctx.clusterConfig.SSLConfig))
if err != nil {
return
func (ctx *renderContext) secretData() (data *SecretData, err error) {
var sslCfg *cfsslconfig.Config
if ctx.clusterConfig.SSLConfig == "" {
sslCfg = &cfsslconfig.Config{}
} else {
sslCfg, err = cfsslconfig.LoadConfig([]byte(ctx.clusterConfig.SSLConfig))
if err != nil {
return
}
}
secretData, err := loadSecretData(sslCfg)
data, err = loadSecretData(sslCfg)
return
}
func (ctx *renderContext) StaticPods() (ba []byte, err error) {
secretData, err := ctx.secretData()
if err != nil {
return
}