File tree Expand file tree Collapse file tree 3 files changed +170
-39
lines changed Expand file tree Collapse file tree 3 files changed +170
-39
lines changed Original file line number Diff line number Diff line change 1
- TAG ?= $(shell gitmeta image tag)
1
+ TAG ?= $(shell git describe -- tag --always --dirty )
2
2
REPO ?= autonomy/cluster-api-talos-controller
3
3
4
4
63
63
# download controller-gen if necessary
64
64
controller-gen :
65
65
ifeq (, $(shell which controller-gen) )
66
- go get sigs.k8s.io/controller-tools/cmd/
[email protected] .
0
66
+ go get sigs.k8s.io/controller-tools/cmd/
[email protected] .
4
67
67
CONTROLLER_GEN =$(GOPATH ) /bin/controller-gen
68
68
else
69
69
CONTROLLER_GEN =$(shell which controller-gen)
Original file line number Diff line number Diff line change @@ -4,20 +4,13 @@ go 1.12
4
4
5
5
require (
6
6
github.com/go-logr/logr v0.1.0
7
- github.com/onsi/ginkgo v1.8.0
8
- github.com/onsi/gomega v1.5.0
9
- github.com/talos-systems/talos v0.3.0-alpha.10.0.20191209205235-3a93e65b5480
10
- gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
11
- gopkg.in/yaml.v2 v2.2.5
12
- k8s.io/api v0.0.0-20191109101513-0171b7c15da1
13
- k8s.io/apimachinery v0.0.0-20191111054156-6eb29fdf75dc
14
- k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
15
- sigs.k8s.io/cluster-api v0.2.5
16
- sigs.k8s.io/controller-runtime v0.3.0
17
- )
18
-
19
- replace (
20
- k8s.io/api => k8s.io/api v0.0.0-20190704095032-f4ca3d3bdf1d
21
- k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190817020851-f2f3a405f61d
22
- k8s.io/client-go => k8s.io/client-go v0.0.0-20190918200256-06eb1244587a
7
+ github.com/onsi/ginkgo v1.10.3
8
+ github.com/onsi/gomega v1.7.1
9
+ github.com/talos-systems/talos v0.3.1
10
+ gopkg.in/yaml.v2 v2.2.7
11
+ k8s.io/api v0.17.0
12
+ k8s.io/apimachinery v0.17.0
13
+ k8s.io/client-go v0.17.0
14
+ sigs.k8s.io/cluster-api v0.2.9
15
+ sigs.k8s.io/controller-runtime v0.4.0
23
16
)
You can’t perform that action at this time.
0 commit comments