From 8341d95ab70d77dca4b49020f944fedd4cbaa469 Mon Sep 17 00:00:00 2001 From: Bryan Strassner Date: Mon, 4 Jun 2018 16:49:30 -0500 Subject: [PATCH] Uplift Deckhand and Shipyard to new versions Changes the versions of Deckhand and Shipyard for the airship-in-a-bottle manifests to newer versions to account for pod labels. As a result, this also brings along several Shipyard schemas and yaml files. Change-Id: I9b8470c45856698725c9aa5a6f63639debfce6eb --- .../shipyard/DeploymentConfiguration/v1.yaml | 10 ++- .../shipyard/DeploymentStrategy/v1.yaml | 74 +++++++++++++++++++ .../v1.0demo/software/config/versions.yaml | 20 ++--- .../shipyard/DeploymentConfiguration/v1.yaml | 10 ++- .../shipyard/DeploymentStrategy/v1.yaml | 74 +++++++++++++++++++ .../v1.0dev/software/config/versions.yaml | 20 ++--- .../deployment/deploymentConfiguration.yaml | 1 - .../deployment/deploymentConfiguration.yaml | 1 - 8 files changed, 184 insertions(+), 26 deletions(-) create mode 100644 deployment_files/global/v1.0demo/schemas/shipyard/DeploymentStrategy/v1.yaml create mode 100644 deployment_files/global/v1.0dev/schemas/shipyard/DeploymentStrategy/v1.yaml diff --git a/deployment_files/global/v1.0demo/schemas/shipyard/DeploymentConfiguration/v1.yaml b/deployment_files/global/v1.0demo/schemas/shipyard/DeploymentConfiguration/v1.yaml index 79e7781d..2b955aeb 100644 --- a/deployment_files/global/v1.0demo/schemas/shipyard/DeploymentConfiguration/v1.yaml +++ b/deployment_files/global/v1.0demo/schemas/shipyard/DeploymentConfiguration/v1.yaml @@ -15,8 +15,6 @@ data: properties: deployment_strategy: type: 'string' - enum: - - 'all-at-once' deploy_interval: type: 'integer' deploy_timeout: @@ -65,8 +63,16 @@ data: armada: type: 'object' properties: + get_releases_timeout: + type: 'integer' + get_status_timeout: + type: 'integer' manifest: type: 'string' + post_apply_timeout: + type: 'integer' + validate_design_timeout: + type: 'integer' additionalProperties: false required: - manifest diff --git a/deployment_files/global/v1.0demo/schemas/shipyard/DeploymentStrategy/v1.yaml b/deployment_files/global/v1.0demo/schemas/shipyard/DeploymentStrategy/v1.yaml new file mode 100644 index 00000000..51bda9f0 --- /dev/null +++ b/deployment_files/global/v1.0demo/schemas/shipyard/DeploymentStrategy/v1.yaml @@ -0,0 +1,74 @@ +--- +schema: 'deckhand/DataSchema/v1' +metadata: + schema: metadata/Control/v1 + name: shipyard/DeploymentStrategy/v1 + labels: + application: shipyard +data: + $schema: 'http://json-schema.org/schema#' + id: 'https://github.com/att-comdev/shipyard/deploymentStrategy.yaml' + type: 'object' + required: + - groups + properties: + groups: + type: 'array' + minItems: 0 + items: + type: 'object' + required: + - name + - critical + - depends_on + - selectors + properties: + name: + type: 'string' + minLength: 1 + critical: + type: 'boolean' + depends_on: + type: 'array' + minItems: 0 + items: + type: 'string' + selectors: + type: 'array' + minItems: 0 + items: + type: 'object' + minProperties: 1 + properties: + node_names: + type: 'array' + items: + type: 'string' + node_labels: + type: 'array' + items: + type: 'string' + node_tags: + type: 'array' + items: + type: 'string' + rack_names: + type: 'array' + items: + type: 'string' + additionalProperties: false + success_criteria: + type: 'object' + minProperties: 1 + properties: + percent_successful_nodes: + type: 'integer' + minimum: 0 + maximum: 100 + minimum_successful_nodes: + type: 'integer' + minimum: 0 + maximum_failed_nodes: + type: 'integer' + minimum: 0 + additionalProperties: false diff --git a/deployment_files/global/v1.0demo/software/config/versions.yaml b/deployment_files/global/v1.0demo/software/config/versions.yaml index 0082c66d..7c2cb749 100644 --- a/deployment_files/global/v1.0demo/software/config/versions.yaml +++ b/deployment_files/global/v1.0demo/software/config/versions.yaml @@ -160,9 +160,9 @@ data: reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601 deckhand: type: git - location: https://github.com/att-comdev/deckhand + location: https://github.com/openstack/airship-deckhand subpath: charts/deckhand - reference: 7385d077395dde975200a071f7ea503a9522e32c + reference: 0118874a4a77d9afbae525359e65bd659142a82c deckhand-htk: type: git location: https://github.com/openstack/openstack-helm @@ -274,9 +274,9 @@ data: reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601 shipyard: type: git - location: https://github.com/att-comdev/shipyard + location: https://github.com/openstack/airship-shipyard subpath: charts/shipyard - reference: afc2ea501deda27083b951f14791c5ed6141d8ae + reference: 0c9152d62e43747f33da58b217320f783a5cca8b shipyard-htk: type: git location: https://github.com/openstack/openstack-helm @@ -433,10 +433,10 @@ data: ks_service: docker.io/openstackhelm/heat:ocata ks_endpoints: docker.io/openstackhelm/heat:ocata deckhand: - deckhand: artifacts-aic.atlantafoundry.com/att-comdev/deckhand:7385d077395dde975200a071f7ea503a9522e32c + deckhand: artifacts-aic.atlantafoundry.com/att-comdev/deckhand:0118874a4a77d9afbae525359e65bd659142a82c.161 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 db_init: docker.io/postgres:9.5 - db_sync: artifacts-aic.atlantafoundry.com/att-comdev/deckhand:7385d077395dde975200a071f7ea503a9522e32c + db_sync: artifacts-aic.atlantafoundry.com/att-comdev/deckhand:0118874a4a77d9afbae525359e65bd659142a82c.161 ks_endpoints: docker.io/openstackhelm/heat:ocata ks_service: docker.io/openstackhelm/heat:ocata ks_user: docker.io/openstackhelm/heat:ocata @@ -460,13 +460,13 @@ data: drydock_db_init: docker.io/postgres:9.5 drydock_db_sync: artifacts-aic.atlantafoundry.com/att-comdev/drydock:506e06623a5f1c11c0d34f2089851cc8381f06ae shipyard: - airflow: artifacts-aic.atlantafoundry.com/att-comdev/airflow:afc2ea501deda27083b951f14791c5ed6141d8ae - shipyard: artifacts-aic.atlantafoundry.com/att-comdev/shipyard:afc2ea501deda27083b951f14791c5ed6141d8ae + airflow: artifacts-aic.atlantafoundry.com/att-comdev/airflow:0c9152d62e43747f33da58b217320f783a5cca8b + shipyard: artifacts-aic.atlantafoundry.com/att-comdev/shipyard:0c9152d62e43747f33da58b217320f783a5cca8b dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 shipyard_db_init: docker.io/postgres:9.5 - shipyard_db_sync: artifacts-aic.atlantafoundry.com/att-comdev/shipyard:afc2ea501deda27083b951f14791c5ed6141d8ae + shipyard_db_sync: artifacts-aic.atlantafoundry.com/att-comdev/shipyard:0c9152d62e43747f33da58b217320f783a5cca8b airflow_db_init: docker.io/postgres:9.5 - airflow_db_sync: artifacts-aic.atlantafoundry.com/att-comdev/airflow:afc2ea501deda27083b951f14791c5ed6141d8ae + airflow_db_sync: artifacts-aic.atlantafoundry.com/att-comdev/airflow:0c9152d62e43747f33da58b217320f783a5cca8b ks_user: docker.io/openstackhelm/heat:ocata ks_service: docker.io/openstackhelm/heat:ocata ks_endpoints: docker.io/openstackhelm/heat:ocata diff --git a/deployment_files/global/v1.0dev/schemas/shipyard/DeploymentConfiguration/v1.yaml b/deployment_files/global/v1.0dev/schemas/shipyard/DeploymentConfiguration/v1.yaml index 79e7781d..2b955aeb 100644 --- a/deployment_files/global/v1.0dev/schemas/shipyard/DeploymentConfiguration/v1.yaml +++ b/deployment_files/global/v1.0dev/schemas/shipyard/DeploymentConfiguration/v1.yaml @@ -15,8 +15,6 @@ data: properties: deployment_strategy: type: 'string' - enum: - - 'all-at-once' deploy_interval: type: 'integer' deploy_timeout: @@ -65,8 +63,16 @@ data: armada: type: 'object' properties: + get_releases_timeout: + type: 'integer' + get_status_timeout: + type: 'integer' manifest: type: 'string' + post_apply_timeout: + type: 'integer' + validate_design_timeout: + type: 'integer' additionalProperties: false required: - manifest diff --git a/deployment_files/global/v1.0dev/schemas/shipyard/DeploymentStrategy/v1.yaml b/deployment_files/global/v1.0dev/schemas/shipyard/DeploymentStrategy/v1.yaml new file mode 100644 index 00000000..51bda9f0 --- /dev/null +++ b/deployment_files/global/v1.0dev/schemas/shipyard/DeploymentStrategy/v1.yaml @@ -0,0 +1,74 @@ +--- +schema: 'deckhand/DataSchema/v1' +metadata: + schema: metadata/Control/v1 + name: shipyard/DeploymentStrategy/v1 + labels: + application: shipyard +data: + $schema: 'http://json-schema.org/schema#' + id: 'https://github.com/att-comdev/shipyard/deploymentStrategy.yaml' + type: 'object' + required: + - groups + properties: + groups: + type: 'array' + minItems: 0 + items: + type: 'object' + required: + - name + - critical + - depends_on + - selectors + properties: + name: + type: 'string' + minLength: 1 + critical: + type: 'boolean' + depends_on: + type: 'array' + minItems: 0 + items: + type: 'string' + selectors: + type: 'array' + minItems: 0 + items: + type: 'object' + minProperties: 1 + properties: + node_names: + type: 'array' + items: + type: 'string' + node_labels: + type: 'array' + items: + type: 'string' + node_tags: + type: 'array' + items: + type: 'string' + rack_names: + type: 'array' + items: + type: 'string' + additionalProperties: false + success_criteria: + type: 'object' + minProperties: 1 + properties: + percent_successful_nodes: + type: 'integer' + minimum: 0 + maximum: 100 + minimum_successful_nodes: + type: 'integer' + minimum: 0 + maximum_failed_nodes: + type: 'integer' + minimum: 0 + additionalProperties: false diff --git a/deployment_files/global/v1.0dev/software/config/versions.yaml b/deployment_files/global/v1.0dev/software/config/versions.yaml index 74f88822..9a9ece9c 100644 --- a/deployment_files/global/v1.0dev/software/config/versions.yaml +++ b/deployment_files/global/v1.0dev/software/config/versions.yaml @@ -160,9 +160,9 @@ data: reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601 deckhand: type: git - location: https://github.com/att-comdev/deckhand + location: https://github.com/openstack/airship-deckhand subpath: charts/deckhand - reference: 7385d077395dde975200a071f7ea503a9522e32c + reference: 0118874a4a77d9afbae525359e65bd659142a82c deckhand-htk: type: git location: https://github.com/openstack/openstack-helm @@ -274,9 +274,9 @@ data: reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601 shipyard: type: git - location: https://github.com/att-comdev/shipyard + location: https://github.com/openstack/airship-shipyard subpath: charts/shipyard - reference: afc2ea501deda27083b951f14791c5ed6141d8ae + reference: 0c9152d62e43747f33da58b217320f783a5cca8b shipyard-htk: type: git location: https://github.com/openstack/openstack-helm @@ -311,10 +311,10 @@ data: ks_service: docker.io/openstackhelm/heat:ocata ks_endpoints: docker.io/openstackhelm/heat:ocata deckhand: - deckhand: artifacts-aic.atlantafoundry.com/att-comdev/deckhand:7385d077395dde975200a071f7ea503a9522e32c + deckhand: artifacts-aic.atlantafoundry.com/att-comdev/deckhand:0118874a4a77d9afbae525359e65bd659142a82c.161 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 db_init: docker.io/postgres:9.5 - db_sync: artifacts-aic.atlantafoundry.com/att-comdev/deckhand:7385d077395dde975200a071f7ea503a9522e32c + db_sync: artifacts-aic.atlantafoundry.com/att-comdev/deckhand:0118874a4a77d9afbae525359e65bd659142a82c.161 ks_endpoints: docker.io/openstackhelm/heat:ocata ks_service: docker.io/openstackhelm/heat:ocata ks_user: docker.io/openstackhelm/heat:ocata @@ -338,13 +338,13 @@ data: drydock_db_init: docker.io/postgres:9.5 drydock_db_sync: artifacts-aic.atlantafoundry.com/att-comdev/drydock:506e06623a5f1c11c0d34f2089851cc8381f06ae shipyard: - airflow: artifacts-aic.atlantafoundry.com/att-comdev/airflow:afc2ea501deda27083b951f14791c5ed6141d8ae - shipyard: artifacts-aic.atlantafoundry.com/att-comdev/shipyard:afc2ea501deda27083b951f14791c5ed6141d8ae + airflow: artifacts-aic.atlantafoundry.com/att-comdev/airflow:0c9152d62e43747f33da58b217320f783a5cca8b + shipyard: artifacts-aic.atlantafoundry.com/att-comdev/shipyard:0c9152d62e43747f33da58b217320f783a5cca8b dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 shipyard_db_init: docker.io/postgres:9.5 - shipyard_db_sync: artifacts-aic.atlantafoundry.com/att-comdev/shipyard:afc2ea501deda27083b951f14791c5ed6141d8ae + shipyard_db_sync: artifacts-aic.atlantafoundry.com/att-comdev/shipyard:0c9152d62e43747f33da58b217320f783a5cca8b airflow_db_init: docker.io/postgres:9.5 - airflow_db_sync: artifacts-aic.atlantafoundry.com/att-comdev/airflow:afc2ea501deda27083b951f14791c5ed6141d8ae + airflow_db_sync: artifacts-aic.atlantafoundry.com/att-comdev/airflow:0c9152d62e43747f33da58b217320f783a5cca8b ks_user: docker.io/openstackhelm/heat:ocata ks_service: docker.io/openstackhelm/heat:ocata ks_endpoints: docker.io/openstackhelm/heat:ocata diff --git a/deployment_files/site/demo/deployment/deploymentConfiguration.yaml b/deployment_files/site/demo/deployment/deploymentConfiguration.yaml index 14521bad..bf0b3b1c 100644 --- a/deployment_files/site/demo/deployment/deploymentConfiguration.yaml +++ b/deployment_files/site/demo/deployment/deploymentConfiguration.yaml @@ -9,7 +9,6 @@ metadata: storagePolicy: cleartext data: physical_provisioner: - deployment_strategy: all-at-once deploy_interval: 30 deploy_timeout: 3600 destroy_interval: 30 diff --git a/deployment_files/site/dev/deployment/deploymentConfiguration.yaml b/deployment_files/site/dev/deployment/deploymentConfiguration.yaml index 14521bad..bf0b3b1c 100644 --- a/deployment_files/site/dev/deployment/deploymentConfiguration.yaml +++ b/deployment_files/site/dev/deployment/deploymentConfiguration.yaml @@ -9,7 +9,6 @@ metadata: storagePolicy: cleartext data: physical_provisioner: - deployment_strategy: all-at-once deploy_interval: 30 deploy_timeout: 3600 destroy_interval: 30