upstream/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2026-05-28 04:10:44 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

[VAULT-44881] enos: add support for Ubuntu 26.04

Browse source 
Signed-off-by: Ryan Cragun <me@ryan.ec>
Co-authored-by: Ryan Cragun <me@ryan.ec>
This commit is contained in:
Vault Automation 2026-05-18 11:39:31 -06:00 committed by GitHub
parent 10d611b430
commit b82f3f6e2c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
18 changed files with 53 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
enos/enos-dynamic-config.hcl
View file

@ -13,7 +13,7 @@ globals {
distro_version_amzn = ["2023"]
distro_version_rhel = ["8.10", "9.7", "10.1"]
distro_version_sles = ["15.7", "16.0"]
distro_version_ubuntu = ["22.04", "24.04"]
upgrade_initial_version = ["1.19.0", "1.19.1", "1.19.2", "1.19.3", "1.19.4", "1.19.5", "1.20.0-rc1", "1.20.0-rc2", "1.20.0", "1.20.1", "1.20.2", "1.20.3", "1.20.4", "1.21.0-rc1", "1.21.0", "1.21.1", "1.21.2", "1.21.3", "1.21.4"]
distro_version_ubuntu = ["22.04", "24.04", "26.04"]
upgrade_initial_version = ["1.20.0", "1.20.1", "1.20.2", "1.20.3", "1.20.4", "1.20.5", "1.20.6", "1.20.7", "1.20.8", "1.20.9", "1.20.10", "1.21.0-rc1", "1.21.0", "1.21.1", "1.21.2", "1.21.3", "1.21.4", "1.21.5", "2.0.0-rc1", "2.0.0"]
}
}

2
enos/enos-dynamic-config.tmpl
View file

@ -13,7 +13,7 @@ globals {
distro_version_amzn = ["2023"]
distro_version_rhel = ["8.10", "9.7", "10.1"]
distro_version_sles = ["15.7", "16.0"]
distro_version_ubuntu = ["22.04", "24.04"]
distro_version_ubuntu = ["22.04", "24.04", "26.04"]
upgrade_initial_version = [{{- $versions := VersionsNMinusTransition "vault" .Edition .Version 3 "major" "1.21.5" "minor" }}{{- range $i, $v := $versions }}{{if $i}}, {{end}}"{{ $v }}"{{- end }}]
}
}

1
enos/enos-globals.hcl
View file

@ -43,6 +43,7 @@ globals {
ubuntu = {
"22.04" = ["netcat", "ldap-utils"]
"24.04" = ["netcat-openbsd", "ldap-utils"]
"26.04" = ["netcat-openbsd", "ldap-utils"]
}
}
distro_version = {

4
enos/enos-scenario-agent.hcl
View file

@ -178,7 +178,7 @@ scenario "agent" {
}
variables {
ami_id = step.ec2_info.ami_ids["arm64"]["ubuntu"]["24.04"]
ami_id = step.ec2_info.ami_ids["arm64"]["ubuntu"]["26.04"]
cluster_tag_key = global.vault_tag_key
common_tags = global.tags
instance_count = 1
@ -237,7 +237,7 @@ scenario "agent" {
variables {
hosts = step.create_external_integration_target.hosts
ip_version = matrix.ip_version
packages = concat(global.packages, global.distro_packages["ubuntu"]["24.04"], ["podman", "podman-docker"])
packages = concat(global.packages, global.distro_packages["ubuntu"]["26.04"], ["podman", "podman-docker"])
ports = global.integration_host_ports
}
}

4
enos/enos-scenario-autopilot.hcl
View file

@ -175,7 +175,7 @@ scenario "autopilot" {
}
variables {
ami_id = step.ec2_info.ami_ids["arm64"]["ubuntu"]["24.04"]
ami_id = step.ec2_info.ami_ids["arm64"]["ubuntu"]["26.04"]
cluster_tag_key = global.vault_tag_key
common_tags = global.tags
instance_count = 1
@ -237,7 +237,7 @@ scenario "autopilot" {
variables {
hosts = step.create_external_integration_target.hosts
ip_version = matrix.ip_version
packages = concat(global.packages, global.distro_packages["ubuntu"]["24.04"], ["podman", "podman-docker"])
packages = concat(global.packages, global.distro_packages["ubuntu"]["26.04"], ["podman", "podman-docker"])
ports = global.integration_host_ports
}
}

4
enos/enos-scenario-dr-replication.hcl
View file

@ -218,7 +218,7 @@ scenario "dr_replication" {
}
variables {
ami_id = step.ec2_info.ami_ids["arm64"]["ubuntu"]["24.04"]
ami_id = step.ec2_info.ami_ids["arm64"]["ubuntu"]["26.04"]
cluster_tag_key = global.vault_tag_key
common_tags = global.tags
instance_count = 1
@ -318,7 +318,7 @@ scenario "dr_replication" {
variables {
hosts = step.create_external_integration_target.hosts
ip_version = matrix.ip_version
packages = concat(global.packages, global.distro_packages["ubuntu"]["24.04"], ["podman", "podman-docker"])
packages = concat(global.packages, global.distro_packages["ubuntu"]["26.04"], ["podman", "podman-docker"])
ports = global.integration_host_ports
}
}

4
enos/enos-scenario-plugin.hcl
View file

@ -178,7 +178,7 @@ scenario "plugin" {
}
variables {
ami_id = step.ec2_info.ami_ids["arm64"]["ubuntu"]["24.04"]
ami_id = step.ec2_info.ami_ids["arm64"]["ubuntu"]["26.04"]
cluster_tag_key = "plugin-integration"
common_tags = global.tags
instance_count = 1
@ -237,7 +237,7 @@ scenario "plugin" {
variables {
hosts = step.create_plugin_integration_target.hosts
ip_version = matrix.ip_version
packages = concat(global.packages, global.distro_packages["ubuntu"]["24.04"], ["podman", "podman-docker"])
packages = concat(global.packages, global.distro_packages["ubuntu"]["26.04"], ["podman", "podman-docker"])
ports = global.integration_host_ports
database_configs = global.database_configs
}

4
enos/enos-scenario-pr-replication.hcl
View file

@ -218,7 +218,7 @@ scenario "pr_replication" {
}
variables {
ami_id = step.ec2_info.ami_ids["arm64"]["ubuntu"]["24.04"]
ami_id = step.ec2_info.ami_ids["arm64"]["ubuntu"]["26.04"]
cluster_tag_key = global.vault_tag_key
common_tags = global.tags
instance_count = 1
@ -340,7 +340,7 @@ scenario "pr_replication" {
variables {
hosts = step.create_external_integration_target.hosts
ip_version = matrix.ip_version
packages = concat(global.packages, global.distro_packages["ubuntu"]["24.04"], ["podman", "podman-docker"])
packages = concat(global.packages, global.distro_packages["ubuntu"]["26.04"], ["podman", "podman-docker"])
ports = global.integration_host_ports
}
}

4
enos/enos-scenario-proxy.hcl
View file

@ -185,7 +185,7 @@ scenario "proxy" {
}
variables {
ami_id = step.ec2_info.ami_ids["arm64"]["ubuntu"]["24.04"]
ami_id = step.ec2_info.ami_ids["arm64"]["ubuntu"]["26.04"]
cluster_tag_key = global.vault_tag_key
common_tags = global.tags
instance_count = 1
@ -244,7 +244,7 @@ scenario "proxy" {
variables {
hosts = step.create_external_integration_target.hosts
ip_version = matrix.ip_version
packages = concat(global.packages, global.distro_packages["ubuntu"]["24.04"], ["podman", "podman-docker"])
packages = concat(global.packages, global.distro_packages["ubuntu"]["26.04"], ["podman", "podman-docker"])
ports = global.integration_host_ports
}
}

4
enos/enos-scenario-seal-ha.hcl
View file

@ -217,7 +217,7 @@ scenario "seal_ha" {
}
variables {
ami_id = step.ec2_info.ami_ids["arm64"]["ubuntu"]["24.04"]
ami_id = step.ec2_info.ami_ids["arm64"]["ubuntu"]["26.04"]
cluster_tag_key = global.vault_tag_key
common_tags = global.tags
instance_count = 1
@ -276,7 +276,7 @@ scenario "seal_ha" {
variables {
hosts = step.create_external_integration_target.hosts
ip_version = matrix.ip_version
packages = concat(global.packages, global.distro_packages["ubuntu"]["24.04"], ["podman", "podman-docker"])
packages = concat(global.packages, global.distro_packages["ubuntu"]["26.04"], ["podman", "podman-docker"])
ports = global.integration_host_ports
}
}

4
enos/enos-scenario-smoke-sdk.hcl
View file

@ -178,7 +178,7 @@ scenario "smoke_sdk" {
}
variables {
ami_id = step.ec2_info.ami_ids["arm64"]["ubuntu"]["24.04"]
ami_id = step.ec2_info.ami_ids["arm64"]["ubuntu"]["26.04"]
cluster_tag_key = global.vault_tag_key
common_tags = global.tags
instance_count = 1
@ -237,7 +237,7 @@ scenario "smoke_sdk" {
variables {
hosts = step.create_external_integration_target.hosts
ip_version = matrix.ip_version
packages = concat(global.packages, global.distro_packages["ubuntu"]["24.04"], ["podman", "podman-docker"])
packages = concat(global.packages, global.distro_packages["ubuntu"]["26.04"], ["podman", "podman-docker"])
ports = global.integration_host_ports
}
}

4
enos/enos-scenario-smoke.hcl
View file

@ -175,7 +175,7 @@ scenario "smoke" {
}
variables {
ami_id = step.ec2_info.ami_ids["arm64"]["ubuntu"]["24.04"]
ami_id = step.ec2_info.ami_ids["arm64"]["ubuntu"]["26.04"]
cluster_tag_key = global.vault_tag_key
common_tags = global.tags
instance_count = 1
@ -234,7 +234,7 @@ scenario "smoke" {
variables {
hosts = step.create_external_integration_target.hosts
ip_version = matrix.ip_version
packages = concat(global.packages, global.distro_packages["ubuntu"]["24.04"], ["podman", "podman-docker"])
packages = concat(global.packages, global.distro_packages["ubuntu"]["26.04"], ["podman", "podman-docker"])
ports = global.integration_host_ports
}
}

4
enos/enos-scenario-upgrade.hcl
View file

@ -192,7 +192,7 @@ scenario "upgrade" {
}
variables {
ami_id = step.ec2_info.ami_ids["arm64"]["ubuntu"]["24.04"]
ami_id = step.ec2_info.ami_ids["arm64"]["ubuntu"]["26.04"]
cluster_tag_key = global.vault_tag_key
common_tags = global.tags
instance_count = 1
@ -251,7 +251,7 @@ scenario "upgrade" {
variables {
hosts = step.create_external_integration_target.hosts
ip_version = matrix.ip_version
packages = concat(global.packages, global.distro_packages["ubuntu"]["24.04"], ["podman", "podman-docker"])
packages = concat(global.packages, global.distro_packages["ubuntu"]["26.04"], ["podman", "podman-docker"])
ports = global.integration_host_ports
}
}

2
enos/enos-variables.hcl
View file

@ -89,7 +89,7 @@ variable "distro_version_sles" {
variable "distro_version_ubuntu" {
description = "The version of Ubuntu Linux to use"
type = string
default = "24.04" // or "22.04"
default = "26.04" // or "22.04" or "24.04"
}
variable "project_name" {

2
enos/enos.vars.hcl
View file

@ -44,7 +44,7 @@
// distro_version_sles = "16.0" // or "15.7"
// distro_version_ubuntu is the version of ubuntu to use for "distro:ubuntu" variants
// distro_version_ubuntu = "22.04" // or "24.04"
// distro_version_ubuntu = "22.04" // or "26.04"
// tags are a map of tags that will be applied to infrastructure resources that
// support tagging.

1
enos/modules/artifact/metadata/main.tf
View file

@ -157,6 +157,7 @@ locals {
ubuntu = {
"22.04" = local.release_path_deb,
"24.04" = local.release_path_deb,
"26.04" = local.release_path_deb,
}
}
release_paths = local.release_path_distro[var.distro]

24
enos/modules/ec2_info/main.tf
View file

@ -27,6 +27,7 @@ locals {
"ubuntu" = {
"22.04" = data.aws_ami.ubuntu_2204["arm64"].id
"24.04" = data.aws_ami.ubuntu_2404["arm64"].id
"26.04" = data.aws_ami.ubuntu_2604["arm64"].id
}
}
"amd64" = {
@ -46,6 +47,7 @@ locals {
"ubuntu" = {
"22.04" = data.aws_ami.ubuntu_2204["x86_64"].id
"24.04" = data.aws_ami.ubuntu_2404["x86_64"].id
"26.04" = data.aws_ami.ubuntu_2604["x86_64"].id
}
}
}
@ -229,6 +231,28 @@ data "aws_ami" "ubuntu_2404" {
owners = [local.canonical_owner_id]
}
data "aws_ami" "ubuntu_2604" {
most_recent = true
for_each = local.architectures
filter {
name = "name"
values = ["ubuntu/images/hvm-ssd-gp3/ubuntu-resolute-26.04-*-server-*"]
}
filter {
name = "virtualization-type"
values = ["hvm"]
}
filter {
name = "architecture"
values = [each.value]
}
owners = [local.canonical_owner_id]
}
data "aws_region" "current" {}
data "aws_availability_zones" "available" {

2
enos/modules/softhsm_install/main.tf
View file

@ -51,6 +51,7 @@ locals {
ubuntu = {
"22.04" = ["softhsm", "opensc"]
"24.04" = ["softhsm2", "opensc"]
"26.04" = ["softhsm2", "opensc"]
}
} : {
amzn = {
@ -64,6 +65,7 @@ locals {
ubuntu = {
"22.04" = ["softhsm"]
"24.04" = ["softhsm2"]
"26.04" = ["softhsm2"]
}
}
}