diff --git a/hack/golangci-hints.yaml b/hack/golangci-hints.yaml index 6b91fb1f1e5..8c8b858e40f 100644 --- a/hack/golangci-hints.yaml +++ b/hack/golangci-hints.yaml @@ -153,13 +153,13 @@ linters: # notimestamp: Legacy 'Timestamp' fields retained for backward compatibility - - text: 'notimestamp: naming convention "notimestamp": field ExpirationTimestamp: prefer use of the term ''time'' over ''timestamp''' + - text: 'notimestamp: naming convention "notimestamp": field TokenRequestStatus.ExpirationTimestamp: prefer use of the term ''time'' over ''timestamp''' path: "staging/src/k8s.io/api/authentication/v1/types.go" - - text: 'notimestamp: naming convention "notimestamp": field (Timestamps|FirstTimestamp|LastTimestamp): prefer use of the term ''time'' over ''timestamp''' + - text: 'notimestamp: naming convention "notimestamp": field (PodLogOptions.Timestamps|Event.FirstTimestamp|Event.LastTimestamp): prefer use of the term ''time'' over ''timestamp''' path: "staging/src/k8s.io/api/core/v1/types.go" - - text: 'notimestamp: naming convention "notimestamp": field Deprecated(FirstTimestamp|LastTimestamp): prefer use of the term ''time'' over ''timestamp''' + - text: 'notimestamp: naming convention "notimestamp": field Event.Deprecated(FirstTimestamp|LastTimestamp): prefer use of the term ''time'' over ''timestamp''' path: "staging/src/k8s.io/api/events/(v1|v1beta1)/types.go" - - text: 'notimestamp: naming convention "notimestamp": field AllocationTimestamp: prefer use of the term ''time'' over ''timestamp''' + - text: 'notimestamp: naming convention "notimestamp": field AllocationResult.AllocationTimestamp: prefer use of the term ''time'' over ''timestamp''' path: "staging/src/k8s.io/api/resource/(v1|v1beta1|v1beta2)/types.go" # Pre-existing issues from the conflictmarkers linter diff --git a/hack/golangci.yaml b/hack/golangci.yaml index 8da9b9eb01e..678a8d1e385 100644 --- a/hack/golangci.yaml +++ b/hack/golangci.yaml @@ -164,13 +164,13 @@ linters: # notimestamp: Legacy 'Timestamp' fields retained for backward compatibility - - text: 'notimestamp: naming convention "notimestamp": field ExpirationTimestamp: prefer use of the term ''time'' over ''timestamp''' + - text: 'notimestamp: naming convention "notimestamp": field TokenRequestStatus.ExpirationTimestamp: prefer use of the term ''time'' over ''timestamp''' path: "staging/src/k8s.io/api/authentication/v1/types.go" - - text: 'notimestamp: naming convention "notimestamp": field (Timestamps|FirstTimestamp|LastTimestamp): prefer use of the term ''time'' over ''timestamp''' + - text: 'notimestamp: naming convention "notimestamp": field (PodLogOptions.Timestamps|Event.FirstTimestamp|Event.LastTimestamp): prefer use of the term ''time'' over ''timestamp''' path: "staging/src/k8s.io/api/core/v1/types.go" - - text: 'notimestamp: naming convention "notimestamp": field Deprecated(FirstTimestamp|LastTimestamp): prefer use of the term ''time'' over ''timestamp''' + - text: 'notimestamp: naming convention "notimestamp": field Event.Deprecated(FirstTimestamp|LastTimestamp): prefer use of the term ''time'' over ''timestamp''' path: "staging/src/k8s.io/api/events/(v1|v1beta1)/types.go" - - text: 'notimestamp: naming convention "notimestamp": field AllocationTimestamp: prefer use of the term ''time'' over ''timestamp''' + - text: 'notimestamp: naming convention "notimestamp": field AllocationResult.AllocationTimestamp: prefer use of the term ''time'' over ''timestamp''' path: "staging/src/k8s.io/api/resource/(v1|v1beta1|v1beta2)/types.go" # Pre-existing issues from the conflictmarkers linter diff --git a/hack/kube-api-linter/exceptions.yaml b/hack/kube-api-linter/exceptions.yaml index 8eb681bc02a..d6eea023556 100644 --- a/hack/kube-api-linter/exceptions.yaml +++ b/hack/kube-api-linter/exceptions.yaml @@ -29,13 +29,13 @@ # notimestamp: Legacy 'Timestamp' fields retained for backward compatibility -- text: 'notimestamp: naming convention "notimestamp": field ExpirationTimestamp: prefer use of the term ''time'' over ''timestamp''' +- text: 'notimestamp: naming convention "notimestamp": field TokenRequestStatus.ExpirationTimestamp: prefer use of the term ''time'' over ''timestamp''' path: "staging/src/k8s.io/api/authentication/v1/types.go" -- text: 'notimestamp: naming convention "notimestamp": field (Timestamps|FirstTimestamp|LastTimestamp): prefer use of the term ''time'' over ''timestamp''' +- text: 'notimestamp: naming convention "notimestamp": field (PodLogOptions.Timestamps|Event.FirstTimestamp|Event.LastTimestamp): prefer use of the term ''time'' over ''timestamp''' path: "staging/src/k8s.io/api/core/v1/types.go" -- text: 'notimestamp: naming convention "notimestamp": field Deprecated(FirstTimestamp|LastTimestamp): prefer use of the term ''time'' over ''timestamp''' +- text: 'notimestamp: naming convention "notimestamp": field Event.Deprecated(FirstTimestamp|LastTimestamp): prefer use of the term ''time'' over ''timestamp''' path: "staging/src/k8s.io/api/events/(v1|v1beta1)/types.go" -- text: 'notimestamp: naming convention "notimestamp": field AllocationTimestamp: prefer use of the term ''time'' over ''timestamp''' +- text: 'notimestamp: naming convention "notimestamp": field AllocationResult.AllocationTimestamp: prefer use of the term ''time'' over ''timestamp''' path: "staging/src/k8s.io/api/resource/(v1|v1beta1|v1beta2)/types.go" # Pre-existing issues from the conflictmarkers linter diff --git a/hack/tools/golangci-lint/go.mod b/hack/tools/golangci-lint/go.mod index 3a8daf2268f..a51ec9ea837 100644 --- a/hack/tools/golangci-lint/go.mod +++ b/hack/tools/golangci-lint/go.mod @@ -218,10 +218,11 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect honnef.co/go/tools v0.6.1 // indirect k8s.io/apimachinery v0.32.3 // indirect + k8s.io/gengo/v2 v2.0.0-20250922181213-ec3ebc5fd46b // indirect k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect mvdan.cc/gofumpt v0.9.2 // indirect mvdan.cc/unparam v0.0.0-20251027182757-5beb8c8f8f15 // indirect - sigs.k8s.io/kube-api-linter v0.0.0-20251029172002-9992248f8813 // indirect + sigs.k8s.io/kube-api-linter v0.0.0-20251208100930-d3015c953951 // indirect sigs.k8s.io/logtools v0.9.0 // indirect sigs.k8s.io/yaml v1.4.0 // indirect ) diff --git a/hack/tools/golangci-lint/go.sum b/hack/tools/golangci-lint/go.sum index 08abc98414c..d79e71be716 100644 --- a/hack/tools/golangci-lint/go.sum +++ b/hack/tools/golangci-lint/go.sum @@ -995,6 +995,8 @@ honnef.co/go/tools v0.6.1 h1:R094WgE8K4JirYjBaOpz/AvTyUu/3wbmAoskKN/pxTI= honnef.co/go/tools v0.6.1/go.mod h1:3puzxxljPCe8RGJX7BIy1plGbxEOZni5mR2aXe3/uk4= k8s.io/apimachinery v0.32.3 h1:JmDuDarhDmA/Li7j3aPrwhpNBA94Nvk5zLeOge9HH1U= k8s.io/apimachinery v0.32.3/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE= +k8s.io/gengo/v2 v2.0.0-20250922181213-ec3ebc5fd46b h1:gMplByicHV/TJBizHd9aVEsTYoJBnnUAT5MHlTkbjhQ= +k8s.io/gengo/v2 v2.0.0-20250922181213-ec3ebc5fd46b/go.mod h1:CgujABENc3KuTrcsdpGmrrASjtQsWCT7R99mEV4U/fM= k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro= k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= mvdan.cc/gofumpt v0.9.2 h1:zsEMWL8SVKGHNztrx6uZrXdp7AX8r421Vvp23sz7ik4= @@ -1004,8 +1006,8 @@ mvdan.cc/unparam v0.0.0-20251027182757-5beb8c8f8f15/go.mod h1:4M5MMXl2kW6fivUT6y rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= -sigs.k8s.io/kube-api-linter v0.0.0-20251029172002-9992248f8813 h1:bn2rchbo/TdTln/RcJU3B49BjPBZTl7/+pj8RSVxLbY= -sigs.k8s.io/kube-api-linter v0.0.0-20251029172002-9992248f8813/go.mod h1:TwxOEmBIjl8POuwDF2VfmrHZ5a4o2SIPjDyqtTX7T3Q= +sigs.k8s.io/kube-api-linter v0.0.0-20251208100930-d3015c953951 h1:pjOeiLsYwEPaSRYTiMtVfdn7gSoRilw7Peyjw6kyUu4= +sigs.k8s.io/kube-api-linter v0.0.0-20251208100930-d3015c953951/go.mod h1:5mP60UakkCye+eOcZ5p98VnV2O49qreW1gq9TdsUf7Q= sigs.k8s.io/logtools v0.9.0 h1:IMP/HTDkfM6rg6os/tcEjmQeIHyOyu/enduM/cOPGNQ= sigs.k8s.io/logtools v0.9.0/go.mod h1:74Z5BP7ehrMHi/Q31W1gSf8YgwT/4GPjVH5xPSPeZA0= sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=