Skip to content

Commit 1283179

Browse files
committed
fix
1 parent 3d992e9 commit 1283179

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

pkg/delete/DeleteService.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ type DeleteService interface {
4646
DeleteChartRepo(deleteRequest *chartRepo.ChartRepoDto) error
4747
DeleteDockerRegistryConfig(deleteRequest *types.DockerArtifactStoreBean) error
4848
CanDeleteChartRegistryPullConfig(storeId string) bool
49-
DeleteClusterConfigMap(deleteRequest *bean2.ClusterBean, err error) error
49+
DeleteClusterConfigMap(deleteRequest *bean2.ClusterBean) error
5050
}
5151

5252
type DeleteServiceImpl struct {
@@ -94,7 +94,7 @@ func (impl DeleteServiceImpl) DeleteCluster(deleteRequest *bean2.ClusterBean, us
9494
return err
9595
}
9696
// deleting a cluster config map created at time of cluster creation/updation so that informer in kubelink and kubewatch can delete the cluster from cache
97-
err = impl.DeleteClusterConfigMap(deleteRequest, err)
97+
err = impl.DeleteClusterConfigMap(deleteRequest)
9898
if err != nil {
9999
impl.logger.Errorw("error in deleting cluster cm", "clusterId", deleteRequest.Id, "error", err)
100100
return err
@@ -103,7 +103,7 @@ func (impl DeleteServiceImpl) DeleteCluster(deleteRequest *bean2.ClusterBean, us
103103
return nil
104104
}
105105

106-
func (impl DeleteServiceImpl) DeleteClusterConfigMap(deleteRequest *bean2.ClusterBean, err error) error {
106+
func (impl DeleteServiceImpl) DeleteClusterConfigMap(deleteRequest *bean2.ClusterBean) error {
107107
// kubelink informers are listening this secret, deleting this secret will inform kubelink that this cluster is deleted
108108
k8sClient, err := impl.K8sUtil.GetCoreV1ClientInCluster()
109109
if err != nil {

pkg/delete/DeleteServiceExtended.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ func (impl DeleteServiceExtendedImpl) DeleteCluster(deleteRequest *bean2.Cluster
9696
impl.logger.Errorw("error im deleting cluster", "err", err, "deleteRequest", deleteRequest)
9797
return err
9898
}
99-
err = impl.DeleteClusterConfigMap(deleteRequest, err)
99+
err = impl.DeleteClusterConfigMap(deleteRequest)
100100
if err != nil {
101101
impl.logger.Errorw("error in deleting cluster secret", "clusterId", deleteRequest.Id, "error", err)
102102
return err

0 commit comments

Comments
 (0)