From d7473c4307bafc89b89a75124374c0e1292993b5 Mon Sep 17 00:00:00 2001 From: Pavan Navarathna <6504783+pavannd1@users.noreply.github.com> Date: Tue, 9 Jan 2024 22:54:00 -0800 Subject: [PATCH] Replace kyaml/sets with kube-openapi/sets (#2593) Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- go.mod | 4 ++-- pkg/controllers/repositoryserver/server.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 87ca2e8436..4db90349f8 100644 --- a/go.mod +++ b/go.mod @@ -58,10 +58,10 @@ require ( k8s.io/cli-runtime v0.26.11 k8s.io/client-go v0.26.11 k8s.io/code-generator v0.26.11 + k8s.io/kube-openapi v0.0.0-20230109183929-3758b55a6596 k8s.io/kubectl v0.26.11 k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 sigs.k8s.io/controller-runtime v0.14.7 - sigs.k8s.io/kustomize/kyaml v0.13.9 sigs.k8s.io/yaml v1.3.0 ) @@ -210,9 +210,9 @@ require ( k8s.io/component-base v0.26.11 // indirect k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect k8s.io/klog/v2 v2.90.1 // indirect - k8s.io/kube-openapi v0.0.0-20230109183929-3758b55a6596 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/kustomize/api v0.12.1 // indirect + sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect ) diff --git a/pkg/controllers/repositoryserver/server.go b/pkg/controllers/repositoryserver/server.go index 37ff0969f2..b07d73d3aa 100644 --- a/pkg/controllers/repositoryserver/server.go +++ b/pkg/controllers/repositoryserver/server.go @@ -28,7 +28,7 @@ import ( "github.com/kanisterio/kanister/pkg/kube" reposerver "github.com/kanisterio/kanister/pkg/secrets/repositoryserver" "github.com/pkg/errors" - "sigs.k8s.io/kustomize/kyaml/sets" + "k8s.io/kube-openapi/pkg/util/sets" ) const (