feature. change variables (cluster infra_conf)

openinfradev · Sep 7, 2023 · 15e8c2e · 15e8c2e
1 parent 0d8e854
commit 15e8c2e
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 20 deletions.
diff --git a/git-repo/create-cluster-repo.yaml b/git-repo/create-cluster-repo.yaml
@@ -97,9 +97,8 @@ spec:
             ## Fetch cluster params from cluster_info file ##
             val_ssh_key=$(echo $CLUSTER_INFO | jq -r '.sshKeyName')
             val_region=$(echo $CLUSTER_INFO | jq -r '.clusterRegion')
-            val_num_of_az=$(echo $CLUSTER_INFO | jq -r '.mdNumOfAz')
-
-            val_cpReplicas=$(echo $CLUSTER_INFO | jq -r '.cpReplicas')
+            
+            val_tksCpNode=$(echo $CLUSTER_INFO | jq -r '.tksCpNode')
             val_tksInfraNode=$(echo $CLUSTER_INFO | jq -r '.tksInfraNode')
             val_tksInfraNodeMax=$(echo $CLUSTER_INFO | jq -r '.tksInfraNodeMax')
             val_tksInfraNodeType=$(echo $CLUSTER_INFO | jq -r '.tksInfraNodeType')
@@ -109,9 +108,8 @@ spec:
 
             yq -i e ".global.sshKeyName=\"$val_ssh_key\"" $CLUSTER_ID/$CLUSTER_ID/tks-cluster/site-values.yaml
             yq -i e ".global.clusterRegion=\"$val_region\"" $CLUSTER_ID/$CLUSTER_ID/tks-cluster/site-values.yaml
-            yq -i e ".global.mdNumOfAz=$val_num_of_az" $CLUSTER_ID/$CLUSTER_ID/tks-cluster/site-values.yaml
 
-            yq -i e ".global.cpReplicas=$val_cpReplicas" $CLUSTER_ID/$CLUSTER_ID/tks-cluster/site-values.yaml
+            yq -i e ".global.tksCpNode=$val_tksCpNode" $CLUSTER_ID/$CLUSTER_ID/tks-cluster/site-values.yaml
             yq -i e ".global.tksInfraNode=$val_tksInfraNode" $CLUSTER_ID/$CLUSTER_ID/tks-cluster/site-values.yaml
             yq -i e ".global.tksInfraNodeMax=$val_tksInfraNodeMax" $CLUSTER_ID/$CLUSTER_ID/tks-cluster/site-values.yaml
             yq -i e ".global.tksInfraNodeType=\"$val_tksInfraNodeType\"" $CLUSTER_ID/$CLUSTER_ID/tks-cluster/site-values.yaml

diff --git a/tests/tks-e2e-aws-msa.yaml b/tests/tks-e2e-aws-msa.yaml
@@ -53,7 +53,7 @@ spec:
           - name: description
             value: "e2e-test"            
           - name: infra_conf
-            value: '{\"cpNodeCnt\":3,\"tksNodeCnt\":3,\"userNodeCnt\":1}'
+            value: '{\"tksCpNode\":1,\"tksInfraNode\":1,\"tksUserNode\":1}'
     - - name: call-validate-cluster
         templateRef:
           name: tks-validate-usercluster

diff --git a/tests/tks-e2e-aws.yaml b/tests/tks-e2e-aws.yaml
@@ -53,7 +53,7 @@ spec:
           - name: description
             value: "e2e-test"
           - name: infra_conf
-            value: '{\"cpNodeCnt\":3,\"tksNodeCnt\":3,\"userNodeCnt\":1}'
+            value: '{\"tksCpNode\":1,\"tksInfraNode\":1,\"tksUserNode\":1}'
     - - name: call-validate-cluster
         templateRef:
           name: tks-validate-usercluster

diff --git a/tks-cli/tks-cli.yaml b/tks-cli/tks-cli.yaml
@@ -12,7 +12,7 @@ spec:
   - name: login-tks-api
     container:
       name: login-tks-api
-      image: harbor.taco-cat.xyz/tks/tks-e2e-test:v2.1.7
+      image: harbor.taco-cat.xyz/tks/tks-e2e-test:v3.1.0
       envFrom:
       - secretRef:
           name: "tks-api-secret"       
@@ -31,7 +31,7 @@ spec:
       - name: description
     container:
       name: create-organization
-      image: harbor.taco-cat.xyz/tks/tks-e2e-test:v2.1.7
+      image: harbor.taco-cat.xyz/tks/tks-e2e-test:v3.1.0
       envFrom:
       - secretRef:
           name: "tks-api-secret"       
@@ -91,7 +91,7 @@ spec:
       - name: infra_conf
     container:
       name: create-usercluster
-      image: harbor.taco-cat.xyz/tks/tks-e2e-test:v2.1.7
+      image: harbor.taco-cat.xyz/tks/tks-e2e-test:v3.1.0
       envFrom:
       - secretRef:
           name: "tks-api-secret"       
@@ -103,9 +103,9 @@ spec:
 
           echo "infra_conf : {{inputs.parameters.infra_conf}}"
 
-          CP_NODE_CNT=$(echo "{{inputs.parameters.infra_conf}}" | jq -r '.cpNodeCnt')
-          TKS_NODE_CNT=$(echo "{{inputs.parameters.infra_conf}}" | jq -r '.tksNodeCnt')
-          USER_NODE_CNT=$(echo "{{inputs.parameters.infra_conf}}" | jq -r '.userNodeCnt')
+          TKS_CP_NODE=$(echo "{{inputs.parameters.infra_conf}}" | jq -r '.tksCpNode')
+          TKS_INFRA_NODE=$(echo "{{inputs.parameters.infra_conf}}" | jq -r '.tksInfraNode')
+          TKS_USER_NODE=$(echo "{{inputs.parameters.infra_conf}}" | jq -r '.tksUserNode')
 
           CL_NAME="{{inputs.parameters.cluster_name}}"
           echo "* Create $CL_NAME cluster"
@@ -114,9 +114,9 @@ spec:
             --organization-id "{{inputs.parameters.organization_id}}" \
             --cloud-account-id "{{inputs.parameters.cloud_account_id}}" \
             --description "{{inputs.parameters.description}}" \
-            --cp-node-cnt $CP_NODE_CNT \
-            --tks-node-cnt $TKS_NODE_CNT \
-            --user-node-cnt $USER_NODE_CNT
+            --tks-cp-node $TKS_CP_NODE \
+            --tks-infra-node $TKS_INFRA_NODE \
+            --tks-user-node $TKS_USER_NODE
 
           threshold=60
           for i in $(seq 1 $threshold)
@@ -156,7 +156,7 @@ spec:
       - name: cluster_id
     container:
       name: delete-usercluster
-      image: harbor.taco-cat.xyz/tks/tks-e2e-test:v2.1.7
+      image: harbor.taco-cat.xyz/tks/tks-e2e-test:v3.1.0
       envFrom:
       - secretRef:
           name: "tks-api-secret"       
@@ -199,7 +199,7 @@ spec:
       - name: description
     container:
       name: create-appgroup
-      image: harbor.taco-cat.xyz/tks/tks-e2e-test:v2.1.7
+      image: harbor.taco-cat.xyz/tks/tks-e2e-test:v3.1.0
       envFrom:
       - secretRef:
           name: "tks-api-secret"       
@@ -249,7 +249,7 @@ spec:
       - name: appgroup_id
     container:
       name: delete-appgroup
-      image: harbor.taco-cat.xyz/tks/tks-e2e-test:v2.1.7
+      image: harbor.taco-cat.xyz/tks/tks-e2e-test:v3.1.0
       envFrom:
       - secretRef:
           name: "tks-api-secret"       
@@ -289,7 +289,7 @@ spec:
       - name: name
     container:
       name: get-appgroup-id
-      image: harbor.taco-cat.xyz/tks/tks-e2e-test:v2.1.7
+      image: harbor.taco-cat.xyz/tks/tks-e2e-test:v3.1.0
       envFrom:
       - secretRef:
           name: "tks-api-secret"