Skip to content

Commit

Permalink
Merge pull request #3252 from hchenxa/hchenxa
Browse files Browse the repository at this point in the history
remove the command args of enable-dynamic-configuration
  • Loading branch information
k8s-ci-robot authored Oct 17, 2018
2 parents aecfad2 + b276800 commit cc5d227
Showing 2 changed files with 1 addition and 3 deletions.
3 changes: 1 addition & 2 deletions cmd/nginx/flags.go
Original file line number Diff line number Diff line change
@@ -196,8 +196,7 @@ Feature backed by OpenResty Lua libraries. Requires that OCSP stapling is not en
}

if *enableSSLChainCompletion && *dynamicCertificatesEnabled {
return false, nil, fmt.Errorf(`SSL certificate chain completion cannot be enabled and dynamic configuration cannot be disabled when
dynamic certificates functionality is enabled. Please check the flags --enable-ssl-chain-completion and --enable-dynamic-configuration`)
return false, nil, fmt.Errorf(`SSL certificate chain completion cannot be enabled when dynamic certificates functionality is enabled. Please check the flags --enable-ssl-chain-completion`)
}

if *publishSvc != "" && *publishStatusAddress != "" {
1 change: 0 additions & 1 deletion docs/user-guide/cli-arguments.md
Original file line number Diff line number Diff line change
@@ -15,7 +15,6 @@ They are set in the container spec of the `nginx-ingress-controller` Deployment
| `--default-ssl-certificate string` | Secret containing a SSL certificate to be used by the default HTTPS server (catch-all). Takes the form "namespace/name". |
| `--election-id string` | Election id to use for Ingress status updates. (default "ingress-controller-leader") |
| `--enable-dynamic-certificates` | Dynamically serves certificates instead of reloading NGINX when certificates are created, updated, or deleted. Currently does not support OCSP stapling, so --enable-ssl-chain-completion must be turned off. Assuming the certificate is generated with a 2048 bit RSA key/cert pair, this feature can store roughly 5000 certificates. This is an experiemental feature that currently is not ready for production use. Feature backed by OpenResty Lua libraries. (disabled by default) |
| `--enable-dynamic-configuration` | Dynamically refresh backends on topology changes instead of reloading NGINX. Feature backed by OpenResty Lua libraries. (default true) |
| `--enable-ssl-chain-completion` | Autocomplete SSL certificate chains with missing intermediate CA certificates. A valid certificate chain is required to enable OCSP stapling. Certificates uploaded to Kubernetes must have the "Authority Information Access" X.509 v3 extension for this to succeed. (default true) |
| `--enable-ssl-passthrough` | Enable SSL Passthrough. |
| `--force-namespace-isolation` | Force namespace isolation. Prevents Ingress objects from referencing Secrets and ConfigMaps located in a different namespace than their own. May be used together with watch-namespace. |

0 comments on commit cc5d227

Please sign in to comment.