Removing Dind References From CodeBase (#172)

hyperledger-labs · Mar 21, 2024 · 6bd11be · 6bd11be
1 parent 23b15af
commit 6bd11be
Show file tree

Hide file tree

Showing 93 changed files with 1,441 additions and 2,548 deletions.
diff --git a/api/v1beta1/common.go b/api/v1beta1/common.go
@@ -34,7 +34,6 @@ const (
 	ORDERER    Component = "ORDERER"
 	PEER       Component = "PEER"
 	GRPCPROXY  Component = "GRPCPROXY"
-	DIND       Component = "DIND"
 	COUCHDB    Component = "COUCHDB"
 	CCLAUNCHER Component = "CCLAUNCHER"
 	ENROLLER   Component = "ENROLLER"

diff --git a/api/v1beta1/ibppeer.go b/api/v1beta1/ibppeer.go
@@ -211,10 +211,6 @@ func (s *IBPPeer) GetResource(comp Component) corev1.ResourceRequirements {
 			if s.Spec.Resources.GRPCProxy != nil {
 				return *s.Spec.Resources.GRPCProxy
 			}
-		case DIND:
-			if s.Spec.Resources.DinD != nil {
-				return *s.Spec.Resources.DinD
-			}
 		case COUCHDB:
 			if s.Spec.Resources.CouchDB != nil {
 				return *s.Spec.Resources.CouchDB
@@ -307,7 +303,6 @@ func (i *PeerImages) Override(requested *PeerImages, registryURL string, arch st
 	i.PeerInitImage = image.GetImage(registryURL, i.PeerInitImage, requested.PeerInitImage)
 	i.PeerImage = image.GetImage(registryURL, i.PeerImage, requested.PeerImage)
 	i.CouchDBImage = image.GetImage(registryURL, i.CouchDBImage, requested.CouchDBImage)
-	i.DindImage = image.GetImage(registryURL, i.DindImage, requested.DindImage)
 	i.GRPCWebImage = image.GetImage(registryURL, i.GRPCWebImage, requested.GRPCWebImage)
 	i.CCLauncherImage = image.GetImage(registryURL, i.CCLauncherImage, requested.CCLauncherImage)
 	i.FileTransferImage = image.GetImage(registryURL, i.FileTransferImage, requested.FileTransferImage)
@@ -322,7 +317,6 @@ func (i *PeerImages) Override(requested *PeerImages, registryURL string, arch st
 	i.PeerInitTag = image.GetTag(arch, i.PeerInitTag, requested.PeerInitTag)
 	i.PeerTag = image.GetTag(arch, i.PeerTag, requested.PeerTag)
 	i.CouchDBTag = image.GetTag(arch, i.CouchDBTag, requested.CouchDBTag)
-	i.DindTag = image.GetTag(arch, i.DindTag, requested.DindTag)
 	i.GRPCWebTag = image.GetTag(arch, i.GRPCWebTag, requested.GRPCWebTag)
 	i.CCLauncherTag = image.GetTag(arch, i.CCLauncherTag, requested.CCLauncherTag)
 	i.FileTransferTag = image.GetTag(arch, i.FileTransferTag, requested.FileTransferTag)

diff --git 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,10 +216,6 @@ type PeerResources struct {
 	// +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true
 	GRPCProxy *corev1.ResourceRequirements `json:"proxy,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"`
@@ -274,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"`

diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go
diff --git a/bundle/manifests/fabric-opensource-operator.clusterserviceversion.yaml b/bundle/manifests/fabric-opensource-operator.clusterserviceversion.yaml
@@ -613,12 +613,6 @@ spec:
       - description: CouchDBTag is the tag of the couchdb image
         displayName: Couch DBTag
         path: versions.peer.image.couchdbTag
-      - description: DindImage is the name of the dind image
-        displayName: Dind Image
-        path: versions.peer.image.dindImage
-      - description: DindTag is the tag of the dind image
-        displayName: Dind Tag
-        path: versions.peer.image.dindTag
       - description: EnrollerImage is the name of the init image for crypto generation
         displayName: Enroller Image
         path: versions.peer.image.enrollerImage
@@ -1305,10 +1299,6 @@ spec:
       - description: StateDB is the pvc to be used as statedb's storage
         displayName: State DB
         path: customNames.pvc.statedb
-      - description: advanced configs DindArgs (Optional) is used to override args
-          passed to dind container
-        displayName: Dind Args
-        path: dindArgs
       - description: DisableNodeOU (Optional) is used to switch nodeou on and off
         displayName: Disable Node OU
         path: disablenodeou
@@ -1347,12 +1337,6 @@ spec:
       - description: CouchDBTag is the tag of the couchdb image
         displayName: Couch DBTag
         path: images.couchdbTag
-      - description: DindImage is the name of the dind image
-        displayName: Dind Image
-        path: images.dindImage
-      - description: DindTag is the tag of the dind image
-        displayName: Dind Tag
-        path: images.dindTag
       - description: EnrollerImage is the name of the init image for crypto generation
         displayName: Enroller Image
         path: images.enrollerImage
@@ -1470,11 +1454,6 @@ spec:
         path: resources.couchdb
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:resourceRequirements
-      - description: DinD (Optional) is the resources provided to the dind container
-        displayName: Din D
-        path: resources.dind
-        x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:resourceRequirements
       - description: Enroller (Optional) is the resources provided to the enroller
           container
         displayName: Enroller

diff --git a/bundle/manifests/ibp.com_ibpconsoles.yaml b/bundle/manifests/ibp.com_ibpconsoles.yaml
@@ -635,12 +635,6 @@ spec:
                             couchdbTag:
                               description: CouchDBTag is the tag of the couchdb image
                               type: string
-                            dindImage:
-                              description: DindImage is the name of the dind image
-                              type: string
-                            dindTag:
-                              description: DindTag is the tag of the dind image
-                              type: string
                             enrollerImage:
                               description: EnrollerImage is the name of the init image
                                 for crypto generation

diff --git a/bundle/manifests/ibp.com_ibppeers.yaml b/bundle/manifests/ibp.com_ibppeers.yaml
@@ -111,12 +111,6 @@ spec:
                         type: string
                     type: object
                 type: object
-              dindArgs:
-                description: advanced configs DindArgs (Optional) is used to override
-                  args passed to dind container
-                items:
-                  type: string
-                type: array
               disablenodeou:
                 description: DisableNodeOU (Optional) is used to switch nodeou on
                   and off
@@ -162,12 +156,6 @@ spec:
                   couchdbTag:
                     description: CouchDBTag is the tag of the couchdb image
                     type: string
-                  dindImage:
-                    description: DindImage is the name of the dind image
-                    type: string
-                  dindTag:
-                    description: DindTag is the tag of the dind image
-                    type: string
                   enrollerImage:
                     description: EnrollerImage is the name of the init image for crypto
                       generation
@@ -333,33 +321,6 @@ spec:
                           to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
                         type: object
                     type: object
-                  dind:
-                    description: DinD (Optional) is the resources provided to the
-                      dind container
-                    properties:
-                      limits:
-                        additionalProperties:
-                          anyOf:
-                          - type: integer
-                          - type: string
-                          pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                          x-kubernetes-int-or-string: true
-                        description: 'Limits describes the maximum amount of compute
-                          resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
-                        type: object
-                      requests:
-                        additionalProperties:
-                          anyOf:
-                          - type: integer
-                          - type: string
-                          pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                          x-kubernetes-int-or-string: true
-                        description: 'Requests describes the minimum amount of compute
-                          resources required. If Requests is omitted for a container,
-                          it defaults to Limits if that is explicitly specified, otherwise
-                          to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
-                        type: object
-                    type: object
                   enroller:
                     description: Enroller (Optional) is the resources provided to
                       the enroller container

diff --git a/config/crd/bases/ibp.com_ibpconsoles.yaml b/config/crd/bases/ibp.com_ibpconsoles.yaml
@@ -636,12 +636,6 @@ spec:
                             couchdbTag:
                               description: CouchDBTag is the tag of the couchdb image
                               type: string
-                            dindImage:
-                              description: DindImage is the name of the dind image
-                              type: string
-                            dindTag:
-                              description: DindTag is the tag of the dind image
-                              type: string
                             enrollerImage:
                               description: EnrollerImage is the name of the init image
                                 for crypto generation

diff --git a/config/crd/bases/ibp.com_ibppeers.yaml b/config/crd/bases/ibp.com_ibppeers.yaml
@@ -112,12 +112,6 @@ spec:
                         type: string
                     type: object
                 type: object
-              dindArgs:
-                description: advanced configs DindArgs (Optional) is used to override
-                  args passed to dind container
-                items:
-                  type: string
-                type: array
               disablenodeou:
                 description: DisableNodeOU (Optional) is used to switch nodeou on
                   and off
@@ -163,12 +157,6 @@ spec:
                   couchdbTag:
                     description: CouchDBTag is the tag of the couchdb image
                     type: string
-                  dindImage:
-                    description: DindImage is the name of the dind image
-                    type: string
-                  dindTag:
-                    description: DindTag is the tag of the dind image
-                    type: string
                   enrollerImage:
                     description: EnrollerImage is the name of the init image for crypto
                       generation
@@ -334,33 +322,6 @@ spec:
                           to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
                         type: object
                     type: object
-                  dind:
-                    description: DinD (Optional) is the resources provided to the
-                      dind container
-                    properties:
-                      limits:
-                        additionalProperties:
-                          anyOf:
-                          - type: integer
-                          - type: string
-                          pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                          x-kubernetes-int-or-string: true
-                        description: 'Limits describes the maximum amount of compute
-                          resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
-                        type: object
-                      requests:
-                        additionalProperties:
-                          anyOf:
-                          - type: integer
-                          - type: string
-                          pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                          x-kubernetes-int-or-string: true
-                        description: 'Requests describes the minimum amount of compute
-                          resources required. If Requests is omitted for a container,
-                          it defaults to Limits if that is explicitly specified, otherwise
-                          to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
-                        type: object
-                    type: object
                   enroller:
                     description: Enroller (Optional) is the resources provided to
                       the enroller container

diff --git a/config/manifests/bases/fabric-opensource-operator.clusterserviceversion.yaml b/config/manifests/bases/fabric-opensource-operator.clusterserviceversion.yaml
@@ -613,12 +613,6 @@ spec:
       - description: CouchDBTag is the tag of the couchdb image
         displayName: Couch DBTag
         path: versions.peer.image.couchdbTag
-      - description: DindImage is the name of the dind image
-        displayName: Dind Image
-        path: versions.peer.image.dindImage
-      - description: DindTag is the tag of the dind image
-        displayName: Dind Tag
-        path: versions.peer.image.dindTag
       - description: EnrollerImage is the name of the init image for crypto generation
         displayName: Enroller Image
         path: versions.peer.image.enrollerImage
@@ -1305,10 +1299,6 @@ spec:
       - description: StateDB is the pvc to be used as statedb's storage
         displayName: State DB
         path: customNames.pvc.statedb
-      - description: advanced configs DindArgs (Optional) is used to override args
-          passed to dind container
-        displayName: Dind Args
-        path: dindArgs
       - description: DisableNodeOU (Optional) is used to switch nodeou on and off
         displayName: Disable Node OU
         path: disablenodeou
@@ -1347,12 +1337,6 @@ spec:
       - description: CouchDBTag is the tag of the couchdb image
         displayName: Couch DBTag
         path: images.couchdbTag
-      - description: DindImage is the name of the dind image
-        displayName: Dind Image
-        path: images.dindImage
-      - description: DindTag is the tag of the dind image
-        displayName: Dind Tag
-        path: images.dindTag
       - description: EnrollerImage is the name of the init image for crypto generation
         displayName: Enroller Image
         path: images.enrollerImage
@@ -1470,11 +1454,6 @@ spec:
         path: resources.couchdb
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:resourceRequirements
-      - description: DinD (Optional) is the resources provided to the dind container
-        displayName: Din D
-        path: resources.dind
-        x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:resourceRequirements
       - description: Enroller (Optional) is the resources provided to the enroller
           container
         displayName: Enroller

diff --git a/controllers/ibpca/mocks/careconcile.go b/controllers/ibpca/mocks/careconcile.go
diff --git a/controllers/ibpconsole/mocks/consolereconcile.go b/controllers/ibpconsole/mocks/consolereconcile.go