Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge main into 8.16 branch #49

Merged
merged 29 commits into from
Nov 8, 2024
Merged
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
1bcac09
k8s-otel: cert-manager integration information added
eedugon Oct 30, 2024
fe94118
initial paragraphs order switched
eedugon Oct 30, 2024
90d34e8
code block indentation fixed
eedugon Oct 30, 2024
cb3d8c1
small structure changes to the cert-manager procedure
eedugon Oct 30, 2024
a84141d
small structure changes to the cert-manager procedure
eedugon Oct 30, 2024
8287195
small structure changes to the cert-manager procedure
eedugon Oct 30, 2024
3cdf173
small structure changes to the cert-manager procedure
eedugon Oct 30, 2024
236ae9e
Update docs/kubernetes/operator/README.md
eedugon Oct 31, 2024
a3d84b2
Update docs/kubernetes/operator/README.md
eedugon Oct 31, 2024
8ecb41b
Update docs/kubernetes/operator/README.md
eedugon Oct 31, 2024
788780e
Update docs/kubernetes/operator/README.md
eedugon Oct 31, 2024
32e1ba6
Update docs/kubernetes/operator/README.md
eedugon Oct 31, 2024
b125471
Update docs/kubernetes/operator/README.md
eedugon Oct 31, 2024
ed1aaee
Update docs/kubernetes/operator/README.md
eedugon Oct 31, 2024
cfb33d5
Update docs/kubernetes/operator/README.md
eedugon Oct 31, 2024
5f227bb
Update docs/kubernetes/operator/README.md
eedugon Oct 31, 2024
a17b581
Update docs/kubernetes/operator/README.md
eedugon Oct 31, 2024
9e517ce
Update docs/kubernetes/operator/README.md
eedugon Oct 31, 2024
a77ec74
Update docs/kubernetes/operator/README.md
eedugon Oct 31, 2024
9b5fed2
Update docs/kubernetes/operator/README.md
eedugon Oct 31, 2024
6497c7b
Update docs/kubernetes/operator/README.md
eedugon Oct 31, 2024
a3b2dd3
Update docs/kubernetes/operator/README.md
eedugon Nov 4, 2024
2d4a042
onboarding introduction change
eedugon Nov 5, 2024
ac9b5d7
Merge pull request #41 from eedugon/cert_manager_instructions
eedugon Nov 5, 2024
6859bb0
split k8sattributes/ecs processor: do not add any extra metadata
tetianakravchenko Nov 6, 2024
bb27128
add back name metadata
tetianakravchenko Nov 6, 2024
a79624b
Merge pull request #46 from tetianakravchenko/ecs-remove-extra-k8satt…
tetianakravchenko Nov 6, 2024
5206785
autoGenerateCert indented within admissionWebhooks
eedugon Nov 7, 2024
2277ed0
Merge pull request #48 from eedugon/values_cert_indent
eedugon Nov 7, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update docs/kubernetes/operator/README.md
Co-authored-by: Mike Birnstiehl <114418652+mdbirnstiehl@users.noreply.github.com>
  • Loading branch information
eedugon and mdbirnstiehl authored Oct 31, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 9e517cef5733c1281a91c259b4412de5b76331bf
2 changes: 1 addition & 1 deletion docs/kubernetes/operator/README.md
Original file line number Diff line number Diff line change
@@ -192,7 +192,7 @@ Integrating the operator with [cert-manager](https://cert-manager.io/) enables a

Follow any of the following options to install the OpenTelemetry Operator Helm Chart integrated with `cert-manager`:

* Directly adding to the installation command the options `--set opentelemetry-operator.admissionWebhooks.certManager.enabled=true --set opentelemetry-operator.autoGenerateCert=null`, like:
* Directly add these options to the installation command `--set opentelemetry-operator.admissionWebhooks.certManager.enabled=true --set opentelemetry-operator.autoGenerateCert=null`. For example:

```bash
helm upgrade --install --namespace opentelemetry-operator-system opentelemetry-kube-stack open-telemetry/opentelemetry-kube-stack \