Updates the tile build process (#113)

- Fixes the path in the generated offering tar file
- Updates the variable descriptions in the tile README and in the offering json

Author: Sean Sundberg

.tile/docs/README.md

@@ -75,15 +75,15 @@ chmod +x create-catalog-offering.sh
 - Enter values for the variables list , these can be customized depending
  on the type of cluster and if its in classic or VPC
 
-    | **Variable**   | **Description**  | **eg. Value**  |
-    |---|---|---|
-    | `ibmcloud_api_key` | The API key from IBM Cloud Console that support service creation access writes  | `{guid API key from Console}`  |
-    |  `resource_group_name` | The name of the resource group where the cluster is created  | `dev-team-one`  |
-    |  `cluster_name`       |  The name of the IKS cluster |  `dev-team-one-iks-117-vpc` |
-    |  `registry_namespace` |  The namespace that should be used in the IBM Container Registry. If not provided the value will default to theresource group name |  `dev-team-one-registry-2020` |
-    |  `cluster_type`       |  The name of the IKS cluster |  `kubernetes` or `ocp4` |
-    |  `cluster_exists`     |  Does the cluster exist already | `true`  |
-    |  `vpc_cluster`        | Is the cluster created in VPC  | `true`  |
+    | **Variable**          | **Description**  | **eg. Value**  |
+    |-----------------------|-----------------------------------------------------------------------------------------------|-------------------------------|
+    | `cluster_exists`      | Flag indicating that the cluster already exists                                               | `true` or `false`             |
+    | `cluster_type`        | The type of cluster into which the toolkit will be installed                                  | `kubernetes` or `ocp4`        |
+    | `ibmcloud_api_key`    | The API key from IBM Cloud Console that has ClusterAdmin access and supports service creation | `{guid API key from Console}` |
+    | `resource_group_name` | Existing resource group in the account where the cluster has been created                     | `dev-team-one`                |
+    | `cluster_name`        | The name of the cluster                                                                       | `dev-team-one-iks-117-vpc`    |
+    | `registry_namespace`  | The namespace that should be used in the IBM Container Registry. If not provided the value will default to the resource group name | `dev-team-one-registry-2020` |
+    | `vpc_cluster`         | Flag indicating that the cluster has been built on VPC infrastructure                         | `true` or `false`             |
 
 - Input the Environment variables
 

.tile/scripts/build.sh

@@ -55,7 +55,7 @@ rm "${WORKSPACE_DIR}/stage3-logdna.tf"
 rm "${WORKSPACE_DIR}/stage3-sysdig.tf"
 
 echo "  - Creating offering - ${OUTPUT_DIR}/${OFFERING_NAME}.tar.gz"
-cd "${WORKSPACE_BASE}" && tar czf "${OUTPUT_DIR}/${OFFERING_NAME}.tar.gz" .
+cd "${WORKSPACE_BASE}" && tar czf "${OUTPUT_DIR}/${OFFERING_NAME}.tar.gz" "${OFFERING_NAME}"
 cd - 1> /dev/null
 rm -rf "${WORKSPACE_BASE}"
 

.tile/scripts/master.json

@@ -24,31 +24,31 @@
               "key": "cluster_exists",
               "type": "string",
               "default_value": "true",
-              "description": "Flag indicating if the cluster already exists (true or false)",
+              "description": "Flag indicating that the cluster already exists (true or false)",
               "required": true,
               "hidden": false
             },
             {
               "key": "cluster_type",
               "type": "string",
-              "default_value": "kubernetes",
-              "description": "The type of cluster that should be created (ocp4, ocp3 or kubernetes)",
+              "default_value": "ocp4",
+              "description": "The type of cluster into which the #OFFERING will be installed (ocp4, ocp3 or kubernetes)",
               "required": true,
               "hidden": false
             },
             {
               "key": "ibmcloud_api_key",
               "type": "password",
               "default_value": "",
-              "description": "The api key for IBM Cloud access",
+              "description": "The API key from IBM Cloud Console that has ClusterAdmin access and supports service creation",
               "required": true,
               "hidden": false
             },
             {
               "key": "resource_group_name",
               "type": "string",
               "default_value": "",
-              "description": "Existing resource group where the cluster will be provisioned.",
+              "description": "Existing resource group that contains the cluster",
               "required": true,
               "hidden": false
             },
@@ -71,8 +71,8 @@
             {
               "key": "vpc_cluster",
               "type": "string",
-              "default_value": "false",
-              "description": "Flag indicating if the cluster is a VPC",
+              "default_value": "true",
+              "description": "Flag indicating that the cluster has been built on VPC infrastructure",
               "required": false,
               "hidden": false
             },