app-serving: add missing param 'project_id'

app_serving/abort-java-app.yaml

@@ -20,8 +20,8 @@ spec:
       value: ""
     - name: organization_id
       value: "ose4j7p39"
-    - name: strategy
-      value: "blue-green"
+    - name: project_id
+      value: ""
     # tks_info service URL
     - name: tks_api_url
       value: "http://tks-api.tks.svc:9110"
@@ -37,6 +37,8 @@ spec:
           parameters:
           - name: organization_id
             value: "{{workflow.parameters.organization_id}}"
+          - name: project_id
+            value: "{{workflow.parameters.project_id}}"
           - name: asa_id
             value: "{{workflow.parameters.asa_id}}"
           - name: asa_task_id
@@ -57,6 +59,8 @@ spec:
           parameters:
           - name: organization_id
             value: "{{workflow.parameters.organization_id}}"
+          - name: project_id
+            value: "{{workflow.parameters.project_id}}"
           - name: asa_id
             value: "{{workflow.parameters.asa_id}}"
           - name: asa_task_id
@@ -78,6 +82,8 @@ spec:
           parameters:
           - name: organization_id
             value: "{{workflow.parameters.organization_id}}"
+          - name: project_id
+            value: "{{workflow.parameters.project_id}}"
           - name: asa_id
             value: "{{workflow.parameters.asa_id}}"
           - name: asa_task_id
@@ -96,6 +102,8 @@ spec:
           parameters:
           - name: organization_id
             value: "{{workflow.parameters.organization_id}}"
+          - name: project_id
+            value: "{{workflow.parameters.project_id}}"
           - name: asa_id
             value: "{{workflow.parameters.asa_id}}"
           - name: asa_task_id
@@ -131,7 +139,6 @@ spec:
         ABORT_LOG='/mnt/out/abort_output.log'
         app_name={{workflow.parameters.app_name}}
         ns={{workflow.parameters.namespace}}
-        strategy={{workflow.parameters.strategy}}
 
         # Prepare kubeconfig
         echo "Preparing kubeconfig for target cluster..." | tee -a $ABORT_LOG

app_serving/delete-java-app.yaml

@@ -19,7 +19,9 @@ spec:
     - name: asa_task_id
       value: ""
     - name: organization_id
-      value: "ose4j7p39"
+      value: ""
+    - name: project_id
+      value: ""
     - name: tks_api_url
       value: "http://tks-api.tks.svc:9110"
 
@@ -34,6 +36,8 @@ spec:
           parameters:
           - name: organization_id
             value: "{{workflow.parameters.organization_id}}"
+          - name: project_id
+            value: "{{workflow.parameters.project_id}}"
           - name: asa_id
             value: "{{workflow.parameters.asa_id}}"
           - name: asa_task_id
@@ -54,6 +58,8 @@ spec:
           parameters:
           - name: organization_id
             value: "{{workflow.parameters.organization_id}}"
+          - name: project_id
+            value: "{{workflow.parameters.project_id}}"
           - name: asa_id
             value: "{{workflow.parameters.asa_id}}"
           - name: asa_task_id
@@ -72,6 +78,8 @@ spec:
           parameters:
           - name: organization_id
             value: "{{workflow.parameters.organization_id}}"
+          - name: project_id
+            value: "{{workflow.parameters.project_id}}"
           - name: asa_id
             value: "{{workflow.parameters.asa_id}}"
           - name: asa_task_id

app_serving/promote-java-app.yaml

@@ -20,6 +20,8 @@ spec:
       value: ""
     - name: organization_id
       value: "ose4j7p39"
+    - name: project_id
+      value: ""
     - name: strategy
       value: "blue-green"
     # tks_info service URL
@@ -37,6 +39,8 @@ spec:
           parameters:
           - name: organization_id
             value: "{{workflow.parameters.organization_id}}"
+          - name: project_id
+            value: "{{workflow.parameters.project_id}}"
           - name: asa_id
             value: "{{workflow.parameters.asa_id}}"
           - name: asa_task_id
@@ -57,6 +61,8 @@ spec:
           parameters:
           - name: organization_id
             value: "{{workflow.parameters.organization_id}}"
