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

Jump to bottom

Move working directory scripts after reboot #1766

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Move working directory scripts after reboot #1766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2803015
Group working directory scripts after reboot
mebays Apr 16, 2024
a6457af
Add PACKER_DEBUG variable to makefile for convenience
mebays Apr 16, 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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ validate: ## Validate packer config
.PHONY: k8s
k8s: validate ## Build default K8s version of EKS Optimized AMI
@echo "Building AMI [os_distro=$(os_distro) kubernetes_version=$(kubernetes_version) arch=$(arch)]"
$(PACKER_BINARY) build -timestamp-ui -color=false $(PACKER_ARGS) $(PACKER_TEMPLATE_FILE)
$(PACKER_BINARY) build -timestamp-ui -color=false $(PACKER_ARGS)$(if $(PACKER_DEBUG),-debug) $(PACKER_TEMPLATE_FILE)

# DEPRECATION NOTICE: `make` targets for each Kubernetes minor version will not be added after 1.28
# Use the `k8s` variable to specify a minor version instead
Expand Down
58 changes: 29 additions & 29 deletions templates/al2/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,17 +125,41 @@
{
"type": "shell",
"remote_folder": "{{ user `remote_folder`}}",
"inline": [
"mkdir -p {{user `working_dir`}}",
"mkdir -p {{user `working_dir`}}/log-collector-script"
"script": "{{template_dir}}/provisioners/install-additional-repos.sh",
"environment_vars": [
"ADDITIONAL_YUM_REPOS={{user `additional_yum_repos`}}"
]
},
{
"type": "shell",
"remote_folder": "{{ user `remote_folder`}}",
"script": "{{template_dir}}/provisioners/install-additional-repos.sh",
"script": "{{template_dir}}/provisioners/upgrade-kernel.sh",
"environment_vars": [
"ADDITIONAL_YUM_REPOS={{user `additional_yum_repos`}}"
"KUBERNETES_VERSION={{user `kubernetes_version`}}",
"KERNEL_VERSION={{user `kernel_version`}}"
]
},
{
"type": "shell",
"remote_folder": "{{ user `remote_folder`}}",
"script": "{{template_dir}}/provisioners/enable-fips.sh",
"environment_vars": [
"ENABLE_FIPS={{user `enable_fips`}}"
]
},
{
"type": "shell",
"remote_folder": "{{ user `remote_folder`}}",
"inline": ["sudo reboot"],
"expect_disconnect": true,
"pause_after": "90s"
},
{
"type": "shell",
"remote_folder": "{{ user `remote_folder`}}",
"inline": [
"mkdir -p {{user `working_dir`}}",
"mkdir -p {{user `working_dir`}}/log-collector-script"
]
},
{
Expand All @@ -161,30 +185,6 @@
"sudo mv {{user `working_dir`}}/bin/* /usr/bin/"
]
},
{
"type": "shell",
"remote_folder": "{{ user `remote_folder`}}",
"script": "{{template_dir}}/provisioners/upgrade-kernel.sh",
"environment_vars": [
"KUBERNETES_VERSION={{user `kubernetes_version`}}",
"KERNEL_VERSION={{user `kernel_version`}}"
]
},
{
"type": "shell",
"remote_folder": "{{ user `remote_folder`}}",
"script": "{{template_dir}}/provisioners/enable-fips.sh",
"environment_vars": [
"ENABLE_FIPS={{user `enable_fips`}}"
]
},
{
"type": "shell",
"remote_folder": "{{ user `remote_folder`}}",
"inline": ["sudo reboot"],
"expect_disconnect": true,
"pause_after": "90s"
},
{
"type": "shell",
"remote_folder": "{{ user `remote_folder`}}",
Expand Down