diff --git a/eksctl/wifi-289708231103/tip-wlan-main/cluster.tip-wlan-qa.yaml b/eksctl/wifi-289708231103/tip-wlan-main/cluster.tip-wlan-qa.yaml index dd4ab97..e6490d6 100644 --- a/eksctl/wifi-289708231103/tip-wlan-main/cluster.tip-wlan-qa.yaml +++ b/eksctl/wifi-289708231103/tip-wlan-main/cluster.tip-wlan-qa.yaml @@ -114,6 +114,31 @@ nodeGroups: k8s.io/cluster-autoscaler/tip-wlan-qa: "owned" kubernetes.io/cluster-autoscaler/enabled: "true" kubernetes.io/cluster-autoscaler/tip-wlan-qa: "owned" +- name: gw + instanceType: m5.4xlarge + amiFamily: AmazonLinux2 + minSize: 1 + maxSize: 8 + desiredCapacity: 1 + volumeSize: 100 + ssh: # import public key from file + allow: true + publicKeyPath: id_rsa_tip-wlan-qa.pub + kubeletExtraConfig: + allowedUnsafeSysctls: + - "net.ipv4.tcp_keepalive_intvl" + - "net.ipv4.tcp_keepalive_probes" + - "net.ipv4.tcp_keepalive_time" + taints: + - key: tip.main/onlygw + value: "true" + effect: NoSchedule + tags: + # EC2 tags required for cluster-autoscaler auto-discovery + k8s.io/cluster-autoscaler/enabled: "true" + k8s.io/cluster-autoscaler/tip-wlan-qa: "owned" + kubernetes.io/cluster-autoscaler/enabled: "true" + kubernetes.io/cluster-autoscaler/tip-wlan-qa: "owned" iamIdentityMappings: - arn: arn:aws:iam::289708231103:user/gha-wlan-testing diff --git a/eksctl/wifi-289708231103/tip-wlan-main/cluster.yaml b/eksctl/wifi-289708231103/tip-wlan-main/cluster.yaml index b937323..947c574 100644 --- a/eksctl/wifi-289708231103/tip-wlan-main/cluster.yaml +++ b/eksctl/wifi-289708231103/tip-wlan-main/cluster.yaml @@ -114,6 +114,31 @@ nodeGroups: k8s.io/cluster-autoscaler/${CLUSTER_NAME}: "owned" kubernetes.io/cluster-autoscaler/enabled: "true" kubernetes.io/cluster-autoscaler/${CLUSTER_NAME}: "owned" +- name: gw + instanceType: ${CLUSTER_INSTANCE_TYPE2} + amiFamily: AmazonLinux2 + minSize: 1 + maxSize: ${CLUSTER_MAX_NODES} + desiredCapacity: ${CLUSTER_NODES2} + volumeSize: ${CLUSTER_VOLUME_SIZE} + ssh: # import public key from file + allow: true + publicKeyPath: id_rsa_${CLUSTER_NAME}.pub + kubeletExtraConfig: + allowedUnsafeSysctls: + - "net.ipv4.tcp_keepalive_intvl" + - "net.ipv4.tcp_keepalive_probes" + - "net.ipv4.tcp_keepalive_time" + taints: + - key: tip.main/onlygw + value: "true" + effect: NoSchedule + tags: + # EC2 tags required for cluster-autoscaler auto-discovery + k8s.io/cluster-autoscaler/enabled: "true" + k8s.io/cluster-autoscaler/${CLUSTER_NAME}: "owned" + kubernetes.io/cluster-autoscaler/enabled: "true" + kubernetes.io/cluster-autoscaler/${CLUSTER_NAME}: "owned" iamIdentityMappings: - arn: arn:aws:iam::${AWS_ACCOUNT_ID}:user/gha-wlan-testing diff --git a/eksctl/wifi-289708231103/tip-wlan-main/env_qa2 b/eksctl/wifi-289708231103/tip-wlan-main/env_qa2 index 1fd15fb..14a2bae 100644 --- a/eksctl/wifi-289708231103/tip-wlan-main/env_qa2 +++ b/eksctl/wifi-289708231103/tip-wlan-main/env_qa2 @@ -4,10 +4,12 @@ export AWS_REGION="$AWS_DEFAULT_REGION" export AWS_ACCOUNT_ID="289708231103" export CLUSTER_DOMAIN="lab.wlan.tip.build" export CLUSTER_ZONE_ID="Z09534373UTXT2L1YL912" -export CLUSTER_INSTANCE_TYPE="c5.xlarge" +#export CLUSTER_INSTANCE_TYPE="c5.xlarge" export CLUSTER_INSTANCE_TYPE="m5.2xlarge" +export CLUSTER_INSTANCE_TYPE2="m5.4xlarge" export CLUSTER_NAME="tip-wlan-qa" export CLUSTER_NODES=2 +export CLUSTER_NODES2=1 export CLUSTER_MIN_NODES=2 export CLUSTER_MAX_NODES=8 export CLUSTER_VOLUME_SIZE=100 diff --git a/eksctl/wifi-289708231103/tip-wlan-main/scale_it b/eksctl/wifi-289708231103/tip-wlan-main/scale_it index 24f8296..27753d7 100755 --- a/eksctl/wifi-289708231103/tip-wlan-main/scale_it +++ b/eksctl/wifi-289708231103/tip-wlan-main/scale_it @@ -34,9 +34,10 @@ if [ -z "$account_id" ] ; then fi config_file="cluster.$CLUSTER_NAME.yaml" -nextstep "Generating cluster.yml file -> $config_file" +echo "Generating cluster.yml file -> $config_file" envsubst < cluster.yaml > $config_file +#eksctl create nodegroup -f cluster.$CLUSTER_NAME.yaml eksctl scale nodegroup -f cluster.$CLUSTER_NAME.yaml logv scaled $CLUSTER_NAME logv endscale "$(date)"