diff --git a/manifests/modules/autoscaling/workloads/hpa/.workshop/terraform/main.tf b/manifests/modules/autoscaling/workloads/hpa/.workshop/terraform/main.tf deleted file mode 100644 index 763fc146e..000000000 --- a/manifests/modules/autoscaling/workloads/hpa/.workshop/terraform/main.tf +++ /dev/null @@ -1,16 +0,0 @@ -module "eks_blueprints_addons" { - source = "aws-ia/eks-blueprints-addons/aws" - version = "1.19.0" - - cluster_name = var.addon_context.eks_cluster_id - cluster_endpoint = var.addon_context.aws_eks_cluster_endpoint - cluster_version = var.eks_cluster_version - oidc_provider_arn = var.addon_context.eks_oidc_provider_arn - - enable_metrics_server = true - metrics_server = { - wait = true - } - - observability_tag = null -} diff --git a/manifests/modules/autoscaling/workloads/hpa/.workshop/terraform/vars.tf b/manifests/modules/autoscaling/workloads/hpa/.workshop/terraform/vars.tf deleted file mode 100644 index 812087dc5..000000000 --- a/manifests/modules/autoscaling/workloads/hpa/.workshop/terraform/vars.tf +++ /dev/null @@ -1,35 +0,0 @@ -# tflint-ignore: terraform_unused_declarations -variable "eks_cluster_id" { - description = "EKS cluster name" - type = string -} - -# tflint-ignore: terraform_unused_declarations -variable "eks_cluster_version" { - description = "EKS cluster version" - type = string -} - -# tflint-ignore: terraform_unused_declarations -variable "cluster_security_group_id" { - description = "EKS cluster security group ID" - type = any -} - -# tflint-ignore: terraform_unused_declarations -variable "addon_context" { - description = "Addon context that can be passed directly to blueprints addon modules" - type = any -} - -# tflint-ignore: terraform_unused_declarations -variable "tags" { - description = "Tags to apply to AWS resources" - type = any -} - -# tflint-ignore: terraform_unused_declarations -variable "resources_precreated" { - description = "Have expensive resources been created already" - type = bool -} diff --git a/website/docs/autoscaling/workloads/horizontal-pod-autoscaler/index.md b/website/docs/autoscaling/workloads/horizontal-pod-autoscaler/index.md index f4a5fa68c..70ef49428 100644 --- a/website/docs/autoscaling/workloads/horizontal-pod-autoscaler/index.md +++ b/website/docs/autoscaling/workloads/horizontal-pod-autoscaler/index.md @@ -7,21 +7,6 @@ description: "Automatically scale workloads on Amazon Elastic Kubernetes Service ::required-time -:::tip Before you start -Prepare your environment for this section: - -```bash timeout=300 wait=30 -$ prepare-environment autoscaling/workloads/hpa -``` - -This will make the following changes to your lab environment: - -- Install the Kubernetes Metrics Server in the Amazon EKS cluster - -You can view the Terraform that applies these changes [here](https://github.com/VAR::MANIFESTS_OWNER/VAR::MANIFESTS_REPOSITORY/tree/VAR::MANIFESTS_REF/manifests/modules/autoscaling/workloads/hpa/.workshop/terraform). - -::: - In this lab, we'll look at the Horizontal Pod Autoscaler (HPA) to scale pods in a deployment or replica set. It's implemented as a K8s API resource and a controller. The resource determines the behavior of the controller. The Controller Manager queries the resource utilization against the metrics specified in each HorizontalPodAutoscaler definition. The controller periodically adjusts the number of replicas in a replication controller or deployment to the target specified by the user by observing metrics such as average CPU utilization, average memory utilization or any other custom metric. It obtains the metrics from either the resource metrics API (for per-pod resource metrics), or the custom metrics API (for all other metrics). The Kubernetes Metrics Server is a scalable and efficient aggregator of resource usage data in your cluster. It provides container metrics that are required by the Horizontal Pod Autoscaler. The metrics server is not deployed by default in Amazon EKS clusters. diff --git a/website/docs/autoscaling/workloads/horizontal-pod-autoscaler/metric-server.md b/website/docs/autoscaling/workloads/horizontal-pod-autoscaler/metric-server.md index 4d95bc2b9..7d6ca5f45 100644 --- a/website/docs/autoscaling/workloads/horizontal-pod-autoscaler/metric-server.md +++ b/website/docs/autoscaling/workloads/horizontal-pod-autoscaler/metric-server.md @@ -3,9 +3,9 @@ title: "Metric server" sidebar_position: 5 --- -The Kubernetes Metrics Server is an aggregator of resource usage data in your cluster, and it is not deployed by default in Amazon EKS clusters. For more information, see [Kubernetes Metrics Server](https://github.com/kubernetes-sigs/metrics-server) on GitHub. The Metrics Server is commonly used by other Kubernetes add-ons, such as the Horizontal Pod Autoscaler or the Kubernetes Dashboard. For more information, see [Resource metrics pipeline](https://kubernetes.io/docs/tasks/debug/debug-cluster/resource-metrics-pipeline/) in the Kubernetes documentation. In this lab exercise, we'll deploy the Kubernetes Metrics Server on our Amazon EKS cluster. +The Kubernetes Metrics Server is an aggregator of resource usage data in your cluster, and it is not deployed by default in Amazon EKS clusters. For more information, see [Kubernetes Metrics Server](https://github.com/kubernetes-sigs/metrics-server) on GitHub. The Metrics Server is commonly used by other Kubernetes add-ons, such as the Horizontal Pod Autoscaler or the Kubernetes Dashboard. For more information, see [Resource metrics pipeline](https://kubernetes.io/docs/tasks/debug/debug-cluster/resource-metrics-pipeline/) in the Kubernetes documentation. -The Metric Server has been set up in advance in our cluster for this workshop: +The Metrics Server was deployed to our cluster as an EKS community addon when the cluster was created: ```bash $ kubectl -n kube-system get pod -l app.kubernetes.io/name=metrics-server