Prefetch ConfigMap before initial NGINX Config generation #298
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Dean-Coakley
added
the
enhancement
Dean-Coakley
force-pushed
the
prefetch-configmap
branch
5 times, most recently
from
18ee8d1
to
668b753
Compare
pleshakov
suggested changes
Jun 26, 2018
nginx-controller/main.go
Outdated
| if cfg.MainServerSSLDHParamFileContent != nil { | ||
| fileName, err := ngxc.AddOrUpdateDHParam(*cfg.MainServerSSLDHParamFileContent) | ||
| if err != nil { | ||
| glog.Errorf("Configmap %s/%s: Could not update dhparams: %v", ns, name, err) |
There was a problem hiding this comment.
let's exit the Ingress controller in case it fails to write the DHParam file -- use glog.Fatalf
| } else { | ||
| config.MainServerSSLDHParam = fileName | ||
| } | ||
| } | ||
| mainCfg := &NginxMainConfig{ |
There was a problem hiding this comment.
use GenerateNginxMainConfig function
| if cnf.config.MainServerSSLDHParamFileContent != nil { | ||
| fileName, err := cnf.nginx.AddOrUpdateDHParam(*cnf.config.MainServerSSLDHParamFileContent) | ||
| if err != nil { | ||
| glog.Errorf("Could not update dhparams: %v", err) |
There was a problem hiding this comment.
let's return an error here
pleshakov
suggested changes
Jun 26, 2018
nginx-controller/nginx/config.go
Outdated
|
|
||
| // ParseConfigMap Parse ConfigMap to Config | ||
| func ParseConfigMap(cfgm *api_v1.ConfigMap, nginxPlus bool) *Config { | ||
| var cfg Config |
There was a problem hiding this comment.
initialize cfg with nginx.NewDefaultConfig()
Dean-Coakley
force-pushed
the
prefetch-configmap
branch
3 times, most recently
from
8acbc47
to
904cf2d
Compare
ConfigMap is applied to the NGINX Config before Config is generated This removes the need for additional NGINX Config generations on startup
Dean-Coakley
force-pushed
the
prefetch-configmap
branch
from
904cf2d
to
b303c59
Compare
pleshakov
changed the title
pleshakov
approved these changes
Jun 27, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When the Ingress controller is starting and the ConfigMap is configured via
-nginx-configmapscli argument, ensure that the ConfigMap is fetched and applied before the initial NGINX config is generated.