From 9b4ae2e348733fbb84072a3b2a205bea832d0669 Mon Sep 17 00:00:00 2001 From: Bharat Kunwar Date: Mon, 21 Oct 2019 11:53:11 +0000 Subject: [PATCH] Use v1.15.0 as default octavia_ingress_controller_tag Change-Id: I133fb76658ac063b1eb68e9c9843fad39390328b --- doc/source/user/index.rst | 2 +- .../kubernetes/fragments/enable-ingress-octavia.sh | 14 +++++++------- .../templates/kubecluster.yaml | 2 +- .../templates/kubecluster.yaml | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/doc/source/user/index.rst b/doc/source/user/index.rst index f9ad4e1f0e..6a1534f942 100644 --- a/doc/source/user/index.rst +++ b/doc/source/user/index.rst @@ -1443,7 +1443,7 @@ _`ingress_controller_role` This label is not used for octavia-ingress-controller. _`octavia_ingress_controller_tag` - The image tag for octavia-ingress-controller. Stein-default: 1.13.2-alpha + The image tag for octavia-ingress-controller. Train-default: v1.15.0 _`nginx_ingress_controller_tag` The image tag for nginx-ingress-controller. Stein-default: 0.23.0 diff --git a/magnum/drivers/common/templates/kubernetes/fragments/enable-ingress-octavia.sh b/magnum/drivers/common/templates/kubernetes/fragments/enable-ingress-octavia.sh index 622a6e24c3..d41fae449b 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/enable-ingress-octavia.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/enable-ingress-octavia.sh @@ -35,17 +35,17 @@ metadata: namespace: kube-system data: config: | - cluster_name: ${CLUSTER_UUID} + cluster-name: ${CLUSTER_UUID} openstack: - auth_url: ${AUTH_URL} - user_id: ${TRUSTEE_USER_ID} + auth-url: ${AUTH_URL} + user-id: ${TRUSTEE_USER_ID} password: ${TRUSTEE_PASSWORD} - trust_id: ${TRUST_ID} + trust-id: ${TRUST_ID} region: ${REGION_NAME} - ca_file: /etc/kubernetes/ca-bundle.crt + ca-file: /etc/kubernetes/ca-bundle.crt octavia: - subnet_id: ${CLUSTER_SUBNET} - floating_network_id: ${EXTERNAL_NETWORK_ID} + subnet-id: ${CLUSTER_SUBNET} + floating-network-id: ${EXTERNAL_NETWORK_ID} EOF ) writeFile $OCTAVIA_INGRESS_CONTROLLER_CONFIGMAP "$OCTAVIA_INGRESS_CONTROLLER_CONFIGMAP_CONTENT" diff --git a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml index 68de802cfb..357e700e2e 100644 --- a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml +++ b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml @@ -572,7 +572,7 @@ parameters: octavia_ingress_controller_tag: type: string description: Octavia ingress controller docker image tag. - default: "1.13.2-alpha" + default: "v1.15.0" kubelet_options: type: string diff --git a/magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml b/magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml index d6ad2e0c58..d246c61ae7 100644 --- a/magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml +++ b/magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml @@ -572,7 +572,7 @@ parameters: octavia_ingress_controller_tag: type: string description: Octavia ingress controller docker image tag. - default: "1.13.2-alpha" + default: "v1.15.0" kubelet_options: type: string