openstack
/
kolla-kubernetes
Code Issues Proposed changes

Merge "Introducing common-lib and common_volumes macro"

This commit is contained in:
Jenkins 2016-09-28 21:52:21 +00:00 committed by Gerrit Code Review
parent 8e6b5970f0 a7d46ddcad
commit 789dae66ac
18 changed files with 70 additions and 201 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
services/cinder/cinder-backup-pod.yml.j2
View File

@ -1,5 +1,5 @@
{%- set resourceName = kolla_kubernetes.cli.args.resource_name %}
{%- import "services/common/common-kube-logger.yml.j2" as kube_logger with context %}
{%- import "services/common/common-lib.yml.j2" as lib with context %}
apiVersion: apps/v1alpha1
kind: PetSet
metadata:
@ -75,7 +75,7 @@ spec:
- name: KOLLA_CONFIG_STRATEGY
value: {{ config_strategy }}
{% if enable_kube_logger == "yes" %}
{{ kube_logger.kube_logger_container() | indent(8, true) }}
{{ lib.kube_logger_container() | indent(8, true) }}
{% endif %}
volumes:
- name: kolla-kubernetes-events
@ -85,11 +85,4 @@ spec:
- name: cinder-backup-configmap
configMap:
name: cinder-backup
- name: host-etc-localtime
hostPath:
path: /etc/localtime
- name: kolla-logs
emptyDir: {}
{% if enable_kube_logger == "yes" %}
{{ kube_logger.kube_logger_volume() | indent(8, true) }}
{% endif %}
{{ lib.common_volumes(indent=8) }}

13
services/cinder/cinder-scheduler-pod.yml.j2
View File

@ -1,5 +1,5 @@
{%- set resourceName = kolla_kubernetes.cli.args.resource_name %}
{%- import "services/common/common-kube-logger.yml.j2" as kube_logger with context %}
{%- import "services/common/common-lib.yml.j2" as lib with context %}
apiVersion: apps/v1alpha1
kind: PetSet
metadata:
@ -37,7 +37,7 @@ spec:
- name: KOLLA_CONFIG_STRATEGY
value: {{ config_strategy }}
{% if enable_kube_logger == "yes" %}
{{ kube_logger.kube_logger_container() | indent(8, true) }}
{{ lib.kube_logger_container() | indent(8, true) }}
{% endif %}
volumes:
- name: kolla-kubernetes-events
@ -45,11 +45,4 @@ spec:
- name: cinder-scheduler-configmap
configMap:
name: cinder-scheduler
- name: host-etc-localtime
hostPath:
path: /etc/localtime
- name: kolla-logs
emptyDir: {}
{% if enable_kube_logger == "yes" %}
{{ kube_logger.kube_logger_volume() | indent(8, true) }}
{% endif %}
{{ lib.common_volumes(indent=8) }}

13
services/cinder/cinder-volume-ceph-pod.yml.j2
View File

@ -1,6 +1,6 @@
{%- set resourceName = kolla_kubernetes.cli.args.resource_name %}
{%- set loggerConfigmapName = "cinder-volume" %}
{%- import "services/common/common-kube-logger.yml.j2" as kube_logger with context %}
{%- import "services/common/common-lib.yml.j2" as lib with context %}
apiVersion: apps/v1alpha1
kind: PetSet
metadata:
@ -92,7 +92,7 @@ spec:
- mountPath: /var/log/kolla/
name: kolla-logs
{% if enable_kube_logger == "yes" %}
{{ kube_logger.kube_logger_container() | indent(8, true) }}
{{ lib.kube_logger_container() | indent(8, true) }}
{% endif %}
volumes:
- name: pod-main-config
@ -100,14 +100,7 @@ spec:
- name: cinder-volume-configmap
configMap:
name: cinder-volume
- name: host-etc-localtime
hostPath:
path: /etc/localtime
- name: kolla-logs
emptyDir: {}
{% if enable_kube_logger == "yes" %}
{{ kube_logger.kube_logger_volume() | indent(8, true) }}
{% endif %}
{{ lib.common_volumes(indent=8) }}
- name: ceph-conf
configMap:
name: ceph-conf

18
services/cinder/cinder-volume-lvm-pod.yml.j2
View File

@ -1,7 +1,7 @@
{%- set resourceName = kolla_kubernetes.cli.args.resource_name %}
{%- set loggerConfigmapName = "cinder-volume" %}
{%- set netHostTrue = "yes" %}
{%- import "services/common/common-kube-logger.yml.j2" as kube_logger with context %}
{%- import "services/common/common-lib.yml.j2" as lib with context %}
apiVersion: extensions/v1beta1
kind: DaemonSet
metadata:
@ -123,7 +123,7 @@ spec:
subPath: resolv.conf
{%- endif %}
{% if enable_kube_logger == "yes" %}
{{ kube_logger.kube_logger_container() | indent(8, true) }}
{{ lib.kube_logger_container() | indent(8, true) }}
{% endif %}
volumes:
- name: kolla-kubernetes-events
@ -145,16 +145,4 @@ spec:
- name: iscsi-info
hostPath:
path: /etc/iscsi
- name: host-etc-localtime
hostPath:
path: /etc/localtime
- name: kolla-logs
emptyDir: {}
{% if enable_kube_logger == "yes" %}
{{ kube_logger.kube_logger_volume() | indent(8, true) }}
{% endif %}
{%- if enable_resolve_conf_net_host_workaround == "yes" %}
- name: resolv-conf
configMap:
name: resolv-conf
{%- endif %}
{{ lib.common_volumes(indent=8) }}

13
services/common/common-deployment.yml.j2
View File

@ -25,7 +25,7 @@
default(kolla_kubernetes_hostlabel_controller)
%}
{%- endif %}
{%- import "services/common/common-kube-logger.yml.j2" as kube_logger with context %}
{%- import "services/common/common-lib.yml.j2" as lib with context %}
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
@ -163,7 +163,7 @@ spec:
- name: KOLLA_CONFIG_STRATEGY
value: {{ config_strategy }}
{% if enable_kube_logger == "yes" %}
{{ kube_logger.kube_logger_container() | indent(8, true) }}
{{ lib.kube_logger_container() | indent(8, true) }}
{% endif %}
volumes:
- name: kolla-kubernetes-events
@ -177,12 +177,5 @@ spec:
- name: haproxy-config
configMap:
name: {{ resourceName }}-haproxy
- name: host-etc-localtime
hostPath:
path: /etc/localtime
- name: kolla-logs
emptyDir: {}
{{ lib.common_volumes(indent=8) }}
{{ extraVolume | indent(8, True) }}
{% if enable_kube_logger == "yes" %}
{{ kube_logger.kube_logger_volume() | indent(8, true) }}
{% endif %}

20
services/common/common-kube-logger.yml.j2 → services/common/common-lib.yml.j2
View File

@ -18,8 +18,28 @@
value: {{ config_strategy }}
{% endmacro %}
{% macro common_volumes(indent) %}
{{ _common_volumes() | indent(indent, true) }}
{% endmacro %}
{% macro kube_logger_volume() %}
- name: logging-config
configMap:
name: {{ loggerConfigmapName | default(resourceName) }}-logging
{% endmacro %}
{% macro _common_volumes() %}
- name: host-etc-localtime
hostPath:
path: /etc/localtime
- name: kolla-logs
emptyDir: {}
{% if enable_kube_logger == "yes" %}
{{ kube_logger_volume() }}
{% endif %}
{%- if netHostTrue == "yes" and enable_resolve_conf_net_host_workaround == "yes" %}
- name: resolv-conf
configMap:
name: resolv-conf
{%- endif %}
{% endmacro %}

13
services/horizon/horizon-pod.yml.j2
View File

@ -1,5 +1,5 @@
{%- set resourceName = kolla_kubernetes.cli.args.resource_name %}
{%- import "services/common/common-kube-logger.yml.j2" as kube_logger with context %}
{%- import "services/common/common-lib.yml.j2" as lib with context %}
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
@ -56,7 +56,7 @@ spec:
- name: KOLLA_CONFIG_STRATEGY
value: {{ config_strategy }}
{% if enable_kube_logger == "yes" %}
{{ kube_logger.kube_logger_container() | indent(8, true) }}
{{ lib.kube_logger_container() | indent(8, true) }}
{% endif %}
volumes:
- name: pod-main-config
@ -71,11 +71,4 @@ spec:
path: config.json
- key: local-settings
path: local_settings
- name: host-etc-localtime
hostPath:
path: /etc/localtime
- name: kolla-logs
emptyDir: {}
{% if enable_kube_logger == "yes" %}
{{ kube_logger.kube_logger_volume() | indent(8, true) }}
{% endif %}
{{ lib.common_volumes(indent=8) }}

13
services/keystone/keystone-pod.yml.j2
View File

@ -1,5 +1,5 @@
{%- set resourceName = kolla_kubernetes.cli.args.resource_name %}
{%- import "services/common/common-kube-logger.yml.j2" as kube_logger with context %}
{%- import "services/common/common-lib.yml.j2" as lib with context %}
apiVersion: v1
kind: ReplicationController
spec:
@ -59,20 +59,13 @@ spec:
- containerPort: {{ keystone_public_port }}
name: keystone-public
{% if enable_kube_logger == "yes" %}
{{ kube_logger.kube_logger_container() | indent(8, true) }}
{{ lib.kube_logger_container() | indent(8, true) }}
{% endif %}
volumes:
- name: keystone-config
configMap:
name: keystone
- name: host-etc-localtime
hostPath:
path: /etc/localtime
- name: kolla-logs
emptyDir: {}
{% if enable_kube_logger == "yes" %}
{{ kube_logger.kube_logger_volume() | indent(8, true) }}
{% endif %}
{{ lib.common_volumes(indent=8) }}
metadata:
name: keystone
namespace: {{ kolla_kubernetes_namespace }}

13
services/mariadb/mariadb-pod.yml.j2
View File

@ -1,5 +1,5 @@
{%- set resourceName = kolla_kubernetes.cli.args.resource_name %}
{%- import "services/common/common-kube-logger.yml.j2" as kube_logger with context %}
{%- import "services/common/common-lib.yml.j2" as lib with context %}
apiVersion: apps/v1alpha1
kind: PetSet
spec:
@ -49,7 +49,7 @@ spec:
- containerPort: {{ mariadb_port }}
name: mariadb
{% if enable_kube_logger == "yes" %}
{{ kube_logger.kube_logger_container() | indent(8, true) }}
{{ lib.kube_logger_container() | indent(8, true) }}
{% endif %}
volumes:
- name: mariadb-config
@ -58,14 +58,7 @@ spec:
- name: mariadb-persistent-storage
persistentVolumeClaim:
claimName: {{ resourceName }}
- name: host-etc-localtime
hostPath:
path: /etc/localtime
- name: kolla-logs
emptyDir: {}
{% if enable_kube_logger == "yes" %}
{{ kube_logger.kube_logger_volume() | indent(8, true) }}
{% endif %}
{{ lib.common_volumes(indent=8) }}
metadata:
name: mariadb
namespace: {{ kolla_kubernetes_namespace }}

13
services/neutron/neutron-dhcp-agent-daemonset.yml.j2
View File

@ -1,6 +1,6 @@
{%- set resourceName = kolla_kubernetes.cli.args.resource_name %}
{%- set netHostTrue = "yes" %}
{%- import "services/common/common-kube-logger.yml.j2" as kube_logger with context %}
{%- import "services/common/common-lib.yml.j2" as lib with context %}
apiVersion: extensions/v1beta1
kind: DaemonSet
metadata:
@ -128,16 +128,7 @@ spec:
- name: host-run
hostPath:
path: /var/run
- name: host-etc-localtime
hostPath:
path: /etc/localtime
- name: neutron-metadata-socket
hostPath:
path: /var/lib/neutron/kolla/metadata_proxy
- name: kolla-logs
emptyDir: {}
{%- if enable_resolve_conf_net_host_workaround == "yes" %}
- name: resolv-conf
configMap:
name: resolv-conf
{%- endif %}
{{ lib.common_volumes(indent=8) }}

18
services/neutron/neutron-l3-agent-daemonset.yml.j2
View File

@ -1,7 +1,7 @@
{%- set resourceName = kolla_kubernetes.cli.args.resource_name %}
{%- set loggerConfigmapName = "neutron-l3-agent" %}
{%- set netHostTrue = "yes" %}
{%- import "services/common/common-kube-logger.yml.j2" as kube_logger with context %}
{%- import "services/common/common-lib.yml.j2" as lib with context %}
apiVersion: extensions/v1beta1
kind: DaemonSet
metadata:
@ -123,7 +123,7 @@ spec:
- name: KOLLA_CONFIG_STRATEGY
value: {{ config_strategy }}
{% if enable_kube_logger == "yes" %}
{{ kube_logger.kube_logger_container() | indent(8, true) }}
{{ lib.kube_logger_container() | indent(8, true) }}
{% endif %}
volumes:
- name: pod-main-config
@ -148,19 +148,7 @@ spec:
- name: host-run
hostPath:
path: /var/run
- name: host-etc-localtime
hostPath:
path: /etc/localtime
- name: neutron-metadata-socket
hostPath:
path: /var/lib/neutron/kolla/metadata_proxy
- name: kolla-logs
emptyDir: {}
{% if enable_kube_logger == "yes" %}
{{ kube_logger.kube_logger_volume() | indent(8, true) }}
{% endif %}
{%- if enable_resolve_conf_net_host_workaround == "yes" %}
- name: resolv-conf
configMap:
name: resolv-conf
{%- endif %}
{{ lib.common_volumes(indent=8) }}

18
services/neutron/neutron-metadata-agent-daemonset.yml.j2
View File

@ -1,7 +1,7 @@
{%- set resourceName = kolla_kubernetes.cli.args.resource_name %}
{%- set loggerConfigmapName = "neutron-metadata-agent" %}
{%- set netHostTrue = "yes" %}
{%- import "services/common/common-kube-logger.yml.j2" as kube_logger with context %}
{%- import "services/common/common-lib.yml.j2" as lib with context %}
apiVersion: extensions/v1beta1
kind: DaemonSet
metadata:
@ -58,7 +58,7 @@ spec:
- name: KOLLA_CONFIG_STRATEGY
value: {{ config_strategy }}
{% if enable_kube_logger == "yes" %}
{{ kube_logger.kube_logger_container() | indent(8, true) }}
{{ lib.kube_logger_container() | indent(8, true) }}
{% endif %}
volumes:
- name: neutron-metadata-agent-config
@ -79,19 +79,7 @@ spec:
- name: host-run
hostPath:
path: /run
- name: host-etc-localtime
hostPath:
path: /etc/localtime
- name: neutron-metadata-socket
hostPath:
path: /var/lib/neutron/kolla/metadata_proxy
- name: kolla-logs
emptyDir: {}
{% if enable_kube_logger == "yes" %}
{{ kube_logger.kube_logger_volume() | indent(8, true) }}
{% endif %}
{%- if enable_resolve_conf_net_host_workaround == "yes" %}
- name: resolv-conf
configMap:
name: resolv-conf
{%- endif %}
{{ lib.common_volumes(indent=8) }}

18
services/neutron/neutron-openvswitch-agent-daemonset.yml.j2
View File

@ -1,7 +1,7 @@
{%- set resourceName = kolla_kubernetes.cli.args.resource_name %}
{%- set loggerConfigmapName = "neutron-openvswitch-agent" %}
{%- set netHostTrue = "yes" %}
{%- import "services/common/common-kube-logger.yml.j2" as kube_logger with context %}
{%- import "services/common/common-lib.yml.j2" as lib with context %}
apiVersion: extensions/v1beta1
kind: DaemonSet
metadata:
@ -110,7 +110,7 @@ spec:
subPath: resolv.conf
{%- endif %}
{% if enable_kube_logger == "yes" %}
{{ kube_logger.kube_logger_container() | indent(8, true) }}
{{ lib.kube_logger_container() | indent(8, true) }}
{% endif %}
# NOTE: (sbezverk) Linux bridge will be moved to its own file at the time of development
# keeping it here just for future reference.
@ -167,19 +167,7 @@ spec:
- name: host-dev
hostPath:
path: /dev
- name: host-etc-localtime
hostPath:
path: /etc/localtime
- name: host-lib-modules
hostPath:
path: /lib/modules
- name: kolla-logs
emptyDir: {}
{% if enable_kube_logger == "yes" %}
{{ kube_logger.kube_logger_volume() | indent(8, true) }}
{% endif %}
{%- if enable_resolve_conf_net_host_workaround == "yes" %}
- name: resolv-conf
configMap:
name: resolv-conf
{%- endif %}
{{ lib.common_volumes(indent=8) }}

18
services/nova/nova-compute-pod.yml.j2
View File

@ -1,6 +1,6 @@
{%- set resourceName = kolla_kubernetes.cli.args.resource_name %}
{%- set netHostTrue = "yes" %}
{%- import "services/common/common-kube-logger.yml.j2" as kube_logger with context %}
{%- import "services/common/common-lib.yml.j2" as lib with context %}
apiVersion: extensions/v1beta1
kind: DaemonSet
metadata:
@ -127,7 +127,7 @@ spec:
- name: KOLLA_CONFIG_STRATEGY
value: {{ config_strategy }}
{% if enable_kube_logger == "yes" %}
{{ kube_logger.kube_logger_container() | indent(8, true) }}
{{ lib.kube_logger_container() | indent(8, true) }}
{% endif %}
volumes:
- name: nova-compute-config
@ -136,9 +136,6 @@ spec:
- name: nova-compute-persistent-storage
hostPath:
path: /var/lib/nova
- name: host-etc-localtime
hostPath:
path: /etc/localtime
- name: lib-modules
hostPath:
path: /lib/modules
@ -153,8 +150,6 @@ spec:
path: /sys/fs/cgroup
- name: nova-config
emptyDir: {}
- name: kolla-logs
emptyDir: {}
{%- if enable_ceph == "yes" %}
- name: ceph-conf
configMap:
@ -163,11 +158,4 @@ spec:
secret:
secretName: ceph-client-nova-keyring
{%- endif %}
{%- if enable_resolve_conf_net_host_workaround == "yes" %}
- name: resolv-conf
configMap:
name: resolv-conf
{%- endif %}
{% if enable_kube_logger == "yes" %}
{{ kube_logger.kube_logger_volume() | indent(8, true) }}
{% endif %}
{{ lib.common_volumes(indent=8) }}

13
services/nova/nova-control-conductor-pod.yml.j2
View File

@ -1,5 +1,5 @@
{%- set resourceName = kolla_kubernetes.cli.args.resource_name %}
{%- import "services/common/common-kube-logger.yml.j2" as kube_logger with context %}
{%- import "services/common/common-lib.yml.j2" as lib with context %}
apiVersion: apps/v1alpha1
kind: PetSet
spec:
@ -54,25 +54,18 @@ spec:
- name: KOLLA_CONFIG_STRATEGY
value: {{ config_strategy }}
{% if enable_kube_logger == "yes" %}
{{ kube_logger.kube_logger_container() | indent(8, true) }}
{{ lib.kube_logger_container() | indent(8, true) }}
{% endif %}
volumes:
- name: nova-conductor-config
configMap:
name: nova-conductor
- name: host-etc-localtime
hostPath:
path: /etc/localtime
- name: lib-modules
hostPath:
path: /lib/modules
- name: nova-config
emptyDir: {}
- name: kolla-logs
emptyDir: {}
{% if enable_kube_logger == "yes" %}
{{ kube_logger.kube_logger_volume() | indent(8, true) }}
{% endif %}
{{ lib.common_volumes(indent=8) }}
metadata:
name: nova-conductor
namespace: {{ kolla_kubernetes_namespace }}

13
services/nova/nova-control-scheduler-pod.yml.j2
View File

@ -1,5 +1,5 @@
{%- set resourceName = kolla_kubernetes.cli.args.resource_name %}
{%- import "services/common/common-kube-logger.yml.j2" as kube_logger with context %}
{%- import "services/common/common-lib.yml.j2" as lib with context %}
apiVersion: apps/v1alpha1
kind: PetSet
spec:
@ -56,25 +56,18 @@ spec:
securityContext:
privileged: true
{% if enable_kube_logger == "yes" %}
{{ kube_logger.kube_logger_container() | indent(8, true) }}
{{ lib.kube_logger_container() | indent(8, true) }}
{% endif %}
volumes:
- name: nova-scheduler-config
configMap:
name: nova-scheduler
- name: host-etc-localtime
hostPath:
path: /etc/localtime
- name: lib-modules
hostPath:
path: /lib/modules
- name: nova-config
emptyDir: {}
- name: kolla-logs
emptyDir: {}
{% if enable_kube_logger == "yes" %}
{{ kube_logger.kube_logger_volume() | indent(8, true) }}
{% endif %}
{{ lib.common_volumes(indent=8) }}
metadata:
name: nova-scheduler
namespace: {{ kolla_kubernetes_namespace }}

18
services/nova/nova-libvirt-pod.yml.j2
View File

@ -1,6 +1,6 @@
{%- set resourceName = kolla_kubernetes.cli.args.resource_name %}
{%- set netHostTrue = "yes" %}
{%- import "services/common/common-kube-logger.yml.j2" as kube_logger with context %}
{%- import "services/common/common-lib.yml.j2" as lib with context %}
apiVersion: extensions/v1beta1
kind: DaemonSet
metadata:
@ -99,7 +99,7 @@ spec:
- name: KOLLA_CONFIG_STRATEGY
value: {{ config_strategy }}
{% if enable_kube_logger == "yes" %}
{{ kube_logger.kube_logger_container() | indent(8, true) }}
{{ lib.kube_logger_container() | indent(8, true) }}
{% endif %}
volumes:
- name: nova-compute-persistent-storage
@ -111,9 +111,6 @@ spec:
- name: nova-libvirt-persistent-storage
hostPath:
path: /var/lib/libvirt
- name: host-etc-localtime
hostPath:
path: /etc/localtime
- name: lib-modules
hostPath:
path: /lib/modules
@ -128,11 +125,7 @@ spec:
path: /sys/fs/cgroup
- name: nova-config
emptyDir: {}
- name: kolla-logs
emptyDir: {}
{% if enable_kube_logger == "yes" %}
{{ kube_logger.kube_logger_volume() | indent(8, true) }}
{% endif %}
{{ lib.common_volumes(indent=8) }}
{%- if enable_ceph == "yes" %}
- name: ceph-conf
configMap:
@ -144,8 +137,3 @@ spec:
secret:
secretName: nova-libvirt-bin
{%- endif %}
{%- if enable_resolve_conf_net_host_workaround == "yes" %}
- name: resolv-conf
configMap:
name: resolv-conf
{%- endif %}

13
services/rabbitmq/rabbitmq-pod.yml.j2
View File

@ -1,5 +1,5 @@
{%- set resourceName = kolla_kubernetes.cli.args.resource_name %}
{%- import "services/common/common-kube-logger.yml.j2" as kube_logger with context %}
{%- import "services/common/common-lib.yml.j2" as lib with context %}
apiVersion: apps/v1alpha1
kind: PetSet
spec:
@ -61,7 +61,7 @@ spec:
- containerPort: {{ rabbitmq_management_port }}
name: management
{% if enable_kube_logger == "yes" %}
{{ kube_logger.kube_logger_container() | indent(8, true) }}
{{ lib.kube_logger_container() | indent(8, true) }}
{% endif %}
volumes:
- name: pod-main-config
@ -72,14 +72,7 @@ spec:
- name: rabbitmq-persistent-storage
persistentVolumeClaim:
claimName: {{ resourceName }}
- name: host-etc-localtime
hostPath:
path: /etc/localtime
- name: kolla-logs
emptyDir: {}
{% if enable_kube_logger == "yes" %}
{{ kube_logger.kube_logger_volume() | indent(8, true) }}
{% endif %}
{{ lib.common_volumes(indent=8) }}
metadata:
name: rabbitmq
namespace: {{ kolla_kubernetes_namespace }}