Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update default values [DO-NOT-MERGE] #376

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
+65 −148
Open

Update default values [DO-NOT-MERGE] #376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8099fcb
chore: update default values
mavimo Feb 12, 2024
2c6ce3b
chore: reorganize kernel update process
mavimo Feb 12, 2024
75dc0c1
fix: CentOS 8 AMI
mavimo Feb 12, 2024
407e6dd
chore: revert changes on volume for Amazon distros
mavimo Feb 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 13 additions & 37 deletions molecule/agent-smoke-kmodule/molecule.yml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,11 @@ platforms:
instance_type: ${INSTANCE_TYPE_X86}
region: ${REGION}
vpc_subnet_id: ${VPC_SUBNET_ID}
volumes:
- device_name: /dev/sda1
ebs:
volume_size: 30
delete_on_termination: true
volume_type: gp3
- name: alma-9-x86_64
image: ami-07bc349330a94a4e3
instance_type: ${INSTANCE_TYPE_X86}
region: ${REGION}
vpc_subnet_id: ${VPC_SUBNET_ID}
volumes:
- device_name: /dev/sda1
ebs:
volume_size: 30
delete_on_termination: true
volume_type: gp3
- name: debian-10-x86_64
image: ami-0e1e938b3f38e7558
instance_type: ${INSTANCE_TYPE_X86}
Expand Down Expand Up @@ -81,40 +69,28 @@ platforms:
instance_type: ${INSTANCE_TYPE_X86}
region: ${REGION}
vpc_subnet_id: ${VPC_SUBNET_ID}
# - name: centos8-x86
# boot_wait_seconds: 180
# image: ami-03dbb661dc3a9b6a5
# instance_type: ${INSTANCE_TYPE_X86}
# region: ${REGION}
# vpc_subnet_id: ${VPC_SUBNET_ID}
# - name: centos8-aarch
# boot_wait_seconds: 180
# image: ami-0fbdd12bd5a9c2e6f
# instance_type: ${INSTANCE_TYPE_AARCH}
# region: ${REGION}
# vpc_subnet_id: ${VPC_SUBNET_ID}
- name: rocky8
- name: centos8-x86_64
boot_wait_seconds: 180
image: ami-0aa6883376595a33c
instance_type: ${INSTANCE_TYPE_X86}
region: ${REGION}
vpc_subnet_id: ${VPC_SUBNET_ID}
- name: centos8-arm64
boot_wait_seconds: 180
image: ami-02be6a70c24b1ae91
instance_type: ${INSTANCE_TYPE_AARCH}
region: ${REGION}
vpc_subnet_id: ${VPC_SUBNET_ID}
- name: rocky8-x86_64
image: ami-093bfdaaa5ea85b41
instance_type: ${INSTANCE_TYPE_X86}
region: ${REGION}
vpc_subnet_id: ${VPC_SUBNET_ID}
volumes:
- device_name: /dev/sda1
ebs:
volume_size: 30
delete_on_termination: true
volume_type: gp3
- name: rocky-9-x86_64
image: ami-021a1f96fec61f4e9
instance_type: ${INSTANCE_TYPE_X86}
region: ${REGION}
vpc_subnet_id: ${VPC_SUBNET_ID}
volumes:
- device_name: /dev/sda1
ebs:
volume_size: 30
delete_on_termination: true
volume_type: gp3
- name: centos-7-x86_64
image: ami-0aedf6b1cb669b4c7
instance_type: ${INSTANCE_TYPE_X86}
Expand Down
52 changes: 14 additions & 38 deletions molecule/agent-smoke-legacy-ebpf/molecule.yml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,11 @@ platforms:
instance_type: ${INSTANCE_TYPE_X86}
region: ${REGION}
vpc_subnet_id: ${VPC_SUBNET_ID}
volumes:
- device_name: /dev/sda1
ebs:
volume_size: 30
delete_on_termination: true
volume_type: gp3
- name: alma-9-x86_64
image: ami-07bc349330a94a4e3
instance_type: ${INSTANCE_TYPE_X86}
region: ${REGION}
vpc_subnet_id: ${VPC_SUBNET_ID}
volumes:
- device_name: /dev/sda1
ebs:
volume_size: 30
delete_on_termination: true
volume_type: gp3
- name: debian-10-x86_64
image: ami-0e1e938b3f38e7558
instance_type: ${INSTANCE_TYPE_X86}
Expand Down Expand Up @@ -60,7 +48,7 @@ platforms:
instance_type: ${INSTANCE_TYPE_X86}
region: ${REGION}
vpc_subnet_id: ${VPC_SUBNET_ID}
- name: ubuntu-2204-amd64
- name: ubuntu-2204-arm64
image: ami-01ec7354bd709968b
instance_type: ${INSTANCE_TYPE_AARCH}
region: ${REGION}
Expand All @@ -81,40 +69,28 @@ platforms:
instance_type: ${INSTANCE_TYPE_X86}
region: ${REGION}
vpc_subnet_id: ${VPC_SUBNET_ID}
# - name: centos8-x86
# boot_wait_seconds: 180
# image: ami-03dbb661dc3a9b6a5
# instance_type: ${INSTANCE_TYPE_X86}
# region: ${REGION}
# vpc_subnet_id: ${VPC_SUBNET_ID}
# - name: centos8-aarch
# boot_wait_seconds: 180
# image: ami-0fbdd12bd5a9c2e6f
# instance_type: ${INSTANCE_TYPE_AARCH}
# region: ${REGION}
# vpc_subnet_id: ${VPC_SUBNET_ID}
- name: rocky8
- name: centos8-x86_64
boot_wait_seconds: 180
image: ami-0aa6883376595a33c
instance_type: ${INSTANCE_TYPE_X86}
region: ${REGION}
vpc_subnet_id: ${VPC_SUBNET_ID}
- name: centos8-arm64
boot_wait_seconds: 180
image: ami-02be6a70c24b1ae91
instance_type: ${INSTANCE_TYPE_AARCH}
region: ${REGION}
vpc_subnet_id: ${VPC_SUBNET_ID}
- name: rocky8-x86_64
image: ami-093bfdaaa5ea85b41
instance_type: ${INSTANCE_TYPE_X86}
region: ${REGION}
vpc_subnet_id: ${VPC_SUBNET_ID}
volumes:
- device_name: /dev/sda1
ebs:
volume_size: 30
delete_on_termination: true
volume_type: gp3
- name: rocky-9-x86_64
image: ami-021a1f96fec61f4e9
instance_type: ${INSTANCE_TYPE_X86}
region: ${REGION}
vpc_subnet_id: ${VPC_SUBNET_ID}
volumes:
- device_name: /dev/sda1
ebs:
volume_size: 30
delete_on_termination: true
volume_type: gp3
provisioner:
lint:
name: ansible-lint
Expand Down
18 changes: 0 additions & 18 deletions molecule/agent-smoke-universal-ebpf/molecule.yml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,11 @@ platforms:
instance_type: ${INSTANCE_TYPE_X86}
region: ${REGION}
vpc_subnet_id: ${VPC_SUBNET_ID}
volumes:
- device_name: /dev/sda1
ebs:
volume_size: 30
delete_on_termination: true
volume_type: gp3
- name: alma-9-x86_64
image: ami-07bc349330a94a4e3
instance_type: ${INSTANCE_TYPE_X86}
region: ${REGION}
vpc_subnet_id: ${VPC_SUBNET_ID}
volumes:
- device_name: /dev/sda1
ebs:
volume_size: 30
delete_on_termination: true
volume_type: gp3
- name: debian-11-x86_64
image: ami-0fd320e6b2de9e34a
instance_type: ${INSTANCE_TYPE_X86}
Expand Down Expand Up @@ -65,12 +53,6 @@ platforms:
instance_type: ${INSTANCE_TYPE_X86}
region: ${REGION}
vpc_subnet_id: ${VPC_SUBNET_ID}
volumes:
- device_name: /dev/sda1
ebs:
volume_size: 30
delete_on_termination: true
volume_type: gp3
provisioner:
lint:
name: ansible-lint
Expand Down
48 changes: 12 additions & 36 deletions molecule/agent-uninstall-clean-all/molecule.yml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,11 @@ platforms:
instance_type: ${INSTANCE_TYPE_X86}
region: ${REGION}
vpc_subnet_id: ${VPC_SUBNET_ID}
volumes:
- device_name: /dev/sda1
ebs:
volume_size: 30
delete_on_termination: true
volume_type: gp3
- name: alma-9-x86_64
image: ami-07bc349330a94a4e3
instance_type: ${INSTANCE_TYPE_X86}
region: ${REGION}
vpc_subnet_id: ${VPC_SUBNET_ID}
volumes:
- device_name: /dev/sda1
ebs:
volume_size: 30
delete_on_termination: true
volume_type: gp3
- name: debian-10-x86_64
image: ami-0e1e938b3f38e7558
instance_type: ${INSTANCE_TYPE_X86}
Expand Down Expand Up @@ -81,40 +69,28 @@ platforms:
instance_type: ${INSTANCE_TYPE_X86}
region: ${REGION}
vpc_subnet_id: ${VPC_SUBNET_ID}
# - name: centos8-x86
# boot_wait_seconds: 180
# image: ami-03dbb661dc3a9b6a5
# instance_type: ${INSTANCE_TYPE_X86}
# region: ${REGION}
# vpc_subnet_id: ${VPC_SUBNET_ID}
# - name: centos8-aarch
# boot_wait_seconds: 180
# image: ami-0fbdd12bd5a9c2e6f
# instance_type: ${INSTANCE_TYPE_AARCH}
# region: ${REGION}
# vpc_subnet_id: ${VPC_SUBNET_ID}
- name: centos8-x86
boot_wait_seconds: 180
image: ami-03dbb661dc3a9b6a5
instance_type: ${INSTANCE_TYPE_X86}
region: ${REGION}
vpc_subnet_id: ${VPC_SUBNET_ID}
- name: centos8-aarch
boot_wait_seconds: 180
image: ami-0fbdd12bd5a9c2e6f
instance_type: ${INSTANCE_TYPE_AARCH}
region: ${REGION}
vpc_subnet_id: ${VPC_SUBNET_ID}
- name: rocky8
image: ami-093bfdaaa5ea85b41
instance_type: ${INSTANCE_TYPE_X86}
region: ${REGION}
vpc_subnet_id: ${VPC_SUBNET_ID}
volumes:
- device_name: /dev/sda1
ebs:
volume_size: 30
delete_on_termination: true
volume_type: gp3
- name: rocky-9-x86_64
image: ami-021a1f96fec61f4e9
instance_type: ${INSTANCE_TYPE_X86}
region: ${REGION}
vpc_subnet_id: ${VPC_SUBNET_ID}
volumes:
- device_name: /dev/sda1
ebs:
volume_size: 30
delete_on_termination: true
volume_type: gp3
- name: centos-7-x86_64
image: ami-0aedf6b1cb669b4c7
instance_type: ${INSTANCE_TYPE_X86}
Expand Down
9 changes: 7 additions & 2 deletions molecule/resources/playbooks/create.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
# Platform settings handling
default_assign_public_ip: true
default_aws_profile: "{{ lookup('env', 'AWS_PROFILE') }}"
default_boot_wait_seconds: 120
default_boot_wait_seconds: 180
default_instance_type: t3a.medium
default_key_inject_method: cloud-init # valid values: [cloud-init, ec2]
default_key_name: "molecule-{{ run_config.run_id }}"
Expand Down Expand Up @@ -70,7 +70,12 @@
region: ""
security_groups: []
tags: {}
volumes: []
volumes:
- device_name: /dev/sda1
ebs:
volume_size: 30
delete_on_termination: true
volume_type: gp3
vpc_id: ""
vpc_subnet_id: ""

