Skip to content

Commit

Permalink
Regenerating
Browse files Browse the repository at this point in the history
  • Loading branch information
marccampbell committed Apr 4, 2020
1 parent 44fd495 commit e6aff0e
Show file tree
Hide file tree
Showing 12 changed files with 203 additions and 25 deletions.
16 changes: 12 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,16 @@ deploy: manifests

.PHONY: manifests
manifests: controller-gen
$(CONTROLLER_GEN) rbac:roleName=manager-role webhook crd:crdVersions=v1beta1 output:crd:artifacts:config=config/crds/v1beta1 paths="./..."
$(CONTROLLER_GEN) rbac:roleName=manager-role webhook crd:crdVersions=v1 output:crd:artifacts:config=config/crds/v1 paths="./..."
$(CONTROLLER_GEN) \
rbac:roleName=manager-role webhook \
crd:crdVersions=v1beta1 \
output:crd:artifacts:config=config/crds/v1beta1 \
paths="./..."
$(CONTROLLER_GEN) \
rbac:roleName=manager-role webhook \
crd:crdVersions=v1 \
output:crd:artifacts:config=config/crds/v1 \
paths="./..."
go run ./generate/...

.PHONY: fmt
Expand All @@ -86,7 +94,7 @@ vet:
.PHONY: generate
generate: controller-gen client-gen
$(CONTROLLER_GEN) object:headerFile=./hack/boilerplate.go.txt paths=./pkg/apis/...
$(CLIENT_GEN) -\
$(CLIENT_GEN) \
-output-package=github.com/schemahero/schemahero/pkg/client \
--clientset-name schemaheroclientset \
--input-base github.com/schemahero/schemahero/pkg/apis \
Expand Down Expand Up @@ -127,7 +135,7 @@ kotsimages: bin/schemahero bin/kubectl-schemahero manager
.PHONY: contoller-gen
controller-gen:
ifeq (, $(shell which controller-gen))
go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.2.4
go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.2.8
CONTROLLER_GEN=$(shell go env GOPATH)/bin/controller-gen
else
CONTROLLER_GEN=$(shell which controller-gen)
Expand Down
2 changes: 1 addition & 1 deletion config/crds/v1/databases.schemahero.io_databases.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.2.4
controller-gen.kubebuilder.io/version: v0.2.8
creationTimestamp: null
name: databases.databases.schemahero.io
spec:
Expand Down
2 changes: 1 addition & 1 deletion config/crds/v1/schemas.schemahero.io_migrations.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.2.4
controller-gen.kubebuilder.io/version: v0.2.8
creationTimestamp: null
name: migrations.schemas.schemahero.io
spec:
Expand Down
2 changes: 1 addition & 1 deletion config/crds/v1/schemas.schemahero.io_tables.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.2.4
controller-gen.kubebuilder.io/version: v0.2.8
creationTimestamp: null
name: tables.schemas.schemahero.io
spec:
Expand Down
2 changes: 1 addition & 1 deletion config/crds/v1beta1/databases.schemahero.io_databases.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.2.4
controller-gen.kubebuilder.io/version: v0.2.8
creationTimestamp: null
name: databases.databases.schemahero.io
spec:
Expand Down
2 changes: 1 addition & 1 deletion config/crds/v1beta1/schemas.schemahero.io_migrations.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.2.4
controller-gen.kubebuilder.io/version: v0.2.8
creationTimestamp: null
name: migrations.schemas.schemahero.io
spec:
Expand Down
2 changes: 1 addition & 1 deletion config/crds/v1beta1/schemas.schemahero.io_tables.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.2.4
controller-gen.kubebuilder.io/version: v0.2.8
creationTimestamp: null
name: tables.schemas.schemahero.io
spec:
Expand Down
19 changes: 10 additions & 9 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@ module github.com/schemahero/schemahero
go 1.12

require (
github.com/Azure/go-autorest v11.1.2+incompatible // indirect
github.com/blang/semver v3.5.1+incompatible
github.com/go-sql-driver/mysql v1.4.1
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
github.com/hashicorp/golang-lru v0.5.3 // indirect
github.com/lib/pq v1.1.1
github.com/natefinch/lumberjack v2.0.0+incompatible // indirect
github.com/onsi/gomega v1.7.0
github.com/pkg/errors v0.8.1
github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35 // indirect
Expand All @@ -18,20 +20,19 @@ require (
github.com/ventu-io/go-shortid v0.0.0-20171029131806-771a37caa5cf
github.com/xo/dburl v0.0.0-20190203050942-98997a05b24f
go.uber.org/zap v1.10.0
golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586
golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975
golang.org/x/net v0.0.0-20191004110552-13f9640d40b9
golang.org/x/tools v0.0.0-20190920225731-5eefd052ad72 // indirect
gopkg.in/square/go-jose.v2 v2.3.0 // indirect
gopkg.in/src-d/go-git.v4 v4.13.1
gopkg.in/yaml.v2 v2.2.4
k8s.io/api v0.17.0
k8s.io/apiextensions-apiserver v0.0.0-20190918161926-8f644eb6e783
k8s.io/apimachinery v0.17.0
gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0 // indirect
gopkg.in/yaml.v2 v2.2.8
k8s.io/api v0.18.0
k8s.io/apiextensions-apiserver v0.18.0
k8s.io/apimachinery v0.18.0
k8s.io/cli-runtime v0.17.0
k8s.io/client-go v0.17.0
k8s.io/code-generator v0.16.5-beta.1 // indirect
k8s.io/client-go v0.18.0
sigs.k8s.io/controller-runtime v0.4.0
sigs.k8s.io/controller-tools v0.2.4 // indirect
sigs.k8s.io/controller-tools v0.2.8 // indirect
)

replace github.com/appscode/jsonpatch => github.com/gomodules/jsonpatch v2.0.1+incompatible

0 comments on commit e6aff0e

Please sign in to comment.