Merge upstream#1
Open
MaxRink wants to merge 1396 commits into
Open
Conversation
Below commit messages from squashed commits: images/capi/packer: extract ansible common SSH args to a single place This is done to remove repetition of '-o IdentitiesOnly=yes' to make sure it is consistent across all platforms and to reduce amount of churn when adding new default arguments like we plan as part of mitigating issue with ssh-rsa keys (#905). images/capi/packer: allow specifying extra scp arguments for Ansible This allows a workaround for issue #859 when building host uses OpenSSH version 9.0+, which uses SFTP protocol for SCP instead of a legacy SCP protocol, which right now causes builds to fail with error message as below when Ansible is trying to copy files over to remote host. bash: line 1: /usr/lib/sftp-server: No such file or directory\nscp: Connection closed\r\n" This commit allows users with new OpenSSH version to specify ANSIBLE_SCP_EXTRA_ARGS="-O" to fix their builds. I plan to automate this in another commit, as it should be relatively simple and harmless. Refs #859. images/capi/packer: allow using ssh-rsa keys with OpenSSH 8.8+ Since OpenSSH version 8.8+ ssh-rsa key algorithm is disabled by default, which right now causes builds to fail for builders which use OpenSSH version 8.8+. The problematic keys are generated by Ansible plugin for Packer and the problem is currently being discussed in issue hashicorp/packer-plugin-ansible#69. An alternative would be to consider using `use_proxy=false` option in plugin, however we are not sure what could be the implications of this. Given that building machine should be a rather short process, the workaround seem acceptable and actually allows being able to succesfully build images out of the box on more distributions. In implementation, 'PubkeyAcceptedKeyTypes' is used instead of 'PubkeyAcceptedAlgorithms', as it provides better backward compatibility, since 'PubkeyAcceptedAlgorithms' is only available since OpenSSH version 8.4. See issue #905 for more details. Co-authored-by: Jeremi Piotrowski <jeremi.piotrowski@gmail.com> images/capi/Makefile: set ANSIBLE_SCP_EXTRA_ARGS="-O" when needed Since OpenSSH 9.0+ 'scp' uses SFTP protocol instead of legacy SCP protocol, which causes building errors like: bash: line 1: /usr/lib/sftp-server: No such file or directory\nscp: Connection closed\r\n"" However, -O option is not available in older OpenSSH version, so we cannot always set it as an option to use. To provide better out-of-the-box experience for users with newer versions of OpenSSH, we conditionally ensure -O is used when used OpenSSH version requires it. See #859 and hashicorp/packer-plugin-ansible#100 for more details. Signed-off-by: Mateusz Gozdek <mgozdekof@gmail.com> Co-authored-by: Jeremi Piotrowski <jeremi.piotrowski@gmail.com>
Update OWNERS_ALIASES for Azure
Add pipeline test job for Azure VHDs
containerd: Update to v1.6.14
…d-compatibility images/capi: improve out-of-the-box compatibility with OpenSSH versions 8.8+ and 9.0+
add containerd-wasm-shims to enable Wasm / WASI workloads
Fix Makefiles and update image-builder
Update mdBook and fix darwin install
Signed-off-by: cpanato <ctadeu@gmail.com>
Signed-off-by: cpanato <ctadeu@gmail.com>
Signed-off-by: cpanato <ctadeu@gmail.com>
Signed-off-by: cpanato <ctadeu@gmail.com>
Signed-off-by: cpanato <ctadeu@gmail.com>
Update capg nightly build images
update default k8s release and cri-tools
feat: Add Oracle Linux 9 build support to CAPI OCI provider
…vement nutanix improvement
Unpin azure-cli to always install the latest
`docs/book/build.sh` downloads `mdbook` to `/tmp/mdbook` serve should probably try to use the same location.
Update book Makefile
Include main in branches for Azure nightly job
Nutanix scsi/iscsi tuning
Update Rocky Linux to 8.8
…nents The rollout of the Nvidia & S3 additions had an unintended knockon effect to other tasks in the load_additional_components as noted in #1185. This commit: * converts the import_task to include_tasks to prevent ansible pre-processing the task and allowing the load_additional_components to run again without the s3 component affecting it. * adds some defaults to the load_additional_components role to cover s3 addition * adds additional_s3={{ user `additional_s3`}} into `ansible_common_vars` section of `ansible_args.json` to ensure false is passed by default as this was also found to be a problem when writing this fix. No other vars of `additional_s3_*` are defined here due to it breaking the nvidia role if defined - s3 role still works without them. The important part was forcing false on additional_s3.
fix: s3 task causing errors with other tasks in load_additional_components
Signed-off-by: Marcus Noble <github@marcusnoble.co.uk>
Remove leftover CAPI OWNERS file
Update docs for v0.1.16 release
Bump containerd-wasm-shims to v0.6.0
use an env for qemu flatcar pypy http origin
When creating a Flatcar ARM64 image, https://github.com/squeaky-pl/portable-pypy does not contain the required binaries for ARM64. Switching https://downloads.python.org/pypy/pypy resolves the issue. Signed-off-by: Mihaela Balutoiu <mbalutoiu@cloudbasesolutions.com>
Arm64: flatcar: fix portable python3/python2 download
Update containerd to 1.6.21
Fixed the make dependencies to ensure compatibility with both architectures. Signed-off-by: Mihaela Balutoiu <mbalutoiu@cloudbasesolutions.com>
Signed-off-by: Marcus Noble <github@marcusnoble.co.uk>
Remove Ubuntu-18.04 from GCE provider
Flatcar: ARM64: fix make deps
Shrink qemu ubuntu image size
Fix host arch detection for arm64
Refactor Ignition config files
…atasource-list CAPC: add ConfigDrive to cloud-init datasource_list in cloudstack images
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.