diff --git a/Monitoring/kube-prometheus-stack/charts/grafana/README.md b/Monitoring/kube-prometheus-stack/charts/grafana/README.md index bcf0923..0596277 100644 --- a/Monitoring/kube-prometheus-stack/charts/grafana/README.md +++ b/Monitoring/kube-prometheus-stack/charts/grafana/README.md @@ -579,7 +579,7 @@ In order to serve Grafana with a prefix (e.g., ), ad ingress: enabled: true annotations: - kubernetes.io/ingress.class: "nginx" + spec.ingressClassName: "nginx" nginx.ingress.kubernetes.io/rewrite-target: /$1 nginx.ingress.kubernetes.io/use-regex: "true" diff --git a/Monitoring/values/kube-prometheus-stack.yaml b/Monitoring/values/kube-prometheus-stack.yaml index c5f6136..610b56d 100644 --- a/Monitoring/values/kube-prometheus-stack.yaml +++ b/Monitoring/values/kube-prometheus-stack.yaml @@ -70,7 +70,7 @@ grafana: ## Annotations for Grafana Ingress ## annotations: - kubernetes.io/ingress.class: nginx + spec.ingressClassName: nginx cert-manager.io/issuer: "letsencrypt-prod" ## Labels to be added to the Ingress diff --git a/performance.py b/performance.py index 4c15f74..c603561 100644 --- a/performance.py +++ b/performance.py @@ -203,6 +203,11 @@ def deploy_kubescape( print("Deploying Kubescape Operator...") cluster_context = subprocess.run(['kubectl', 'config', 'current-context'], check=True, capture_output=True, text=True).stdout.strip() + quay_password = os.environ.get("QUAYIO_REGISTRY_PASSWORD") + quay_username = os.environ.get("QUAYIO_REGISTRY_USERNAME") + if not quay_password or not quay_username: + raise ValueError("QUAYIO_REGISTRY_PASSWORD or QUAYIO_REGISTRY_USERNAME not set.") + helm_command = ( f'helm upgrade --install kubescape kubescape/kubescape-operator ' f'-n kubescape --create-namespace ' @@ -232,9 +237,9 @@ def deploy_kubescape( ' --set capabilities.manageWorkloads=enable ' ' --set capabilities.nodeProfileService=enable ' ' --set capabilities.runtimeDetection=enable ' - ' --set imagePullSecret.password=Q5UMRCFPRAHAIRWAYTOP7P4PK9ZNV2H26JFTB70CMNZ2KG1NHGPYXK6PNPNC677E ' + ' --set imagePullSecret.password={quay_password} ' ' --set imagePullSecret.server=quay.io ' - ' --set imagePullSecret.username=armosec+armosec_ro ' + ' --set imagePullSecret.username={quay_username} ' ' --set imagePullSecrets=armosec-readonly ' ' --set nodeAgent.image.repository=quay.io/armosec/node-agent ' )