Merge pull request #410 from wenchajun/wenchajun/release-1.5.1

release 1.5.1
fluent · Sep 30, 2022 · 36bae1d · 36bae1d
2 parents 5870864 + 3bb1516
commit 36bae1d
Show file tree

Hide file tree

Showing 61 changed files with 4,882 additions and 3,847 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,27 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "monthly"
+  - package-ecosystem: "docker"
+    directory: "/cmd/fluent-manager"
+    schedule:
+      interval: "monthly"
+  - package-ecosystem: "docker"
+    directory: "/cmd/fluent-watcher/fluent-bit"
+    schedule:
+      interval: "monthly"
+  - package-ecosystem: "docker"
+    directory: "/cmd/fluent-watcher/fluentd/base"
+    schedule:
+      interval: "monthly"
+  - package-ecosystem: "docker"
+    directory: "/docs/best-practice/forwarding-logs-via-http"
+    schedule:
+      interval: "monthly"
+  - package-ecosystem: "gomod"
+    directory: "/"
+    schedule:
+      interval: "monthly"
+
diff --git a/.github/workflows/build-fb-image.yaml b/.github/workflows/build-fb-image.yaml
@@ -13,7 +13,7 @@ on:
       - "pkg/filenotify/**"
 
 env:
-  FB_IMG: 'kubesphere/fluent-bit:v1.9.8'
+  FB_IMG: 'kubesphere/fluent-bit:v1.9.9'
 
 jobs:
   build:
@@ -22,11 +22,11 @@ jobs:
     name: Build Image for Fluent Bit
     steps:
       - name: Install Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v3
         with:
-          go-version: 1.17.x
+          go-version: 1.19
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: ~/go/pkg/mod
           key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@@ -37,14 +37,14 @@ jobs:
           fetch-depth: 0
 
       - name: Login to Docker Hub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.REGISTRY_USER }}
           password: ${{ secrets.REGISTRY_PASSWORD }}
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
 
       - name: Build and Push Image for Fluent Bit
         run: |

diff --git a/.github/workflows/build-fd-image.yaml b/.github/workflows/build-fd-image.yaml
@@ -24,11 +24,11 @@ jobs:
     name: Build amd64 Image for Fluentd
     steps:
       - name: Install Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v3
         with:
-          go-version: 1.17.x
+          go-version: 1.19
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: ~/go/pkg/mod
           key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@@ -39,7 +39,7 @@ jobs:
           fetch-depth: 0
 
       - name: Login to Docker Hub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.REGISTRY_USER }}
           password: ${{ secrets.REGISTRY_PASSWORD }}
@@ -55,11 +55,11 @@ jobs:
     name: Build arm64 Image for Fluentd
     steps:
       - name: Install Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v3
         with:
-          go-version: 1.17.x
+          go-version: 1.19
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: ~/go/pkg/mod
           key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@@ -70,14 +70,14 @@ jobs:
           fetch-depth: 0
 
       - name: Login to Docker Hub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.REGISTRY_USER }}
           password: ${{ secrets.REGISTRY_PASSWORD }}
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
 
       - name: Build and Push arm64 Image for Fluentd
         run: |

diff --git a/.github/workflows/build-op-image.yaml b/.github/workflows/build-op-image.yaml
@@ -28,11 +28,11 @@ jobs:
     name: Build Image for Fluent Operator
     steps:
       - name: Install Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v3
         with:
-          go-version: 1.17.x
+          go-version: 1.19
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: ~/go/pkg/mod
           key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@@ -43,14 +43,14 @@ jobs:
           fetch-depth: 0
 
       - name: Login to Docker Hub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.REGISTRY_USER }}
           password: ${{ secrets.REGISTRY_PASSWORD }}
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
 
       - name: Build and Push Image for Fluent Operator
         run: |

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -33,11 +33,11 @@ jobs:
       GO111MODULE: "on"
     steps:
       - name: Install Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v3
         with:
-          go-version: 1.17.x
+          go-version: 1.19
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: ~/go/pkg/mod
           key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@@ -71,11 +71,11 @@ jobs:
       GO111MODULE: "on"
     steps:
       - name: Install Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v3
         with:
-          go-version: 1.17.x
+          go-version: 1.19
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: ~/go/pkg/mod
           key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@@ -102,11 +102,11 @@ jobs:
       GO111MODULE: "on"
     steps:
       - name: Install Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v3
         with:
-          go-version: 1.17.x
+          go-version: 1.19
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: ~/go/pkg/mod
           key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@@ -118,7 +118,7 @@ jobs:
           curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.21.4/bin/linux/amd64/kubectl && sudo install kubectl /usr/local/bin/kubectl
 
       - name: Install Helm
