Skip to content

Commit 624a5dd

Browse files
authored
Merge pull request #5 from IBM/renamedomain
Domain and Group change
2 parents 6c44803 + afed797 commit 624a5dd

27 files changed

+227
-226
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL)
2828
# This variable is used to construct full image tags for bundle and catalog images.
2929
#
3030
# For example, running 'make bundle-build bundle-push catalog-build catalog-push' will build and push both
31-
# ibm.com/ibm-object-csi-driver-operator-bundle:$VERSION and ibm.com/ibm-object-csi-driver-operator-catalog:$VERSION.
32-
IMAGE_TAG_BASE ?= ibm.com/ibm-object-csi-driver-operator
31+
# csi.ibm.com/ibm-object-csi-driver-operator-bundle:$VERSION and csi.ibm.com/ibm-object-csi-driver-operator-catalog:$VERSION.
32+
IMAGE_TAG_BASE ?= csi.ibm.com/ibm-object-csi-driver-operator
3333

3434
# BUNDLE_IMG defines the image:tag used for the bundle.
3535
# You can use it as an arg. (E.g make bundle-build BUNDLE_IMG=<some-registry>/<project-name-bundle>:<tag>)

PROJECT

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# This file is used to track the info used to scaffold your project
33
# and allow the plugins properly work.
44
# More info: https://book.kubebuilder.io/reference/project-config.html
5-
domain: ibm.com
5+
domain: csi.ibm.com
66
layout:
77
- go.kubebuilder.io/v3
88
plugins:
@@ -15,18 +15,18 @@ resources:
1515
crdVersion: v1
1616
namespaced: true
1717
controller: true
18-
domain: ibm.com
19-
group: csi
18+
domain: csi.ibm.com
19+
group: objectdriver
2020
kind: IBMObjectCSI
2121
path: github.ibm.com/alchemy-containers/ibm-object-csi-driver-operator/api/v1alpha1
2222
version: v1alpha1
2323
- api:
2424
crdVersion: v1
2525
namespaced: true
2626
controller: true
27-
domain: ibm.com
28-
group: csi
29-
kind: FixStaleVolume
27+
domain: csi.ibm.com
28+
group: objectdriver
29+
kind: RecoverStaleVolume
3030
path: github.ibm.com/alchemy-containers/ibm-object-csi-driver-operator/api/v1alpha1
3131
version: v1alpha1
3232
version: "3"

api/v1alpha1/groupversion_info.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
// Package v1alpha1 contains API Schema definitions for the csi v1alpha1 API group
17+
// Package v1alpha1 contains API Schema definitions for the objectdriver v1alpha1 API group
1818
// +kubebuilder:object:generate=true
19-
// +groupName=csi.ibm.com
19+
// +groupName=objectdriver.csi.ibm.com
2020
package v1alpha1
2121

