Skip to content

Commit

Permalink
add pass and user for quay and fixdeprecated of ingress.class
Browse files Browse the repository at this point in the history
Signed-off-by: bvolovat <[email protected]>
  • Loading branch information
bvolovat committed Jan 6, 2025
1 parent a9bcce7 commit ba45f4c
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Monitoring/kube-prometheus-stack/charts/grafana/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -579,7 +579,7 @@ In order to serve Grafana with a prefix (e.g., <http://example.com/grafana>), 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"
Expand Down
2 changes: 1 addition & 1 deletion Monitoring/values/kube-prometheus-stack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 7 additions & 2 deletions performance.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 '
Expand Down Expand Up @@ -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 '
)
Expand Down

0 comments on commit ba45f4c

Please sign in to comment.