Nail/fission-src
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete builder service associated with environment name (#2616)

Browse Source
This commit is contained in:
Shubham Bansal
2022-11-12 09:11:05 +05:30
committed by GitHub
parent 57d3a80fc6
commit 66897cb9d0
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/buildermgr/envwatcher.go
+4 -3
View File
@@ -113,9 +113,10 @@ func makeEnvironmentWatcher(
return envWatcher return envWatcher
} }
func (env *environmentWatcher) getLabelForDeploymentOwner() map[string]string { func (env *environmentWatcher) getDeploymentLabels(envName string) map[string]string {
return map[string]string{ return map[string]string{
LABEL_DEPLOYMENT_OWNER: BUILDER_MGR, LABEL_DEPLOYMENT_OWNER: BUILDER_MGR,
LABEL_ENV_NAME: envName,
} }
} }
@@ -202,7 +203,7 @@ func (envw *environmentWatcher) getNamespace(env *fv1.Environment) string {
func (envw *environmentWatcher) DeleteBuilderService(ctx context.Context, env *fv1.Environment) { func (envw *environmentWatcher) DeleteBuilderService(ctx context.Context, env *fv1.Environment) {
ns := envw.getNamespace(env) ns := envw.getNamespace(env)
svcList, err := envw.getBuilderServiceList(ctx, envw.getLabelForDeploymentOwner(), ns) svcList, err := envw.getBuilderServiceList(ctx, envw.getDeploymentLabels(env.ObjectMeta.Name), ns)
if err != nil { if err != nil {
envw.logger.Error("error getting the builder service list", zap.Error(err)) envw.logger.Error("error getting the builder service list", zap.Error(err))
} }
@@ -227,7 +228,7 @@ func (envw *environmentWatcher) DeleteBuilderService(ctx context.Context, env *f
func (envw *environmentWatcher) DeleteBuilderDeployment(ctx context.Context, env *fv1.Environment) { func (envw *environmentWatcher) DeleteBuilderDeployment(ctx context.Context, env *fv1.Environment) {
ns := envw.getNamespace(env) ns := envw.getNamespace(env)
deployList, err := envw.getBuilderDeploymentList(ctx, envw.getLabelForDeploymentOwner(), ns) deployList, err := envw.getBuilderDeploymentList(ctx, envw.getDeploymentLabels(env.ObjectMeta.Name), ns)
if err != nil { if err != nil {
envw.logger.Error("error getting the builder deployment list", zap.Error(err)) envw.logger.Error("error getting the builder deployment list", zap.Error(err))
} }