Release v2.2.13 (#1255)

Author: alesnovak-s1

.github/workflows/reusable-agent-build-linux-packages-new.yml

@@ -73,10 +73,16 @@ jobs:
           image: tonistiigi/binfmt:qemu-v6.2.0
           platforms: all
 
+      - name: Set up Docker Context for Buildx
+        id: buildx-context
+        run: |
+          docker context create builders || echo Already exists
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3
         with:
           driver-opts: network=host
+          endpoint: builders
 
       - name: Expose GitHub Runtime To Be Able to Use GHA Cache By Docker.
         uses: crazy-max/ghaction-github-runtime@715c25b40ccc0df9b62bfa8be3ccc57d09dbc4b1
@@ -100,7 +106,7 @@ jobs:
 
   build_packages:
     name: Build package ${{ matrix.variant.builder_name }}-${{ matrix.variant.package_type }}
-    runs-on: ubuntu-22.04
+    runs-on: ${{ vars.RUNNER }}
     needs:
       - build_dependencies
     strategy:
@@ -128,10 +134,16 @@ jobs:
           image: tonistiigi/binfmt:qemu-v6.2.0
           platforms: all
 
+      - name: Set up Docker Context for Buildx
+        id: buildx-context
+        run: |
+          docker context create builders || echo Already exists
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3
         with:
           driver-opts: network=host
+          endpoint: builders
 
       - name: Expose GitHub Runtime To Be Able to Use GHA Cache By Docker.
         uses: crazy-max/ghaction-github-runtime@715c25b40ccc0df9b62bfa8be3ccc57d09dbc4b1

CHANGELOG.md

@@ -1,6 +1,14 @@
 Scalyr Agent 2 Changes By Release
 =================================
 
+## 2.2.13 "Killian" - Mar 30, 2024
+<!---
+Packaged by Ales Novak <[email protected]> on Mar 30, 2024 00:00 -0800
+--->
+
+Feature:
+* Kubernetes Monitor - when K8s Pod API returnes 404, the logs are ingested based on SCALYR_K8S_INCLUDE_ALL_CONTAINERS regardless of pods annotations. Short-lived pods are usually affected.
+
 
 ## 2.2.12 "Gizmo" - Feb 29, 2024
 <!---

VERSION

@@ -1 +1 @@
-2.2.12
+2.2.13

agent_build_refactored/container_images/base_images/alpine.Dockerfile

@@ -18,7 +18,11 @@ RUN apk update && apk add --no-cache \
     git \
     bash \
     rust \
-    cargo
+    cargo \
+    py3-orjson
+
+RUN mkdir -p /tmp/requrements_root/usr/lib/python3.11/site-packages
+RUN cp -r ./usr/lib/python3.11/site-packages/orjson /tmp/requrements_root/usr/lib/python3.11/site-packages
 
 FROM base as runtime_base
 RUN apk update && apk add --no-cache python3 py3-pip

agent_build_refactored/container_images/dependencies.Dockerfile

@@ -3,8 +3,6 @@ RUN python3 -m pip install --upgrade setuptools pip --root /tmp/requrements_root
 RUN cp -a /tmp/requrements_root/. /
 ARG AGENT_REQUIREMENTS
 RUN echo "${AGENT_REQUIREMENTS}" > /tmp/requirements.txt
-RUN echo Installing Agent requirements for platfor_system:
-RUN python3 -c "import platform; print(platform.system())"
 RUN python3 -m pip install -r /tmp/requirements.txt --root /tmp/requrements_root
 ARG TEST_REQUIREMENTS
 RUN echo "${TEST_REQUIREMENTS}" > /tmp/test_requirments.txt

agent_build_refactored/container_images/image_builders.py

@@ -70,6 +70,7 @@ class ContainerisedAgentBuilder(Builder):
 
     BASE_DISTRO: str
     TAG_SUFFIXES: List[str]
+    AGENT_REQUIREMENTS_EXCLUDE = []
 
     def __init__(self, base_image):
         super(ContainerisedAgentBuilder, self).__init__()
@@ -108,6 +109,15 @@ def _build_base_image_dockerfile(
             build_args=self.__build_args
         )
 
+    def __agent_requirements(self):
+        return "\n".join([
+            dependency
+            for dependency in AGENT_REQUIREMENTS.split("\n")
+            if not any(
+                dependency.startswith(excluded) for excluded in self.__class__.AGENT_REQUIREMENTS_EXCLUDE
+            )
+        ])
+
     def build_requirement_libs(
             self,
             architecture: CpuArch,
@@ -154,7 +164,7 @@ def build_requirement_libs(
             context_path=_PARENT_DIR,
             architectures=[architecture],
             build_args={
-                "AGENT_REQUIREMENTS": AGENT_REQUIREMENTS,
+                "AGENT_REQUIREMENTS": self.__agent_requirements(),
                 "TEST_REQUIREMENTS": test_requirements,
             },
             build_contexts={
@@ -493,6 +503,9 @@ def _arch_to_target_arch_and_variant(architecture: CpuArch):
 # Create all image builder classes and make them available from this global collection.
 CONTAINERISED_AGENT_BUILDERS: Dict[str, Type[ContainerisedAgentBuilder]] = {}
 
+requirement_libs_exclude = {
+    "alpine": ["orjson", "lz4", "zstandard"]
+}
 
 for base_distro in ["ubuntu", "alpine"]:
     tag_suffixes = [f"-{base_distro}"]
@@ -505,6 +518,8 @@ class _ContainerisedAgentBuilder(ContainerisedAgentBuilder):
         NAME = name
         BASE_DISTRO = base_distro
         TAG_SUFFIXES = tag_suffixes[:]
+        AGENT_REQUIREMENTS_EXCLUDE = requirement_libs_exclude.get(base_distro, [])
+
 
     CONTAINERISED_AGENT_BUILDERS[name] = _ContainerisedAgentBuilder
 

k8s/default-namespace/scalyr-agent-2.yaml

@@ -50,7 +50,7 @@ spec:
         envFrom:
         - configMapRef:
             name: scalyr-config
-        image: scalyr/scalyr-k8s-agent:2.2.12
+        image: scalyr/scalyr-k8s-agent:2.2.13
         imagePullPolicy: Always
         name: scalyr-agent
         securityContext:

k8s/no-kustomize/scalyr-agent-2.yaml

@@ -50,7 +50,7 @@ spec:
         envFrom:
         - configMapRef:
             name: scalyr-config
-        image: scalyr/scalyr-k8s-agent:2.2.12
+        image: scalyr/scalyr-k8s-agent:2.2.13
         imagePullPolicy: Always
         name: scalyr-agent
         securityContext:

k8s/scalyr-agent-2-envfrom.yaml

@@ -49,7 +49,7 @@ spec:
         envFrom:
         - configMapRef:
             name: scalyr-config
-        image: scalyr/scalyr-k8s-agent:2.2.12
+        image: scalyr/scalyr-k8s-agent:2.2.13
         imagePullPolicy: Always
         name: scalyr-agent
         securityContext:

k8s/scalyr-agent-2.yaml

@@ -49,7 +49,7 @@ spec:
         envFrom:
         - configMapRef:
             name: scalyr-config
-        image: scalyr/scalyr-k8s-agent:2.2.12
+        image: scalyr/scalyr-k8s-agent:2.2.13
         imagePullPolicy: Always
         name: scalyr-agent
         securityContext: