Merge pull request #489 from k8s-infra-cherrypick-robot/cherry-pick-4…

…87-to-release-1.5 [release-1.5] bumping CRD to v1beta1 and move scope into namespaced
kubernetes-sigs · Apr 24, 2023 · 0f0046e · 0f0046e
2 parents 45531da + 3cafe98
commit 0f0046e
Show file tree

Hide file tree

Showing 38 changed files with 600 additions and 488 deletions.
diff --git a/pkg/apis/multishare/v1alpha1/doc.go → pkg/apis/multishare/v1beta1/doc.go b/pkg/apis/multishare/v1alpha1/doc.go → pkg/apis/multishare/v1beta1/doc.go
@@ -17,5 +17,5 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 // +groupName=multishare.filestore.csi.storage.gke.io
 
-// Package v1alpha1 is the v1alpha1 version of the API.
-package v1alpha1 // import "sigs.k8s.io/gcp-filestore-csi-driver/pkg/apis/multishare_filestore/v1alpha1"
+// Package v1beta1 is the v1beta1 version of the API.
+package v1beta1 // import "sigs.k8s.io/gcp-filestore-csi-driver/pkg/apis/multishare_filestore/v1beta1"
diff --git a/pkg/apis/multishare/v1alpha1/register.go → pkg/apis/multishare/v1beta1/register.go b/pkg/apis/multishare/v1alpha1/register.go → pkg/apis/multishare/v1beta1/register.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1alpha1
+package v1beta1
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -25,7 +25,7 @@ import (
 )
 
 // SchemeGroupVersion is group version used to register these objects
-var SchemeGroupVersion = schema.GroupVersion{Group: multishare.GroupName, Version: "v1alpha1"}
+var SchemeGroupVersion = schema.GroupVersion{Group: multishare.GroupName, Version: "v1beta1"}
 
 // Kind takes an unqualified kind and returns back a Group qualified GroupKind
 func Kind(kind string) schema.GroupKind {

diff --git a/pkg/apis/multishare/v1alpha1/types.go → pkg/apis/multishare/v1beta1/types.go b/pkg/apis/multishare/v1alpha1/types.go → pkg/apis/multishare/v1beta1/types.go
@@ -14,14 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1alpha1
+package v1beta1
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 // +genclient
-// +genclient:nonNamespaced
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 // ShareInfo is a specification for a Foo resource
@@ -72,7 +71,6 @@ type ShareInfoList struct {
 }
 
 // +genclient
-// +genclient:nonNamespaced
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 // ShareInfo is a specification for a Foo resource

diff --git a/...tishare/v1alpha1/zz_generated.deepcopy.go → ...ltishare/v1beta1/zz_generated.deepcopy.go b/...tishare/v1alpha1/zz_generated.deepcopy.go → ...ltishare/v1beta1/zz_generated.deepcopy.go
diff --git a/pkg/client/clientset/versioned/clientset.go b/pkg/client/clientset/versioned/clientset.go
diff --git a/pkg/client/clientset/versioned/fake/clientset_generated.go b/pkg/client/clientset/versioned/fake/clientset_generated.go
diff --git a/pkg/client/clientset/versioned/fake/register.go b/pkg/client/clientset/versioned/fake/register.go
diff --git a/pkg/client/clientset/versioned/scheme/register.go b/pkg/client/clientset/versioned/scheme/register.go
diff --git a/...ersioned/typed/multishare/v1alpha1/doc.go → ...versioned/typed/multishare/v1beta1/doc.go b/...ersioned/typed/multishare/v1alpha1/doc.go → ...versioned/typed/multishare/v1beta1/doc.go
diff --git a/...ned/typed/multishare/v1alpha1/fake/doc.go → ...oned/typed/multishare/v1beta1/fake/doc.go b/...ned/typed/multishare/v1alpha1/fake/doc.go → ...oned/typed/multishare/v1beta1/fake/doc.go
diff --git a/...ishare/v1alpha1/fake/fake_instanceinfo.go → ...tishare/v1beta1/fake/fake_instanceinfo.go b/...ishare/v1alpha1/fake/fake_instanceinfo.go → ...tishare/v1beta1/fake/fake_instanceinfo.go
diff --git a/...e/v1alpha1/fake/fake_multishare_client.go → ...re/v1beta1/fake/fake_multishare_client.go b/...e/v1alpha1/fake/fake_multishare_client.go → ...re/v1beta1/fake/fake_multishare_client.go