Skip to content

Commit 2c96359

Browse files
monopolemonopole
authored
Merge pull request #1779 from monopole/pinAllAtApiV020
Pin kustomize and the plugins to kust Api v0.2.0
2 parents bae6418 + 2dd148a commit 2c96359

File tree

55 files changed

+307
-183
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+307
-183
lines changed

‎hack/crawl/go.mod‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ require (
1414
github.com/rs/cors v1.7.0
1515
gopkg.in/inf.v0 v0.9.1 // indirect
1616
k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a // indirect
17-
sigs.k8s.io/kustomize/api v0.1.1
17+
sigs.k8s.io/kustomize/api v0.2.0
1818
sigs.k8s.io/yaml v1.1.0
1919
)
20-
21-
replace sigs.k8s.io/kustomize/api v0.0.0 => ../../api

‎hack/pinUnpinPluginApiDep.sh‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
#!/usr/bin/env bash
2+
# Copyright 2019 The Kubernetes Authors.
3+
# SPDX-License-Identifier: Apache-2.0
4+
5+
# This script unpins or repins the Go kustomize API dependence
6+
# for all the plugins in the repo.
7+
8+
# Run from repo root, e.g.
9+
#
10+
# ./hack/pinUnpinPluginApiDep.sh pin v0.2.0
11+
#
12+
# or
13+
#
14+
# ./hack/pinUnpinPluginApiDep.sh unPin
15+
#
16+
17+
set -o errexit
18+
set -o nounset
19+
set -o pipefail
20+
21+
operation=$1
22+
version=$2
23+
24+
if [[ ("$operation" != "pin") && ("$operation" != "unPin") ]]; then
25+
echo "unknown operation $operation"
26+
exit 1
27+
fi
28+
29+
function doUnPin {
30+
oldV=$(grep -m 1 sigs.k8s.io/kustomize/api go.mod | awk '{print $2}')
31+
go mod edit -replace=sigs.k8s.io/kustomize/api@${oldV}=$1
32+
go mod tidy
33+
}
34+
35+
function doPin {
36+
oldV=$(grep -m 1 sigs.k8s.io/kustomize/api go.mod | awk '{print $2}')
37+
go mod edit -dropreplace=sigs.k8s.io/kustomize/api@${oldV}
38+
go mod edit -dropreplace=sigs.k8s.io/kustomize/[email protected]
39+
go mod edit -require=sigs.k8s.io/kustomize/api@$1
40+
go mod tidy
41+
}
42+
43+
function forEachGoMod {
44+
for goMod in $(find $2 -name 'go.mod'); do
45+
d=$(dirname "${goMod}")
46+
echo $d
47+
(cd $d; $1 $3)
48+
done
49+
}
50+
51+
function unPin {
52+
forEachGoMod doUnPin ./plugin/builtin ../../../api
53+
forEachGoMod doUnPin ./plugin/someteam.example.com ../../../../api
54+
}
55+
56+
function pin {
57+
forEachGoMod doPin ./plugin/builtin $version
58+
forEachGoMod doPin ./plugin/someteam.example.com $version
59+
}
60+
61+
$operation

‎hack/unpinRepinPluginApiDep.sh‎

Lines changed: 0 additions & 53 deletions
This file was deleted.

‎kustomize/go.mod‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ require (
66
github.com/pkg/errors v0.8.1
77
github.com/spf13/cobra v0.0.5
88
github.com/spf13/pflag v1.0.5
9-
sigs.k8s.io/kustomize/api v0.1.1
9+
sigs.k8s.io/kustomize/api v0.2.0
1010
sigs.k8s.io/yaml v1.1.0
1111
)
12-
13-
replace sigs.k8s.io/kustomize/api v0.1.1 => ../api

‎kustomize/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -384,8 +384,8 @@ k8s.io/utils v0.0.0-20191030222137-2b95a09bc58d/go.mod h1:sZAwmy6armz5eXlNoLmJcl
384384
mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed/go.mod h1:Xkxe497xwlCKkIaQYRfC7CSLworTXY9RMqwhhCm+8Nc=
385385
mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod h1:2odslEg/xrtNQqCYg2/jCoyKnw3vv5biOc3JnIcYfL4=
386386
mvdan.cc/unparam v0.0.0-20190720180237-d51796306d8f/go.mod h1:4G1h5nDURzA3bwVMZIVpwbkw+04kSxk3rAtzlimaUJw=
387-
sigs.k8s.io/kustomize/pseudo/k8s v0.0.0-20191108212413-1f86a0ca5d6c h1:t7fk+ljA3Ru4pro+/0RuOAZcODDhByL1fvIdyHLhjTY=
388-
sigs.k8s.io/kustomize/pseudo/k8s v0.0.0-20191108212413-1f86a0ca5d6c/go.mod h1:bl/gVJgYYhJZCZdYU2BfnaKYAlqFkgbJEkpl302jEss=
387+
sigs.k8s.io/kustomize/api v0.2.0 h1:e++6JpysnnlUbHmFrv6jvfF5rFlgQ103bS1DO7r5bWA=
388+
sigs.k8s.io/kustomize/api v0.2.0/go.mod h1:zVtMg179jW1gr74jo9fc2Ac9dLYLTZZThc3DDb9lDW4=
389389
sigs.k8s.io/kustomize/pseudo/k8s v0.1.0 h1:otg4dLFc03c3gzl+2CV8GPGcd1kk8wjXwD+UhhcCn5I=
390390
sigs.k8s.io/kustomize/pseudo/k8s v0.1.0/go.mod h1:bl/gVJgYYhJZCZdYU2BfnaKYAlqFkgbJEkpl302jEss=
391391
sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=

