Skip to content

Commit

Permalink
Run make bundle
Browse files Browse the repository at this point in the history
Signed-off-by: Jake Utley <[email protected]>
  • Loading branch information
jutley committed Mar 25, 2022
1 parent 7a7d457 commit 9d369c7
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,11 @@ spec:
- args:
- --metrics-addr=127.0.0.1:8080
- --enable-leader-election
<<<<<<< HEAD
image: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.47.0
=======
image: ghcr.io/jutley/opentelemetry-operator/opentelemetry-operator:0.46.0-13-g4a3699a
>>>>>>> c426cd0 (Run make bundle)
livenessProbe:
httpGet:
path: /healthz
Expand Down Expand Up @@ -389,7 +393,11 @@ spec:
maturity: alpha
provider:
name: OpenTelemetry Community
<<<<<<< HEAD
version: 0.47.0
=======
version: 0.46.0-13-g4a3699a
>>>>>>> c426cd0 (Run make bundle)
webhookdefinitions:
- admissionReviewVersions:
- v1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,12 @@ spec:
- sidecar
- statefulset
type: string
nodeSelector:
additionalProperties:
type: string
description: NodeSelector to schedule OpenTelemetry Collector pods.
This is only relevant to daemonsets, statefulsets and deployments
type: object
podAnnotations:
additionalProperties:
type: string
Expand Down
8 changes: 7 additions & 1 deletion config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,2 +1,8 @@
resources:
- manager.yaml
- manager.yaml
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
images:
- name: controller
newName: ghcr.io/jutley/opentelemetry-operator/opentelemetry-operator
newTag: 0.46.0-13-g4a3699a

0 comments on commit 9d369c7

Please sign in to comment.