diff --git a/CHANGES.md b/CHANGES.md index 6c51a80c..168079bd 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -10,7 +10,7 @@ #### Examples -* Updated Kubernetes examples to v1.2.3 (#187) +* Updated Kubernetes examples to v1.2.4 * Remove 8.8.8.8 from networkd example Ignition configs (#184) * Fix a bug in the k8s example k8s-certs@.service file check (#156) * Add self-hosted Kubernetes example (PXE boot or install to disk) diff --git a/Documentation/kubernetes.md b/Documentation/kubernetes.md index 4e14bd52..574dfb5a 100644 --- a/Documentation/kubernetes.md +++ b/Documentation/kubernetes.md @@ -1,7 +1,7 @@ # Kubernetes -The Kubernetes examples provision a 3 node v1.2.3 Kubernetes cluster with one master, two workers, and TLS authentication. A 3 node etcd cluster is run on the hosts for Kubernetes and to coordinate CoreOS auto-updates (if installed to disk). +The Kubernetes examples provision a 3 node v1.2.4 Kubernetes cluster with one master, two workers, and TLS authentication. A 3 node etcd cluster is run on the hosts for Kubernetes and to coordinate CoreOS auto-updates (if installed to disk). ## Requirements diff --git a/examples/README.md b/examples/README.md index ade2147a..3cc482d5 100644 --- a/examples/README.md +++ b/examples/README.md @@ -21,7 +21,7 @@ Get started running `bootcfg` on your Linux machine to network boot and provisio * [bootcfg with rkt](../Documentation/getting-started-rkt.md) * [bootcfg with Docker](../Documentation/getting-started-docker.md) -* [Kubernetes v1.2.3](../Documentation/kubernetes.md) +* [Kubernetes v1.2.4](../Documentation/kubernetes.md) * [Self-hosted Kubernetes](../Documentation/bootkube.md) (experimental) ## Experimental diff --git a/examples/ignition/k8s-master.yaml b/examples/ignition/k8s-master.yaml index caa58496..4ec96ea7 100644 --- a/examples/ignition/k8s-master.yaml +++ b/examples/ignition/k8s-master.yaml @@ -66,7 +66,7 @@ systemd: After=k8s-assets.target [Service] ExecStartPre=/usr/bin/mkdir -p /etc/kubernetes/manifests - Environment=KUBELET_VERSION=v1.2.3_coreos.0 + Environment=KUBELET_VERSION=v1.2.4_coreos.1 ExecStart=/usr/lib/coreos/kubelet-wrapper \ --api-servers=http://127.0.0.1:8080 \ --register-schedulable=false \ @@ -123,7 +123,7 @@ storage: hostNetwork: true containers: - name: kube-proxy - image: quay.io/coreos/hyperkube:v1.2.3_coreos.0 + image: quay.io/coreos/hyperkube:v1.2.4_coreos.1 command: - /hyperkube - proxy @@ -150,7 +150,7 @@ storage: hostNetwork: true containers: - name: kube-apiserver - image: quay.io/coreos/hyperkube:v1.2.3_coreos.0 + image: quay.io/coreos/hyperkube:v1.2.4_coreos.1 command: - /hyperkube - apiserver @@ -200,7 +200,7 @@ storage: spec: containers: - name: kube-controller-manager - image: quay.io/coreos/hyperkube:v1.2.3_coreos.0 + image: quay.io/coreos/hyperkube:v1.2.4_coreos.1 command: - /hyperkube - controller-manager @@ -241,7 +241,7 @@ storage: hostNetwork: true containers: - name: kube-scheduler - image: quay.io/coreos/hyperkube:v1.2.3_coreos.0 + image: quay.io/coreos/hyperkube:v1.2.4_coreos.1 command: - /hyperkube - scheduler diff --git a/examples/ignition/k8s-worker.yaml b/examples/ignition/k8s-worker.yaml index 5aff297a..6c28bdb7 100644 --- a/examples/ignition/k8s-worker.yaml +++ b/examples/ignition/k8s-worker.yaml @@ -63,7 +63,7 @@ systemd: After=k8s-assets.target [Service] ExecStartPre=/usr/bin/mkdir -p /etc/kubernetes/manifests - Environment=KUBELET_VERSION=v1.2.3_coreos.0 + Environment=KUBELET_VERSION=v1.2.4_coreos.1 ExecStart=/usr/lib/coreos/kubelet-wrapper \ --api-servers={{.k8s_controller_endpoint}} \ --register-node=true \ @@ -130,7 +130,7 @@ storage: hostNetwork: true containers: - name: kube-proxy - image: quay.io/coreos/hyperkube:v1.2.3_coreos.0 + image: quay.io/coreos/hyperkube:v1.2.4_coreos.1 command: - /hyperkube - proxy diff --git a/scripts/tls/kubernetes-cert b/scripts/tls/kubernetes-cert index 4aab79a2..2515b67e 100755 --- a/scripts/tls/kubernetes-cert +++ b/scripts/tls/kubernetes-cert @@ -45,6 +45,8 @@ subjectAltName = @alt_names [alt_names] DNS.1 = kubernetes DNS.2 = kubernetes.default +DNS.3 = kubernetes.default.svc +DNS.4 = kubernetes.default.svc.cluster.local " echo "Generating SSL artifacts in $OUTDIR"