Update Kubernetes to v1.27 and Kustomize to v5.0

Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>

cmd/flux/build_artifact.go

@@ -87,7 +87,7 @@ func buildArtifactCmdRun(cmd *cobra.Command, args []string) error {
 
  logger.Actionf("building artifact from %s", path)
 
- ociClient := oci.NewLocalClient()
+ ociClient := oci.NewClient(oci.DefaultOptions())
  if err := ociClient.Build(buildArtifactArgs.output, path, buildArtifactArgs.ignorePaths); err != nil {
  return fmt.Errorf("bulding artifact failed, error: %w", err)
  }

cmd/flux/diff_artifact.go

@@ -21,10 +21,11 @@ import (
  "fmt"
  "os"
 
- "github.com/fluxcd/flux2/v2/internal/flags"
  oci "github.com/fluxcd/pkg/oci/client"
  sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
  "github.com/spf13/cobra"
+
+ "github.com/fluxcd/flux2/v2/internal/flags"
 )
 
 var diffArtifactCmd = &cobra.Command{
@@ -81,7 +82,7 @@ func diffArtifactCmdRun(cmd *cobra.Command, args []string) error {
  ctx, cancel := context.WithTimeout(context.Background(), rootArgs.timeout)
  defer cancel()
 
- ociClient := oci.NewLocalClient()
+ ociClient := oci.NewClient(oci.DefaultOptions())
 
  if diffArtifactArgs.provider.String() == sourcev1.GenericOCIProvider && diffArtifactArgs.creds != "" {
  logger.Actionf("logging in to registry with credentials")

cmd/flux/list_artifact.go

@@ -78,7 +78,7 @@ func listArtifactsCmdRun(cmd *cobra.Command, args []string) error {
  return err
  }
 
- ociClient := oci.NewLocalClient()
+ ociClient := oci.NewClient(oci.DefaultOptions())
 
  if listArtifactArgs.provider.String() == sourcev1.GenericOCIProvider && listArtifactArgs.creds != "" {
  logger.Actionf("logging in to registry with credentials")

cmd/flux/pull_artifact.go

@@ -21,10 +21,11 @@ import (
  "fmt"
  "os"
 
- "github.com/fluxcd/flux2/v2/internal/flags"
  sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
  "github.com/spf13/cobra"
 
+ "github.com/fluxcd/flux2/v2/internal/flags"
+
  oci "github.com/fluxcd/pkg/oci/client"
 )
 
@@ -82,7 +83,7 @@ func pullArtifactCmdRun(cmd *cobra.Command, args []string) error {
  ctx, cancel := context.WithTimeout(context.Background(), rootArgs.timeout)
  defer cancel()
 
- ociClient := oci.NewLocalClient()
+ ociClient := oci.NewClient(oci.DefaultOptions())
 
  if pullArtifactArgs.provider.String() == sourcev1.GenericOCIProvider && pullArtifactArgs.creds != "" {
  logger.Actionf("logging in to registry with credentials")

cmd/flux/push_artifact.go

@@ -23,12 +23,13 @@ import (
  "os"
  "strings"
 
- "github.com/fluxcd/flux2/v2/internal/flags"
  sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
  reg "github.com/google/go-containerregistry/pkg/name"
  "github.com/spf13/cobra"
  "sigs.k8s.io/yaml"
 
+ "github.com/fluxcd/flux2/v2/internal/flags"
+
  oci "github.com/fluxcd/pkg/oci/client"
 )
 
@@ -183,7 +184,7 @@ func pushArtifactCmdRun(cmd *cobra.Command, args []string) error {
  ctx, cancel := context.WithTimeout(context.Background(), rootArgs.timeout)
  defer cancel()
 
- ociClient := oci.NewLocalClient()
+ ociClient := oci.NewClient(oci.DefaultOptions())
 
  if pushArtifactArgs.provider.String() == sourcev1.GenericOCIProvider && pushArtifactArgs.creds != "" {
  logger.Actionf("logging in to registry with credentials")

cmd/flux/tag_artifact.go

@@ -78,7 +78,7 @@ func tagArtifactCmdRun(cmd *cobra.Command, args []string) error {
  ctx, cancel := context.WithTimeout(context.Background(), rootArgs.timeout)
  defer cancel()
 
- ociClient := oci.NewLocalClient()
+ ociClient := oci.NewClient(oci.DefaultOptions())
 
  if tagArtifactArgs.provider.String() == sourcev1.GenericOCIProvider && tagArtifactArgs.creds != "" {
  logger.Actionf("logging in to registry with credentials")

go.mod

@@ -3,101 +3,101 @@ module github.com/fluxcd/flux2/v2
 go 1.18
 
 require (
- github.com/Masterminds/semver/v3 v3.2.0
- github.com/ProtonMail/go-crypto v0.0.0-20230426101702-58e86b294756
+ github.com/Masterminds/semver/v3 v3.2.1
+ github.com/ProtonMail/go-crypto v0.0.0-20230518184743-7afd39499903
  github.com/cyphar/filepath-securejoin v0.2.3
- github.com/distribution/distribution/v3 v3.0.0-20230327091844-0c958010ace2
+ github.com/distribution/distribution/v3 v3.0.0-20230519140516-983358f8e250
  github.com/fluxcd/go-git-providers v0.15.3
  github.com/fluxcd/go-git/v5 v5.0.0-20221219190809-2e5c9d01cfc4
  github.com/fluxcd/helm-controller/api v0.33.0
  github.com/fluxcd/image-automation-controller/api v0.33.1
  github.com/fluxcd/image-reflector-controller/api v0.27.2
  github.com/fluxcd/kustomize-controller/api v1.0.0-rc.3
  github.com/fluxcd/notification-controller/api v1.0.0-rc.3
- github.com/fluxcd/pkg/apis/event v0.4.1
- github.com/fluxcd/pkg/apis/meta v1.0.0
- github.com/fluxcd/pkg/git v0.11.0
- github.com/fluxcd/pkg/git/gogit v0.8.1
- github.com/fluxcd/pkg/kustomize v1.1.1
- github.com/fluxcd/pkg/oci v0.22.0
- github.com/fluxcd/pkg/runtime v0.35.0
+ github.com/fluxcd/pkg/apis/event v0.5.0
+ github.com/fluxcd/pkg/apis/meta v1.1.0
+ github.com/fluxcd/pkg/git v0.12.1
+ github.com/fluxcd/pkg/git/gogit v0.10.0
+ github.com/fluxcd/pkg/kustomize v1.3.1
+ github.com/fluxcd/pkg/oci v0.26.1
+ github.com/fluxcd/pkg/runtime v0.38.1
  github.com/fluxcd/pkg/sourceignore v0.3.3
- github.com/fluxcd/pkg/ssa v0.27.0
- github.com/fluxcd/pkg/ssh v0.7.3
- github.com/fluxcd/pkg/untar v0.2.0
- github.com/fluxcd/pkg/version v0.2.1
+ github.com/fluxcd/pkg/ssa v0.28.1
+ github.com/fluxcd/pkg/ssh v0.7.4
+ github.com/fluxcd/pkg/untar v0.3.0
+ github.com/fluxcd/pkg/version v0.2.2
  github.com/fluxcd/source-controller/api v1.0.0-rc.3
  github.com/gonvenience/bunt v1.3.5
  github.com/gonvenience/ytbx v1.4.4
  github.com/google/go-cmp v0.5.9
- github.com/google/go-containerregistry v0.14.0
- github.com/homeport/dyff v1.5.6
+ github.com/google/go-containerregistry v0.15.2
+ github.com/homeport/dyff v1.5.7
  github.com/lucasb-eyer/go-colorful v1.2.0
  github.com/manifoldco/promptui v0.9.0
  github.com/mattn/go-shellwords v1.0.12
  github.com/olekukonko/tablewriter v0.0.5
- github.com/onsi/gomega v1.27.6
+ github.com/onsi/gomega v1.27.7
  github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5
  github.com/spf13/cobra v1.7.0
  github.com/spf13/pflag v1.0.5
  github.com/theckman/yacspin v0.13.12
- golang.org/x/crypto v0.8.0
- golang.org/x/term v0.7.0
- k8s.io/api v0.26.3
- k8s.io/apiextensions-apiserver v0.26.3
- k8s.io/apimachinery v0.26.3
- k8s.io/cli-runtime v0.26.3
- k8s.io/client-go v0.26.3
- k8s.io/kubectl v0.26.3
+ golang.org/x/crypto v0.9.0
+ golang.org/x/term v0.8.0
+ k8s.io/api v0.27.2
+ k8s.io/apiextensions-apiserver v0.27.2
+ k8s.io/apimachinery v0.27.2
+ k8s.io/cli-runtime v0.27.2
+ k8s.io/client-go v0.27.2
+ k8s.io/kubectl v0.27.2
  sigs.k8s.io/cli-utils v0.34.0
- sigs.k8s.io/controller-runtime v0.14.6
- sigs.k8s.io/kustomize/api v0.12.1
- sigs.k8s.io/kustomize/kyaml v0.13.9
+ sigs.k8s.io/controller-runtime v0.15.0
+ sigs.k8s.io/kustomize/api v0.13.4
+ sigs.k8s.io/kustomize/kyaml v0.14.2
  sigs.k8s.io/yaml v1.3.0
 )
 
 // Fix CVE-2022-28948
 replace gopkg.in/yaml.v3 => gopkg.in/yaml.v3 v3.0.1
 
 require (
- github.com/Azure/azure-sdk-for-go/sdk/azcore v1.5.0-beta.1 // indirect
- github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.0-beta.4 // indirect
- github.com/Azure/azure-sdk-for-go/sdk/internal v1.1.2 // indirect
+ github.com/Azure/azure-sdk-for-go/sdk/azcore v1.6.0 // indirect
+ github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.0 // indirect
+ github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 // indirect
  github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
- github.com/AzureAD/microsoft-authentication-library-for-go v0.9.0 // indirect
- github.com/BurntSushi/toml v1.0.0 // indirect
+ github.com/AzureAD/microsoft-authentication-library-for-go v1.0.0 // indirect
+ github.com/BurntSushi/toml v1.2.1 // indirect
  github.com/MakeNowJust/heredoc v1.0.0 // indirect
- github.com/Microsoft/go-winio v0.6.0 // indirect
+ github.com/Microsoft/go-winio v0.6.1 // indirect
  github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d // indirect
  github.com/acomagu/bufpipe v1.0.4 // indirect
- github.com/aws/aws-sdk-go-v2 v1.17.7 // indirect
- github.com/aws/aws-sdk-go-v2/config v1.18.19 // indirect
- github.com/aws/aws-sdk-go-v2/credentials v1.13.18 // indirect
- github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.1 // indirect
- github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.31 // indirect
- github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.25 // indirect
- github.com/aws/aws-sdk-go-v2/internal/ini v1.3.32 // indirect
- github.com/aws/aws-sdk-go-v2/service/ecr v1.18.7 // indirect
- github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.25 // indirect
- github.com/aws/aws-sdk-go-v2/service/sso v1.12.6 // indirect
- github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.6 // indirect
- github.com/aws/aws-sdk-go-v2/service/sts v1.18.7 // indirect
+ github.com/aws/aws-sdk-go-v2 v1.18.0 // indirect
+ github.com/aws/aws-sdk-go-v2/config v1.18.25 // indirect
+ github.com/aws/aws-sdk-go-v2/credentials v1.13.24 // indirect
+ github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.3 // indirect
+ github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33 // indirect
+ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.27 // indirect
+ github.com/aws/aws-sdk-go-v2/internal/ini v1.3.34 // indirect
+ github.com/aws/aws-sdk-go-v2/service/ecr v1.18.11 // indirect
+ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.27 // indirect
+ github.com/aws/aws-sdk-go-v2/service/sso v1.12.10 // indirect
+ github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.10 // indirect
+ github.com/aws/aws-sdk-go-v2/service/sts v1.19.0 // indirect
  github.com/aws/smithy-go v1.13.5 // indirect
  github.com/beorn7/perks v1.0.1 // indirect
  github.com/bshuster-repo/logrus-logstash-hook v1.0.0 // indirect
  github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd // indirect
  github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b // indirect
  github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0 // indirect
- github.com/cespare/xxhash/v2 v2.1.2 // indirect
+ github.com/cespare/xxhash/v2 v2.2.0 // indirect
  github.com/chai2010/gettext-go v1.0.2 // indirect
  github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect
  github.com/cloudflare/circl v1.3.3 // indirect
  github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect
  github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
  github.com/davecgh/go-spew v1.1.1 // indirect
- github.com/docker/cli v23.0.1+incompatible // indirect
+ github.com/docker/cli v23.0.5+incompatible // indirect
  github.com/docker/distribution v2.8.2+incompatible // indirect
- github.com/docker/docker v23.0.3+incompatible // indirect
+ github.com/docker/docker v23.0.5+incompatible // indirect
  github.com/docker/docker-credential-helpers v0.7.0 // indirect
  github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
  github.com/docker/go-metrics v0.0.1 // indirect
@@ -111,7 +111,7 @@ require (
  github.com/fatih/color v1.13.0 // indirect
  github.com/felixge/httpsnoop v1.0.3 // indirect
  github.com/fluxcd/pkg/apis/acl v0.1.0 // indirect
- github.com/fluxcd/pkg/apis/kustomize v1.0.0 // indirect
+ github.com/fluxcd/pkg/apis/kustomize v1.1.0 // indirect
  github.com/fluxcd/pkg/tar v0.2.0 // indirect
  github.com/fsnotify/fsnotify v1.6.0 // indirect
  github.com/go-errors/errors v1.4.2 // indirect
@@ -123,7 +123,7 @@ require (
  github.com/go-openapi/jsonreference v0.20.1 // indirect
  github.com/go-openapi/swag v0.22.3 // indirect
  github.com/gogo/protobuf v1.3.2 // indirect
- github.com/golang-jwt/jwt/v4 v4.4.3 // indirect
+ github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
  github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
  github.com/golang/protobuf v1.5.3 // indirect
  github.com/gomodule/redigo v1.8.2 // indirect
@@ -146,14 +146,14 @@ require (
  github.com/hashicorp/go-multierror v1.1.1 // indirect
  github.com/hashicorp/go-retryablehttp v0.7.2 // indirect
  github.com/hashicorp/golang-lru v0.5.4 // indirect
- github.com/imdario/mergo v0.3.13 // indirect
+ github.com/imdario/mergo v0.3.15 // indirect
  github.com/inconshreveable/mousetrap v1.1.0 // indirect
  github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
  github.com/jmespath/go-jmespath v0.4.0 // indirect
  github.com/josharian/intern v1.0.0 // indirect
  github.com/json-iterator/go v1.1.12 // indirect
  github.com/kevinburke/ssh_config v1.2.0 // indirect
- github.com/klauspost/compress v1.16.0 // indirect
+ github.com/klauspost/compress v1.16.5 // indirect
  github.com/kylelemons/godebug v1.1.0 // indirect
  github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
  github.com/mailru/easyjson v0.7.7 // indirect
@@ -167,28 +167,28 @@ require (
  github.com/mitchellh/go-wordwrap v1.0.1 // indirect
  github.com/mitchellh/hashstructure v1.1.0 // indirect
  github.com/moby/spdystream v0.2.0 // indirect
- github.com/moby/term v0.0.0-20221105221325-4eb28fa6025c // indirect
+ github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
  github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
  github.com/modern-go/reflect2 v1.0.2 // indirect
  github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
  github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
  github.com/opencontainers/go-digest v1.0.0 // indirect
- github.com/opencontainers/image-spec v1.1.0-rc2 // indirect
+ github.com/opencontainers/image-spec v1.1.0-rc3 // indirect
  github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
  github.com/pjbgf/sha1cd v0.3.0 // indirect
  github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
  github.com/pkg/errors v0.9.1 // indirect
- github.com/prometheus/client_golang v1.14.0 // indirect
- github.com/prometheus/client_model v0.3.0 // indirect
- github.com/prometheus/common v0.37.0 // indirect
- github.com/prometheus/procfs v0.8.0 // indirect
+ github.com/prometheus/client_golang v1.15.1 // indirect
+ github.com/prometheus/client_model v0.4.0 // indirect
+ github.com/prometheus/common v0.42.0 // indirect
+ github.com/prometheus/procfs v0.9.0 // indirect
  github.com/rivo/uniseg v0.2.0 // indirect
  github.com/russross/blackfriday/v2 v2.1.0 // indirect
  github.com/sergi/go-diff v1.3.1 // indirect
- github.com/sirupsen/logrus v1.9.0 // indirect
- github.com/skeema/knownhosts v1.1.0 // indirect
+ github.com/sirupsen/logrus v1.9.2 // indirect
+ github.com/skeema/knownhosts v1.1.1 // indirect
  github.com/texttheater/golang-levenshtein v1.0.1 // indirect
- github.com/vbatts/tar-split v0.11.2 // indirect
+ github.com/vbatts/tar-split v0.11.3 // indirect
  github.com/virtuald/go-ordered-json v0.0.0-20170621173500-b18e6e673d74 // indirect
  github.com/xanzy/go-gitlab v0.83.0 // indirect
  github.com/xanzy/ssh-agent v0.3.3 // indirect
@@ -197,24 +197,24 @@ require (
  github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50 // indirect
  github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f // indirect
  go.starlark.net v0.0.0-20221028183056-acb66ad56dd2 // indirect
- golang.org/x/mod v0.9.0 // indirect
- golang.org/x/net v0.9.0 // indirect
+ golang.org/x/mod v0.10.0 // indirect
+ golang.org/x/net v0.10.0 // indirect
  golang.org/x/oauth2 v0.7.0 // indirect
- golang.org/x/sync v0.1.0 // indirect
- golang.org/x/sys v0.7.0 // indirect
+ golang.org/x/sync v0.2.0 // indirect
+ golang.org/x/sys v0.8.0 // indirect
  golang.org/x/text v0.9.0 // indirect
  golang.org/x/time v0.3.0 // indirect
- golang.org/x/tools v0.7.0 // indirect
- gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
+ golang.org/x/tools v0.9.1 // indirect
+ gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
  google.golang.org/appengine v1.6.7 // indirect
- google.golang.org/protobuf v1.29.1 // indirect
+ google.golang.org/protobuf v1.30.0 // indirect
  gopkg.in/inf.v0 v0.9.1 // indirect
  gopkg.in/warnings.v0 v0.1.2 // indirect
  gopkg.in/yaml.v2 v2.4.0 // indirect
  gopkg.in/yaml.v3 v3.0.1 // indirect
- k8s.io/component-base v0.26.3 // indirect
- k8s.io/klog/v2 v2.90.1 // indirect
- k8s.io/kube-openapi v0.0.0-20230109183929-3758b55a6596 // indirect
+ k8s.io/component-base v0.27.2 // indirect
+ k8s.io/klog/v2 v2.100.1 // indirect
+ k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
  k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
  sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
  sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect