Browse Source

Merge "Use v1.15.0 as default octavia_ingress_controller_tag"

tags/10.0.0.0rc1
Zuul 1 year ago
committed by Gerrit Code Review
parent
commit
5f985776d1
4 changed files with 10 additions and 10 deletions
  1. +1
    -1
      doc/source/user/index.rst
  2. +7
    -7
      magnum/drivers/common/templates/kubernetes/fragments/enable-ingress-octavia.sh
  3. +1
    -1
      magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml
  4. +1
    -1
      magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml

+ 1
- 1
doc/source/user/index.rst View File

@@ -1460,7 +1460,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


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

@@ -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"


+ 1
- 1
magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml View File

@@ -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


+ 1
- 1
magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml View File

@@ -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


Loading…
Cancel
Save