Bump controller-runtime

Signed-off-by: Praveen Rewar <[email protected]>

.github/workflows/benchmark-action.yaml

@@ -23,8 +23,6 @@ jobs:
  steps:
  - uses: actions/[email protected]
  - uses: actions/setup-go@v5 # default version of go is 1.10
- with:
- go-version: 1.21.9
  - name: Install Carvel Tools
  run: ./hack/install-deps.sh
  # Run benchmark with `go test -bench` and stores the output to a file

.github/workflows/dependency-updater.yml

@@ -15,8 +15,6 @@ jobs:
  fetch-depth: 0
  - name: Set up Go 1.x
  uses: actions/setup-go@v5
- with:
- go-version: 1.21.9
  - name: Update Dependencies File
  run: go run ./hack/dependencies.go update
  - name: Create Pull Request

.github/workflows/golangci-lint.yml

@@ -20,13 +20,11 @@ jobs:
  steps:
  - name: Set up Go 1.x
  uses: actions/setup-go@v5
- with:
- go-version: 1.21.9
  - uses: actions/[email protected]
  with:
  fetch-depth: '0'
  - name: golangci-lint
  uses: golangci/[email protected]
  with:
- version: v1.52.2
+ version: v1.58.1
  args: -v

.github/workflows/kind-action.yml

@@ -26,8 +26,6 @@ jobs:
  with:
  fetch-depth: 0
  - uses: actions/setup-go@v5 # default version of go is 1.10
- with:
- go-version: 1.21.9
  - name: Install Carvel Tools
  run: ./hack/install-deps.sh
  # Run benchmark with `go test -bench` and stores the output to a file

.github/workflows/release-process.yml

@@ -38,8 +38,6 @@ jobs:
 
  - name: Set up Go 1.x
  uses: actions/setup-go@v5
- with:
- go-version: 1.21.9
 
  - name: Set up Cosign
  uses: sigstore/[email protected]

.github/workflows/test-gh.yml

@@ -25,8 +25,6 @@ jobs:
  steps:
  - name: Set up Go 1.x
  uses: actions/setup-go@v5
- with:
- go-version: 1.21.9
  - name: Check out code
  uses: actions/[email protected]
  with:

.github/workflows/test-kctrl-gh.yml

@@ -23,8 +23,6 @@ jobs:
  steps:
  - name: Set up Go 1.x
  uses: actions/setup-go@v5
- with:
- go-version: 1.21.9
  - name: Check out code
  uses: actions/[email protected]
  with:

.github/workflows/trivy-scan.yml

@@ -69,8 +69,6 @@ jobs:
  fetch-depth: 0
  - name: Set up Go 1.x
  uses: actions/setup-go@v5
- with:
- go-version: 1.21.9
  - name: Build the kapp-controller artifacts
  run: |
  ./hack/install-deps.sh

.github/workflows/upgrade-testing.yml

@@ -25,8 +25,6 @@ jobs:
  steps:
  - name: Set up Go 1.x
  uses: actions/setup-go@v5
- with:
- go-version: 1.21.9
  - name: Check out code
  uses: actions/[email protected]
  - name: Install Carvel Tools

Dockerfile

@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM golang:1.21.9 AS deps
+FROM --platform=$BUILDPLATFORM golang:1.22.5 AS deps
 
 ARG TARGETOS TARGETARCH KCTRL_VER=development
 WORKDIR /workspace

cmd/controller/run.go

@@ -36,6 +36,7 @@ import (
  "sigs.k8s.io/controller-runtime/pkg/controller"
  "sigs.k8s.io/controller-runtime/pkg/manager"
  "sigs.k8s.io/controller-runtime/pkg/manager/signals"
+ metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
  "sigs.k8s.io/controller-runtime/pkg/reconcile"
 )
 
@@ -67,8 +68,18 @@ func Run(opts Options, runLog logr.Logger) error {
  restConfig.Timeout = opts.APIRequestTimeout
  }
 
- mgr, err := manager.New(restConfig, manager.Options{Cache: cache.Options{Namespaces: []string{opts.Namespace}},
- Scheme: kcconfig.Scheme, MetricsBindAddress: opts.MetricsBindAddress})
+ mgrOpts := manager.Options{
+ Scheme: kcconfig.Scheme,
+ Metrics: metricsserver.Options{BindAddress: opts.MetricsBindAddress},
+ }
+
+ if opts.Namespace != "" {
+ // Run in namespaced mode
+ mgrOpts.Cache.DefaultNamespaces = make(map[string]cache.Config)
+ mgrOpts.Cache.DefaultNamespaces[opts.Namespace] = cache.Config{}
+ }
+
+ mgr, err := manager.New(restConfig, mgrOpts)
  if err != nil {
  return fmt.Errorf("Setting up overall controller manager: %s", err)
  }

