Update dependencies to v0.30.0-alpha.3 tag

Merge pull request #123348 from hoskeri/update-go-x-crypto-19
Update x/crypto to 0.19. Kubernetes-commit: 9a9028983806af26e7b48223f3a92922e94725df
2026-06-23 18:25:04 +00:00 · 2024-02-28 11:00:18 +00:00 · 2024-02-21 20:26:51 +00:00 · 2024-02-21 12:27:26 +00:00 · 2024-02-18 14:50:55 -08:00 · 2024-02-16 20:18:14 +00:00
19 changed files with 66 additions and 61 deletions
--- a/README.md
+++ b/README.md
@@ -75,14 +75,14 @@ We will backport bugfixes--but not new features--into older versions of

 #### Compatibility matrix

-|                               | Kubernetes 1.15 | Kubernetes 1.16 | Kubernetes 1.17 | Kubernetes 1.18 | Kubernetes 1.19 | Kubernetes 1.20 |
-|-------------------------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|
-| `kubernetes-1.15.0`           | ✓               | +-              | +-              | +-              | +-              | +-              |
-| `kubernetes-1.16.0`           | +-              | ✓               | +-              | +-              | +-              | +-              |
-| `kubernetes-1.17.0`/`v0.17.0` | +-              | +-              | ✓               | +-              | +-              | +-              |
-| `kubernetes-1.18.0`/`v0.18.0` | +-              | +-              | +-              | ✓               | +-              | +-              |
-| `kubernetes-1.19.0`/`v0.19.0` | +-              | +-              | +-              | +-              | ✓               | +-              |
-| `kubernetes-1.20.0`/`v0.20.0` | +-              | +-              | +-              | +-              | +-              | ✓               |
+|                               | Kubernetes 1.23 | Kubernetes 1.24 | Kubernetes 1.25 | Kubernetes 1.26 | Kubernetes 1.27 | Kubernetes 1.28 |
+| ----------------------------- | --------------- | --------------- | --------------- | --------------- | --------------- | --------------- |
+| `kubernetes-1.23.0`/`v0.23.0` | ✓               | +-              | +-              | +-              | +-              | +-              |
+| `kubernetes-1.24.0`/`v0.24.0` | +-              | ✓               | +-              | +-              | +-              | +-              |
+| `kubernetes-1.25.0`/`v0.25.0` | +-              | +-              | ✓               | +-              | +-              | +-              |
+| `kubernetes-1.26.0`/`v0.26.0` | +-              | +-              | +-              | ✓               | +-              | +-              |
+| `kubernetes-1.27.0`/`v0.27.0` | +-              | +-              | +-              | +-              | ✓               | +-              |
+| `kubernetes-1.28.0`/`v0.28.0` | +-              | +-              | +-              | +-              | +-              | ✓               |
 | `HEAD`                        | +-              | +-              | +-              | +-              | +-              | +-              |

 Key:
@@ -102,27 +102,19 @@ Key:
 See the [CHANGELOG](./CHANGELOG.md) for a detailed description of changes
 between client-go versions.

