github-personal/matchbox
1
0
Fork 0
mirror of https://github.com/outbackdingo/matchbox.git synced 2026-01-27 10:19:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

examples/k8s: Update k8s to v1.2.4_coreos.1

Browse Source 
* Add missing kubernetes.default.svc alt names to openssl config
This commit is contained in:
Dalton Hubble
2016-05-16 11:24:52 -07:00
parent e2c066d750
commit ce88b94b9f
6 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.md
View File

@@ -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)

2
Documentation/kubernetes.md
View File

@@ -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

2
examples/README.md
View File

@@ -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

10
examples/ignition/k8s-master.yaml
View File

@@ -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

4
examples/ignition/k8s-worker.yaml
View File

@@ -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

2
scripts/tls/kubernetes-cert
View File

@@ -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"