Merge pull request #40339 from noseka1/master

Automatic merge from submit-queue (batch tested with PRs 40549, 40339) Invalid node names when deploying with Heat OpenStack Heat templates create Kubernetes nodes with invalid hostnames. Capital letters are not allowed in the hostnames: Unable to register node "kubernetes-node-6s8OizYe" with API server: Node "kubernetes-node-6s8OizYe" is invalid: metadata.name: Invalid value: "kubernetes-node-6s8OizYe": must match the regex [a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)* (e.g. 'example.com') This patch prevents Heat generating hostnames that contain capital letters. **What this PR does / why we need it**: **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: **Release note**: ```release-note ```

Merge pull request #40339 from noseka1/master
7ee9abe4 · Kubernetes Submit Queue · GitHub · 2623f7c4 · 307a7556 · 7ee9abe4
Commit 7ee9abe4 authored Jan 29, 2017 by Kubernetes Submit Queue Committed by GitHub Jan 29, 2017
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

kubeminion.yaml cluster/openstack-heat/kubernetes-heat/kubeminion.yaml +3 -0

No files found.
--- a/cluster/openstack-heat/kubernetes-heat/kubeminion.yaml
+++ b/cluster/openstack-heat/kubernetes-heat/kubeminion.yaml
@@ -258,6 +258,9 @@ resources:
    properties:
      character_classes: [{'class': 'lowercase', 'min': 1}]
      length: 8
+      character_classes:
+        - class: lowercase
+        - class: digits
  kube_minion:
    type: OS::Nova::Server