Expand Down
36 changes: 19 additions & 17 deletions molecule/resources/playbooks/prepare.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,22 +29,24 @@
when: update_debian_kernel.changed
when: ansible_distribution == "Debian"

# See https://almalinux.org/blog/2023-12-20-almalinux-8-key-update/
- name: Import AlmaLinux 8 GPG key
ansible.builtin.rpm_key:
state: present
key: https://repo.almalinux.org/almalinux/RPM-GPG-KEY-AlmaLinux
when:
- ansible_distribution == 'AlmaLinux'
- ansible_distribution_major_version == '8'
- name: Prepare Alma, Fedora, and Rocky hosts
block:
# See https://almalinux.org/blog/2023-12-20-almalinux-8-key-update/
- name: Import AlmaLinux 8 GPG key
ansible.builtin.rpm_key:
state: present
key: https://repo.almalinux.org/almalinux/RPM-GPG-KEY-AlmaLinux
when:
- ansible_distribution == 'AlmaLinux'
- ansible_distribution_major_version == '8'

- name: Update Alma, Fedora, and Rocky kernels
ansible.builtin.dnf:
name: kernel
state: latest
register: update_kernel
when: ansible_distribution in ['AlmaLinux', 'Fedora', 'Rocky']
- name: Update kernels
ansible.builtin.dnf:
name: kernel
state: latest
register: update_kernel

- name: Reboot systems after kernel update (if required)
ansible.builtin.reboot:
when: update_kernel.changed
- name: Reboot systems after kernel update (if required)
ansible.builtin.reboot:
when: update_kernel.changed
when: ansible_distribution in ['AlmaLinux', 'Fedora', 'Rocky']
Loading