openstack
/
openstack-helm-addons
Code Issues Proposed changes

Reorder Ranger's values.yaml to follow spec 

The values.yaml functionality is the same, just reordered according
to the values ordering spec[1].

BREAKING CHANGE:

1. Removed `release_group`

[1] https://docs.openstack.org/openstack-helm/latest/specs/values-ordering.html

Change-Id: I278a3f8aabc68b3ba17abd0aa74da1955f4400ac
This commit is contained in:
Dustin Specker 2018-10-16 08:15:20 -05:00
parent 5559878087
commit 38b255a047
1 changed files with 329 additions and 337 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

666
ranger/values.yaml
View File

@ -12,172 +12,32 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# Default values for ranger.
# This is a YAML-formatted file.
# Declare name/value pairs to be passed into your templates.
# name: value
release_group: null
labels:
ranger:
node_selector_key: openstack-control-plane
node_selector_value: enabled
job:
node_selector_key: openstack-control-plane
node_selector_value: enabled
test:
node_selector_key: openstack-control-plane
node_selector_value: enabled
images: images:
tags: tags:
ranger: quay.io/attcomdev/ranger:d376b6059733a4d9b0c47d1c8ba1edf98c8953e3
ranger_db_sync: quay.io/attcomdev/ranger:d376b6059733a4d9b0c47d1c8ba1edf98c8953e3
db_drop: docker.io/openstackhelm/heat:newton db_drop: docker.io/openstackhelm/heat:newton
db_init: docker.io/openstackhelm/heat:newton db_init: docker.io/openstackhelm/heat:newton
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
scripted_test: docker.io/openstackhelm/heat:newton
image_repo_sync: docker.io/docker:17.07.0 image_repo_sync: docker.io/docker:17.07.0
ranger: quay.io/attcomdev/ranger:d376b6059733a4d9b0c47d1c8ba1edf98c8953e3
ranger_db_sync: quay.io/attcomdev/ranger:d376b6059733a4d9b0c47d1c8ba1edf98c8953e3
scripted_test: docker.io/openstackhelm/heat:newton
pull_policy: "IfNotPresent" pull_policy: "IfNotPresent"
local_registry: local_registry:
active: false active: false
exclude: exclude:
- dep_check - dep_check
- image_repo_sync - image_repo_sync
conf:
labels:
job:
node_selector_key: openstack-control-plane
node_selector_value: enabled
ranger: ranger:
DEFAULT: node_selector_key: openstack-control-plane
protocol: http node_selector_value: enabled
log_level: INFO test:
orm_host: 0.0.0.0 node_selector_key: openstack-control-plane
pecan_debug: True node_selector_value: enabled
ranger_base: '/home/ranger/ranger'
ssl_verify: False
use_handlers: console
ranger_agent_https_enable: False
ranger_agent_client_cert_path: ''
cms:
log: null
fms:
log: null
ims:
log: null
rms:
log: null
rds:
log: null
repo_local_location: /home/ranger/git_repo
repo_remote_location: git@127.0.0.1:/home/repo/ORM.git
repo_user: orm
repo_email: orm@test.com
uuid:
log: null
audit:
log: null
cli:
base_region: RegionOne
database:
max_retries: -1
keystone_authtoken:
auth_type: password
auth_version: v3
auth_enabled: False
ssh:
user: ranger
user_home: /home/ranger
ssh_key_file: ranger
ssh_key: null
ssh_config: null
cert:
ranger_agent_client_cert: null
network:
cms:
ingress:
public: true
classes:
namespace: "nginx"
cluster: "nginx-cluster"
annotations:
nginx.ingress.kubernetes.io/rewrite-target: /
external_policy_local: false
node_port:
enabled: false
port: 37080
fms:
ingress:
public: true
classes:
namespace: "nginx"
cluster: "nginx-cluster"
annotations:
nginx.ingress.kubernetes.io/rewrite-target: /
external_policy_local: false
node_port:
enabled: false
port: 38082
ims:
ingress:
public: true
classes:
namespace: "nginx"
cluster: "nginx-cluster"
annotations:
nginx.ingress.kubernetes.io/rewrite-target: /
external_policy_local: false
node_port:
enabled: false
port: 38084
rms:
ingress:
public: true
classes:
namespace: "nginx"
cluster: "nginx-cluster"
annotations:
nginx.ingress.kubernetes.io/rewrite-target: /
external_policy_local: false
node_port:
enabled: false
port: 38080
audit:
ingress:
public: true
classes:
namespace: "nginx"
cluster: "nginx-cluster"
annotations:
nginx.ingress.kubernetes.io/rewrite-target: /
external_policy_local: false
node_port:
enabled: false
port: 38776
rds:
ingress:
public: true
classes:
namespace: "nginx"
cluster: "nginx-cluster"
annotations:
nginx.ingress.kubernetes.io/rewrite-target: /
external_policy_local: false
node_port:
enabled: false
port: 38777
uuid:
ingress:
public: true
classes:
namespace: "nginx"
cluster: "nginx-cluster"
annotations:
nginx.ingress.kubernetes.io/rewrite-target: /
external_policy_local: false
node_port:
enabled: false
port: 38090
dependencies: dependencies:
dynamic: dynamic:
@ -189,9 +49,11 @@ dependencies:
- endpoint: node - endpoint: node
service: local_image_registry service: local_image_registry
static: static:
ranger: db_drop:
jobs: services:
- ranger-db-sync - service: oslo_db
endpoint: internal
db_init:
services: services:
- service: oslo_db - service: oslo_db
endpoint: internal endpoint: internal
@ -201,18 +63,88 @@ dependencies:
services: services:
- service: oslo_db - service: oslo_db
endpoint: internal endpoint: internal
db_init:
services:
- service: oslo_db
endpoint: internal
db_drop:
services:
- service: oslo_db
endpoint: internal
image_repo_sync: image_repo_sync:
services: services:
- service: local_image_registry - service: local_image_registry
endpoint: internal endpoint: internal
ranger:
jobs:
- ranger-db-sync
services:
- service: oslo_db
endpoint: internal
pod:
user:
ranger:
uid: 1000
affinity:
anti:
type:
default: preferredDuringSchedulingIgnoredDuringExecution
topologyKey:
default: kubernetes.io/hostname
mounts:
ranger:
init_container: null
ranger:
ranger_tests:
init_container: null
ranger_tests:
replicas:
ranger: 1
lifecycle:
upgrades:
deployments:
revision_history: 3
pod_replacement_strategy: RollingUpdate
rolling_update:
max_unavailable: 1
max_surge: 3
disruption_budget:
ranger:
min_available: 0
termination_grace_period:
ranger:
timeout: 30
resources:
enabled: false
jobs:
db_drop:
requests:
memory: "128Mi"
cpu: "100m"
limits:
memory: "1024Mi"
cpu: "2000m"
db_init:
requests:
memory: "128Mi"
cpu: "100m"
limits:
memory: "1024Mi"
cpu: "2000m"
db_sync:
requests:
memory: "128Mi"
cpu: "100m"
limits:
memory: "1024Mi"
cpu: "2000m"
tests:
requests:
memory: "128Mi"
cpu: "100m"
limits:
memory: "1024Mi"
cpu: "2000m"
ranger:
requests:
memory: "128Mi"
cpu: "100m"
limits:
memory: "1024Mi"
cpu: "2000m"
# Names of secrets used and environmental checks # Names of secrets used and environmental checks
secrets: secrets:
@ -229,12 +161,12 @@ secrets:
ims: ims:
ims: ims:
public: ims public: ims
rms:
rms:
public: rms
rds: rds:
rds: rds:
public: rds public: rds
rms:
rms:
public: rms
# typically overriden by environmental # typically overriden by environmental
# values, but should include all endpoints # values, but should include all endpoints
@ -252,32 +184,20 @@ endpoints:
default: null default: null
port: port:
registry: registry:
node: 5000 node: 5000
oslo_db: audit:
auth: name: audit
admin:
username: root
password: password
ranger:
username: ranger
password: password
hosts: hosts:
default: mariadb default: audit-api
host_fqdn_override: host_fqdn_override:
default: null default: null
path: /orm path:
scheme: mysql+pymysql default: /v1/audit/transaction
scheme:
default: http
port: port:
mysql: api:
default: 3306 default: 7008
oslo_cache:
hosts:
default: memcached
host_fqdn_override:
default: null
port:
memcache:
default: 11211
cms: cms:
name: cms name: cms
hosts: hosts:
@ -315,77 +235,6 @@ endpoints:
api: api:
default: 8082 default: 8082
public: 80 public: 80
ims:
name: ims
hosts:
default: ims-api
public: ims
host_fqdn_override:
default: null
path:
default: /v1/orm/images
scheme:
default: http
port:
api:
default: 8084
public: 80
rms:
name: rms
hosts:
default: rms-api
public: rms
host_fqdn_override:
default: null
path:
default: /v2/orm/regions
scheme:
default: http
port:
api:
default: 7003
public: 80
rds:
name: rds
hosts:
default: rds-api
public: rds
host_fqdn_override:
default: null
path:
default: /v1/rds/status
scheme:
default: http
port:
api:
default: 8777
public: 80
uuid:
name: uuid
hosts:
default: uuid-api
host_fqdn_override:
default: null
path:
default: /v1/uuids
scheme:
default: http
port:
api:
default: 7001
audit:
name: audit
hosts:
default: audit-api
host_fqdn_override:
default: null
path:
default: /v1/audit/transaction
scheme:
default: http
port:
api:
default: 7008
identity: identity:
name: keystone name: keystone
auth: auth:
@ -410,78 +259,175 @@ endpoints:
api: api:
default: 80 default: 80
internal: 5000 internal: 5000
ims:
name: ims
hosts:
default: ims-api
public: ims
host_fqdn_override:
default: null
path:
default: /v1/orm/images
scheme:
default: http
port:
api:
default: 8084
public: 80
oslo_cache:
hosts:
default: memcached
host_fqdn_override:
default: null
port:
memcache:
default: 11211
oslo_db:
auth:
admin:
username: root
password: password
ranger:
username: ranger
password: password
hosts:
default: mariadb
host_fqdn_override:
default: null
path: /orm
scheme: mysql+pymysql
port:
mysql:
default: 3306
rds:
name: rds
hosts:
default: rds-api
public: rds
host_fqdn_override:
default: null
path:
default: /v1/rds/status
scheme:
default: http
port:
api:
default: 8777
public: 80
rms:
name: rms
hosts:
default: rms-api
public: rms
host_fqdn_override:
default: null
path:
default: /v2/orm/regions
scheme:
default: http
port:
api:
default: 7003
public: 80
uuid:
name: uuid
hosts:
default: uuid-api
host_fqdn_override:
default: null
path:
default: /v1/uuids
scheme:
default: http
port:
api:
default: 7001
pod: network:
user: audit:
ranger: ingress:
uid: 1000 public: true
affinity: classes:
anti: namespace: "nginx"
type: cluster: "nginx-cluster"
default: preferredDuringSchedulingIgnoredDuringExecution annotations:
topologyKey: nginx.ingress.kubernetes.io/rewrite-target: /
default: kubernetes.io/hostname external_policy_local: false
mounts: node_port:
ranger: enabled: false
init_container: null port: 38776
ranger: cms:
ranger_tests: ingress:
init_container: null public: true
ranger_tests: classes:
replicas: namespace: "nginx"
ranger: 1 cluster: "nginx-cluster"
lifecycle: annotations:
upgrades: nginx.ingress.kubernetes.io/rewrite-target: /
deployments: external_policy_local: false
revision_history: 3 node_port:
pod_replacement_strategy: RollingUpdate enabled: false
rolling_update: port: 37080
max_unavailable: 1 fms:
max_surge: 3 ingress:
disruption_budget: public: true
ranger: classes:
min_available: 0 namespace: "nginx"
termination_grace_period: cluster: "nginx-cluster"
ranger: annotations:
timeout: 30 nginx.ingress.kubernetes.io/rewrite-target: /
resources: external_policy_local: false
enabled: false node_port:
ranger: enabled: false
requests: port: 38082
memory: "128Mi" ims:
cpu: "100m" ingress:
limits: public: true
memory: "1024Mi" classes:
cpu: "2000m" namespace: "nginx"
jobs: cluster: "nginx-cluster"
db_init: annotations:
requests: nginx.ingress.kubernetes.io/rewrite-target: /
memory: "128Mi" external_policy_local: false
cpu: "100m" node_port:
limits: enabled: false
memory: "1024Mi" port: 38084
cpu: "2000m" rds:
db_sync: ingress:
requests: public: true
memory: "128Mi" classes:
cpu: "100m" namespace: "nginx"
limits: cluster: "nginx-cluster"
memory: "1024Mi" annotations:
cpu: "2000m" nginx.ingress.kubernetes.io/rewrite-target: /
db_drop: external_policy_local: false
requests: node_port:
memory: "128Mi" enabled: false
cpu: "100m" port: 38777
limits: rms:
memory: "1024Mi" ingress:
cpu: "2000m" public: true
tests: classes:
requests: namespace: "nginx"
memory: "128Mi" cluster: "nginx-cluster"
cpu: "100m" annotations:
limits: nginx.ingress.kubernetes.io/rewrite-target: /
memory: "1024Mi" external_policy_local: false
cpu: "2000m" node_port:
enabled: false
port: 38080
uuid:
ingress:
public: true
classes:
namespace: "nginx"
cluster: "nginx-cluster"
annotations:
nginx.ingress.kubernetes.io/rewrite-target: /
external_policy_local: false
node_port:
enabled: false
port: 38090
manifests: manifests:
configmap_bin: true configmap_bin: true
@ -489,28 +435,74 @@ manifests:
deployment_ranger_services: true deployment_ranger_services: true
ingress_cms: true ingress_cms: true
ingress_fms: true ingress_fms: true
ingress_rms: true
ingress_ims: true ingress_ims: true
ingress_rds: true ingress_rds: true
ingress_rms: true
secret_db: true secret_db: true
secret_ssh_key: true
secret_ingress_tls: true secret_ingress_tls: true
secret_ssh_key: true
job_db_drop: false
job_db_init: true job_db_init: true
job_db_sync: true job_db_sync: true
job_db_drop: false
job_image_repo_sync: true job_image_repo_sync: true
pdb_api: true pdb_api: true
pod_test: true pod_test: true
service_ingress_cms: true service_ingress_cms: true
service_ingress_fms: true service_ingress_fms: true
service_ingress_ims: true service_ingress_ims: true
service_ingress_rms: true
service_ingress_rds: true service_ingress_rds: true
service_ingress_rms: true
service_audit: true
service_cms: true service_cms: true
service_fms: true service_fms: true
service_ims: true service_ims: true
service_rms: true
service_rds: true service_rds: true
service_rms: true
service_uuid: true service_uuid: true
service_audit: true
conf:
ranger:
DEFAULT:
protocol: http
log_level: INFO
orm_host: 0.0.0.0
pecan_debug: True
ranger_base: '/home/ranger/ranger'
ssl_verify: False
use_handlers: console
ranger_agent_https_enable: False
ranger_agent_client_cert_path: ''
audit:
log: null
cli:
base_region: RegionOne
cms:
log: null
database:
max_retries: -1
fms:
log: null
ims:
log: null
keystone_authtoken:
auth_type: password
auth_version: v3
auth_enabled: False
rds:
log: null
repo_local_location: /home/ranger/git_repo
repo_remote_location: git@127.0.0.1:/home/repo/ORM.git
repo_user: orm
repo_email: orm@test.com
rms:
log: null
uuid:
log: null
ssh:
user: ranger
user_home: /home/ranger
ssh_key_file: ranger
ssh_key: null
ssh_config: null
cert:
ranger_agent_client_cert: null