Skip to content

Commit 0c07caa

Browse files
ambiknaiambiknai
authored
Merge pull request #3 from ashimagarg27/fixes
Remove unused code and minor optimisation
2 parents d52eb28 + bdfa3bb commit 0c07caa

File tree

12 files changed

+84
-152
lines changed

12 files changed

+84
-152
lines changed

‎Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ COPY . .
2727
RUN CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build -a -o ibm-object-csi-operator main.go
2828

2929

30-
31-
3230
# Use distroless as minimal base image to package the manager binary
3331
# Refer to https://github.com/GoogleContainerTools/distroless for more details
3432
FROM gcr.io/distroless/static:nonroot

‎controllers/ibmobjectcsi_controller.go

Lines changed: 22 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -65,26 +65,26 @@ type IBMObjectCSIReconciler struct {
6565
//+kubebuilder:rbac:groups=csi.ibm.com,resources=ibmobjectcsis,verbs=get;list;watch;create;update;patch;delete
6666
//+kubebuilder:rbac:groups=csi.ibm.com,resources=ibmobjectcsis/status,verbs=get;update;patch
6767
//+kubebuilder:rbac:groups=csi.ibm.com,resources=ibmobjectcsis/finalizers,verbs=update
68-
// +kubebuilder:rbac:groups="",resources=pods,verbs=get;delete;list;watch
69-
// +kubebuilder:rbac:groups="",resources=configmaps,verbs=get;create;delete
70-
// +kubebuilder:rbac:groups="",resources=secrets,verbs=get;list;watch
71-
// +kubebuilder:rbac:groups="",resources=persistentvolumeclaims,verbs=get;list;watch;update;patch
72-
// +kubebuilder:rbac:groups="",resources=persistentvolumeclaims/status,verbs=get;update;patch
73-
// +kubebuilder:rbac:groups=monitoring.coreos.com,resources=servicemonitors,verbs=get;create
74-
// +kubebuilder:rbac:groups="",resources=persistentvolumeclaims/finalizers,verbs=update
75-
// +kubebuilder:rbac:groups="",resources=persistentvolumes,verbs=get;delete;list;watch;update;create;patch
76-
// +kubebuilder:rbac:groups="",resources=events,verbs=*
77-
// +kubebuilder:rbac:groups="",resources=nodes,verbs=get;list;watch
78-
// +kubebuilder:rbac:groups=apps,resources=deployments;daemonsets;statefulsets,verbs=get;list;watch;update;create;delete
79-
// +kubebuilder:rbac:groups="",resources=serviceaccounts,verbs=create;delete;get;watch;list
80-
// +kubebuilder:rbac:groups=rbac.authorization.k8s.io,resources=clusterroles;clusterrolebindings,verbs=create;delete;get;watch;list;update
81-
// +kubebuilder:rbac:groups=storage.k8s.io,resources=storageclasses,verbs=get;list;watch
82-
// +kubebuilder:rbac:groups=apps,resourceNames=ibm-object-csi-operator,resources=deployments/finalizers,verbs=update
83-
// +kubebuilder:rbac:groups=storage.k8s.io,resources=csidrivers,verbs=create;delete;get;watch;list
84-
// +kubebuilder:rbac:groups=storage.k8s.io,resources=csinodes,verbs=get;list;watch
85-
// +kubebuilder:rbac:groups=security.openshift.io,resourceNames=anyuid;privileged,resources=securitycontextconstraints,verbs=use
86-
// +kubebuilder:rbac:groups=apiextensions.k8s.io,resources=customresourcedefinitions,verbs=create;list;watch;delete
87-
// +kubebuilder:rbac:groups=csi.ibm.com,resources=*,verbs=*
68+
//+kubebuilder:rbac:groups="",resources=pods,verbs=get;delete;list;watch
69+
//+kubebuilder:rbac:groups="",resources=configmaps,verbs=get;create;delete
70+
//+kubebuilder:rbac:groups="",resources=secrets,verbs=get;list;watch
71+
//+kubebuilder:rbac:groups="",resources=persistentvolumeclaims,verbs=get;list;watch;update;patch
72+
//+kubebuilder:rbac:groups="",resources=persistentvolumeclaims/status,verbs=get;update;patch
73+
//+kubebuilder:rbac:groups=monitoring.coreos.com,resources=servicemonitors,verbs=get;create
74+
//+kubebuilder:rbac:groups="",resources=persistentvolumeclaims/finalizers,verbs=update
75+
//+kubebuilder:rbac:groups="",resources=persistentvolumes,verbs=get;delete;list;watch;update;create;patch
76+
//+kubebuilder:rbac:groups="",resources=events,verbs=*
77+
//+kubebuilder:rbac:groups="",resources=nodes,verbs=get;list;watch
78+
//+kubebuilder:rbac:groups=apps,resources=deployments;daemonsets;statefulsets,verbs=get;list;watch;update;create;delete
79+
//+kubebuilder:rbac:groups="",resources=serviceaccounts,verbs=create;delete;get;watch;list
80+
//+kubebuilder:rbac:groups=rbac.authorization.k8s.io,resources=clusterroles;clusterrolebindings,verbs=create;delete;get;watch;list;update
81+
//+kubebuilder:rbac:groups=storage.k8s.io,resources=storageclasses,verbs=get;list;watch
82+
//+kubebuilder:rbac:groups=apps,resourceNames=ibm-object-csi-operator,resources=deployments/finalizers,verbs=update
83+
//+kubebuilder:rbac:groups=storage.k8s.io,resources=csidrivers,verbs=create;delete;get;watch;list
84+
//+kubebuilder:rbac:groups=storage.k8s.io,resources=csinodes,verbs=get;list;watch
85+
//+kubebuilder:rbac:groups=security.openshift.io,resourceNames=anyuid;privileged,resources=securitycontextconstraints,verbs=use
86+
//+kubebuilder:rbac:groups=apiextensions.k8s.io,resources=customresourcedefinitions,verbs=create;list;watch;delete
87+
//+kubebuilder:rbac:groups=csi.ibm.com,resources=*,verbs=*
8888
//+kubebuilder:rbac:groups=storage.k8s.io,resources=storageclasses,verbs=create;get;list;watch;delete;update
8989

9090
// Reconcile is part of the main kubernetes reconciliation loop which aims to
@@ -116,18 +116,13 @@ func (r *IBMObjectCSIReconciler) Reconcile(ctx context.Context, req ctrl.Request
116116
//This ensures that the CR has all the required fields with default values before further processing or reconciliation by the operator.
117117
r.Scheme.Default(instance.Unwrap())
118118
changed := instance.SetDefaults()
119-
if err := instance.Validate(); err != nil {
120-
err = fmt.Errorf("wrong IBMObjectCSI options: %v", err)
121-
return reconcile.Result{RequeueAfter: ReconcileTime}, err
122-
}
123119
// update CR if there was changes after defaulting
124120
if changed {
125121
err = r.Update(context.TODO(), instance.Unwrap())
126122
if err != nil {
127123
err = fmt.Errorf("failed to update IBMObjectCSI CR: %v", err)
128124
return reconcile.Result{}, err
129125
}
130-
return reconcile.Result{}, nil
131126
}
132127
if err := r.ControllerHelper.AddFinalizerIfNotPresent(
133128
instance, instance.Unwrap()); err != nil {
@@ -378,14 +373,12 @@ func (r *IBMObjectCSIReconciler) reconcileServiceAccount(instance *crutils.IBMOb
378373
if rErr != nil {
379374
return rErr
380375
}
381-
382376
}
383377
} else if err != nil {
384378
logger.Error(err, "Failed to get ServiceAccount", "Name", sa.GetName())
385379
return err
386380
} else {
387-
// Resource already exists - don't requeue
388-
//logger.Info("Skip reconcile: ServiceAccount already exists", "Namespace", sa.GetNamespace(), "Name", sa.GetName())
381+
logger.Info("Skip reconcile: ServiceAccount already exists", "Namespace", sa.GetNamespace(), "Name", sa.GetName())
389382
}
390383
}
391384

@@ -440,10 +433,8 @@ func (r *IBMObjectCSIReconciler) reconcileCSIDriver(instance *crutils.IBMObjectC
440433
} else if err != nil {
441434
logger.Error(err, "Failed to get CSIDriver", "Name", cd.GetName())
442435
return err
443-
} else {
444-
// Resource already exists - don't requeue
445436
}
446-
437+
logger.Info("Skip reconcile: CSIDriver already exists", "Namespace", cd.GetNamespace(), "Name", cd.GetName())
447438
return nil
448439
}
449440

