@@ -31,6 +31,7 @@ import (
31
31
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
32
32
"k8s.io/apimachinery/pkg/runtime"
33
33
"k8s.io/apimachinery/pkg/runtime/schema"
34
+ "k8s.io/apimachinery/pkg/types"
34
35
"sigs.k8s.io/controller-runtime/pkg/conversion"
35
36
logf "sigs.k8s.io/controller-runtime/pkg/log"
36
37
)
@@ -69,16 +70,21 @@ func (wh *Webhook) ServeHTTP(w http.ResponseWriter, r *http.Request) {
69
70
return
70
71
}
71
72
73
+ var uid types.UID
74
+ if convertReview .Request != nil {
75
+ uid = convertReview .Request .UID
76
+ }
77
+
72
78
// TODO(droot): may be move the conversion logic to a separate module to
73
79
// decouple it from the http layer ?
74
80
resp , err := wh .handleConvertRequest (convertReview .Request )
75
81
if err != nil {
76
- log .Error (err , "failed to convert" , "request" , convertReview . Request . UID )
82
+ log .Error (err , "failed to convert" , "request" , uid )
77
83
convertReview .Response = errored (err )
78
84
} else {
79
85
convertReview .Response = resp
80
86
}
81
- convertReview .Response .UID = convertReview . Request . UID
87
+ convertReview .Response .UID = uid
82
88
convertReview .Request = nil
83
89
84
90
err = json .NewEncoder (w ).Encode (convertReview )
0 commit comments