-| Branch         | Canonical source code location       | Maintenance status            |
-|----------------|--------------------------------------|-------------------------------|
-| `release-1.4`  | Kubernetes main repo, 1.4 branch     | = -                           |
-| `release-1.5`  | Kubernetes main repo, 1.5 branch     | = -                           |
-| `release-2.0`  | Kubernetes main repo, 1.5 branch     | = -                           |
-| `release-3.0`  | Kubernetes main repo, 1.6 branch     | = -                           |
-| `release-4.0`  | Kubernetes main repo, 1.7 branch     | = -                           |
-| `release-5.0`  | Kubernetes main repo, 1.8 branch     | = -                           |
-| `release-6.0`  | Kubernetes main repo, 1.9 branch     | = -                           |
-| `release-7.0`  | Kubernetes main repo, 1.10 branch    | = -                           |
-| `release-8.0`  | Kubernetes main repo, 1.11 branch    | =-                            |
-| `release-9.0`  | Kubernetes main repo, 1.12 branch    | =-                            |
-| `release-10.0` | Kubernetes main repo, 1.13 branch    | =-                            |
-| `release-11.0` | Kubernetes main repo, 1.14 branch    | =-                            |
-| `release-12.0` | Kubernetes main repo, 1.15 branch    | =-                            |
-| `release-13.0` | Kubernetes main repo, 1.16 branch    | =-                            |
-| `release-14.0` | Kubernetes main repo, 1.17 branch    | ✓                             |
-| `release-1.18` | Kubernetes main repo, 1.18 branch    | ✓                             |
-| `release-1.19` | Kubernetes main repo, 1.19 branch    | ✓                             |
-| `release-1.20` | Kubernetes main repo, 1.20 branch    | ✓                             |
-| client-go HEAD | Kubernetes main repo, master branch  | ✓                             |
+| Branch         | Canonical source code location      | Maintenance status |
+| -------------- | ----------------------------------- | ------------------ |
+| `release-1.19` | Kubernetes main repo, 1.19 branch   | =-                 |
+| `release-1.20` | Kubernetes main repo, 1.20 branch   | =-                 |
+| `release-1.21` | Kubernetes main repo, 1.21 branch   | =-                 |
+| `release-1.22` | Kubernetes main repo, 1.22 branch   | =-                 |
+| `release-1.23` | Kubernetes main repo, 1.23 branch   | =-                 |
+| `release-1.24` | Kubernetes main repo, 1.24 branch   | =-                 |
+| `release-1.25` | Kubernetes main repo, 1.25 branch   | ✓                  |
+| `release-1.26` | Kubernetes main repo, 1.26 branch   | ✓                  |
+| `release-1.27` | Kubernetes main repo, 1.27 branch   | ✓                  |
+| `release-1.28` | Kubernetes main repo, 1.28 branch   | ✓                  |
+| client-go HEAD | Kubernetes main repo, master branch | ✓                  |

 Key:

--- a/applyconfigurations/doc.go
+++ b/applyconfigurations/doc.go
@@ -148,4 +148,4 @@ reconciliation code that performs a "read/modify-in-place/update" (or patch) wor
 	    // apply
 	    applied, err := deploymentClient.Apply(ctx, extractedDeployment, metav1.ApplyOptions{FieldManager: fieldMgr})
 */
-package applyconfigurations
+package applyconfigurations // import "k8s.io/client-go/applyconfigurations"
--- a/discovery/testdata/apis/batch/v1.json
+++ b/discovery/testdata/apis/batch/v1.json
--- a/discovery/testdata/apis/batch/v1beta1.json
+++ b/discovery/testdata/apis/batch/v1beta1.json
--- a/examples/fake-client/doc.go
+++ b/examples/fake-client/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // Package fakeclient contains examples on how to use fakeclient in tests.
 // Note: This file is here to avoid warnings on go build since there are no
 // non-test files in this package.
