Merge pull request #363 from openinfradev/fix_typo

trivial. fix typo
openinfradev · Apr 25, 2024 · 258116b · 258116b
2 parents cc35c98 + 3f762b9
commit 258116b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 20 deletions.
diff --git a/deploy_apps/tks-policy-wftpl.yaml b/deploy_apps/tks-policy-wftpl.yaml
@@ -13,12 +13,6 @@ spec:
       value: "main"
     - name: app_prefix
       value: "{{workflow.parameters.site_name}}"
-    - name: cluster_id
-      value: "{{workflow.parameters.site_name}}"
-    - name: contract_id
-      value: "{{workflow.parameters.contract_id}}"
-    - name: policy_ids
-      value: "{{workflow.parameters.policy_ids}}"
 
   volumes:
     - name: kubeconfig-adm
@@ -29,10 +23,14 @@ spec:
   - name: deploy
     inputs:
       parameters:
-      - name: cluster_id
-        value: '{{inputs.parameters.cluster_id}}'
       - name: appname
-        value: 'policy-resources'
+        value: "policy-resources"
+      - name: cluster_id
+        value: "{{inputs.parameters.cluster_id}}"
+      - name: contract_id
+        value: "{{ inputs.parameters.contract_id }}"
+      - name: policy_ids
+        value: "{{ inputs.parameters.policy_ids }}"        
     steps:
     - - name: createNamespace
         template: createNamespace
@@ -67,9 +65,9 @@ spec:
         arguments:
           parameters:
           - name: contract_id
-            value: '{{inputs.parameters.contract_id}}'
+            value: "{{inputs.parameters.contract_id}}"
           - name: cluster_id
-            value: '{{inputs.parameters.cluster_id}}'
+            value: "{{inputs.parameters.cluster_id}}"
 
     - - name: argocd-sync-wait
         templateRef:
@@ -78,9 +76,9 @@ spec:
         arguments:
           parameters:
           - name: cluster_id
-            value: '{{inputs.parameters.cluster_id}}'
+            value: "{{inputs.parameters.cluster_id}}"
           - name: appname
-            value: 'policy-resources'
+            value: "policy-resources"
 
     - - name: apply-policies
         templateRef:
@@ -89,11 +87,11 @@ spec:
         arguments:
           parameters:
           - name: contract_id
-            value: '{{inputs.parameters.contract_id}}'
+            value: "{{inputs.parameters.contract_id}}"
           - name: cluster_id
-            value: '{{inputs.parameters.cluster_id}}'
+            value: "{{inputs.parameters.cluster_id}}"
           - name: policy_ids
-            value: '{{inputs.parameters.policy_ids}}'
+            value: "{{inputs.parameters.policy_ids}}"
 
   - name: createNamespace
     inputs:
@@ -126,7 +124,7 @@ spec:
           fi
       env:
         - name: TARGET_NAMESPACE
-          value: '{{inputs.parameters.target_namespace}}'
+          value: "{{inputs.parameters.target_namespace}}"
     activeDeadlineSeconds: 900
     retryStrategy:
       limit: 2

diff --git a/tks-cluster/create-usercluster-wftpl.yaml b/tks-cluster/create-usercluster-wftpl.yaml
@@ -418,11 +418,11 @@ spec:
             arguments:
               parameters:
                 - name: cluster_id
-                  value: "{{workflow.parameters.cluster_id}}"
+                  value: "{{ workflow.parameters.cluster_id }}"
                 - name: contract_id
-                  value: "{{workflow.parameters.contract_id}}"
+                  value: "{{ workflow.parameters.contract_id }}"
                 - name: policy_ids
-                  value: "{{workflow.parameters.policy_ids}}"
+                  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}}"
 
     #######################