savepoint

README.md

@@ -34,6 +34,9 @@ In addition, the following tools are recommended:
 
 ### AMI
 
+The Terraform modules in this repository require the use of AL2023 for the
+Linux version for all AMIs.
+
 The Terraform modules in this repository rely on the AMIs used for worker
 nodes to be optimized for XRd. The easiest way to achieve this is to use the
 [XRd Packer](https://github.com/ios-xr/xrd-packer) templates to generate

aws-quickstart

@@ -141,7 +141,6 @@ ensure_ami_exists () {
     --filters \
       "Name=tag:Generated_By,Values=xrd-packer" \
       "Name=tag:Kubernetes_Version,Values=${KUBERNETES_VERSION}" \
-      "Name=tag:Amazon_Linux_Version,Values=AL2023" \
     --query "Images[*].[ImageId]" \
     --output text \
     | head -n 1)

examples/ha/infra/main.tf

@@ -84,13 +84,6 @@ module "xrd_ami" {
   count  = var.node_ami == null ? 1 : 0
 
   cluster_version = data.aws_eks_cluster.this.version
-
-  filters = [
-    {
-      name   = "tag:Amazon_Linux_Version"
-      values = ["AL2023"]
-    }
-  ]
 }
 
 locals {

examples/overlay/infra/main.tf

@@ -57,19 +57,6 @@ resource "aws_security_group" "data" {
   }
 }
 
-data "http" "multus_yaml" {
-  url = "https://raw.githubusercontent.com/aws/amazon-vpc-cni-k8s/master/config/multus/v4.0.2-eksbuild.1/multus-daemonset-thick.yml"
-}
-
-
-resource "kubernetes_manifest" "multus" {
-  for_each = toset(compact(split("---", data.http.multus_yaml.response_body)))
-  depends_on = [module.node]
-
-  manifest = yamldecode(each.key)
-}
-
-
 module "eks_config" {
   source = "../../../modules/aws/eks-config"