Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove include-year and includeYear flag #5817

Merged
merged 13 commits into from
Jun 27, 2024
Merged

Remove include-year and includeYear flag #5817

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
6c91606
- refer https://github.com/nginxinc/kubernetes-ingress/issues/5776
harsha-mangena Jun 21, 2024
23a7d0b
removed commented code
harsha-mangena Jun 21, 2024
cdf2299
- made `includeYear` flag as `true` by default.
harsha-mangena Jun 24, 2024
e3d6a3c
- addressed comments
harsha-mangena Jun 25, 2024
6d1c175
recommit - yaml
harsha-mangena Jun 25, 2024
726a213
Merge branch 'main' into i5776-remove-deprecated-values
Jun 25, 2024
e183cac
removed include-year arg
harsha-mangena Jun 26, 2024
b656706
removed include-year arg
harsha-mangena Jun 26, 2024
21abdc9
removed include-year arg
harsha-mangena Jun 26, 2024
d6cf46e
removed include-year arg
harsha-mangena Jun 26, 2024
db2b62d
Merge branch 'main' into i5776-remove-deprecated-values
Jun 26, 2024
86519f0
Merge branch 'main' into i5776-remove-deprecated-values
Jun 27, 2024
c35c739
Merge branch 'main' into i5776-remove-deprecated-values
Jun 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion charts/nginx-ingress/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,6 @@ Build the args for the service binary.
- -service-insight-tls-secret={{ .Values.serviceInsight.secret }}
- -enable-custom-resources={{ .Values.controller.enableCustomResources }}
- -enable-snippets={{ .Values.controller.enableSnippets }}
- -include-year={{ .Values.controller.includeYear }}
- -disable-ipv6={{ .Values.controller.disableIPV6 }}
{{- if .Values.controller.enableCustomResources }}
- -enable-tls-passthrough={{ .Values.controller.enableTLSPassthrough }}
Expand Down
10 changes: 0 additions & 10 deletions charts/nginx-ingress/values.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -908,14 +908,6 @@
false
]
},
"includeYear": {
"type": "boolean",
"default": false,
"title": "The includeYear",
"examples": [
false
]
},
"enableTLSPassthrough": {
"type": "boolean",
"default": false,
Expand Down Expand Up @@ -1728,7 +1720,6 @@
"watchNamespace": "",
"enableCustomResources": true,
"enableOIDC": false,
"includeYear": false,
"enableTLSPassthrough": false,
"tlsPassthroughPort": 443,
"enableCertManager": false,
Expand Down Expand Up @@ -2262,7 +2253,6 @@
"watchNamespace": "",
"enableCustomResources": true,
"enableOIDC": false,
"includeYear": false,
"enableTLSPassthrough": false,
"enableCertManager": false,
"enableExternalDNS": false,
Expand Down
4 changes: 2 additions & 2 deletions charts/nginx-ingress/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,8 +343,8 @@ controller:
## Enable OIDC policies.
enableOIDC: false

## Include year in log header. This parameter will be removed in release 3.7 and the year will be included by default.
includeYear: false
# Include year in log header. This parameter will be removed in release 3.7 and the year will be included by default.
j1m-ryan marked this conversation as resolved.
Show resolved Hide resolved
# includeYear: true

## Enable TLS Passthrough on port 443. Requires controller.enableCustomResources.
enableTLSPassthrough: false
Expand Down
6 changes: 1 addition & 5 deletions cmd/nginx-ingress/flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (
"net"
"os"
"regexp"
"strconv"
"strings"

"github.com/golang/glog"
Expand Down Expand Up @@ -198,9 +197,6 @@ var (
enableExternalDNS = flag.Bool("enable-external-dns", false,
"Enable external-dns controller for VirtualServer resources. Requires -enable-custom-resources")

includeYearInLogs = flag.Bool("include-year", false,
"Option to include the year in the log header")

disableIPV6 = flag.Bool("disable-ipv6", false,
`Disable IPV6 listeners explicitly for nodes that do not support the IPV6 stack`)

Expand Down Expand Up @@ -305,7 +301,7 @@ func initialChecks() {
glog.Fatalf("Error setting logtostderr to true: %v", err)
}

err = flag.Lookup("include_year").Value.Set(strconv.FormatBool(*includeYearInLogs))
j1m-ryan marked this conversation as resolved.
Show resolved Hide resolved
err = flag.Lookup("include_year").Value.Set("true")
if err != nil {
glog.Fatalf("Error setting include_year flag: %v", err)
}
Expand Down
10 changes: 0 additions & 10 deletions docs/content/configuration/global-configuration/command-line-arguments.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,16 +81,6 @@ Default `false`.

---

### -include-year

Adds year to log headers.

Default `false`.

{{< note >}} This flag will be removed in release 3.7 and the year will be included by default. {{< /note >}}

---

### -enable-leader-election

Enables Leader election to avoid multiple replicas of the controller reporting the status of Ingress, VirtualServer and VirtualServerRoute resources -- only one replica will report status.
Expand Down