Skip to content

Commit

Permalink
fix: admission for ingress delete (#4327)
Browse files Browse the repository at this point in the history
* fix logger

* fix flag

* fix: skip vingress when delete ingress.

Signed-off-by: yy <lingdie.yy@outlook.com>

---------

Signed-off-by: yy <lingdie.yy@outlook.com>
  • Loading branch information
lingdie committed Nov 21, 2023
1 parent bfe029c commit 333f05d
Showing 1 changed file with 14 additions and 12 deletions.
26 changes: 14 additions & 12 deletions controllers/admission/cmd/main.go
Expand Up @@ -66,23 +66,25 @@ func main() {
opts.BindFlags(flag.CommandLine)
flag.Parse()

ctrl.SetLogger(zap.New(zap.UseFlagOptions(&opts)))

setupLog.Info("ingress annotations:", "annotation", ingressAnnotationString)
ingressAnnotations := make(map[string]string)
kvs := strings.Split(ingressAnnotationString, ",")
for _, kv := range kvs {
parts := strings.Split(kv, "=")
if len(parts) == 2 {
key := parts[0]
value := parts[1]
ingressAnnotations[key] = value
} else {
setupLog.Error(nil, "ingress annotation format error", "annotation", kv)
os.Exit(1)
if ingressAnnotationString != "" {
kvs := strings.Split(ingressAnnotationString, ",")
for _, kv := range kvs {
parts := strings.Split(kv, "=")
if len(parts) == 2 {
key := parts[0]
value := parts[1]
ingressAnnotations[key] = value
} else {
setupLog.Error(nil, "ingress annotation format error", "annotation", kv)
os.Exit(1)
}
}
}

ctrl.SetLogger(zap.New(zap.UseFlagOptions(&opts)))

mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
Scheme: scheme,
MetricsBindAddress: metricsAddr,
Expand Down

0 comments on commit 333f05d

Please sign in to comment.