Remove extraneous data
There is data in our Kustomize documents which is purely extraneous. Images and conf data do not need to be specified unless we are overriding. spec.url is just not used in helmrepository.yaml. Change-Id: I2d7498a92e08a1d9f894306034232ec22cc6fe23
This commit is contained in:
@@ -21,37 +21,3 @@ charts:
|
||||
repository: https://tarballs.opendev.org/openstack/openstack-helm
|
||||
name: keystone
|
||||
version: 0.1.6
|
||||
images:
|
||||
mariadb:
|
||||
dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
|
||||
mariadb: docker.io/openstackhelm/mariadb:latest-ubuntu_xenial
|
||||
ingress: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.9.0
|
||||
error_pages: k8s.gcr.io/defaultbackend:1.4
|
||||
prometheus_create_mysql_user: docker.io/mariadb:10.2.31
|
||||
prometheus_mysql_exporter: docker.io/prom/mysqld-exporter:v0.11.0
|
||||
prometheus_mysql_exporter_helm_tests: docker.io/openstackhelm/heat:newton-ubuntu_xenial
|
||||
image_repo_sync: docker.io/docker:17.07.0
|
||||
memcached:
|
||||
dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
|
||||
memcached: docker.io/memcached:1.5.5
|
||||
prometheus_memcached_exporter: docker.io/prom/memcached-exporter:v0.4.1
|
||||
image_repo_sync: docker.io/docker:17.07.0
|
||||
ranger:
|
||||
db_drop: docker.io/openstackhelm/heat:newton-ubuntu_xenial
|
||||
db_init: docker.io/openstackhelm/heat:newton-ubuntu_xenial
|
||||
dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
|
||||
image_repo_sync: docker.io/docker:17.07.0
|
||||
ranger: quay.io/attcomdev/ranger:30ccde094baf556e885b0ee5f9d51126d8a423bc
|
||||
ranger_db_sync: quay.io/attcomdev/ranger:30ccde094baf556e885b0ee5f9d51126d8a423bc
|
||||
scripted_test: docker.io/openstackhelm/heat:newton-ubuntu_xenial
|
||||
keystone:
|
||||
dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
|
||||
keystone_api: docker.io/openstackhelm/keystone:train-ubuntu_bionic
|
||||
keystone_fernet_setup: docker.io/openstackhelm/keystone:train-ubuntu_bionic
|
||||
keystone_fernet_rotate: docker.io/openstackhelm/keystone:train-ubuntu_bionic
|
||||
keystone_credential_setup: docker.io/openstackhelm/keystone:train-ubuntu_bionic
|
||||
keystone_credential_rotate: docker.io/openstackhelm/keystone:train-ubuntu_bionic
|
||||
keystone_credential_cleanup: docker.io/openstackhelm/heat:train-ubuntu_bionic
|
||||
keystone_db_sync: docker.io/openstackhelm/keystone:train-ubuntu_bionic
|
||||
bootstrap: docker.io/openstackhelm/heat:train-ubuntu_bionic
|
||||
db_init: docker.io/openstackhelm/heat:train-ubuntu_bionic
|
||||
|
||||
@@ -24,74 +24,13 @@ spec:
|
||||
api: 1
|
||||
manifests:
|
||||
job_rabbit_init: false
|
||||
secret_rabbitmq: true
|
||||
conf:
|
||||
keystone:
|
||||
oslo_messaging_notifications:
|
||||
driver: log
|
||||
dependencies:
|
||||
dynamic:
|
||||
rabbit_init:
|
||||
services:
|
||||
- service: oslo_messaging
|
||||
endpoint: internal
|
||||
static:
|
||||
api:
|
||||
jobs:
|
||||
- keystone-db-sync
|
||||
- keystone-credential-setup
|
||||
- keystone-fernet-setup
|
||||
services:
|
||||
- endpoint: internal
|
||||
service: oslo_cache
|
||||
- endpoint: internal
|
||||
service: oslo_db
|
||||
bootstrap:
|
||||
jobs:
|
||||
- keystone-domain-manage
|
||||
services:
|
||||
- endpoint: internal
|
||||
service: identity
|
||||
credential_rotate:
|
||||
jobs:
|
||||
- keystone-credential-setup
|
||||
credential_setup: null
|
||||
credential_cleanup:
|
||||
services:
|
||||
- endpoint: internal
|
||||
service: oslo_db
|
||||
db_drop:
|
||||
services:
|
||||
- endpoint: internal
|
||||
service: oslo_db
|
||||
db_init:
|
||||
services:
|
||||
- endpoint: internal
|
||||
service: oslo_db
|
||||
db_sync:
|
||||
jobs:
|
||||
- keystone-db-init
|
||||
- keystone-credential-setup
|
||||
- keystone-fernet-setup
|
||||
services:
|
||||
- endpoint: internal
|
||||
service: oslo_db
|
||||
domain_manage:
|
||||
services:
|
||||
- endpoint: internal
|
||||
service: identity
|
||||
fernet_rotate:
|
||||
jobs:
|
||||
- keystone-fernet-setup
|
||||
fernet_setup: null
|
||||
tests:
|
||||
services:
|
||||
- endpoint: internal
|
||||
service: identity
|
||||
image_repo_sync:
|
||||
services:
|
||||
- endpoint: internal
|
||||
service: local_image_registry
|
||||
test:
|
||||
enable: false
|
||||
interval: 5m
|
||||
|
||||
@@ -3,5 +3,4 @@ kind: HelmRepository
|
||||
metadata:
|
||||
name: keystone
|
||||
spec:
|
||||
url: https://tarballs.opendev.org/openstack/openstack-helm/
|
||||
interval: 10m
|
||||
|
||||
@@ -3,5 +3,4 @@ kind: HelmRepository
|
||||
metadata:
|
||||
name: mariadb
|
||||
spec:
|
||||
url: https://charts.bitnami.com/bitnami
|
||||
interval: 10m
|
||||
|
||||
@@ -3,5 +3,4 @@ kind: HelmRepository
|
||||
metadata:
|
||||
name: memcached
|
||||
spec:
|
||||
url: https://charts.bitnami.com/bitnami
|
||||
interval: 10m
|
||||
|
||||
@@ -3,5 +3,4 @@ kind: HelmRepository
|
||||
metadata:
|
||||
name: ranger
|
||||
spec:
|
||||
url: tarballs.opendev.org
|
||||
interval: 10m
|
||||
interval: 10m
|
||||
Reference in New Issue
Block a user