github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #74590 from vanduc95/cleanup-kubeadm-cont.6-20190226 

kubeadm cleanup: master -> control-plane (cont.6)
pull/564/head
Kubernetes Prow Robot 2019-02-26 15:30:03 -08:00 committed by GitHub
parent 493b261057 3759fcd4c8
commit e64336e94b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubeadm/app/cmd/upgrade/diff_test.go
View File

@ -22,7 +22,7 @@ import (
) )
const ( const (
testUpgradeDiffConfig = `testdata/diff_master_config.yaml` testUpgradeDiffConfig = `testdata/diff_controlplane_config.yaml`
testUpgradeDiffManifest = `testdata/diff_dummy_manifest.yaml` testUpgradeDiffManifest = `testdata/diff_dummy_manifest.yaml`
) )

0
cmd/kubeadm/app/cmd/upgrade/testdata/diff_master_config.yaml → cmd/kubeadm/app/cmd/upgrade/testdata/diff_controlplane_config.yaml vendored
View File

2
cmd/kubeadm/app/util/config/testdata/conversion/controlplane/internal.yaml vendored
View File

@ -198,7 +198,7 @@ Networking:
NodeRegistration: NodeRegistration:
CRISocket: /var/run/dockershim.sock CRISocket: /var/run/dockershim.sock
KubeletExtraArgs: null KubeletExtraArgs: null
Name: master-1 Name: control-plane-1
Taints: Taints:
- effect: NoSchedule - effect: NoSchedule
key: node-role.kubernetes.io/master key: node-role.kubernetes.io/master

2
cmd/kubeadm/app/util/config/testdata/conversion/controlplane/internal_non_linux.yaml vendored
View File

@ -197,7 +197,7 @@ Networking:
NodeRegistration: NodeRegistration:
CRISocket: /var/run/dockershim.sock CRISocket: /var/run/dockershim.sock
KubeletExtraArgs: null KubeletExtraArgs: null
Name: master-1 Name: control-plane-1
Taints: Taints:
- effect: NoSchedule - effect: NoSchedule
key: node-role.kubernetes.io/master key: node-role.kubernetes.io/master

2
cmd/kubeadm/app/util/config/testdata/conversion/controlplane/v1alpha3.yaml vendored
View File

@ -13,7 +13,7 @@ bootstrapTokens:
kind: InitConfiguration kind: InitConfiguration
nodeRegistration: nodeRegistration:
criSocket: /var/run/dockershim.sock criSocket: /var/run/dockershim.sock
name: master-1 name: control-plane-1
taints: taints:
- effect: NoSchedule - effect: NoSchedule
key: node-role.kubernetes.io/master key: node-role.kubernetes.io/master

2
cmd/kubeadm/app/util/config/testdata/conversion/controlplane/v1alpha3_non_linux.yaml vendored
View File

@ -13,7 +13,7 @@ bootstrapTokens:
kind: InitConfiguration kind: InitConfiguration
nodeRegistration: nodeRegistration:
criSocket: /var/run/dockershim.sock criSocket: /var/run/dockershim.sock
name: master-1 name: control-plane-1
taints: taints:
- effect: NoSchedule - effect: NoSchedule
key: node-role.kubernetes.io/master key: node-role.kubernetes.io/master

2
cmd/kubeadm/app/util/config/testdata/conversion/controlplane/v1beta1.yaml vendored
View File

@ -13,7 +13,7 @@ localAPIEndpoint:
bindPort: 6443 bindPort: 6443
nodeRegistration: nodeRegistration:
criSocket: /var/run/dockershim.sock criSocket: /var/run/dockershim.sock
name: master-1 name: control-plane-1
taints: taints:
- effect: NoSchedule - effect: NoSchedule
key: node-role.kubernetes.io/master key: node-role.kubernetes.io/master

2
cmd/kubeadm/app/util/config/testdata/conversion/controlplane/v1beta1_non_linux.yaml vendored
View File

