Removed More Reference of DIND

hyperledger-labs · Feb 21, 2024 · 9ed912a · 9ed912a
1 parent a16c17f
commit 9ed912a
Show file tree

Hide file tree

Showing 65 changed files with 1,396 additions and 2,106 deletions.
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/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
diff --git a/controllers/ibporderer/mocks/ordererreconcile.go b/controllers/ibporderer/mocks/ordererreconcile.go
diff --git a/controllers/ibppeer/mocks/peerreconcile.go b/controllers/ibppeer/mocks/peerreconcile.go
diff --git a/pkg/action/mocks/deploymentreset.go b/pkg/action/mocks/deploymentreset.go