From f647eaeb1c328adf74217470d8fcd4c9b0b72fb2 Mon Sep 17 00:00:00 2001 From: Maxime Piraux Date: Wed, 14 Jun 2023 17:11:15 +0200 Subject: [PATCH 1/4] Update APT keys location for Kubernetes --- roles/edgenet-kubernetes/defaults/main.yml | 2 +- roles/edgenet-kubernetes/tasks/kube-debian.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/edgenet-kubernetes/defaults/main.yml b/roles/edgenet-kubernetes/defaults/main.yml index 517f0b2..cdfad99 100644 --- a/roles/edgenet-kubernetes/defaults/main.yml +++ b/roles/edgenet-kubernetes/defaults/main.yml @@ -11,7 +11,7 @@ containerd_apt_repository: "deb [arch={{ containerd_apt_arch }}] https://downloa containerd_apt_gpg_key: "https://download.docker.com/linux/{{ ansible_distribution | lower }}/gpg" kubernetes_apt_release_channel: main -kubernetes_apt_repository: "deb [signed-by=/usr/share/keyrings/kubernetes-archive-keyring.gpg] http://apt.kubernetes.io/ kubernetes-xenial {{ kubernetes_apt_release_channel }}" +kubernetes_apt_repository: "deb [signed-by=/etc/apt/keyrings/kubernetes-archive-keyring.gpg] http://apt.kubernetes.io/ kubernetes-xenial {{ kubernetes_apt_release_channel }}" kubernetes_apt_gpg_key: https://packages.cloud.google.com/apt/doc/apt-key.gpg # RedHat diff --git a/roles/edgenet-kubernetes/tasks/kube-debian.yml b/roles/edgenet-kubernetes/tasks/kube-debian.yml index 88b8c83..fa0c572 100644 --- a/roles/edgenet-kubernetes/tasks/kube-debian.yml +++ b/roles/edgenet-kubernetes/tasks/kube-debian.yml @@ -13,7 +13,7 @@ - name: Ensure Kubernetes APT GPG key is present get_url: url: "{{ kubernetes_apt_gpg_key }}" - dest: /usr/share/keyrings/kubernetes-archive-keyring.gpg + dest: /etc/apt/keyrings/kubernetes-archive-keyring.gpg - name: Ensure Kubernetes APT repository is present apt_repository: From 2846b011d5fd84ca5306663567e30baea6082674 Mon Sep 17 00:00:00 2001 From: Maxime Piraux Date: Wed, 14 Jun 2023 17:16:18 +0200 Subject: [PATCH 2/4] Updates boostrap.sh repo url --- bootstrap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap.sh b/bootstrap.sh index e05e1d5..993ad10 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -28,7 +28,7 @@ EDGENET_PLAYBOOK="${EDGENET_PLAYBOOK:-edgenet-node.yml}" EDGENET_REF="${EDGENET_REF:-main}" # URL of the Git repository containing the playbook to run. -EDGENET_REPOSITORY="${EDGENET_REPOSITORY:-https://github.com/EdgeNet-project/node.git}" +EDGENET_REPOSITORY="${EDGENET_REPOSITORY:-https://github.com/mpiraux/edgenet-node.git}" # If the shell is non-interactive, do not ask for confirmation. # See https://www.gnu.org/software/bash/manual/html_node/Is-this-Shell-Interactive_003f.html. From d95ad0ac1a8138f352e317daa1a37df530895b45 Mon Sep 17 00:00:00 2001 From: Maxime Piraux Date: Wed, 14 Jun 2023 18:24:52 +0200 Subject: [PATCH 3/4] Use .asc format for keys --- roles/edgenet-kubernetes/defaults/main.yml | 2 +- roles/edgenet-kubernetes/tasks/kube-debian.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/edgenet-kubernetes/defaults/main.yml b/roles/edgenet-kubernetes/defaults/main.yml index cdfad99..f3bc40a 100644 --- a/roles/edgenet-kubernetes/defaults/main.yml +++ b/roles/edgenet-kubernetes/defaults/main.yml @@ -11,7 +11,7 @@ containerd_apt_repository: "deb [arch={{ containerd_apt_arch }}] https://downloa containerd_apt_gpg_key: "https://download.docker.com/linux/{{ ansible_distribution | lower }}/gpg" kubernetes_apt_release_channel: main -kubernetes_apt_repository: "deb [signed-by=/etc/apt/keyrings/kubernetes-archive-keyring.gpg] http://apt.kubernetes.io/ kubernetes-xenial {{ kubernetes_apt_release_channel }}" +kubernetes_apt_repository: "deb [signed-by=/etc/apt/keyrings/kubernetes-archive-keyring.asc] http://apt.kubernetes.io/ kubernetes-xenial {{ kubernetes_apt_release_channel }}" kubernetes_apt_gpg_key: https://packages.cloud.google.com/apt/doc/apt-key.gpg # RedHat diff --git a/roles/edgenet-kubernetes/tasks/kube-debian.yml b/roles/edgenet-kubernetes/tasks/kube-debian.yml index fa0c572..5db970a 100644 --- a/roles/edgenet-kubernetes/tasks/kube-debian.yml +++ b/roles/edgenet-kubernetes/tasks/kube-debian.yml @@ -13,7 +13,7 @@ - name: Ensure Kubernetes APT GPG key is present get_url: url: "{{ kubernetes_apt_gpg_key }}" - dest: /etc/apt/keyrings/kubernetes-archive-keyring.gpg + dest: /etc/apt/keyrings/kubernetes-archive-keyring.asc - name: Ensure Kubernetes APT repository is present apt_repository: From 9b1063ccd0adec6d6f1bb2f7b25f6fbd808bd7b3 Mon Sep 17 00:00:00 2001 From: Maxime Piraux Date: Wed, 13 Sep 2023 16:36:23 +0200 Subject: [PATCH 4/4] Revert git repo URL change --- bootstrap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap.sh b/bootstrap.sh index 993ad10..e05e1d5 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -28,7 +28,7 @@ EDGENET_PLAYBOOK="${EDGENET_PLAYBOOK:-edgenet-node.yml}" EDGENET_REF="${EDGENET_REF:-main}" # URL of the Git repository containing the playbook to run. -EDGENET_REPOSITORY="${EDGENET_REPOSITORY:-https://github.com/mpiraux/edgenet-node.git}" +EDGENET_REPOSITORY="${EDGENET_REPOSITORY:-https://github.com/EdgeNet-project/node.git}" # If the shell is non-interactive, do not ask for confirmation. # See https://www.gnu.org/software/bash/manual/html_node/Is-this-Shell-Interactive_003f.html.