Skip to content

Commit df90ea8

Browse files
committed
Fix issue after israel
Signed-off-by: Pavol Loffay <[email protected]>
1 parent 96e8181 commit df90ea8

6 files changed

+10
-25
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ release-artifacts: set-image-controller
172172
# Generate manifests e.g. CRD, RBAC etc.
173173
.PHONY: manifests
174174
manifests: controller-gen
175-
$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=$(MANIFEST_DIR)
175+
$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=config/crd/bases
176176

177177
# Run tests
178178
# setup-envtest uses KUBEBUILDER_ASSETS which points to a directory with binaries (api-server, etcd and kubectl)

bundle/manifests/opentelemetry.io_instrumentations.yaml

-7
Original file line numberDiff line numberDiff line change
@@ -566,18 +566,11 @@ spec:
566566
type: object
567567
type: array
568568
extensions:
569-
description: |-
570-
Extensions defines java specific extensions.
571-
All extensions are copied to a single directory; if a JAR with the same name exists, it will be overwritten.
572569
items:
573570
properties:
574571
dir:
575-
description: Dir is a directory with extensions auto-instrumentation
576-
JAR.
577572
type: string
578573
image:
579-
description: Image is a container image with extensions
580-
auto-instrumentation JAR.
581574
type: string
582575
required:
583576
- dir

bundle/manifests/opentelemetry.io_opentelemetrycollectors.yaml

+3-5
Original file line numberDiff line numberDiff line change
@@ -1252,9 +1252,6 @@ spec:
12521252
type: integer
12531253
type: object
12541254
config:
1255-
description: Config is the raw YAML to be used as the collector's
1256-
configuration. Refer to the OpenTelemetry Collector documentation
1257-
for details.
12581255
type: string
12591256
configmaps:
12601257
items:
@@ -2318,8 +2315,6 @@ spec:
23182315
appProtocol:
23192316
type: string
23202317
hostPort:
2321-
description: Allows defining which port to bind to the host
2322-
in the Container.
23232318
format: int32
23242319
type: integer
23252320
name:
@@ -6614,6 +6609,9 @@ spec:
66146609
properties:
66156610
appProtocol:
66166611
type: string
6612+
hostPort:
6613+
format: int32
6614+
type: integer
66176615
name:
66186616
type: string
66196617
nodePort:

config/crd/bases/opentelemetry.io_instrumentations.yaml

-7
Original file line numberDiff line numberDiff line change
@@ -564,18 +564,11 @@ spec:
564564
type: object
565565
type: array
566566
extensions:
567-
description: |-
568-
Extensions defines java specific extensions.
569-
All extensions are copied to a single directory; if a JAR with the same name exists, it will be overwritten.
570567
items:
571568
properties:
572569
dir:
573-
description: Dir is a directory with extensions auto-instrumentation
574-
JAR.
575570
type: string
576571
image:
577-
description: Image is a container image with extensions
578-
auto-instrumentation JAR.
579572
type: string
580573
required:
581574
- dir

config/crd/bases/opentelemetry.io_opentelemetrycollectors.yaml

+3-5
Original file line numberDiff line numberDiff line change
@@ -1238,9 +1238,6 @@ spec:
12381238
type: integer
12391239
type: object
12401240
config:
1241-
description: Config is the raw YAML to be used as the collector's
1242-
configuration. Refer to the OpenTelemetry Collector documentation
1243-
for details.
12441241
type: string
12451242
configmaps:
12461243
items:
@@ -2304,8 +2301,6 @@ spec:
23042301
appProtocol:
23052302
type: string
23062303
hostPort:
2307-
description: Allows defining which port to bind to the host
2308-
in the Container.
23092304
format: int32
23102305
type: integer
23112306
name:
@@ -6600,6 +6595,9 @@ spec:
66006595
properties:
66016596
appProtocol:
66026597
type: string
6598+
hostPort:
6599+
format: int32
6600+
type: integer
66036601
name:
66046602
type: string
66056603
nodePort:

config/crd/bases/opentelemetry.io_targetallocators.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -2199,6 +2199,9 @@ spec:
21992199
properties:
22002200
appProtocol:
22012201
type: string
2202+
hostPort:
2203+
format: int32
2204+
type: integer
22022205
name:
22032206
type: string
22042207
nodePort:

0 commit comments

Comments
 (0)