Fix nil error when using BootstrapOptions.Host

ichekrygin · ichekrygin · commit 6cb24d88e8d9 · 2018-12-31T17:25:44.000-08:00
Signed-off-by: ichekrygin &lt;illya.chekrygin@gmail.com&gt;
diff --git a/pkg/webhook/bootstrap.go b/pkg/webhook/bootstrap.go
@@ -297,7 +297,7 @@ func (s *Server) validatingWHConfigs() (runtime.Object, error) {
 }
 
 func (s *Server) admissionWebhook(path string, wh *admission.Webhook) (*admissionregistration.Webhook, error) {
-	if wh.NamespaceSelector == nil && len(s.Service.Namespace) > 0 {
+	if wh.NamespaceSelector == nil && (s.Service == nil || s.Service.Namespace == "") {
 		wh.NamespaceSelector = &metav1.LabelSelector{
 			MatchExpressions: []metav1.LabelSelectorRequirement{
 				{

Original file line number	Diff line number	Diff line change
`@@ -297,7 +297,7 @@ func (s *Server) validatingWHConfigs() (runtime.Object, error) {`
`297`	`297`	`}`
`298`	`298`
`299`	`299`	`func (s Server) admissionWebhook(path string, wh admission.Webhook) (*admissionregistration.Webhook, error) {`
`300`		`- if wh.NamespaceSelector == nil && len(s.Service.Namespace) > 0 {`
	`300`	`+ if wh.NamespaceSelector == nil && (s.Service == nil \|\| s.Service.Namespace == "") {`
`301`	`301`	`wh.NamespaceSelector = &metav1.LabelSelector{`
`302`	`302`	`MatchExpressions: []metav1.LabelSelectorRequirement{`
`303`	`303`	`{`