Skip to content

Commit 115c0ca

Browse files
shoaebjindaniShoaeb Jindani
and
Shoaeb Jindani
authored
Removed DIND References from api (#180)
Signed-off-by: Shoaeb Jindani <[email protected]> Co-authored-by: Shoaeb Jindani <[email protected]>
1 parent 9eae269 commit 115c0ca

File tree

3 files changed

+0
-62
lines changed

3 files changed

+0
-62
lines changed

api/v1beta1/ibppeer_types.go

-29
Original file line numberDiff line numberDiff line change
@@ -136,11 +136,6 @@ type IBPPeerSpec struct {
136136
// +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true
137137
Zone string `json:"zone,omitempty"`
138138

139-
/* advanced configs */
140-
// DindArgs (Optional) is used to override args passed to dind container
141-
// +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true
142-
DindArgs []string `json:"dindArgs,omitempty"`
143-
144139
// Action (Optional) is object for peer actions
145140
// +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true
146141
Action PeerAction `json:"action,omitempty"`
@@ -221,14 +216,6 @@ type PeerResources struct {
221216
// +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true
222217
GRPCProxy *corev1.ResourceRequirements `json:"proxy,omitempty"`
223218

224-
// FluentD (Optional) is the resources provided to the fluentd container
225-
// +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true
226-
FluentD *corev1.ResourceRequirements `json:"fluentd,omitempty"`
227-
228-
// DinD (Optional) is the resources provided to the dind container
229-
// +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true
230-
DinD *corev1.ResourceRequirements `json:"dind,omitempty"`
231-
232219
// CouchDB (Optional) is the resources provided to the couchdb container
233220
// +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true
234221
CouchDB *corev1.ResourceRequirements `json:"couchdb,omitempty"`
@@ -278,14 +265,6 @@ type PeerImages struct {
278265
// +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true
279266
PeerTag string `json:"peerTag,omitempty"`
280267

281-
// DindImage is the name of the dind image
282-
// +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true
283-
DindImage string `json:"dindImage,omitempty"`
284-
285-
// DindTag is the tag of the dind image
286-
// +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true
287-
DindTag string `json:"dindTag,omitempty"`
288-
289268
// GRPCWebImage is the name of the grpc web proxy image
290269
// +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true
291270
GRPCWebImage string `json:"grpcwebImage,omitempty"`
@@ -294,14 +273,6 @@ type PeerImages struct {
294273
// +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true
295274
GRPCWebTag string `json:"grpcwebTag,omitempty"`
296275

297-
// FluentdImage is the name of the fluentd logger image
298-
// +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true
299-
FluentdImage string `json:"fluentdImage,omitempty"`
300-
301-
// FluentdTag is the tag of the fluentd logger image
302-
// +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true
303-
FluentdTag string `json:"fluentdTag,omitempty"`
304-
305276
// CouchDBImage is the name of the couchdb image
306277
// +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true
307278
CouchDBImage string `json:"couchdbImage,omitempty"`

api/v1beta1/zz_generated.deepcopy.go

-15
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/apis/deployer/deployer.go

-18
Original file line numberDiff line numberDiff line change
@@ -126,15 +126,6 @@ type PeerImages struct {
126126
// PeerDigest is the digest tag of the peer image
127127
PeerDigest string `json:"peerDigest,omitempty"`
128128

129-
// DindImage is the name of the dind image
130-
DindImage string `json:"dindImage,omitempty"`
131-
132-
// DindTag is the tag of the dind image
133-
DindTag string `json:"dindTag,omitempty"`
134-
135-
// DindDigest is the digest tag of the dind image
136-
DindDigest string `json:"dindDigest,omitempty"`
137-
138129
// GRPCWebImage is the name of the grpc web proxy image
139130
GRPCWebImage string `json:"grpcwebImage,omitempty"`
140131

@@ -144,15 +135,6 @@ type PeerImages struct {
144135
// GRPCWebDigest is the digest tag of the grpc web proxy image
145136
GRPCWebDigest string `json:"grpcwebDigest,omitempty"`
146137

147-
// FluentdImage is the name of the fluentd logger image
148-
FluentdImage string `json:"fluentdImage,omitempty"`
149-
150-
// FluentdTag is the tag of the fluentd logger image
151-
FluentdTag string `json:"fluentdTag,omitempty"`
152-
153-
// FluentdDigest is the digest tag of the fluentd logger image
154-
FluentdDigest string `json:"fluentdDigest,omitempty"`
155-
156138
// CouchDBImage is the name of the couchdb image
157139
CouchDBImage string `json:"couchdbImage,omitempty"`
158140

0 commit comments

Comments
 (0)