Merge branch 'master' of github.com:IBM-Cloud/secure-file-storage

Author: l2fprod

.bluemix/classic.yml

@@ -35,17 +35,6 @@
           "params": ["api-key"]
       }
     },
-    "target-resource-group": {
-      "description": {
-        "$ref": "#/messages/deploy.groupDescription"
-      },
-      "type": "string",
-      "pattern": "\\S",
-      "validator": {
-          "v-type": "resource-group",
-          "params": ["api-key"]
-      }
-    },
     "image-name": {
       "description": {
         "$ref": "#/messages/deploy.imageDescription"
@@ -65,33 +54,20 @@
           "validate": false
       }
     },
-    "target-cluster-name": {
+    "schematics-workspace-id": {
       "description": {
-        "$ref": "#/messages/deploy.clusterDescription"
-      },
-      "type": "string",
-      "pattern": "\\S",
-      "validator": {
-          "v-type": "k8s-cluster-name",
-          "params": ["target-resource-group", "target-region"]
-      }
-    },
-    "target-cluster-namespace": {
-      "description": {
-        "$ref": "#/messages/deploy.namespaceDescription"
+        "$ref": "#/messages/deploy.schematicsWorkspaceDescription"
       },
       "type": "string",
       "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$"
     }
-  },
-  "required": [
+},
+"required": [
     "api-key",
     "target-region",
-    "target-resource-group",
     "image-name",
     "registry-namespace",
-    "target-cluster-name",
-    "target-cluster-namespace"
+    "schematics-workspace-id"
   ],
   "form": [
     {
@@ -118,41 +94,26 @@
       "type": "select",
       "readonly": false,
       "title": {
-        "$ref": "#/messages/deploy.groupName"
+        "$ref": "#/messages/deploy.imageRegistryNamespace"
       },
-      "key": "target-resource-group"
+      "key": "registry-namespace"
     },
     {
       "type": "select",
       "readonly": false,
       "title": {
-        "$ref": "#/messages/deploy.imageRegistryNamespace"
+        "$ref": "#/messages/deploy.schematicsWorkspace"
       },
-      "key": "registry-namespace"
+      "key": "schematics-workspace-id"
     },
+
     {
       "type": "text",
       "readonly": false,
       "title": {
         "$ref": "#/messages/deploy.imageName"
       },
       "key": "image-name"
-    },
-    {
-      "key": "target-cluster-name",
-      "readonly": false,
-      "type": "select",
-      "title": {
-        "$ref": "#/messages/deploy.clusterName"
-      }
-    },
-    {
-      "type": "text",
-      "readonly": false,
-      "title": {
-        "$ref": "#/messages/deploy.namespaceName"
-      },
-      "key": "target-cluster-namespace"
     }
-  ]
+ ]
 }

.bluemix/deploy.json

@@ -20,3 +20,5 @@ deploy.clusterNote: "Retrieve the Kubernetes cluster name with the CLI command '
 region: "Region"
 deploy.groupName: "Resource group where to create resources"
 deploy.groupDescription: "Resource group where to create resources"
+deploy.schematicsWorkspace: "Schematics workspace ID"
+deploy.schematicsWorkspaceDescription: "Schematics workspace ID for workspace with deployed resources"

.bluemix/nls/messages.yml

@@ -3,76 +3,39 @@ inputs:
   branch: ${GIT_BRANCH}
   path: .tekton
   service: repo
+- type: git
+  branch: master
+  service: ${TEKTON_CATALOG_REPO}
+  path: container-registry
 properties:
-- name: GIT_REPO
+- name: git-repository
   value: ${GIT_REPO_URL} 
   type: text 
-- name: GIT_BRANCH
+- name: git-branch
   value: ${GIT_BRANCH}
   type: text 
-- name: API_KEY
+- name: apikey
   value: ${API_KEY}
   type: SECURE
-- name: REGISTRY_REGION_ID
+- name: registry-region
   value: ${REGISTRY_REGION_ID}
-  type: text 
-- name: REGISTRY_NAMESPACE
+  type: text
+- name: registry-namespace
   value: ${REGISTRY_NAMESPACE}
   type: text 
-- name: TARGET_CLUSTER_NAME
-  value: ${TARGET_CLUSTER_NAME}
+- name: schematics-workspace-id
+  value: ${SCHEMATICS_WORKSPACE_ID}
   type: text 
-- name: IMAGE_NAME
+- name: image-name
   value: ${IMAGE_NAME}
   type: text 
-- name: TARGET_REGION_ID
+- name: target-region
   value: ${TARGET_REGION_ID}
-  type: text 
-- name: TARGET_NAMESPACE
-  value: ${TARGET_NAMESPACE}
-  type: text 
-- name: TARGET_RESOURCE_GROUP
-  value: ${TARGET_RESOURCE_GROUP}
-  type: text 
-- name: COS_PLAN
-  value: "lite"
-  type: text 
-- name: APP_ID_PLAN
-  value: "lite"
-  type: text 
-- name: CLOUDANT_PLAN
-  value: "lite"
-  type: text 
+  type: text
 triggers:
-- eventListener: BUILD-DEPLOY-two-task
-  branch: master
-  events:
-    push: true
-  name: git-BUILD-DEPLOY-two-task
-  properties: []
-  type: git
-  service: repo
-- eventListener: BUILD
-  name: BUILD
-  type: manual
-- eventListener: DEPLOY
-  name: DEPLOY
-  type: manual
-- eventListener: BUILD-DEPLOY-two-task
-  name: BUILD-DEPLOY-two-task
-  type: manual
-- eventListener: BUILD-DEPLOY-one-task
-  name: BUILD-DEPLOY-one-task
-  type: manual
-- eventListener: ROTATE_STORAGE_CREDENTIALS
-  name: ROTATE_STORAGE_CREDENTIALS
-  type: manual
-- eventListener: ROTATE_APPID_CREDENTIALS
-  name: ROTATE_APPID_CREDENTIALS
-  type: manual
-- eventListener: ROTATE_REGISTRY_CREDENTIALS
-  name: ROTATE_REGISTRY_CREDENTIALS
+- eventListener: manual-listener-builddeploy
+  name: manual-builddeploy
   type: manual
-- eventListener: UNINSTALL
-  name: UNINSTALL
+- eventListener: manual-listener-uninstall
+  name: manual-uninstall
   type: manual