Merge pull request #4552 from KnVerey/version-mismatch

Copy of go 1.18 created version mismatch, reverting for now

cmd/pluginator/go.mod

@@ -6,8 +6,6 @@ require (
 	github.com/rakyll/statik v0.1.7
 	github.com/spf13/cobra v1.2.1
 	github.com/stretchr/testify v1.7.0
-	sigs.k8s.io/kustomize/api v0.11.3
+	sigs.k8s.io/kustomize/api v0.11.4
 	sigs.k8s.io/kustomize/kyaml v0.13.6
 )
-
-replace sigs.k8s.io/kustomize/api => ../../api

cmd/pluginator/go.sum

@@ -645,6 +645,8 @@ 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.4 h1:/0Mr3kfBBNcNPOW5Qwk/3eb8zkswCwnqQxxKtmrTkRo=
+sigs.k8s.io/kustomize/api v0.11.4/go.mod h1:k+8RsqYbgpkIrJ4p9jcdPqe8DprLxFUUO0yNOq8C+xI=
 sigs.k8s.io/kustomize/kyaml v0.13.6 h1:eF+wsn4J7GOAXlvajv6OknSunxpcOBQQqsnPxObtkGs=
 sigs.k8s.io/kustomize/kyaml v0.13.6/go.mod h1:yHP031rn1QX1lr/Xd934Ri/xdVNG8BE2ECa78Ht/kEg=
 sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=

kustomize/go.mod

@@ -8,10 +8,8 @@ require (
 	github.com/spf13/cobra v1.4.0
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.7.0
-	sigs.k8s.io/kustomize/api v0.11.3
+	sigs.k8s.io/kustomize/api v0.11.4
 	sigs.k8s.io/kustomize/cmd/config v0.10.6
 	sigs.k8s.io/kustomize/kyaml v0.13.6
 	sigs.k8s.io/yaml v1.2.0
 )
-
-replace sigs.k8s.io/kustomize/api => ../api

kustomize/go.sum

@@ -657,6 +657,8 @@ 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.4 h1:/0Mr3kfBBNcNPOW5Qwk/3eb8zkswCwnqQxxKtmrTkRo=
+sigs.k8s.io/kustomize/api v0.11.4/go.mod h1:k+8RsqYbgpkIrJ4p9jcdPqe8DprLxFUUO0yNOq8C+xI=
 sigs.k8s.io/kustomize/cmd/config v0.10.6 h1:Qjs7z/Q1NrVmW86tavmhM7wZtgWJ7aitLMARlUKrj98=
 sigs.k8s.io/kustomize/cmd/config v0.10.6/go.mod h1:/S4A4nUANUa4bZJ/Edt7ZQTyKOY9WCER0uBS1SW2Rco=
 sigs.k8s.io/kustomize/kyaml v0.13.6 h1:eF+wsn4J7GOAXlvajv6OknSunxpcOBQQqsnPxObtkGs=

releasing/cloudbuild.yaml

@@ -37,14 +37,6 @@ steps:
   - checkout
   - $TAG_NAME
 
-# Copy a newer version of Go into the goreleaser workspace.
-# Use the same source image as the builder in kustomize.Dockerfile
-- name: golang:alpine
-  entrypoint: /bin/sh
-  args:
-  - '-c'
-  - 'mkdir -p /workspace/bin && cp $(go env GOROOT)/bin/go /workspace/bin'
-
 # Run goreleaser indirectly via a shell script
 # to configure it properly.
 - name: goreleaser/goreleaser:v0.179.0
@@ -52,8 +44,6 @@ steps:
   entrypoint: /bin/sh
   dir: myClone
   secretEnv: ['GITHUB_TOKEN']
-  env:
-  - 'GO_BINARY_PATH=/workspace/bin/go'
   args:
   - releasing/cloudbuild.sh
   - $TAG_NAME

releasing/compile-changelog.sh

@@ -29,7 +29,8 @@ fullTag=$2
 changeLogFile="${3:-}"
 
 # Find previous tag that matches the tags module
-prevTag=$(git tag -l "$module*" --sort=-version:refname --no-contains="$fullTag" | head -n 1)
+allTags=$(git tag -l "$module*" --sort=-version:refname --no-contains="$fullTag")
+prevTag=$(echo "$allTags" | head -n 1)
 echo "Compiling $module changes from $prevTag to $fullTag"
 
 commits=( $(git log "$prevTag".."$fullTag" \