‎controllers/internal/crutils/static_resource_generator.go

Lines changed: 25 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -9,30 +9,6 @@ import (
99
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1010
)
1111

12-
const (
13-
securityOpenshiftApiGroup string = "security.openshift.io"
14-
storageApiGroup string = "storage.k8s.io"
15-
rbacAuthorizationApiGroup string = "rbac.authorization.k8s.io"
16-
storageClassesResource string = "storageclasses"
17-
persistentVolumesResource string = "persistentvolumes"
18-
persistentVolumeClaimsResource string = "persistentvolumeclaims"
19-
persistentVolumeClaimsStatusResource string = "persistentvolumeclaims/status"
20-
persistentVolumeClaimsFinalizersResource string = "persistentvolumeclaims/finalizers"
21-
podsResource string = "pods"
22-
eventsResource string = "events"
23-
nodesResource string = "nodes"
24-
csiNodesResource string = "csinodes"
25-
secretsResource string = "secrets"
26-
securityContextConstraintsResource string = "securitycontextconstraints"
27-
verbGet string = "get"
28-
verbList string = "list"
29-
verbWatch string = "watch"
30-
verbCreate string = "create"
31-
verbUpdate string = "update"
32-
verbPatch string = "patch"
33-
verbDelete string = "delete"
34-
)
35-
3612
func (c *IBMObjectCSI) GenerateCSIDriver() *storagev1.CSIDriver {
3713
defaultFSGroupPolicy := storagev1.FileFSGroupPolicy
3814
return &storagev1.CSIDriver{
@@ -76,38 +52,38 @@ func (c *IBMObjectCSI) GenerateExternalProvisionerClusterRole() *rbacv1.ClusterR
7652
Rules: []rbacv1.PolicyRule{
7753
{
7854
APIGroups: []string{""},
79-
Resources: []string{secretsResource},
80-
Verbs: []string{verbGet, verbList},
55+
Resources: []string{config.SecretsResource},
56+
Verbs: []string{config.VerbGet, config.VerbList},
8157
},
8258
{
8359
APIGroups: []string{""},
84-
Resources: []string{persistentVolumesResource},
85-
Verbs: []string{verbGet, verbList, verbWatch, verbCreate, verbDelete},
60+
Resources: []string{config.PersistentVolumesResource},
61+
Verbs: []string{config.VerbGet, config.VerbList, config.VerbWatch, config.VerbCreate, config.VerbDelete},
8662
},
8763
{
8864
APIGroups: []string{""},
89-
Resources: []string{persistentVolumeClaimsResource},
90-
Verbs: []string{verbGet, verbList, verbWatch, verbUpdate},
65+
Resources: []string{config.PersistentVolumeClaimsResource},
66+
Verbs: []string{config.VerbGet, config.VerbList, config.VerbWatch, config.VerbUpdate},
9167
},
9268
{
93-
APIGroups: []string{storageApiGroup},
94-
Resources: []string{storageClassesResource},
95-
Verbs: []string{verbGet, verbList, verbWatch},
69+
APIGroups: []string{config.StorageApiGroup},
70+
Resources: []string{config.StorageClassesResource},
71+
Verbs: []string{config.VerbGet, config.VerbList, config.VerbWatch},
9672
},
9773
{
9874
APIGroups: []string{""},
99-
Resources: []string{eventsResource},
100-
Verbs: []string{verbList, verbWatch, verbCreate, verbUpdate, verbPatch},
75+
Resources: []string{config.EventsResource},
76+
Verbs: []string{config.VerbList, config.VerbWatch, config.VerbCreate, config.VerbUpdate, config.VerbPatch},
10177
},
10278
{
103-
APIGroups: []string{storageApiGroup},
104-
Resources: []string{csiNodesResource},
105-
Verbs: []string{verbGet, verbList, verbWatch},
79+
APIGroups: []string{config.StorageApiGroup},
80+
Resources: []string{config.CsiNodesResource},
81+
Verbs: []string{config.VerbGet, config.VerbList, config.VerbWatch},
10682
},
10783
{
10884
APIGroups: []string{""},
109-
Resources: []string{nodesResource},
110-
Verbs: []string{verbGet, verbList, verbWatch},
85+
Resources: []string{config.NodesResource},
86+
Verbs: []string{config.VerbGet, config.VerbList, config.VerbWatch},
11187
},
11288
},
11389
}
@@ -128,7 +104,7 @@ func (c *IBMObjectCSI) GenerateExternalProvisionerClusterRoleBinding() *rbacv1.C
128104
RoleRef: rbacv1.RoleRef{
129105
Kind: "ClusterRole",
130106
Name: config.GetNameForResource(config.ExternalProvisionerClusterRole, c.Name),
131-
APIGroup: rbacAuthorizationApiGroup,
107+
APIGroup: config.RbacAuthorizationApiGroup,
132108
},
133109
}
134110
}
@@ -140,8 +116,8 @@ func (c *IBMObjectCSI) GenerateSCCForControllerClusterRole() *rbacv1.ClusterRole
140116
},
141117
Rules: []rbacv1.PolicyRule{
142118
{
143-
APIGroups: []string{securityOpenshiftApiGroup},
144-
Resources: []string{securityContextConstraintsResource},
119+
APIGroups: []string{config.SecurityOpenshiftApiGroup},
120+
Resources: []string{config.SecurityContextConstraintsResource},
145121
ResourceNames: []string{"anyuid"},
146122
Verbs: []string{"use"},
147123
},
@@ -164,7 +140,7 @@ func (c *IBMObjectCSI) GenerateSCCForControllerClusterRoleBinding() *rbacv1.Clus
164140
RoleRef: rbacv1.RoleRef{
165141
Kind: "ClusterRole",
166142
Name: config.GetNameForResource(config.CSIControllerSCCClusterRole, c.Name),
167-
APIGroup: rbacAuthorizationApiGroup,
143+
APIGroup: config.RbacAuthorizationApiGroup,
168144
},
169145
}
170146
}
@@ -176,15 +152,15 @@ func (c *IBMObjectCSI) GenerateSCCForNodeClusterRole() *rbacv1.ClusterRole {
176152
},
177153
Rules: []rbacv1.PolicyRule{
178154
{
179-
APIGroups: []string{securityOpenshiftApiGroup},
180-
Resources: []string{securityContextConstraintsResource},
155+
APIGroups: []string{config.SecurityOpenshiftApiGroup},
156+
Resources: []string{config.SecurityContextConstraintsResource},
181157
ResourceNames: []string{"privileged"},
182158
Verbs: []string{"use"},
183159
},
184160
{
185161
APIGroups: []string{""},
186-
Resources: []string{nodesResource},
187-
Verbs: []string{verbGet},
162+
Resources: []string{config.NodesResource},
163+
Verbs: []string{config.VerbGet},
188164
},
189165
},
190166
}
@@ -205,7 +181,7 @@ func (c *IBMObjectCSI) GenerateSCCForNodeClusterRoleBinding() *rbacv1.ClusterRol
205181
RoleRef: rbacv1.RoleRef{
206182
Kind: "ClusterRole",
207183
Name: config.GetNameForResource(config.CSINodeSCCClusterRole, c.Name),
208-
APIGroup: rbacAuthorizationApiGroup,
184+
APIGroup: config.RbacAuthorizationApiGroup,
209185
},
210186
}
211187
}

