Merge pull request #359 from openinfradev/fix_policy2

trivial. bugfix for creating stack
openinfradev · Apr 18, 2024 · cce8edb · cce8edb
2 parents 9ba3431 + 33b16e4
commit cce8edb
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/deploy_apps/tks-policy-wftpl.yaml b/deploy_apps/tks-policy-wftpl.yaml
@@ -92,7 +92,7 @@ spec:
             value: '{{inputs.parameters.contract_id}}'
           - name: cluster_id
             value: '{{inputs.parameters.cluster_id}}'
-          - name: policy-ids
+          - name: policy_ids
             value: '{{inputs.parameters.policy_ids}}'
 
   - name: createNamespace

diff --git a/tks-cluster/create-usercluster-wftpl.yaml b/tks-cluster/create-usercluster-wftpl.yaml
@@ -419,10 +419,10 @@ spec:
               parameters:
                 - name: cluster_id
                   value: "{{workflow.parameters.cluster_id}}"
-                - name: appname
-                  value: "policy-resources"
+                - name: contract_id
+                  value: "{{workflow.parameters.contract_id}}"
                 - name: policy_ids
-                  value: ""
+                  value: "{{workflow.parameters.policy_ids}}"
             # when: "{{steps.get-clusters-in-contract.outputs.parameters.primary_cluster}} != '' && {{workflow.parameters.cluster_id}} != {{steps.get-clusters-in-contract.outputs.parameters.primary_cluster}}"
 
     #######################

diff --git a/tks_info/apply-policies.yaml b/tks_info/apply-policies.yaml
@@ -1,15 +1,15 @@
 apiVersion: argoproj.io/v1alpha1
 kind: WorkflowTemplate
 metadata:
-  name: apply-policies
+  name: tks-apply-policies
   namespace: argo
 spec:
   entrypoint: applyPolicies
   arguments:
     parameters:
     - name: tks_api_url
       value: "http://tks-api-dev.taco-cat.xyz"
-    - name: organization_id
+    - name: contract_id
       value: ""
     - name: cluster_id
       value: ""
@@ -20,7 +20,7 @@ spec:
   - name: applyPolicies
     inputs:
       parameters:
-      - name: organization_id
+      - name: contract_id
       - name: cluster_id
       - name: policy_ids
 
@@ -41,7 +41,7 @@ spec:
         import sys
 
         TKS_API_URL = '{{workflow.parameters.tks_api_url}}'
-        ORGANIZATION_ID = '{{inputs.parameters.organization_id}}'
+        ORGANIZATION_ID = '{{inputs.parameters.contract_id}}'
         CLUSTER_ID = '{{inputs.parameters.cluster_id}}'
         POLICY_IDS = '{{inputs.parameters.policy_ids}}'