From 115c0cab04c40db4020d64105f0069062f8646ea Mon Sep 17 00:00:00 2001 From: shoaebjindani <40020259+shoaebjindani@users.noreply.github.com> Date: Thu, 21 Mar 2024 22:23:23 +0530 Subject: [PATCH] Removed DIND References from api (#180) Signed-off-by: Shoaeb Jindani Co-authored-by: Shoaeb Jindani --- api/v1beta1/ibppeer_types.go | 29 ---------------------------- api/v1beta1/zz_generated.deepcopy.go | 15 -------------- pkg/apis/deployer/deployer.go | 18 ----------------- 3 files changed, 62 deletions(-) diff --git a/api/v1beta1/ibppeer_types.go b/api/v1beta1/ibppeer_types.go index 5d78508f..c5254f58 100644 --- a/api/v1beta1/ibppeer_types.go +++ b/api/v1beta1/ibppeer_types.go @@ -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"` @@ -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"` @@ -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"` @@ -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"` diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go index 7a28711a..e481df13 100644 --- a/api/v1beta1/zz_generated.deepcopy.go +++ b/api/v1beta1/zz_generated.deepcopy.go @@ -1251,11 +1251,6 @@ func (in *IBPPeerSpec) DeepCopyInto(out *IBPPeerSpec) { *out = make([]string, len(*in)) copy(*out, *in) } - if in.DindArgs != nil { - in, out := &in.DindArgs, &out.DindArgs - *out = make([]string, len(*in)) - copy(*out, *in) - } out.Action = in.Action if in.ChaincodeBuilderConfig != nil { in, out := &in.ChaincodeBuilderConfig, &out.ChaincodeBuilderConfig @@ -1743,16 +1738,6 @@ func (in *PeerResources) DeepCopyInto(out *PeerResources) { *out = new(v1.ResourceRequirements) (*in).DeepCopyInto(*out) } - if in.FluentD != nil { - in, out := &in.FluentD, &out.FluentD - *out = new(v1.ResourceRequirements) - (*in).DeepCopyInto(*out) - } - if in.DinD != nil { - in, out := &in.DinD, &out.DinD - *out = new(v1.ResourceRequirements) - (*in).DeepCopyInto(*out) - } if in.CouchDB != nil { in, out := &in.CouchDB, &out.CouchDB *out = new(v1.ResourceRequirements) diff --git a/pkg/apis/deployer/deployer.go b/pkg/apis/deployer/deployer.go index 78747229..791357dd 100644 --- a/pkg/apis/deployer/deployer.go +++ b/pkg/apis/deployer/deployer.go @@ -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"` @@ -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"`