+          - name: project_id
+            value: "{{workflow.parameters.project_id}}"
           - name: asa_id
             value: "{{workflow.parameters.asa_id}}"
           - name: asa_task_id
@@ -78,6 +84,8 @@ spec:
           parameters:
           - name: organization_id
             value: "{{workflow.parameters.organization_id}}"
+          - name: project_id
+            value: "{{workflow.parameters.project_id}}"
           - name: asa_id
             value: "{{workflow.parameters.asa_id}}"
           - name: asa_task_id
@@ -96,6 +104,8 @@ spec:
           parameters:
           - name: organization_id
             value: "{{workflow.parameters.organization_id}}"
+          - name: project_id
+            value: "{{workflow.parameters.project_id}}"
           - name: asa_id
             value: "{{workflow.parameters.asa_id}}"
           - name: asa_task_id

app_serving/rollback-java-app.yaml

@@ -10,6 +10,8 @@ spec:
     parameters:
     - name: organization_id
       value: "ose4j7p39"
+    - name: project_id
+      value: ""
     - name: target_cluster_id
       value: "C011b88fa"
     - name: app_name
@@ -37,6 +39,8 @@ spec:
           parameters:
           - name: organization_id
             value: "{{workflow.parameters.organization_id}}"
+          - name: project_id
+            value: "{{workflow.parameters.project_id}}"
           - name: asa_id
             value: "{{workflow.parameters.asa_id}}"
           - name: asa_task_id
@@ -57,6 +61,8 @@ spec:
           parameters:
           - name: organization_id
             value: "{{workflow.parameters.organization_id}}"
+          - name: project_id
+            value: "{{workflow.parameters.project_id}}"
           - name: asa_id
             value: "{{workflow.parameters.asa_id}}"
           - name: asa_task_id
@@ -75,6 +81,8 @@ spec:
           parameters:
           - name: organization_id
             value: "{{workflow.parameters.organization_id}}"
+          - name: project_id
+            value: "{{workflow.parameters.project_id}}"
           - name: asa_id
             value: "{{workflow.parameters.asa_id}}"
           - name: asa_task_id
@@ -93,6 +101,8 @@ spec:
           parameters:
           - name: organization_id
             value: "{{workflow.parameters.organization_id}}"
+          - name: project_id
+            value: "{{workflow.parameters.project_id}}"
           - name: asa_id
             value: "{{workflow.parameters.asa_id}}"
           - name: asa_task_id

app_serving/serve-java-app.yaml

@@ -24,9 +24,11 @@ spec:
     - name: app_type
       value: "springboot"
     - name: target_cluster_id
-      value: "cmibsrdnq"
+      value: ""
     - name: organization_id
-      value: "ose4j7p39"
+      value: ""
+    - name: project_id
+      value: ""
     - name: app_name
       value: "spring-petclinic"
     - name: namespace
@@ -106,6 +108,8 @@ spec:
           parameters:
           - name: organization_id
             value: "{{workflow.parameters.organization_id}}"
+          - name: project_id
+            value: "{{workflow.parameters.project_id}}"
           - name: asa_id
             value: "{{workflow.parameters.asa_id}}"
           - name: asa_task_id
@@ -123,6 +127,8 @@ spec:
           parameters:
           - name: organization_id
             value: "{{workflow.parameters.organization_id}}"
+          - name: project_id
+            value: "{{workflow.parameters.project_id}}"
           - name: asa_id
             value: "{{workflow.parameters.asa_id}}"
           - name: asa_task_id
@@ -140,6 +146,8 @@ spec:
           parameters:
           - name: organization_id
             value: "{{workflow.parameters.organization_id}}"
+          - name: project_id
+            value: "{{workflow.parameters.project_id}}"
           - name: asa_id
             value: "{{workflow.parameters.asa_id}}"
           - name: asa_task_id
@@ -162,6 +170,8 @@ spec:
           parameters:
           - name: organization_id
             value: "{{workflow.parameters.organization_id}}"
+          - name: project_id
+            value: "{{workflow.parameters.project_id}}"
           - name: asa_id
             value: "{{workflow.parameters.asa_id}}"
           - name: asa_task_id
@@ -182,6 +192,8 @@ spec:
           parameters:
           - name: organization_id
             value: "{{workflow.parameters.organization_id}}"
