From 4dc01cd5bd4e53cda11c61b116d0a93ecf80a709 Mon Sep 17 00:00:00 2001 From: Dustin Specker Date: Tue, 16 Oct 2018 08:15:20 -0500 Subject: [PATCH] Reorder Ranger Agent'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: I0961b80c7085dc4ec7a8ba0d4aed9cbac5d7223f --- ranger-agent/values.yaml | 566 +++++++++++++++++++-------------------- 1 file changed, 283 insertions(+), 283 deletions(-) diff --git a/ranger-agent/values.yaml b/ranger-agent/values.yaml index 1493e5ad..16bbec1f 100755 --- a/ranger-agent/values.yaml +++ b/ranger-agent/values.yaml @@ -17,7 +17,25 @@ # Declare name/value pairs to be passed into your templates. # name: value -release_group: null +images: + tags: + db_drop: docker.io/openstackhelm/heat:newton + db_init: docker.io/openstackhelm/heat:newton + dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 + image_repo_sync: docker.io/docker:17.07.0 + ks_endpoints: docker.io/openstackhelm/heat:newton + ks_service: docker.io/openstackhelm/heat:newton + ks_user: docker.io/openstackhelm/heat:newton + rabbit_init: docker.io/rabbitmq:3.7-management + ranger-agent_db_sync: quay.io/attcomdev/ranger-agent:60529ac023bf550f0e9cb9e0eb4d4eb3dbf2d5c6 + ranger_agent: quay.io/attcomdev/ranger-agent:60529ac023bf550f0e9cb9e0eb4d4eb3dbf2d5c6 + scripted_test: docker.io/openstackhelm/heat:newton + pull_policy: "IfNotPresent" + local_registry: + active: false + exclude: + - dep_check + - image_repo_sync labels: api: @@ -33,82 +51,6 @@ labels: node_selector_key: openstack-control-plane node_selector_value: enabled -images: - tags: - ranger_agent: quay.io/attcomdev/ranger-agent:60529ac023bf550f0e9cb9e0eb4d4eb3dbf2d5c6 - ranger-agent_db_sync: quay.io/attcomdev/ranger-agent:60529ac023bf550f0e9cb9e0eb4d4eb3dbf2d5c6 - db_drop: docker.io/openstackhelm/heat:newton - db_init: docker.io/openstackhelm/heat:newton - ks_user: docker.io/openstackhelm/heat:newton - ks_service: docker.io/openstackhelm/heat:newton - rabbit_init: docker.io/rabbitmq:3.7-management - ks_endpoints: docker.io/openstackhelm/heat:newton - 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 - pull_policy: "IfNotPresent" - local_registry: - active: false - exclude: - - dep_check - - image_repo_sync - -conf: - paste: - pipeline:main: - pipeline: request_id api-server - app:api-server: - paste.app_factory: ord.api.app:app_factory - filter:authtoken: - paste.filter_factory: keystonemiddleware.auth_token:filter_factory - filter:request_id: - paste.filter_factory: oslo_middleware:RequestId.factory - ranger_agent: - DEFAULT: - api_workers: 1 - debug: false - verbose: true - pecan_debug: true - repo_connection_timeout: 120 - resource_creation_timeout_min: 1200 - resource_creation_timeout_max: 14400 - use_stderr: true - api_paste_config: /etc/ranger-agent/api-paste.ini - local_repo: ranger_repo - resource_status_check_wait: 15 - api: - host: 0.0.0.0 - database: - max_retries: -1 - oslo_messaging_notifications: - driver: messagingv2 - orm: - orm_template_repo_url: git@github.com:ranger-agent/templates.git - repo_pull_check_wait: 2 - retry_limits: 5 - keystone_authtoken: - auth_type: password - auth_version: v3 - ssh: - user: ranger_agent - user_home: /home/ranger_agent - ssh_key_file: ranger_agent - ssh_key: null - ssh_config: null -network: - api: - 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: 30010 - dependencies: dynamic: common: @@ -128,6 +70,20 @@ dependencies: services: - service: oslo_db endpoint: internal + db_drop: + services: + - service: oslo_db + endpoint: internal + db_init: + services: + - service: oslo_db + endpoint: internal + db_sync: + jobs: + - ranger-agent-db-init + services: + - service: oslo_db + endpoint: internal engine: jobs: - ranger-agent-db-sync @@ -142,21 +98,13 @@ dependencies: endpoint: internal - service: image endpoint: internal - db_init: + image_repo_sync: services: - - service: oslo_db - endpoint: internal - db_sync: + - endpoint: internal + service: local_image_registry + ks_endpoints: jobs: - - ranger-agent-db-init - services: - - service: oslo_db - endpoint: internal - db_drop: - services: - - service: oslo_db - endpoint: internal - ks_user: + - ranger-agent-ks-service services: - service: identity endpoint: internal @@ -164,9 +112,7 @@ dependencies: services: - service: identity endpoint: internal - ks_endpoints: - jobs: - - ranger-agent-ks-service + ks_user: services: - service: identity endpoint: internal @@ -174,10 +120,142 @@ dependencies: services: - service: oslo_messaging endpoint: internal - image_repo_sync: - services: - - endpoint: internal - service: local_image_registry + +network: + api: + 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: 30010 + +pod: + user: + ranger_agent: + uid: 1000 + affinity: + anti: + type: + default: preferredDuringSchedulingIgnoredDuringExecution + topologyKey: + default: kubernetes.io/hostname + mounts: + ranger_agent_api: + init_container: null + ranger_agent_api: + ranger_agent_engine: + init_container: null + ranger_agent_engine: + ranger_agent_tests: + init_container: null + ranger_agent_tests: + replicas: + api: 1 + engine: 1 + lifecycle: + upgrades: + deployments: + revision_history: 3 + pod_replacement_strategy: RollingUpdate + rolling_update: + max_unavailable: 1 + max_surge: 3 + disruption_budget: + ranger_agent_api: + min_available: 0 + ranger_agent_engine: + min_available: 0 + termination_grace_period: + ranger_agent_api: + timeout: 30 + ranger_agent_engine: + 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" + image_repo_sync: + requests: + memory: "128Mi" + cpu: "100m" + limits: + memory: "1024Mi" + cpu: "2000m" + ks_endpoints: + requests: + memory: "128Mi" + cpu: "100m" + limits: + memory: "1024Mi" + cpu: "2000m" + ks_service: + requests: + memory: "128Mi" + cpu: "100m" + limits: + memory: "1024Mi" + cpu: "2000m" + ks_user: + requests: + memory: "128Mi" + cpu: "100m" + limits: + memory: "1024Mi" + cpu: "2000m" + rabbit_init: + requests: + memory: "128Mi" + cpu: "100m" + limits: + memory: "1024Mi" + cpu: "2000m" + tests: + requests: + memory: "128Mi" + cpu: "100m" + limits: + memory: "1024Mi" + cpu: "2000m" + ranger_agent_api: + requests: + memory: "128Mi" + cpu: "100m" + limits: + memory: "1024Mi" + cpu: "2000m" + ranger_agent_engine: + requests: + memory: "128Mi" + cpu: "100m" + limits: + memory: "1024Mi" + cpu: "2000m" # Names of secrets used and environmental checks secrets: @@ -213,65 +291,6 @@ endpoints: port: registry: node: 5000 - oslo_db: - auth: - admin: - username: root - password: password - ranger_agent: - username: ranger-agent - password: password - hosts: - default: mariadb - host_fqdn_override: - default: null - path: /ord - scheme: mysql+pymysql - port: - mysql: - default: 3306 - oslo_cache: - hosts: - default: memcached - host_fqdn_override: - default: null - port: - memcache: - default: 11211 - oslo_messaging: - auth: - admin: - username: rabbitmq - password: password - ranger-agent: - username: ranger-agent - password: password - hosts: - default: rabbitmq - host_fqdn_override: - default: null - path: /ranger-agent - scheme: rabbit - port: - amqp: - default: 5672 - http: - default: 15672 - ranger_rds: - name: rds-url - hosts: - default: rds - public: rds-public - host_fqdn_override: - default: null - path: - default: /v1/rds/status - scheme: - default: http - port: - rds: - default: 8777 - public: 80 identity: name: keystone auth: @@ -347,6 +366,50 @@ endpoints: api: default: 8004 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_agent: + username: ranger-agent + password: password + hosts: + default: mariadb + host_fqdn_override: + default: null + path: /ord + scheme: mysql+pymysql + port: + mysql: + default: 3306 + oslo_messaging: + auth: + admin: + username: rabbitmq + password: password + ranger-agent: + username: ranger-agent + password: password + hosts: + default: rabbitmq + host_fqdn_override: + default: null + path: /ranger-agent + scheme: rabbit + port: + amqp: + default: 5672 + http: + default: 15672 ranger_agent: name: ranger-agent hosts: @@ -369,128 +432,22 @@ endpoints: api: default: 9010 public: 80 + ranger_rds: + name: rds-url + hosts: + default: rds + public: rds-public + host_fqdn_override: + default: null + path: + default: /v1/rds/status + scheme: + default: http + port: + rds: + default: 8777 + public: 80 -pod: - user: - ranger_agent: - uid: 1000 - affinity: - anti: - type: - default: preferredDuringSchedulingIgnoredDuringExecution - topologyKey: - default: kubernetes.io/hostname - mounts: - ranger_agent_api: - init_container: null - ranger_agent_api: - ranger_agent_engine: - init_container: null - ranger_agent_engine: - ranger_agent_tests: - init_container: null - ranger_agent_tests: - replicas: - api: 1 - engine: 1 - lifecycle: - upgrades: - deployments: - revision_history: 3 - pod_replacement_strategy: RollingUpdate - rolling_update: - max_unavailable: 1 - max_surge: 3 - disruption_budget: - ranger_agent_api: - min_available: 0 - ranger_agent_engine: - min_available: 0 - termination_grace_period: - ranger_agent_api: - timeout: 30 - ranger_agent_engine: - timeout: 30 - resources: - enabled: false - ranger_agent_api: - requests: - memory: "128Mi" - cpu: "100m" - limits: - memory: "1024Mi" - cpu: "2000m" - ranger_agent_engine: - requests: - memory: "128Mi" - cpu: "100m" - limits: - memory: "1024Mi" - cpu: "2000m" - jobs: - db_init: - requests: - memory: "128Mi" - cpu: "100m" - limits: - memory: "1024Mi" - cpu: "2000m" - db_sync: - requests: - memory: "128Mi" - cpu: "100m" - limits: - memory: "1024Mi" - cpu: "2000m" - db_drop: - requests: - memory: "128Mi" - cpu: "100m" - limits: - memory: "1024Mi" - cpu: "2000m" - ks_endpoints: - requests: - memory: "128Mi" - cpu: "100m" - limits: - memory: "1024Mi" - cpu: "2000m" - ks_service: - requests: - memory: "128Mi" - cpu: "100m" - limits: - memory: "1024Mi" - cpu: "2000m" - ks_user: - requests: - memory: "128Mi" - cpu: "100m" - limits: - memory: "1024Mi" - cpu: "2000m" - rabbit_init: - requests: - memory: "128Mi" - cpu: "100m" - limits: - memory: "1024Mi" - cpu: "2000m" - tests: - requests: - memory: "128Mi" - cpu: "100m" - limits: - memory: "1024Mi" - cpu: "2000m" - image_repo_sync: - requests: - memory: "128Mi" - cpu: "100m" - limits: - memory: "1024Mi" - cpu: "2000m" manifests: configmap_bin: true @@ -498,14 +455,9 @@ manifests: deployment_ranger_agent_api: true deployment_ranger_agent_engine: true ingress_ranger_agent_api: true - secret_db: true - secret_keystone: true - secret_ssh_key: true - secret_rabbitmq: true - secret_ingress_tls: true + job_db_drop: false job_db_init: true job_db_sync: true - job_db_drop: false job_image_repo_sync: true job_ks_endpoints: true job_ks_service: true @@ -514,5 +466,53 @@ manifests: job_rabbit_init: true pdb_api: true pod_test: true + secret_db: true + secret_ingress_tls: true + secret_keystone: true + secret_rabbitmq: true + secret_ssh_key: true service_ingress_ranger_agent_api: true service_ranger_agent_api: true + +conf: + paste: + pipeline:main: + pipeline: request_id api-server + app:api-server: + paste.app_factory: ord.api.app:app_factory + filter:authtoken: + paste.filter_factory: keystonemiddleware.auth_token:filter_factory + filter:request_id: + paste.filter_factory: oslo_middleware:RequestId.factory + ranger_agent: + DEFAULT: + api_workers: 1 + debug: false + verbose: true + pecan_debug: true + repo_connection_timeout: 120 + resource_creation_timeout_min: 1200 + resource_creation_timeout_max: 14400 + use_stderr: true + api_paste_config: /etc/ranger-agent/api-paste.ini + local_repo: ranger_repo + resource_status_check_wait: 15 + api: + host: 0.0.0.0 + database: + max_retries: -1 + keystone_authtoken: + auth_type: password + auth_version: v3 + orm: + orm_template_repo_url: git@github.com:ranger-agent/templates.git + repo_pull_check_wait: 2 + retry_limits: 5 + oslo_messaging_notifications: + driver: messagingv2 + ssh: + user: ranger_agent + user_home: /home/ranger_agent + ssh_key_file: ranger_agent + ssh_key: null + ssh_config: null