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.

Sign up for GitHub

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

Marked specific fields as nullable to keep backwards compatibility #985

Merged
merged 1 commit into from
Mar 25, 2020
Merged

Marked specific fields as nullable to keep backwards compatibility #985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 21 additions & 0 deletions deploy/crds/jaegertracing.io_jaegers_crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,7 @@ spec:
type: object
type: object
agent:
nullable: true
properties:
affinity:
properties:
Expand Down Expand Up @@ -575,6 +576,7 @@ spec:
annotations:
additionalProperties:
type: string
nullable: true
type: object
image:
type: string
Expand All @@ -585,6 +587,7 @@ spec:
options:
type: object
resources:
nullable: true
properties:
limits:
additionalProperties:
Expand Down Expand Up @@ -1535,6 +1538,7 @@ spec:
annotations:
additionalProperties:
type: string
nullable: true
type: object
image:
type: string
Expand All @@ -1545,6 +1549,7 @@ spec:
options:
type: object
resources:
nullable: true
properties:
limits:
additionalProperties:
Expand Down Expand Up @@ -2229,6 +2234,7 @@ spec:
annotations:
additionalProperties:
type: string
nullable: true
type: object
collector:
properties:
Expand Down Expand Up @@ -2497,6 +2503,7 @@ spec:
annotations:
additionalProperties:
type: string
nullable: true
type: object
autoscale:
type: boolean
Expand All @@ -2518,6 +2525,7 @@ spec:
format: int32
type: integer
resources:
nullable: true
properties:
limits:
additionalProperties:
Expand Down Expand Up @@ -3466,6 +3474,7 @@ spec:
annotations:
additionalProperties:
type: string
nullable: true
type: object
image:
type: string
Expand All @@ -3479,6 +3488,7 @@ spec:
format: int32
type: integer
resources:
nullable: true
properties:
limits:
additionalProperties:
Expand Down Expand Up @@ -4427,6 +4437,7 @@ spec:
annotations:
additionalProperties:
type: string
nullable: true
type: object
enabled:
type: boolean
Expand All @@ -4452,6 +4463,7 @@ spec:
options:
type: object
resources:
nullable: true
properties:
limits:
additionalProperties:
Expand Down Expand Up @@ -5419,6 +5431,7 @@ spec:
annotations:
additionalProperties:
type: string
nullable: true
type: object
image:
type: string
Expand All @@ -5432,6 +5445,7 @@ spec:
format: int32
type: integer
resources:
nullable: true
properties:
limits:
additionalProperties:
Expand Down Expand Up @@ -6114,6 +6128,7 @@ spec:
type: array
type: object
resources:
nullable: true
properties:
limits:
additionalProperties:
Expand Down Expand Up @@ -6467,6 +6482,7 @@ spec:
annotations:
additionalProperties:
type: string
nullable: true
type: object
cassandraClientAuthEnabled:
type: boolean
Expand All @@ -6485,6 +6501,7 @@ spec:
type: string
type: object
resources:
nullable: true
properties:
limits:
additionalProperties:
Expand Down Expand Up @@ -7475,6 +7492,7 @@ spec:
annotations:
additionalProperties:
type: string
nullable: true
type: object
enabled:
type: boolean
Expand All @@ -7487,6 +7505,7 @@ spec:
numberOfDays:
type: integer
resources:
nullable: true
properties:
limits:
additionalProperties:
Expand Down Expand Up @@ -8443,6 +8462,7 @@ spec:
annotations:
additionalProperties:
type: string
nullable: true
type: object
conditions:
type: string
Expand All @@ -8455,6 +8475,7 @@ spec:
readTTL:
type: string
resources:
nullable: true
properties:
limits:
additionalProperties:
Expand Down
3 changes: 3 additions & 0 deletions pkg/apis/jaegertracing/v1/jaeger_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ type JaegerSpec struct {
Ingester JaegerIngesterSpec `json:"ingester,omitempty"`

// +optional
// +nullable
Agent JaegerAgentSpec `json:"agent,omitempty"`

// +optional
Expand Down Expand Up @@ -159,12 +160,14 @@ type JaegerCommonSpec struct {
// +listType=set
VolumeMounts []v1.VolumeMount `json:"volumeMounts,omitempty"`

// +nullable
// +optional
Annotations map[string]string `json:"annotations,omitempty"`

// +optional
Labels map[string]string `json:"labels,omitempty"`

// +nullable
// +optional
Resources v1.ResourceRequirements `json:"resources,omitempty"`

Expand Down