Merge pull request #531 from vshn/allow-ingress-deletion-keycloak

vshnbot · web-flow · commit 50981874a200 · 2025-12-02T11:46:22.000+01:00
Allow keycloak ingress deletion
diff --git a/pkg/comp-functions/functions/vshnkeycloak/ingress.go b/pkg/comp-functions/functions/vshnkeycloak/ingress.go
@@ -47,7 +47,7 @@ func AddIngress(_ context.Context, comp *vshnv1.VSHNKeycloak, svc *runtime.Servi
 		return runtime.NewWarningResult(fmt.Sprintf("cannot generate ingress: %s", err))
 	}
 
-	err = common.CreateIngresses(comp, svc, []*netv1.Ingress{ingress})
+	err = common.CreateIngresses(comp, svc, []*netv1.Ingress{ingress}, runtime.KubeOptionAllowDeletion)
 	if err != nil {
 		return runtime.NewWarningResult(fmt.Sprintf("cannot create ingress: %s", err))
 	}
@@ -107,5 +107,5 @@ func addOpenShiftCa(svc *runtime.ServiceRuntime, comp *vshnv1.VSHNKeycloak) erro
 		},
 	}
 
-	return svc.SetDesiredKubeObject(secret, comp.GetName()+"-route-ca")
+	return svc.SetDesiredKubeObject(secret, comp.GetName()+"-route-ca", runtime.KubeOptionAllowDeletion)
 }

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ func AddIngress(_ context.Context, comp vshnv1.VSHNKeycloak, svc runtime.Servi`
`47`	`47`	`return runtime.NewWarningResult(fmt.Sprintf("cannot generate ingress: %s", err))`
`48`	`48`	`}`
`49`	`49`
`50`		`- err = common.CreateIngresses(comp, svc, []*netv1.Ingress{ingress})`
	`50`	`+ err = common.CreateIngresses(comp, svc, []*netv1.Ingress{ingress}, runtime.KubeOptionAllowDeletion)`
`51`	`51`	`if err != nil {`
`52`	`52`	`return runtime.NewWarningResult(fmt.Sprintf("cannot create ingress: %s", err))`
`53`	`53`	`}`
`@@ -107,5 +107,5 @@ func addOpenShiftCa(svc runtime.ServiceRuntime, comp vshnv1.VSHNKeycloak) erro`
`107`	`107`	`},`
`108`	`108`	`}`
`109`	`109`
`110`		`- return svc.SetDesiredKubeObject(secret, comp.GetName()+"-route-ca")`
	`110`	`+ return svc.SetDesiredKubeObject(secret, comp.GetName()+"-route-ca", runtime.KubeOptionAllowDeletion)`
`111`	`111`	`}`