go.mod

@@ -1,77 +1,77 @@
 module carvel.dev/kapp-controller
 
-go 1.21
+go 1.22.5
 
 require (
  carvel.dev/vendir v0.40.0
  github.com/fatih/color v1.15.0 // indirect
  github.com/gogo/protobuf v1.3.2
- github.com/google/go-cmp v0.5.9 // indirect
- github.com/prometheus/client_golang v1.15.1
+ github.com/google/go-cmp v0.6.0 // indirect
+ github.com/prometheus/client_golang v1.16.0
  github.com/stretchr/testify v1.8.4
  golang.org/x/crypto v0.21.0
  golang.org/x/text v0.14.0 // indirect
- golang.org/x/tools v0.12.0
+ golang.org/x/tools v0.18.0
  gopkg.in/yaml.v3 v3.0.1 // indirect
- k8s.io/api v0.27.7
- k8s.io/apimachinery v0.27.7
- k8s.io/apiserver v0.27.7
- k8s.io/client-go v0.27.7
- k8s.io/code-generator v0.27.7
+ k8s.io/api v0.30.1
+ k8s.io/apimachinery v0.30.1
+ k8s.io/apiserver v0.30.1
+ k8s.io/client-go v0.30.1
+ k8s.io/code-generator v0.30.1
  k8s.io/kube-aggregator v0.22.17
- k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f
- sigs.k8s.io/controller-runtime v0.15.3
+ k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340
+ sigs.k8s.io/controller-runtime v0.18.4
  sigs.k8s.io/controller-tools v0.7.0
  sigs.k8s.io/yaml v1.4.0
 )
 
 require (
  github.com/blang/semver v3.5.1+incompatible
  github.com/cppforlife/go-cli-ui v0.0.0-20220425131040-94f26b16bc14
- github.com/go-logr/logr v1.2.4
+ github.com/go-logr/logr v1.4.1
  github.com/k14s/semver/v4 v4.0.1-0.20210701191048-266d47ac6115
  github.com/prometheus/client_model v0.4.0
  github.com/spf13/cobra v1.7.0
- golang.org/x/sync v0.3.0
+ golang.org/x/sync v0.6.0
  gopkg.in/yaml.v2 v2.4.0
- k8s.io/component-base v0.27.7
- k8s.io/klog/v2 v2.90.1
- k8s.io/utils v0.0.0-20230209194617-a36077c30491
+ k8s.io/component-base v0.30.1
+ k8s.io/klog/v2 v2.120.1
+ k8s.io/utils v0.0.0-20230726121419-3b25d923346b
 )
 
 require (
- cloud.google.com/go v0.110.4 // indirect
+ cloud.google.com/go v0.110.6 // indirect
  github.com/NYTimes/gziphandler v1.1.1 // indirect
- github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect
+ github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
  github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
  github.com/beorn7/perks v1.0.1 // indirect
  github.com/blang/semver/v4 v4.0.0 // indirect
  github.com/carvel-dev/semver/v4 v4.0.1-0.20230221220520-8090ce423695 // indirect
- github.com/cenkalti/backoff/v4 v4.1.3 // indirect
+ github.com/cenkalti/backoff/v4 v4.2.1 // indirect
  github.com/cespare/xxhash/v2 v2.2.0 // indirect
- github.com/coreos/go-semver v0.3.0 // indirect
- github.com/coreos/go-systemd/v22 v22.4.0 // indirect
+ github.com/coreos/go-semver v0.3.1 // indirect
+ github.com/coreos/go-systemd/v22 v22.5.0 // indirect
  github.com/cppforlife/color v1.9.1-0.20200716202919-6706ac40b835 // indirect
  github.com/davecgh/go-spew v1.1.1 // indirect
- github.com/emicklei/go-restful/v3 v3.10.1 // indirect
+ github.com/emicklei/go-restful/v3 v3.11.0 // indirect
  github.com/evanphx/json-patch v4.12.0+incompatible // indirect
- github.com/evanphx/json-patch/v5 v5.6.0 // indirect
+ github.com/evanphx/json-patch/v5 v5.9.0 // indirect
  github.com/felixge/httpsnoop v1.0.3 // indirect
- github.com/fsnotify/fsnotify v1.6.0 // indirect
+ github.com/fsnotify/fsnotify v1.7.0 // indirect
  github.com/go-logr/stdr v1.2.2 // indirect
- github.com/go-logr/zapr v1.2.4 // indirect
+ github.com/go-logr/zapr v1.3.0 // indirect
  github.com/go-openapi/jsonpointer v0.19.6 // indirect
- github.com/go-openapi/jsonreference v0.20.1 // indirect
+ github.com/go-openapi/jsonreference v0.20.2 // indirect
  github.com/go-openapi/swag v0.22.3 // indirect
  github.com/gobuffalo/flect v0.2.3 // indirect
  github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
- github.com/golang/protobuf v1.5.3 // indirect
- github.com/google/cel-go v0.12.7 // indirect
- github.com/google/gnostic v0.5.7-v3refs // indirect
- github.com/google/gofuzz v1.1.0 // indirect
+ github.com/golang/protobuf v1.5.4 // indirect
+ github.com/google/cel-go v0.17.8 // indirect
+ github.com/google/gnostic-models v0.6.8 // indirect
+ github.com/google/gofuzz v1.2.0 // indirect
  github.com/google/uuid v1.3.0 // indirect
  github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
- github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
+ github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
  github.com/hashicorp/go-version v1.2.1 // indirect
  github.com/imdario/mergo v0.3.12 // indirect
  github.com/inconshreveable/mousetrap v1.1.0 // indirect
@@ -81,54 +81,52 @@ require (
  github.com/mattn/go-colorable v0.1.13 // indirect
  github.com/mattn/go-isatty v0.0.20 // indirect
  github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
- github.com/mitchellh/mapstructure v1.4.1 // indirect
  github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
  github.com/modern-go/reflect2 v1.0.2 // indirect
  github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
  github.com/pkg/errors v0.9.1 // indirect
  github.com/pmezard/go-difflib v1.0.0 // indirect
- github.com/prometheus/common v0.42.0 // indirect
- github.com/prometheus/procfs v0.9.0 // indirect
+ github.com/prometheus/common v0.44.0 // indirect
+ github.com/prometheus/procfs v0.12.0 // indirect
  github.com/spf13/pflag v1.0.5 // indirect
  github.com/stoewer/go-strcase v1.2.0 // indirect
  github.com/vito/go-interact v1.0.1 // indirect
- go.etcd.io/etcd/api/v3 v3.5.9 // indirect
- go.etcd.io/etcd/client/pkg/v3 v3.5.9 // indirect
- go.etcd.io/etcd/client/v3 v3.5.9 // indirect
- go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 // indirect
- go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.1 // indirect
- go.opentelemetry.io/otel v1.10.0 // indirect
- go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0 // indirect
- go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.10.0 // indirect
- go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.10.0 // indirect
- go.opentelemetry.io/otel/metric v0.31.0 // indirect
- go.opentelemetry.io/otel/sdk v1.10.0 // indirect
- go.opentelemetry.io/otel/trace v1.10.0 // indirect
- go.opentelemetry.io/proto/otlp v0.19.0 // indirect
- go.uber.org/atomic v1.7.0 // indirect
- go.uber.org/multierr v1.6.0 // indirect
- go.uber.org/zap v1.24.0 // indirect
- golang.org/x/mod v0.12.0 // indirect
+ go.etcd.io/etcd/api/v3 v3.5.10 // indirect
+ go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
+ go.etcd.io/etcd/client/v3 v3.5.10 // indirect
+ go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0 // indirect
+ go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 // indirect
+ go.opentelemetry.io/otel v1.19.0 // indirect
+ go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect
+ go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 // indirect
+ go.opentelemetry.io/otel/metric v1.19.0 // indirect
+ go.opentelemetry.io/otel/sdk v1.19.0 // indirect
+ go.opentelemetry.io/otel/trace v1.19.0 // indirect
+ go.opentelemetry.io/proto/otlp v1.0.0 // indirect
+ go.uber.org/multierr v1.11.0 // indirect
+ go.uber.org/zap v1.26.0 // indirect
+ golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
+ golang.org/x/mod v0.15.0 // indirect
  golang.org/x/net v0.23.0 // indirect
- golang.org/x/oauth2 v0.10.0 // indirect
+ golang.org/x/oauth2 v0.12.0 // indirect
  golang.org/x/sys v0.18.0 // indirect
  golang.org/x/term v0.18.0 // indirect
  golang.org/x/time v0.3.0 // indirect
- gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
+ gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
  google.golang.org/appengine v1.6.7 // indirect
- google.golang.org/genproto v0.0.0-20230711160842-782d3b101e98 // indirect
- google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98 // indirect
- google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
+ google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect
+ google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e // indirect
+ google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
  google.golang.org/grpc v1.58.3 // indirect
  google.golang.org/protobuf v1.33.0 // indirect
  gopkg.in/inf.v0 v0.9.1 // indirect
- gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
- k8s.io/apiextensions-apiserver v0.27.7 // indirect
- k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
- k8s.io/kms v0.27.7 // indirect
- sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
+ gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
+ k8s.io/apiextensions-apiserver v0.30.1 // indirect
+ k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
+ k8s.io/kms v0.30.1 // indirect
+ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
  sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
- sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
+ sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
 )
 
 replace cloud.google.com/go => cloud.google.com/go v0.60.0