github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 06:54:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #102770 from pacoxu/kubeadm-example

Browse Source 
kubeadm: use a suggested example in v1beta2/3 docs
This commit is contained in:
Kubernetes Prow Robot 2021-06-10 08:23:47 -07:00 committed by GitHub
commit faa36554c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/kubeadm/app/apis/kubeadm/v1beta2/doc.go
View File

@ -203,8 +203,8 @@ limitations under the License.
// # certFile: "/etcd/kubernetes/pki/etcd/etcd.crt"
// # keyFile: "/etcd/kubernetes/pki/etcd/etcd.key"
// networking:
// serviceSubnet: "10.96.0.0/12"
// podSubnet: "10.100.0.1/24"
// serviceSubnet: "10.96.0.0/16"
// podSubnet: "10.244.0.0/24"
// dnsDomain: "cluster.local"
// kubernetesVersion: "v1.12.0"
// controlPlaneEndpoint: "10.100.0.1:6443"

6
cmd/kubeadm/app/apis/kubeadm/v1beta3/doc.go
View File

@ -204,10 +204,10 @@ limitations under the License.
// # certFile: "/etcd/kubernetes/pki/etcd/etcd.crt"
// # keyFile: "/etcd/kubernetes/pki/etcd/etcd.key"
// networking:
// serviceSubnet: "10.96.0.0/12"
// podSubnet: "10.100.0.1/24"
// serviceSubnet: "10.96.0.0/16"
// podSubnet: "10.244.0.0/24"
// dnsDomain: "cluster.local"
// kubernetesVersion: "v1.12.0"
// kubernetesVersion: "v1.21.0"
// controlPlaneEndpoint: "10.100.0.1:6443"
// apiServer:
// extraArgs: