Merge "Run haproxy as nobody"

This commit is contained in:
Zuul 2019-09-20 15:57:52 +00:00 committed by Gerrit Code Review
commit db0124b27b
3 changed files with 19 additions and 10 deletions

View File

@ -101,6 +101,8 @@ data:
- --requestheader-allowed-names='aggregator' - --requestheader-allowed-names='aggregator'
armada: armada:
target_manifest: cluster-bootstrap target_manifest: cluster-bootstrap
haproxy:
run_as_user: 65534
labels: labels:
dynamic: dynamic:
- beta.kubernetes.io/fluentd-ds-ready=true - beta.kubernetes.io/fluentd-ds-ready=true

View File

@ -92,6 +92,13 @@ data:
items: items:
$ref: '#/definitions/file' $ref: '#/definitions/file'
haproxy:
type: object
properties:
run_as_user:
type: integer
additionalProperties: false
hostname: hostname:
$ref: '#/definitions/hostname' $ref: '#/definitions/hostname'

View File

@ -4,7 +4,7 @@ data:
kubernetes: kubernetes:
apiserver: apiserver:
location: https://opendev.org/airship/promenade location: https://opendev.org/airship/promenade
reference: 42b8febcedd002e0d9c6a9c51367373849e5fc69 reference: e32f52b52455d0660e7666d9535eab3966af8e5b
subpath: charts/apiserver subpath: charts/apiserver
type: git type: git
apiserver-htk: apiserver-htk:
@ -25,7 +25,7 @@ data:
type: git type: git
etcd: etcd:
location: https://opendev.org/airship/promenade location: https://opendev.org/airship/promenade
reference: 42b8febcedd002e0d9c6a9c51367373849e5fc69 reference: e32f52b52455d0660e7666d9535eab3966af8e5b
subpath: charts/etcd subpath: charts/etcd
type: git type: git
etcd-htk: etcd-htk:
@ -35,7 +35,7 @@ data:
type: git type: git
controller-manager: controller-manager:
location: https://opendev.org/airship/promenade location: https://opendev.org/airship/promenade
reference: 42b8febcedd002e0d9c6a9c51367373849e5fc69 reference: e32f52b52455d0660e7666d9535eab3966af8e5b
subpath: charts/controller_manager subpath: charts/controller_manager
type: git type: git
controller-manager-htk: controller-manager-htk:
@ -45,7 +45,7 @@ data:
type: git type: git
coredns: coredns:
location: https://opendev.org/airship/promenade location: https://opendev.org/airship/promenade
reference: 42b8febcedd002e0d9c6a9c51367373849e5fc69 reference: e32f52b52455d0660e7666d9535eab3966af8e5b
subpath: charts/coredns subpath: charts/coredns
type: git type: git
coredns-htk: coredns-htk:
@ -55,7 +55,7 @@ data:
type: git type: git
etcd: etcd:
location: https://opendev.org/airship/promenade location: https://opendev.org/airship/promenade
reference: 42b8febcedd002e0d9c6a9c51367373849e5fc69 reference: e32f52b52455d0660e7666d9535eab3966af8e5b
subpath: charts/etcd subpath: charts/etcd
type: git type: git
etcd-htk: etcd-htk:
@ -65,7 +65,7 @@ data:
type: git type: git
haproxy: haproxy:
location: https://opendev.org/airship/promenade location: https://opendev.org/airship/promenade
reference: 42b8febcedd002e0d9c6a9c51367373849e5fc69 reference: e32f52b52455d0660e7666d9535eab3966af8e5b
subpath: charts/haproxy subpath: charts/haproxy
type: git type: git
haproxy-htk: haproxy-htk:
@ -85,7 +85,7 @@ data:
type: git type: git
proxy: proxy:
location: https://opendev.org/airship/promenade location: https://opendev.org/airship/promenade
reference: 42b8febcedd002e0d9c6a9c51367373849e5fc69 reference: e32f52b52455d0660e7666d9535eab3966af8e5b
subpath: charts/proxy subpath: charts/proxy
type: git type: git
proxy-htk: proxy-htk:
@ -95,7 +95,7 @@ data:
type: git type: git
scheduler: scheduler:
location: https://opendev.org/airship/promenade location: https://opendev.org/airship/promenade
reference: 42b8febcedd002e0d9c6a9c51367373849e5fc69 reference: e32f52b52455d0660e7666d9535eab3966af8e5b
subpath: charts/scheduler subpath: charts/scheduler
type: git type: git
scheduler-htk: scheduler-htk:
@ -473,7 +473,7 @@ data:
type: git type: git
promenade: promenade:
location: https://opendev.org/airship/promenade location: https://opendev.org/airship/promenade
reference: 42b8febcedd002e0d9c6a9c51367373849e5fc69 reference: e32f52b52455d0660e7666d9535eab3966af8e5b
subpath: charts/promenade subpath: charts/promenade
type: git type: git
promenade-htk: promenade-htk:
@ -640,7 +640,7 @@ data:
postgresql: {} postgresql: {}
promenade: promenade:
monitoring_image: busybox:1.28.3 monitoring_image: busybox:1.28.3
promenade: quay.io/airshipit/promenade:42b8febcedd002e0d9c6a9c51367373849e5fc69 promenade: quay.io/airshipit/promenade:e32f52b52455d0660e7666d9535eab3966af8e5b
rabbitmq: {} rabbitmq: {}
shipyard: shipyard:
airflow: quay.io/airshipit/airflow:c21555fce0d4f9dffce219d1be70e5d5cebca2a7-ubuntu_xenial airflow: quay.io/airshipit/airflow:c21555fce0d4f9dffce219d1be70e5d5cebca2a7-ubuntu_xenial