-package fakeclient
+package fakeclient // import "k8s.io/client-go/examples/fake-client"
--- a/go.mod
+++ b/go.mod
@@ -21,11 +21,11 @@ require (
 	github.com/stretchr/testify v1.8.4
 	golang.org/x/net v0.19.0
 	golang.org/x/oauth2 v0.10.0
-	golang.org/x/term v0.15.0
+	golang.org/x/term v0.17.0
 	golang.org/x/time v0.3.0
 	google.golang.org/protobuf v1.31.0
-	k8s.io/api v0.30.0-alpha.1
-	k8s.io/apimachinery v0.30.0-alpha.1
+	k8s.io/api v0.30.0-alpha.3
+	k8s.io/apimachinery v0.30.0-alpha.3
 	k8s.io/klog/v2 v2.120.1
 	k8s.io/kube-openapi v0.0.0-20231113174909-778a5567bc1e
 	k8s.io/utils v0.0.0-20230726121419-3b25d923346b
@@ -52,7 +52,7 @@ require (
 	github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	golang.org/x/sys v0.15.0 // indirect
+	golang.org/x/sys v0.17.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
@@ -61,6 +61,6 @@ require (
 )

 replace (
-	k8s.io/api => k8s.io/api v0.30.0-alpha.1
-	k8s.io/apimachinery => k8s.io/apimachinery v0.30.0-alpha.1
+	k8s.io/api => k8s.io/api v0.30.0-alpha.3
+	k8s.io/apimachinery => k8s.io/apimachinery v0.30.0-alpha.3
 )
--- a/go.sum
+++ b/go.sum
@@ -119,10 +119,10 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
-golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4=
-golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
+golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=
+golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/term v0.17.0 h1:mkTF7LCd6WGJNL3K1Ad7kwxNfYAW6a8a8QqtMblp/4U=
+golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -157,10 +157,10 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-k8s.io/api v0.30.0-alpha.1 h1:8FCjW0J6yU+tZkCn2j7dRND3GM7qKXxarXmNOc3Ujt8=
-k8s.io/api v0.30.0-alpha.1/go.mod h1:dmO1fSXFEGktE3nbj3Q7oCKTc5fvPBkRvn5ltvdP7jY=
-k8s.io/apimachinery v0.30.0-alpha.1 h1:AAQ3jCL1jnVGUNCr0osDLaO62fJACPiR3vXyozvWKMY=
-k8s.io/apimachinery v0.30.0-alpha.1/go.mod h1:Oh3ZrffM1/I8O/43oAA+aoOYgSregIXHxcWJB9ZRfQ8=
+k8s.io/api v0.30.0-alpha.3 h1:EcbaDi8WjoR8QdQS6LKd8oP0qjODWxfKdVj5U8WM1P0=
+k8s.io/api v0.30.0-alpha.3/go.mod h1:gUziZ7QreMQgwigIm0O6q1xN4w2DPIs6PwP9Ha3c9dQ=
+k8s.io/apimachinery v0.30.0-alpha.3 h1:9FoqT1Wc+48DJ+mYkbmZd3n4351u9YbGnQSPnVWUwWM=
+k8s.io/apimachinery v0.30.0-alpha.3/go.mod h1:/862Kkwje5hhHGJWPKiaHuov2c6mw6uCXWikV9kOIP4=
 k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
 k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
 k8s.io/kube-openapi v0.0.0-20231113174909-778a5567bc1e h1:snPmy96t93RredGRjKfMFt+gvxuVAncqSAyBveJtr4Q=
--- a/informers/doc.go
+++ b/informers/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */

 // Package informers provides generated informers for Kubernetes APIs.
-package informers
+package informers // import "k8s.io/client-go/informers"
--- a/kubernetes/doc.go
+++ b/kubernetes/doc.go
@@ -16,4 +16,4 @@ limitations under the License.

 // Package kubernetes holds packages which implement a clientset for Kubernetes
 // APIs.
-package kubernetes
+package kubernetes // import "k8s.io/client-go/kubernetes"
--- a/listers/doc.go
+++ b/listers/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */

 // Package listers provides generated listers for Kubernetes APIs.
-package listers
+package listers // import "k8s.io/client-go/listers"
--- a/openapi/openapitest/testdata/api__v1_openapi.json
+++ b/openapi/openapitest/testdata/api__v1_openapi.json
@@ -5235,7 +5235,7 @@
            "description": "SecurityContext holds pod-level security attributes and common container settings. Optional: Defaults to empty.  See type description for default values of each field."
          },
          "serviceAccount": {
-            "description": "DeprecatedServiceAccount is a depreciated alias for ServiceAccountName. Deprecated: Use serviceAccountName instead.",
+            "description": "DeprecatedServiceAccount is a deprecated alias for ServiceAccountName. Deprecated: Use serviceAccountName instead.",
            "type": "string"
          },
          "serviceAccountName": {
--- a/openapi/openapitest/testdata/apisappsv1_openapi.json
+++ b/openapi/openapitest/testdata/apisappsv1_openapi.json
@@ -3677,7 +3677,7 @@
            "description": "SecurityContext holds pod-level security attributes and common container settings. Optional: Defaults to empty.  See type description for default values of each field."
          },
          "serviceAccount": {
-            "description": "DeprecatedServiceAccount is a depreciated alias for ServiceAccountName. Deprecated: Use serviceAccountName instead.",
+            "description": "DeprecatedServiceAccount is a deprecated alias for ServiceAccountName. Deprecated: Use serviceAccountName instead.",
            "type": "string"
          },
          "serviceAccountName": {
--- a/openapi/openapitest/testdata/apisbatchv1_openapi.json
+++ b/openapi/openapitest/testdata/apisbatchv1_openapi.json
@@ -2851,7 +2851,7 @@
            "description": "SecurityContext holds pod-level security attributes and common container settings. Optional: Defaults to empty.  See type description for default values of each field."
          },
          "serviceAccount": {
-            "description": "DeprecatedServiceAccount is a depreciated alias for ServiceAccountName. Deprecated: Use serviceAccountName instead.",
+            "description": "DeprecatedServiceAccount is a deprecated alias for ServiceAccountName. Deprecated: Use serviceAccountName instead.",
            "type": "string"
          },
          "serviceAccountName": {
--- a/scale/scheme/appsint/doc.go
+++ b/scale/scheme/appsint/doc.go
@@ -19,4 +19,4 @@ limitations under the License.
 // It doesn't have any of its own types -- it's just necessary to
 // get the expected behavior out of runtime.Scheme.ConvertToVersion
 // and associated methods.
-package appsint
+package appsint // import "k8s.io/client-go/scale/scheme/appsint"
--- a/scale/scheme/doc.go
+++ b/scale/scheme/doc.go
@@ -19,4 +19,4 @@ limitations under the License.
 // Package scheme contains a runtime.Scheme to be used for serializing
 // and deserializing different versions of Scale, and for converting
 // in between them.
-package scheme
+package scheme // import "k8s.io/client-go/scale/scheme"
--- a/scale/scheme/extensionsint/doc.go
+++ b/scale/scheme/extensionsint/doc.go
@@ -19,4 +19,4 @@ limitations under the License.
 // It doesn't have any of its own types -- it's just necessary to
 // get the expected behavior out of runtime.Scheme.ConvertToVersion
 // and associated methods.
-package extensionsint
+package extensionsint // import "k8s.io/client-go/scale/scheme/extensionsint"
--- a/tools/clientcmd/api/doc.go
+++ b/tools/clientcmd/api/doc.go
@@ -16,4 +16,4 @@ limitations under the License.

 // +k8s:deepcopy-gen=package

-package api
+package api // import "k8s.io/client-go/tools/clientcmd/api"
--- a/tools/clientcmd/api/v1/doc.go
+++ b/tools/clientcmd/api/v1/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 // +k8s:defaulter-gen=Kind

-package v1
+package v1 // import "k8s.io/client-go/tools/clientcmd/api/v1"
--- a/tools/record/event.go
+++ b/tools/record/event.go
@@ -198,16 +198,29 @@ func NewBroadcaster(opts ...BroadcasterOption) EventBroadcaster {
 	ctx := c.Context
 	if ctx == nil {
 		ctx = context.Background()
-	} else {
+	}
+	// The are two scenarios where it makes no sense to wait for context cancelation:
+	// - The context was nil.
+	// - The context was context.Background() to begin with.
+	//
+	// Both cases get checked here.
+	haveCtxCancelation := ctx.Done() == nil
+
+	eventBroadcaster.cancelationCtx, eventBroadcaster.cancel = context.WithCancel(ctx)
+
+	if haveCtxCancelation {
 		// Calling Shutdown is not required when a context was provided:
 		// when the context is canceled, this goroutine will shut down
 		// the broadcaster.
+		//
+		// If Shutdown is called first, then this goroutine will
+		// also stop.
 		go func() {
-			<-ctx.Done()
+			<-eventBroadcaster.cancelationCtx.Done()
 			eventBroadcaster.Broadcaster.Shutdown()
 		}()
 	}
-	eventBroadcaster.cancelationCtx, eventBroadcaster.cancel = context.WithCancel(ctx)
+
 	return eventBroadcaster
 }
Author	SHA1	Message	Date
Kubernetes Publisher	7f4bc0ee62	Update dependencies to v0.30.0-alpha.3 tag	2024-02-28 11:00:18 +00:00
Kubernetes Publisher	8c4efe8d07	Merge pull request #123348 from hoskeri/update-go-x-crypto-19 Update x/crypto to 0.19. Kubernetes-commit: 9a9028983806af26e7b48223f3a92922e94725df	2024-02-21 20:26:51 +00:00
Kubernetes Publisher	e88f4481f2	Merge pull request #123392 from thockin/depreciate Cleanup: s/depreciated/deprecated/g Kubernetes-commit: 11785bb815d58eb553be3a1fa305464c35d860cc	2024-02-21 12:27:26 +00:00
Tim Hockin	7087b65a74	Cleanup: s/depreciated/deprecated/g Kubernetes-commit: 9f4b82bf3b079fe868effbd2498b61464db6d459	2024-02-18 14:50:55 -08:00
Abhijit Hoskeri	bb04dc47e3	Update x/crypto to 0.19. Main reason is to pick up updated CA roots. Full diff: https://github.com/golang/crypto/compare/v0.16.0...v0.19.0 Kubernetes-commit: d3a0e296defbb0b55e591e273004e79e7ebfb1fd	2024-02-16 20:18:14 +00:00
Kubernetes Publisher	306b201a2d	Merge pull request #123250 from benluddy/dep-bump-cbor-v2.6.0 Bump github.com/fxamacker/cbor/v2 to v2.6.0. Kubernetes-commit: e305e773bbfe8c5bdf9c57881a875e168b004b8c	2024-02-15 01:24:42 +00:00
Ben Luddy	d23a110967	Bump github.com/fxamacker/cbor/v2 to v2.6.0. Kubernetes-commit: aac43dc96f2b679f0ab030fd3512c7e03b0f2df4	2024-02-12 15:46:17 -05:00
Kubernetes Prow Robot	dc532e7975	Merge pull request #1294 from dnwe/compatibility-matrix chore(docs): refresh compatibility matrix	2024-02-13 10:38:36 -08:00
Kubernetes Publisher	5fb8d886b5	Merge pull request #122152 from pohly/client-go-event-context-fix client-go events: support context.Background() as context Kubernetes-commit: e51e3c74f720cd299e10a5e0c500a749bb36c251	2024-02-12 17:23:58 +00:00
Kubernetes Publisher	790cfadf62	Merge pull request #121486 from benluddy/cbor-stub KEP-4222: Add stub CBOR serializer. Kubernetes-commit: 48228bf9dbac308f43abd59a53fdc069fbddee0f	2024-02-10 01:28:08 +00:00
José Carlos Chávez	76174b8af8	chore: adds consistent vanity import to files and provides tooling for verifying and updating them. (#120642 ) * chore: drops update vanity imports from script. * chore: changes copyright year to 2024. * chore: makes lint happy. Kubernetes-commit: 6d6398ef9266abce3518a4c9a3d4e4d8feeffdc1	2024-02-08 13:38:07 +00:00
Dominic Evans	3d92ad924f	chore(docs): refresh compatibility matrix Bring the compatibility matrix up-to-date with more recent versions of Kubernetes Signed-off-by: Dominic Evans <dominic.evans@uk.ibm.com>	2024-01-24 18:28:43 +00:00
Patrick Ohly	2231ff5ae4	client-go events: support context.Background() as context If, for whatever reason, the context was context.Background(), the additional goroutine was started and then got stuck forever because context.Background().Done() is a nil channel. Found when indirectly instantiating a broadcaster with such a context: found unexpected goroutines: [Goroutine 9106 in state chan receive (nil chan), with k8s.io/kubernetes/vendor/k8s.io/client-go/tools/record.NewBroadcaster.func1 on top of the stack: goroutine 9106 [chan receive (nil chan)]: k8s.io/kubernetes/vendor/k8s.io/client-go/tools/record.NewBroadcaster.func1() /home/prow/go/src/k8s.io/kubernetes/_output/local/go/src/k8s.io/kubernetes/vendor/k8s.io/client-go/tools/record/event.go:206 +0x2c created by k8s.io/kubernetes/vendor/k8s.io/client-go/tools/record.NewBroadcaster in goroutine 8957 /home/prow/go/src/k8s.io/kubernetes/_output/local/go/src/k8s.io/kubernetes/vendor/k8s.io/client-go/tools/record/event.go:205 +0x1a5 This can be fixed by checking for a nil channel. Another problem also gets addressed: if Shutdown was called without canceling the context, the goroutine also didn't stop. Now it waits for the cancelation context and thus terminates in both cases. Kubernetes-commit: eed6e29a5b8cfaa20fbc426541d9c74105d430ee	2023-12-01 18:35:28 +01:00
Ben Luddy	dc967a1ca9	Update vendoring to take new CBOR library dependency. Kubernetes-commit: 09a1abda998fc37e2e29a120a82be7c6271656e0	2023-10-17 16:51:52 -04:00