diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3be24bae..7621561e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,13 +16,13 @@ concurrency: jobs: build: name: Build - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - - name: Set up Go 1.21 + - name: Set up Go 1.23 uses: actions/setup-go@v1 with: - go-version: '1.21' + go-version: '1.23' id: go - uses: actions/checkout@v2 diff --git a/.github/workflows/release-tracker.yml b/.github/workflows/release-tracker.yml index c53fdf2f..e23a9851 100644 --- a/.github/workflows/release-tracker.yml +++ b/.github/workflows/release-tracker.yml @@ -11,7 +11,7 @@ concurrency: jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v1 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 923bc5e0..8da54c2f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,7 +14,7 @@ concurrency: jobs: build: name: Build - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v1 diff --git a/Makefile b/Makefile index 556db16f..4fa52b6c 100644 --- a/Makefile +++ b/Makefile @@ -74,7 +74,7 @@ TAG_DBG := $(VERSION)-dbg_$(OS)_$(ARCH) GO_VERSION ?= 1.21 BUILD_IMAGE ?= ghcr.io/appscode/golang-dev:$(GO_VERSION) -CHART_TEST_IMAGE ?= quay.io/helmpack/chart-testing:v3.5.1 +CHART_TEST_IMAGE ?= quay.io/helmpack/chart-testing:v3.11.0 OUTBIN = bin/$(BIN)-$(OS)-$(ARCH) ifeq ($(OS),windows) diff --git a/pkg/cmds/run.go b/pkg/cmds/run.go index ac0db1b0..e9a1eccd 100644 --- a/pkg/cmds/run.go +++ b/pkg/cmds/run.go @@ -27,7 +27,6 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" clientgoscheme "k8s.io/client-go/kubernetes/scheme" "k8s.io/klog/v2" - "k8s.io/klog/v2/klogr" "kmodules.xyz/client-go/meta" "kmodules.xyz/client-go/tools/clusterid" ec2api "kubedb.dev/provider-aws/apis/ec2/v1alpha1" @@ -66,7 +65,7 @@ func NewCmdRun() *cobra.Command { Run: func(cmd *cobra.Command, args []string) { klog.Infof("Starting binary version %s+%s ...", v.Version.Version, v.Version.CommitHash) - ctrl.SetLogger(klogr.New()) + ctrl.SetLogger(klog.NewKlogr()) cfg := ctrl.GetConfigOrDie() cfg.QPS = QPS