Merge pull request #442 from wenchajun/wenchajun/release-1.6.1

release 1.6.1

Author: benjaminhuo

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.6.1 / 2022-10-31
+### BUGFIX 
+- Fix: add missing config attributes for splunk output (#437)
+- Fix(go): Update go version from 1.19.1 to 1.19.2 to resolve vulnerabilities. (#438)
+- Revert "build: Enhance binary" (#439)
+
 ## 1.6.0 / 2022-10-25
 ### Features
 - Add Fluent Bit Splunk output plugin (#417)

RELEASE.md

@@ -29,6 +29,7 @@ This page describes the release process and the currently planned schedule for u
 | v1.5.0           | 2022-09-24                                 | Elon Cheng (GitHub: @wenchajun)         |
 | v1.5.1           | 2022-09-30                                 | Elon Cheng (GitHub: @wenchajun)         |
 | v1.6.0           | 2022-10-25                                 | Elon Cheng (GitHub: @wenchajun)         |
+| v1.6.1           | 2022-10-31                                 | Elon Cheng (GitHub: @wenchajun)         |
 
 # How to cut a new release
 

VERSION

@@ -1 +1 @@
-v1.6.0
+v1.6.1

apis/fluentbit/v1alpha2/plugins/output/splunk_types.go

@@ -120,7 +120,21 @@ func (o *Splunk) Params(sl plugins.SecretLoader) (*params.KVs, error) {
 	if o.EventSource != "" {
 		kvs.Insert("event_source", o.EventSource)
 	}
-
+	if o.EventSourcetype != "" {
+		kvs.Insert("event_sourcetype", o.EventSourcetype)
+	}
+	if o.EventSourcetypeKey != "" {
+		kvs.Insert("event_sourcetype_key", o.EventSourcetypeKey)
+	}
+	if o.EventIndex != "" {
+		kvs.Insert("event_index", o.EventIndex)
+	}
+	if o.EventIndexKey != "" {
+		kvs.Insert("event_index_key", o.EventIndexKey)
+	}
+	if o.EventField != "" {
+		kvs.Insert("event_field", o.EventField)
+	}
 	if o.Workers != nil {
 		kvs.Insert("workers", fmt.Sprint(*o.Workers))
 	}

charts/fluent-operator/Chart.yaml

@@ -15,9 +15,9 @@ description: A Helm chart for Kubernetes
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.6.0
+version: 1.6.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: 1.6.0
+appVersion: 1.6.1

charts/fluent-operator/values.yaml

@@ -12,7 +12,7 @@ operator:
     tag: "20.10"
   container:
     repository: "kubesphere/fluent-operator"
-    tag: "v1.6.0"
+    tag: "v1.6.1"
     # FluentBit operator resources. Usually user needn't to adjust these.
   resources:
     limits:

cmd/fluent-manager/Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.19.1-alpine3.16 as builder
+FROM golang:1.19.2-alpine3.16 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests
@@ -16,7 +16,7 @@ COPY controllers controllers/
 COPY pkg pkg/
 
 # Build
-RUN CGO_ENABLED=0 GO111MODULE=on go build -trimpath -a -o manager main.go
+RUN CGO_ENABLED=0 GO111MODULE=on go build -a -o manager main.go
 
 # Use distroless as minimal base image to package the manager binary
 # Refer to https://github.com/GoogleContainerTools/distroless for more details

cmd/fluent-watcher/fluentbit/Dockerfile

@@ -1,10 +1,10 @@
-FROM golang:1.19.1-alpine3.16 as buildergo
+FROM golang:1.19.2-alpine3.16 as buildergo
 RUN mkdir -p /fluent-bit
 RUN mkdir -p /code
 COPY . /code/
 WORKDIR /code
 RUN echo $(ls -al /code)
-RUN CGO_ENABLED=0 go build -buildmode=pie -trimpath -ldflags '-w -s' -o /fluent-bit/fluent-bit /code/cmd/fluent-watcher/fluentbit/main.go
+RUN CGO_ENABLED=0 go build -i -ldflags '-w -s' -o /fluent-bit/fluent-bit /code/cmd/fluent-watcher/fluentbit/main.go
 
 FROM fluent/fluent-bit:1.9.9
 LABEL Description="Fluent Bit docker image" Vendor="Fluent" Version="1.0"

cmd/fluent-watcher/fluentd/Dockerfile.amd64

@@ -1,11 +1,11 @@
 # Fluentd watcher agent
-FROM golang:1.19.1-alpine3.16 as buildergo
+FROM golang:1.19.2-alpine3.16 as buildergo
 RUN mkdir -p /fluentd
 RUN mkdir -p /code
 COPY . /code/
 WORKDIR /code
 RUN echo $(ls -al /code)
-RUN CGO_ENABLED=0 go build -buildmode=pie -trimpath -ldflags '-w -s' -o /fluentd/fluentd-watcher /code/cmd/fluent-watcher/fluentd/main.go
+RUN CGO_ENABLED=0 go build -i -ldflags '-w -s' -o /fluentd/fluentd-watcher /code/cmd/fluent-watcher/fluentd/main.go
 
 # Fluentd main image
 FROM alpine:3.13

cmd/fluent-watcher/fluentd/Dockerfile.arm64

@@ -1,11 +1,11 @@
 # Fluentd watcher agent
-FROM golang:1.19.1-alpine3.16 as buildergo
+FROM golang:1.19.2-alpine3.16 as buildergo
 RUN mkdir -p /fluentd
 RUN mkdir -p /code
 COPY . /code/
 WORKDIR /code
 RUN echo $(ls -al /code)
-RUN CGO_ENABLED=0 go build -buildmode=pie -trimpath -ldflags '-w -s' -o /fluentd/fluentd-watcher /code/cmd/fluent-watcher/fluentd/main.go
+RUN CGO_ENABLED=0 go build -i -ldflags '-w -s' -o /fluentd/fluentd-watcher /code/cmd/fluent-watcher/fluentd/main.go
 
 # To set multiarch build for Docker hub automated build.
 FROM golang:alpine AS builderqemu

cmd/fluent-watcher/fluentd/Dockerfile.arm64.quick

@@ -1,11 +1,11 @@
 # Fluentd watcher agent
-FROM golang:1.19.1-alpine3.16 as buildergo
+FROM golang:1.19.2-alpine3.16 as buildergo
 RUN mkdir -p /fluentd
 RUN mkdir -p /code
 COPY . /code/
 WORKDIR /code
 RUN echo $(ls -al /code)
-RUN CGO_ENABLED=0 go build -buildmode=pie -trimpath -ldflags '-w -s' -o /fluentd/fluentd-watcher /code/cmd/fluent-watcher/fluentd/main.go
+RUN CGO_ENABLED=0 go build -i -ldflags '-w -s' -o /fluentd/fluentd-watcher /code/cmd/fluent-watcher/fluentd/main.go
 
 # Fluentd main image
 FROM kubesphere/fluentd:v1.14.6-arm64-base

docs/best-practice/forwarding-logs-via-http/Dockerfile

@@ -1,9 +1,9 @@
 # Build the manager binary
-FROM golang:1.19.1 as builder
+FROM golang:1.19.2 as builder
 
 WORKDIR /
 COPY main.go /go/src/main.go
-RUN CGO_ENABLED=0 go build -buildmode=pie -trimpath /go/src/main.go
+RUN CGO_ENABLED=0 go build /go/src/main.go
 
 # Use distroless as minimal base image to package the manager binary
 # Refer to https://github.com/GoogleContainerTools/distroless for more details

manifests/setup/fluent-operator-deployment.yaml

@@ -39,7 +39,7 @@ spec:
           mountPath: /var/run/docker.sock
       containers:
       - name: fluent-operator
-        image: kubesphere/fluent-operator:v1.6.0
+        image: kubesphere/fluent-operator:v1.6.1
         env:
           - name: NAMESPACE
             valueFrom:

manifests/setup/setup.yaml

@@ -13873,7 +13873,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: metadata.namespace
-        image: kubesphere/fluent-operator:v1.6.0
+        image: kubesphere/fluent-operator:v1.6.1
         name: fluent-operator
         resources:
           limits: