Merge branch 'develop' into prometheus-support

Makefile

@@ -1,6 +1,6 @@
 NAMESPACE = connaisseur
 IMAGE := $(shell yq e '.deployment.image' helm/values.yaml)
-COSIGN_VERSION = 1.5.0
+COSIGN_VERSION = 1.5.1
 
 .PHONY: all docker install unistall upgrade annihilate
 

connaisseur/workload_object.py

@@ -58,8 +58,13 @@ def parent_containers(self):
             name = owner["name"]
             uid = owner["uid"]
 
+            if api_version == "v1":
+                rest_path = "api"
+            else:
+                rest_path = "apis"
+
             parent = k_api.request_kube_api(
-                f"apis/{api_version}/namespaces/{self.namespace}/{kind}/{name}"
+                f"{rest_path}/{api_version}/namespaces/{self.namespace}/{kind}/{name}"
             )
 
             if parent["metadata"]["uid"] != uid:

docs/overrides/main.html

@@ -6,3 +6,8 @@
         <center>&#11088; <strong> If you like Connaisseur, give it a star on <a href="https://github.com/sse-secure-systems/connaisseur">GitHub</a> or share your <a href="https://github.com/sse-secure-systems/connaisseur/discussions">feedback</a>!</strong> &#11088;</center>
 {% endblock %}
 
+{% block outdated %}
+You're not viewing the docs of the latest version.
+<a href="{{ '../' ~ base_url  }}"><strong>Click here to go to the latest version.</strong></a>
+{% endblock %}
+

docs/requirements_docs.txt

@@ -1,2 +1,2 @@
-mkdocs-material~=8.1.7
+mkdocs-material~=8.1.9
 mike~=1.1.2

helm/Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v2
 name: connaisseur
 description: Helm chart for Connaisseur - a Kubernetes admission controller to integrate container image signature verification and trust pinning into a cluster.
 type: application
-version: 1.2.0
-appVersion: 2.4.0
+version: 1.2.1
+appVersion: 2.4.1
 keywords:
   - container image
   - signature

helm/templates/role.yaml

@@ -7,7 +7,7 @@ metadata:
     {{- include "helm.labels" . | nindent 4 }}
 rules:
 - apiGroups: ["*"]
-  resources: ["deployments", "pods", "replicacontrollers", "replicasets", "daemonsets", "statefulsets", "jobs", "cronjobs", "imagepolicies", "mutatingwebhookconfigurations"]
+  resources: ["deployments", "pods", "replicationcontrollers", "replicasets", "daemonsets", "statefulsets", "jobs", "cronjobs", "imagepolicies", "mutatingwebhookconfigurations"]
   verbs: ["get"]
 {{- if .Values.deployment.podSecurityPolicy }}
 {{- if .Values.deployment.podSecurityPolicy.enabled }}

helm/values.yaml

@@ -1,7 +1,7 @@
 # configure Connaisseur deployment
 deployment:
   replicasCount: 3
-  image: securesystemsengineering/connaisseur:v2.4.0
+  image: securesystemsengineering/connaisseur:v2.4.1
   imagePullPolicy: IfNotPresent
   # imagePullSecrets contains an optional list of Kubernetes Secrets, in Connaisseur namespace,
   # that are needed to access the registry containing Connaisseur image.

requirements_dev.txt

@@ -4,7 +4,7 @@ parsedatetime~=2.6
 pylint~=2.12.2
 pytest-asyncio~=0.17.2
 pytest-cov~=3.0.0
-pytest-mock~=3.6.1
-pytest-subprocess~=1.3.2
+pytest-mock~=3.7.0
+pytest-subprocess~=1.4.0
 requests-mock~=1.9.3
-setuptools~=60.5.0
+setuptools~=60.7.1

tests/validators/cosign/test_cosign_validator.py

@@ -84,7 +84,7 @@ def mock_add_kill_fake_process(monkeypatch):
     def mock_kill(self):
         return
 
-    pytest_subprocess.core.FakePopen.kill = mock_kill
+    pytest_subprocess.fake_popen.FakePopen.kill = mock_kill
 
 
 @pytest.mark.parametrize("index", [0, 1, 2])
@@ -313,7 +313,7 @@ def callback_function(input):
         stdin_callable=callback_function,
     )
 
-    mock_kill = mocker.patch("pytest_subprocess.core.FakePopen.kill")
+    mock_kill = mocker.patch("pytest_subprocess.fake_popen.FakePopen.kill")
 
     with pytest.raises(exc.CosignTimeout) as err: