Removed FluentD References (#158)

#100

api/v1beta1/common.go

@@ -34,7 +34,6 @@ const (
 	ORDERER    Component = "ORDERER"
 	PEER       Component = "PEER"
 	GRPCPROXY  Component = "GRPCPROXY"
-	FLUENTD    Component = "FLUENTD"
 	DIND       Component = "DIND"
 	COUCHDB    Component = "COUCHDB"
 	CCLAUNCHER Component = "CCLAUNCHER"

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 FLUENTD:
-			if s.Spec.Resources.FluentD != nil {
-				return *s.Spec.Resources.FluentD
-			}
 		case DIND:
 			if s.Spec.Resources.DinD != nil {
 				return *s.Spec.Resources.DinD
@@ -313,7 +309,6 @@ func (i *PeerImages) Override(requested *PeerImages, registryURL string, arch st
 	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.FluentdImage = image.GetImage(registryURL, i.FluentdImage, requested.FluentdImage)
 	i.CCLauncherImage = image.GetImage(registryURL, i.CCLauncherImage, requested.CCLauncherImage)
 	i.FileTransferImage = image.GetImage(registryURL, i.FileTransferImage, requested.FileTransferImage)
 	i.BuilderImage = image.GetImage(registryURL, i.BuilderImage, requested.BuilderImage)
@@ -329,7 +324,6 @@ func (i *PeerImages) Override(requested *PeerImages, registryURL string, arch st
 	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.FluentdTag = image.GetTag(arch, i.FluentdTag, requested.FluentdTag)
 	i.CCLauncherTag = image.GetTag(arch, i.CCLauncherTag, requested.CCLauncherTag)
 	i.FileTransferTag = image.GetTag(arch, i.FileTransferTag, requested.FileTransferTag)
 	i.BuilderTag = image.GetTag(arch, i.BuilderTag, requested.BuilderTag)

api/v1beta1/ibppeer_types.go

@@ -221,10 +221,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"`
@@ -294,14 +290,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"`

bundle/manifests/fabric-opensource-operator.clusterserviceversion.yaml

@@ -631,12 +631,6 @@ spec:
       - description: FileTransferTag is the tag of the file transfer image
         displayName: File Transfer Tag
         path: versions.peer.image.fileTransferTag
-      - description: FluentdImage is the name of the fluentd logger image
-        displayName: Fluentd Image
-        path: versions.peer.image.fluentdImage
-      - description: FluentdTag is the tag of the fluentd logger image
-        displayName: Fluentd Tag
-        path: versions.peer.image.fluentdTag
       - description: GoEnvImage is the name of the goenv image
         displayName: Go Env Image
         path: versions.peer.image.goEnvImage
@@ -1371,12 +1365,6 @@ spec:
       - description: FileTransferTag is the tag of the file transfer image
         displayName: File Transfer Tag
         path: images.fileTransferTag
-      - description: FluentdImage is the name of the fluentd logger image
-        displayName: Fluentd Image
-        path: images.fluentdImage
-      - description: FluentdTag is the tag of the fluentd logger image
-        displayName: Fluentd Tag
-        path: images.fluentdTag
       - description: GoEnvImage is the name of the goenv image
         displayName: Go Env Image
         path: images.goEnvImage
@@ -1493,11 +1481,6 @@ spec:
         path: resources.enroller
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:resourceRequirements
-      - description: FluentD (Optional) is the resources provided to the fluentd container
-        displayName: Fluent D
-        path: resources.fluentd
-        x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:resourceRequirements
       - description: HSMDaemon (Optional) is the resources provided to the HSM Daemon
           container
         displayName: HSMDaemon

bundle/manifests/ibp.com_ibpconsoles.yaml

@@ -657,14 +657,6 @@ spec:
                               description: FileTransferTag is the tag of the file
                                 transfer image
                               type: string
-                            fluentdImage:
-                              description: FluentdImage is the name of the fluentd
-                                logger image
-                              type: string
-                            fluentdTag:
-                              description: FluentdTag is the tag of the fluentd logger
-                                image
-                              type: string
                             goEnvImage:
                               description: GoEnvImage is the name of the goenv image
                               type: string

bundle/manifests/ibp.com_ibppeers.yaml

@@ -183,12 +183,6 @@ spec:
                   fileTransferTag:
                     description: FileTransferTag is the tag of the file transfer image
                     type: string
-                  fluentdImage:
-                    description: FluentdImage is the name of the fluentd logger image
-                    type: string
-                  fluentdTag:
-                    description: FluentdTag is the tag of the fluentd logger image
-                    type: string
                   goEnvImage:
                     description: GoEnvImage is the name of the goenv image
                     type: string
@@ -393,33 +387,6 @@ spec:
                           to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
                         type: object
                     type: object
-                  fluentd:
-                    description: FluentD (Optional) is the resources provided to the
-                      fluentd 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
                   hsmdaemon:
                     description: HSMDaemon (Optional) is the resources provided to
                       the HSM Daemon container

config/crd/bases/ibp.com_ibpconsoles.yaml

@@ -658,14 +658,6 @@ spec:
                               description: FileTransferTag is the tag of the file
                                 transfer image
                               type: string
-                            fluentdImage:
-                              description: FluentdImage is the name of the fluentd
-                                logger image
-                              type: string
-                            fluentdTag:
-                              description: FluentdTag is the tag of the fluentd logger
-                                image
-                              type: string
                             goEnvImage:
                               description: GoEnvImage is the name of the goenv image
                               type: string

config/crd/bases/ibp.com_ibppeers.yaml

@@ -184,12 +184,6 @@ spec:
                   fileTransferTag:
                     description: FileTransferTag is the tag of the file transfer image
                     type: string
-                  fluentdImage:
-                    description: FluentdImage is the name of the fluentd logger image
-                    type: string
-                  fluentdTag:
-                    description: FluentdTag is the tag of the fluentd logger image
-                    type: string
                   goEnvImage:
                     description: GoEnvImage is the name of the goenv image
                     type: string
@@ -394,33 +388,6 @@ spec:
                           to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
                         type: object
                     type: object
-                  fluentd:
-                    description: FluentD (Optional) is the resources provided to the
-                      fluentd 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
                   hsmdaemon:
                     description: HSMDaemon (Optional) is the resources provided to
                       the HSM Daemon container

config/manifests/bases/fabric-opensource-operator.clusterserviceversion.yaml

@@ -631,12 +631,6 @@ spec:
       - description: FileTransferTag is the tag of the file transfer image
         displayName: File Transfer Tag
         path: versions.peer.image.fileTransferTag
-      - description: FluentdImage is the name of the fluentd logger image
-        displayName: Fluentd Image
-        path: versions.peer.image.fluentdImage
-      - description: FluentdTag is the tag of the fluentd logger image
-        displayName: Fluentd Tag
-        path: versions.peer.image.fluentdTag
       - description: GoEnvImage is the name of the goenv image
         displayName: Go Env Image
         path: versions.peer.image.goEnvImage
@@ -1371,12 +1365,6 @@ spec:
       - description: FileTransferTag is the tag of the file transfer image
         displayName: File Transfer Tag
         path: images.fileTransferTag
-      - description: FluentdImage is the name of the fluentd logger image
-        displayName: Fluentd Image
-        path: images.fluentdImage
-      - description: FluentdTag is the tag of the fluentd logger image
-        displayName: Fluentd Tag
-        path: images.fluentdTag
       - description: GoEnvImage is the name of the goenv image
         displayName: Go Env Image
         path: images.goEnvImage

definitions/console/deployer-configmap.yaml

@@ -124,13 +124,6 @@ data:
             requests:
               cpu: 200m
               memory: 400M
-          fluentd:
-            limits:
-              cpu: 100m
-              memory: 200M
-            requests:
-              cpu: 100m
-              memory: 200M
           couchdb:
             limits:
               cpu: 200m

definitions/peer/deployment.yaml

@@ -234,46 +234,6 @@ spec:
               name: tls-signcert
             - mountPath: /certs/tls/keystore
               name: tls-keystore
-        - env:
-            - name: LICENSE
-              value: accept
-          image: fluent/fluentd:v1.4-2
-          imagePullPolicy: Always
-          livenessProbe:
-            failureThreshold: 6
-            initialDelaySeconds: 30
-            tcpSocket:
-              port: 9880
-            timeoutSeconds: 5
-          name: chaincode-logs
-          ports:
-            - containerPort: 9880
-          readinessProbe:
-            initialDelaySeconds: 26
-            periodSeconds: 5
-            tcpSocket:
-              port: 9880
-            timeoutSeconds: 5
-          resources:
-            limits:
-              cpu: 100m
-              memory: 200M
-            requests:
-              cpu: 100m
-              memory: 200M
-          securityContext:
-            capabilities:
-              add:
-                - NET_BIND_SERVICE
-              drop:
-                - ALL
-            privileged: false
-            readOnlyRootFilesystem: false
-            runAsNonRoot: true
-            runAsUser: 1000
-          volumeMounts:
-            - mountPath: /fluentd/etc
-              name: fluentd-config
       hostIPC: false
       hostNetwork: false
       hostPID: false

integration/helper/crspecs.go

@@ -150,7 +150,6 @@ func Org1PeerCR(namespace, domain, peerUsername, tlsCert, caHost, adminCert stri
 						corev1.ResourceEphemeralStorage: resource.MustParse("1G"),
 					},
 				},
-				FluentD:   resourceReq,
 				GRPCProxy: resourceReq,
 				Peer:      resourceReq,
 			},

integration/migration/fabric/peer_test.go

@@ -158,8 +158,6 @@ func GetPeer() *helper.Peer {
 				// do not change dind tag, it is used for loading dind faster
 				DindImage:     "ghcr.io/ibm-blockchain/dind",
 				DindTag:       "noimages-amd64",
-				FluentdImage:  "ghcr.io/ibm-blockchain/fluentd",
-				FluentdTag:    "1.0.0-20210826-amd64",
 				GRPCWebImage:  "ghcr.io/ibm-blockchain/grpcweb",
 				GRPCWebTag:    "1.0.0-20210826-amd64",
 				PeerImage:     "ghcr.io/ibm-blockchain/peer",

integration/migration/migration_test.go

@@ -646,15 +646,6 @@ var _ = PDescribe("migrating", func() {
 			err = client.Create(context.TODO(), ingress)
 			Expect(err).NotTo(HaveOccurred())
 
-			cm := &corev1.ConfigMap{
-				ObjectMeta: metav1.ObjectMeta{
-					Name:      fmt.Sprintf("%s-fluentd-configmap", instance.Name),
-					Namespace: instance.Namespace,
-				},
-			}
-			err = client.Create(context.TODO(), cm)
-			Expect(err).NotTo(HaveOccurred())
-
 			secretBytes, err := ioutil.ReadFile("../../testdata/migration/secret.json")
 			Expect(err).NotTo(HaveOccurred())
 
@@ -703,7 +694,6 @@ var _ = PDescribe("migrating", func() {
 				}).Should(Equal(true))
 
 				Expect(secret.Data["peermigration-service"]).NotTo(Equal(""))
-				Expect(secret.Data["peermigration-cm-fluentd"]).NotTo(Equal(""))
 			})
 
 			By("creating ecert ca certs secret", func() {