Skip to content

Commit

Permalink
api docs gen and code fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
@Duncan-tree-zhou
Duncan-tree-zhou committed Jan 20, 2022
1 parent b5e0cdf commit fa8eb3d
Show file tree
Hide file tree
Showing 7 changed files with 325 additions and 7 deletions.
2 changes: 1 addition & 1 deletion apis/v1alpha1/instrumentation_webhook.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const (
AnnotationDefaultAutoInstrumentationJava = "instrumentation.opentelemetry.io/default-auto-instrumentation-java-image"
AnnotationDefaultAutoInstrumentationNodeJS = "instrumentation.opentelemetry.io/default-auto-instrumentation-nodejs-image"
AnnotationDefaultAutoInstrumentationPython = "instrumentation.opentelemetry.io/default-auto-instrumentation-python-image"
CustomizedEnvPrefix = "OTEL_"
CustomizedEnvPrefix = "OTEL_"
)

// log is for logging in this package.
Expand Down
42 changes: 38 additions & 4 deletions apis/v1alpha1/zz_generated.deepcopy.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bundle/manifests/opentelemetry-operator.clusterserviceversion.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ spec:
- args:
- --metrics-addr=127.0.0.1:8080
- --enable-leader-election
image: ghcr.io/duncan/opentelemetry-operator/opentelemetry-operator:v0.42.0
image: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:v0.42.0
livenessProbe:
httpGet:
path: /healthz
Expand Down
60 changes: 60 additions & 0 deletions bundle/manifests/opentelemetry.io_instrumentations.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,21 @@ spec:
description: InstrumentationSpec defines the desired state of OpenTelemetry
SDK and instrumentation.
properties:
env:
description: Env defines customized environments.
items:
description: Env defines customized envs.
properties:
name:
description: Name defines environments name.
type: string
value:
description: Value defines environments value.
type: string
required:
- name
type: object
type: array
exporter:
description: Exporter defines exporter configuration.
properties:
Expand All @@ -52,6 +67,21 @@ spec:
java:
description: Java defines configuration for java auto-instrumentation.
properties:
env:
description: Env defines customized environments.
items:
description: Env defines customized envs.
properties:
name:
description: Name defines environments name.
type: string
value:
description: Value defines environments value.
type: string
required:
- name
type: object
type: array
image:
description: Image is a container image with javaagent auto-instrumentation
JAR.
Expand All @@ -60,6 +90,21 @@ spec:
nodejs:
description: NodeJS defines configuration for nodejs auto-instrumentation.
properties:
env:
description: Env defines customized environments.
items:
description: Env defines customized envs.
properties:
name:
description: Name defines environments name.
type: string
value:
description: Value defines environments value.
type: string
required:
- name
type: object
type: array
image:
description: Image is a container image with NodeJS SDK and auto-instrumentation.
type: string
Expand All @@ -83,6 +128,21 @@ spec:
python:
description: Python defines configuration for python auto-instrumentation.
properties:
env:
description: Env defines customized environments.
items:
description: Env defines customized envs.
properties:
name:
description: Name defines environments name.
type: string
value:
description: Value defines environments value.
type: string
required:
- name
type: object
type: array
image:
description: Image is a container image with Python SDK and auto-instrumentation.
type: string
Expand Down
60 changes: 60 additions & 0 deletions config/crd/bases/opentelemetry.io_instrumentations.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,21 @@ spec:
description: InstrumentationSpec defines the desired state of OpenTelemetry
SDK and instrumentation.
properties:
env:
description: Env defines customized environments.
items:
description: Env defines customized envs.
properties:
name:
description: Name defines environments name.
type: string
value:
description: Value defines environments value.
type: string
required:
- name
type: object
type: array
exporter:
description: Exporter defines exporter configuration.
properties:
Expand All @@ -54,6 +69,21 @@ spec:
java:
description: Java defines configuration for java auto-instrumentation.
properties:
env:
description: Env defines customized environments.
items:
description: Env defines customized envs.
properties:
name:
description: Name defines environments name.
type: string
value:
description: Value defines environments value.
type: string
required:
- name
type: object
type: array
image:
description: Image is a container image with javaagent auto-instrumentation
JAR.
Expand All @@ -62,6 +92,21 @@ spec:
nodejs:
description: NodeJS defines configuration for nodejs auto-instrumentation.
properties:
env:
description: Env defines customized environments.
items:
description: Env defines customized envs.
properties:
name:
description: Name defines environments name.
type: string
value:
description: Value defines environments value.
type: string
required:
- name
type: object
type: array
image:
description: Image is a container image with NodeJS SDK and auto-instrumentation.
type: string
Expand All @@ -85,6 +130,21 @@ spec:
python:
description: Python defines configuration for python auto-instrumentation.
properties:
env:
description: Env defines customized environments.
items:
description: Env defines customized envs.
properties:
name:
description: Name defines environments name.
type: string
value:
description: Value defines environments value.
type: string
required:
- name
type: object
type: array
image:
description: Image is a container image with Python SDK and auto-instrumentation.
type: string
Expand Down
2 changes: 1 addition & 1 deletion config/manager/kustomization.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ kind: Kustomization
images:
- name: controller
newName: ghcr.io/duncan/opentelemetry-operator/opentelemetry-operator
newTag: v0.42.0
newTag: v0.42.0-3-gb5e0cdf
Loading

0 comments on commit fa8eb3d

Please sign in to comment.