Skip to content

Commit 23bf1b4

Browse files
committed
update recoverstalevolume CRD
Signed-off-by: Ashima-Ashima1 <[email protected]>
1 parent 3843e56 commit 23bf1b4

File tree

5 files changed

+42
-36
lines changed

5 files changed

+42
-36
lines changed

api/v1alpha1/recoverstalevolume_types.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ import (
2626

2727
// RecoverStaleVolumeSpec defines the desired state of RecoverStaleVolume
2828
type RecoverStaleVolumeSpec struct {
29-
NoOfLogLines int64 `json:"noOfLogLines,omitempty"`
30-
Deployment []DeploymentData `json:"deploymentData,omitempty"`
29+
NoOfLogLines int64 `json:"noOfLogLines,omitempty"`
30+
Data []NamespacedDeploymentData `json:"data,omitempty"`
3131
}
3232

33-
// DeploymentData ...
34-
type DeploymentData struct {
35-
DeploymentName string `json:"deploymentName,omitempty"`
36-
DeploymentNamespace string `json:"deploymentNamespace,omitempty"`
33+
// NamespacedDeploymentData ...
34+
type NamespacedDeploymentData struct {
35+
Namespace string `json:"namespace,omitempty"`
36+
Deployments []string `json:"applications,omitempty"`
3737
}
3838

3939
// RecoverStaleVolumeStatus defines the observed state of RecoverStaleVolume

api/v1alpha1/zz_generated.deepcopy.go

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

config/crd/bases/objectdriver.csi.ibm.com_recoverstalevolumes.yaml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,15 @@ spec:
4040
spec:
4141
description: RecoverStaleVolumeSpec defines the desired state of RecoverStaleVolume
4242
properties:
43-
deploymentData:
43+
data:
4444
items:
45-
description: DeploymentData ...
45+
description: NamespacedDeploymentData ...
4646
properties:
47-
deploymentName:
48-
type: string
49-
deploymentNamespace:
47+
applications:
48+
items:
49+
type: string
50+
type: array
51+
namespace:
5052
type: string
5153
type: object
5254
type: array

config/samples/csi_v1alpha1_recoverstalevolume.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ metadata:
88
namespace: ibm-object-csi-operator-system
99
spec:
1010
noOfLogLines: 200
11-
deploymentData:
12-
- deploymentName: cos-csi-app-deployment
13-
deploymentNamespace: default
11+
data:
12+
- namespace: default
13+
applications: []

controllers/ibmobjectcsi_controller.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,6 @@ import (
4848
"sigs.k8s.io/controller-runtime/pkg/reconcile"
4949
)
5050

51-
// ReconcileTime is the delay between reconciliations
52-
const ReconcileTime = 30 * time.Second
53-
5451
type reconciler func(instance *crutils.IBMObjectCSI) error
5552

5653
var csiLog = logf.Log.WithName("ibmobjectcsi_controller")

0 commit comments

Comments
 (0)