-        uses: azure/setup-helm@v1
+        uses: azure/setup-helm@v3
         with:
           version: v3.6.3
 
@@ -136,11 +136,11 @@ jobs:
     name: Binary build
     steps:
       - name: Install Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v3
         with:
-          go-version: 1.17.x
+          go-version: 1.19
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: ~/go/pkg/mod
           key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@@ -159,11 +159,11 @@ jobs:
   #   name: Docker amd64 build
   #   steps:
   #     - name: Install Go
-  #       uses: actions/setup-go@v2
+  #       uses: actions/setup-go@v3
   #       with:
   #         go-version: 1.16.x
 
-  #     - uses: actions/cache@v2
+  #     - uses: actions/cache@v3
   #       with:
   #         path: ~/go/pkg/mod
   #         key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,21 @@
+## 1.5.1 / 2022-09-30
+
+### ENHANCEMENT
+- Add Dependabot (#386)
+- Bump azure/setup-helm from 1 to 3 (#387)
+- Bump alpine from 3.13 to 3.16.2 in /cmd/fluent-watcher/fluentd/base (#388)
+- Bump golang from 1.17.10-alpine3.16 to 1.19.1-alpine3.16 in /cmd/fluent-manager (#389) 
+- Bump docker/setup-buildx-action from 1 to 2 (#390)
+- Bump docker/login-action from 1 to 2 (#391) 
+- Bump golang from 1.14 to 1.19.1 in /docs/best-practice/forwarding-logs-via-http (#392) 
+- Bump actions/setup-go from 2 to 3 (#393)
+- Bump actions/cache from 2 to 3 (#394)
+- Bump sigs.k8s.io/yaml from 1.2.0 to 1.3.0 (#396)
+- update go mod (#402) 
+- Upgrade fluentbit to v1.9.9 (#403)
+- Upgrade go version (#405)
+- Upgrade golang image version (#406)
+
 ## 1.5.0 / 2022-09-24
 
 ### Features

diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 VERSION?=$(shell cat VERSION | tr -d " \t\n\r")
 # Image URL to use all building/pushing image targets
-FB_IMG ?= kubesphere/fluent-bit:v1.9.8
+FB_IMG ?= kubesphere/fluent-bit:v1.9.9
 FD_IMG ?= kubesphere/fluentd:v1.14.6
 FO_IMG ?= kubesphere/fluent-operator:$(VERSION)
 FD_IMG_BASE ?= kubesphere/fluentd:v1.14.6-arm64-base
@@ -150,9 +150,9 @@ KUSTOMIZE = $(shell pwd)/bin/kustomize
 kustomize: go-deps ## Download kustomize locally if necessary.
 	$(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/[email protected])
 
-CODE_GENERATOR = $(shell go env GOPATH)/pkg/mod/k8s.io/code-generator@v0.21.3
+CODE_GENERATOR = $(shell go env GOPATH)/pkg/mod/k8s.io/code-generator@v0.25.0
 code-generator: go-deps ## Download code-generator locally if necessary
-	$(call go-get-tool,$(CODE_GENERATOR),k8s.io/code-generator@v0.21.3)
+	$(call go-get-tool,$(CODE_GENERATOR),k8s.io/code-generator@v0.25.0)
 
 # go-get-tool will 'go get' any package $2 and install it to $1.
 PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
@@ -169,6 +169,7 @@ rm -rf $$TMP_DIR ;\
 endef
 
 go-deps: # download go dependencies
+	go get k8s.io/[email protected]
 	go mod download
 
 docs-update: # update api docs

diff --git a/README.md b/README.md
@@ -126,7 +126,7 @@ Kubernetes v1.16.13+ is necessary for running Fluent Operator.
 Install the latest stable version
 
 ```shell
-kubectl apply -f https://raw.githubusercontent.com/fluent/fluent-operator/release-1.0/manifests/setup/setup.yaml
+kubectl apply -f https://raw.githubusercontent.com/fluent/fluent-operator/release-1.5/manifests/setup/setup.yaml
 
 # You can change the namespace in manifests/setup/kustomization.yaml in corresponding release branch 
 # and then use command below to install to another namespace

diff --git a/RELEASE.md b/RELEASE.md
@@ -27,6 +27,7 @@ This page describes the release process and the currently planned schedule for u
 | v1.0.2           | 2022-05-17                                 | Elon Cheng (GitHub: @wenchajun)         |
 | v1.1.0           | 2022-06-15                                 | Elon Cheng (GitHub: @wenchajun)         |
 | v1.5.0           | 2022-09-24                                 | Elon Cheng (GitHub: @wenchajun)         |
+| v1.5.1           | 2022-09-30                                 | Elon Cheng (GitHub: @wenchajun)         |
 
 # How to cut a new release
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-v1.5.0
+v1.5.1
diff --git a/apis/fluentbit/v1alpha2/clusterfilter_types_test.go b/apis/fluentbit/v1alpha2/clusterfilter_types_test.go
@@ -3,6 +3,7 @@ package v1alpha2
 import (
 	"github.com/fluent/fluent-operator/apis/fluentbit/v1alpha2/plugins"
 	"github.com/fluent/fluent-operator/apis/fluentbit/v1alpha2/plugins/filter"
+	"github.com/go-logr/logr"
 	. "github.com/onsi/gomega"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"testing"
@@ -48,7 +49,7 @@ var filtersExpected = `[Filter]
 func TestClusterFilterList_Load(t *testing.T) {
 	g := NewGomegaWithT(t)
 
-	sl := plugins.NewSecretLoader(nil, "testnamespace", nil)
+	sl := plugins.NewSecretLoader(nil, "testnamespace", logr.Logger{})
 
 	labels := map[string]string{
 		"label0": "lv0",

diff --git a/apis/fluentbit/v1alpha2/clusterfluentbitconfig_types_test.go b/apis/fluentbit/v1alpha2/clusterfluentbitconfig_types_test.go
@@ -1,6 +1,7 @@
 package v1alpha2
 
 import (
+	"github.com/go-logr/logr"
 	"testing"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -102,7 +103,7 @@ var expected = `[Service]
 func Test_FluentBitConfig_RenderMainConfig(t *testing.T) {
 	g := NewGomegaWithT(t)
 
-	sl := plugins.NewSecretLoader(nil, "testnamespace", nil)
+	sl := plugins.NewSecretLoader(nil, "testnamespace", logr.Logger{})
 
 	disableInotifyWatcher := ptrBool(true)
 

diff --git a/apis/fluentbit/v1alpha2/clusterinput_types_test.go b/apis/fluentbit/v1alpha2/clusterinput_types_test.go
@@ -1,6 +1,7 @@
 package v1alpha2
 
 import (
+	"github.com/go-logr/logr"
 	"testing"
 
 	"github.com/fluent/fluent-operator/apis/fluentbit/v1alpha2/plugins"
@@ -40,7 +41,7 @@ var inputExpected = `[Input]
 func TestClusterInputList_Load(t *testing.T) {
 	g := NewGomegaWithT(t)
 
-	sl := plugins.NewSecretLoader(nil, "testnamespace", nil)
+	sl := plugins.NewSecretLoader(nil, "testnamespace", logr.Logger{})
 
 	labels := map[string]string{
 		"label0": "lv0",
@@ -139,7 +140,7 @@ var fluentbitExpected = `[Input]
 func TestFluentbitMetricClusterInputList_Load(t *testing.T) {
 	g := NewGomegaWithT(t)
 
-	sl := plugins.NewSecretLoader(nil, "testnamespace", nil)
+	sl := plugins.NewSecretLoader(nil, "testnamespace", logr.Logger{})
 
 	labels := map[string]string{
 		"label0": "lv0",

diff --git a/apis/fluentbit/v1alpha2/clusteroutput_types_test.go b/apis/fluentbit/v1alpha2/clusteroutput_types_test.go
@@ -1,6 +1,7 @@
 package v1alpha2
 
 import (
+	"github.com/go-logr/logr"
 	"testing"
 
 	"github.com/fluent/fluent-operator/apis/fluentbit/v1alpha2/plugins"
@@ -68,7 +69,7 @@ var outputExpected = `[Output]
 func TestClusterOutputList_Load(t *testing.T) {
 	g := NewGomegaWithT(t)
 
-	sl := plugins.NewSecretLoader(nil, "testnamespace", nil)
+	sl := plugins.NewSecretLoader(nil, "testnamespace", logr.Logger{})
 
 	labels := map[string]string{
 		"label0": "lv0",

diff --git a/apis/fluentbit/v1alpha2/groupversion_info.go b/apis/fluentbit/v1alpha2/groupversion_info.go
@@ -15,8 +15,8 @@ limitations under the License.
 */
 
 // Package v1alpha2 contains API Schema definitions for the logging v1alpha2 API group
-//+kubebuilder:object:generate=true
-//+groupName=fluentbit.fluent.io
+// +kubebuilder:object:generate=true
+// +groupName=fluentbit.fluent.io
 package v1alpha2
 
 import (