openstack/magnum
Code Issues Proposed changes

Merge "Use v1.15.0 as default octavia_ingress_controller_tag"

Browse Source
This commit is contained in:
Zuul 2019-10-24 01:38:53 +00:00 committed by Gerrit Code Review
commit 5f985776d1
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/user/index.rst
View File

@ -1460,7 +1460,7 @@ _`ingress_controller_role`
This label is not used for octavia-ingress-controller. This label is not used for octavia-ingress-controller.
_`octavia_ingress_controller_tag` _`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` _`nginx_ingress_controller_tag`
The image tag for nginx-ingress-controller. Stein-default: 0.23.0 The image tag for nginx-ingress-controller. Stein-default: 0.23.0

14
magnum/drivers/common/templates/kubernetes/fragments/enable-ingress-octavia.sh
View File

@ -35,17 +35,17 @@ metadata:
namespace: kube-system namespace: kube-system
data: data:
config: | config: |
cluster_name: ${CLUSTER_UUID} cluster-name: ${CLUSTER_UUID}
openstack: openstack:
auth_url: ${AUTH_URL} auth-url: ${AUTH_URL}
user_id: ${TRUSTEE_USER_ID} user-id: ${TRUSTEE_USER_ID}
password: ${TRUSTEE_PASSWORD} password: ${TRUSTEE_PASSWORD}
trust_id: ${TRUST_ID} trust-id: ${TRUST_ID}
region: ${REGION_NAME} region: ${REGION_NAME}
ca_file: /etc/kubernetes/ca-bundle.crt ca-file: /etc/kubernetes/ca-bundle.crt
octavia: octavia:
subnet_id: ${CLUSTER_SUBNET} subnet-id: ${CLUSTER_SUBNET}
floating_network_id: ${EXTERNAL_NETWORK_ID} floating-network-id: ${EXTERNAL_NETWORK_ID}
EOF EOF
) )
writeFile $OCTAVIA_INGRESS_CONTROLLER_CONFIGMAP "$OCTAVIA_INGRESS_CONTROLLER_CONFIGMAP_CONTENT" writeFile $OCTAVIA_INGRESS_CONTROLLER_CONFIGMAP "$OCTAVIA_INGRESS_CONTROLLER_CONFIGMAP_CONTENT"

2
magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml
View File

@ -572,7 +572,7 @@ parameters:
octavia_ingress_controller_tag: octavia_ingress_controller_tag:
type: string type: string
description: Octavia ingress controller docker image tag. description: Octavia ingress controller docker image tag.
default: "1.13.2-alpha" default: "v1.15.0"
kubelet_options: kubelet_options:
type: string type: string

2
magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml
View File

@ -572,7 +572,7 @@ parameters:
octavia_ingress_controller_tag: octavia_ingress_controller_tag:
type: string type: string
description: Octavia ingress controller docker image tag. description: Octavia ingress controller docker image tag.
default: "1.13.2-alpha" default: "v1.15.0"
kubelet_options: kubelet_options:
type: string type: string