2222
import (
@@ -26,7 +26,7 @@ import (
2626

2727
var (
2828
// GroupVersion is group version used to register these objects
29-
GroupVersion = schema.GroupVersion{Group: "csi.ibm.com", Version: "v1alpha1"}
29+
GroupVersion = schema.GroupVersion{Group: "objectdriver.csi.ibm.com", Version: "v1alpha1"}
3030

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

api/v1alpha1/fixstalevolume_types.go renamed to api/v1alpha1/recoverstalevolume_types.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ import (
2323
// EDIT THIS FILE! THIS IS SCAFFOLDING FOR YOU TO OWN!
2424
// NOTE: json tags are required. Any new fields you add must have json tags for the fields to be serialized.
2525

26-
// FixStaleVolumeSpec defines the desired state of FixStaleVolume
26+
// RecoverStaleVolumeSpec defines the desired state of RecoverStaleVolume
2727

28-
type FixStaleVolumeSpec struct {
28+
type RecoverStaleVolumeSpec struct {
2929
NoOfLogLines int64 `json:"noOfLogLines,omitempty"`
3030
Deployment []DeploymentData `json:"deploymentData,omitempty"`
3131
}
@@ -35,33 +35,33 @@ type DeploymentData struct {
3535
DeploymentNamespace string `json:"deploymentNamespace,omitempty"`
3636
}
3737

38-
// FixStaleVolumeStatus defines the observed state of FixStaleVolume
39-
type FixStaleVolumeStatus struct {
38+
// RecoverStaleVolumeStatus defines the observed state of RecoverStaleVolume
39+
type RecoverStaleVolumeStatus struct {
4040
// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
4141
// Important: Run "make" to regenerate code after modifying this file
4242
}
4343

4444
//+kubebuilder:object:root=true
4545
//+kubebuilder:subresource:status
4646

47-
// FixStaleVolume is the Schema for the fixstalevolumes API
48-
type FixStaleVolume struct {
47+
// RecoverStaleVolume is the Schema for the recoverstalevolumes API
48+
type RecoverStaleVolume struct {
4949
metav1.TypeMeta `json:",inline"`
5050
metav1.ObjectMeta `json:"metadata,omitempty"`
5151

52-
Spec FixStaleVolumeSpec `json:"spec,omitempty"`
53-
Status FixStaleVolumeStatus `json:"status,omitempty"`
52+
Spec RecoverStaleVolumeSpec `json:"spec,omitempty"`
53+
Status RecoverStaleVolumeStatus `json:"status,omitempty"`
5454
}
5555

5656
//+kubebuilder:object:root=true
5757

58-
// FixStaleVolumeList contains a list of FixStaleVolume
59-
type FixStaleVolumeList struct {
58+
// RecoverStaleVolumeList contains a list of RecoverStaleVolume
59+
type RecoverStaleVolumeList struct {
6060
metav1.TypeMeta `json:",inline"`
6161
metav1.ListMeta `json:"metadata,omitempty"`
62-
Items []FixStaleVolume `json:"items"`
62+
Items []RecoverStaleVolume `json:"items"`
6363
}
6464

6565
func init() {
66-
SchemeBuilder.Register(&FixStaleVolume{}, &FixStaleVolumeList{})
66+
SchemeBuilder.Register(&RecoverStaleVolume{}, &RecoverStaleVolumeList{})
6767
}

api/v1alpha1/zz_generated.deepcopy.go

Lines changed: 94 additions & 94 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/crd/bases/csi.ibm.com_ibmobjectcsis.yaml renamed to config/crd/bases/objectdriver.csi.ibm.com_ibmobjectcsis.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ kind: CustomResourceDefinition
44
metadata:
55
annotations:
66
controller-gen.kubebuilder.io/version: v0.14.0
7-
name: ibmobjectcsis.csi.ibm.com
7+
name: ibmobjectcsis.objectdriver.csi.ibm.com
88
spec:
9-
group: csi.ibm.com
9+
group: objectdriver.csi.ibm.com
1010
names:
1111
kind: IBMObjectCSI
1212
listKind: IBMObjectCSIList

config/crd/bases/csi.ibm.com_fixstalevolumes.yaml renamed to config/crd/bases/objectdriver.csi.ibm.com_recoverstalevolumes.yaml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,21 @@ kind: CustomResourceDefinition
44
metadata:
55
annotations:
66
controller-gen.kubebuilder.io/version: v0.14.0
7-
name: fixstalevolumes.csi.ibm.com
7+
name: recoverstalevolumes.objectdriver.csi.ibm.com
88
spec:
9-
group: csi.ibm.com
9+
group: objectdriver.csi.ibm.com
1010
names:
11-
kind: FixStaleVolume
12-
listKind: FixStaleVolumeList
13-
plural: fixstalevolumes
14-
singular: fixstalevolume
11+
kind: RecoverStaleVolume
12+
listKind: RecoverStaleVolumeList
13+
plural: recoverstalevolumes
14+
singular: recoverstalevolume
1515
scope: Namespaced
1616
versions:
1717
- name: v1alpha1
1818
schema:
1919
openAPIV3Schema:
20-
description: FixStaleVolume is the Schema for the fixstalevolumes API
20+
description: RecoverStaleVolume is the Schema for the recoverstalevolumes
21+
API
2122
properties:
2223
apiVersion:
2324
description: |-
@@ -52,7 +53,7 @@ spec:
5253
type: integer
5354
type: object
5455
status:
55-
description: FixStaleVolumeStatus defines the observed state of FixStaleVolume
56+
description: RecoverStaleVolumeStatus defines the observed state of RecoverStaleVolume
5657
type: object
5758
type: object
5859
served: true

config/crd/kustomization.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@
22
# since it depends on service name and namespace that are out of this kustomize package.
33
# It should be run by config/default
44
resources:
5-
- bases/csi.ibm.com_ibmobjectcsis.yaml
6-
- bases/csi.ibm.com_fixstalevolumes.yaml
5+
- bases/objectdriver.csi.ibm.com_ibmobjectcsis.yaml
6+
- bases/objectdriver.csi.ibm.com_recoverstalevolumes.yaml
77
#+kubebuilder:scaffold:crdkustomizeresource
88

99
patchesStrategicMerge:
1010
# [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix.
1111
# patches here are for enabling the conversion webhook for each CRD
1212
#- patches/webhook_in_ibmobjectcsis.yaml
13-
#- patches/webhook_in_fixstalevolumes.yaml
13+
#- patches/webhook_in_recoverstalevolumes.yaml
1414
#+kubebuilder:scaffold:crdkustomizewebhookpatch
1515

1616
# [CERTMANAGER] To enable cert-manager, uncomment all the sections with [CERTMANAGER] prefix.
1717
# patches here are for enabling the CA injection for each CRD
1818
#- patches/cainjection_in_ibmobjectcsis.yaml
19-
#- patches/cainjection_in_fixstalevolumes.yaml
19+
#- patches/cainjection_in_recoverstalevolumes.yaml
2020
#+kubebuilder:scaffold:crdkustomizecainjectionpatch
2121

2222
# the following config is for teaching kustomize how to do kustomization for CRDs.

0 commit comments

Comments
 (0)