+          - name: project_id
+            value: "{{workflow.parameters.project_id}}"
           - name: asa_id
             value: "{{workflow.parameters.asa_id}}"
           - name: asa_task_id
@@ -199,6 +211,8 @@ spec:
           parameters:
           - name: organization_id
             value: "{{workflow.parameters.organization_id}}"
+          - name: project_id
+            value: "{{workflow.parameters.project_id}}"
           - name: asa_id
             value: "{{workflow.parameters.asa_id}}"
           - name: asa_task_id
@@ -219,6 +233,8 @@ spec:
           parameters:
           - name: organization_id
             value: "{{workflow.parameters.organization_id}}"
+          - name: project_id
+            value: "{{workflow.parameters.project_id}}"
           - name: asa_id
             value: "{{workflow.parameters.asa_id}}"
           - name: asa_task_id
@@ -238,6 +254,8 @@ spec:
           parameters:
           - name: organization_id
             value: "{{workflow.parameters.organization_id}}"
+          - name: project_id
+            value: "{{workflow.parameters.project_id}}"
           - name: asa_id
             value: "{{workflow.parameters.asa_id}}"
           - name: asa_task_id

tks_info/update-asa-endpoint-wftpl.yaml

@@ -24,6 +24,7 @@ spec:
     inputs:
       parameters:
       - name: organization_id
+      - name: project_id
       - name: asa_id
       - name: asa_task_id
       - name: endpoint
@@ -50,6 +51,7 @@ spec:
 
         TKS_API_URL = '{{workflow.parameters.tks_api_url}}'
         ORG_ID = '{{inputs.parameters.organization_id}}'
+        PROJECT_ID = '{{inputs.parameters.project_id}}'
         APP_ID = '{{inputs.parameters.asa_id}}'
         TASK_ID = '{{inputs.parameters.asa_task_id}}'
         ENDPOINT_URL = '{{inputs.parameters.endpoint}}'
@@ -74,16 +76,13 @@ spec:
             logStr='response text: {}\n'.format(res.text)
             with open(UPDATE_LOG, "a") as f:
               f.write(wfRefStr)
-              f.write(logStr)
               f.write(loginErrStr)
-            print(logStr)
             sys.exit(loginErrStr)
           res_json = res.json()
           return res_json['user']['token']
 
-
         TOKEN = getToken()
-        uri = '/api/1.0/organizations/%s/app-serve-apps/%s/endpoint' % (ORG_ID, APP_ID)
+        uri = '/api/1.0/organizations/%s/projects/%s/app-serve-apps/%s/endpoint' % (ORG_ID, PROJECT_ID, APP_ID)
         data = {
           'taskId': TASK_ID,
           'endpointUrl': ENDPOINT_URL,

tks_info/update-asa-status-wftpl.yaml

@@ -15,6 +15,7 @@ spec:
     inputs:
       parameters:
       - name: organization_id
+      - name: project_id
       - name: asa_id
       - name: asa_task_id
       - name: status
@@ -38,6 +39,7 @@ spec:
 
         TKS_API_URL = '{{workflow.parameters.tks_api_url}}'
         ORG_ID = '{{inputs.parameters.organization_id}}'
+        PROJECT_ID = '{{inputs.parameters.project_id}}'
         APP_ID = '{{inputs.parameters.asa_id}}'
         TASK_ID = '{{inputs.parameters.asa_task_id}}'
         STATUS = '{{inputs.parameters.status}}'
@@ -59,7 +61,7 @@ spec:
 
 
         TOKEN = getToken()
-        uri = '/api/1.0/organizations/%s/app-serve-apps/%s/status' % (ORG_ID, APP_ID)
+        uri = '/api/1.0/organizations/%s/projects/%s/app-serve-apps/%s/status' % (ORG_ID, PROJECT_ID, APP_ID)
         data = {
           'taskId': TASK_ID,
           'status': STATUS,
@@ -69,7 +71,7 @@ spec:
                             headers={"Authorization": "Bearer " + TOKEN},
                             json=data)
         if res.status_code != 200:
-          print('text: {}\n'.format(res.text))
+          print('Response: {}\n'.format(res.text))
           sys.exit('Failed to update status')
 
         res_json = res.json()