diff --git a/.bingo/Variables.mk b/.bingo/Variables.mk index 274b82d73..63ad7a067 100644 --- a/.bingo/Variables.mk +++ b/.bingo/Variables.mk @@ -1,4 +1,4 @@ -# Auto generated binary variables helper managed by https://github.com/bwplotka/bingo v0.5.1. DO NOT EDIT. +# Auto generated binary variables helper managed by https://github.com/bwplotka/bingo v0.6. DO NOT EDIT. # All tools are designed to be build inside $GOBIN. BINGO_DIR := $(dir $(lastword $(MAKEFILE_LIST))) GOPATH ?= $(shell go env GOPATH) @@ -29,11 +29,11 @@ $(BINGO): $(BINGO_DIR)/bingo.mod @echo "(re)installing $(GOBIN)/bingo-v0.5.1" @cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=bingo.mod -o=$(GOBIN)/bingo-v0.5.1 "github.com/bwplotka/bingo" -GOLANGCI_LINT := ${GOBIN}/golangci-lint-v1.50.1 +GOLANGCI_LINT := $(GOBIN)/golangci-lint-v1.53.3 $(GOLANGCI_LINT): $(BINGO_DIR)/golangci-lint.mod @# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies. - @echo "(re)installing $(GOBIN)/golangci-lint-v1.50.1" - @cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOLANGCI_LINT) "github.com/golangci/golangci-lint/cmd/golangci-lint" + @echo "(re)installing $(GOBIN)/golangci-lint-v1.53.3" + @cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v1.53.3 "github.com/golangci/golangci-lint/cmd/golangci-lint" JB := $(GOBIN)/jb-v0.4.0 $(JB): $(BINGO_DIR)/jb.mod diff --git a/.bingo/golangci-lint.mod b/.bingo/golangci-lint.mod index 2f6e404e6..55fbd4a24 100644 --- a/.bingo/golangci-lint.mod +++ b/.bingo/golangci-lint.mod @@ -2,4 +2,4 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT go 1.16 -require github.com/golangci/golangci-lint v1.50.1 // cmd/golangci-lint +require github.com/golangci/golangci-lint v1.53.3 // cmd/golangci-lint diff --git a/.bingo/variables.env b/.bingo/variables.env index 17385f5e2..be90a5eb4 100644 --- a/.bingo/variables.env +++ b/.bingo/variables.env @@ -1,4 +1,4 @@ -# Auto generated binary variables helper managed by https://github.com/bwplotka/bingo v0.5.1. DO NOT EDIT. +# Auto generated binary variables helper managed by https://github.com/bwplotka/bingo v0.6. DO NOT EDIT. # All tools are designed to be build inside $GOBIN. # Those variables will work only until 'bingo get' was invoked, or if tools were installed via Makefile's Variables.mk. GOBIN=${GOBIN:=$(go env GOBIN)} @@ -12,7 +12,7 @@ BENCHSTAT="${GOBIN}/benchstat-v0.0.0-20211012211434-03971e389cd3" BINGO="${GOBIN}/bingo-v0.5.1" -GOLANGCI_LINT="${GOBIN}/golangci-lint-v1.50.1" +GOLANGCI_LINT="${GOBIN}/golangci-lint-v1.53.3" JB="${GOBIN}/jb-v0.4.0" diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index c1bd6736a..7d854eca6 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - go: ['1.19'] + go: ['1.20'] steps: - name: install make diff --git a/.github/workflows/pull_request_e2e.yml b/.github/workflows/pull_request_e2e.yml index 93c57ac4f..1486c4907 100644 --- a/.github/workflows/pull_request_e2e.yml +++ b/.github/workflows/pull_request_e2e.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - go: ['1.19'] + go: ['1.20'] steps: - name: install make diff --git a/.github/workflows/push_image.yml b/.github/workflows/push_image.yml index 8862910b8..29a0c637b 100644 --- a/.github/workflows/push_image.yml +++ b/.github/workflows/push_image.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - go: ['1.19'] + go: ['1.20'] steps: - name: install make run: sudo apt-get install make diff --git a/.github/workflows/push_image_pr.yml b/.github/workflows/push_image_pr.yml index b191e0b62..1e105bbaa 100644 --- a/.github/workflows/push_image_pr.yml +++ b/.github/workflows/push_image_pr.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - go: ['1.19'] + go: ['1.20'] steps: - name: install make run: sudo apt-get install make diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3d7f4b82b..d0fd17c51 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - go: ['1.19'] + go: ['1.20'] steps: - name: checkout uses: actions/checkout@v3 diff --git a/Makefile b/Makefile index f333f707d..f94000543 100644 --- a/Makefile +++ b/Makefile @@ -45,7 +45,7 @@ OCI_BUILD_OPTS ?= OCI_BIN_PATH = $(shell which docker 2>/dev/null || which podman) OCI_BIN ?= $(shell basename ${OCI_BIN_PATH}) -MIN_GO_VERSION := 1.18.0 +MIN_GO_VERSION := 1.19.0 FLP_BIN_FILE=flowlogs-pipeline CG_BIN_FILE=confgenerator NETFLOW_GENERATOR=nflow-generator diff --git a/README.md b/README.md index 07e88b405..0686929d4 100644 --- a/README.md +++ b/README.md @@ -49,14 +49,15 @@ Usage: flowlogs-pipeline [flags] Flags: - --config string config file (default is $HOME/.flowlogs-pipeline) - --health.port string Health server port (default "8080") - -h, --help help for flowlogs-pipeline - --log-level string Log level: debug, info, warning, error (default "error") - --metrics-settings string json for global metrics settings - --parameters string json of config file parameters field - --pipeline string json of config file pipeline field - --profile.port int Go pprof tool port (default: disabled) + --config string config file (default is $HOME/.flowlogs-pipeline) + --health.address string Health server address (default "0.0.0.0") + --health.port string Health server port (default "8080") + -h, --help help for flowlogs-pipeline + --log-level string Log level: debug, info, warning, error (default "error") + --metricsSettings string json for global metrics settings + --parameters string json of config file parameters field + --pipeline string json of config file pipeline field + --profile.port int Go pprof tool port (default: disabled) ``` @@ -94,7 +95,7 @@ These instructions apply for deploying FLP development and exploration environme tested on Ubuntu 20.4 and Fedora 34. 1. Make sure the following commands are installed and can be run from the current shell: - make - - go (version 1.18) + - go (version 1.19) - docker 2. To deploy the full simulated environment which includes a kind cluster with FLP, Prometheus, Grafana, and netflow-simulator, run (note that depending on your user permissions, you may have to run this command under sudo): diff --git a/contrib/docker/Dockerfile b/contrib/docker/Dockerfile index b4504d4f8..8ac26e43a 100644 --- a/contrib/docker/Dockerfile +++ b/contrib/docker/Dockerfile @@ -1,7 +1,7 @@ # We do not use --platform feature to auto fill this ARG because of incompatibility between podman and docker ARG TARGETPLATFORM=linux/amd64 ARG BUILDPLATFORM=linux/amd64 -FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.19 as builder +FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.20 as builder ARG TARGETPLATFORM ARG TARGETARCH=amd64 diff --git a/go.mod b/go.mod index c2c18e0ee..c57a68880 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/netobserv/flowlogs-pipeline -go 1.18 +go 1.19 require ( github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible diff --git a/pkg/pipeline/transform/kubernetes/kubernetes.go b/pkg/pipeline/transform/kubernetes/kubernetes.go index 85ea9e540..c31ca7877 100644 --- a/pkg/pipeline/transform/kubernetes/kubernetes.go +++ b/pkg/pipeline/transform/kubernetes/kubernetes.go @@ -54,7 +54,6 @@ type kubeDataInterface interface { } type KubeData struct { - kubeDataInterface // pods, nodes and services cache the different object types as *Info pointers pods cache.SharedIndexInformer nodes cache.SharedIndexInformer