Add opentelemetry agent to xtesting images - part 2

- pin otel versions for healthcheck and smoke-usecases-robot-py3
  since both still are based on python 3.8

Issue-ID: INT-2344
Change-Id: Ice498b79386457011e55f5973bdd636f62a0c318
Signed-off-by: Fiete Ostkamp <fiete.ostkamp@telekom.de>

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..ef9a69b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+.venv
+venv

diff --git a/healthcheck/requirements.txt b/healthcheck/requirements.txt
index 92fde6d..4012e1f 100644 (file)
--- a/healthcheck/requirements.txt
+++ b/healthcheck/requirements.txt
@@ -16,6 +16,6 @@ pyyaml>=4.2b1
 json5==0.9.11
 pytz
 urllib3<2
-opentelemetry-distro
-opentelemetry-exporter-otlp
-opentelemetry-instrumentation-requests
+opentelemetry-distro==0.40b0 # 0.40b0 is still compatible with Python 3.8
+opentelemetry-instrumentation-requests==0.40b0 # 0.40b0 is still compatible with Python 3.8
+opentelemetry-exporter-otlp==1.19.0 # 1.19.0 is still compatible with Python 3.8

diff --git a/healthcheck/upper-constraints.txt b/healthcheck/upper-constraints.txt
index 52fd08d..49ee04e 100644 (file)
--- a/healthcheck/upper-constraints.txt
+++ b/healthcheck/upper-constraints.txt
@@ -1,4 +1,4 @@
-importlib_metadata==4.12.0
+importlib_metadata==6.7.0
 robotframework-httplibrary===0.4.2
 ansible===2.9.2
 xtesting===0.91.0
@@ -10,4 +10,4 @@ ruamel.yaml===0.15.100
 sphinxcontrib-spelling===4.3.0
 kubernetes===11.0.0
 ansible-lint===4.2.0
-setuptools_scm===6.0.1
\ No newline at end of file
+setuptools_scm===6.0.1

diff --git a/security/docker/Dockerfile b/security/docker/Dockerfile
index 55ea170..197a968 100644 (file)
--- a/security/docker/Dockerfile
+++ b/security/docker/Dockerfile
@@ -30,6 +30,7 @@ COPY scripts/check_cis_kubernetes.sh /check_cis_kubernetes.sh
 COPY scripts/check_versions.sh /check_versions.sh
 COPY --from=build_yq /go/bin/yq /usr/local/bin/yq
 COPY --from=build_onap /go/bin/sslendpoints /usr/local/bin/sslendpoints
+COPY upper-constraints.txt /upper-constraints.txt
 
 RUN set -x && \
     apk --no-cache add --update curl ca-certificates openssl procps util-linux \
@@ -54,7 +55,7 @@ RUN set -x && \
     rm -rf /usr/lib/python3.8/site-packages/PyYAML* && \
     pip3 install --no-cache-dir \
         git+https://git.onap.org/integration/xtesting.git@$ONAP_TESTS_TAG#subdirectory=security && \
-    cd /kube-hunter && pip3 install -r /kube-hunter/requirements.txt && \
+    cd /kube-hunter && pip3 install -c /upper-constraints.txt -r /kube-hunter/requirements.txt && \
     pip3 install --no-cache-dir \
         git+https://git.onap.org/integration.git@$ONAP_TESTS_TAG#subdirectory=test/security/check_versions && \
     apk del .build-deps

diff --git a/security/upper-constraints.txt b/security/upper-constraints.txt
new file mode 100644 (file)
index 0000000..cb6e760
--- /dev/null
+++ b/security/upper-constraints.txt
@@ -0,0 +1 @@
+cryptography===38.0.4

diff --git a/smoke-usecases-robot-py3/requirements.txt b/smoke-usecases-robot-py3/requirements.txt
index a95cf92..eaf590e 100644 (file)
--- a/smoke-usecases-robot-py3/requirements.txt
+++ b/smoke-usecases-robot-py3/requirements.txt
@@ -4,3 +4,6 @@ robotframework-jsonlibrary
 robotframework-sshlibrary
 robotframework-archivelibrary
 robotframework-seleniumlibrary==5.1.3
+opentelemetry-distro==0.51b0 # 0.51b0 is still compatible with Python 3.8
+opentelemetry-instrumentation-requests==0.51b0 # 0.51b0 is still compatible with Python 3.8
+opentelemetry-exporter-otlp==1.30.0 # 1.30.0 is still compatible with Python 3.8