This is an automated email from the ASF dual-hosted git repository.
pingsutw pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/submarine.git
The following commit(s) were added to refs/heads/master by this push:
new 19bd28b SUBMARINE-956. Change submarine CRD groupName to
"submarine.apache.org"
19bd28b is described below
commit 19bd28b9bbb1e427456e1caa9b1bfbd51693ef17
Author: MortalHappiness <[email protected]>
AuthorDate: Sun Aug 1 14:07:46 2021 +0800
SUBMARINE-956. Change submarine CRD groupName to "submarine.apache.org"
### What is this PR for?
Currently, the CRD groupName of submarines is "submarine.k8s.io", we should
change it to "submarine.apache.org"
### What type of PR is it?
[Bug Fix]
### Todos
### What is the Jira issue?
https://issues.apache.org/jira/projects/SUBMARINE/issues/SUBMARINE-956
### How should this be tested?
### Screenshots (if appropriate)
### Questions:
* Do the license files need updating? No
* Are there breaking changes for older versions? No
* Does this need new documentation? No
Author: MortalHappiness <[email protected]>
Signed-off-by: Kevin <[email protected]>
Closes #691 from MortalHappiness/SUBMARINE-956 and squashes the following
commits:
f38cd0aa [MortalHappiness] SUBMARINE-956. Change submarine CRD groupName to
"submarine.apache.org"
---
submarine-cloud-v2/artifacts/examples/example-submarine.yaml | 2 +-
submarine-cloud-v2/helm-charts/submarine-operator/crds/crd.yaml | 4 ++--
submarine-cloud-v2/helm-charts/submarine-operator/templates/rbac.yaml | 2 +-
submarine-cloud-v2/pkg/apis/submarine/v1alpha1/doc.go | 2 +-
submarine-cloud-v2/pkg/apis/submarine/v1alpha1/register.go | 2 +-
.../versioned/typed/submarine/v1alpha1/fake/fake_submarine.go | 4 ++--
.../clientset/versioned/typed/submarine/v1alpha1/submarine_client.go | 2 +-
submarine-cloud-v2/pkg/client/informers/externalversions/generic.go | 2 +-
8 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/submarine-cloud-v2/artifacts/examples/example-submarine.yaml
b/submarine-cloud-v2/artifacts/examples/example-submarine.yaml
index 309c37f..788741c 100644
--- a/submarine-cloud-v2/artifacts/examples/example-submarine.yaml
+++ b/submarine-cloud-v2/artifacts/examples/example-submarine.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
#
-apiVersion: submarine.k8s.io/v1alpha1
+apiVersion: submarine.apache.org/v1alpha1
kind: Submarine
metadata:
name: example-submarine
diff --git a/submarine-cloud-v2/helm-charts/submarine-operator/crds/crd.yaml
b/submarine-cloud-v2/helm-charts/submarine-operator/crds/crd.yaml
index 50393ac..bd7be82 100644
--- a/submarine-cloud-v2/helm-charts/submarine-operator/crds/crd.yaml
+++ b/submarine-cloud-v2/helm-charts/submarine-operator/crds/crd.yaml
@@ -18,9 +18,9 @@
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
- name: submarines.submarine.k8s.io
+ name: submarines.submarine.apache.org
spec:
- group: submarine.k8s.io
+ group: submarine.apache.org
version: v1alpha1
names:
kind: Submarine
diff --git
a/submarine-cloud-v2/helm-charts/submarine-operator/templates/rbac.yaml
b/submarine-cloud-v2/helm-charts/submarine-operator/templates/rbac.yaml
index a625be5..399b5f6 100644
--- a/submarine-cloud-v2/helm-charts/submarine-operator/templates/rbac.yaml
+++ b/submarine-cloud-v2/helm-charts/submarine-operator/templates/rbac.yaml
@@ -21,7 +21,7 @@ metadata:
name: submarine-operator
rules:
- apiGroups:
- - submarine.k8s.io
+ - submarine.apache.org
resources:
- submarines
verbs:
diff --git a/submarine-cloud-v2/pkg/apis/submarine/v1alpha1/doc.go
b/submarine-cloud-v2/pkg/apis/submarine/v1alpha1/doc.go
index 311df56..81ba4f8 100644
--- a/submarine-cloud-v2/pkg/apis/submarine/v1alpha1/doc.go
+++ b/submarine-cloud-v2/pkg/apis/submarine/v1alpha1/doc.go
@@ -15,6 +15,6 @@
* limitations under the License.
*/
// +k8s:deepcopy-gen=package
-// +groupName=submarine.k8s.io
+// +groupName=submarine.apache.org
package v1alpha1
diff --git a/submarine-cloud-v2/pkg/apis/submarine/v1alpha1/register.go
b/submarine-cloud-v2/pkg/apis/submarine/v1alpha1/register.go
index 9326443..2300e88 100644
--- a/submarine-cloud-v2/pkg/apis/submarine/v1alpha1/register.go
+++ b/submarine-cloud-v2/pkg/apis/submarine/v1alpha1/register.go
@@ -24,7 +24,7 @@ import (
)
const (
- GroupName = "submarine.k8s.io"
+ GroupName = "submarine.apache.org"
GroupVersion = "v1alpha1"
)
diff --git
a/submarine-cloud-v2/pkg/client/clientset/versioned/typed/submarine/v1alpha1/fake/fake_submarine.go
b/submarine-cloud-v2/pkg/client/clientset/versioned/typed/submarine/v1alpha1/fake/fake_submarine.go
index 7c37ac1..c3d15bf 100644
---
a/submarine-cloud-v2/pkg/client/clientset/versioned/typed/submarine/v1alpha1/fake/fake_submarine.go
+++
b/submarine-cloud-v2/pkg/client/clientset/versioned/typed/submarine/v1alpha1/fake/fake_submarine.go
@@ -37,9 +37,9 @@ type FakeSubmarines struct {
ns string
}
-var submarinesResource = schema.GroupVersionResource{Group:
"submarine.k8s.io", Version: "v1alpha1", Resource: "submarines"}
+var submarinesResource = schema.GroupVersionResource{Group:
"submarine.apache.org", Version: "v1alpha1", Resource: "submarines"}
-var submarinesKind = schema.GroupVersionKind{Group: "submarine.k8s.io",
Version: "v1alpha1", Kind: "Submarine"}
+var submarinesKind = schema.GroupVersionKind{Group: "submarine.apache.org",
Version: "v1alpha1", Kind: "Submarine"}
// Get takes name of the submarine, and returns the corresponding submarine
object, and an error if there is any.
func (c *FakeSubmarines) Get(ctx context.Context, name string, options
v1.GetOptions) (result *v1alpha1.Submarine, err error) {
diff --git
a/submarine-cloud-v2/pkg/client/clientset/versioned/typed/submarine/v1alpha1/submarine_client.go
b/submarine-cloud-v2/pkg/client/clientset/versioned/typed/submarine/v1alpha1/submarine_client.go
index d7c5b63..621f4f6 100644
---
a/submarine-cloud-v2/pkg/client/clientset/versioned/typed/submarine/v1alpha1/submarine_client.go
+++
b/submarine-cloud-v2/pkg/client/clientset/versioned/typed/submarine/v1alpha1/submarine_client.go
@@ -30,7 +30,7 @@ type SubmarineV1alpha1Interface interface {
SubmarinesGetter
}
-// SubmarineV1alpha1Client is used to interact with features provided by the
submarine.k8s.io group.
+// SubmarineV1alpha1Client is used to interact with features provided by the
submarine.apache.org group.
type SubmarineV1alpha1Client struct {
restClient rest.Interface
}
diff --git
a/submarine-cloud-v2/pkg/client/informers/externalversions/generic.go
b/submarine-cloud-v2/pkg/client/informers/externalversions/generic.go
index 773c21e..5834047 100644
--- a/submarine-cloud-v2/pkg/client/informers/externalversions/generic.go
+++ b/submarine-cloud-v2/pkg/client/informers/externalversions/generic.go
@@ -53,7 +53,7 @@ func (f *genericInformer) Lister() cache.GenericLister {
// TODO extend this to unknown resources with a client pool
func (f *sharedInformerFactory) ForResource(resource
schema.GroupVersionResource) (GenericInformer, error) {
switch resource {
- // Group=submarine.k8s.io, Version=v1alpha1
+ // Group=submarine.apache.org, Version=v1alpha1
case v1alpha1.SchemeGroupVersion.WithResource("submarines"):
return &genericInformer{resource: resource.GroupResource(),
informer: f.Submarine().V1alpha1().Submarines().Informer()}, nil
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
