Skip to content

Commit

Permalink
Update Kubernetes image-builder submodule (#193)
Browse files Browse the repository at this point in the history
* Update Kubernetes image-builder submodule

* Add new variables to Packer build

---------

Co-authored-by: mkjpryor <[email protected]>
Co-authored-by: Matt Pryor <[email protected]>
  • Loading branch information
3 people authored May 31, 2024
1 parent 20944fa commit 0af658e
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
12 changes: 12 additions & 0 deletions packer/kubernetes.pkr.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,14 @@ variable "sysusrlocal_prefix" {
type = string
}

variable "ubuntu_repo" {
type = string
}

variable "ubuntu_security_repo" {
type = string
}

#####
# Locals
#####
Expand Down Expand Up @@ -506,6 +514,10 @@ build {
"sysusr_prefix=${var.sysusr_prefix}",
"--extra-vars",
"sysusrlocal_prefix=${var.sysusrlocal_prefix}",
"--extra-vars",
"ubuntu_repo=${var.ubuntu_repo}",
"--extra-vars",
"ubuntu_security_repo=${var.ubuntu_security_repo}",
]
ansible_env_vars = ["ANSIBLE_SSH_RETRIES=10"]
}
Expand Down
2 changes: 1 addition & 1 deletion vendor/image-builder
Submodule image-builder updated 83 files
+2 −2 RELEASE.md
+0 −1 docs/book/src/SUMMARY.md
+5 −5 docs/book/src/capi/container-image.md
+1 −1 docs/book/src/capi/goss/goss.md
+8 −1 docs/book/src/capi/providers/aws.md
+2 −0 docs/book/src/capi/providers/azure.md
+3 −1 docs/book/src/capi/providers/digitalocean.md
+18 −13 docs/book/src/capi/providers/ibmcloud.md
+1 −1 docs/book/src/capi/providers/nutanix.md
+0 −41 docs/book/src/capi/providers/virtualbox.md
+4 −4 docs/book/src/capi/releasing.md
+0 −4 docs/book/src/glossary.md
+5 −9 images/capi/.ansible-lint-ignore
+59 −49 images/capi/Makefile
+2 −2 images/capi/ansible/roles/containerd/tasks/main.yml
+1 −1 images/capi/ansible/roles/containerd/templates/etc/systemd/system/containerd.service.d/limit-nofile.conf
+3 −1 images/capi/ansible/roles/kubernetes/tasks/azurelinux.yml
+2 −2 images/capi/ansible/roles/kubernetes/tasks/main.yml
+3 −4 images/capi/ansible/roles/node/defaults/main.yml
+2 −2 images/capi/ansible/roles/node/meta/main.yml
+1 −1 images/capi/ansible/roles/node/tasks/main.yml
+0 −2 images/capi/ansible/roles/providers/files/etc/cloud/cloud.cfg.d/99_metadata.cfg
+1 −16 images/capi/ansible/roles/providers/tasks/aws.yml
+82 −5 images/capi/ansible/roles/providers/tasks/awscliv2.yml
+2 −8 images/capi/ansible/roles/providers/tasks/azure.yml
+72 −0 images/capi/ansible/roles/providers/tasks/azurecli.yml
+1 −0 images/capi/ansible/roles/providers/tasks/main.yml
+11 −8 images/capi/ansible/roles/providers/tasks/outscale.yml
+0 −30 images/capi/ansible/roles/providers/tasks/redhat.yml
+27 −16 images/capi/ansible/roles/providers/tasks/vmware-redhat.yml
+14 −0 images/capi/ansible/roles/security/README.md
+4 −5 images/capi/ansible/roles/security/defaults/main.yml
+57 −0 images/capi/ansible/roles/security/tasks/falco.yml
+10 −8 images/capi/ansible/roles/security/tasks/main.yml
+40 −0 images/capi/ansible/roles/security/tasks/trivy.yml
+1 −1 images/capi/ansible/roles/setup/tasks/azurelinux.yml
+2 −2 images/capi/ansible/roles/setup/tasks/main.yml
+4 −4 images/capi/ansible/roles/setup/templates/etc/apt/sources.list.j2
+2 −0 images/capi/ansible/roles/sysprep/tasks/azurelinux.yml
+4 −4 images/capi/ansible/roles/sysprep/tasks/main.yml
+16 −12 images/capi/ansible/windows/roles/providers/tasks/azure.yml
+8 −8 images/capi/azure_targets.sh
+1 −1 images/capi/hack/ensure-powervs.sh
+2 −1 images/capi/packer/ami/packer-windows.json
+2 −1 images/capi/packer/ami/packer.json
+11 −0 images/capi/packer/ami/ubuntu-2404.json
+1 −2 images/capi/packer/azure/.pipelines/build-vhd.yaml
+0 −2 images/capi/packer/azure/.pipelines/cleanup.yaml
+0 −2 images/capi/packer/azure/.pipelines/create-disk-version.yaml
+0 −2 images/capi/packer/azure/.pipelines/create-sku.yaml
+1 −2 images/capi/packer/azure/.pipelines/smoke-test.yaml
+0 −1 images/capi/packer/azure/.pipelines/stages.yaml
+0 −3 images/capi/packer/azure/.pipelines/test-vhd.yaml
+9 −0 images/capi/packer/azure/azurelinux-3-gen2.json
+9 −0 images/capi/packer/azure/azurelinux-3.json
+15 −0 images/capi/packer/azure/scripts/init-sig.sh
+3 −0 images/capi/packer/azure/scripts/new-sku.sh
+9 −0 images/capi/packer/azure/ubuntu-2404-cvm.json
+9 −0 images/capi/packer/azure/ubuntu-2404-gen2.json
+9 −0 images/capi/packer/azure/ubuntu-2404.json
+1 −1 images/capi/packer/config/ansible-args.json
+4 −1 images/capi/packer/config/common.json
+5 −5 images/capi/packer/config/kubernetes.json
+5 −0 images/capi/packer/digitalocean/ubuntu-2404.json
+0 −4 images/capi/packer/goss/goss-command.yaml
+29 −33 images/capi/packer/goss/goss-vars.yaml
+8 −0 images/capi/packer/nutanix/ubuntu-2404.json
+10 −0 images/capi/packer/openstack/packer.json
+82 −0 images/capi/packer/ova/linux/rhel/http/9/ks.cfg
+2 −0 images/capi/packer/ova/packer-node.json
+20 −0 images/capi/packer/ova/rhel-9.json
+2 −2 images/capi/packer/ova/rockylinux-9.json
+2 −0 images/capi/packer/powervs/packer.json
+2 −2 images/capi/packer/qemu/qemu-rockylinux-9.json
+0 −5 images/capi/packer/vbox/OWNERS
+0 −8 images/capi/packer/vbox/packer-common.json
+0 −124 images/capi/packer/vbox/packer-windows.json
+0 −24 images/capi/packer/vbox/vagrantfile-windows_2019.template
+0 −11 images/capi/packer/vbox/windows-2019.json
+0 −18 images/capi/packer/vbox/windows/enable-winrm.ps1
+0 −13 images/capi/packer/vbox/windows/sysprep.ps1
+0 −250 images/capi/packer/vbox/windows/windows-2019/autounattend.xml
+1 −1 images/capi/scripts/release-update-docs.sh

0 comments on commit 0af658e

Please sign in to comment.