Merge pull request #37264 from yuanying/use-lowercase-character

Automatic merge from submit-queue (batch tested with PRs 39275, 40327, 37264) Fix invalid node name in openstack-heat provider Cluster node name must follow name syntax in RFC 1123. But currently, openstack-heat provider generate invalid node name which contains upper-case characters. This patch fixes it.

Merge pull request #37264 from yuanying/use-lowercase-character
6dbad57b · Kubernetes Submit Queue · GitHub · 92c54578 · 40e4e0e4 · 6dbad57b
Commit 6dbad57b authored Jan 24, 2017 by Kubernetes Submit Queue Committed by GitHub Jan 24, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

config-default.sh cluster/openstack-heat/config-default.sh +1 -1

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

No files found.
--- a/cluster/openstack-heat/config-default.sh
+++ b/cluster/openstack-heat/config-default.sh
@@ -17,7 +17,7 @@
 ## Contains configuration values for the Openstack cluster

 # Stack name
-STACK_NAME=${STACK_NAME:-KubernetesStack}
+STACK_NAME=${STACK_NAME:-kube-stack}

 # Keypair for kubernetes stack
 KUBERNETES_KEYPAIR_NAME=${KUBERNETES_KEYPAIR_NAME:-kubernetes_keypair}

--- a/cluster/openstack-heat/kubernetes-heat/kubeminion.yaml
+++ b/cluster/openstack-heat/kubernetes-heat/kubeminion.yaml
@@ -251,6 +251,7 @@ resources:
  server_name_post_fix:
    type: OS::Heat::RandomString
    properties:
+      character_classes: [{'class': 'lowercase', 'min': 1}]
      length: 8

  kube_minion: