Merge "Fix charts overrides for hyperkube 1.12"
This commit is contained in:
commit
b661363fdd
|
@ -38,6 +38,14 @@ metadata:
|
||||||
path: .images.ucp.armada.helm
|
path: .images.ucp.armada.helm
|
||||||
dest:
|
dest:
|
||||||
path: .images.helm.helm
|
path: .images.helm.helm
|
||||||
|
|
||||||
|
- src:
|
||||||
|
schema: pegleg/SoftwareVersions/v1
|
||||||
|
name: software-versions
|
||||||
|
path: .images.kubernetes.hyperkube
|
||||||
|
dest:
|
||||||
|
path: .images.kubernetes.hyperkube
|
||||||
|
|
||||||
- src:
|
- src:
|
||||||
schema: pegleg/SoftwareVersions/v1
|
schema: pegleg/SoftwareVersions/v1
|
||||||
name: software-versions
|
name: software-versions
|
||||||
|
|
|
@ -113,11 +113,17 @@ data:
|
||||||
required:
|
required:
|
||||||
- helm
|
- helm
|
||||||
additionalProperties: false
|
additionalProperties: false
|
||||||
|
kubernetes:
|
||||||
|
type: object
|
||||||
|
properties:
|
||||||
|
hyperkube:
|
||||||
|
$ref: '#/definitions/image'
|
||||||
monitoring_image:
|
monitoring_image:
|
||||||
$ref: '#/definitions/image'
|
$ref: '#/definitions/image'
|
||||||
required:
|
required:
|
||||||
- haproxy
|
- haproxy
|
||||||
- helm
|
- helm
|
||||||
|
- kubernetes
|
||||||
- monitoring_image
|
- monitoring_image
|
||||||
additionalProperties: false
|
additionalProperties: false
|
||||||
|
|
||||||
|
|
|
@ -22,9 +22,9 @@ metadata:
|
||||||
- src:
|
- src:
|
||||||
schema: pegleg/SoftwareVersions/v1
|
schema: pegleg/SoftwareVersions/v1
|
||||||
name: software-versions
|
name: software-versions
|
||||||
path: .images.ucp.tiller
|
path: .images.ucp.armada.tiller
|
||||||
dest:
|
dest:
|
||||||
path: .values.images.tags
|
path: .values.images.tags.tiller
|
||||||
|
|
||||||
data:
|
data:
|
||||||
chart_name: tiller
|
chart_name: tiller
|
||||||
|
|
|
@ -26,6 +26,7 @@ metadata:
|
||||||
path: .images.ucp.promenade
|
path: .images.ucp.promenade
|
||||||
dest:
|
dest:
|
||||||
path: .values.images.tags
|
path: .values.images.tags
|
||||||
|
|
||||||
- src:
|
- src:
|
||||||
schema: pegleg/SoftwareVersions/v1
|
schema: pegleg/SoftwareVersions/v1
|
||||||
name: software-versions
|
name: software-versions
|
||||||
|
@ -33,6 +34,13 @@ metadata:
|
||||||
dest:
|
dest:
|
||||||
path: .values.images.tags.monitoring_image
|
path: .values.images.tags.monitoring_image
|
||||||
|
|
||||||
|
- src:
|
||||||
|
schema: pegleg/SoftwareVersions/v1
|
||||||
|
name: software-versions
|
||||||
|
path: .images.kubernetes.hyperkube
|
||||||
|
dest:
|
||||||
|
path: .values.images.tags.hyperkube
|
||||||
|
|
||||||
# Files
|
# Files
|
||||||
- src:
|
- src:
|
||||||
schema: promenade/HostSystem/v1
|
schema: promenade/HostSystem/v1
|
||||||
|
|
|
@ -647,7 +647,6 @@ data:
|
||||||
airflow_db_sync: quay.io/airshipit/airflow:f42e85d7cedb0a22c2f90f53ad4902cc4a62d9a9-ubuntu_xenial
|
airflow_db_sync: quay.io/airshipit/airflow:f42e85d7cedb0a22c2f90f53ad4902cc4a62d9a9-ubuntu_xenial
|
||||||
shipyard: quay.io/airshipit/shipyard:f42e85d7cedb0a22c2f90f53ad4902cc4a62d9a9-ubuntu_xenial
|
shipyard: quay.io/airshipit/shipyard:f42e85d7cedb0a22c2f90f53ad4902cc4a62d9a9-ubuntu_xenial
|
||||||
shipyard_db_sync: quay.io/airshipit/shipyard:f42e85d7cedb0a22c2f90f53ad4902cc4a62d9a9-ubuntu_xenial
|
shipyard_db_sync: quay.io/airshipit/shipyard:f42e85d7cedb0a22c2f90f53ad4902cc4a62d9a9-ubuntu_xenial
|
||||||
tiller: {}
|
|
||||||
packages:
|
packages:
|
||||||
gpgkey: |-
|
gpgkey: |-
|
||||||
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||||
|
|
Loading…
Reference in New Issue