github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 13:45:06 +00:00
Code Issues Projects Releases Wiki Activity

Move one-time svg mime init code into Run()

Browse Source
This commit is contained in:
Dr. Stefan Schimanski
2016-09-26 11:21:18 +02:00
parent b48ac54e1c
commit e2c17d69f7
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/genericapiserver/config.go
View File

@@ -20,7 +20,6 @@ import (
"crypto/tls" "crypto/tls"
"fmt" "fmt"
"io" "io"
"mime"
"net" "net"
"net/http" "net/http"
"os" "os"
@@ -338,11 +337,6 @@ func (c Config) New() (*GenericAPIServer, error) {
}) })
} }
// Send correct mime type for .svg files.
// TODO: remove when https://github.com/golang/go/commit/21e47d831bafb59f22b1ea8098f709677ec8ce33
// makes it into all of our supported go versions (only in v1.7.1 now).
mime.AddExtensionType(".svg", "image/svg+xml")
apiserver.InstallServiceErrorHandler(s.Serializer, s.HandlerContainer) apiserver.InstallServiceErrorHandler(s.Serializer, s.HandlerContainer)
s.installAPI(&c) s.installAPI(&c)

8
pkg/genericapiserver/genericapiserver.go
View File

@@ -19,6 +19,7 @@ package genericapiserver
import ( import (
"crypto/tls" "crypto/tls"
"fmt" "fmt"
"mime"
"net" "net"
"net/http" "net/http"
"path" "path"
@@ -167,6 +168,13 @@ type GenericAPIServer struct {
postStartHooksCalled bool postStartHooksCalled bool
} }
func init() {
// Send correct mime type for .svg files.
// TODO: remove when https://github.com/golang/go/commit/21e47d831bafb59f22b1ea8098f709677ec8ce33
// makes it into all of our supported go versions (only in v1.7.1 now).
mime.AddExtensionType(".svg", "image/svg+xml")
}
// RequestContextMapper is exposed so that third party resource storage can be build in a different location. // RequestContextMapper is exposed so that third party resource storage can be build in a different location.
// TODO refactor third party resource storage // TODO refactor third party resource storage
func (s *GenericAPIServer) RequestContextMapper() api.RequestContextMapper { func (s *GenericAPIServer) RequestContextMapper() api.RequestContextMapper {