Skip to content

Commit

Permalink
Update addons to latest versions (#354)
Browse files Browse the repository at this point in the history
* Split versions.tf file

* Update hack/versions

So that we don't have to run terraform fmt after updating the versions
file

* Update addons to latest versions
  • Loading branch information
errm committed Feb 16, 2024
1 parent 498ea59 commit 943156d
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 22 deletions.
11 changes: 9 additions & 2 deletions hack/versions
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ unless K8S_VERSION
end

ADDONS = %w(vpc-cni kube-proxy coredns aws-ebs-csi-driver)
PADDING = ADDONS.map(&:size).max

def pad(string)
string.ljust(PADDING)
end

addons = []

Expand All @@ -24,14 +29,16 @@ ADDONS.each do |addon|
end

puts <<-VERSION
# Run hack/versions k8sVersionNumber > versions.tf
# to generate the latest values for this
locals {
versions = {
k8s = "#{K8S_VERSION}"
#{pad("k8s")} = "#{K8S_VERSION}"
VERSION

addons.each do |addon|
puts <<-VERSION
#{addon["addonName"].gsub("-", "_")} = "#{addon["addonVersions"].map { |version| version["addonVersion"] }.sort.last}"
#{pad(addon["addonName"].gsub("-", "_"))} = "#{addon["addonVersions"].map { |version| version["addonVersion"] }.sort.last}"
VERSION
end

Expand Down
15 changes: 15 additions & 0 deletions required_providers.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
terraform {
required_version = ">= 1.0"

required_providers {
aws = {
source = "hashicorp/aws"
version = ">= 4.47.0"
}

kubernetes = {
source = "hashicorp/kubernetes"
version = ">= 2.10"
}
}
}
25 changes: 5 additions & 20 deletions versions.tf
Original file line number Diff line number Diff line change
@@ -1,26 +1,11 @@
terraform {
required_version = ">= 1.0"

required_providers {
aws = {
source = "hashicorp/aws"
version = ">= 4.47.0"
}

kubernetes = {
source = "hashicorp/kubernetes"
version = ">= 2.10"
}
}
}

# Run hack/versions to generate the latest values for this
# Run hack/versions k8sVersionNumber > versions.tf
# to generate the latest values for this
locals {
versions = {
k8s = "1.25"
vpc_cni = "v1.12.6-eksbuild.2"
vpc_cni = "v1.16.2-eksbuild.1"
kube_proxy = "v1.25.9-eksbuild.1"
coredns = "v1.9.3-eksbuild.3"
aws_ebs_csi_driver = "v1.19.0-eksbuild.2"
coredns = "v1.9.3-eksbuild.9"
aws_ebs_csi_driver = "v1.27.0-eksbuild.1"
}
}

0 comments on commit 943156d

Please sign in to comment.