Fix Velero tests and stop using bitnami images (#21274) (#21296)

* Move bitnami image used for testing to bitnami legacy

* Add changelog

* Increase timeout when installing velero

* Decrease timeout for installation. Did not work.

* Add custom kubectl image

(cherry picked from commit 04d89ef)

Co-authored-by: Juanpe Araque <[email protected]>
Co-authored-by: Steven Yuen <[email protected]>

Author: 3 people

velero/changelog.d/21274.fixed

@@ -0,0 +1 @@
+Remove usage of bitnami images for testing and add ruff rules from parent directory

velero/pyproject.toml

@@ -58,3 +58,6 @@ include = [
 dev-mode-dirs = [
     ".",
 ]
+
+[tool.ruff]
+extend = "../pyproject.toml"

velero/tests/conftest.py

@@ -2,13 +2,13 @@
 # All rights reserved
 # Licensed under a 3-clause BSD style license (see LICENSE)
 import os
-from contextlib import ExitStack
+from contextlib import ExitStack, contextmanager
 
 import pytest
 
 from datadog_checks.dev import TempDir, run_command
 from datadog_checks.dev.fs import path_join
-from datadog_checks.dev.kind import kind_run
+from datadog_checks.dev.kind import KindLoad, kind_run
 from datadog_checks.dev.kube_port_forward import port_forward
 
 from .common import MOCKED_INSTANCE, PORT
@@ -17,6 +17,19 @@
 KIND_DIR = os.path.join(HERE, 'kind')
 
 
+@contextmanager
+def build_and_load_kubectl_image(image_tag: str):
+    print("Building custom kubectl image...")
+    dockerfile_path = os.path.join(KIND_DIR, 'kubectl.Dockerfile')
+
+    # Build the custom kubectl image
+    run_command(
+        ['docker', 'build', '-t', image_tag, '-f', dockerfile_path, '.'],
+        check=True,
+    )
+    yield
+
+
 def setup_velero():
     """Set up Velero, MinIO and Nginx in the Kind cluster."""
     # Apply MinIO deployment
@@ -63,10 +76,12 @@ def get_instances(velero_host, velero_port, node_agent_host, node_agent_port):
 @pytest.fixture(scope='session')
 def dd_environment():
     kind_config = os.path.join(KIND_DIR, 'kind-config.yaml')
+    custom_kubectl_image_tag = "custom-kubectl:latest"
 
     with TempDir('helm_dir') as helm_dir:
         with kind_run(
-            conditions=[setup_velero],
+            wrappers=[build_and_load_kubectl_image(custom_kubectl_image_tag)],
+            conditions=[KindLoad(custom_kubectl_image_tag), setup_velero],
             kind_config=kind_config,
             env_vars={
                 "HELM_CACHE_HOME": path_join(helm_dir, 'Caches'),

velero/tests/kind/kubectl.Dockerfile

@@ -0,0 +1,8 @@
+FROM debian:bullseye-slim
+
+RUN apt-get update && apt-get install -y --no-install-recommends wget gnupg coreutils ca-certificates && \
+    rm -rf /var/lib/apt/lists/*
+
+RUN wget -q -O kubectl https://dl.k8s.io/release/v1.28.0/bin/linux/amd64/kubectl && \
+    install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl && \
+    rm kubectl

velero/tests/kind/velero-values.yaml

@@ -35,11 +35,20 @@ metrics:
 # Deploy node-agent since we're monitoring it
 deployNodeAgent: true
 
+# Override kubectl image to avoid bitnami dependency
+# This should be updated when velero has a final solution to depending on bitnami images
+# https://github.com/vmware-tanzu/helm-charts/issues/698
+kubectl:
+  image:
+    repository: custom-kubectl
+    tag: "latest"
+  pullPolicy: Never
+
 # Default resource requests/limits
 resources:
   requests:
     cpu: 500m
     memory: 128Mi
   limits:
     cpu: 1000m
-    memory: 512Mi 
+    memory: 512Mi