*: initial update to kube 1.8

Signed-off-by: Antonio Murdaca <runcom@redhat.com>

vendor/k8s.io/apiserver/pkg/util/feature/feature_gate.go

@@ -21,6 +21,7 @@ import (
 	"sort"
 	"strconv"
 	"strings"
+	"sync"
 
 	"github.com/golang/glog"
 	"github.com/spf13/pflag"
@@ -70,15 +71,23 @@ const (
 // FeatureGate parses and stores flag gates for known features from
 // a string like feature1=true,feature2=false,...
 type FeatureGate interface {
+	// AddFlag adds a flag for setting global feature gates to the specified FlagSet.
 	AddFlag(fs *pflag.FlagSet)
+	// Set parses and stores flag gates for known features
+	// from a string like feature1=true,feature2=false,...
 	Set(value string) error
+	// Enabled returns true if the key is enabled.
 	Enabled(key Feature) bool
+	// Add adds features to the featureGate.
 	Add(features map[Feature]FeatureSpec) error
+	// KnownFeatures returns a slice of strings describing the FeatureGate's known features.
 	KnownFeatures() []string
 }
 
 // featureGate implements FeatureGate as well as pflag.Value for flag parsing.
 type featureGate struct {
+	lock sync.RWMutex
+
 	known   map[Feature]FeatureSpec
 	special map[Feature]func(*featureGate, bool)
 	enabled map[Feature]bool
@@ -112,9 +121,12 @@ func NewFeatureGate() *featureGate {
 	return f
 }
 
-// Set Parses a string of the form // "key1=value1,key2=value2,..." into a
+// Set Parses a string of the form "key1=value1,key2=value2,..." into a
 // map[string]bool of known keys or returns an error.
 func (f *featureGate) Set(value string) error {
+	f.lock.Lock()
+	defer f.lock.Unlock()
+
 	for _, s := range strings.Split(value, ",") {
 		if len(s) == 0 {
 			continue
@@ -145,7 +157,11 @@ func (f *featureGate) Set(value string) error {
 	return nil
 }
 
+// String returns a string containing all enabled feature gates, formatted as "key1=value1,key2=value2,...".
 func (f *featureGate) String() string {
+	f.lock.RLock()
+	defer f.lock.RUnlock()
+
 	pairs := []string{}
 	for k, v := range f.enabled {
 		pairs = append(pairs, fmt.Sprintf("%s=%t", k, v))
@@ -158,7 +174,11 @@ func (f *featureGate) Type() string {
 	return "mapStringBool"
 }
 
+// Add adds features to the featureGate.
 func (f *featureGate) Add(features map[Feature]FeatureSpec) error {
+	f.lock.Lock()
+	defer f.lock.Unlock()
+
 	if f.closed {
 		return fmt.Errorf("cannot add a feature gate after adding it to the flag set")
 	}
@@ -176,7 +196,11 @@ func (f *featureGate) Add(features map[Feature]FeatureSpec) error {
 	return nil
 }
 
+// Enabled returns true if the key is enabled.
 func (f *featureGate) Enabled(key Feature) bool {
+	f.lock.RLock()
+	defer f.lock.RUnlock()
+
 	defaultValue := f.known[key].Default
 	if f.enabled != nil {
 		if v, ok := f.enabled[key]; ok {
@@ -188,7 +212,9 @@ func (f *featureGate) Enabled(key Feature) bool {
 
 // AddFlag adds a flag for setting global feature gates to the specified FlagSet.
 func (f *featureGate) AddFlag(fs *pflag.FlagSet) {
+	f.lock.Lock()
 	f.closed = true
+	f.lock.Unlock()
 
 	known := f.KnownFeatures()
 	fs.Var(f, flagName, ""+
@@ -196,8 +222,10 @@ func (f *featureGate) AddFlag(fs *pflag.FlagSet) {
 		"Options are:\n"+strings.Join(known, "\n"))
 }
 
-// Returns a string describing the FeatureGate's known features.
+// KnownFeatures returns a slice of strings describing the FeatureGate's known features.
 func (f *featureGate) KnownFeatures() []string {
+	f.lock.RLock()
+	defer f.lock.RUnlock()
 	var known []string
 	for k, v := range f.known {
 		pre := ""

vendor/k8s.io/apiserver/pkg/util/wsstream/conn.go

@@ -87,7 +87,10 @@ var (
 // IsWebSocketRequest returns true if the incoming request contains connection upgrade headers
 // for WebSockets.
 func IsWebSocketRequest(req *http.Request) bool {
-	return connectionUpgradeRegex.MatchString(strings.ToLower(req.Header.Get("Connection"))) && strings.ToLower(req.Header.Get("Upgrade")) == "websocket"
+	if !strings.EqualFold(req.Header.Get("Upgrade"), "websocket") {
+		return false
+	}
+	return connectionUpgradeRegex.MatchString(strings.ToLower(req.Header.Get("Connection")))
 }
 
 // IgnoreReceives reads from a WebSocket until it is closed, then returns. If timeout is set, the