build(deps): Bump k8s.io/apimachinery from 0.27.4 to 0.28.0 (#494)

* build(deps): Bump k8s.io/apimachinery from 0.27.4 to 0.28.0 Bumps [k8s.io/apimachinery](https://github.com/kubernetes/apimachinery) from 0.27.4 to 0.28.0. - [Commits](kubernetes/apimachinery@v0.27.4...v0.28.0) --- updated-dependencies: - dependency-name: k8s.io/apimachinery dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * build(deps): Bump k8s.io/* modules --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jimmi Dyson <[email protected]>
mesosphere · Aug 21, 2023 · 26cf3a8 · 26cf3a8
1 parent 1a10e1d
commit 26cf3a8
Show file tree

Hide file tree

Showing 8 changed files with 86 additions and 85 deletions.
diff --git a/cmd/mindthegap/create/helmbundle/helm_bundle.go b/cmd/mindthegap/create/helmbundle/helm_bundle.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/spf13/cobra"
 	"helm.sh/helm/v3/pkg/action"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 
 	"github.com/mesosphere/dkp-cli-runtime/core/output"
 
@@ -144,7 +144,7 @@ func NewCommand(out output.Output) *cobra.Command {
 							helm.UsernamePasswordOpt(repoConfig.Username, repoConfig.Password),
 						)
 					}
-					if !pointer.BoolDeref(repoConfig.TLSVerify, true) {
+					if !ptr.Deref(repoConfig.TLSVerify, true) {
 						opts = append(opts, helm.InsecureSkipTLSverifyOpt())
 					}
 					for _, chartVersion := range chartVersions {

diff --git a/config/helm_charts_config.go b/config/helm_charts_config.go
@@ -10,7 +10,7 @@ import (
 
 	"gopkg.in/yaml.v3"
 	"k8s.io/apimachinery/pkg/util/sets"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 )
 
 // HelmRepositorySyncConfig contains information about a single repository, read from
@@ -36,7 +36,7 @@ func (c HelmRepositorySyncConfig) Clone() HelmRepositorySyncConfig {
 
 	var tlsVerify *bool = nil
 	if c.TLSVerify != nil {
-		tlsVerify = pointer.Bool(*c.TLSVerify)
+		tlsVerify = ptr.To(*c.TLSVerify)
 	}
 
 	return HelmRepositorySyncConfig{

diff --git a/config/helm_charts_config_test.go b/config/helm_charts_config_test.go
@@ -10,7 +10,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 )
 
 func TestParseHelmChartsFile(t *testing.T) {
@@ -99,7 +99,7 @@ func TestParseHelmChartsFile(t *testing.T) {
 		want: HelmChartsConfig{
 			Repositories: map[string]HelmRepositorySyncConfig{
 				"test.repository.io": {
-					TLSVerify: pointer.Bool(false),
+					TLSVerify: ptr.To(false),
 				},
 			},
 		},
@@ -108,10 +108,10 @@ func TestParseHelmChartsFile(t *testing.T) {
 		want: HelmChartsConfig{
 			Repositories: map[string]HelmRepositorySyncConfig{
 				"test.repository.io": {
-					TLSVerify: pointer.Bool(false),
+					TLSVerify: ptr.To(false),
 				},
 				"test.repository2.io": {
-					TLSVerify: pointer.Bool(true),
+					TLSVerify: ptr.To(true),
 				},
 			},
 		},

diff --git a/config/images_config.go b/config/images_config.go
@@ -14,7 +14,7 @@ import (
 	"github.com/containers/image/v5/types"
 	"github.com/distribution/distribution/v3/reference"
 	"gopkg.in/yaml.v3"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 )
 
 // RegistrySyncConfig contains information about a single registry, read from
@@ -53,7 +53,7 @@ func (rsc RegistrySyncConfig) Clone() RegistrySyncConfig {
 
 	var tlsVerify *bool = nil
 	if rsc.TLSVerify != nil {
-		tlsVerify = pointer.Bool(*rsc.TLSVerify)
+		tlsVerify = ptr.To(*rsc.TLSVerify)
 	}
 
 	var creds *types.DockerAuthConfig = nil

diff --git a/config/images_config_test.go b/config/images_config_test.go
@@ -10,7 +10,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 )
 
 func TestParseImagesFile(t *testing.T) {
@@ -86,17 +86,17 @@ func TestParseImagesFile(t *testing.T) {
 		name: "single registry with tls config",
 		want: ImagesConfig{
 			"test.registry.io": RegistrySyncConfig{
-				TLSVerify: pointer.Bool(false),
+				TLSVerify: ptr.To(false),
 			},
 		},
 	}, {
 		name: "multiple registries with tls config",
 		want: ImagesConfig{
 			"test.registry.io": RegistrySyncConfig{
-				TLSVerify: pointer.Bool(false),
+				TLSVerify: ptr.To(false),
 			},
 			"test.registry2.io": RegistrySyncConfig{
-				TLSVerify: pointer.Bool(true),
+				TLSVerify: ptr.To(true),
 			},
 		},
 	}, {

diff --git a/docker/ecr/repository.go b/docker/ecr/repository.go
@@ -16,7 +16,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/ecr"
 	"github.com/aws/aws-sdk-go-v2/service/ecr/types"
 	"github.com/google/go-containerregistry/pkg/name"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 )
 
 func ClientForRegistry(registryAddress string) (*ecr.Client, error) {
@@ -81,7 +81,7 @@ func EnsureRepositoryExistsFunc(ecrClient *ecr.Client, ecrLifecyclePolicy string
 			context.TODO(),
 			&ecr.PutLifecyclePolicyInput{
 				RepositoryName:      &repositoryName,
-				LifecyclePolicyText: pointer.String(string(ecrLifecyclePolicyText)),
+				LifecyclePolicyText: ptr.To(string(ecrLifecyclePolicyText)),
 			},
 		)
 		if err != nil {

diff --git a/go.mod b/go.mod
@@ -37,9 +37,9 @@ require (
 	golang.org/x/sync v0.3.0
 	gopkg.in/yaml.v3 v3.0.1
 	helm.sh/helm/v3 v3.12.3
-	k8s.io/apimachinery v0.27.4
+	k8s.io/apimachinery v0.28.0
 	k8s.io/klog/v2 v2.100.1
-	k8s.io/utils v0.0.0-20230711102312-30195339c3c7
+	k8s.io/utils v0.0.0-20230726121419-3b25d923346b
 )
 
 require (
@@ -96,7 +96,7 @@ require (
 	github.com/go-logr/logr v1.2.4 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-openapi/jsonpointer v0.19.6 // indirect
-	github.com/go-openapi/jsonreference v0.20.1 // indirect
+	github.com/go-openapi/jsonreference v0.20.2 // indirect
 	github.com/go-openapi/swag v0.22.4 // indirect
 	github.com/go-sql-driver/mysql v1.7.1 // indirect
 	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
@@ -107,7 +107,7 @@ require (
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/gomodule/redigo v1.8.2 // indirect
 	github.com/google/btree v1.1.2 // indirect
-	github.com/google/gnostic v0.5.7-v3refs // indirect
+	github.com/google/gnostic-models v0.6.8 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/pprof v0.0.0-20230111200839-76d1ae5aea2b // indirect
@@ -151,7 +151,7 @@ require (
 	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/mitchellh/go-testing-interface v1.14.1 // indirect
-	github.com/mitchellh/go-wordwrap v1.0.0 // indirect
+	github.com/mitchellh/go-wordwrap v1.0.1 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/moby/locker v1.0.1 // indirect
 	github.com/moby/spdystream v0.2.0 // indirect
@@ -167,10 +167,10 @@ require (
 	github.com/pierrec/lz4/v4 v4.1.15 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/prometheus/client_golang v1.15.1 // indirect
+	github.com/prometheus/client_golang v1.16.0 // indirect
 	github.com/prometheus/client_model v0.4.0 // indirect
-	github.com/prometheus/common v0.42.0 // indirect
-	github.com/prometheus/procfs v0.9.0 // indirect
+	github.com/prometheus/common v0.44.0 // indirect
+	github.com/prometheus/procfs v0.10.1 // indirect
 	github.com/rivo/uniseg v0.4.4 // indirect
 	github.com/rubenv/sql-migrate v1.3.1 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
@@ -183,15 +183,15 @@ require (
 	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
 	github.com/xeipuuv/gojsonschema v1.2.0 // indirect
 	github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
-	github.com/xlab/treeprint v1.1.0 // indirect
+	github.com/xlab/treeprint v1.2.0 // indirect
 	go.opencensus.io v0.24.0 // indirect
 	go.opentelemetry.io/otel v1.15.0 // indirect
 	go.opentelemetry.io/otel/trace v1.15.0 // indirect
-	go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
+	go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
 	golang.org/x/crypto v0.11.0 // indirect
 	golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 // indirect
 	golang.org/x/mod v0.10.0 // indirect
-	golang.org/x/net v0.12.0 // indirect
+	golang.org/x/net v0.13.0 // indirect
 	golang.org/x/oauth2 v0.9.0 // indirect
 	golang.org/x/sys v0.10.0 // indirect
 	golang.org/x/term v0.10.0 // indirect
@@ -201,23 +201,25 @@ require (
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
 	google.golang.org/api v0.124.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
+	google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect
 	google.golang.org/grpc v1.55.0 // indirect
 	google.golang.org/protobuf v1.30.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
-	k8s.io/api v0.27.3 // indirect
+	k8s.io/api v0.28.0 // indirect
 	k8s.io/apiextensions-apiserver v0.27.3 // indirect
-	k8s.io/apiserver v0.27.3 // indirect
-	k8s.io/cli-runtime v0.27.3 // indirect
-	k8s.io/client-go v0.27.3 // indirect
-	k8s.io/component-base v0.27.3 // indirect
-	k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
-	k8s.io/kubectl v0.27.3 // indirect
+	k8s.io/apiserver v0.28.0 // indirect
+	k8s.io/cli-runtime v0.28.0 // indirect
+	k8s.io/client-go v0.28.0 // indirect
+	k8s.io/component-base v0.28.0 // indirect
+	k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
+	k8s.io/kubectl v0.28.0 // indirect
 	oras.land/oras-go v1.2.3 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
-	sigs.k8s.io/kustomize/api v0.13.2 // indirect
-	sigs.k8s.io/kustomize/kyaml v0.14.1 // indirect
+	sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
+	sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
 	sigs.k8s.io/yaml v1.3.0 // indirect
 )