Skip to content

Commit 1e16079

Browse files
authored
Add kustomize to go tools (#531)
* Add kustomize to go tools such that we all (developers and pipelines) use the same kustomize version. Executed go get sigs.k8s.io/kustomize/kustomize/[email protected] Note that v3.9.0 suffers the bug in kubernetes-sigs/kustomize#3340 Previously our pipelines used KustomizeVersion:v2.0.4-kubebuilder-special-edition. * Remove kustomize installation from GitHub actions since make install-tools will install kustomize
1 parent a637934 commit 1e16079

File tree

4 files changed

+196
-7
lines changed

4 files changed

+196
-7
lines changed

.github/workflows/pr.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ jobs:
2929
uses: actions/checkout@v2
3030
- name: Dry run examples
3131
run: |
32-
curl -s "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" | bash
3332
export GOPATH=$HOME/go
3433
export PATH=$PATH:$GOPATH/bin
3534
make install-tools
@@ -54,7 +53,6 @@ jobs:
5453
env:
5554
K8S_VERSION: ${{ matrix.k8s }}
5655
run: |
57-
curl -s "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" | bash
5856
export GOPATH=$HOME/go
5957
export PATH=$PATH:$GOPATH/bin
6058
make install-tools

go.mod

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ require (
1313
github.com/go-logr/zapr v0.1.1 // indirect
1414
github.com/go-stomp/stomp v2.0.8+incompatible
1515
github.com/gophercloud/gophercloud v0.5.0 // indirect
16-
github.com/mattn/go-colorable v0.1.4 // indirect
1716
github.com/michaelklishin/rabbit-hole/v2 v2.6.0
1817
github.com/onsi/ginkgo v1.14.2
1918
github.com/onsi/gomega v1.10.4
@@ -24,13 +23,13 @@ require (
2423
github.com/streadway/amqp v0.0.0-20200108173154-1c71cc93ed71
2524
go.uber.org/multierr v1.2.0 // indirect
2625
golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb
27-
golang.org/x/tools v0.0.0-20200616195046-dc31b401abb5
2826
gopkg.in/ini.v1 v1.62.0
29-
k8s.io/api v0.18.6
30-
k8s.io/apimachinery v0.18.8
31-
k8s.io/client-go v0.18.6
27+
k8s.io/api v0.18.10
28+
k8s.io/apimachinery v0.18.10
29+
k8s.io/client-go v0.18.10
3230
k8s.io/utils v0.0.0-20200603063816-c1c6865ac451
3331
sigs.k8s.io/controller-runtime v0.6.4
3432
sigs.k8s.io/controller-tools v0.4.1
3533
sigs.k8s.io/kind v0.9.0
34+
sigs.k8s.io/kustomize/kustomize/v3 v3.8.8
3635
)

0 commit comments

Comments
 (0)