From 6345b3b9943cbcb798d8f1b1b72798e132eebf61 Mon Sep 17 00:00:00 2001 From: Lionel Villard Date: Mon, 8 Nov 2021 15:44:09 -0500 Subject: [PATCH 1/2] remove unsupported stackdriver tracing backend --- .../channels/in-memory-channel/configmaps/tracing.yaml | 7 +------ config/core/configmaps/tracing.yaml | 9 ++------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/config/channels/in-memory-channel/configmaps/tracing.yaml b/config/channels/in-memory-channel/configmaps/tracing.yaml index 30ac4974a3a..89317a0844b 100644 --- a/config/channels/in-memory-channel/configmaps/tracing.yaml +++ b/config/channels/in-memory-channel/configmaps/tracing.yaml @@ -41,18 +41,13 @@ data: # this example block and unindented to be in the data block # to actually change the configuration. # - # This may be "zipkin" or "stackdriver", the default is "none" + # This may be "zipkin" or "none", the default is "none" backend: "none" # URL to zipkin collector where traces are sent. # This must be specified when backend is "zipkin" zipkin-endpoint: "http://zipkin.istio-system.svc.cluster.local:9411/api/v2/spans" - # The GCP project into which stackdriver metrics will be written - # when backend is "stackdriver". If unspecified, the project-id - # is read from GCP metadata when running on GCP. - stackdriver-project-id: "my-project" - # Enable zipkin debug mode. This allows all spans to be sent to the server # bypassing sampling. debug: "false" diff --git a/config/core/configmaps/tracing.yaml b/config/core/configmaps/tracing.yaml index a1f288b2b6a..4f9b7dfebdf 100644 --- a/config/core/configmaps/tracing.yaml +++ b/config/core/configmaps/tracing.yaml @@ -24,7 +24,7 @@ metadata: app.kubernetes.io/version: devel app.kubernetes.io/part-of: knative-eventing annotations: - knative.dev/example-checksum: "4002b4c2" + knative.dev/example-checksum: "0492ceb0" data: _example: | ################################ @@ -41,18 +41,13 @@ data: # this example block and unindented to be in the data block # to actually change the configuration. # - # This may be "zipkin" or "stackdriver", the default is "none" + # This may be "zipkin" or "none". the default is "none" backend: "none" # URL to zipkin collector where traces are sent. # This must be specified when backend is "zipkin" zipkin-endpoint: "http://zipkin.istio-system.svc.cluster.local:9411/api/v2/spans" - # The GCP project into which stackdriver metrics will be written - # when backend is "stackdriver". If unspecified, the project-id - # is read from GCP metadata when running on GCP. - stackdriver-project-id: "my-project" - # Enable zipkin debug mode. This allows all spans to be sent to the server # bypassing sampling. debug: "false" From f61b1a7d5637aaa0467e52a6f30ad0e374299b8d Mon Sep 17 00:00:00 2001 From: Lionel Villard Date: Mon, 8 Nov 2021 16:32:11 -0500 Subject: [PATCH 2/2] fix hack script --- config/channels/in-memory-channel/configmaps/tracing.yaml | 2 +- hack/update-checksums.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/config/channels/in-memory-channel/configmaps/tracing.yaml b/config/channels/in-memory-channel/configmaps/tracing.yaml index 89317a0844b..f3c252cd9af 100644 --- a/config/channels/in-memory-channel/configmaps/tracing.yaml +++ b/config/channels/in-memory-channel/configmaps/tracing.yaml @@ -24,7 +24,7 @@ metadata: app.kubernetes.io/version: devel app.kubernetes.io/part-of: knative-eventing annotations: - knative.dev/example-checksum: "4002b4c2" + knative.dev/example-checksum: "c8f8c47b" data: _example: | ################################ diff --git a/hack/update-checksums.sh b/hack/update-checksums.sh index 84b6f85fe44..b047f13dfa8 100755 --- a/hack/update-checksums.sh +++ b/hack/update-checksums.sh @@ -27,3 +27,4 @@ fi source $(dirname $0)/../vendor/knative.dev/hack/library.sh go run "${REPO_ROOT_DIR}/vendor/knative.dev/pkg/configmap/hash-gen" "${REPO_ROOT_DIR}"/config/core/configmaps/*.yaml +go run "${REPO_ROOT_DIR}/vendor/knative.dev/pkg/configmap/hash-gen" "${REPO_ROOT_DIR}"/config/channels/in-memory-channel/configmaps/*.yaml