Merge branch 'master' into dependabot/pip/podman-approx-eq-5.2.0

Author: asmorodskyi

.github/workflows/container.yml

@@ -39,13 +39,13 @@ jobs:
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81
+        uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96
         with:
           images: ${{ env.REGISTRY }}/${{ env.PCW_IMAGE_PREFIX }}_${{ matrix.suffix }}
 
       - name: Build Docker image (PCW)
         if: ${{ matrix.suffix == 'main' }}
-        uses: docker/build-push-action@5cd11c3a4ced054e52742c5fd54dca954e0edd85
+        uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355
         with:
           context: .
           file: containers/Dockerfile
@@ -54,7 +54,7 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
       - name: Build Docker image (K8S)
         if: ${{ matrix.suffix == 'k8s' }}
-        uses: docker/build-push-action@5cd11c3a4ced054e52742c5fd54dca954e0edd85
+        uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355
         with:
           context: .
           file: containers/Dockerfile_${{ matrix.suffix }}
@@ -85,13 +85,13 @@ jobs:
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81
+        uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96
         with:
           images: ${{ env.REGISTRY }}/${{ env.PCW_IMAGE_PREFIX }}_${{ matrix.suffix }}
 
       - name: Build and push Docker image (PCW)
         if: ${{ matrix.suffix == 'main' }}
-        uses: docker/build-push-action@5cd11c3a4ced054e52742c5fd54dca954e0edd85
+        uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355
         with:
           context: .
           file: containers/Dockerfile
@@ -100,7 +100,7 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
       - name: Build and push Docker image (K8S)
         if: ${{ matrix.suffix == 'k8s' }}
-        uses: docker/build-push-action@5cd11c3a4ced054e52742c5fd54dca954e0edd85
+        uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355
         with:
           context: .
           file: containers/Dockerfile_${{ matrix.suffix }}

.github/workflows/pcw.yml

@@ -39,4 +39,4 @@ jobs:
       - name: Run tests and collect coverage
         run: pytest --cov
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5

ocw/lib/cleanup.py

@@ -4,8 +4,7 @@
 from ocw.lib.azure import Azure
 from ocw.lib.ec2 import EC2
 from ocw.lib.gce import GCE
-from ocw.lib.eks import EKS
-from ocw.lib.emailnotify import send_mail, send_cluster_notification
+from ocw.lib.emailnotify import send_mail
 from ocw.enums import ProviderChoice
 
 logger = logging.getLogger(__name__)
@@ -28,16 +27,3 @@ def cleanup_run():
         except Exception as ex:
             logger.exception("[%s] Cleanup failed!", namespace)
             send_mail(f'{type(ex).__name__} on Cleanup in [{namespace}]', traceback.format_exc())
-
-
-def list_clusters():
-    for namespace in PCWConfig.get_namespaces_for('clusters'):
-        try:
-            clusters = EKS(namespace).all_clusters()
-            quantity = sum(len(clusters[c1]) for c1 in clusters)
-            logger.info("%d cluster(s) found", quantity)
-            if quantity > 0:
-                send_cluster_notification(namespace, clusters)
-        except Exception as ex:
-            logger.exception("[%s] List clusters failed!", namespace)
-            send_mail(f'{type(ex).__name__} on List clusters in [{namespace}]', traceback.format_exc())

ocw/lib/emailnotify.py

@@ -29,17 +29,6 @@ def draw_instance_table(objects):
     return table.draw()
 
 
-def send_cluster_notification(namespace, clusters):
-    if len(clusters) and PCWConfig.has('notify'):
-        clusters_str = ''
-        for region in clusters:
-            clusters_list = ' '.join([str(cluster) for cluster in clusters[region]])
-            clusters_str = f'{clusters_str}\n{region} : {clusters_list}'
-        logger.debug("Full clusters list - %s", clusters_str)
-        send_mail(f"[{namespace}] EC2 clusters found", clusters_str,
-                  receiver_email=PCWConfig.get_feature_property('notify', 'to', namespace))
-
-
 def send_mail(subject, message, receiver_email=None):
     if PCWConfig.has('notify'):
         smtp_server = PCWConfig.get_feature_property('notify', 'smtp')

ocw/templates/ocw/instance_list.html

@@ -6,9 +6,9 @@
 {% block content %}
     <link rel="stylesheet" href="{% static 'css/instance_table.css' %}">
     {% if filter %}
-        <button data-toggle="collapse" class="btn btn-primary btn-sm" data-target="#table_filter">Edit filter<span class="glyphicon glyphicon-filter"></span></button>
+        <button data-bs-toggle="collapse" class="btn btn-primary btn-sm" data-bs-target="#table_filter">Edit filter<span class="glyphicon glyphicon-filter"></span></button>
                 Displaying {{ filter.qs.count }} of {{ filter.queryset.count }} items.
-        <div id="table_filter" class="well collapse {{ request.GET.state|yesno:"in, " }} ">
+        <div id="table_filter" class="card p-3 collapse {{ request.GET.state|yesno:"show, " }} ">
         <form action="" method="get" class="form">
             {% bootstrap_form filter.form %}
             <a class="btn btn-default" role="button" href='{{ request.path }}' >Clear</a>

requirements.txt

@@ -1,23 +1,24 @@
-boto3
-azure-identity==1.16.0
-azure-mgmt-compute==31.0.0
+apscheduler==3.10.4
+azure-identity==1.19.0
+azure-storage-blob==12.23.1
+azure-mgmt-compute==33.0.0
 azure-mgmt-resource==23.1.1
-azure-mgmt-storage==21.1.0
-azure-storage-blob==12.20.0
-cachetools
-msrestazure==0.6.4
-uwsgi==2.0.24
-requests==2.32.3
+azure-mgmt-storage==21.2.0
+boto3==1.35.39
+botocore==1.35.39
+cachetools==5.5.0
 Django~=5.0.6
 django-tables2==2.7.0
 django-filter==23.5
 django-bootstrap5==24.2
-texttable
-oauth2client
-google-api-python-client==2.131.0
-google-cloud-storage==2.16.0
-openqa_client
-python-dateutil
-apscheduler
-kubernetes
-influxdb-client
+google-api-python-client==2.149.0
+httplib2==0.22.0
+influxdb-client==1.46.0
+msrest==0.7.1
+openqa-client==4.2.3
+protobuf==5.28.2
+python-dateutil==2.9.0.post0
+requests==2.32.3
+texttable==1.7.0
+urllib3==2.2.3
+uwsgi==2.0.24

requirements_k8s.txt

@@ -1,8 +1,6 @@
-oauth2client
-kubernetes
-google-api-python-client==2.131.0
-azure-cli==2.61.0
-azure-identity==1.16.0
-azure-mgmt-containerservice==30.0.0
+azure-cli==2.65.0
+azure-identity==1.19.0
 azure-mgmt-resource==23.1.1
-boto3
+boto3==1.35.39
+google_api_python_client==2.149.0
+kubernetes

webui/PCWConfig.py

@@ -64,7 +64,6 @@ def get_feature_property(feature: str, feature_property: str, namespace: str | N
             'updaterun/default_ttl': {'default': 44400, 'return_type': int},
             'notify/to': {'default': None, 'return_type': str},
             'notify/age-hours': {'default': 12, 'return_type': int},
-            'cluster.notify/to': {'default': None, 'return_type': str},
             'notify/smtp': {'default': None, 'return_type': str},
             'notify/smtp-port': {'default': 25, 'return_type': int},
             'notify/from': {'default': '[email protected]', 'return_type': str},