eks fix

aws2tf.sh

@@ -240,5 +240,9 @@ echo "Terraform Plan ..."
 terraform plan .
 
 echo "---------------------------------------------------------------------------"
-echo "aws2tf output files are in aws2tf/generated/tf.$mysub"
-echo "---------------------------------------------------------------------------"
+echo "aws2tf output files are in generated/tf.$mysub"
+echo "---------------------------------------------------------------------------"
+
+if [ "$t" == "eks" ]; then
+echo "aws eks update-kubeconfig --name $i"
+fi

scripts/051-get-iam-role-policies.sh

@@ -23,7 +23,7 @@ for c in `seq 0 0`; do
     count=`echo $awsout | jq ".${pref[(${c})]} | length"`
     if [ "$count" -gt "0" ]; then
         count=`expr $count - 1`
-        echo $count
+        #echo $count
         for i in `seq 0 $count`; do
             pname=`echo $awsout | jq ".${pref[(${c})]}[(${i})]" | tr -d '"'`     
             awsout2=`$AWS iam get-role-policy --role-name ${1} --policy-name ${pname}`

scripts/111-get-dhcp-options.sh

@@ -15,7 +15,7 @@ for c in `seq 0 0`; do
 	#echo $cm
     awsout=`eval $cm`
     count=`echo $awsout | jq ".${pref[(${c})]} | length"`
-    echo "count=$count"
+    #echo "count=$count"
     if [ "$count" -gt "0" ]; then
         count=`expr $count - 1`
         for i in `seq 0 $count`; do

scripts/161-get-vpce.sh

@@ -107,6 +107,10 @@ for c in `seq 0 0`; do
                         t1=`echo $t1 | tr -d '"|,'`
                         t1=`printf "aws_security_group.%s.id," $t1`
                     fi
+                    if [[ "$t1" == *"rtb-"* ]]; then
+                        t1=`echo $t1 | tr -d '"|,'`
+                        t1=`printf "aws_route_table.%s.id," $t1`
+                    fi
 
                 fi
                 if [ "$skip" == "0" ]; then

scripts/300-get-eks-cluster.sh

@@ -40,7 +40,7 @@ if [ "$kcount" -gt "0" ]; then
         for ts in `cat tf2.tmp` ; do
             terraform state rm $ts > t2.txt
         done
-
+        
 
 
             ## this needs to loop !!
@@ -65,6 +65,7 @@ if [ "$kcount" -gt "0" ]; then
             ## need these or will it do it's own ?
         ../../scripts/140*.sh $tcmd  # route table
         ../../scripts/141*.sh $tcmd  # route table assoc
+        ../../scripts/161*.sh $tcmd  # vpce
 
         rarn=`echo $awsout | jq ".${pref[(${c})]}.roleArn" | tr -d '"'`
         #echo "rarn=$rarn"
@@ -150,6 +151,12 @@ if [ "$kcount" -gt "0" ]; then
                             if [[ ${tt1} == *":"* ]];then
                                 t1=`printf "\"%s\"=%s" $tt1 $tt2`
                             fi
+                            #if [[ ${tt1} == "endpoint_public_access" ]];then
+                            #    # must start public and flick over
+                            #    t1=`printf "\"%s\"= false" $tt1`
+                            #fi
+
+
                             if [[ ${tt1} == "arn" ]];then skip=1; fi
                             if [[ ${tt1} == "id" ]];then skip=1; fi
                             if [[ ${tt1} == "role_arn" ]];then 
@@ -224,6 +231,11 @@ if [ "$kcount" -gt "0" ]; then
     done  # k  
 fi
 
+#### potfix private net
+####  endpoint_public_access  = true
+
+
+
 echo "fmt"
 terraform fmt
 echo "validate"

scripts/get-eks-cluster-nodegroups.sh

@@ -70,7 +70,7 @@ if [ "$kcount" -gt "0" ]; then
                             rm $ttft.$cname.tf
                             #ls *.tf
                             cat t2.txt | perl -pe 's/\x1b.*?[mGKH]//g' > t1.txt
-
+                            mv="version"
                             file="t1.txt"
                             fn=`printf "%s__%s.tf" $ttft $cname`
                             echo $aws2tfmess > $fn
@@ -109,6 +109,7 @@ if [ "$kcount" -gt "0" ]; then
                                     if [[ ${tt1} == "version" ]];then 
                                         if [ "$iscust" == "1" ]; then
                                             skip=1;
+                                            iscust=0  # skip first occurance but not the second
                                         fi
                                     fi
                                     if [[ ${tt1} == "release_version" ]];then