Skip to content

Removed DIND References from api #180

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.

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

Merged
merged 2 commits into from
Mar 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
29 changes: 0 additions & 29 deletions api/v1beta1/ibppeer_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -136,11 +136,6 @@ type IBPPeerSpec struct {
// +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true
Zone string `json:"zone,omitempty"`

/* advanced configs */
// DindArgs (Optional) is used to override args passed to dind container
// +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true
DindArgs []string `json:"dindArgs,omitempty"`

// Action (Optional) is object for peer actions
// +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true
Action PeerAction `json:"action,omitempty"`
Expand Down Expand Up @@ -221,14 +216,6 @@ type PeerResources struct {
// +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true
GRPCProxy *corev1.ResourceRequirements `json:"proxy,omitempty"`

// FluentD (Optional) is the resources provided to the fluentd container
// +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true
FluentD *corev1.ResourceRequirements `json:"fluentd,omitempty"`

// DinD (Optional) is the resources provided to the dind container
// +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true
DinD *corev1.ResourceRequirements `json:"dind,omitempty"`

// CouchDB (Optional) is the resources provided to the couchdb container
// +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true
CouchDB *corev1.ResourceRequirements `json:"couchdb,omitempty"`
Expand Down Expand Up @@ -278,14 +265,6 @@ type PeerImages struct {
// +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true
PeerTag string `json:"peerTag,omitempty"`

// DindImage is the name of the dind image
// +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true
DindImage string `json:"dindImage,omitempty"`

// DindTag is the tag of the dind image
// +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true
DindTag string `json:"dindTag,omitempty"`

// GRPCWebImage is the name of the grpc web proxy image
// +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true
GRPCWebImage string `json:"grpcwebImage,omitempty"`
Expand All @@ -294,14 +273,6 @@ type PeerImages struct {
// +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true
GRPCWebTag string `json:"grpcwebTag,omitempty"`

// FluentdImage is the name of the fluentd logger image
// +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true
FluentdImage string `json:"fluentdImage,omitempty"`

// FluentdTag is the tag of the fluentd logger image
// +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true
FluentdTag string `json:"fluentdTag,omitempty"`

// CouchDBImage is the name of the couchdb image
// +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true
CouchDBImage string `json:"couchdbImage,omitempty"`
Expand Down
15 changes: 0 additions & 15 deletions api/v1beta1/zz_generated.deepcopy.go

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

18 changes: 0 additions & 18 deletions pkg/apis/deployer/deployer.go
Original file line number Diff line number Diff line change
Expand Up @@ -126,15 +126,6 @@ type PeerImages struct {
// PeerDigest is the digest tag of the peer image
PeerDigest string `json:"peerDigest,omitempty"`

// DindImage is the name of the dind image
DindImage string `json:"dindImage,omitempty"`

// DindTag is the tag of the dind image
DindTag string `json:"dindTag,omitempty"`

// DindDigest is the digest tag of the dind image
DindDigest string `json:"dindDigest,omitempty"`

// GRPCWebImage is the name of the grpc web proxy image
GRPCWebImage string `json:"grpcwebImage,omitempty"`

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

// FluentdImage is the name of the fluentd logger image
FluentdImage string `json:"fluentdImage,omitempty"`

// FluentdTag is the tag of the fluentd logger image
FluentdTag string `json:"fluentdTag,omitempty"`

// FluentdDigest is the digest tag of the fluentd logger image
FluentdDigest string `json:"fluentdDigest,omitempty"`

// CouchDBImage is the name of the couchdb image
CouchDBImage string `json:"couchdbImage,omitempty"`

Expand Down
Loading