py-pve-cloud 0.1.2__tar.gz → 0.2.0__tar.gz

{py_pve_cloud-0.1.2/src/py_pve_cloud.egg-info → py_pve_cloud-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: py-pve-cloud
-Version: 0.1.2
+Version: 0.2.0
 Author-email: Tobias Huebner <tobias.huebner@vmzberlin.com>
 License-Expression: GPL-3.0-or-later
 License-File: LICENSE

{py_pve_cloud-0.1.2 → py_pve_cloud-0.2.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "py-pve-cloud"
-version = "0.1.2"
+version = "0.2.0"
 authors = [{ name = "Tobias Huebner", email = "tobias.huebner@vmzberlin.com" }]
 license = "GPL-3.0-or-later"
 license-files = ["LICENSE"]

{py_pve_cloud-0.1.2 → py_pve_cloud-0.2.0}/src/pve_cloud/cli/pvclu.py

@@ -5,6 +5,7 @@ import socket
 import paramiko
 import dns.resolver
 import base64
+import re
 
 
 def get_cloud_domain(target_pve):
@@ -59,7 +60,13 @@ def get_cloud_env(pve_host):
 
   patroni_pass = stdout.read().decode('utf-8').strip()
 
-  return cluster_vars, patroni_pass
+  # fetch bind update key for ingress dns validation
+  _, stdout, _ = ssh.exec_command("sudo cat /etc/pve/cloud/secrets/internal.key")
+  bind_key_file = stdout.read().decode('utf-8')
+
+  bind_internal_key = re.search(r'secret\s+"([^"]+)";', bind_key_file).group(1)
+
+  return cluster_vars, patroni_pass, bind_internal_key
 
 
 def get_online_pve_host_prsr(args):
@@ -90,7 +97,7 @@ def get_ssh_master_kubeconfig(cluster_vars, stack_name):
 def export_envr(args):
   ansible_host = get_online_pve_host(args.target_pve)
   cloud_domain = get_cloud_domain(args.target_pve)
-  cluster_vars, patroni_pass = get_cloud_env(ansible_host)
+  cluster_vars, patroni_pass, bind_internal_key = get_cloud_env(ansible_host)
   print(f"export PVE_ANSIBLE_HOST='{ansible_host}'")
   print(f"export PVE_CLOUD_DOMAIN='{cloud_domain}'")
 
@@ -101,7 +108,8 @@ def export_envr(args):
   print(f"export TF_VAR_cluster_proxy_ip='{cluster_vars['pve_haproxy_floating_ip_internal']}'")
   print(f"export TF_VAR_pve_cloud_pg_cstr=\"postgresql+psycopg2://postgres:{patroni_pass}@{cluster_vars['pve_haproxy_floating_ip_internal']}:5000/pve_cloud?sslmode=disable\"")
   print(f"export TF_VAR_master_b64_kubeconf='{get_ssh_master_kubeconfig(cluster_vars, args.stack_name)}'")
-
+  print(f"export TF_VAR_bind_master_ip='{cluster_vars['bind_master_ip']}'")
+  print(f"export TF_VAR_bind_internal_key='{bind_internal_key}'")
 
   
 def main():

{py_pve_cloud-0.1.2 → py_pve_cloud-0.2.0/src/py_pve_cloud.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: py-pve-cloud
-Version: 0.1.2
+Version: 0.2.0
 Author-email: Tobias Huebner <tobias.huebner@vmzberlin.com>
 License-Expression: GPL-3.0-or-later
 License-File: LICENSE