k8s-helper-cli 0.4.1__py3-none-any.whl → 0.4.3__py3-none-any.whl

k8s_helper/__init__.py

@@ -20,7 +20,7 @@ from .utils import (
     create_service_manifest
 )
 
-__version__ = "0.4.0"
+__version__ = "0.4.3"
 __author__ = "Harshit Chatterjee"
 __email__ = "harshitchatterjee50@gmail.com"
 

k8s_helper/cli.py

@@ -1400,6 +1400,14 @@ def setup_monitoring(
         if result['success']:
             console.print("✅ Monitoring stack deployed successfully!")
             
+            # Show warning if Grafana configuration failed
+            if result.get('warning'):
+                console.print(f"⚠️  {result['warning']}")
+                console.print("💡 You can manually configure Grafana by:")
+                console.print("   1. Accessing Grafana with admin/admin123")
+                console.print("   2. Adding Prometheus as a data source")
+                console.print(f"   3. Use URL: http://prometheus-service.{result['namespace']}.svc.cluster.local:9090")
+            
             # Show deployment summary
             console.print(f"\n📋 Deployment Summary:")
             console.print(f"📍 Namespace: {result['namespace']}")
@@ -1412,6 +1420,12 @@ def setup_monitoring(
             if result['grafana']['deployed']:
                 console.print("✅ Grafana: Deployed")
                 console.print(f"🔑 Admin credentials: {result['grafana']['admin_user']}/{result['grafana']['admin_password']}")
+                
+                # Show Grafana configuration status
+                if result.get('grafana_configured', True):
+                    console.print("✅ Grafana: Automatically configured with Prometheus")
+                else:
+                    console.print("⚠️  Grafana: Manual configuration required")
             else:
                 console.print("❌ Grafana: Failed to deploy")
             

k8s_helper/core.py

@@ -1724,8 +1724,11 @@ class K8sClient:
                     # Configure Grafana data source and dashboard
                     if self._configure_grafana(namespace, import_dashboard):
                         result['success'] = True
+                        result['grafana_configured'] = True
                     else:
-                        result['error'] = "Failed to configure Grafana"
+                        result['success'] = True  # Still successful even if config fails
+                        result['grafana_configured'] = False
+                        result['warning'] = "Grafana deployed but automatic configuration failed"
                 else:
                     result['error'] = "Monitoring deployments failed to become ready"
             else:
@@ -1964,15 +1967,33 @@ scrape_configs:
                 raise e
         
         # ClusterRoleBinding
-        cluster_role_binding = client.V1ClusterRoleBinding(
-            metadata=client.V1ObjectMeta(name="prometheus"),
-            subjects=[
-                client.V1Subject(
+        # Create subject with version compatibility
+        try:
+            # Try V1Subject first (older versions)
+            subject = client.V1Subject(
+                kind="ServiceAccount",
+                name="prometheus",
+                namespace=namespace
+            )
+        except AttributeError:
+            # Try RbacV1Subject (newer versions)
+            try:
+                subject = client.RbacV1Subject(
                     kind="ServiceAccount",
                     name="prometheus",
                     namespace=namespace
                 )
-            ],
+            except AttributeError:
+                # Manual construction as fallback
+                subject = {
+                    'kind': 'ServiceAccount',
+                    'name': 'prometheus',
+                    'namespace': namespace
+                }
+        
+        cluster_role_binding = client.V1ClusterRoleBinding(
+            metadata=client.V1ObjectMeta(name="prometheus"),
+            subjects=[subject],
             role_ref=client.V1RoleRef(
                 kind="ClusterRole",
                 name="prometheus",
@@ -2106,9 +2127,6 @@ scrape_configs:
     def _configure_grafana(self, namespace: str, import_dashboard: bool = True) -> bool:
         """Configure Grafana with Prometheus data source and dashboard"""
         try:
-            # Wait a bit for Grafana to fully start
-            time.sleep(10)
-            
             import requests
             import json
             
@@ -2120,6 +2138,32 @@ scrape_configs:
             
             print(f"🔧 Configuring Grafana at {grafana_url}")
             
+            # Wait for Grafana to be accessible with retry logic
+            max_retries = 12  # 2 minutes total (12 * 10 seconds)
+            retry_count = 0
+            auth = ('admin', 'admin123')
+            
+            while retry_count < max_retries:
+                try:
+                    # Test connection to Grafana
+                    health_response = requests.get(
+                        f"{grafana_url}/api/health",
+                        auth=auth,
+                        timeout=10
+                    )
+                    if health_response.status_code == 200:
+                        print("✅ Grafana is accessible")
+                        break
+                except Exception as e:
+                    retry_count += 1
+                    if retry_count < max_retries:
+                        print(f"⏳ Waiting for Grafana to be accessible... (attempt {retry_count}/{max_retries})")
+                        time.sleep(10)
+                    else:
+                        print(f"❌ Grafana not accessible after {max_retries} attempts")
+                        print("💡 You can manually add Prometheus as a data source in Grafana")
+                        return False
+            
             # Add Prometheus data source
             datasource_payload = {
                 "name": "Prometheus",
@@ -2129,20 +2173,27 @@ scrape_configs:
                 "isDefault": True
             }
             
-            auth = ('admin', 'admin123')
-            
-            # Add data source
-            response = requests.post(
-                f"{grafana_url}/api/datasources",
-                json=datasource_payload,
-                auth=auth,
-                timeout=30
-            )
-            
-            if response.status_code in [200, 409]:  # Success or already exists
-                print("✅ Prometheus data source configured")
-            else:
-                print(f"⚠️  Warning: Could not add Prometheus data source: {response.text}")
+            # Try to add data source with retry
+            for attempt in range(3):
+                try:
+                    response = requests.post(
+                        f"{grafana_url}/api/datasources",
+                        json=datasource_payload,
+                        auth=auth,
+                        timeout=30
+                    )
+                    
+                    if response.status_code in [200, 409]:  # Success or already exists
+                        print("✅ Prometheus data source configured")
+                        break
+                    else:
+                        print(f"⚠️  Attempt {attempt + 1}: Could not add Prometheus data source: {response.text}")
+                        if attempt < 2:
+                            time.sleep(5)
+                except Exception as e:
+                    print(f"⚠️  Attempt {attempt + 1}: Error adding data source: {e}")
+                    if attempt < 2:
+                        time.sleep(5)
             
             # Import default dashboard if requested
             if import_dashboard:

{k8s_helper_cli-0.4.1.dist-info → k8s_helper_cli-0.4.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: k8s-helper-cli
-Version: 0.4.1
+Version: 0.4.3
 Summary: A simplified Python wrapper for common Kubernetes operations
 Author-email: Harshit Chatterjee <harshitchatterjee50@gmail.com>
 License-Expression: MIT

k8s_helper_cli-0.4.3.dist-info/RECORD

@@ -0,0 +1,11 @@
+k8s_helper/__init__.py,sha256=8xOzKrONciTYSjLyhDKR4cQs5wVVtW0UZll7TnsTpqQ,2666
+k8s_helper/cli.py,sha256=g0hzBHaROOT0gbKN5xu5GeC-aqbIyXpl3U-xx7vNWEU,80259
+k8s_helper/config.py,sha256=P7YdfyvCHprrNs2J9DRb3RrClylfTTh5hfTtDzLug0A,6867
+k8s_helper/core.py,sha256=R0_EDqVGFWQCpu5YuWC4abLLWIqjFtpn6KHgGD_Wues,112490
+k8s_helper/utils.py,sha256=wYgTd5ktyuI-EiVcfW7FrxA7MzXY5odrEKQgmMVdueY,9496
+k8s_helper_cli-0.4.3.dist-info/licenses/LICENSE,sha256=tXPvVl3gLVc6e0qCEoLH9KjeA7z4JVL78UybpvGtBCw,1096
+k8s_helper_cli-0.4.3.dist-info/METADATA,sha256=-uygNSjY9k0yhuw6KPwft5Uu-77b0GBGCPRURlt4PEM,30789
+k8s_helper_cli-0.4.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+k8s_helper_cli-0.4.3.dist-info/entry_points.txt,sha256=IoCMWUZ6mn90LwzQzEy5YkWOwvogDdZ6ycqUWAzCFTQ,50
+k8s_helper_cli-0.4.3.dist-info/top_level.txt,sha256=x9A1jflyer-z2cFnkqk5B42juoH2q0fy5hkT9upsTG8,11
+k8s_helper_cli-0.4.3.dist-info/RECORD,,

k8s_helper_cli-0.4.1.dist-info/RECORD

@@ -1,11 +0,0 @@
-k8s_helper/__init__.py,sha256=XDUF1icyJlQZbTC8B1N4sI8nxUs9X9nJO2EOHzVVq4E,2666
-k8s_helper/cli.py,sha256=ngXnZ-6EaTm9hCViLPOLZya4HtFDsqpPbLYnOBEfQmA,79400
-k8s_helper/config.py,sha256=P7YdfyvCHprrNs2J9DRb3RrClylfTTh5hfTtDzLug0A,6867
-k8s_helper/core.py,sha256=g6PjbbOqfc9n6CbSJLmglxaDLYdLZltc1V2z0bxpAHk,109980
-k8s_helper/utils.py,sha256=wYgTd5ktyuI-EiVcfW7FrxA7MzXY5odrEKQgmMVdueY,9496
-k8s_helper_cli-0.4.1.dist-info/licenses/LICENSE,sha256=tXPvVl3gLVc6e0qCEoLH9KjeA7z4JVL78UybpvGtBCw,1096
-k8s_helper_cli-0.4.1.dist-info/METADATA,sha256=xwNsN6p-TUlQLnN-9HtMEu-Z5cnvlRIFt4F8SmfKzKM,30789
-k8s_helper_cli-0.4.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-k8s_helper_cli-0.4.1.dist-info/entry_points.txt,sha256=IoCMWUZ6mn90LwzQzEy5YkWOwvogDdZ6ycqUWAzCFTQ,50
-k8s_helper_cli-0.4.1.dist-info/top_level.txt,sha256=x9A1jflyer-z2cFnkqk5B42juoH2q0fy5hkT9upsTG8,11
-k8s_helper_cli-0.4.1.dist-info/RECORD,,