@ -13,7 +13,7 @@ localAPIEndpoint:
bindPort: 6443 bindPort: 6443
nodeRegistration: nodeRegistration:
criSocket: /var/run/dockershim.sock criSocket: /var/run/dockershim.sock
name: master-1 name: control-plane-1
taints: taints:
- effect: NoSchedule - effect: NoSchedule
key: node-role.kubernetes.io/master key: node-role.kubernetes.io/master

2
cmd/kubeadm/app/util/config/testdata/conversion/node/internal.yaml vendored
View File

@ -15,7 +15,7 @@ Discovery:
NodeRegistration: NodeRegistration:
CRISocket: /var/run/dockershim.sock CRISocket: /var/run/dockershim.sock
KubeletExtraArgs: null KubeletExtraArgs: null
Name: master-1 Name: control-plane-1
Taints: Taints:
- effect: NoSchedule - effect: NoSchedule
key: node-role.kubernetes.io/master key: node-role.kubernetes.io/master

2
cmd/kubeadm/app/util/config/testdata/conversion/node/v1alpha3.yaml vendored
View File

@ -13,7 +13,7 @@ discoveryTokenUnsafeSkipCAVerification: true
kind: JoinConfiguration kind: JoinConfiguration
nodeRegistration: nodeRegistration:
criSocket: /var/run/dockershim.sock criSocket: /var/run/dockershim.sock
name: master-1 name: control-plane-1
taints: taints:
- effect: NoSchedule - effect: NoSchedule
key: node-role.kubernetes.io/master key: node-role.kubernetes.io/master

2
cmd/kubeadm/app/util/config/testdata/conversion/node/v1beta1.yaml vendored
View File

@ -14,7 +14,7 @@ discovery:
kind: JoinConfiguration kind: JoinConfiguration
nodeRegistration: nodeRegistration:
criSocket: /var/run/dockershim.sock criSocket: /var/run/dockershim.sock
name: master-1 name: control-plane-1
taints: taints:
- effect: NoSchedule - effect: NoSchedule
key: node-role.kubernetes.io/master key: node-role.kubernetes.io/master

2
cmd/kubeadm/app/util/config/testdata/defaulting/controlplane/defaulted.yaml vendored
View File

@ -13,7 +13,7 @@ localAPIEndpoint:
bindPort: 6443 bindPort: 6443
nodeRegistration: nodeRegistration:
criSocket: /var/run/criruntime.sock criSocket: /var/run/criruntime.sock
name: master-1 name: control-plane-1
taints: taints:
- effect: NoSchedule - effect: NoSchedule
key: node-role.kubernetes.io/master key: node-role.kubernetes.io/master

2
cmd/kubeadm/app/util/config/testdata/defaulting/controlplane/defaulted_non_linux.yaml vendored
View File

@ -13,7 +13,7 @@ localAPIEndpoint:
bindPort: 6443 bindPort: 6443
nodeRegistration: nodeRegistration:
criSocket: /var/run/criruntime.sock criSocket: /var/run/criruntime.sock
name: master-1 name: control-plane-1
taints: taints:
- effect: NoSchedule - effect: NoSchedule
key: node-role.kubernetes.io/master key: node-role.kubernetes.io/master

2
cmd/kubeadm/app/util/config/testdata/defaulting/controlplane/incomplete.yaml vendored
View File

@ -6,7 +6,7 @@ localAPIEndpoint:
advertiseAddress: 192.168.2.2 advertiseAddress: 192.168.2.2
nodeRegistration: nodeRegistration:
criSocket: /var/run/criruntime.sock criSocket: /var/run/criruntime.sock
name: master-1 name: control-plane-1
--- ---
apiVersion: kubeadm.k8s.io/v1beta1 apiVersion: kubeadm.k8s.io/v1beta1
certificatesDir: /var/lib/kubernetes/pki certificatesDir: /var/lib/kubernetes/pki