Skip to content

Commit

Permalink
Params: Align to upstream. (#452)
Browse files Browse the repository at this point in the history
* Params: Remove `controller.annotationsPrefix`.

* Params: Remove `controller.defaultSSLCertificate`.

* Params: Remove `controller.enableSSLChainCompletion`.

* Params: Remove `controller.updateIngressStatus`.
  • Loading branch information
Gacko committed Oct 18, 2023
1 parent 9717d72 commit 2ac955a
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 27 deletions.
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,18 @@ and this project's packages adheres to [Semantic Versioning](http://semver.org/s

## [Unreleased]

### Removed

- Params: Align to upstream. ([#452](https://github.com/giantswarm/nginx-ingress-controller-app/pull/452))
- Params: Remove `controller.annotationsPrefix`.\
**NOTE:** This is part of our alignment to upstream. Use `controller.extraArgs` instead.
- Params: Remove `controller.defaultSSLCertificate`.\
**NOTE:** This is part of our alignment to upstream. Use `controller.extraArgs` instead.
- Params: Remove `controller.enableSSLChainCompletion`.\
**NOTE:** This is part of our alignment to upstream. Use `controller.extraArgs` instead.
- Params: Remove `controller.updateIngressStatus`.\
**NOTE:** This is part of our alignment to upstream. Use `controller.extraArgs` instead.

## [2.30.1] - 2023-05-07

### Changed
Expand Down
8 changes: 0 additions & 8 deletions helm/nginx-ingress-controller-app/templates/_params.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,6 @@
- --{{ $key }}={{ $value }}
{{- end }}
{{- end }}
{{- if .Values.controller.annotationsPrefix }}
- --annotations-prefix={{ .Values.controller.annotationsPrefix }}
{{- end}}
{{- if .Values.controller.defaultSSLCertificate }}
- --default-ssl-certificate={{ .Values.controller.defaultSSLCertificate }}
{{- end}}
- --enable-ssl-chain-completion={{ .Values.controller.enableSSLChainCompletion }}
- --update-status={{ .Values.controller.updateIngressStatus }}
{{- if .Values.controller.disableExternalNameForwarding }}
- --disable-svc-external-name
{{- end }}
Expand Down
19 changes: 0 additions & 19 deletions helm/nginx-ingress-controller-app/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -168,25 +168,6 @@ controller:
# key: FOO
# name: secret-resource

# The value for the "--annotations-prefix" flag given to the nginx-ingress-controller
# container.
annotationsPrefix: nginx.ingress.kubernetes.io

# The Secret referred to by this flag contains the default certificate to be
# used when accessing the catch-all server. If this flag is not provided NGINX
# will use a self-signed certificate.
# Example value: "default/foo-tls".
defaultSSLCertificate: ""

# Autocomplete SSL certificate chains with missing intermediate CA certificates.
# Certificates uploaded to Kubernetes must have the "Authority Information Access" X.509 v3 extension for this to succeed.
enableSSLChainCompletion: false

# Enables updating of the loadbalancer status of Ingress objects which this controller is reconciling. Unless you are
# managing DNS for ingresses via an external method, this should always be left enabled.
# Disabling updates of Ingress status allows two parallel NGINX IC deployments to reconcile the same Ingresses.
updateIngressStatus: true

# Enable or disable forwarding to ExternalName Services through
# --disable-svc-external-name flag
disableExternalNameForwarding: true
Expand Down

0 comments on commit 2ac955a

Please sign in to comment.