Skip to content

Commit ddb0309

Browse files
author
Phillip Wittrock
authored
Merge pull request #136 from droot/use-dep
Use "dep" to import dependencies for generated project
2 parents 8eeb562 + 7b34aa3 commit ddb0309

File tree

6 files changed

+303
-158
lines changed

6 files changed

+303
-158
lines changed

‎cmd/kubebuilder/create/resource/run.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,13 @@ import (
2121
"log"
2222
"os"
2323

24+
"strings"
25+
2426
createutil "github.com/kubernetes-sigs/kubebuilder/cmd/kubebuilder/create/util"
2527
generatecmd "github.com/kubernetes-sigs/kubebuilder/cmd/kubebuilder/generate"
2628
"github.com/kubernetes-sigs/kubebuilder/cmd/kubebuilder/util"
2729
"github.com/markbates/inflect"
2830
"github.com/spf13/cobra"
29-
"strings"
3031
)
3132

3233
var nonNamespacedKind bool

‎cmd/kubebuilder/initproject/dep_manifest.go

Lines changed: 198 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,198 @@
1+
/*
2+
Copyright 2017 The Kubernetes Authors.
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
*/
16+
17+
package initproject
18+
19+
// template for dep's manifest file (Gopkg.toml). This is generated using
20+
// scripts/generate_dep_manifest.sh scripts.
21+
const depManifestOverride = `
22+
[[override]]
23+
name="cloud.google.com/go"
24+
version="v0.21.0"
25+
26+
[[override]]
27+
name="github.com/PuerkitoBio/purell"
28+
version="v1.1.0"
29+
30+
[[override]]
31+
name="github.com/PuerkitoBio/urlesc"
32+
revision="de5bf2ad457846296e2031421a34e2568e304e35"
33+
34+
[[override]]
35+
name="github.com/davecgh/go-spew"
36+
version="v1.1.0"
37+
38+
[[override]]
39+
name="github.com/emicklei/go-restful"
40+
version="v2.7.0"
41+
42+
[[override]]
43+
name="github.com/ghodss/yaml"
44+
version="v1.0.0"
45+
46+
[[override]]
47+
name="github.com/go-openapi/jsonpointer"
48+
revision="3a0015ad55fa9873f41605d3e8f28cd279c32ab2"
49+
50+
[[override]]
51+
name="github.com/go-openapi/jsonreference"
52+
revision="3fb327e6747da3043567ee86abd02bb6376b6be2"
53+
54+
[[override]]
55+
name="github.com/go-openapi/spec"
56+
revision="bcff419492eeeb01f76e77d2ebc714dc97b607f5"
57+
58+
[[override]]
59+
name="github.com/go-openapi/swag"
60+
revision="811b1089cde9dad18d4d0c2d09fbdbf28dbd27a5"
61+
62+
[[override]]
63+
name="github.com/gogo/protobuf"
64+
version="v1.0.0"
65+
66+
[[override]]
67+
name="github.com/golang/glog"
68+
revision="23def4e6c14b4da8ac2ed8007337bc5eb5007998"
69+
70+
[[override]]
71+
name="github.com/golang/groupcache"
72+
revision="66deaeb636dff1ac7d938ce666d090556056a4b0"
73+
74+
[[override]]
75+
name="github.com/golang/protobuf"
76+
version="v1.1.0"
77+
78+
[[override]]
79+
name="github.com/google/gofuzz"
80+
revision="24818f796faf91cd76ec7bddd72458fbced7a6c1"
81+
82+
[[override]]
83+
name="github.com/googleapis/gnostic"
84+
version="v0.1.0"
85+
86+
[[override]]
87+
name="github.com/hashicorp/golang-lru"
88+
revision="0fb14efe8c47ae851c0034ed7a448854d3d34cf3"
89+
90+
[[override]]
91+
name="github.com/howeyc/gopass"
92+
revision="bf9dde6d0d2c004a008c27aaee91170c786f6db8"
93+
94+
[[override]]
95+
name="github.com/imdario/mergo"
96+
version="v0.3.4"
97+
98+
[[override]]
99+
name="github.com/json-iterator/go"
100+
version="1.1.3"
101+
102+
[[override]]
103+
name="github.com/mailru/easyjson"
104+
revision="8b799c424f57fa123fc63a99d6383bc6e4c02578"
105+
106+
[[override]]
107+
name="github.com/modern-go/concurrent"
108+
version="1.0.3"
109+
110+
[[override]]
111+
name="github.com/modern-go/reflect2"
112+
version="1.0.0"
113+
114+
[[override]]
115+
name="github.com/onsi/ginkgo"
116+
version="v1.4.0"
117+
118+
[[override]]
119+
name="github.com/onsi/gomega"
120+
version="v1.3.0"
121+
122+
[[override]]
123+
name="github.com/spf13/pflag"
124+
version="v1.0.1"
125+
126+
[[override]]
127+
name="golang.org/x/crypto"
128+
revision="4ec37c66abab2c7e02ae775328b2ff001c3f025a"
129+
130+
[[override]]
131+
name="golang.org/x/net"
132+
revision="640f4622ab692b87c2f3a94265e6f579fe38263d"
133+
134+
[[override]]
135+
name="golang.org/x/oauth2"
136+
revision="cdc340f7c179dbbfa4afd43b7614e8fcadde4269"
137+
138+
[[override]]
139+
name="golang.org/x/sys"
140+
revision="7db1c3b1a98089d0071c84f646ff5c96aad43682"
141+
142+
[[override]]
143+
name="golang.org/x/text"
144+
version="v0.3.0"
145+
146+
[[override]]
147+
name="golang.org/x/time"
148+
revision="fbb02b2291d28baffd63558aa44b4b56f178d650"
149+
150+
[[override]]
151+
name="google.golang.org/appengine"
152+
version="v1.0.0"
153+
154+
[[override]]
155+
name="gopkg.in/inf.v0"
156+
version="v0.9.1"
157+
158+
[[override]]
159+
name="gopkg.in/yaml.v2"
160+
version="v2.2.1"
161+
162+
[[override]]
163+
name="k8s.io/api"
164+
version="kubernetes-1.10.0"
165+
166+
[[override]]
167+
name="k8s.io/apiextensions-apiserver"
168+
version="kubernetes-1.10.1"
169+
170+
[[override]]
171+
name="k8s.io/apimachinery"
172+
version="kubernetes-1.10.0"
173+
174+
[[override]]
175+
name="k8s.io/client-go"
176+
version="kubernetes-1.10.1"
177+
178+
[[override]]
179+
name="k8s.io/kube-aggregator"
180+
version="kubernetes-1.10.1"
181+
182+
[[override]]
183+
name="k8s.io/kube-openapi"
184+
revision="f08db293d3ef80052d6513ece19792642a289fea"
185+
186+
[[override]]
187+
name="sigs.k8s.io/testing_frameworks"
188+
revision="f53464b8b84b4507805a0b033a8377b225163fea"
189+
190+
[[override]]
191+
name = "github.com/kubernetes-sigs/kubebuilder"
192+
{{ if eq .Version "unknown" -}}
193+
branch="master"
194+
{{ else -}}
195+
version="{{.Version}}"
196+
{{ end }}
197+
198+
`

‎cmd/kubebuilder/initproject/init.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,16 @@ func runInitRepo(cmd *cobra.Command, args []string) {
5555
if versionCmp(version, "go1.10") < 0 {
5656
log.Fatalf("The go version is %v, must be 1.10+", version)
5757
}
58+
if !depExists() {
59+
log.Fatalf("Dep is not installed. Follow steps at: https://golang.github.io/dep/docs/installation.html")
60+
}
5861

5962
if len(domain) == 0 {
6063
log.Fatal("Must specify --domain")
6164
}
6265
cr := util.GetCopyright(copyright)
6366

6467
fmt.Printf("Initializing project structure...\n")
65-
RunVendorInstall(nil, nil)
6668
if bazel {
6769
createBazelWorkspace()
6870
}
@@ -87,6 +89,7 @@ func runInitRepo(cmd *cobra.Command, args []string) {
8789
doInject(cr)
8890
doArgs(cr)
8991
//os.MkdirAll("bin", 0700)
92+
RunVendorInstall(nil, nil)
9093

9194
createBoilerplate()
9295
fmt.Printf("Next: Define a resource with:\n" +

0 commit comments

Comments
 (0)