Skip to content

Commit 4ed0d6e

Browse files
committed
Fix transport endpoint issue for rclone mounter
1 parent 274270a commit 4ed0d6e

File tree

3 files changed

+1
-37
lines changed

3 files changed

+1
-37
lines changed

api/v1alpha1/ibmobjectcsi_types.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ type IBMObjectCSISpec struct {
3535
// +kubebuilder:validation:Optional
3636
ImagePullSecrets []string `json:"imagePullSecrets,omitempty"`
3737

38-
//Resources ResourcesSpec `json:"resources,omitempty"`
39-
4038
HealthPort uint16 `json:"healthPort,omitempty"`
4139

4240
Resources ResourcesSpec `json:"resources,omitempty"`

config/manager/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ kind: Kustomization
55
images:
66
- name: controller
77
newName: bhagyak1/ibm-object-csi-driver-operator
8-
newTag: apr801
8+
newTag: apr803

controllers/internal/crutils/ibmobjectcsi.go

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -99,54 +99,20 @@ func (c *IBMObjectCSI) GetCSIControllerImage() string {
9999
}
100100

101101
func (c *IBMObjectCSI) GetCSIControllerResourceRequests() *objectdriverv1alpha1.ResourcesSpec {
102-
//limits, requests := make(map[string]string), make(map[string]string)
103102
resources := objectdriverv1alpha1.ResourcesSpec{}
104103

105104
if &c.Spec.Controller.Resources != nil {
106-
107105
resources = c.Spec.Controller.Resources
108-
109-
//limits["cpu"] = c.Spec.Controller.Resources.Limits.Cpu
110-
//limits["memory"] = c.Spec.Controller.Resources.Limits.Memory
111-
//requests["cpu"] = c.Spec.Controller.Resources.Requests.Cpu
112-
//requests["memory"] = c.Spec.Controller.Resources.Requests.Memory
113-
//
114-
//resources.Limits = objectdriverv1alpha1.ReqLimits{
115-
// Cpu: limits["cpu"],
116-
// Memory: limits["memory"],
117-
//}
118-
//resources.Requests = objectdriverv1alpha1.ReqLimits{
119-
// Cpu: requests["cpu"],
120-
// Memory: requests["memory"],
121-
//}
122106
}
123-
124107
return &resources
125108
}
126109

127110
func (c *IBMObjectCSI) GetCSINodeResourceRequests() *objectdriverv1alpha1.ResourcesSpec {
128-
//limits, requests := make(map[string]string), make(map[string]string)
129111
resources := objectdriverv1alpha1.ResourcesSpec{}
130112

131-
//if &c.Spec.Node.Resources != nil {
132-
// limits["cpu"] = c.Spec.Node.Resources.Limits.Cpu
133-
// limits["memory"] = c.Spec.Node.Resources.Limits.Memory
134-
// requests["cpu"] = c.Spec.Node.Resources.Requests.Cpu
135-
// requests["memory"] = c.Spec.Node.Resources.Requests.Memory
136-
//
137-
// resources.Limits = objectdriverv1alpha1.ReqLimits{
138-
// Cpu: limits["cpu"],
139-
// Memory: limits["memory"],
140-
// }
141-
// resources.Requests = objectdriverv1alpha1.ReqLimits{
142-
// Cpu: requests["cpu"],
143-
// Memory: requests["memory"],
144-
// }
145-
//}
146113
if &c.Spec.Node.Resources != nil {
147114
resources = c.Spec.Node.Resources
148115
}
149-
150116
return &resources
151117
}
152118

0 commit comments

Comments
 (0)