Skip to content

Commit 63ebb3b

Browse files
ashimagarg27ashimagarg27
committed
remove unused code
Signed-off-by: Ashima-Ashima1 <[email protected]>
1 parent d52eb28 commit 63ebb3b

File tree

10 files changed

+38
-75
lines changed

10 files changed

+38
-75
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 & 27 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
@@ -127,7 +127,6 @@ func (r *IBMObjectCSIReconciler) Reconcile(ctx context.Context, req ctrl.Request
127127
err = fmt.Errorf("failed to update IBMObjectCSI CR: %v", err)
128128
return reconcile.Result{}, err
129129
}
130-
return reconcile.Result{}, nil
131130
}
132131
if err := r.ControllerHelper.AddFinalizerIfNotPresent(
133132
instance, instance.Unwrap()); err != nil {
@@ -378,14 +377,12 @@ func (r *IBMObjectCSIReconciler) reconcileServiceAccount(instance *crutils.IBMOb
378377
if rErr != nil {
379378
return rErr
380379
}
381-
382380
}
383381
} else if err != nil {
384382
logger.Error(err, "Failed to get ServiceAccount", "Name", sa.GetName())
385383
return err
386384
} else {
387-
// Resource already exists - don't requeue
388-
//logger.Info("Skip reconcile: ServiceAccount already exists", "Namespace", sa.GetNamespace(), "Name", sa.GetName())
385+
logger.Info("Skip reconcile: ServiceAccount already exists", "Namespace", sa.GetNamespace(), "Name", sa.GetName())
389386
}
390387
}
391388

@@ -440,10 +437,8 @@ func (r *IBMObjectCSIReconciler) reconcileCSIDriver(instance *crutils.IBMObjectC
440437
} else if err != nil {
441438
logger.Error(err, "Failed to get CSIDriver", "Name", cd.GetName())
442439
return err
443-
} else {
444-
// Resource already exists - don't requeue
445440
}
446-
441+
logger.Info("Skip reconcile: CSIDriver already exists", "Namespace", cd.GetNamespace(), "Name", cd.GetName())
447442
return nil
448443
}
449444

‎controllers/internal/crutils/static_resource_generator.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111

1212
const (
1313
securityOpenshiftApiGroup string = "security.openshift.io"
14-
storageApiGroup string = "storage.k8s.io"
1514
rbacAuthorizationApiGroup string = "rbac.authorization.k8s.io"
1615
storageClassesResource string = "storageclasses"
1716
persistentVolumesResource string = "persistentvolumes"
@@ -90,7 +89,7 @@ func (c *IBMObjectCSI) GenerateExternalProvisionerClusterRole() *rbacv1.ClusterR
9089
Verbs: []string{verbGet, verbList, verbWatch, verbUpdate},
9190
},
9291
{
93-
APIGroups: []string{storageApiGroup},
92+
APIGroups: []string{config.StorageApiGroup},
9493
Resources: []string{storageClassesResource},
9594
Verbs: []string{verbGet, verbList, verbWatch},
9695
},
@@ -100,7 +99,7 @@ func (c *IBMObjectCSI) GenerateExternalProvisionerClusterRole() *rbacv1.ClusterR
10099
Verbs: []string{verbList, verbWatch, verbCreate, verbUpdate, verbPatch},
101100
},
102101
{
103-
APIGroups: []string{storageApiGroup},
102+
APIGroups: []string{config.StorageApiGroup},
104103
Resources: []string{csiNodesResource},
105104
Verbs: []string{verbGet, verbList, verbWatch},
106105
},

‎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

‎pkg/util/boolptr/boolptr.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ package boolptr
22

33
// IsTrue returns true if and only if the bool pointer is non-nil and set to true.
44
func IsTrue(b *bool) bool {
5-
return b != nil && *b == true
5+
return b != nil && *b
66
}
77

88
// IsFalse returns true if and only if the bool pointer is non-nil and set to false.
99
func IsFalse(b *bool) bool {
10-
return b != nil && *b == false
10+
return b != nil && !*b
1111
}
1212

1313
// True returns a *bool whose underlying value is true.

0 commit comments

Comments
 (0)