diff --git a/go.mod b/go.mod index 536f4792b..2ccdd3cf3 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/davecgh/go-spew v1.1.1 github.com/onsi/ginkgo v1.11.0 github.com/onsi/gomega v1.8.1 - github.com/open-cluster-management/api v0.0.0-20200702210332-e07f4fdaf68b + github.com/open-cluster-management/api v0.0.0-20200715201722-3c3c076bf062 github.com/openshift/build-machinery-go v0.0.0-20200424080330-082bf86082cc github.com/openshift/library-go v0.0.0-20200414135834-ccc4bb27d032 github.com/spf13/cobra v1.0.0 diff --git a/go.sum b/go.sum index 00c7ff3ed..5f5ae545e 100644 --- a/go.sum +++ b/go.sum @@ -302,8 +302,8 @@ github.com/onsi/gomega v1.7.0 h1:XPnZz8VVBHjVsy1vzJmRwIcSwiUO+JFfrv/xGiigmME= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.8.1 h1:C5Dqfs/LeauYDX0jJXIe2SWmwCbGzx9yF8C8xy3Lh34= github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= -github.com/open-cluster-management/api v0.0.0-20200702210332-e07f4fdaf68b h1:3f9t8fo9sD23hxvAhy/QQpH3Wdico/rzv310BhrcKzM= -github.com/open-cluster-management/api v0.0.0-20200702210332-e07f4fdaf68b/go.mod h1:+vUECYB7WkfCb52r0J7rxgD1mseSGAqGi8rTLLRcbgw= +github.com/open-cluster-management/api v0.0.0-20200715201722-3c3c076bf062 h1:sYKu/XTeGrYCjO7x6/r6CfM/R8/Lr2kX7IG1DOC+wW0= +github.com/open-cluster-management/api v0.0.0-20200715201722-3c3c076bf062/go.mod h1:+vUECYB7WkfCb52r0J7rxgD1mseSGAqGi8rTLLRcbgw= github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= github.com/opencontainers/runc v0.0.0-20191031171055-b133feaeeb2e/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= diff --git a/vendor/github.com/open-cluster-management/api/work/v1/0000_01_work.open-cluster-management.io_appliedmanifestworks.crd.yaml b/vendor/github.com/open-cluster-management/api/work/v1/0000_01_work.open-cluster-management.io_appliedmanifestworks.crd.yaml index 1193669f1..ce47cb420 100644 --- a/vendor/github.com/open-cluster-management/api/work/v1/0000_01_work.open-cluster-management.io_appliedmanifestworks.crd.yaml +++ b/vendor/github.com/open-cluster-management/api/work/v1/0000_01_work.open-cluster-management.io_appliedmanifestworks.crd.yaml @@ -21,6 +21,8 @@ spec: a manifestwork on a hub recording resources deployed in the managed cluster. When the agent is removed from managed cluster, cluster-admin on managed cluster can delete appliedmanifestwork to remove resources deployed by the agent. + The name of the appliedmanifestwork must be in the format of {hash of hub's + first kube-apiserver url}-{manifestwork name} type: object properties: apiVersion: @@ -39,10 +41,6 @@ spec: description: Spec represents the desired configuration of AppliedManifestWork type: object properties: - clusterNamee: - description: ClusterName represents the name of the cluster on hub where - the related manifestwork is placed. - type: string hubHash: description: HubHash represents the hash of the first hub kube apiserver to identify which hub this AppliedManifestWork links to. diff --git a/vendor/github.com/open-cluster-management/api/work/v1/types.go b/vendor/github.com/open-cluster-management/api/work/v1/types.go index d33fb0d7c..de22af61a 100644 --- a/vendor/github.com/open-cluster-management/api/work/v1/types.go +++ b/vendor/github.com/open-cluster-management/api/work/v1/types.go @@ -233,6 +233,8 @@ type ManifestWorkList struct { // deployed in the managed cluster. // When the agent is removed from managed cluster, cluster-admin on managed cluster // can delete appliedmanifestwork to remove resources deployed by the agent. +// The name of the appliedmanifestwork must be in the format of +// {hash of hub's first kube-apiserver url}-{manifestwork name} type AppliedManifestWork struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata,omitempty"` @@ -255,11 +257,6 @@ type AppliedManifestWorkSpec struct { // ManifestWorkName represents the name of the related manifestwork on hub. // +required ManifestWorkName string `json:"manifestWorkName"` - - // ClusterName represents the name of the cluster on hub where the related manifestwork - // is placed. - // +required - ClusterName string `json:"clusterNamee"` } // AppliedManifestWorkStatus represents the current status of AppliedManifestWork diff --git a/vendor/github.com/open-cluster-management/api/work/v1/zz_generated.swagger_doc_generated.go b/vendor/github.com/open-cluster-management/api/work/v1/zz_generated.swagger_doc_generated.go index 139c6586d..35bee8b2c 100644 --- a/vendor/github.com/open-cluster-management/api/work/v1/zz_generated.swagger_doc_generated.go +++ b/vendor/github.com/open-cluster-management/api/work/v1/zz_generated.swagger_doc_generated.go @@ -26,7 +26,7 @@ func (AppliedManifestResourceMeta) SwaggerDoc() map[string]string { } var map_AppliedManifestWork = map[string]string{ - "": "AppliedManifestWork represents an applied manifestwork on managed cluster. It is placed on managed cluster. An AppliedManifestWork links to a manifestwork on a hub recording resources deployed in the managed cluster. When the agent is removed from managed cluster, cluster-admin on managed cluster can delete appliedmanifestwork to remove resources deployed by the agent.", + "": "AppliedManifestWork represents an applied manifestwork on managed cluster. It is placed on managed cluster. An AppliedManifestWork links to a manifestwork on a hub recording resources deployed in the managed cluster. When the agent is removed from managed cluster, cluster-admin on managed cluster can delete appliedmanifestwork to remove resources deployed by the agent. The name of the appliedmanifestwork must be in the format of {hash of hub's first kube-apiserver url}-{manifestwork name}", "spec": "Spec represents the desired configuration of AppliedManifestWork", "status": "Status represents the current status of AppliedManifestWork", } @@ -49,7 +49,6 @@ var map_AppliedManifestWorkSpec = map[string]string{ "": "AppliedManifestWorkSpec represents the desired configuration of AppliedManifestWork", "hubHash": "HubHash represents the hash of the first hub kube apiserver to identify which hub this AppliedManifestWork links to.", "manifestWorkName": "ManifestWorkName represents the name of the related manifestwork on hub.", - "clusterNamee": "ClusterName represents the name of the cluster on hub where the related manifestwork is placed.", } func (AppliedManifestWorkSpec) SwaggerDoc() map[string]string { diff --git a/vendor/modules.txt b/vendor/modules.txt index b84e7ea0a..ff4a182c4 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -130,7 +130,7 @@ github.com/onsi/gomega/matchers/support/goraph/edge github.com/onsi/gomega/matchers/support/goraph/node github.com/onsi/gomega/matchers/support/goraph/util github.com/onsi/gomega/types -# github.com/open-cluster-management/api v0.0.0-20200702210332-e07f4fdaf68b +# github.com/open-cluster-management/api v0.0.0-20200715201722-3c3c076bf062 github.com/open-cluster-management/api/client/work/clientset/versioned github.com/open-cluster-management/api/client/work/clientset/versioned/fake github.com/open-cluster-management/api/client/work/clientset/versioned/scheme