DTIN-6034: Stop calling deprecated K8S endpoint (#1338)

* DTIN-6034: Stop calling deprecated K8S endpoint
* Removed no-longer-needed tests

Author: jmakar-s1

.github/workflows/reusable-agent-build-container-images.yml

@@ -261,11 +261,6 @@ jobs:
       fail-fast: false
       matrix:
         k8s_version:
-          # NOTE: We don't test under very old versions where CronJob was part of v2alpha1 since in
-          # those versions CronJobs are not enabled by default and need to be installed extra
-          - { "version": "v1.20.15", "driver": "", "runtime": "docker", "run_cronjob_checks": false }
-          - { "version": "v1.21.10", "driver": "", "runtime": "docker", "run_cronjob_checks": true }
-          - { "version": "v1.22.7", "driver": "", "runtime": "docker", "run_cronjob_checks": true }
           # NOTE: Using containerd runtime in minikube on GHA only works with docker driver
           - { "version": "v1.23.17", "driver": "docker", "runtime": "containerd", "run_cronjob_checks": true }
           - { "version": "v1.24.14", "driver": "docker", "runtime": "containerd", "run_cronjob_checks": true }

LICENSE.txt

@@ -187,7 +187,7 @@
       identification within third-party archives.
 
    Copyright 2014-2021 Scalyr, Inc.
-   Copyright 2021 SentinelOne, Inc.
+   Copyright 2021-2025 SentinelOne, Inc.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

scalyr_agent/configuration.py

@@ -1119,6 +1119,7 @@ def k8s_controlled_warmer_blacklist_time(self):
     def k8s_events_disable(self):
         return self.__get_config().get_bool("k8s_events_disable")
 
+    # TODO This has been deprecated and is to be removed
     @property
     def k8s_fallback_urls_disable(self):
         return self.__get_config().get_bool("k8s_fallback_urls_disable")
@@ -3107,6 +3108,7 @@ def __verify_main_config_and_apply_defaults(
             env_aware=True,
         )
 
+        # TODO This has been deprecated and is to be removed
         self.__verify_or_set_optional_bool(
             config,
             "k8s_fallback_urls_disable",

scalyr_agent/monitor_utils/k8s.py

@@ -44,43 +44,24 @@
 # A regex for splitting a container id and runtime
 _CID_RE = re.compile("^(.+)://(.+)$")
 
-# endpoints used by the agent for querying the k8s api.  Having this mapping allows
-# us to avoid special casing the logic for each different object type.  We can just
-# look up the appropriate endpoint in this dict and query objects however we need.
+# Endpoints used for querying the Kubernetes api
 #
-# The dict is keyed by object kind, and or each object kind, there are 3 endpoints:
-#       single, list and list all.
+# Keyed by object kind with the following endpoint specifiers:
+# - `single` is for querying a single object of a specific kind
+#   - Requires substitutions for ${namespace} and ${name}
+# - `list` is for querying all objects of a given kind in a specific namespace
+#   - Requires substitution for ${namespace}
+# - `list-all` is for querying all objects of a given kind in the entire cluster
 #
-# `single` is for querying a single object of a specific type
-# `list` is for querying all objects of a given type in a specific namespace
-# `list-all` is for querying all objects of a given type in the entire cluster
+# Each endpoint specifier may be a list and are attempted in order until successful.
+# The use case is to support changes, say promotions from /v1beta1 to /v1 and similar.
 #
-# the `single` and `list` endpoints are Templates that require the caller to substitute
-# in the appropriate values for ${namespace} and ${name}.
-#
-# For each key we also allow values to be a list. This way multiple URLs can be specific. We will
-# first try with the first URL with the list and then continue with the next one in case it returns
-# 404.
-# The use case here is to support URL paths which have changed, e.g. API endpoint which has been
-# promoted from /v1beta to /v1 and similar. Keep in mind that this is not a full blown robust
-# solution and not a replacement for proper API version management which is a larger and a longer
-# term project. It's a short term workaround / compromise to handle some of those scenarios where
-# an API endpoint has been promoted from beta to stable.
+# TODO Implement proper Kubernetes api version management
 _OBJECT_ENDPOINTS = {
     "CronJob": {
-        "single": [
-            Template("/apis/batch/v1beta1/namespaces/${namespace}/cronjobs/${name}"),
-            # In Kubernetes v1.25.0 this API endpoint has been promoted from v1beta to v1
-            Template("/apis/batch/v1/namespaces/${namespace}/cronjobs/${name}"),
-        ],
-        "list": [
-            Template("/apis/batch/v1beta1/namespaces/${namespace}/cronjobs"),
-            Template("/apis/batch/v1/namespaces/${namespace}/cronjobs"),
-        ],
-        "list-all": [
-            "/apis/batch/v1beta1/cronjobs",
-            "/apis/batch/v1/cronjobs",
-        ],
+        "single": Template("/apis/batch/v1/namespaces/${namespace}/cronjobs/${name}"),
+        "list": Template("/apis/batch/v1/namespaces/${namespace}/cronjobs"),
+        "list-all": "/apis/batch/v1/cronjobs",
     },
     "DaemonSet": {
         "single": Template("/apis/apps/v1/namespaces/${namespace}/daemonsets/${name}"),
@@ -1962,9 +1943,6 @@ def create_instance(
                     "token_file": global_config.k8s_service_account_token,
                     "namespace_file": global_config.k8s_service_account_namespace,
                     "token_re_read_interval": global_config.k8s_token_re_read_interval,
-                    "enable_fallback_urls": not (
-                        global_config.k8s_fallback_urls_disable
-                    ),
                 }
             )
         return KubernetesApi(**kwargs)
@@ -1985,7 +1963,6 @@ def __init__(
         token_file="/var/run/secrets/kubernetes.io/serviceaccount/token",
         namespace_file="/var/run/secrets/kubernetes.io/serviceaccount/namespace",
         token_re_read_interval=300,
-        enable_fallback_urls=True,
     ):
         """Init the kubernetes object"""
         self.log_api_responses = log_api_responses
@@ -2005,7 +1982,6 @@ def __init__(
         self._ca_file = ca_file
         self._token_file = token_file
         self._token_re_read_interval = int(token_re_read_interval)
-        self._enable_fallback_urls = enable_fallback_urls
 
         # We create a few headers ahead of time so that we don't have to recreate them each time we need them.
         self._standard_headers = {
@@ -2491,15 +2467,6 @@ def query_object(self, kind, namespace, name, query_options=None):
         if not isinstance(object_endpoints, list):
             object_endpoints = [object_endpoints]
 
-        if not self._enable_fallback_urls:
-            global_log.info(
-                "k8s_fallback_urls_disable option is set to true. Won't fall back to "
-                "the next URL in the list if API returns 404 response",
-                limit_once_per_x_secs=3600,
-                limit_key="k8s_get_object_fallback_url_disabled",
-            )
-            object_endpoints = object_endpoints[:1]
-
         object_endpoints_count = len(object_endpoints)
 
         for index, object_endpoint in enumerate(object_endpoints):
@@ -2565,15 +2532,6 @@ def query_objects(self, kind, namespace=None, filter=None):
         if not isinstance(objects_endpoints, list):
             objects_endpoints = [objects_endpoints]
 
-        if not self._enable_fallback_urls:
-            global_log.info(
-                "k8s_fallback_urls_disable option is set to true. Won't fall back to "
-                "the next URL in the list if API returns 404 response",
-                limit_once_per_x_secs=3600,
-                limit_key="k8s_list_objects_fallback_url_disabled",
-            )
-            objects_endpoints = objects_endpoints[:1]
-
         objects_endpoints_count = len(objects_endpoints)
 
         for index, objects_endpoint in enumerate(objects_endpoints):