chore(opentelemetry-operator): upgrade opentelemetry-operator subchart to 0.13.0 #2561
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
Comment on lines
1544
to
1549
| --- | ||
| apiVersion: admissionregistration.k8s.io/v1 | ||
| kind: MutatingWebhookConfiguration | ||
| apiVersion: opentelemetry.io/v1alpha1 | ||
| kind: Instrumentation | ||
| metadata: | ||
| annotations: | ||
| cert-manager.io/inject-ca-from: {{ printf "%s/%s" .Release.Namespace ( include "opentelemetry-operator.controller.manager.service.cert.name" . ) }} | ||
| namespace: {{ $ns }} | ||
| name: {{ template "sumologic.metadata.name.opentelemetry.operator.instrumentation" $ctx }} |
There was a problem hiding this comment.
I would put it in separate file
There was a problem hiding this comment.
I've moved Instrumentation CR generation to separated file located in confs/opentelemetry-operator
mat-rumian
changed the title
mat-rumian
changed the title
# Conflicts: # CHANGELOG.md
sumo-drosiek
approved these changes
Oct 17, 2022
swiatekm
reviewed
Oct 17, 2022
| {{- $ctx := . -}} | ||
| {{ $watchNamespace := index .Values "opentelemetry-operator" "manager" "env" }} | ||
| {{- if eq ( get $watchNamespace "WATCH_NAMESPACE" ) "" }} | ||
| {{ fail "It is mandatory to set value for \"opentelemetry-operator.manager.env.WATCH_NAMESPACE\" when opentelemetry-operator is enabled. Value is comma separated namespaces e.g. \"ns1\\,ns2\"" }} |
There was a problem hiding this comment.
Why is this mandatory, actually? A user may not want to use Instrumentation at all and just have the operator manage OT in all namespaces.
There was a problem hiding this comment.
If WATCH_NAMESPACE is not provided then in theory Operator should watch for all namespaces but it doesn't. At least in case of Instrumentation.
Logs say that Instrumentation resource exists and became default
{"level":"info","ts":1666018961.0456557,"logger":"instrumentation-resource","msg":"default","name":"collection-sumologic-ot-operator-instr"}
{"level":"info","ts":1666018961.0561447,"logger":"instrumentation-resource","msg":"validate update","name":"collection-sumologic-ot-operator-instr"}
But when I add annotation to the e.g. Deployment I'm getting this kind of error. Doesn't matter if annotation value is true or name-of-the-instrumentation-resource.
{"level":"error","ts":1666018765.0062091,"msg":"failed to select an OpenTelemetry Instrumentation instance for this pod","namespace":"","name":"","error":"no OpenTelemetry Instrumentation instances available","stacktrace":"github.com/open-telemetry/opentelemetry-operator/pkg/instrumentation.(*instPodMutator).Mutate\n\t/workspace/pkg/instrumentation/podmutator.go:102\ngithub.com/open-telemetry/opentelemetry-operator/internal/webhookhandler.(*podSidecarInjector).Handle\n\t/workspace/internal/webhookhandler/webhookhandler.go:92\nsigs.k8s.io/controller-runtime/pkg/webhook/admission.(*Webhook).Handle\n\t/go/pkg/mod/sigs.k8s.io/controller-runtime@v0.13.0/pkg/webhook/admission/webhook.go:169\nsigs.k8s.io/controller-runtime/pkg/webhook/admission.(*Webhook).ServeHTTP\n\t/go/pkg/mod/sigs.k8s.io/controller-runtime@v0.13.0/pkg/webhook/admission/http.go:98\ngithub.com/prometheus/client_golang/prometheus/promhttp.InstrumentHandlerInFlight.func1\n\t/go/pkg/mod/github.com/prometheus/client_golang@v1.12.2/prometheus/promhttp/instrument_server.go:40\nnet/http.HandlerFunc.ServeHTTP\n\t/usr/local/go/src/net/http/server.go:2109\ngithub.com/prometheus/client_golang/prometheus/promhttp.InstrumentHandlerCounter.func1\n\t/go/pkg/mod/github.com/prometheus/client_golang@v1.12.2/prometheus/promhttp/instrument_server.go:117\nnet/http.HandlerFunc.ServeHTTP\n\t/usr/local/go/src/net/http/server.go:2109\ngithub.com/prometheus/client_golang/prometheus/promhttp.InstrumentHandlerDuration.func2\n\t/go/pkg/mod/github.com/prometheus/client_golang@v1.12.2/prometheus/promhttp/instrument_server.go:84\nnet/http.HandlerFunc.ServeHTTP\n\t/usr/local/go/src/net/http/server.go:2109\nnet/http.(*ServeMux).ServeHTTP\n\t/usr/local/go/src/net/http/server.go:2487\nnet/http.serverHandler.ServeHTTP\n\t/usr/local/go/src/net/http/server.go:2947\nnet/http.(*conn).serve\n\t/usr/local/go/src/net/http/server.go:1991"}
I believe this is something to improve in the upstream.
There was a problem hiding this comment.
Hm, but what if you don't want instrumentation at all? I think we used to have a setting to disable default instrumentation.
There was a problem hiding this comment.
You're getting instrumentation out of the box. It's just a matter of creation of Instrumentation resource in the specific namespace.
# Conflicts: # CHANGELOG.md
swiatekm
approved these changes
Oct 18, 2022
|
The backport to To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release-v2 release-v2
# Navigate to the new working tree
cd .worktrees/backport-release-v2
# Create a new branch
git switch --create backport-2561-to-release-v2
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 d4d75994a1c31f9daabca8b25281b81ca9a301f8
# Push it to GitHub
git push --set-upstream origin backport-2561-to-release-v2
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release-v2Then, create a pull request where the |
mat-rumian
added a commit
that referenced
this pull request
Oct 19, 2022
…t to 0.13.0 (#2561) * chore(chart): update version * chore(tls): remove certificate creation, supported by operator chart * chore(clusterole): add opentelemetry-operator api group * chore(instrumentation): add instrumentation configmap and job * chore(instrumentatio-cr): move instrumentation cr to confs * chore(tests): update tests * chore(opentelemetry-operator): split instrumentation resource creation * chore(readme): update parameters list (cherry picked from commit d4d7599)
1 task
mat-rumian
added a commit
that referenced
this pull request
Oct 20, 2022
#2577) * chore(opentelemetry-operator): upgrade opentelemetry-operator subchart to 0.13.0 (#2561) * chore(tls): remove certificate creation, supported by operator chart * chore(clusterole): add opentelemetry-operator api group * chore(instrumentation): add instrumentation configmap and job * chore(instrumentatio-cr): move instrumentation cr to confs * chore(tests): update tests * chore(opentelemetry-operator): split instrumentation resource creation * chore(readme): update parameters list (cherry picked from commit d4d7599) * docs(changelog): update
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR:
InstrumentationCR generation to confs (config map created for this purpose)Instrumentationresource -opentelemetry-operator.createDefaultInstrumentation=falseopentelemetry-operator.instrumentationNamespacesparameter forInstrumentationresource creationChecklist
Testing performed