Skip to content

Commit

Permalink
Jaeger Collector Config: Lifecycle and `TerminationGracePeriodSecon…
Browse files Browse the repository at this point in the history 
…ds` (jaegertracing#2242)

* feat: add Lifecycle and TerminationGracePeriodSeconds to collector

Signed-off-by: Taj Pereira <[email protected]>

* fix: ran make install-tools ci

Signed-off-by: Taj Pereira <[email protected]>

---------

Signed-off-by: Taj Pereira <[email protected]>
Co-authored-by: Ben B <[email protected]>
  • Loading branch information
@taj-p @frzifus
taj-p and frzifus authored Jun 26, 2023
1 parent 9021b0e commit 8230334
Show file tree
Hide file tree
Showing 8 changed files with 699 additions and 9 deletions.
6 changes: 6 additions & 0 deletions apis/v1/jaeger_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -466,6 +466,12 @@ type JaegerCollectorSpec struct {
// +optional
// +nullable
NodeSelector map[string]string `json:"nodeSelector,omitempty"`

// +optional
Lifecycle *v1.Lifecycle `json:"lifecycle,omitempty"`

// +optional
TerminationGracePeriodSeconds *int64 `json:"terminationGracePeriodSeconds,omitempty"`
}

// JaegerIngesterSpec defines the options to be used when deploying the ingester
Expand Down
10 changes: 10 additions & 0 deletions apis/v1/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/jaeger-operator.clusterserviceversion.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ metadata:
categories: Logging & Tracing
certified: "false"
containerImage: quay.io/jaegertracing/jaeger-operator
createdAt: "2023-06-07T14:51:27Z"
createdAt: "2023-06-21T21:07:23Z"
description: Provides tracing, monitoring and troubleshooting for microservices-based
distributed systems
operators.openshift.io/infrastructure-features: '["disconnected"]'
Expand Down
106 changes: 106 additions & 0 deletions bundle/manifests/jaegertracing.io_jaegers.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3773,6 +3773,109 @@ spec:
additionalProperties:
type: string
type: object
lifecycle:
properties:
postStart:
properties:
exec:
properties:
command:
items:
type: string
type: array
type: object
httpGet:
properties:
host:
type: string
httpHeaders:
items:
properties:
name:
type: string
value:
type: string
required:
- name
- value
type: object
type: array
path:
type: string
port:
anyOf:
- type: integer
- type: string
x-kubernetes-int-or-string: true
scheme:
type: string
required:
- port
type: object
tcpSocket:
properties:
host:
type: string
port:
anyOf:
- type: integer
- type: string
x-kubernetes-int-or-string: true
required:
- port
type: object
type: object
preStop:
properties:
exec:
properties:
command:
items:
type: string
type: array
type: object
httpGet:
properties:
host:
type: string
httpHeaders:
items:
properties:
name:
type: string
value:
type: string
required:
- name
- value
type: object
type: array
path:
type: string
port:
anyOf:
- type: integer
- type: string
x-kubernetes-int-or-string: true
scheme:
type: string
required:
- port
type: object
tcpSocket:
properties:
host:
type: string
port:
anyOf:
- type: integer
- type: string
x-kubernetes-int-or-string: true
required:
- port
type: object
type: object
type: object
livenessProbe:
properties:
exec:
Expand Down Expand Up @@ -3988,6 +4091,9 @@ spec:
type:
type: string
type: object
terminationGracePeriodSeconds:
format: int64
type: integer
tolerations:
items:
properties:
Expand Down
106 changes: 106 additions & 0 deletions config/crd/bases/jaegertracing.io_jaegers.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3771,6 +3771,109 @@ spec:
additionalProperties:
type: string
type: object
lifecycle:
properties:
postStart:
properties:
exec:
properties:
command:
items:
type: string
type: array
type: object
httpGet:
properties:
host:
type: string
httpHeaders:
items:
properties:
name:
type: string
value:
type: string
required:
- name
- value
type: object
type: array
path:
type: string
port:
anyOf:
- type: integer
- type: string
x-kubernetes-int-or-string: true
scheme:
type: string
required:
- port
type: object
tcpSocket:
properties:
host:
type: string
port:
anyOf:
- type: integer
- type: string
x-kubernetes-int-or-string: true
required:
- port
type: object
type: object
preStop:
properties:
exec:
properties:
command:
items:
type: string
type: array
type: object
httpGet:
properties:
host:
type: string
httpHeaders:
items:
properties:
name:
type: string
value:
type: string
required:
- name
- value
type: object
type: array
path:
type: string
port:
anyOf:
- type: integer
- type: string
x-kubernetes-int-or-string: true
scheme:
type: string
required:
- port
type: object
tcpSocket:
properties:
host:
type: string
port:
anyOf:
- type: integer
- type: string
x-kubernetes-int-or-string: true
required:
- port
type: object
type: object
type: object
livenessProbe:
properties:
exec:
Expand Down Expand Up @@ -3986,6 +4089,9 @@ spec:
type:
type: string
type: object
terminationGracePeriodSeconds:
format: int64
type: integer
tolerations:
items:
properties:
Expand Down
Loading

0 comments on commit 8230334

Please sign in to comment.