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

Add image pull secrets to Jaeger resources #1103

Closed
wants to merge 8 commits into from
Closed

Add image pull secrets to Jaeger resources #1103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5238312
added imagePullSecret field in jaeger CRD
Jun 25, 2020
ecbffad
added imagePullSecrets to deployment/pod specs
Jun 25, 2020
9238f97
added necessary listType to imagePullSecrets in api
Jun 26, 2020
cbe0254
run code generation
Jun 26, 2020
33035f2
added unit tests for imagePullSecrets
Jun 26, 2020
98a61b4
only use agent spec for sidecar image pull secrets
Jul 3, 2020
c92f31b
Merge branch 'master' into add-imagePullSecrets
Jul 3, 2020
36bd00c
run code generation
Jul 3, 2020
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
77 changes: 77 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 @@ -582,6 +582,13 @@ spec:
type: object
image:
type: string
imagePullSecrets:
items:
properties:
name:
type: string
type: object
type: array
labels:
additionalProperties:
type: string
Expand Down Expand Up @@ -1546,6 +1553,13 @@ spec:
type: object
image:
type: string
imagePullSecrets:
items:
properties:
name:
type: string
type: object
type: array
labels:
additionalProperties:
type: string
Expand Down Expand Up @@ -2515,6 +2529,13 @@ spec:
type: object
image:
type: string
imagePullSecrets:
items:
properties:
name:
type: string
type: object
type: array
labels:
additionalProperties:
type: string
Expand Down Expand Up @@ -3213,6 +3234,13 @@ spec:
type: object
type: array
type: object
imagePullSecrets:
items:
properties:
name:
type: string
type: object
type: array
ingester:
properties:
affinity:
Expand Down Expand Up @@ -3488,6 +3516,13 @@ spec:
type: object
image:
type: string
imagePullSecrets:
items:
properties:
name:
type: string
type: object
type: array
labels:
additionalProperties:
type: string
Expand Down Expand Up @@ -4461,6 +4496,13 @@ spec:
items:
type: string
type: array
imagePullSecrets:
items:
properties:
name:
type: string
type: object
type: array
labels:
additionalProperties:
type: string
Expand Down Expand Up @@ -5451,6 +5493,13 @@ spec:
type: object
image:
type: string
imagePullSecrets:
items:
properties:
name:
type: string
type: object
type: array
labels:
additionalProperties:
type: string
Expand Down Expand Up @@ -6223,6 +6272,13 @@ spec:
type: boolean
image:
type: string
imagePullSecrets:
items:
properties:
name:
type: string
type: object
type: array
mode:
type: string
timeout:
Expand Down Expand Up @@ -6512,6 +6568,13 @@ spec:
type: boolean
image:
type: string
imagePullSecrets:
items:
properties:
name:
type: string
type: object
type: array
javaOpts:
type: string
labels:
Expand Down Expand Up @@ -7516,6 +7579,13 @@ spec:
type: boolean
image:
type: string
imagePullSecrets:
items:
properties:
name:
type: string
type: object
type: array
labels:
additionalProperties:
type: string
Expand Down Expand Up @@ -8486,6 +8556,13 @@ spec:
type: string
image:
type: string
imagePullSecrets:
items:
properties:
name:
type: string
type: object
type: array
labels:
additionalProperties:
type: string
Expand Down
8 changes: 8 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 @@ -183,6 +183,10 @@ type JaegerCommonSpec struct {

// +optional
ServiceAccount string `json:"serviceAccount,omitempty"`

// +optional
// +listType=set
ImagePullSecrets []v1.LocalObjectReference `json:"imagePullSecrets,omitempty"`
}

// JaegerQuerySpec defines the options to be used when deploying the query
Expand Down Expand Up @@ -439,6 +443,10 @@ type JaegerCassandraCreateSchemaSpec struct {

// Datacenter is a collection of racks in the cassandra topology.
// defaults to "test"
// +optional
// +listType=set
ImagePullSecrets []v1.LocalObjectReference `json:"imagePullSecrets,omitempty"`

// +optional
Datacenter string `json:"datacenter,omitempty"`

Expand Down
10 changes: 10 additions & 0 deletions pkg/apis/jaegertracing/v1/zz_generated.deepcopy.go
View file
Open in desktop

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

Loading