241015 main from release ( v3.2.1 )

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

cloud-accounts/aws-multi-tenancy-iam-resources.yaml

@@ -73,6 +73,7 @@ spec:
               - \"iam:TagOpenIDConnectProvider\"
               - \"iam:CreatePolicy\"
               - \"iam:GetPolicy\"
+              - \"iam:DeletePolicy\"
               - \"iam:AttachRolePolicy\"
               - \"iam:DetachRolePolicy\"
               - \"iam:CreateRole\"

deploy_apps/tks-lma-federation-wftpl.yaml

@@ -28,7 +28,7 @@ spec:
     - name: console_url
       value: "https://tks-console-dev.taco-cat.xyz"
     - name: alert_tks
-      value: "https://tks-api-dev.taco-cat.xyz/system-api/1.0/alerts"
+      value: "https://tks-api-dev.taco-cat.xyz/system-api/1.0/system-notifications"
     - name: alert_slack
       value: "https://hooks.slack.com/services/fixme"
     ##########################
@@ -46,9 +46,6 @@ spec:
       value: ""
 
   volumes:
-  - name: tks-proto-vol
-    configMap:
-      name: tks-proto
   - name: kubeconfig-adm
     secret:
       secretName: tks-admin-kubeconfig-secret
@@ -169,12 +166,16 @@ spec:
             value: "{{ workflow.parameters.github_account }}/{{workflow.parameters.cluster_id}}"
         when: "{{steps.update-auth-oidc-grafana.outputs.parameters.is_changed}} == YES"
 
-    - - name: argocd-sync-wait
-        template: argocd-sync-wait
+    - - name: garafana-sync-wait
+        templateRef:
+          name: create-application
+          template: argocd-sync-wait
         arguments:
           parameters:
           - name: cluster_id
             value: '{{workflow.parameters.cluster_id}}'
+          - name: appname
+            value: 'grafana'
 
     - - name: grafana-restart
         template: grafana-restart
@@ -312,9 +313,9 @@ spec:
             sleep 5
           done
 
-          grafana_ep_secret=$(kubectl get secret -n ${cluster_id} tks-endpoint-secret -o jsonpath='{.data.grafana}'| base64 -d )
-
-          if [[ ${grafana_ep_secret} == "" ]]; then
+          grafana_ep_secret=$(kubectl get secret -n ${cluster_id} tks-endpoint-secret -o jsonpath='{.data.grafana}'| base64 -d ) || grafana_ep_secret=""
+          
+          if [ "$grafana_ep_secret" == "" ]; then
             while [ -z $(kubectl --kubeconfig=kubeconfig get svc -n lma grafana -o jsonpath="{.status.loadBalancer.ingress[*].hostname}") ]; do
               if [[ "$(kubectl --kubeconfig=kubeconfig get svc -n lma grafana -o jsonpath='{.spec.type}')" != "LoadBalancer" ]]; then
                 log "FAIL" "A service for the grafana in ${cluster_id} is not configured properly.(No LoadBalancer)"
@@ -447,35 +448,6 @@ spec:
           path: /mnt/out/changed.txt
           default: "NO"
 
-  - name: argocd-sync-wait
-    inputs:
-      parameters:
-        - name: cluster_id
-    container:
-      name: argocd-sync-wait
-      image: harbor.taco-cat.xyz/tks/argocd-cli:v2.2.5
-      command:
-        - /bin/bash
-        - '-c'
-        - |
-          # log into Argo CD server
-          ./argocd login $ARGO_SERVER --plaintext --insecure --username $ARGO_USERNAME \
-          --password $ARGO_PASSWORD
-
-          app_name={{inputs.parameters.cluster_id}}-grafana
-
-          # sync app
-          echo "sync app $app_name"
-          ./argocd app sync $app_name
-
-          # wait for sync
-          ./argocd app wait $app_name --sync 
-
-      envFrom:
-        - secretRef:
-            name: "decapod-argocd-config"
-    activeDeadlineSeconds: 900
-
   - name: grafana-restart
     inputs:
       parameters: