github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 07:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Fixes and improvements to Photon Controller backend for kube-up

Browse Source 
- Improve reliability of network address detection by using MAC
  address. VMware has a MAC OUI that reliably distinguishes the VM's
  NICs from the other NICs (like the CBR). This doesn't rely on the
  unreliable reporting of the portgroup.
- Persist route changes. We configure routes on the master and nodes,
  but previously we didn't persist them so they didn't last across
  reboots. This persists them in /etc/network/interfaces
- Fix regression that didn't configure auth for kube-apiserver with
  Photon Controller.
- Reliably run apt-get update: Not doing this can cause apt to fail.
- Remove unused nginx config in salt
This commit is contained in:
Alain Roy
2016-06-13 16:14:18 -07:00
parent 8bcecac12f
commit 5740ceb7f6
7 changed files with 43 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cluster/photon-controller/templates/create-dynamic-salt-files.sh
View File

@@ -125,6 +125,3 @@ cluster_cidr: "$NODE_IP_RANGES"
allocate_node_cidrs: "${ALLOCATE_NODE_CIDRS:-true}"
admission_control: NamespaceLifecycle,LimitRanger,SecurityContextDeny,ServiceAccount,ResourceQuota
EOF
mkdir -p /srv/salt-overlay/salt/nginx
echo ${MASTER_HTPASSWD} > /srv/salt-overlay/salt/nginx/htpasswd