Skip to content

Commit 355e26a

Browse files
ashimagarg27ashimagarg27
authored
Merge pull request #33 from IBM/ashima
fix namespace
2 parents cd402c1 + c9480c5 commit 355e26a

File tree

7 files changed

+23
-22
lines changed

7 files changed

+23
-22
lines changed

‎config/default/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Adds namespace to all resources.
2-
namespace: ibm-object-csi-operator-system
2+
namespace: ibm-object-csi-operator
33

44
# Value of this field is prepended to the
55
# names of all resources, e.g. a deployment named

‎config/samples/csi_v1alpha1_ibmobjectcsi.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: objectdriver.csi.ibm.com/v1alpha1
22
kind: IBMObjectCSI
33
metadata:
44
name: ibm-object-csi
5-
namespace: ibm-object-csi-operator-system
5+
namespace: ibm-object-csi-operator
66
labels:
77
app.kubernetes.io/name: ibm-object-csi
88
app.kubernetes.io/instance: ibm-object-csi

‎config/samples/csi_v1alpha1_recoverstalevolume.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
app.kubernetes.io/name: recoverstalevolume
66
app.kubernetes.io/instance: recoverstalevolume-sample
77
name: recoverstalevolume-sample
8-
namespace: ibm-object-csi-operator-system
8+
namespace: ibm-object-csi-operator
99
spec:
1010
logHistory: 200
1111
data:

‎controllers/constants/constants.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@ import (
99
const (
1010
APIGroup = "objectdriver.csi.ibm.com"
1111

12-
APIVersion = "v1"
13-
CSIOperatorName = "ibm-object-csi-driver-operator"
14-
CSIDriverName = "ibm-object-csi-driver"
15-
DriverName = "cos.s3.csi.ibm.io"
12+
APIVersion = "v1"
13+
CSIOperatorName = "ibm-object-csi-driver-operator"
14+
CSIOperatorNamespace = "ibm-object-csi-operator"
15+
CSIDriverName = "ibm-object-csi-driver"
16+
DriverName = "cos.s3.csi.ibm.io"
1617

1718
RbacAuthorizationAPIGroup = "rbac.authorization.k8s.io"
1819
SecurityOpenshiftAPIGroup = "security.openshift.io"

‎controllers/recoverstalevolume_controller.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -207,10 +207,10 @@ func (r *RecoverStaleVolumeReconciler) Reconcile(ctx context.Context, req ctrl.R
207207
reqLogger.Info("node-names maped with volumes and deployment pods", "nodeVolumeMap", nodeVolumePodMapping)
208208

209209
// Get Pods in ibm-object-csi-driver-operator ns
210-
k8sOps.Namespace = req.Namespace
210+
k8sOps.Namespace = constants.CSIOperatorNamespace
211211
podsInOpNs, err := k8sOps.ListPod()
212212
if err != nil {
213-
reqLogger.Error(err, "failed to fetch pods in namespace: "+req.Namespace)
213+
reqLogger.Error(err, "failed to fetch pods in namespace: "+constants.CSIOperatorNamespace)
214214
return ctrl.Result{}, err
215215
}
216216
reqLogger.Info("Successfully fetched pods in namespace", "number-of-pods", len(podsInOpNs.Items))
@@ -231,7 +231,7 @@ func (r *RecoverStaleVolumeReconciler) Reconcile(ctx context.Context, req ctrl.R
231231
for nodeName, volumesData := range nodeVolumePodMapping {
232232
// Fetch volume stats from Logs of the Node Server Pod
233233
getVolStatsFromLogs, err := fetchVolumeStatsFromNodeServerPodLogs(ctx, csiNodeServerPods[nodeName],
234-
req.Namespace, logTailLines, r.IsTest)
234+
constants.CSIOperatorNamespace, logTailLines, r.IsTest)
235235
if err != nil {
236236
return ctrl.Result{}, err
237237
}

‎go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ require (
1010
github.com/onsi/gomega v1.33.1
1111
github.com/presslabs/controller-util v0.11.0
1212
github.com/stretchr/testify v1.9.0
13-
golang.org/x/exp v0.0.0-20240604190554-fc45aab8b7f8
14-
k8s.io/api v0.30.1
15-
k8s.io/apimachinery v0.30.1
16-
k8s.io/client-go v0.30.1
13+
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8
14+
k8s.io/api v0.30.2
15+
k8s.io/apimachinery v0.30.2
16+
k8s.io/client-go v0.30.2
1717
sigs.k8s.io/controller-runtime v0.18.4
1818
)
1919

‎go.sum

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
118118
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
119119
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
120120
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
121-
golang.org/x/exp v0.0.0-20240604190554-fc45aab8b7f8 h1:LoYXNGAShUG3m/ehNk4iFctuhGX/+R1ZpfJ4/ia80JM=
122-
golang.org/x/exp v0.0.0-20240604190554-fc45aab8b7f8/go.mod h1:jj3sYF3dwk5D+ghuXyeI3r5MFf+NT2An6/9dOA95KSI=
121+
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 h1:yixxcjnhBmY0nkL253HFVIm0JsFHwrHdT3Yh6szTnfY=
122+
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8/go.mod h1:jj3sYF3dwk5D+ghuXyeI3r5MFf+NT2An6/9dOA95KSI=
123123
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
124124
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
125125
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
@@ -176,14 +176,14 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
176176
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
177177
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
178178
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
179-
k8s.io/api v0.30.1 h1:kCm/6mADMdbAxmIh0LBjS54nQBE+U4KmbCfIkF5CpJY=
180-
k8s.io/api v0.30.1/go.mod h1:ddbN2C0+0DIiPntan/bye3SW3PdwLa11/0yqwvuRrJM=
179+
k8s.io/api v0.30.2 h1:+ZhRj+28QT4UOH+BKznu4CBgPWgkXO7XAvMcMl0qKvI=
180+
k8s.io/api v0.30.2/go.mod h1:ULg5g9JvOev2dG0u2hig4Z7tQ2hHIuS+m8MNZ+X6EmI=
181181
k8s.io/apiextensions-apiserver v0.30.1 h1:4fAJZ9985BmpJG6PkoxVRpXv9vmPUOVzl614xarePws=
182182
k8s.io/apiextensions-apiserver v0.30.1/go.mod h1:R4GuSrlhgq43oRY9sF2IToFh7PVlF1JjfWdoG3pixk4=
183-
k8s.io/apimachinery v0.30.1 h1:ZQStsEfo4n65yAdlGTfP/uSHMQSoYzU/oeEbkmF7P2U=
184-
k8s.io/apimachinery v0.30.1/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc=
185-
k8s.io/client-go v0.30.1 h1:uC/Ir6A3R46wdkgCV3vbLyNOYyCJ8oZnjtJGKfytl/Q=
186-
k8s.io/client-go v0.30.1/go.mod h1:wrAqLNs2trwiCH/wxxmT/x3hKVH9PuV0GGW0oDoHVqc=
183+
k8s.io/apimachinery v0.30.2 h1:fEMcnBj6qkzzPGSVsAZtQThU62SmQ4ZymlXRC5yFSCg=
184+
k8s.io/apimachinery v0.30.2/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc=
185+
k8s.io/client-go v0.30.2 h1:sBIVJdojUNPDU/jObC+18tXWcTJVcwyqS9diGdWHk50=
186+
k8s.io/client-go v0.30.2/go.mod h1:JglKSWULm9xlJLx4KCkfLLQ7XwtlbflV6uFFSHTMgVs=
187187
k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
188188
k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
189189
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag=

0 commit comments

Comments
 (0)