k8s-helper-cli 0.5.3__py3-none-any.whl → 0.5.5__py3-none-any.whl

k8s_helper/__init__.py

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

k8s_helper/core.py

@@ -3418,16 +3418,35 @@ scrape_configs:
                     'service': {
                         'type': grafana_service_type
                     },
+                    'env': {
+                        'GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS': 'true',
+                        'GF_INSTALL_PLUGINS': '',  # Disable automatic plugin installation
+                        'GF_SECURITY_DISABLE_INITIAL_ADMIN_CREATION': 'false'
+                    },
                     'adminPassword': 'admin',
+                    'plugins': [],  # Disable problematic plugins
+                    'sidecar': {
+                        'datasources': {
+                            'enabled': True,
+                            'defaultDatasourceEnabled': True
+                        },
+                        'dashboards': {
+                            'enabled': True,
+                            'searchNamespace': 'ALL'
+                        }
+                    },
                     'datasources': {
                         'datasources.yaml': {
                             'apiVersion': 1,
+                            'deleteDatasources': [],
                             'datasources': [{
                                 'name': 'Prometheus',
                                 'type': 'prometheus',
                                 'url': 'http://kube-prometheus-stack-prometheus:9090',
                                 'access': 'proxy',
-                                'isDefault': True
+                                'isDefault': True,
+                                'uid': 'prometheus',
+                                'editable': True
                             }]
                         }
                     },
@@ -3471,6 +3490,16 @@ scrape_configs:
                     'enabled': True,
                     'prometheusSpec': {
                         'retention': '30d',
+                        'resources': {
+                            'requests': {
+                                'memory': '512Mi',
+                                'cpu': '200m'
+                            },
+                            'limits': {
+                                'memory': '2Gi',
+                                'cpu': '1000m'
+                            }
+                        },
                         'storageSpec': {
                             'volumeClaimTemplate': {
                                 'spec': {
@@ -3487,13 +3516,57 @@ scrape_configs:
                     }
                 },
                 'alertmanager': {
-                    'enabled': True
+                    'enabled': True,
+                    'alertmanagerSpec': {
+                        'resources': {
+                            'requests': {
+                                'memory': '128Mi',
+                                'cpu': '100m'
+                            },
+                            'limits': {
+                                'memory': '512Mi',
+                                'cpu': '500m'
+                            }
+                        }
+                    }
                 },
                 'nodeExporter': {
-                    'enabled': True
+                    'enabled': True,
+                    'resources': {
+                        'requests': {
+                            'memory': '30Mi',
+                            'cpu': '100m'
+                        },
+                        'limits': {
+                            'memory': '100Mi',
+                            'cpu': '200m'
+                        }
+                    }
                 },
                 'kubeStateMetrics': {
-                    'enabled': True
+                    'enabled': True,
+                    'resources': {
+                        'requests': {
+                            'memory': '64Mi',
+                            'cpu': '50m'
+                        },
+                        'limits': {
+                            'memory': '256Mi',
+                            'cpu': '200m'
+                        }
+                    }
+                },
+                'prometheusOperator': {
+                    'resources': {
+                        'requests': {
+                            'memory': '128Mi',
+                            'cpu': '100m'
+                        },
+                        'limits': {
+                            'memory': '512Mi',
+                            'cpu': '500m'
+                        }
+                    }
                 },
                 'defaultRules': {
                     'create': True,
@@ -3536,14 +3609,19 @@ scrape_configs:
                     'helm', 'install', 'kube-prometheus-stack',
                     'prometheus-community/kube-prometheus-stack',
                     '--namespace', namespace,
-                    '--values', values_file
+                    '--values', values_file,
+                    '--create-namespace'
                 ]
                 
                 if wait_for_ready:
                     helm_cmd.append('--wait')
-                    helm_cmd.extend(['--timeout', '10m'])
+                    helm_cmd.extend(['--timeout', '20m'])  # Increased timeout
+                    print("⏳ This may take up to 20 minutes for first-time installation...")
+                else:
+                    # Even without wait, add a reasonable timeout
+                    helm_cmd.extend(['--timeout', '5m'])
                 
-                result = subprocess.run(helm_cmd, capture_output=True, text=True, check=True)
+                result = subprocess.run(helm_cmd, capture_output=True, text=True, check=True, timeout=1200)  # 20 min subprocess timeout
                 print("✅ Helm chart installed successfully")
                 
                 # Wait a bit for pods to start
@@ -3574,9 +3652,72 @@ scrape_configs:
                 
         except subprocess.CalledProcessError as e:
             error_msg = e.stderr if e.stderr else str(e)
+            
+            # Check if it's a timeout error and offer fallback
+            if 'context deadline exceeded' in error_msg or 'timeout' in error_msg.lower():
+                print("⚠️  Installation timed out, but this doesn't necessarily mean failure.")
+                print("🔍 Checking if components were actually deployed...")
+                
+                # Check if the release was created even if it timed out
+                try:
+                    check_result = subprocess.run([
+                        'helm', 'status', 'kube-prometheus-stack', '--namespace', namespace
+                    ], capture_output=True, text=True, timeout=30)
+                    
+                    if check_result.returncode == 0:
+                        print("✅ Helm release was created successfully despite timeout!")
+                        print("⏳ Components may still be starting up. Use 'k8s-helper monitoring-stack-status' to check progress.")
+                        
+                        return {
+                            'success': True,
+                            'namespace': namespace,
+                            'release_name': 'kube-prometheus-stack',
+                            'prometheus': {'deployed': True},
+                            'grafana': {
+                                'deployed': True,
+                                'admin_password': 'admin'
+                            },
+                            'warning': 'Installation completed but timed out waiting for all pods to be ready. Components may still be starting.',
+                            'suggestion': 'Use "k8s-helper monitoring-stack-status" to check current status.'
+                        }
+                except:
+                    pass
+            
+            return {
+                'success': False,
+                'error': f'Helm installation failed: {error_msg}',
+                'suggestion': 'Try running without --wait flag, or increase cluster resources.'
+            }
+        except subprocess.TimeoutExpired:
+            print("⚠️  Installation timed out after 20 minutes.")
+            print("🔍 Checking if components were deployed...")
+            
+            # Check if anything was installed
+            try:
+                check_result = subprocess.run([
+                    'helm', 'list', '--namespace', namespace
+                ], capture_output=True, text=True, timeout=30)
+                
+                if 'kube-prometheus-stack' in check_result.stdout:
+                    return {
+                        'success': True,
+                        'namespace': namespace,
+                        'release_name': 'kube-prometheus-stack',
+                        'prometheus': {'deployed': True},
+                        'grafana': {
+                            'deployed': True,
+                            'admin_password': 'admin'
+                        },
+                        'warning': 'Installation timed out but components may be deployed. Check status manually.',
+                        'suggestion': 'Use "k8s-helper monitoring-stack-status" to verify deployment status.'
+                    }
+            except:
+                pass
+                
             return {
                 'success': False,
-                'error': f'Helm installation failed: {error_msg}'
+                'error': 'Installation timed out after 20 minutes',
+                'suggestion': 'Try running "k8s-helper setup-monitoring-stack" without --wait flag, or increase cluster resources.'
             }
         except Exception as e:
             return {

{k8s_helper_cli-0.5.3.dist-info → k8s_helper_cli-0.5.5.dist-info}/METADATA

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

k8s_helper_cli-0.5.5.dist-info/RECORD

@@ -0,0 +1,11 @@
+k8s_helper/__init__.py,sha256=m2qQQFAXIhvJzVvMCKQo-oh6LfaB2OEL8xXBMPsVn9o,2666
+k8s_helper/cli.py,sha256=3eP3J7srPIM0bm_G5RxdU_RvtDwJHLX2xBguF2EmXtk,95115
+k8s_helper/config.py,sha256=P7YdfyvCHprrNs2J9DRb3RrClylfTTh5hfTtDzLug0A,6867
+k8s_helper/core.py,sha256=l3QDHZBHN8IKdua8Ke65Djjw4MitdjSKypqsF5tJ4vA,167222
+k8s_helper/utils.py,sha256=wYgTd5ktyuI-EiVcfW7FrxA7MzXY5odrEKQgmMVdueY,9496
+k8s_helper_cli-0.5.5.dist-info/licenses/LICENSE,sha256=tXPvVl3gLVc6e0qCEoLH9KjeA7z4JVL78UybpvGtBCw,1096
+k8s_helper_cli-0.5.5.dist-info/METADATA,sha256=6n1cmKDTgT6rbeglC-iPbEGLcDSZx4RUqiqqxBU3N9c,30789
+k8s_helper_cli-0.5.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+k8s_helper_cli-0.5.5.dist-info/entry_points.txt,sha256=IoCMWUZ6mn90LwzQzEy5YkWOwvogDdZ6ycqUWAzCFTQ,50
+k8s_helper_cli-0.5.5.dist-info/top_level.txt,sha256=x9A1jflyer-z2cFnkqk5B42juoH2q0fy5hkT9upsTG8,11
+k8s_helper_cli-0.5.5.dist-info/RECORD,,

k8s_helper_cli-0.5.3.dist-info/RECORD

@@ -1,11 +0,0 @@
-k8s_helper/__init__.py,sha256=3GNylm6r22pm4iWnjRfi_QLWcPBP9GL0NqZSTtFnLdc,2666
-k8s_helper/cli.py,sha256=3eP3J7srPIM0bm_G5RxdU_RvtDwJHLX2xBguF2EmXtk,95115
-k8s_helper/config.py,sha256=P7YdfyvCHprrNs2J9DRb3RrClylfTTh5hfTtDzLug0A,6867
-k8s_helper/core.py,sha256=0a4juGOteVZ3xwPqhq8vA3Dai63El1nCHo4D9tt7UMM,160443
-k8s_helper/utils.py,sha256=wYgTd5ktyuI-EiVcfW7FrxA7MzXY5odrEKQgmMVdueY,9496
-k8s_helper_cli-0.5.3.dist-info/licenses/LICENSE,sha256=tXPvVl3gLVc6e0qCEoLH9KjeA7z4JVL78UybpvGtBCw,1096
-k8s_helper_cli-0.5.3.dist-info/METADATA,sha256=K-zPIghmapn0gBpCr0AAxR3Uulbu1ww3z_xxTbNIKEo,30789
-k8s_helper_cli-0.5.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-k8s_helper_cli-0.5.3.dist-info/entry_points.txt,sha256=IoCMWUZ6mn90LwzQzEy5YkWOwvogDdZ6ycqUWAzCFTQ,50
-k8s_helper_cli-0.5.3.dist-info/top_level.txt,sha256=x9A1jflyer-z2cFnkqk5B42juoH2q0fy5hkT9upsTG8,11
-k8s_helper_cli-0.5.3.dist-info/RECORD,,