‎plugin/builtin/annotationstransformer/go.mod‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ module sigs.k8s.io/kustomize/plugin/builtin/annotationstransformer
33
go 1.13
44

55
require (
6-
sigs.k8s.io/kustomize/api v0.1.1
6+
sigs.k8s.io/kustomize/api v0.2.0
77
sigs.k8s.io/yaml v1.1.0
88
)
9-
10-
replace sigs.k8s.io/kustomize/api v0.1.1 => ../../../api

‎plugin/builtin/annotationstransformer/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -382,8 +382,8 @@ k8s.io/utils v0.0.0-20191030222137-2b95a09bc58d/go.mod h1:sZAwmy6armz5eXlNoLmJcl
382382
mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed/go.mod h1:Xkxe497xwlCKkIaQYRfC7CSLworTXY9RMqwhhCm+8Nc=
383383
mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod h1:2odslEg/xrtNQqCYg2/jCoyKnw3vv5biOc3JnIcYfL4=
384384
mvdan.cc/unparam v0.0.0-20190720180237-d51796306d8f/go.mod h1:4G1h5nDURzA3bwVMZIVpwbkw+04kSxk3rAtzlimaUJw=
385-
sigs.k8s.io/kustomize/pseudo/k8s v0.0.0-20191108212413-1f86a0ca5d6c h1:t7fk+ljA3Ru4pro+/0RuOAZcODDhByL1fvIdyHLhjTY=
386-
sigs.k8s.io/kustomize/pseudo/k8s v0.0.0-20191108212413-1f86a0ca5d6c/go.mod h1:bl/gVJgYYhJZCZdYU2BfnaKYAlqFkgbJEkpl302jEss=
385+
sigs.k8s.io/kustomize/api v0.2.0 h1:e++6JpysnnlUbHmFrv6jvfF5rFlgQ103bS1DO7r5bWA=
386+
sigs.k8s.io/kustomize/api v0.2.0/go.mod h1:zVtMg179jW1gr74jo9fc2Ac9dLYLTZZThc3DDb9lDW4=
387387
sigs.k8s.io/kustomize/pseudo/k8s v0.1.0 h1:otg4dLFc03c3gzl+2CV8GPGcd1kk8wjXwD+UhhcCn5I=
388388
sigs.k8s.io/kustomize/pseudo/k8s v0.1.0/go.mod h1:bl/gVJgYYhJZCZdYU2BfnaKYAlqFkgbJEkpl302jEss=
389389
sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=

‎plugin/builtin/configmapgenerator/go.mod‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ module sigs.k8s.io/kustomize/plugin/builtin/configmapgenerator
33
go 1.13
44

55
require (
6-
sigs.k8s.io/kustomize/api v0.1.1
6+
sigs.k8s.io/kustomize/api v0.2.0
77
sigs.k8s.io/yaml v1.1.0
88
)
9-
10-
replace sigs.k8s.io/kustomize/api v0.1.1 => ../../../api

‎plugin/builtin/configmapgenerator/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -382,8 +382,8 @@ k8s.io/utils v0.0.0-20191030222137-2b95a09bc58d/go.mod h1:sZAwmy6armz5eXlNoLmJcl
382382
mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed/go.mod h1:Xkxe497xwlCKkIaQYRfC7CSLworTXY9RMqwhhCm+8Nc=
383383
mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod h1:2odslEg/xrtNQqCYg2/jCoyKnw3vv5biOc3JnIcYfL4=
384384
mvdan.cc/unparam v0.0.0-20190720180237-d51796306d8f/go.mod h1:4G1h5nDURzA3bwVMZIVpwbkw+04kSxk3rAtzlimaUJw=
385-
sigs.k8s.io/kustomize/pseudo/k8s v0.0.0-20191108212413-1f86a0ca5d6c h1:t7fk+ljA3Ru4pro+/0RuOAZcODDhByL1fvIdyHLhjTY=
386-
sigs.k8s.io/kustomize/pseudo/k8s v0.0.0-20191108212413-1f86a0ca5d6c/go.mod h1:bl/gVJgYYhJZCZdYU2BfnaKYAlqFkgbJEkpl302jEss=
385+
sigs.k8s.io/kustomize/api v0.2.0 h1:e++6JpysnnlUbHmFrv6jvfF5rFlgQ103bS1DO7r5bWA=
386+
sigs.k8s.io/kustomize/api v0.2.0/go.mod h1:zVtMg179jW1gr74jo9fc2Ac9dLYLTZZThc3DDb9lDW4=
387387
sigs.k8s.io/kustomize/pseudo/k8s v0.1.0 h1:otg4dLFc03c3gzl+2CV8GPGcd1kk8wjXwD+UhhcCn5I=
388388
sigs.k8s.io/kustomize/pseudo/k8s v0.1.0/go.mod h1:bl/gVJgYYhJZCZdYU2BfnaKYAlqFkgbJEkpl302jEss=
389389
sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=

‎plugin/builtin/hashtransformer/go.mod‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,4 @@ module sigs.k8s.io/kustomize/plugin/builtin/hashtransformer
22

33
go 1.13
44

5-
require sigs.k8s.io/kustomize/api v0.1.1
6-
7-
replace sigs.k8s.io/kustomize/api v0.1.1 => ../../../api
5+
require sigs.k8s.io/kustomize/api v0.2.0

0 commit comments

Comments
 (0)