From b4e116346ee9c8a24eaba839711d92e9216d4995 Mon Sep 17 00:00:00 2001 From: natasha41575 Date: Wed, 9 Feb 2022 16:16:10 -0800 Subject: [PATCH] Test examples against latest release --- Makefile | 2 +- api/go.mod | 2 ++ api/go.sum | 2 -- cmd/config/go.mod | 2 ++ cmd/config/go.sum | 2 -- cmd/pluginator/go.mod | 4 ++++ cmd/pluginator/go.sum | 4 ---- kustomize/go.mod | 6 ++++++ kustomize/go.sum | 6 ------ 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index 6665c16d1..d4297346c 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ MYGOBIN = $(shell go env GOPATH)/bin endif export PATH := $(MYGOBIN):$(PATH) MODULES := '"cmd/config" "api/" "kustomize/" "kyaml/"' -LATEST_V4_RELEASE=v4.5.1 +LATEST_V4_RELEASE=v4.5.2 # Provide defaults for REPO_OWNER and REPO_NAME if not present. # Typically these values would be provided by Prow. diff --git a/api/go.mod b/api/go.mod index b732d526e..1422cd1c8 100644 --- a/api/go.mod +++ b/api/go.mod @@ -14,3 +14,5 @@ require ( sigs.k8s.io/kustomize/kyaml v0.13.3 sigs.k8s.io/yaml v1.2.0 ) + +replace sigs.k8s.io/kustomize/kyaml => ../kyaml diff --git a/api/go.sum b/api/go.sum index 7cc673e2b..048d7fb3c 100644 --- a/api/go.sum +++ b/api/go.sum @@ -634,8 +634,6 @@ k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2R 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/kustomize/kyaml v0.13.3 h1:tNNQIC+8cc+aXFTVg+RtQAOsjwUdYBZRAgYOVI3RBc4= -sigs.k8s.io/kustomize/kyaml v0.13.3/go.mod h1:/ya3Gk4diiQzlE4mBh7wykyLRFZNvqlbh+JnwQ9Vhrc= sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= diff --git a/cmd/config/go.mod b/cmd/config/go.mod index 829c2ea6b..b56a5f9c2 100644 --- a/cmd/config/go.mod +++ b/cmd/config/go.mod @@ -14,3 +14,5 @@ require ( k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e sigs.k8s.io/kustomize/kyaml v0.13.3 ) + +replace sigs.k8s.io/kustomize/kyaml => ../../kyaml diff --git a/cmd/config/go.sum b/cmd/config/go.sum index e62a2a48c..e6c826c04 100644 --- a/cmd/config/go.sum +++ b/cmd/config/go.sum @@ -644,8 +644,6 @@ k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2R 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/kustomize/kyaml v0.13.3 h1:tNNQIC+8cc+aXFTVg+RtQAOsjwUdYBZRAgYOVI3RBc4= -sigs.k8s.io/kustomize/kyaml v0.13.3/go.mod h1:/ya3Gk4diiQzlE4mBh7wykyLRFZNvqlbh+JnwQ9Vhrc= sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= diff --git a/cmd/pluginator/go.mod b/cmd/pluginator/go.mod index 7210e6259..d6fd1ebc3 100644 --- a/cmd/pluginator/go.mod +++ b/cmd/pluginator/go.mod @@ -9,3 +9,7 @@ require ( sigs.k8s.io/kustomize/api v0.11.2 sigs.k8s.io/kustomize/kyaml v0.13.3 ) + +replace sigs.k8s.io/kustomize/api => ../../api + +replace sigs.k8s.io/kustomize/kyaml => ../../kyaml diff --git a/cmd/pluginator/go.sum b/cmd/pluginator/go.sum index 36424b56e..07db6d35c 100644 --- a/cmd/pluginator/go.sum +++ b/cmd/pluginator/go.sum @@ -639,10 +639,6 @@ k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2R 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/kustomize/api v0.11.2 h1:6YvCJHFDwsLwAX7zNHBxMZi3k7dGIXI8G9l0saYQI0E= -sigs.k8s.io/kustomize/api v0.11.2/go.mod h1:GZuhith5YcqxIDe0GnRJNx5xxPTjlwaLTt/e+ChUtJA= -sigs.k8s.io/kustomize/kyaml v0.13.3 h1:tNNQIC+8cc+aXFTVg+RtQAOsjwUdYBZRAgYOVI3RBc4= -sigs.k8s.io/kustomize/kyaml v0.13.3/go.mod h1:/ya3Gk4diiQzlE4mBh7wykyLRFZNvqlbh+JnwQ9Vhrc= sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= diff --git a/kustomize/go.mod b/kustomize/go.mod index e88c7e7db..1e09a64a2 100644 --- a/kustomize/go.mod +++ b/kustomize/go.mod @@ -13,3 +13,9 @@ require ( sigs.k8s.io/kustomize/kyaml v0.13.3 sigs.k8s.io/yaml v1.2.0 ) + +replace sigs.k8s.io/kustomize/api => ../api + +replace sigs.k8s.io/kustomize/cmd/config => ../cmd/config + +replace sigs.k8s.io/kustomize/kyaml => ../kyaml diff --git a/kustomize/go.sum b/kustomize/go.sum index 5f295707f..40d413d61 100644 --- a/kustomize/go.sum +++ b/kustomize/go.sum @@ -651,12 +651,6 @@ k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2R 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/kustomize/api v0.11.2 h1:6YvCJHFDwsLwAX7zNHBxMZi3k7dGIXI8G9l0saYQI0E= -sigs.k8s.io/kustomize/api v0.11.2/go.mod h1:GZuhith5YcqxIDe0GnRJNx5xxPTjlwaLTt/e+ChUtJA= -sigs.k8s.io/kustomize/cmd/config v0.10.4 h1:gv8Jj8Yi82aeuCbg2GsbBxIJKxGmPf0YXaSN/gO+7go= -sigs.k8s.io/kustomize/cmd/config v0.10.4/go.mod h1:2woQTJo0oA4wr8G3F8ZFdH2YoaOoG27IGU4aPA9GPTo= -sigs.k8s.io/kustomize/kyaml v0.13.3 h1:tNNQIC+8cc+aXFTVg+RtQAOsjwUdYBZRAgYOVI3RBc4= -sigs.k8s.io/kustomize/kyaml v0.13.3/go.mod h1:/ya3Gk4diiQzlE4mBh7wykyLRFZNvqlbh+JnwQ9Vhrc= sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=