Merge pull request #222 from openinfradev/s3support

S3support

deploy_apps/tks-lma-federation-wftpl.yaml

@@ -8,23 +8,25 @@ spec:
   arguments:
     parameters:
     - name: site_name
-      value: "decapod-refrence"
+      value: "coyar0qx1"
     - name: logging_component
       value: "loki"
+    - name: object_store
+      value: "s3"
     - name: github_account
       value: "decapod10"
     - name: manifest_repo_url
-      value: "https://github.com/decapod10/c3c16juq5-manifests"
+      value: "https://github.com/decapod10/coyar0qx1-manifests"
     - name: revision
       value: "main"
     - name: organization_id
-      value: "o086tb3zc"
+      value: "ovbxm7jvf"
     - name: app_prefix
       value: "{{workflow.parameters.site_name}}"
     - name: keycloak_url
-      value: ""
+      value: "https://tks-console-dev.taco-cat.xyz"
     - name: console_url
-      value: ""
+      value: "https://tks-console-dev.taco-cat.xyz"
     - name: alert_tks
       value: "https://tks-api-dev.taco-cat.xyz/system-api/1.0/alerts"
     - name: alert_slack
@@ -35,11 +37,13 @@ spec:
     - name: tks_info_host
       value: "http://tks-api.tks.svc:9110"
     - name: cluster_id
-      value: "c3c16juq5"
+      value: "coyar0qx1"
     - name: app_group_id
-      value: "a60sfxh4v"
+      value: "a4z9mqwew"
     - name: base_repo_branch
-      value: "main"
+      value: develop
+    - name: cloud_account_id
+      value: ""
 
   volumes:
   - name: tks-proto-vol

deploy_apps/tks-remove-lma-federation-wftpl.yaml

@@ -14,15 +14,19 @@ spec:
     - name: tks_info_host
       value: "http://tks-api.tks.svc:9110"
     - name: organization_id
-      value: "ohxwkh7iy"
+      value: "ovbxm7jvf"
     - name: cluster_id
-      value: "c750jgmy8"
+      value: "cs7r4tu4d"
     - name: app_group_id
-      value: "aey4niy0a"
+      value: "acq1x8rcb"
     - name: keycloak_url
-      value: ""
+      value: "https://tks-console-dev.taco-cat.xyz"
     - name: base_repo_branch
-      value: "main"
+      value: "develop"
+    - name: cloud_account_id
+      value: ""
+    - name: object_store
+      value: "s3"
 
     ##########################
     # For removeLMA task #

git-repo/create-cluster-repo.yaml

@@ -247,4 +247,4 @@ spec:
           parameter: "{{steps.createClusterRepo.outputs.parameters.infra_provider}}"
       - name: managed_cluster
         valueFrom:
-          parameter: "{{steps.createClusterRepo.outputs.parameters.managed_cluster}}"
+          parameter: "{{steps.createClusterRepo.outputs.parameters.managed_cluster}}"

tks-cluster/create-usercluster-wftpl.yaml

@@ -263,12 +263,6 @@ spec:
           - name: list
             value: |
               [
-                {
-                  "app_group": "tks-cluster",
-                  "path": "aws-ebs-csi-driver",
-                  "namespace": "kube-system",
-                  "target_cluster": ""
-                },
                 {
                   "app_group": "tks-cluster",
                   "path": "s3-chart-crds",
@@ -282,6 +276,25 @@ spec:
                   "target_cluster": ""
                 }
               ]
+        when: >-
+            {{steps.tks-create-cluster-repo.outputs.parameters.infra_provider}} == aws
+
+    - - name: install-addons-aws-for-self-managed
+        templateRef:
+          name: create-application
+          template: installApps
+        arguments:
+          parameters:
+          - name: list
+            value: |
+              [
+                {
+                  "app_group": "tks-cluster",
+                  "path": "aws-ebs-csi-driver",
+                  "namespace": "kube-system",
+                  "target_cluster": ""
+                }
+              ]
         when: >-
             {{steps.tks-create-cluster-repo.outputs.parameters.infra_provider}} == aws &&
               {{steps.tks-create-cluster-repo.outputs.parameters.managed_cluster}} == false

tks-cluster/import-usercluster-wftpl.yaml

@@ -264,4 +264,3 @@ spec:
       env:
       - name: CLUSTER_ID
         value: "{{ inputs.parameters.cluster_id }}"
-

tks-cluster/remove-usercluster-wftpl.yaml

@@ -138,10 +138,7 @@ spec:
           parameters:
             - name: app_name
               value: "{{workflow.parameters.app_prefix}}-s3-chart"
-        when: >-
-            ( {{steps.findInfraProvider.outputs.parameters.infra_provider}} == aws &&
-              {{steps.findInfraProvider.outputs.parameters.managed_cluster}} == false
-            )
+        when: "{{steps.findInfraProvider.outputs.parameters.infra_provider}} == aws "
 
     - - name: deleteS3ChartCrdApp
         templateRef:
@@ -151,10 +148,7 @@ spec:
           parameters:
             - name: app_name
               value: "{{workflow.parameters.app_prefix}}-s3-chart-crds"
-        when: >-
-            ( {{steps.findInfraProvider.outputs.parameters.infra_provider}} == aws &&
-              {{steps.findInfraProvider.outputs.parameters.managed_cluster}} == false
-            )
+        when: "{{steps.findInfraProvider.outputs.parameters.infra_provider}} == aws "
 
     - - name: deleteCalicoController
         template: deleteCalicoController

tks-stack/tks-stack-create-aws-msa.yaml

@@ -23,6 +23,10 @@ spec:
       value: ""
     - name: infra_conf
       value: ""
+    - name: object_store
+      value: "s3"
+    - name: base_repo_branch
+      value: develop
 
   templates:
   - name: main

tks-stack/tks-stack-create-aws.yaml

@@ -23,6 +23,8 @@ spec:
       value: ""
     - name: infra_conf
       value: ""
+    - name: object_store
+      value: "s3"
 
   templates:
   - name: main