Skip to content
This repository has been archived by the owner on Oct 10, 2023. It is now read-only.

Commit

Permalink
Move apis/config/ClientConfig and apis/cli/Catalog API to `cli/ru…
Browse files Browse the repository at this point in the history
…ntime/apis` module (#3375)

* Move `apis/config/ClientConfig`, `apis/cli/Catalog`

* Remove `apis/config/ClientConfig` and `apis/cli/Catalog` apis from apis/

* Update references for apis/config/v1alpha1

* Update references for apis/cli/v1alpha1

* Update go.mod and go.sum files

* Fix imports

* Update Makefile

* Update plugin template files

* Update go.mod

Signed-off-by: Anuj Chaudhari <anujc@vmware.com>
  • Loading branch information
anujc25 authored Sep 18, 2022
1 parent bb14b4c commit 8a526ce
Showing 148 changed files with 2,632 additions and 3,365 deletions.
2 changes: 2 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -153,6 +153,7 @@ manifests: ## Generate manifests e.g. CRD, RBAC etc.
$(MAKE) generate-manifests CONTROLLER_GEN_SRC=./apis/...
$(MAKE) -C apis/cli generate-manifests CONTROLLER_GEN_SRC=./...
$(MAKE) -C apis/config generate-manifests CONTROLLER_GEN_SRC=./...
$(MAKE) -C cli/runtime generate-manifests

generate-go: $(COUNTERFEITER) ## Generate code via go generate.
PATH=$(abspath hack/tools/bin):"$(PATH)" go generate ./...
@@ -161,6 +162,7 @@ generate: tools ## Generate code (legacy)
$(MAKE) generate-controller-code
$(MAKE) -C apis/cli generate-controller-code
$(MAKE) -C apis/config generate-controller-code
$(MAKE) -C cli/runtime generate-controller-code

## --------------------------------------
##@ Version
33 changes: 1 addition & 32 deletions apis/cli/go.mod
Original file line number Diff line number Diff line change
@@ -5,56 +5,25 @@ go 1.17
replace github.com/vmware-tanzu/tanzu-framework/apis/config => ../../apis/config

require (
github.com/vmware-tanzu/tanzu-framework/apis/config v0.0.0-00010101000000-000000000000
k8s.io/apimachinery v0.23.5
sigs.k8s.io/controller-runtime v0.11.2
)

require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.1.1 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
github.com/fsnotify/fsnotify v1.5.1 // indirect
github.com/go-logr/logr v1.2.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/go-cmp v0.5.8 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/google/uuid v1.1.2 // indirect
github.com/googleapis/gnostic v0.5.5 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_golang v1.11.0 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.28.0 // indirect
github.com/prometheus/procfs v0.6.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/stretchr/testify v1.8.0 // indirect
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.27.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/api v0.23.5 // indirect
k8s.io/apiextensions-apiserver v0.23.5 // indirect
k8s.io/client-go v0.23.5 // indirect
k8s.io/component-base v0.23.5 // indirect
k8s.io/klog/v2 v2.60.1 // indirect
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)
693 changes: 3 additions & 690 deletions apis/cli/go.sum

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions apis/cli/v1alpha1/groupversion_info.go
Original file line number Diff line number Diff line change
@@ -21,9 +21,6 @@ var (
// AddToScheme adds the types in this group-version to the given scheme.
AddToScheme = SchemeBuilder.AddToScheme

// GroupVersionKindCatalog has information about group, version and kind of Catalog object.
GroupVersionKindCatalog = GroupVersion.WithKind("Catalog")

// GroupVersionKindCLIPlugin has information about group, version and kind of CLIPlugin object.
GroupVersionKindCLIPlugin = GroupVersion.WithKind("CLIPlugin")
)
199 changes: 0 additions & 199 deletions apis/cli/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions apis/config/go.mod
Original file line number Diff line number Diff line change
@@ -4,7 +4,6 @@ go 1.17

require (
github.com/google/go-cmp v0.5.8
github.com/stretchr/testify v1.8.0
k8s.io/api v0.23.5
k8s.io/apimachinery v0.23.5
k8s.io/client-go v0.23.5
@@ -30,12 +29,12 @@ require (
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.11.0 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.28.0 // indirect
github.com/prometheus/procfs v0.6.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/stretchr/testify v1.8.0 // indirect
golang.org/x/net v0.0.0-20211209124913-491a49abca63 // indirect
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
golang.org/x/sys v0.0.0-20211029165221-6e7872819dc8 // indirect
3 changes: 0 additions & 3 deletions apis/config/v1alpha1/groupversion_info.go
Original file line number Diff line number Diff line change
@@ -15,9 +15,6 @@ var (
// GroupVersion is group version used to register these objects
GroupVersion = schema.GroupVersion{Group: "config.tanzu.vmware.com", Version: "v1alpha1"}

// GroupVersionKind has information about group, version and kind of this object.
GroupVersionKind = GroupVersion.WithKind("ClientConfig")

// SchemeBuilder is used to add go types to the GroupVersionKind scheme
SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}

Loading

0 comments on commit 8a526ce

Please # to comment.