Skip to content

Commit 28a35c2

Browse files
Shivam-nagar23Shivam-nagar23
authored
Merge pull request #6711 from devtron-labs/min-sync-7-7
sync: main sync 7/7
2 parents 7695745 + fd41b5b commit 28a35c2

File tree

19 files changed

+5930
-32
lines changed

19 files changed

+5930
-32
lines changed

‎api/cluster/ClusterRestHandler.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ func (impl ClusterRestHandlerImpl) DeleteCluster(w http.ResponseWriter, r *http.
556556
common.WriteJsonResp(w, err, "Unauthorized User", http.StatusUnauthorized)
557557
return
558558
}
559-
var bean bean2.ClusterBean
559+
var bean bean2.DeleteClusterBean
560560
err = decoder.Decode(&bean)
561561
if err != nil {
562562
impl.logger.Errorw("request err, Delete", "error", err, "payload", bean)
@@ -580,7 +580,7 @@ func (impl ClusterRestHandlerImpl) DeleteCluster(w http.ResponseWriter, r *http.
580580
//RBAC enforcer Ends
581581
err = impl.deleteService.DeleteCluster(&bean, userId)
582582
if err != nil {
583-
impl.logger.Errorw("error in deleting cluster", "err", err, "id", bean.Id, "name", bean.ClusterName)
583+
impl.logger.Errorw("error in deleting cluster", "err", err, "id", bean.Id)
584584
common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
585585
return
586586
}

‎assets/plugin-icons/ic-plugin-aws-ecr-retag.png

2.35 KB
Loading

‎pkg/cluster/ClusterService.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ type ClusterService interface {
7070
FindAllExceptVirtual() ([]*bean.ClusterBean, error)
7171
FindAllWithoutConfig() ([]*bean.ClusterBean, error)
7272
FindAllActive() ([]bean.ClusterBean, error)
73-
DeleteFromDb(bean *bean.ClusterBean, userId int32) (string, error)
73+
DeleteFromDb(bean *clusterBean.DeleteClusterBean, userId int32) (string, error)
7474

7575
FindById(id int) (*bean.ClusterBean, error)
7676
FindByIdWithoutConfig(id int) (*bean.ClusterBean, error)
@@ -580,7 +580,7 @@ func (impl *ClusterServiceImpl) buildInformer() {
580580
impl.K8sInformerFactory.BuildInformer(clusterInfo)
581581
}
582582

583-
func (impl *ClusterServiceImpl) DeleteFromDb(bean *bean.ClusterBean, userId int32) (string, error) {
583+
func (impl *ClusterServiceImpl) DeleteFromDb(bean *clusterBean.DeleteClusterBean, userId int32) (string, error) {
584584
existingCluster, err := impl.clusterRepository.FindById(bean.Id)
585585
if err != nil {
586586
impl.logger.Errorw("No matching entry found for delete.", "id", bean.Id)

‎pkg/cluster/ClusterServiceExtended.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ func (impl *ClusterServiceImplExtended) Save(ctx context.Context, bean *bean.Clu
361361
return clusterBean, nil
362362
}
363363

364-
func (impl ClusterServiceImplExtended) DeleteFromDb(bean *bean.ClusterBean, userId int32) (string, error) {
364+
func (impl ClusterServiceImplExtended) DeleteFromDb(bean *bean.DeleteClusterBean, userId int32) (string, error) {
365365
existingCluster, err := impl.clusterRepository.FindById(bean.Id)
366366
if err != nil {
367367
impl.logger.Errorw("No matching entry found for delete.", "id", bean.Id)

‎pkg/cluster/bean/bean.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,10 @@ func (bean ClusterBean) GetClusterConfig() *k8s.ClusterConfig {
5454
return clusterCfg
5555
}
5656

57+
type DeleteClusterBean struct {
58+
Id int `json:"id" validate:"number,required"`
59+
}
60+
5761
type UserInfo struct {
5862
UserName string `json:"userName,omitempty"`
5963
Config map[string]string `json:"config,omitempty"`

‎pkg/delete/DeleteService.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@ import (
4141
)
4242

4343
type DeleteService interface {
44-
DeleteCluster(deleteRequest *bean2.ClusterBean, userId int32) error
44+
DeleteCluster(deleteRequest *bean2.DeleteClusterBean, userId int32) error
4545
DeleteEnvironment(deleteRequest *bean.EnvironmentBean, userId int32) error
4646
DeleteTeam(deleteRequest *bean3.TeamRequest) error
4747
DeleteChartRepo(deleteRequest *chartRepo.ChartRepoDto) error
4848
DeleteDockerRegistryConfig(deleteRequest *types.DockerArtifactStoreBean) error
4949
CanDeleteChartRegistryPullConfig(storeId string) bool
50-
DeleteClusterConfigMap(deleteRequest *bean2.ClusterBean) error
50+
DeleteClusterConfigMap(deleteRequest *bean2.DeleteClusterBean) error
5151
}
5252

5353
type DeleteServiceImpl struct {
@@ -91,7 +91,7 @@ func NewDeleteServiceImpl(logger *zap.SugaredLogger,
9191
}
9292
}
9393

94-
func (impl DeleteServiceImpl) DeleteCluster(deleteRequest *bean2.ClusterBean, userId int32) error {
94+
func (impl DeleteServiceImpl) DeleteCluster(deleteRequest *bean2.DeleteClusterBean, userId int32) error {
9595
clusterName, err := impl.clusterService.DeleteFromDb(deleteRequest, userId)
9696
if err != nil {
9797
impl.logger.Errorw("error im deleting cluster", "err", err, "deleteRequest", deleteRequest)
@@ -108,11 +108,11 @@ func (impl DeleteServiceImpl) DeleteCluster(deleteRequest *bean2.ClusterBean, us
108108
return nil
109109
}
110110

111-
func (impl DeleteServiceImpl) DeleteClusterConfigMap(deleteRequest *bean2.ClusterBean) error {
111+
func (impl DeleteServiceImpl) DeleteClusterConfigMap(deleteRequest *bean2.DeleteClusterBean) error {
112112
// kubelink informers are listening this secret, deleting this secret will inform kubelink that this cluster is deleted
113113
k8sClient, err := impl.K8sUtil.GetCoreV1ClientInCluster()
114114
if err != nil {
115-
impl.logger.Errorw("error in getting in cluster k8s client", "err", err, "clusterName", deleteRequest.ClusterName)
115+
impl.logger.Errorw("error in getting in cluster k8s client", "err", err, "clusterId", deleteRequest.Id)
116116
return nil
117117
}
118118
cmName := cluster.ParseCmNameForK8sInformerOnClusterEvent(deleteRequest.Id)

‎pkg/delete/DeleteServiceExtended.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,15 @@ func NewDeleteServiceExtendedImpl(logger *zap.SugaredLogger,
8080
}
8181
}
8282

83-
func (impl DeleteServiceExtendedImpl) DeleteCluster(deleteRequest *bean2.ClusterBean, userId int32) error {
83+
func (impl DeleteServiceExtendedImpl) DeleteCluster(deleteRequest *bean2.DeleteClusterBean, userId int32) error {
8484
//finding if there are env in this cluster or not, if yes then will not delete
8585
env, err := impl.environmentRepository.FindByClusterId(deleteRequest.Id)
8686
if err != nil && err != pg.ErrNoRows {
87-
impl.logger.Errorw("err in deleting cluster", "clusterName", deleteRequest.ClusterName, "err", err)
87+
impl.logger.Errorw("err in deleting cluster", "clusterId", deleteRequest.Id, "err", err)
8888
return err
8989
}
9090
if len(env) > 0 {
91-
impl.logger.Errorw("err in deleting cluster, found env in this cluster", "clusterName", deleteRequest.ClusterName, "err", err)
91+
impl.logger.Errorw("err in deleting cluster, found env in this cluster", "clusterId", deleteRequest.Id, "err", err)
9292
return &util.ApiError{HttpStatusCode: http.StatusBadRequest, UserMessage: " Please delete all related environments before deleting this cluster"}
9393
}
9494
clusterName, err := impl.clusterService.DeleteFromDb(deleteRequest, userId)

‎scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/service.yaml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,19 @@ metadata:
1818
{{- end}}
1919
spec:
2020
type: {{ .Values.service.type | default "ClusterIP" }}
21-
{{- if (and (eq .Values.service.type "LoadBalancer") .Values.service.loadBalancerSourceRanges )}}
21+
{{- with .Values.service.extraSpec }}
22+
{{- toYaml . | nindent 2 }}
23+
{{- end }}
24+
{{- if (eq .Values.service.type "LoadBalancer") }}
25+
{{- if .Values.service.loadBalancerIP }}
26+
loadBalancerIP: {{ .Values.service.loadBalancerIP }}
27+
{{- end }}
28+
{{- if .Values.service.loadBalancerSourceRanges }}
2229
loadBalancerSourceRanges:
23-
{{- range .Values.service.loadBalancerSourceRanges }}
30+
{{- range .Values.service.loadBalancerSourceRanges }}
2431
- {{ . }}
25-
{{- end }}
32+
{{- end }}
33+
{{- end }}
2634
{{- end }}
2735
ports:
2836
{{- range .Values.ContainerPort }}

‎scripts/devtron-reference-helm-charts/deployment-chart_4-21-0/templates/service.yaml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,19 @@ metadata:
1818
{{- end}}
1919
spec:
2020
type: {{ .Values.service.type | default "ClusterIP" }}
21-
{{- if (and (eq .Values.service.type "LoadBalancer") .Values.service.loadBalancerSourceRanges )}}
21+
{{- with .Values.service.extraSpec }}
22+
{{- toYaml . | nindent 2 }}
23+
{{- end }}
24+
{{- if (eq .Values.service.type "LoadBalancer") }}
25+
{{- if .Values.service.loadBalancerIP }}
26+
loadBalancerIP: {{ .Values.service.loadBalancerIP }}
27+
{{- end }}
28+
{{- if .Values.service.loadBalancerSourceRanges }}
2229
loadBalancerSourceRanges:
23-
{{- range .Values.service.loadBalancerSourceRanges }}
30+
{{- range .Values.service.loadBalancerSourceRanges }}
2431
- {{ . }}
25-
{{- end }}
32+
{{- end }}
33+
{{- end }}
2634
{{- end }}
2735
ports:
2836
{{- range .Values.ContainerPort }}

‎scripts/devtron-reference-helm-charts/deployment-chart_4-21-0/test_values.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,10 @@ service:
158158
type: ClusterIP
159159
# name: "1234567890123456789012345678901234567890123456789012345678901234567890"
160160
annotations: {}
161+
# loadBalancerIP: "98.73.123.45"
162+
# loadBalancerSourceRanges: ["127.0.0.1","127.0.0.1","127.0.0.1"]
163+
extraSpec: {}
164+
# externalTrafficPolicy: Local
161165
# test1: test2
162166
# test3: test4
163167

0 commit comments

Comments
 (0)