‎controllers/internal/crutils/validator.go

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎controllers/syncer/csi_controller.go

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -195,22 +195,6 @@ func (s *csiControllerSyncer) ensureContainer(name, image string, args []string)
195195
}
196196
}
197197

198-
func (s *csiControllerSyncer) envVarFromSecret(sctName, name, key string, opt bool) corev1.EnvVar {
199-
env := corev1.EnvVar{
200-
Name: name,
201-
ValueFrom: &corev1.EnvVarSource{
202-
SecretKeyRef: &corev1.SecretKeySelector{
203-
LocalObjectReference: corev1.LocalObjectReference{
204-
Name: sctName,
205-
},
206-
Key: key,
207-
Optional: &opt,
208-
},
209-
},
210-
}
211-
return env
212-
}
213-
214198
func (s *csiControllerSyncer) getEnvFor(name string) []corev1.EnvVar {
215199

216200
switch name {

‎controllers/syncer/csi_node.go

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -322,14 +322,6 @@ func (s *csiNodeSyncer) getCSINodeDriverRegistrarPullPolicy() corev1.PullPolicy
322322
return corev1.PullIfNotPresent
323323
}
324324

325-
func (s *csiNodeSyncer) getLivenessProbePullPolicy() corev1.PullPolicy {
326-
sidecar := s.getSidecarByName(config.LivenessProbe)
327-
if sidecar != nil && sidecar.ImagePullPolicy != "" {
328-
return sidecar.ImagePullPolicy
329-
}
330-
return corev1.PullIfNotPresent
331-
}
332-
333325
func ensureHostPathVolumeSource(path, pathType string) corev1.VolumeSource {
334326
t := corev1.HostPathType(pathType)
335327

‎controllers/util/common/common.go

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,10 @@ func (ch *ControllerHelper) ReconcileClusterRoleBinding(clusterRoleBindings []*r
8080
return err
8181
}
8282
} else if err != nil {
83-
logger.Error(err, "Failed to get ClusterRole", "Name", crb.GetName())
83+
logger.Error(err, "Failed to get ClusterRoleBinding", "Name", crb.GetName())
8484
return err
85-
} else {
86-
// Resource already exists - don't requeue
87-
//ch.Log.Info("Skip reconcile: ClusterRoleBinding already exists", "Name", crb.GetName())
8885
}
86+
ch.Log.Info("Skip reconcile: ClusterRoleBinding already exists", "Name", crb.GetName())
8987
}
9088
return nil
9189
}
@@ -103,10 +101,8 @@ func (ch *ControllerHelper) ReconcileStorageClasses(storageclasses []*storagev1.
103101
} else if err != nil {
104102
logger.Error(err, "Failed to get StorageClass", "Name", sc.GetName())
105103
return err
106-
} else {
107-
// Resource already exists - don't requeue
108-
//ch.Log.Info("Skip reconcile: ClusterRoleBinding already exists", "Name", crb.GetName())
109104
}
105+
ch.Log.Info("Skip reconcile: StorageClass already exists", "Name", sc.GetName())
110106
}
111107
return nil
112108
}

‎go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require (
77
github.com/imdario/mergo v0.3.16
88
github.com/onsi/ginkgo/v2 v2.15.0
99
github.com/onsi/gomega v1.31.1
10-
github.com/presslabs/controller-util v0.9.0
10+
github.com/presslabs/controller-util v0.10.0
1111
k8s.io/api v0.29.2
1212
k8s.io/apimachinery v0.29.2
1313
k8s.io/client-go v0.29.2
@@ -53,10 +53,10 @@ require (
5353
go.uber.org/multierr v1.11.0 // indirect
5454
go.uber.org/zap v1.26.0 // indirect
5555
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
56-
golang.org/x/net v0.19.0 // indirect
56+
golang.org/x/net v0.20.0 // indirect
5757
golang.org/x/oauth2 v0.12.0 // indirect
5858
golang.org/x/sys v0.16.0 // indirect
59-
golang.org/x/term v0.15.0 // indirect
59+
golang.org/x/term v0.16.0 // indirect
6060
golang.org/x/text v0.14.0 // indirect
6161
golang.org/x/time v0.3.0 // indirect
6262
golang.org/x/tools v0.16.1 // indirect

‎go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
9090
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
9191
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
9292
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
93-
github.com/presslabs/controller-util v0.9.0 h1:Ok8ZQPiNASzp2GlwyxpEe+F3gzo8sHENHRdagQXO3DY=
94-
github.com/presslabs/controller-util v0.9.0/go.mod h1:aWVlFEdBOQauu7FcwwixqEoNm81HsP+mn/4/3ygpKtI=
93+
github.com/presslabs/controller-util v0.10.0 h1:yy1x1qG6gV1qlye9GC9ExisymvH1ZMTz7CEOdHEl3cs=
94+
github.com/presslabs/controller-util v0.10.0/go.mod h1:6M84GzO1lBaGypN7j8p7sUEOK9FO5n3+DgOrNqvRgt8=
9595
github.com/prometheus/client_golang v1.18.0 h1:HzFfmkOzH5Q8L8G+kSJKUx5dtG87sewO+FoDDqP5Tbk=
9696
github.com/prometheus/client_golang v1.18.0/go.mod h1:T+GXkCk5wSJyOqMIzVgvvjFDlkOQntgjkJWKrN5txjA=
9797
github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw=
@@ -134,8 +134,8 @@ golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR
134134
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
135135
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
136136
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
137-
golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
138-
golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
137+
golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo=
138+
golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
139139
golang.org/x/oauth2 v0.12.0 h1:smVPGxink+n1ZI5pkQa8y6fZT0RW0MgCO5bFpepy4B4=
140140
golang.org/x/oauth2 v0.12.0/go.mod h1:A74bZ3aGXgCY0qaIC9Ahg6Lglin4AMAco8cIv9baba4=
141141
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -147,8 +147,8 @@ golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7w
147147
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
148148
golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
149149
golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
150-
golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4=
151-
golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
150+
golang.org/x/term v0.16.0 h1:m+B6fahuftsE9qjo0VWp2FW0mB3MTJvR0BaMQrq0pmE=
151+
golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY=
152152
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
153153
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
154154
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=

‎main.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ var (
4444
scheme = runtime.NewScheme()
4545
setupLog = ctrl.Log.WithName("setup")
4646
watchNamespaceEnvVar = "WATCH_NAMESPACE"
47-
topologyPrefixes = [...]string{"topology.cos.s3.csi.ibm.io"}
4847
log = logf.Log.WithName("cmd")
4948
)
5049

0 commit comments

Comments
 (0)