Merge pull request kubernetes-sigs#175 from mengqiy/fix_nil_pointer

k8s-ci-robot · web-flow · commit 1fe24e55f6ee · 2018-10-18T14:05:03.000-07:00
fix a nil pointer issue when defaulting
diff --git a/pkg/webhook/bootstrap.go b/pkg/webhook/bootstrap.go
@@ -82,6 +82,9 @@ func (s *Server) setServerDefault() {
 
 // setBootstrappingDefault does defaulting for the Server bootstrapping.
 func (s *Server) setBootstrappingDefault() {
+	if s.BootstrapOptions == nil {
+		s.BootstrapOptions = &BootstrapOptions{}
+	}
 	if len(s.MutatingWebhookConfigName) == 0 {
 		s.MutatingWebhookConfigName = "mutating-webhook-configuration"
 	}

Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,9 @@ func (s *Server) setServerDefault() {`
`82`	`82`
`83`	`83`	`// setBootstrappingDefault does defaulting for the Server bootstrapping.`
`84`	`84`	`func (s *Server) setBootstrappingDefault() {`
	`85`	`+ if s.BootstrapOptions == nil {`
	`86`	`+ s.BootstrapOptions = &BootstrapOptions{}`
	`87`	`+ }`
`85`	`88`	`if len(s.MutatingWebhookConfigName) == 0 {`
`86`	`89`	`s.MutatingWebhookConfigName = "mutating-webhook-configuration"`
`87`	`90`	`}`