use jmespath-1.0.1 from debian mirror

wireapp · Jan 23, 2024 · 8ecfb23 · 8ecfb23
1 parent 9cfe215
commit 8ecfb23
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 2 deletions.
diff --git a/ansible/install_jmespath.yml b/ansible/install_jmespath.yml
@@ -0,0 +1,10 @@
+# ansible role to install the .deb package from the jmespath_1_0_1_url url
+- name: Install jmespath-1.0.1 on Kubernets nodes
+  hosts: k8s-cluster
+  become: true
+  tasks:
+    - name: Debian - Download jmespath from url
+      get_url: url={{ jmespath_1_0_1_url }} dest=/tmp/jmespath_1_0_1.deb validate_certs=no
+
+    - name: Debian - Ensure jmespath is installed from downloaded package
+      apt: deb=/tmp/jmespath_1_0_1.deb
diff --git a/ansible/inventory/offline/group_vars/all/offline.yml b/ansible/inventory/offline/group_vars/all/offline.yml
@@ -56,6 +56,8 @@ minio_client_artifact_url: "{{ binaries_url }}/mc.RELEASE.2023-07-07T05-25-51Z"
 minio_client_artifact_checksum: sha256:205a2dc5a49dc467f78228c43c7d368e376c6cc14492597a7c4fe195c291f074
 minio_client_upgrade_from_checksums : [ "sha256:59e184bd4e2c3a8a19837b0f0da3977bd4e301495a24e4a5d50e291728a1de51" ]
 
+jmespath_1_0_1_url: "{{ binaries_url }}/python3-jmespath_1.0.1-1_all.deb"
+
 kubeconfig_localhost: true
 #resolvconf_mode: none
 

diff --git a/bin/offline-cluster.sh b/bin/offline-cluster.sh
@@ -46,6 +46,9 @@ ansible-playbook -i $INVENTORY_FILE $ANSIBLE_DIR/seed-offline-containerd.yml
 # Install NTP
 ansible-playbook -i $INVENTORY_FILE $ANSIBLE_DIR/sync_time.yml -v
 
+# Install jmespath
+ansible-playbook -i $INVENTORY_FILE $ANSIBLE_DIR/install_jmespath.yml -v
+
 # Run the rest of kubespray. This should bootstrap a kubernetes cluster successfully:
 ansible-playbook -i $INVENTORY_FILE $ANSIBLE_DIR/kubernetes.yml --skip-tags bootstrap-os,preinstall,container-engine
 

diff --git a/nix/overlay.nix b/nix/overlay.nix
@@ -10,7 +10,6 @@ super: {
     # for packet debugging and reporting.
     super.python3Packages.pyshark
     super.python3Packages.matplotlib
-    super.python3Packages.jmespath
   ]));
 
   # kubeadm and kubectl

diff --git a/nix/pkgs/wire-binaries.nix b/nix/pkgs/wire-binaries.nix
@@ -103,6 +103,11 @@ let
       url = "https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-${elasticsearch_version}.deb";
       sha256 = "sha256:0s7m49rvg5n6mrjzg5snbg3092mq0n661qs9209phjzka1lqajvb";
     };
+    jmespath = fetchurl rec {
+      passthru.url = url;
+      url = "http://ftp.de.debian.org/debian/pool/main/p/python-jmespath/python3-jmespath_1.0.1-1_all.deb";
+      sha256 = "2b4351db7f00a8e4840140572b337a5005f897eaf6c7d9c929991e85a152d388";
+    };
   };
 in
 runCommandNoCC "wire-binaries"

diff --git a/nix/scripts/mirror-apt-jammy.sh b/nix/scripts/mirror-apt-jammy.sh
@@ -27,7 +27,6 @@ shift
 packages=(
   python3-apt
   python3-netaddr
-  #python3-jmespath
   aufs-tools
   apt-transport-https
   software-properties-common