airship
/
promenade
Code Issues Proposed changes

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:
Mark Burnett 2017-11-02 12:47:07 -05:00
parent bba438a2ab
commit 40dfad265f
13 changed files with 12 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/basic/Genesis.yaml
View File

@ -10,10 +10,8 @@ data:
hostname: n0 hostname: n0
ip: 192.168.77.10 ip: 192.168.77.10
labels: labels:
static:
- calico-etcd=enabled
- node-role.kubernetes.io/master=
dynamic: dynamic:
- calico-etcd=enabled
- kubernetes-apiserver=enabled - kubernetes-apiserver=enabled
- kubernetes-controller-manager=enabled - kubernetes-controller-manager=enabled
- kubernetes-etcd=enabled - kubernetes-etcd=enabled

2
examples/basic/HostSystem.yaml
View File

@ -13,7 +13,7 @@ data:
tar_path: kubernetes/node/bin/kubelet tar_path: kubernetes/node/bin/kubelet
mode: 0555 mode: 0555
images: images:
coredns: coredns/coredns:011 coredns: coredns/coredns:0.9.9
helm: helm:
helm: lachlanevenson/k8s-helm:v2.5.1 helm: lachlanevenson/k8s-helm:v2.5.1
kubernetes: kubernetes:

6
examples/basic/joining-host-config.yaml
View File

@ -26,8 +26,6 @@ data:
ip: 192.168.77.11 ip: 192.168.77.11
join_ip: 192.168.77.10 join_ip: 192.168.77.10
labels: labels:
static:
- node-role.kubernetes.io/master=
dynamic: dynamic:
- calico-etcd=enabled - calico-etcd=enabled
- kubernetes-apiserver=enabled - kubernetes-apiserver=enabled
@ -48,8 +46,6 @@ data:
ip: 192.168.77.12 ip: 192.168.77.12
join_ip: 192.168.77.10 join_ip: 192.168.77.10
labels: labels:
static:
- node-role.kubernetes.io/master=
dynamic: dynamic:
- calico-etcd=enabled - calico-etcd=enabled
- kubernetes-apiserver=enabled - kubernetes-apiserver=enabled
@ -70,8 +66,6 @@ data:
ip: 192.168.77.13 ip: 192.168.77.13
join_ip: 192.168.77.11 join_ip: 192.168.77.11
labels: labels:
static:
- node-role.kubernetes.io/master=
dynamic: dynamic:
- calico-etcd=enabled - calico-etcd=enabled
- kubernetes-apiserver=enabled - kubernetes-apiserver=enabled

4
examples/complete/Genesis.yaml
View File

@ -10,10 +10,8 @@ data:
hostname: n0 hostname: n0
ip: 192.168.77.10 ip: 192.168.77.10
labels: labels:
static:
- calico-etcd=enabled
- node-role.kubernetes.io/master=
dynamic: dynamic:
- calico-etcd=enabled
- ceph-mds=enabled - ceph-mds=enabled
- ceph-mon=enabled - ceph-mon=enabled
- ceph-osd=enabled - ceph-osd=enabled

2
examples/complete/HostSystem.yaml
View File

@ -13,7 +13,7 @@ data:
tar_path: kubernetes/node/bin/kubelet tar_path: kubernetes/node/bin/kubelet
mode: 0555 mode: 0555
images: images:
coredns: coredns/coredns:011 coredns: coredns/coredns:0.9.9
helm: helm:
helm: lachlanevenson/k8s-helm:v2.5.1 helm: lachlanevenson/k8s-helm:v2.5.1
kubernetes: kubernetes:

6
examples/complete/joining-host-config.yaml
View File

@ -30,8 +30,6 @@ data:
ip: 192.168.77.11 ip: 192.168.77.11
join_ip: 192.168.77.10 join_ip: 192.168.77.10
labels: labels:
static:
- node-role.kubernetes.io/master=
dynamic: dynamic:
- calico-etcd=enabled - calico-etcd=enabled
- ceph-mds=enabled - ceph-mds=enabled
@ -56,8 +54,6 @@ data:
ip: 192.168.77.12 ip: 192.168.77.12
join_ip: 192.168.77.10 join_ip: 192.168.77.10
labels: labels:
static:
- node-role.kubernetes.io/master=
dynamic: dynamic:
- calico-etcd=enabled - calico-etcd=enabled
- ceph-mds=enabled - ceph-mds=enabled
@ -82,8 +78,6 @@ data:
ip: 192.168.77.13 ip: 192.168.77.13
join_ip: 192.168.77.11 join_ip: 192.168.77.11
labels: labels:
static:
- node-role.kubernetes.io/master=
dynamic: dynamic:
- calico-etcd=enabled - calico-etcd=enabled
- ceph-mds=enabled - ceph-mds=enabled

