Merge pull request #13146 from mikedanese/config-api

cmd/genconversion/conversion.go

@@ -27,6 +27,8 @@ import (
 
 	"k8s.io/kubernetes/pkg/api"
 	_ "k8s.io/kubernetes/pkg/api/v1"
+	_ "k8s.io/kubernetes/pkg/apis/componentconfig"
+	_ "k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1"
 	_ "k8s.io/kubernetes/pkg/apis/extensions"
 	_ "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
 	kruntime "k8s.io/kubernetes/pkg/runtime"

cmd/gendeepcopy/deep_copy.go

@@ -27,6 +27,8 @@ import (
 
 	"k8s.io/kubernetes/pkg/api"
 	_ "k8s.io/kubernetes/pkg/api/v1"
+	_ "k8s.io/kubernetes/pkg/apis/componentconfig"
+	_ "k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1"
 	_ "k8s.io/kubernetes/pkg/apis/extensions"
 	_ "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
 	kruntime "k8s.io/kubernetes/pkg/runtime"

cmd/kube-version-change/import_known_versions.go

@@ -19,5 +19,6 @@ package main
 // These imports are the API groups the kube-version-change tool will support.
 import (
 	_ "k8s.io/kubernetes/pkg/api/install"
+	_ "k8s.io/kubernetes/pkg/apis/componentconfig/install"
 	_ "k8s.io/kubernetes/pkg/apis/extensions/install"
 )

docs/admin/kube-apiserver.md

@@ -101,14 +101,14 @@ kube-apiserver
       --service-node-port-range=: A port range to reserve for services with NodePort visibility.  Example: '30000-32767'.  Inclusive at both ends of the range.
       --ssh-keyfile="": If non-empty, use secure SSH proxy to the nodes, using this user keyfile
       --ssh-user="": If non-empty, use secure SSH proxy to the nodes, using this user name
-      --storage-versions="extensions/v1beta1,v1": The versions to store resources with. Different groups may be stored in different versions. Specified in the format "group1/version1,group2/version2...". This flag expects a complete list of storage versions of ALL groups registered in the server. It defaults to a list of preferred versions of all registered groups, which is derived from the KUBE_API_VERSIONS environment variable.
+      --storage-versions="componentconfig/v1alpha1,extensions/v1beta1,v1": The versions to store resources with. Different groups may be stored in different versions. Specified in the format "group1/version1,group2/version2...". This flag expects a complete list of storage versions of ALL groups registered in the server. It defaults to a list of preferred versions of all registered groups, which is derived from the KUBE_API_VERSIONS environment variable.
       --tls-cert-file="": File containing x509 Certificate for HTTPS.  (CA cert, if any, concatenated after server cert). If HTTPS serving is enabled, and --tls-cert-file and --tls-private-key-file are not provided, a self-signed certificate and key are generated for the public address and saved to /var/run/kubernetes.
       --tls-private-key-file="": File containing x509 private key matching --tls-cert-file.
       --token-auth-file="": If set, the file that will be used to secure the secure port of the API server via token authentication.
       --watch-cache[=true]: Enable watch caching in the apiserver
 ```
 
-###### Auto generated by spf13/cobra on 24-Oct-2015
+###### Auto generated by spf13/cobra on 30-Oct-2015
 
 
 <!-- BEGIN MUNGE: GENERATED_ANALYTICS -->

hack/after-build/update-generated-conversions.sh

@@ -43,7 +43,7 @@ EOF
 }
 
 # TODO(lavalamp): get this list by listing the pkg/apis/ directory?
-DEFAULT_GROUP_VERSIONS="v1 extensions/v1beta1"
+DEFAULT_GROUP_VERSIONS="v1 extensions/v1beta1 componentconfig/v1alpha1"
 VERSIONS=${VERSIONS:-$DEFAULT_GROUP_VERSIONS}
 for ver in $VERSIONS; do
   # Ensure that the version being processed is registered by setting

hack/after-build/update-generated-deep-copies.sh

@@ -57,6 +57,6 @@ function generate_deep_copies() {
 }
 
 # v1 is in the group ""
-DEFAULT_VERSIONS="/ v1 extensions/ extensions/v1beta1"
+DEFAULT_VERSIONS="/ v1 extensions/ extensions/v1beta1 componentconfig/ componentconfig/v1alpha1"
 VERSIONS=${VERSIONS:-$DEFAULT_VERSIONS}
 generate_deep_copies "$VERSIONS"

hack/test-go.sh

@@ -315,7 +315,7 @@ for (( i=0, j=0; ; )); do
   # KUBE_TEST_API sets the version of each group to be tested. KUBE_API_VERSIONS
   # register the groups/versions as supported by k8s. So KUBE_API_VERSIONS
   # needs to be the superset of KUBE_TEST_API.
-  KUBE_TEST_API="${apiVersion}" KUBE_API_VERSIONS="v1,extensions/v1beta1" ETCD_PREFIX=${etcdPrefix} runTests "$@"
+  KUBE_TEST_API="${apiVersion}" KUBE_API_VERSIONS="v1,extensions/v1beta1,componentconfig/v1alpha1" ETCD_PREFIX=${etcdPrefix} runTests "$@"
   i=${i}+1
   j=${j}+1
   if [[ i -eq ${apiVersionsCount} ]] && [[ j -eq ${etcdPrefixesCount} ]]; then

pkg/api/registered/registered.go

@@ -32,12 +32,13 @@ var RegisteredVersions []string
 func init() {
 	// TODO: caesarxuchao: rename this variable to validGroupVersions
 	validAPIVersions := map[string]bool{
-		"v1":                 true,
-		"extensions/v1beta1": true,
+		"v1":                       true,
+		"extensions/v1beta1":       true,
+		"componentconfig/v1alpha1": true,
 	}
 
 	// The default list of supported api versions, in order of most preferred to the least.
-	defaultSupportedVersions := "v1,extensions/v1beta1"
+	defaultSupportedVersions := "v1,extensions/v1beta1,componentconfig/v1alpha1"
 	// Env var KUBE_API_VERSIONS is a comma separated list of API versions that should be registered in the scheme.
 	// The versions should be in the order of most preferred to the least.
 	supportedVersions := os.Getenv("KUBE_API_VERSIONS")

pkg/apis/componentconfig/decode.go

+/*
+Copyright 2015 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package componentconfig
+
+import (
+	"io/ioutil"
+
+	"k8s.io/kubernetes/pkg/runtime"
+)
+
+func DecodeFromPathInto(obj runtime.Object, c runtime.Codec, filename string) error {
+	b, err := ioutil.ReadFile(filename)
+	c = runtime.YAMLDecoder(c)
+
+	if err != nil {
+		return err
+	}
+	return c.DecodeInto(b, obj)
+}

pkg/apis/componentconfig/deep_copy_generated.go

+/*
+Copyright 2015 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// DO NOT EDIT. THIS FILE IS AUTO-GENERATED BY $KUBEROOT/hack/update-generated-deep-copies.sh.
+
+package componentconfig
+
+import (
+	api "k8s.io/kubernetes/pkg/api"
+	unversioned "k8s.io/kubernetes/pkg/api/unversioned"
+	conversion "k8s.io/kubernetes/pkg/conversion"
+)
+
+func deepCopy_unversioned_TypeMeta(in unversioned.TypeMeta, out *unversioned.TypeMeta, c *conversion.Cloner) error {
+	out.Kind = in.Kind
+	out.APIVersion = in.APIVersion
+	return nil
+}
+
+func deepCopy_componentconfig_KubeProxyConfiguration(in KubeProxyConfiguration, out *KubeProxyConfiguration, c *conversion.Cloner) error {
+	if err := deepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+		return err
+	}
+	out.BindAddress = in.BindAddress
+	out.CleanupIPTables = in.CleanupIPTables
+	out.HealthzBindAddress = in.HealthzBindAddress
+	out.HealthzPort = in.HealthzPort
+	out.HostnameOverride = in.HostnameOverride
+	out.IPTablesSyncePeriodSeconds = in.IPTablesSyncePeriodSeconds
+	out.KubeAPIBurst = in.KubeAPIBurst
+	out.KubeAPIQPS = in.KubeAPIQPS
+	out.KubeconfigPath = in.KubeconfigPath
+	out.MasqueradeAll = in.MasqueradeAll
+	out.Master = in.Master
+	if in.OOMScoreAdj != nil {
+		out.OOMScoreAdj = new(int)
+		*out.OOMScoreAdj = *in.OOMScoreAdj
+	} else {
+		out.OOMScoreAdj = nil
+	}
+	out.Mode = in.Mode
+	out.PortRange = in.PortRange
+	out.ResourceContainer = in.ResourceContainer
+	out.UDPTimeoutMilliseconds = in.UDPTimeoutMilliseconds
+	return nil
+}
+
+func init() {
+	err := api.Scheme.AddGeneratedDeepCopyFuncs(
+		deepCopy_unversioned_TypeMeta,
+		deepCopy_componentconfig_KubeProxyConfiguration,
+	)
+	if err != nil {
+		// if one of the deep copy functions is malformed, detect it immediately.
+		panic(err)
+	}
+}

pkg/apis/componentconfig/install/install.go

+/*
+Copyright 2015 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Package install installs the experimental API group, making it available as
+// an option to all of the API encoding/decoding machinery.
+package install
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/golang/glog"
+
+	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/api/latest"
+	"k8s.io/kubernetes/pkg/api/meta"
+	"k8s.io/kubernetes/pkg/api/registered"
+	apiutil "k8s.io/kubernetes/pkg/api/util"
+	_ "k8s.io/kubernetes/pkg/apis/componentconfig"
+	"k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1"
+	"k8s.io/kubernetes/pkg/runtime"
+	"k8s.io/kubernetes/pkg/util/sets"
+)
+
+const importPrefix = "k8s.io/kubernetes/pkg/apis/componentconfig"
+
+var accessor = meta.NewAccessor()
+
+func init() {
+	groupMeta, err := latest.RegisterGroup("componentconfig")
+	if err != nil {
+		glog.V(4).Infof("%v", err)
+		return
+	}
+	registeredGroupVersions := registered.GroupVersionsForGroup("componentconfig")
+	groupVersion := registeredGroupVersions[0]
+	*groupMeta = latest.GroupMeta{
+		GroupVersion: groupVersion,
+		Group:        apiutil.GetGroup(groupVersion),
+		Version:      apiutil.GetVersion(groupVersion),
+		Codec:        runtime.CodecFor(api.Scheme, groupVersion),
+	}
+	var versions []string
+	var groupVersions []string
+	for i := len(registeredGroupVersions) - 1; i >= 0; i-- {
+		versions = append(versions, apiutil.GetVersion(registeredGroupVersions[i]))
+		groupVersions = append(groupVersions, registeredGroupVersions[i])
+	}
+	groupMeta.Versions = versions
+	groupMeta.GroupVersions = groupVersions
+
+	groupMeta.SelfLinker = runtime.SelfLinker(accessor)
+
+	// the list of kinds that are scoped at the root of the api hierarchy
+	// if a kind is not enumerated here, it is assumed to have a namespace scope
+	rootScoped := sets.NewString()
+
+	ignoredKinds := sets.NewString()
+
+	groupMeta.RESTMapper = api.NewDefaultRESTMapper("componentconfig", groupVersions, interfacesFor, importPrefix, ignoredKinds, rootScoped)
+	api.RegisterRESTMapper(groupMeta.RESTMapper)
+	groupMeta.InterfacesFor = interfacesFor
+}
+
+// interfacesFor returns the default Codec and ResourceVersioner for a given version
+// string, or an error if the version is not known.
+func interfacesFor(version string) (*meta.VersionInterfaces, error) {
+	switch version {
+	case "componentconfig/v1alpha1":
+		return &meta.VersionInterfaces{
+			Codec:            v1alpha1.Codec,
+			ObjectConvertor:  api.Scheme,
+			MetadataAccessor: accessor,
+		}, nil
+	default:
+		g, _ := latest.Group("componentconfig")
+		return nil, fmt.Errorf("unsupported storage version: %s (valid: %s)", version, strings.Join(g.Versions, ", "))
+	}
+}

pkg/apis/componentconfig/install/install_test.go

+/*
+Copyright 2014 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package install
+
+import (
+	"encoding/json"
+	"testing"
+
+	"k8s.io/kubernetes/pkg/api/latest"
+	"k8s.io/kubernetes/pkg/apis/componentconfig"
+)
+
+func TestCodec(t *testing.T) {
+	daemonSet := componentconfig.KubeProxyConfiguration{}
+	// We do want to use package latest rather than testapi here, because we
+	// want to test if the package install and package latest work as expected.
+	data, err := latest.GroupOrDie("componentconfig").Codec.Encode(&daemonSet)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	other := componentconfig.KubeProxyConfiguration{}
+	if err := json.Unmarshal(data, &other); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if other.APIVersion != latest.GroupOrDie("componentconfig").GroupVersion || other.Kind != "KubeProxyConfiguration" {
+		t.Errorf("unexpected unmarshalled object %#v", other)
+	}
+}
+
+func TestInterfacesFor(t *testing.T) {
+	if _, err := latest.GroupOrDie("componentconfig").InterfacesFor(""); err == nil {
+		t.Fatalf("unexpected non-error: %v", err)
+	}
+	for i, groupVersion := range append([]string{latest.GroupOrDie("componentconfig").GroupVersion}, latest.GroupOrDie("componentconfig").GroupVersions...) {
+		if vi, err := latest.GroupOrDie("componentconfig").InterfacesFor(groupVersion); err != nil || vi == nil {
+			t.Fatalf("%d: unexpected result: %v", i, err)
+		}
+	}
+}
+
+func TestRESTMapper(t *testing.T) {
+	if v, k, err := latest.GroupOrDie("componentconfig").RESTMapper.VersionAndKindForResource("kubeproxyconfiguration"); err != nil || v != "componentconfig/v1alpha1" || k != "KubeProxyConfiguration" {
+		t.Errorf("unexpected version mapping: %s %s %v", v, k, err)
+	}
+
+	if m, err := latest.GroupOrDie("componentconfig").RESTMapper.RESTMapping("KubeProxyConfiguration", ""); err != nil || m.APIVersion != "componentconfig/v1alpha1" || m.Resource != "kubeproxyconfigurations" {
+		t.Errorf("unexpected version mapping: %#v %v", m, err)
+	}
+
+	for _, groupVersion := range latest.GroupOrDie("componentconfig").GroupVersions {
+		mapping, err := latest.GroupOrDie("componentconfig").RESTMapper.RESTMapping("KubeProxyConfiguration", groupVersion)
+		if err != nil {
+			t.Errorf("unexpected error: %v", err)
+		}
+
+		if mapping.Resource != "kubeproxyconfigurations" {
+			t.Errorf("incorrect resource name: %#v", mapping)
+		}
+		if mapping.APIVersion != groupVersion {
+			t.Errorf("incorrect groupVersion: %v", mapping)
+		}
+
+		interfaces, _ := latest.GroupOrDie("componentconfig").InterfacesFor(groupVersion)
+		if mapping.Codec != interfaces.Codec {
+			t.Errorf("unexpected codec: %#v, expected: %#v", mapping, interfaces)
+		}
+	}
+}

pkg/apis/componentconfig/register.go

+/*
+Copyright 2015 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package componentconfig
+
+import (
+	"k8s.io/kubernetes/pkg/api"
+)
+
+func init() {
+	addKnownTypes()
+}
+
+func addKnownTypes() {
+	api.Scheme.AddKnownTypes("",
+		&KubeProxyConfiguration{},
+	)
+}
+
+func (_ *KubeProxyConfiguration) IsAnAPIObject() {}

pkg/apis/componentconfig/types.go

+/*
+Copyright 2015 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package componentconfig
+
+import "k8s.io/kubernetes/pkg/api/unversioned"
+
+type KubeProxyConfiguration struct {
+	unversioned.TypeMeta
+
+	// bindAddress is the IP address for the proxy server to serve on (set to 0.0.0.0 for all interfaces)
+	BindAddress string `json:"bindAddress"`
+	// cleanupIPTables
+	CleanupIPTables bool `json:"cleanupIPTables"`
+	// healthzBindAddress is the IP address for the health check server to serve on, defaulting to 127.0.0.1 (set to 0.0.0.0 for all interfaces)
+	HealthzBindAddress string `json:"healthzBindAddress"`
+	// healthzPort is the port to bind the health check server. Use 0 to disable.
+	HealthzPort int `json:"healthzPort"`
+	// hostnameOverride, if non-empty, will be used as the identity instead of the actual hostname.
+	HostnameOverride string `json:"hostnameOverride"`
+	// iptablesSyncPeriodSeconds is the period that iptables rules are refreshed (e.g. '5s', '1m', '2h22m').  Must be greater than 0.
+	IPTablesSyncePeriodSeconds int `json:"iptablesSyncPeriodSeconds"`
+	// kubeAPIBurst is the burst to use while talking with kubernetes apiserver
+	KubeAPIBurst int `json:"kubeAPIBurst"`
+	// kubeAPIQPS is the max QPS to use while talking with kubernetes apiserver
+	KubeAPIQPS int `json:"kubeAPIQPS"`
+	// kubeconfigPath is the path to the kubeconfig file with authorization information (the master location is set by the master flag).
+	KubeconfigPath string `json:"kubeconfigPath"`
+	// masqueradeAll tells kube-proxy to SNAT everything if using the pure iptables proxy mode.
+	MasqueradeAll bool `json:"masqueradeAll"`
+	// master is the address of the Kubernetes API server (overrides any value in kubeconfig)
+	Master string `json:"master"`
+	// oomScoreAdj is the oom-score-adj value for kube-proxy process. Values must be within the range [-1000, 1000]
+	OOMScoreAdj *int `json:"oomScoreAdj"`
+	// mode specifies which proxy mode to use.
+	Mode ProxyMode `json:"mode"`
+	// portRange is the range of host ports (beginPort-endPort, inclusive) that may be consumed in order to proxy service traffic. If unspecified (0-0) then ports will be randomly chosen.
+	PortRange string `json:"portRange"`
+	// resourceContainer is the bsolute name of the resource-only container to create and run the Kube-proxy in (Default: /kube-proxy).
+	ResourceContainer string `json:"resourceContainer"`
+	// udpTimeoutMilliseconds is how long an idle UDP connection will be kept open (e.g. '250ms', '2s').  Must be greater than 0. Only applicable for proxyMode=userspace.
+	UDPTimeoutMilliseconds int `json:"udpTimeoutMilliseconds"`
+}
+
+// Currently two modes of proxying are available: 'userspace' (older, stable) or 'iptables' (experimental). If blank, look at the Node object on the Kubernetes API and respect the 'net.experimental.kubernetes.io/proxy-mode' annotation if provided.  Otherwise use the best-available proxy (currently userspace, but may change in future versions).  If the iptables proxy is selected, regardless of how, but the system's kernel or iptables versions are insufficient, this always falls back to the userspace proxy.
+type ProxyMode string
+
+const (
+	ProxyModeUserspace ProxyMode = "userspace"
+	ProxyModeIPTables  ProxyMode = "iptables"
+)

pkg/apis/componentconfig/v1alpha1/conversion_generated.go

+/*
+Copyright 2015 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// DO NOT EDIT. THIS FILE IS AUTO-GENERATED BY $KUBEROOT/hack/update-generated-conversions.sh
+
+package v1alpha1
+
+import (
+	reflect "reflect"
+
+	api "k8s.io/kubernetes/pkg/api"
+	componentconfig "k8s.io/kubernetes/pkg/apis/componentconfig"
+	conversion "k8s.io/kubernetes/pkg/conversion"
+)
+
+func autoconvert_componentconfig_KubeProxyConfiguration_To_v1alpha1_KubeProxyConfiguration(in *componentconfig.KubeProxyConfiguration, out *KubeProxyConfiguration, s conversion.Scope) error {
+	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
+		defaulting.(func(*componentconfig.KubeProxyConfiguration))(in)
+	}
+	if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil {
+		return err
+	}
+	out.BindAddress = in.BindAddress
+	out.CleanupIPTables = in.CleanupIPTables
+	out.HealthzBindAddress = in.HealthzBindAddress
+	out.HealthzPort = in.HealthzPort
+	out.HostnameOverride = in.HostnameOverride
+	out.IPTablesSyncePeriodSeconds = in.IPTablesSyncePeriodSeconds
+	out.KubeAPIBurst = in.KubeAPIBurst
+	out.KubeAPIQPS = in.KubeAPIQPS
+	out.KubeconfigPath = in.KubeconfigPath
+	out.MasqueradeAll = in.MasqueradeAll
+	out.Master = in.Master
+	if in.OOMScoreAdj != nil {
+		out.OOMScoreAdj = new(int)
+		*out.OOMScoreAdj = *in.OOMScoreAdj
+	} else {
+		out.OOMScoreAdj = nil
+	}
+	out.Mode = ProxyMode(in.Mode)
+	out.PortRange = in.PortRange
+	out.ResourceContainer = in.ResourceContainer
+	out.UDPTimeoutMilliseconds = in.UDPTimeoutMilliseconds
+	return nil
+}
+
+func convert_componentconfig_KubeProxyConfiguration_To_v1alpha1_KubeProxyConfiguration(in *componentconfig.KubeProxyConfiguration, out *KubeProxyConfiguration, s conversion.Scope) error {
+	return autoconvert_componentconfig_KubeProxyConfiguration_To_v1alpha1_KubeProxyConfiguration(in, out, s)
+}
+
+func autoconvert_v1alpha1_KubeProxyConfiguration_To_componentconfig_KubeProxyConfiguration(in *KubeProxyConfiguration, out *componentconfig.KubeProxyConfiguration, s conversion.Scope) error {
+	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
+		defaulting.(func(*KubeProxyConfiguration))(in)
+	}
+	if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil {
+		return err
+	}
+	out.BindAddress = in.BindAddress
+	out.CleanupIPTables = in.CleanupIPTables
+	out.HealthzBindAddress = in.HealthzBindAddress
+	out.HealthzPort = in.HealthzPort
+	out.HostnameOverride = in.HostnameOverride
+	out.IPTablesSyncePeriodSeconds = in.IPTablesSyncePeriodSeconds
+	out.KubeAPIBurst = in.KubeAPIBurst
+	out.KubeAPIQPS = in.KubeAPIQPS
+	out.KubeconfigPath = in.KubeconfigPath
+	out.MasqueradeAll = in.MasqueradeAll
+	out.Master = in.Master
+	if in.OOMScoreAdj != nil {
+		out.OOMScoreAdj = new(int)
+		*out.OOMScoreAdj = *in.OOMScoreAdj
+	} else {
+		out.OOMScoreAdj = nil
+	}
+	out.Mode = componentconfig.ProxyMode(in.Mode)
+	out.PortRange = in.PortRange
+	out.ResourceContainer = in.ResourceContainer
+	out.UDPTimeoutMilliseconds = in.UDPTimeoutMilliseconds
+	return nil
+}
+
+func convert_v1alpha1_KubeProxyConfiguration_To_componentconfig_KubeProxyConfiguration(in *KubeProxyConfiguration, out *componentconfig.KubeProxyConfiguration, s conversion.Scope) error {
+	return autoconvert_v1alpha1_KubeProxyConfiguration_To_componentconfig_KubeProxyConfiguration(in, out, s)
+}
+
+func init() {
+	err := api.Scheme.AddGeneratedConversionFuncs(
+		autoconvert_componentconfig_KubeProxyConfiguration_To_v1alpha1_KubeProxyConfiguration,
+		autoconvert_v1alpha1_KubeProxyConfiguration_To_componentconfig_KubeProxyConfiguration,
+	)
+	if err != nil {
+		// If one of the conversion functions is malformed, detect it immediately.
+		panic(err)
+	}
+}

pkg/apis/componentconfig/v1alpha1/deep_copy_generated.go

+/*
+Copyright 2015 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// DO NOT EDIT. THIS FILE IS AUTO-GENERATED BY $KUBEROOT/hack/update-generated-deep-copies.sh.
+
+package v1alpha1
+
+import (
+	api "k8s.io/kubernetes/pkg/api"
+	unversioned "k8s.io/kubernetes/pkg/api/unversioned"
+	conversion "k8s.io/kubernetes/pkg/conversion"
+)
+
+func deepCopy_unversioned_TypeMeta(in unversioned.TypeMeta, out *unversioned.TypeMeta, c *conversion.Cloner) error {
+	out.Kind = in.Kind
+	out.APIVersion = in.APIVersion
+	return nil
+}
+
+func deepCopy_v1alpha1_KubeProxyConfiguration(in KubeProxyConfiguration, out *KubeProxyConfiguration, c *conversion.Cloner) error {
+	if err := deepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
+		return err
+	}
+	out.BindAddress = in.BindAddress
+	out.CleanupIPTables = in.CleanupIPTables
+	out.HealthzBindAddress = in.HealthzBindAddress
+	out.HealthzPort = in.HealthzPort
+	out.HostnameOverride = in.HostnameOverride
+	out.IPTablesSyncePeriodSeconds = in.IPTablesSyncePeriodSeconds
+	out.KubeAPIBurst = in.KubeAPIBurst
+	out.KubeAPIQPS = in.KubeAPIQPS
+	out.KubeconfigPath = in.KubeconfigPath
+	out.MasqueradeAll = in.MasqueradeAll
+	out.Master = in.Master
+	if in.OOMScoreAdj != nil {
+		out.OOMScoreAdj = new(int)
+		*out.OOMScoreAdj = *in.OOMScoreAdj
+	} else {
+		out.OOMScoreAdj = nil
+	}
+	out.Mode = in.Mode
+	out.PortRange = in.PortRange
+	out.ResourceContainer = in.ResourceContainer
+	out.UDPTimeoutMilliseconds = in.UDPTimeoutMilliseconds
+	return nil
+}
+
+func init() {
+	err := api.Scheme.AddGeneratedDeepCopyFuncs(
+		deepCopy_unversioned_TypeMeta,
+		deepCopy_v1alpha1_KubeProxyConfiguration,
+	)
+	if err != nil {
+		// if one of the deep copy functions is malformed, detect it immediately.
+		panic(err)
+	}
+}

pkg/apis/componentconfig/v1alpha1/defaults.go

+/*
+Copyright 2015 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1alpha1
+
+import (
+	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/kubelet/qos"
+)
+
+func addDefaultingFuncs() {
+	api.Scheme.AddDefaultingFuncs(
+		func(obj *KubeProxyConfiguration) {
+			if obj.BindAddress == "" {
+				obj.BindAddress = "0.0.0.0"
+			}
+			if obj.HealthzPort == 0 {
+				obj.HealthzPort = 10249
+			}
+			if obj.HealthzBindAddress == "" {
+				obj.HealthzBindAddress = "127.0.0.1"
+			}
+			if obj.OOMScoreAdj == nil {
+				temp := qos.KubeProxyOOMScoreAdj
+				obj.OOMScoreAdj = &temp
+			}
+			if obj.ResourceContainer == "" {
+				obj.ResourceContainer = "/kube-proxy"
+			}
+			if obj.IPTablesSyncePeriodSeconds == 0 {
+				obj.IPTablesSyncePeriodSeconds = 5
+			}
+		},
+	)
+}

pkg/apis/componentconfig/v1alpha1/register.go

+/*
+Copyright 2015 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1alpha1
+
+import (
+	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/runtime"
+)
+
+var Codec = runtime.CodecFor(api.Scheme, "componentconfig/v1alpha1")
+
+func init() {
+	addKnownTypes()
+	addDefaultingFuncs()
+}
+
+func addKnownTypes() {
+	api.Scheme.AddKnownTypes("componentconfig/v1alpha1",
+		&KubeProxyConfiguration{},
+	)
+}
+
+func (_ *KubeProxyConfiguration) IsAnAPIObject() {}

pkg/apis/componentconfig/v1alpha1/types.go

+/*
+Copyright 2015 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1alpha1
+
+import "k8s.io/kubernetes/pkg/api/unversioned"
+
+type KubeProxyConfiguration struct {
+	unversioned.TypeMeta
+
+	// bindAddress is the IP address for the proxy server to serve on (set to 0.0.0.0 for all interfaces)
+	BindAddress string `json:"bindAddress"`
+	// cleanupIPTables
+	CleanupIPTables bool `json:"cleanupIPTables"`
+	// healthzBindAddress is the IP address for the health check server to serve on, defaulting to 127.0.0.1 (set to 0.0.0.0 for all interfaces)
+	HealthzBindAddress string `json:"healthzBindAddress"`
+	// healthzPort is the port to bind the health check server. Use 0 to disable.
+	HealthzPort int `json:"healthzPort"`
+	// hostnameOverride, if non-empty, will be used as the identity instead of the actual hostname.
+	HostnameOverride string `json:"hostnameOverride"`
+	// iptablesSyncPeriodSeconds is the period that iptables rules are refreshed (e.g. '5s', '1m', '2h22m').  Must be greater than 0.
+	IPTablesSyncePeriodSeconds int `json:"iptablesSyncPeriodSeconds"`
+	// kubeAPIBurst is the burst to use while talking with kubernetes apiserver
+	KubeAPIBurst int `json:"kubeAPIBurst"`
+	// kubeAPIQPS is the max QPS to use while talking with kubernetes apiserver
+	KubeAPIQPS int `json:"kubeAPIQPS"`
+	// kubeconfigPath is the path to the kubeconfig file with authorization information (the master location is set by the master flag).
+	KubeconfigPath string `json:"kubeconfigPath"`
+	// masqueradeAll tells kube-proxy to SNAT everything if using the pure iptables proxy mode.
+	MasqueradeAll bool `json:"masqueradeAll"`
+	// master is the address of the Kubernetes API server (overrides any value in kubeconfig)
+	Master string `json:"master"`
+	// oomScoreAdj is the oom-score-adj value for kube-proxy process. Values must be within the range [-1000, 1000]
+	OOMScoreAdj *int `json:"oomScoreAdj"`
+	// mode specifies which proxy mode to use.
+	Mode ProxyMode `json:"mode"`
+	// portRange is the range of host ports (beginPort-endPort, inclusive) that may be consumed in order to proxy service traffic. If unspecified (0-0) then ports will be randomly chosen.
+	PortRange string `json:"portRange"`
+	// resourceContainer is the bsolute name of the resource-only container to create and run the Kube-proxy in (Default: /kube-proxy).
+	ResourceContainer string `json:"resourceContainer"`
+	// udpTimeoutMilliseconds is how long an idle UDP connection will be kept open (e.g. '250ms', '2s').  Must be greater than 0. Only applicable for proxyMode=userspace.
+	UDPTimeoutMilliseconds int `json:"udpTimeoutMilliseconds"`
+}
+
+// Currently two modes of proxying are available: 'userspace' (older, stable) or 'iptables' (experimental). If blank, look at the Node object on the Kubernetes API and respect the 'net.experimental.kubernetes.io/proxy-mode' annotation if provided.  Otherwise use the best-available proxy (currently userspace, but may change in future versions).  If the iptables proxy is selected, regardless of how, but the system's kernel or iptables versions are insufficient, this always falls back to the userspace proxy.
+type ProxyMode string
+
+const (
+	ProxyModeUserspace ProxyMode = "userspace"
+	ProxyModeIPTables  ProxyMode = "iptables"
+)

pkg/client/unversioned/import_known_versions.go

@@ -19,5 +19,6 @@ package unversioned
 // These imports are the API groups the client will support.
 import (
 	_ "k8s.io/kubernetes/pkg/api/install"
+	_ "k8s.io/kubernetes/pkg/apis/componentconfig/install"
 	_ "k8s.io/kubernetes/pkg/apis/extensions/install"
 )

pkg/master/import_known_versions.go

@@ -19,5 +19,6 @@ package master
 // These imports are the API groups the API server will support.
 import (
 	_ "k8s.io/kubernetes/pkg/api/install"
+	_ "k8s.io/kubernetes/pkg/apis/componentconfig/install"
 	_ "k8s.io/kubernetes/pkg/apis/extensions/install"
 )