diff --git a/cmd/kubeadm/app/util/config/testdata/conversion/master/internal.yaml b/cmd/kubeadm/app/util/config/testdata/conversion/master/internal.yaml index c10a4c6f79b..a2d266011e0 100644 --- a/cmd/kubeadm/app/util/config/testdata/conversion/master/internal.yaml +++ b/cmd/kubeadm/app/util/config/testdata/conversion/master/internal.yaml @@ -23,6 +23,140 @@ BootstrapTokens: CIImageRepository: "" CertificatesDir: /etc/kubernetes/pki ClusterName: kubernetes +ComponentConfigs: + KubeProxy: + BindAddress: 0.0.0.0 + ClientConnection: + AcceptContentTypes: "" + Burst: 10 + ContentType: application/vnd.kubernetes.protobuf + KubeConfigFile: /var/lib/kube-proxy/kubeconfig.conf + QPS: 5 + ClusterCIDR: "" + ConfigSyncPeriod: 15m0s + Conntrack: + Max: null + MaxPerCore: 32768 + Min: 131072 + TCPCloseWaitTimeout: 1h0m0s + TCPEstablishedTimeout: 24h0m0s + EnableProfiling: false + FeatureGates: + ServiceNodeExclusion: true + SupportIPVSProxyMode: true + HealthzBindAddress: 0.0.0.0:10256 + HostnameOverride: "" + IPTables: + MasqueradeAll: false + MasqueradeBit: 14 + MinSyncPeriod: 0s + SyncPeriod: 30s + IPVS: + ExcludeCIDRs: null + MinSyncPeriod: 0s + Scheduler: "" + SyncPeriod: 30s + MetricsBindAddress: 127.0.0.1:10249 + Mode: iptables + NodePortAddresses: null + OOMScoreAdj: -999 + PortRange: "" + ResourceContainer: /kube-proxy + UDPIdleTimeout: 250ms + Kubelet: + Address: 1.2.3.4 + Authentication: + Anonymous: + Enabled: false + Webhook: + CacheTTL: 2m0s + Enabled: true + X509: + ClientCAFile: /etc/kubernetes/pki/ca.crt + Authorization: + Mode: Webhook + Webhook: + CacheAuthorizedTTL: 5m0s + CacheUnauthorizedTTL: 30s + CPUCFSQuota: true + CPUManagerPolicy: none + CPUManagerReconcilePeriod: 10s + CgroupDriver: cgroupfs + CgroupRoot: "" + CgroupsPerQOS: true + ClusterDNS: + - 10.96.0.10 + ClusterDomain: cluster.local + ConfigMapAndSecretChangeDetectionStrategy: Watch + ContainerLogMaxFiles: 5 + ContainerLogMaxSize: 10Mi + ContentType: application/vnd.kubernetes.protobuf + EnableContentionProfiling: false + EnableControllerAttachDetach: true + EnableDebuggingHandlers: true + EnforceNodeAllocatable: + - pods + EventBurst: 10 + EventRecordQPS: 5 + EvictionHard: + imagefs.available: 15% + memory.available: 100Mi + nodefs.available: 10% + nodefs.inodesFree: 5% + EvictionMaxPodGracePeriod: 0 + EvictionMinimumReclaim: null + EvictionPressureTransitionPeriod: 5m0s + EvictionSoft: null + EvictionSoftGracePeriod: null + FailSwapOn: true + FeatureGates: null + FileCheckFrequency: 20s + HTTPCheckFrequency: 20s + HairpinMode: promiscuous-bridge + HealthzBindAddress: 127.0.0.1 + HealthzPort: 10248 + IPTablesDropBit: 15 + IPTablesMasqueradeBit: 14 + ImageGCHighThresholdPercent: 85 + ImageGCLowThresholdPercent: 80 + ImageMinimumGCAge: 2m0s + KubeAPIBurst: 10 + KubeAPIQPS: 5 + KubeReserved: null + KubeReservedCgroup: "" + KubeletCgroups: "" + MakeIPTablesUtilChains: true + MaxOpenFiles: 1000000 + MaxPods: 110 + NodeStatusUpdateFrequency: 10s + OOMScoreAdj: -999 + PodCIDR: "" + PodPidsLimit: -1 + PodsPerCore: 0 + Port: 10250 + ProtectKernelDefaults: false + QOSReserved: null + ReadOnlyPort: 0 + RegistryBurst: 10 + RegistryPullQPS: 5 + ResolverConfig: /etc/resolv.conf + RotateCertificates: true + RuntimeRequestTimeout: 2m0s + SerializeImagePulls: true + ServerTLSBootstrap: false + StaticPodPath: /etc/kubernetes/manifests + StaticPodURL: "" + StaticPodURLHeader: null + StreamingConnectionIdleTimeout: 4h0m0s + SyncFrequency: 1m0s + SystemCgroups: "" + SystemReserved: null + SystemReservedCgroup: "" + TLSCertFile: "" + TLSCipherSuites: null + TLSMinVersion: "" + TLSPrivateKeyFile: "" + VolumeStatsAggPeriod: 1m0s ControllerManagerExtraArgs: null ControllerManagerExtraVolumes: null Etcd: @@ -35,116 +169,6 @@ Etcd: ServerCertSANs: null FeatureGates: null ImageRepository: k8s.gcr.io -KubeProxy: - Config: - bindAddress: 0.0.0.0 - clientConnection: - acceptContentTypes: "" - burst: 10 - contentType: application/vnd.kubernetes.protobuf - kubeconfig: /var/lib/kube-proxy/kubeconfig.conf - qps: 5 - clusterCIDR: "" - configSyncPeriod: 15m0s - conntrack: - max: null - maxPerCore: 32768 - min: 131072 - tcpCloseWaitTimeout: 1h0m0s - tcpEstablishedTimeout: 24h0m0s - enableProfiling: false - featureGates: - ServiceNodeExclusion: true - SupportIPVSProxyMode: true - healthzBindAddress: 0.0.0.0:10256 - hostnameOverride: "" - iptables: - masqueradeAll: false - masqueradeBit: 14 - minSyncPeriod: 0s - syncPeriod: 30s - ipvs: - excludeCIDRs: null - minSyncPeriod: 0s - scheduler: "" - syncPeriod: 30s - metricsBindAddress: 127.0.0.1:10249 - mode: "" - nodePortAddresses: null - oomScoreAdj: -999 - portRange: "" - resourceContainer: /kube-proxy - udpIdleTimeout: 250ms -KubeletConfiguration: - BaseConfig: - address: 0.0.0.0 - authentication: - anonymous: - enabled: false - webhook: - cacheTTL: 2m0s - enabled: true - x509: - clientCAFile: /etc/kubernetes/pki/ca.crt - authorization: - mode: Webhook - webhook: - cacheAuthorizedTTL: 5m0s - cacheUnauthorizedTTL: 30s - cgroupDriver: cgroupfs - cgroupsPerQOS: true - clusterDNS: - - 10.96.0.10 - clusterDomain: cluster.local - configMapAndSecretChangeDetectionStrategy: Watch - containerLogMaxFiles: 5 - containerLogMaxSize: 10Mi - contentType: application/vnd.kubernetes.protobuf - cpuCFSQuota: true - cpuManagerPolicy: none - cpuManagerReconcilePeriod: 10s - enableControllerAttachDetach: true - enableDebuggingHandlers: true - enforceNodeAllocatable: - - pods - eventBurst: 10 - eventRecordQPS: 5 - evictionHard: - imagefs.available: 15% - memory.available: 100Mi - nodefs.available: 10% - nodefs.inodesFree: 5% - evictionPressureTransitionPeriod: 5m0s - failSwapOn: true - fileCheckFrequency: 20s - hairpinMode: promiscuous-bridge - healthzBindAddress: 127.0.0.1 - healthzPort: 10248 - httpCheckFrequency: 20s - imageGCHighThresholdPercent: 85 - imageGCLowThresholdPercent: 80 - imageMinimumGCAge: 2m0s - iptablesDropBit: 15 - iptablesMasqueradeBit: 14 - kubeAPIBurst: 10 - kubeAPIQPS: 5 - makeIPTablesUtilChains: true - maxOpenFiles: 1000000 - maxPods: 110 - nodeStatusUpdateFrequency: 10s - oomScoreAdj: -999 - podPidsLimit: -1 - port: 10250 - registryBurst: 10 - registryPullQPS: 5 - resolvConf: /etc/resolv.conf - rotateCertificates: true - runtimeRequestTimeout: 2m0s - serializeImagePulls: true - staticPodPath: /etc/kubernetes/manifests - streamingConnectionIdleTimeout: 4h0m0s - syncFrequency: 1m0s - volumeStatsAggPeriod: 1m0s KubernetesVersion: v1.10.2 Networking: DNSDomain: cluster.local diff --git a/cmd/kubeadm/app/util/config/testdata/conversion/master/v1alpha2.yaml b/cmd/kubeadm/app/util/config/testdata/conversion/master/v1alpha2.yaml index b0c29b43553..06fd21a2ce1 100644 --- a/cmd/kubeadm/app/util/config/testdata/conversion/master/v1alpha2.yaml +++ b/cmd/kubeadm/app/util/config/testdata/conversion/master/v1alpha2.yaml @@ -59,7 +59,7 @@ kubeProxy: scheduler: "" syncPeriod: 30s metricsBindAddress: 127.0.0.1:10249 - mode: "" + mode: iptables nodePortAddresses: null oomScoreAdj: -999 portRange: "" @@ -67,7 +67,7 @@ kubeProxy: udpIdleTimeout: 250ms kubeletConfiguration: baseConfig: - address: 0.0.0.0 + address: 1.2.3.4 authentication: anonymous: enabled: false diff --git a/cmd/kubeadm/app/util/config/testdata/conversion/master/v1alpha3.yaml b/cmd/kubeadm/app/util/config/testdata/conversion/master/v1alpha3.yaml index 2b08a804f2f..8a20ba41b50 100644 --- a/cmd/kubeadm/app/util/config/testdata/conversion/master/v1alpha3.yaml +++ b/cmd/kubeadm/app/util/config/testdata/conversion/master/v1alpha3.yaml @@ -59,7 +59,7 @@ kubeProxy: scheduler: "" syncPeriod: 30s metricsBindAddress: 127.0.0.1:10249 - mode: "" + mode: iptables nodePortAddresses: null oomScoreAdj: -999 portRange: "" @@ -67,7 +67,7 @@ kubeProxy: udpIdleTimeout: 250ms kubeletConfiguration: baseConfig: - address: 0.0.0.0 + address: 1.2.3.4 authentication: anonymous: enabled: false