2
promenade/schemas/Genesis.yaml
View File

@ -78,8 +78,6 @@ data:
type: array type: array
items: items:
$ref: '#/definitions/kubernetes_label' $ref: '#/definitions/kubernetes_label'
required:
- static
additionalProperties: false additionalProperties: false
images: images:

2
promenade/templates/include/utils.sh
View File

@ -234,7 +234,7 @@ spec:
kubernetes.io/hostname: ${NODE} kubernetes.io/hostname: ${NODE}
containers: containers:
- name: noisy - name: noisy
image: busybox image: busybox:1.27.1
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
command: command:
- /bin/echo - /bin/echo

1
promenade/templates/roles/join/etc/kubernetes/manifests/.placeholder
View File

@ -0,0 +1 @@
# placeholder

5
tools/gate/config-templates/bootstrap-armada-config.yaml
View File

@ -487,7 +487,10 @@ data:
no_hooks: true no_hooks: true
values: values:
coredns: coredns:
cluster_domain: cluster.local kubernetes_zones:
- cluster.local
- 10.96.0.0/16
- 10.97.0.0/16
upstream_nameservers: upstream_nameservers:
- 8.8.8.8 - 8.8.8.8
- 8.8.4.4 - 8.8.4.4

4
tools/gate/config-templates/genesis-config.yaml
View File

@ -10,10 +10,8 @@ data:
hostname: ${GENESIS_HOSTNAME} hostname: ${GENESIS_HOSTNAME}
ip: ${GENESIS_IP} ip: ${GENESIS_IP}
labels: labels:
static:
- calico-etcd=enabled
- node-role.kubernetes.io/master=
dynamic: dynamic:
- calico-etcd=enabled
- kubernetes-apiserver=enabled - kubernetes-apiserver=enabled
- kubernetes-controller-manager=enabled - kubernetes-controller-manager=enabled
- kubernetes-etcd=enabled - kubernetes-etcd=enabled

6
tools/gate/config-templates/joining-host-config.yaml
View File

@ -11,8 +11,6 @@ data:
ip: ${GENESIS_IP} ip: ${GENESIS_IP}
join_ip: ${MASTER1_IP} join_ip: ${MASTER1_IP}
labels: labels:
static:
- node-role.kubernetes.io/master=
dynamic: dynamic:
- calico-etcd=enabled - calico-etcd=enabled
- ceph-mds=enabled - ceph-mds=enabled
@ -40,8 +38,6 @@ data:
ip: ${MASTER1_IP} ip: ${MASTER1_IP}
join_ip: ${GENESIS_IP} join_ip: ${GENESIS_IP}
labels: labels:
static:
- node-role.kubernetes.io/master=
dynamic: dynamic:
- calico-etcd=enabled - calico-etcd=enabled
- ceph-mds=enabled - ceph-mds=enabled
@ -69,8 +65,6 @@ data:
ip: ${MASTER2_IP} ip: ${MASTER2_IP}
join_ip: ${GENESIS_IP} join_ip: ${GENESIS_IP}
labels: labels:
static:
- node-role.kubernetes.io/master=
dynamic: dynamic:
- calico-etcd=enabled - calico-etcd=enabled
- ceph-mds=enabled - ceph-mds=enabled

1
tools/gate/config-templates/site-config.yaml
View File

@ -12,6 +12,7 @@ data:
service_ip: 10.96.0.10 service_ip: 10.96.0.10
bootstrap_validation_checks: bootstrap_validation_checks:
- calico-etcd.kube-system.svc.cluster.local - calico-etcd.kube-system.svc.cluster.local
- google.com
- kubernetes-etcd.kube-system.svc.cluster.local - kubernetes-etcd.kube-system.svc.cluster.local
- kubernetes.default.svc.cluster.local - kubernetes.default.svc.cluster.local
upstream_servers: upstream_servers: