Fix: Minor cleanup items
* Freeze busybox version for log validation. * Move static labels to dynamic in remaining places. * Stop using node-role.kubernetes.io/master= label. * Update older coredns image usage. * Add content to plaeholder file to avoid warning. * Add external DNS check to DNS validation check. Change-Id: I9d0665a940ab055e6426aeca9c8e2be269e6b13a
This commit is contained in:
parent
bba438a2ab
commit
40dfad265f
|
@ -10,10 +10,8 @@ data:
|
|||
hostname: n0
|
||||
ip: 192.168.77.10
|
||||
labels:
|
||||
static:
|
||||
- calico-etcd=enabled
|
||||
- node-role.kubernetes.io/master=
|
||||
dynamic:
|
||||
- calico-etcd=enabled
|
||||
- kubernetes-apiserver=enabled
|
||||
- kubernetes-controller-manager=enabled
|
||||
- kubernetes-etcd=enabled
|
||||
|
|
|
@ -13,7 +13,7 @@ data:
|
|||
tar_path: kubernetes/node/bin/kubelet
|
||||
mode: 0555
|
||||
images:
|
||||
coredns: coredns/coredns:011
|
||||
coredns: coredns/coredns:0.9.9
|
||||
helm:
|
||||
helm: lachlanevenson/k8s-helm:v2.5.1
|
||||
kubernetes:
|
||||
|
|
|
@ -26,8 +26,6 @@ data:
|
|||
ip: 192.168.77.11
|
||||
join_ip: 192.168.77.10
|
||||
labels:
|
||||
static:
|
||||
- node-role.kubernetes.io/master=
|
||||
dynamic:
|
||||
- calico-etcd=enabled
|
||||
- kubernetes-apiserver=enabled
|
||||
|
@ -48,8 +46,6 @@ data:
|
|||
ip: 192.168.77.12
|
||||
join_ip: 192.168.77.10
|
||||
labels:
|
||||
static:
|
||||
- node-role.kubernetes.io/master=
|
||||
dynamic:
|
||||
- calico-etcd=enabled
|
||||
- kubernetes-apiserver=enabled
|
||||
|
@ -70,8 +66,6 @@ data:
|
|||
ip: 192.168.77.13
|
||||
join_ip: 192.168.77.11
|
||||
labels:
|
||||
static:
|
||||
- node-role.kubernetes.io/master=
|
||||
dynamic:
|
||||
- calico-etcd=enabled
|
||||
- kubernetes-apiserver=enabled
|
||||
|
|
|
@ -10,10 +10,8 @@ data:
|
|||
hostname: n0
|
||||
ip: 192.168.77.10
|
||||
labels:
|
||||
static:
|
||||
- calico-etcd=enabled
|
||||
- node-role.kubernetes.io/master=
|
||||
dynamic:
|
||||
- calico-etcd=enabled
|
||||
- ceph-mds=enabled
|
||||
- ceph-mon=enabled
|
||||
- ceph-osd=enabled
|
||||
|
|
|
@ -13,7 +13,7 @@ data:
|
|||
tar_path: kubernetes/node/bin/kubelet
|
||||
mode: 0555
|
||||
images:
|
||||
coredns: coredns/coredns:011
|
||||
coredns: coredns/coredns:0.9.9
|
||||
helm:
|
||||
helm: lachlanevenson/k8s-helm:v2.5.1
|
||||
kubernetes:
|
||||
|
|
|
@ -30,8 +30,6 @@ data:
|
|||
ip: 192.168.77.11
|
||||
join_ip: 192.168.77.10
|
||||
labels:
|
||||
static:
|
||||
- node-role.kubernetes.io/master=
|
||||
dynamic:
|
||||
- calico-etcd=enabled
|
||||
- ceph-mds=enabled
|
||||
|
@ -56,8 +54,6 @@ data:
|
|||
ip: 192.168.77.12
|
||||
join_ip: 192.168.77.10
|
||||
labels:
|
||||
static:
|
||||
- node-role.kubernetes.io/master=
|
||||
dynamic:
|
||||
- calico-etcd=enabled
|
||||
- ceph-mds=enabled
|
||||
|
@ -82,8 +78,6 @@ data:
|
|||
ip: 192.168.77.13
|
||||
join_ip: 192.168.77.11
|
||||
labels:
|
||||
static:
|
||||
- node-role.kubernetes.io/master=
|
||||
dynamic:
|
||||
- calico-etcd=enabled
|
||||
- ceph-mds=enabled
|
||||
|
|
|
@ -78,8 +78,6 @@ data:
|
|||
type: array
|
||||
items:
|
||||
$ref: '#/definitions/kubernetes_label'
|
||||
required:
|
||||
- static
|
||||
additionalProperties: false
|
||||
|
||||
images:
|
||||
|
|
|
@ -234,7 +234,7 @@ spec:
|
|||
kubernetes.io/hostname: ${NODE}
|
||||
containers:
|
||||
- name: noisy
|
||||
image: busybox
|
||||
image: busybox:1.27.1
|
||||
imagePullPolicy: IfNotPresent
|
||||
command:
|
||||
- /bin/echo
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
# placeholder
|
|
@ -487,7 +487,10 @@ data:
|
|||
no_hooks: true
|
||||
values:
|
||||
coredns:
|
||||
cluster_domain: cluster.local
|
||||
kubernetes_zones:
|
||||
- cluster.local
|
||||
- 10.96.0.0/16
|
||||
- 10.97.0.0/16
|
||||
upstream_nameservers:
|
||||
- 8.8.8.8
|
||||
- 8.8.4.4
|
||||
|
|
|
@ -10,10 +10,8 @@ data:
|
|||
hostname: ${GENESIS_HOSTNAME}
|
||||
ip: ${GENESIS_IP}
|
||||
labels:
|
||||
static:
|
||||
- calico-etcd=enabled
|
||||
- node-role.kubernetes.io/master=
|
||||
dynamic:
|
||||
- calico-etcd=enabled
|
||||
- kubernetes-apiserver=enabled
|
||||
- kubernetes-controller-manager=enabled
|
||||
- kubernetes-etcd=enabled
|
||||
|
|
|
@ -11,8 +11,6 @@ data:
|
|||
ip: ${GENESIS_IP}
|
||||
join_ip: ${MASTER1_IP}
|
||||
labels:
|
||||
static:
|
||||
- node-role.kubernetes.io/master=
|
||||
dynamic:
|
||||
- calico-etcd=enabled
|
||||
- ceph-mds=enabled
|
||||
|
@ -40,8 +38,6 @@ data:
|
|||
ip: ${MASTER1_IP}
|
||||
join_ip: ${GENESIS_IP}
|
||||
labels:
|
||||
static:
|
||||
- node-role.kubernetes.io/master=
|
||||
dynamic:
|
||||
- calico-etcd=enabled
|
||||
- ceph-mds=enabled
|
||||
|
@ -69,8 +65,6 @@ data:
|
|||
ip: ${MASTER2_IP}
|
||||
join_ip: ${GENESIS_IP}
|
||||
labels:
|
||||
static:
|
||||
- node-role.kubernetes.io/master=
|
||||
dynamic:
|
||||
- calico-etcd=enabled
|
||||
- ceph-mds=enabled
|
||||
|
|
|
@ -12,6 +12,7 @@ data:
|
|||
service_ip: 10.96.0.10
|
||||
bootstrap_validation_checks:
|
||||
- calico-etcd.kube-system.svc.cluster.local
|
||||
- google.com
|
||||
- kubernetes-etcd.kube-system.svc.cluster.local
|
||||
- kubernetes.default.svc.cluster.local
|
||||
upstream_servers:
|
||||
|
|
Loading…
Reference in New Issue