airship
/
treasuremap
Code Issues Proposed changes

Fixes for airship-seaworthy manifests 

Change-Id: I961886cbaa3a0ce03e836d2392cf81bb74afc26c
This commit is contained in:
Kaspars Skels 2018-08-16 15:20:23 -05:00
parent cf1f2af877
commit c4a926052b
36 changed files with 117 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
global/v4.0/software/charts/kubernetes/container-networking/calico.yaml
View File

@ -82,14 +82,14 @@ data:
wait:
timeout: 600
labels:
release_group: kubernetes-calico
release_group: airship-kubernetes-calico
upgrade:
no_hooks: false
pre:
delete:
- type: job
labels:
release_group: kubernetes-calico
release_group: airship-kubernetes-calico
values:
conf:
cni_network_config:

4
global/v4.0/software/charts/kubernetes/container-networking/etcd.yaml
View File

@ -78,14 +78,14 @@ data:
wait:
timeout: 600
labels:
release_group: kubernetes-calico-etcd
release_group: airship-kubernetes-calico-etcd
upgrade:
no_hooks: false
pre:
delete:
- type: job
labels:
release_group: kubernetes-calico-etcd
release_group: airship-kubernetes-calico-etcd
values:
labels:
anchor:

4
global/v4.0/software/charts/kubernetes/core/apiserver.yaml
View File

@ -109,14 +109,14 @@ data:
wait:
timeout: 600
labels:
release_group: kubernetes-apiserver
release_group: airship-kubernetes-apiserver
upgrade:
no_hooks: false
pre:
delete:
- type: job
labels:
release_group: kubernetes-apiserver
release_group: airship-kubernetes-apiserver
values:
apiserver:
etcd:

4
global/v4.0/software/charts/kubernetes/core/controller-manager.yaml
View File

@ -91,14 +91,14 @@ data:
wait:
timeout: 600
labels:
release_group: kubernetes-controller-manager
release_group: airship-kubernetes-controller-manager
upgrade:
no_hooks: false
pre:
delete:
- type: job
labels:
release_group: kubernetes-controller-manager
release_group: airship-kubernetes-controller-manager
values:
command_prefix:
- /controller-manager

4
global/v4.0/software/charts/kubernetes/core/scheduler.yaml
View File

@ -55,14 +55,14 @@ data:
wait:
timeout: 600
labels:
release_group: kubernetes-scheduler
release_group: airship-kubernetes-scheduler
upgrade:
no_hooks: false
pre:
delete:
- type: job
labels:
release_group: kubernetes-scheduler
release_group: airship-kubernetes-scheduler
values:
network:
kubernetes_netloc: 127.0.0.1:6553

4
global/v4.0/software/charts/kubernetes/dns/coredns.yaml
View File

@ -86,14 +86,14 @@ data:
wait:
timeout: 600
labels:
release_group: coredns
release_group: airship-coredns
upgrade:
no_hooks: false
pre:
delete:
- type: job
labels:
release_group: coredns
release_group: airship-coredns
values:
conf:
coredns:

4
global/v4.0/software/charts/kubernetes/etcd/etcd.yaml
View File

@ -83,14 +83,14 @@ data:
wait:
timeout: 600
labels:
release_group: kubernetes-etcd
release_group: airship-kubernetes-etcd
upgrade:
no_hooks: false
pre:
delete:
- type: job
labels:
release_group: kubernetes-etcd
release_group: airship-kubernetes-etcd
values:
labels:
anchor:

4
global/v4.0/software/charts/kubernetes/haproxy/haproxy.yaml
View File

@ -43,14 +43,14 @@ data:
wait:
timeout: 600
labels:
release_group: haproxy
release_group: airship-haproxy
upgrade:
no_hooks: false
pre:
delete:
- type: job
labels:
release_group: haproxy
release_group: airship-haproxy
values:
conf:
anchor:

4
global/v4.0/software/charts/kubernetes/ingress/ingress.yaml
View File

@ -31,7 +31,7 @@ data:
wait:
timeout: 300
labels:
release_group: ingress-kube-system
release_group: airship-ingress-kube-system
install:
no_hooks: false
upgrade:
@ -40,7 +40,7 @@ data:
delete:
- type: job
labels:
release_group: ingress-kube-system
release_group: airship-ingress-kube-system
values:
labels:
server:

4
global/v4.0/software/charts/kubernetes/proxy/kubernetes-proxy.yaml
View File

@ -47,14 +47,14 @@ data:
wait:
timeout: 600
labels:
release_group: kubernetes-proxy
release_group: airship-kubernetes-proxy
upgrade:
no_hooks: false
pre:
delete:
- type: job
labels:
release_group: kubernetes-proxy
release_group: airship-kubernetes-proxy
values:
command_prefix:
- /proxy

4
global/v4.0/software/charts/ucp/armada/armada.yaml
View File

@ -72,7 +72,7 @@ data:
wait:
timeout: 100
labels:
release_group: ucp-armada
release_group: airship-ucp-armada
install:
no_hooks: false
upgrade:
@ -81,7 +81,7 @@ data:
delete:
- type: job
labels:
release_group: ucp-armada
release_group: airship-ucp-armada
values:
pod:
replicas:

4
global/v4.0/software/charts/ucp/armada/tiller.yaml
View File

@ -31,7 +31,7 @@ data:
wait:
timeout: 100
labels:
release_group: ucp-tiller
release_group: airship-ucp-tiller
install:
no_hooks: false
upgrade:
@ -40,7 +40,7 @@ data:
delete:
- type: job
labels:
release_group: ucp-tiller
release_group: airship-ucp-tiller
values: {}
dependencies:
- tiller-htk

6
global/v4.0/software/charts/ucp/ceph-config/ceph-config.yaml
View File

@ -97,9 +97,7 @@ data:
release: ucp-ceph-config
namespace: ucp
wait:
timeout: 3600
labels:
release_group: ucp-ceph-config
timeout: 900
install:
no_hooks: false
upgrade:
@ -108,7 +106,7 @@ data:
delete:
- type: job
labels:
release_group: ucp-ceph-config
release_group: airship-ucp-ceph-config
values:
labels:
job:

4
global/v4.0/software/charts/ucp/ceph/ceph-client-update.yaml
View File

@ -104,7 +104,7 @@ data:
wait:
timeout: 900
labels:
release_group: ucp-ceph-client
release_group: airship-ucp-ceph-client
install:
no_hooks: false
upgrade:
@ -113,7 +113,7 @@ data:
delete:
- type: job
labels:
release_group: ucp-ceph-client
release_group: airship-ucp-ceph-client
values:
labels:
job:

4
global/v4.0/software/charts/ucp/ceph/ceph-client.yaml
View File

@ -105,7 +105,7 @@ data:
wait:
timeout: 900
labels:
release_group: ucp-ceph-client
release_group: airship-ucp-ceph-client
install:
no_hooks: false
upgrade:
@ -114,7 +114,7 @@ data:
delete:
- type: job
labels:
release_group: ucp-ceph-client
release_group: airship-ucp-ceph-client
values:
labels:
job:

4
global/v4.0/software/charts/ucp/ceph/ceph-ingress.yaml
View File

@ -29,7 +29,7 @@ data:
wait:
timeout: 300
labels:
release_group: ucp-ceph-ingress
release_group: airship-ucp-ceph-ingress
install:
no_hooks: false
upgrade:
@ -38,7 +38,7 @@ data:
delete:
- type: job
labels:
release_group: ucp-ceph-ingress
release_group: airship-ucp-ceph-ingress
values:
conf:
ingress:

4
global/v4.0/software/charts/ucp/ceph/ceph-mon.yaml
View File

@ -111,7 +111,7 @@ data:
wait:
timeout: 1800
labels:
release_group: ucp-ceph-mon
release_group: airship-ucp-ceph-mon
install:
no_hooks: false
upgrade:
@ -120,7 +120,7 @@ data:
delete:
- type: job
labels:
release_group: ucp-ceph-mon
release_group: airship-ucp-ceph-mon
values:
logging:
fluentd: true

2
global/v4.0/software/charts/ucp/ceph/ceph-osd.yaml
View File

@ -111,7 +111,7 @@ data:
wait:
timeout: 900
labels:
release_group: ucp-ceph-osd
release_group: airship-ucp-ceph-osd
install:
no_hooks: false
upgrade:

4
global/v4.0/software/charts/ucp/core/ingress.yaml
View File

@ -29,7 +29,7 @@ data:
wait:
timeout: 300
labels:
release_group: ingress
release_group: airship-ingress
install:
no_hooks: false
upgrade:
@ -38,7 +38,7 @@ data:
delete:
- type: job
labels:
release_group: ingress
release_group: airship-ingress
values:
conf:
ingress:

4
global/v4.0/software/charts/ucp/core/mariadb.yaml
View File

@ -54,7 +54,7 @@ data:
wait:
timeout: 300
labels:
release_group: ucp-mariadb
release_group: airship-ucp-mariadb
install:
no_hooks: false
upgrade:
@ -63,7 +63,7 @@ data:
delete:
- type: job
labels:
release_group: ucp-mariadb
release_group: airship-ucp-mariadb
values:
labels:
server:

4
global/v4.0/software/charts/ucp/core/postgresql.yaml
View File

@ -53,7 +53,7 @@ data:
wait:
timeout: 600
labels:
release_group: ucp-postgresql
release_group: airship-ucp-postgresql
install:
no_hooks: false
upgrade:
@ -62,7 +62,7 @@ data:
delete:
- type: job
labels:
release_group: ucp-postgresql
release_group: airship-ucp-postgresql
create: []
post:
create: []

4
global/v4.0/software/charts/ucp/core/rabbitmq.yaml
View File

@ -61,7 +61,7 @@ data:
wait:
timeout: 300
labels:
release_group: ucp-rabbitmq
release_group: airship-ucp-rabbitmq
install:
no_hooks: false
upgrade:
@ -70,7 +70,7 @@ data:
delete:
- type: job
labels:
release_group: ucp-rabbitmq
release_group: airship-ucp-rabbitmq
values:
pod:
replicas:

4
global/v4.0/software/charts/ucp/deckhand/barbican.yaml
View File

@ -138,7 +138,7 @@ data:
wait:
timeout: 300
labels:
release_group: ucp-barbican
release_group: airship-ucp-barbican
install:
no_hooks: false
upgrade:
@ -147,7 +147,7 @@ data:
delete:
- type: job
labels:
release_group: ucp-barbican
release_group: airship-ucp-barbican
post:
create: []
values:

4
global/v4.0/software/charts/ucp/deckhand/deckhand.yaml
View File

@ -121,7 +121,7 @@ data:
wait:
timeout: 600
labels:
release_group: ucp-deckhand
release_group: airship-ucp-deckhand
install:
no_hooks: false
upgrade:
@ -130,7 +130,7 @@ data:
delete:
- type: job
labels:
release_group: ucp-deckhand
release_group: airship-ucp-deckhand
post:
create: []
values:

4
global/v4.0/software/charts/ucp/divingbell/divingbell.yaml
View File

@ -31,7 +31,7 @@ data:
wait:
timeout: 300
labels:
release_group: ucp-divingbell
release_group: airship-ucp-divingbell
install:
no_hooks: false
upgrade:
@ -40,7 +40,7 @@ data:
delete:
- type: job
labels:
release_group: ucp-divingbell
release_group: airship-ucp-divingbell
values:
conf:
sysctl:

4
global/v4.0/software/charts/ucp/drydock/drydock.yaml
View File

@ -137,7 +137,7 @@ data:
wait:
timeout: 600
labels:
release_group: drydock
release_group: airship-drydock
install:
no_hooks: false
upgrade:
@ -146,7 +146,7 @@ data:
delete:
- type: job
labels:
release_group: drydock
release_group: airship-drydock
values:
labels:
node_selector_key: ucp-control-plane

4
global/v4.0/software/charts/ucp/drydock/maas.yaml
View File

@ -157,7 +157,7 @@ data:
wait:
timeout: 600
labels:
release_group: maas
release_group: airship-maas
install:
no_hooks: false
upgrade:
@ -166,7 +166,7 @@ data:
delete:
- type: job
labels:
release_group: maas
release_group: airship-maas
values:
labels:
rack:

4
global/v4.0/software/charts/ucp/keystone/keystone.yaml
View File

@ -121,7 +121,7 @@ data:
wait:
timeout: 600
labels:
release_group: ucp-keystone
release_group: airship-ucp-keystone
install:
no_hooks: false
upgrade:
@ -130,7 +130,7 @@ data:
delete:
- type: job
labels:
release_group: ucp-keystone
release_group: airship-ucp-keystone
post:
create: []
values:

4
global/v4.0/software/charts/ucp/keystone/memcached.yaml
View File

@ -37,7 +37,7 @@ data:
wait:
timeout: 600
labels:
release_group: ucp-keystone-memcached
release_group: airship-ucp-keystone-memcached
install:
no_hooks: false
upgrade:
@ -46,7 +46,7 @@ data:
delete:
- type: job
labels:
release_group: ucp-keystone-memcached
release_group: airship-ucp-keystone-memcached
values:
labels:
server:

4
global/v4.0/software/charts/ucp/promenade/promenade.yaml
View File

@ -78,7 +78,7 @@ data:
wait:
timeout: 600
labels:
release_group: ucp-promenade
release_group: airship-ucp-promenade
install:
no_hooks: false
upgrade:
@ -87,7 +87,7 @@ data:
delete:
- type: job
labels:
release_group: ucp-promenade
release_group: airship-ucp-promenade
values:
pod:
replicas:

4
global/v4.0/software/charts/ucp/shipyard/shipyard.yaml
View File

@ -229,7 +229,7 @@ data:
wait:
timeout: 600
labels:
release_group: ucp-shipyard
release_group: airship-ucp-shipyard
install:
no_hooks: false
upgrade:
@ -238,7 +238,7 @@ data:
delete:
- type: job
labels:
release_group: ucp-shipyard
release_group: airship-ucp-shipyard
values:
endpoints:
postgresql_airflow_db:

24
global/v4.0/software/config/versions.yaml
View File

@ -85,9 +85,9 @@ data:
reference: c0c5199fb20335b3e8839163129372059a876ce8
ingress:
type: git
location: https://git.openstack.org/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm-infra
subpath: ingress
reference: fbfcb51c31e21331ceb20b6108b739c5e2ad48f5
reference: c0c5199fb20335b3e8839163129372059a876ce8
ingress-htk:
type: git
location: https://git.openstack.org/openstack/openstack-helm-infra
@ -202,9 +202,9 @@ data:
reference: fbfcb51c31e21331ceb20b6108b739c5e2ad48f5
ingress:
type: git
location: https://git.openstack.org/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm-infra
subpath: ingress
reference: fbfcb51c31e21331ceb20b6108b739c5e2ad48f5
reference: c0c5199fb20335b3e8839163129372059a876ce8
keystone:
type: git
location: https://git.openstack.org/openstack/openstack-helm
@ -318,9 +318,9 @@ data:
reference: fbfcb51c31e21331ceb20b6108b739c5e2ad48f5
ingress:
type: git
location: https://git.openstack.org/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm-infra
subpath: ingress
reference: fbfcb51c31e21331ceb20b6108b739c5e2ad48f5
reference: c0c5199fb20335b3e8839163129372059a876ce8
ingress-htk:
type: git
location: https://git.openstack.org/openstack/openstack-helm-infra
@ -457,8 +457,8 @@ data:
ks_service: docker.io/openstackhelm/heat:ocata
ks_user: docker.io/openstackhelm/heat:ocata
image_repo_sync: docker.io/docker:17.07.0
helm: docker.io/lachlanevenson/k8s-helm:v2.7.2
tiller: gcr.io/kubernetes-helm/tiller:v2.7.2
helm: docker.io/lachlanevenson/k8s-helm:v2.9.1
tiller: gcr.io/kubernetes-helm/tiller:v2.9.1
promenade:
promenade: quay.io/airshipit/promenade:7a06bef72c0bfd799c2353b8213627f6a0826251
ks_user: docker.io/openstackhelm/heat:ocata
@ -542,7 +542,7 @@ data:
rabbit_init: docker.io/rabbitmq:3.7-management
image_repo_sync: docker.io/docker:17.07.0
tiller:
tiller: gcr.io/kubernetes-helm/tiller:v2.7.2
tiller: gcr.io/kubernetes-helm/tiller:v2.9.1
mariadb:
mariadb: docker.io/mariadb:10.2.13
ingress: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.9.0
@ -720,7 +720,7 @@ data:
snapshot_repository: *heat
image_repo_sync: docker.io/docker:17.07.0
fluent_logging:
fluentbit: docker.io/fluent-bit:0.12.14
fluentbit: docker.io/fluent/fluent-bit:0.12.14
fluentd: docker.io/kolla/ubuntu-source-fluentd:ocata
# should be moved to somewhere...
prometheus_fluentd_exporter: docker.io/srwilkers/fluentd_exporter:v0.1
@ -770,7 +770,7 @@ data:
image_repo_sync: docker.io/docker:17.07.0
ceph:
ceph-mon:
fluentbit: docker.io/fluent-bit:0.12.14
fluentbit: docker.io/fluent/fluent-bit:0.12.14
ceph_bootstrap: *ceph_daemon
ceph_config_helper: docker.io/port/ceph-config-helper:v1.10.3
ceph_mon: *ceph_daemon
@ -778,7 +778,7 @@ data:
dep_check: *dep_check
image_repo_sync: docker.io/docker:17.07.0
ceph-osd:
fluentbit: docker.io/fluent-bit:0.12.14
fluentbit: docker.io/fluent/fluent-bit:0.12.14
ceph_osd: *ceph_daemon
ceph_bootstrap: *ceph_daemon
dep_check: *dep_check

4
site/airship-seaworthy/networks/common-addresses.yaml
View File

@ -136,8 +136,8 @@ data:
ceph:
# NEWSITE-CHANGEME: CIDRs for Ceph. Update to match the network CIDR
# used for the `storage` network in networks/physical/networks.yaml
public_cidr: '10.23.23.0/24'
cluster_cidr: '10.23.23.0/24'
public_cidr: '10.23.22.0/24'
cluster_cidr: '10.23.22.0/24'
neutron:
# NEWSITE-CHANGEME: Overlay network for VM traffic. Ensure the bond name and

10
site/airship-seaworthy/pki/pki-catalog.yaml
View File

@ -153,6 +153,7 @@ data:
- 127.0.0.1
- localhost
- kubernetes-etcd.kube-system.svc.cluster.local
- 10.96.0.2
- document_name: kubernetes-etcd-cab23-r720-11
common_name: kubernetes-etcd-cab23-r720-11
hosts:
@ -162,6 +163,7 @@ data:
- 127.0.0.1
- localhost
- kubernetes-etcd.kube-system.svc.cluster.local
- 10.96.0.2
- document_name: kubernetes-etcd-cab23-r720-12
common_name: kubernetes-etcd-cab23-r720-12
hosts:
@ -171,6 +173,7 @@ data:
- 127.0.0.1
- localhost
- kubernetes-etcd.kube-system.svc.cluster.local
- 10.96.0.2
- document_name: kubernetes-etcd-cab23-r720-13
common_name: kubernetes-etcd-cab23-r720-13
hosts:
@ -180,6 +183,7 @@ data:
- 127.0.0.1
- localhost
- kubernetes-etcd.kube-system.svc.cluster.local
- 10.96.0.2
- document_name: kubernetes-etcd-cab23-r720-14
common_name: kubernetes-etcd-cab23-r720-14
hosts:
@ -189,6 +193,7 @@ data:
- 127.0.0.1
- localhost
- kubernetes-etcd.kube-system.svc.cluster.local
- 10.96.0.2
# End node list
kubernetes-etcd-peer:
certificates:
@ -203,6 +208,7 @@ data:
- 127.0.0.1
- localhost
- kubernetes-etcd.kube-system.svc.cluster.local
- 10.96.0.2
- document_name: kubernetes-etcd-cab23-r720-11-peer
common_name: kubernetes-etcd-cab23-r720-11-peer
hosts:
@ -212,6 +218,7 @@ data:
- 127.0.0.1
- localhost
- kubernetes-etcd.kube-system.svc.cluster.local
- 10.96.0.2
- document_name: kubernetes-etcd-cab23-r720-12-peer
common_name: kubernetes-etcd-cab23-r720-12-peer
hosts:
@ -221,6 +228,7 @@ data:
- 127.0.0.1
- localhost
- kubernetes-etcd.kube-system.svc.cluster.local
- 10.96.0.2
- document_name: kubernetes-etcd-cab23-r720-13-peer
common_name: kubernetes-etcd-cab23-r720-13-peer
hosts:
@ -230,6 +238,7 @@ data:
- 127.0.0.1
- localhost
- kubernetes-etcd.kube-system.svc.cluster.local
- 10.96.0.2
- document_name: kubernetes-etcd-cab23-r720-14-peer
common_name: kubernetes-etcd-cab23-r720-14-peer
hosts:
@ -239,6 +248,7 @@ data:
- 127.0.0.1
- localhost
- kubernetes-etcd.kube-system.svc.cluster.local
- 10.96.0.2
# End node list
calico-etcd:
description: Certificates for Calico etcd client traffic

16
site/airship-seaworthy/software/charts/osh-infra/osh-infra-logging/elasticsearch.yaml Normal file
View File

@ -0,0 +1,16 @@
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: elasticsearch
layeringDefinition:
abstract: false
layer: site
parentSelector:
hosttype: elasticsearch-global
actions:
- method: merge
path: .
storagePolicy: cleartext
data: {}
...

16
site/airship-seaworthy/software/charts/osh-infra/osh-infra-logging/fluent-logging.yaml Normal file
View File

@ -0,0 +1,16 @@
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: fluent-logging
layeringDefinition:
abstract: false
layer: site
parentSelector:
hosttype: fluent-logging-global
actions:
- method: merge
path: .
storagePolicy: cleartext
data: {}
...