Merge pull request #154 from nirmata/NDEV-20550

CVE fix for VISA
nirmata · Sep 27, 2024 · c6e8ca2 · c6e8ca2
2 parents 1b8b48c + 547c339
commit c6e8ca2
Show file tree

Hide file tree

Showing 9 changed files with 1,447 additions and 509 deletions.
diff --git a/go.mod b/go.mod
diff --git a/go.sum b/go.sum
diff --git a/pkg/metrics/metrics.go b/pkg/metrics/metrics.go
@@ -18,7 +18,7 @@ import (
 	"go.opentelemetry.io/otel/metric"
 	sdkmetric "go.opentelemetry.io/otel/sdk/metric"
 	"go.opentelemetry.io/otel/sdk/resource"
-	semconv "go.opentelemetry.io/otel/semconv/v1.21.0"
+	semconv "go.opentelemetry.io/otel/semconv/v1.24.0"
 	"k8s.io/client-go/kubernetes"
 )
 

diff --git a/pkg/tracing/config.go b/pkg/tracing/config.go
@@ -13,7 +13,7 @@ import (
 	"go.opentelemetry.io/otel/propagation"
 	"go.opentelemetry.io/otel/sdk/resource"
 	sdktrace "go.opentelemetry.io/otel/sdk/trace"
-	semconv "go.opentelemetry.io/otel/semconv/v1.21.0"
+	semconv "go.opentelemetry.io/otel/semconv/v1.24.0"
 	"k8s.io/client-go/kubernetes"
 )
 

diff --git a/pkg/tracing/helpers.go b/pkg/tracing/helpers.go
@@ -6,7 +6,7 @@ import (
 
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/codes"
-	semconv "go.opentelemetry.io/otel/semconv/v1.21.0"
+	semconv "go.opentelemetry.io/otel/semconv/v1.24.0"
 	"go.opentelemetry.io/otel/trace"
 )
 

diff --git a/pkg/webhooks/handlers/metrics.go b/pkg/webhooks/handlers/metrics.go
@@ -12,7 +12,7 @@ import (
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/metric"
-	semconv "go.opentelemetry.io/otel/semconv/v1.21.0"
+	semconv "go.opentelemetry.io/otel/semconv/v1.24.0"
 )
 
 func (inner AdmissionHandler) WithMetrics(logger logr.Logger, metricsConfig config.MetricsConfiguration, attrs ...attribute.KeyValue) AdmissionHandler {

diff --git a/pkg/webhooks/handlers/trace.go b/pkg/webhooks/handlers/trace.go
@@ -9,7 +9,7 @@ import (
 	"github.com/go-logr/logr"
 	"github.com/kyverno/kyverno/pkg/tracing"
 	admissionutils "github.com/kyverno/kyverno/pkg/utils/admission"
-	semconv "go.opentelemetry.io/otel/semconv/v1.21.0"
+	semconv "go.opentelemetry.io/otel/semconv/v1.24.0"
 	"go.opentelemetry.io/otel/trace"
 )
 

diff --git a/test/conformance/kuttl/kuttl-test.yaml b/test/conformance/kuttl/kuttl-test.yaml
@@ -3,7 +3,7 @@ kind: TestSuite
 testDirs:
 - ./test/conformance/kuttl
 startKIND: false
-timeout: 90
+timeout: 120
 parallel: 1
 fullName: true
 skipTestRegex: '_.+'
diff --git a/test/conformance/kuttl/validate/clusterpolicy/standard/debug/with-pod/policies.yaml b/test/conformance/kuttl/validate/clusterpolicy/standard/debug/with-pod/policies.yaml
@@ -13,6 +13,6 @@ spec:
         any:
           - resources:
               kinds:
-                - Pod
+                - Pod/ephemeralcontainers
       validate:
         deny: {}