Skip to content

Commit

Permalink
Merge pull request #748 from ccamacho/rke
Browse files Browse the repository at this point in the history
fix: trust kubernetes repositories
  • Loading branch information
ccamacho committed Jun 2, 2023
2 parents 775b00d + bffb8c1 commit a12a91c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 10 deletions.
9 changes: 1 addition & 8 deletions kubeinit/roles/kubeinit_libvirt/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,6 @@
when: hostvars[kubeinit_deployment_node_name].distribution_family == 'Debian'
register: _result_installed_packages_debian

# - name: Upgrade all packages
# ansible.builtin.package:
# name: '*'
# state: latest
# register: _result_upgraded_packages

- name: Add users to libvirt
ansible.builtin.user:
name: "{{ item }}"
Expand All @@ -106,13 +100,12 @@
pre_reboot_delay: 0
post_reboot_delay: 30
test_command: whoami
when: (_result_installed_packages_centos.changed or _result_installed_packages_debian.changed or _result_upgraded_packages.changed) and kubeinit_libvirt_reboot_hypervisors_after_package_update
when: (_result_installed_packages_centos.changed or _result_installed_packages_debian.changed) and kubeinit_libvirt_reboot_hypervisors_after_package_update

- name: Clear installed/upgraded packages facts
ansible.builtin.set_fact:
_result_installed_packages_centos: null
_result_installed_packages_debian: null
_result_upgraded_packages: null

- name: Check if Intel virtualization is supported
ansible.builtin.shell: |
Expand Down
4 changes: 2 additions & 2 deletions kubeinit/roles/kubeinit_rke/tasks/prepare_cluster.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
set -eo pipefail
apt-get install -y apt-transport-https ca-certificates curl
curl -fsSLo /usr/share/keyrings/kubernetes-archive-keyring.gpg https://packages.cloud.google.com/apt/doc/apt-key.gpg
echo "deb [signed-by=/usr/share/keyrings/kubernetes-archive-keyring.gpg] https://apt.kubernetes.io/ kubernetes-xenial main" | tee /etc/apt/sources.list.d/kubernetes.list
apt-get update
echo "deb [trusted=yes signed-by=/usr/share/keyrings/kubernetes-archive-keyring.gpg] https://apt.kubernetes.io/ kubernetes-xenial main" | tee /etc/apt/sources.list.d/kubernetes.list
apt-get update --allow-insecure-repositories
args:
executable: /bin/bash
register: _result
Expand Down

0 comments on commit a12a91c

Please sign in to comment.