Skip to content

Commit 7d2e5fe

Browse files
committed
Fix panic in conversion webhook
1 parent bcde6f0 commit 7d2e5fe

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

pkg/webhook/conversion/conversion.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import (
3131
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3232
"k8s.io/apimachinery/pkg/runtime"
3333
"k8s.io/apimachinery/pkg/runtime/schema"
34+
"k8s.io/apimachinery/pkg/types"
3435
"sigs.k8s.io/controller-runtime/pkg/conversion"
3536
logf "sigs.k8s.io/controller-runtime/pkg/log"
3637
)
@@ -69,16 +70,21 @@ func (wh *Webhook) ServeHTTP(w http.ResponseWriter, r *http.Request) {
6970
return
7071
}
7172

73+
var uid types.UID
74+
if convertReview.Request != nil {
75+
uid = convertReview.Request.UID
76+
}
77+
7278
// TODO(droot): may be move the conversion logic to a separate module to
7379
// decouple it from the http layer ?
7480
resp, err := wh.handleConvertRequest(convertReview.Request)
7581
if err != nil {
76-
log.Error(err, "failed to convert", "request", convertReview.Request.UID)
82+
log.Error(err, "failed to convert", "request", uid)
7783
convertReview.Response = errored(err)
7884
} else {
7985
convertReview.Response = resp
8086
}
81-
convertReview.Response.UID = convertReview.Request.UID
87+
convertReview.Response.UID = uid
8288
convertReview.Request = nil
8389

8490
err = json.NewEncoder(w).Encode(convertReview)

0 commit comments

Comments
 (0)