From b29f07c93e63aa621805bf3acf6321078ab841ae Mon Sep 17 00:00:00 2001 From: Natasha Sarkar Date: Thu, 1 Jul 2021 17:10:28 -0700 Subject: [PATCH] Manually update kustomize attachment points. Kubernetes-commit: a46b42a92b87c04f22c77df6d57149ad34b0ee6d --- go.mod | 35 +++++++++++++++++----------------- go.sum | 18 ----------------- pkg/cmd/kustomize/kustomize.go | 2 +- 3 files changed, 19 insertions(+), 36 deletions(-) diff --git a/go.mod b/go.mod index 3d2f1904..5e1fdc2b 100644 --- a/go.mod +++ b/go.mod @@ -31,28 +31,29 @@ require ( github.com/stretchr/testify v1.7.0 golang.org/x/sys v0.0.0-20210616094352-59db8d763f22 gopkg.in/yaml.v2 v2.4.0 - k8s.io/api v0.0.0-20210707174547-c7120651ba6c - k8s.io/apimachinery v0.0.0-20210701054147-830375057167 - k8s.io/cli-runtime v0.0.0-20210707181534-3546f71950b2 - k8s.io/client-go v0.0.0-20210707174930-b2678640329d - k8s.io/component-base v0.0.0-20210702054709-fddd92849e34 - k8s.io/component-helpers v0.0.0-20210701055214-c69fdc006e3d + k8s.io/api v0.0.0 + k8s.io/apimachinery v0.0.0 + k8s.io/cli-runtime v0.0.0 + k8s.io/client-go v0.0.0 + k8s.io/component-base v0.0.0 + k8s.io/component-helpers v0.0.0 k8s.io/klog/v2 v2.9.0 k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e - k8s.io/metrics v0.0.0-20210701060343-ae3c4d90860b + k8s.io/metrics v0.0.0 k8s.io/utils v0.0.0-20210521133846-da695404a2bc - sigs.k8s.io/kustomize/api v0.8.10 - sigs.k8s.io/kustomize/kustomize/v4 v4.1.3 + sigs.k8s.io/kustomize/kustomize/v4 v4.2.0 + sigs.k8s.io/kustomize/kyaml v0.11.0 sigs.k8s.io/yaml v1.2.0 ) replace ( - k8s.io/api => k8s.io/api v0.0.0-20210707174547-c7120651ba6c - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210701054147-830375057167 - k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20210707181534-3546f71950b2 - k8s.io/client-go => k8s.io/client-go v0.0.0-20210707174930-b2678640329d - k8s.io/code-generator => k8s.io/code-generator v0.0.0-20210704214018-b1b4942f7194 - k8s.io/component-base => k8s.io/component-base v0.0.0-20210702054709-fddd92849e34 - k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20210701055214-c69fdc006e3d - k8s.io/metrics => k8s.io/metrics v0.0.0-20210701060343-ae3c4d90860b + k8s.io/api => ../api + k8s.io/apimachinery => ../apimachinery + k8s.io/cli-runtime => ../cli-runtime + k8s.io/client-go => ../client-go + k8s.io/code-generator => ../code-generator + k8s.io/component-base => ../component-base + k8s.io/component-helpers => ../component-helpers + k8s.io/kubectl => ../kubectl + k8s.io/metrics => ../metrics ) diff --git a/go.sum b/go.sum index 4cb88df4..a902bc20 100644 --- a/go.sum +++ b/go.sum @@ -110,7 +110,6 @@ github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZM github.com/fatih/camelcase v1.0.0 h1:hxNvNX/xYBp0ovncs8WyWZrOrpBNub/JfaMvbURyft8= github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= @@ -422,8 +421,6 @@ go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0/go.mod h1:2AboqHi0CiIZU0qwhtUfCYD1GeUzvvIXWNkhDt7ZMG4= go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzoxm/dooo= go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod h1:YIieizyaN77rtLJra0buKiNBOm9XQfkPEKBeuhoMwAM= go.opentelemetry.io/otel/metric v0.20.0/go.mod h1:598I5tYlH1vzBjn+BTuhzTCSb/9debfNp6R3s7Pr1eU= @@ -738,19 +735,6 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -k8s.io/api v0.0.0-20210707174547-c7120651ba6c h1:fSuqMc1G40Cl6BY7TuYWLdo+wcWUfaWijwWPMGm3hrE= -k8s.io/api v0.0.0-20210707174547-c7120651ba6c/go.mod h1:zoURDvOPW5UMFZr2YUU/sStjYnWSPt+x+MM4R94ATgQ= -k8s.io/apimachinery v0.0.0-20210701054147-830375057167 h1:fob/j8+uMBIVvyo+9bG7GvjFSj0LX3RNuSXW+RcUrwo= -k8s.io/apimachinery v0.0.0-20210701054147-830375057167/go.mod h1:O3oNtNadZdeOMxHFVxOreoznohCpy0z6mocxbZr7oJ0= -k8s.io/cli-runtime v0.0.0-20210707181534-3546f71950b2 h1:qvZrEO11xhHs7VhKLlcvzapyZoa+ZDUK1c9JUwM06T0= -k8s.io/cli-runtime v0.0.0-20210707181534-3546f71950b2/go.mod h1:vdRgUcpOdPLinvbGC78KvgVfU2VuXOZTW5bV93e8CEQ= -k8s.io/client-go v0.0.0-20210707174930-b2678640329d h1:JZpwpZ5mK716hQiKLwGnoABxEbWhFSaM36csnj4mw3M= -k8s.io/client-go v0.0.0-20210707174930-b2678640329d/go.mod h1:sHAZo8Y/PMppsKX6llqj9HPjDT8PM/PYRxWZCCt1zlc= -k8s.io/code-generator v0.0.0-20210704214018-b1b4942f7194/go.mod h1:eV77Y09IopzeXOJzndrDyCI88UBok2h6WxAlBwpxa+o= -k8s.io/component-base v0.0.0-20210702054709-fddd92849e34 h1:L7kJX0+rX5SJ2ZUaFy8zarcUMW0+2AHkd3gyuIp0ZLM= -k8s.io/component-base v0.0.0-20210702054709-fddd92849e34/go.mod h1:KuldLgSPMxWtcVmPn3hcUoWNJqm7HEdVcSID+ZdAB24= -k8s.io/component-helpers v0.0.0-20210701055214-c69fdc006e3d h1:rzPPeHblp87VaGgdISzN9DrYrNJPPTAGCXBovsMK1oA= -k8s.io/component-helpers v0.0.0-20210701055214-c69fdc006e3d/go.mod h1:OguzSsEhC2rjao1f6WA/qJsJSQawTviFkF3oEJatDfQ= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= @@ -759,8 +743,6 @@ k8s.io/klog/v2 v2.9.0 h1:D7HV+n1V57XeZ0m6tdRkfknthUaM06VFbWldOFh8kzM= k8s.io/klog/v2 v2.9.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e h1:KLHHjkdQFomZy8+06csTWZ0m1343QqxZhR2LJ1OxCYM= k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= -k8s.io/metrics v0.0.0-20210701060343-ae3c4d90860b h1:5t0HHGQSI5ywzqXv+TfO0Y1XbsYq2AcH3UEWwEr/nEQ= -k8s.io/metrics v0.0.0-20210701060343-ae3c4d90860b/go.mod h1:Ry1pPkGFa49ntpDBJtLHEU/54WeCQI5x0/OglG3GMzw= k8s.io/utils v0.0.0-20210521133846-da695404a2bc h1:dx6VGe+PnOW/kD/2UV4aUSsRfJGd7+lcqgJ6Xg0HwUs= k8s.io/utils v0.0.0-20210521133846-da695404a2bc/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= diff --git a/pkg/cmd/kustomize/kustomize.go b/pkg/cmd/kustomize/kustomize.go index 7b9d85e9..77543484 100644 --- a/pkg/cmd/kustomize/kustomize.go +++ b/pkg/cmd/kustomize/kustomize.go @@ -21,8 +21,8 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" - "sigs.k8s.io/kustomize/api/filesys" "sigs.k8s.io/kustomize/kustomize/v4/commands/build" + "sigs.k8s.io/kustomize/kyaml/filesys" ) // NewCmdKustomize returns an adapted kustomize build command.