Skip to content

Commit a5e16d3

Browse files
ambiknaiambiknai
committed
Domain change
Signed-off-by: Ambika Nair <[email protected]>
1 parent 6c44803 commit a5e16d3

22 files changed

+2524
-56
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}

‎config/crd/bases/objectdriver.csi.ibm.com_ibmobjectcsis.yaml

Lines changed: 1989 additions & 0 deletions
Large diffs are not rendered by default.

‎config/crd/bases/objectdriver.csi.ibm.com_restorestalevolumes.yaml

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
---
2+
apiVersion: apiextensions.k8s.io/v1
3+
kind: CustomResourceDefinition
4+
metadata:
5+
annotations:
6+
controller-gen.kubebuilder.io/version: v0.14.0
7+
name: recoverstalevolume.objectdriver.csi.ibm.com
8+
spec:
9+
group: objectdriver.csi.ibm.com
10+
names:
11+
kind: RecoverStaleVolume
12+
listKind: RecoverStaleVolumeList
13+
plural: recoverstalevolumes
14+
singular: recoverstalevolume
15+
scope: Namespaced
16+
versions:
17+
- name: v1alpha1
18+
schema:
19+
openAPIV3Schema:
20+
description: RecoverStaleVolume is the Schema for the recoverstalevolumes API
21+
properties:
22+
apiVersion:
23+
description: |-
24+
APIVersion defines the versioned schema of this representation of an object.
25+
Servers should convert recognized schemas to the latest internal value, and
26+
may reject unrecognized values.
27+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
28+
type: string
29+
kind:
30+
description: |-
31+
Kind is a string value representing the REST resource this object represents.
32+
Servers may infer this from the endpoint the client submits requests to.
33+
Cannot be updated.
34+
In CamelCase.
35+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
36+
type: string
37+
metadata:
38+
type: object
39+
spec:
40+
properties:
41+
deploymentData:
42+
items:
43+
properties:
44+
deploymentName:
45+
type: string
46+
deploymentNamespace:
47+
type: string
48+
type: object
49+
type: array
50+
noOfLogLines:
51+
format: int64
52+
type: integer
53+
type: object
54+
status:
55+
description: FixStaleVolumeStatus defines the observed state of FixStaleVolume
56+
type: object
57+
type: object
58+
served: true
59+
storage: true
60+
subresources:
61+
status: {}

‎config/crd/kustomization.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
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_restorestalevolumes.yaml
77
#+kubebuilder:scaffold:crdkustomizeresource
88

99
patchesStrategicMerge:

‎config/crd/patches/cainjection_in_ibmobjectcsis.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ kind: CustomResourceDefinition
44
metadata:
55
annotations:
66
cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
7-
name: ibmobjectcsis.csi.ibm.com
7+
name: ibmobjectcsis.objectdriver.csi.ibm.com

‎config/crd/patches/cainjection_in_restorestalevolumes.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# The following patch adds a directive for certmanager to inject CA into the CRD
2+
apiVersion: apiextensions.k8s.io/v1
3+
kind: CustomResourceDefinition
4+
metadata:
5+
annotations:
6+
cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
7+
name: restorestalevolumes.objectdriver.csi.ibm.com

‎config/crd/patches/webhook_in_ibmobjectcsis.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
5-
name: ibmobjectcsis.csi.ibm.com
5+
name: ibmobjectcsis.objectdriver.csi.ibm.com
66
spec:
77
conversion:
88
strategy: Webhook

‎config/crd/patches/webhook_in_restorestalevolumes.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# The following patch enables a conversion webhook for the CRD
2+
apiVersion: apiextensions.k8s.io/v1
3+
kind: CustomResourceDefinition
4+
metadata:
5+
name: restorestalevolumes.objectdriver.csi.ibm.com
6+
spec:
7+
conversion:
8+
strategy: Webhook
9+
webhook:
10+
clientConfig:
11+
service:
12+
namespace: system
13+
name: webhook-service
14+
path: /convert
15+
conversionReviewVersions:
16+
- v1

0 commit comments

Comments
 (0)