Merge branch 'master' into miani-k8s-falco-20250127

GoogleCloudPlatform · Jan 30, 2025 · 33238e4 · 33238e4
2 parents f00d1ca + 4e45316
commit 33238e4
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 16 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -4,8 +4,3 @@
 # These owners will be the default owners for everything in
 # the repo. Unless a later match takes precedence.
 *                   @GoogleCloudPlatform/ccm-saap-team
-
-
-/docker/ @GoogleCloudPlatform/c2d-contributors
-/k8s/**/Makefile @GoogleCloudPlatform/c2d-contributors
-/vm/chef/cookbooks/**/attributes/default.rb @GoogleCloudPlatform/c2d-contributors
diff --git a/k8s/jaeger-operator/Makefile b/k8s/jaeger-operator/Makefile
@@ -10,7 +10,7 @@ APP_ID ?= $(CHART_NAME)
 
 SOURCE_REGISTRY ?= marketplace.gcr.io/google
 
-TRACK ?= 1.45
+TRACK ?= 1.53
 SERVICE_NAME := services/434ff7ab-fb9b-46c5-b76c-1d6088d5dc8b.cloudpartnerservices.goog
 
 IMAGE_MAIN ?= $(SOURCE_REGISTRY)/jaeger-operator1:$(TRACK)

diff --git a/k8s/jaeger-operator/apptest/tester/tests/basic-suite.yaml b/k8s/jaeger-operator/apptest/tester/tests/basic-suite.yaml
@@ -61,16 +61,6 @@ actions:
     expect:
       exitCode:
         equals: 0
-- name: Trying to find previous request from Jaeger query service
-  bashTest:
-    script: |
-      sleep 10; \
-      curl --retry 3 --retry-connrefused --retry-max-time 60 \
-        "example-query.${NAMESPACE}.svc.cluster.local:16686/api/traces?service=jaeger-query&tags=%7B%22http.url%22%3A%22%2Fapi%2Fservices%3Ffoo%3Dbar%22%7D" \
-        | jq .data[0] | grep "api/services?foo=bar"
-    expect:
-      exitCode:
-        equals: 0
 - name: Delete test Jaeger
   bashTest:
     script: |