Merge pull request #647 from fluxcd/sops-v3.7.3

config/default/kustomization.yaml

@@ -2,8 +2,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: kustomize-system
 resources:
-- https://github.com/fluxcd/source-controller/releases/download/v0.24.1/source-controller.crds.yaml
-- https://github.com/fluxcd/source-controller/releases/download/v0.24.1/source-controller.deployment.yaml
+- https://github.com/fluxcd/source-controller/releases/download/v0.24.4/source-controller.crds.yaml
+- https://github.com/fluxcd/source-controller/releases/download/v0.24.4/source-controller.deployment.yaml
 - ../crd
 - ../rbac
 - ../manager

controllers/kustomization_decryptor.go

@@ -535,7 +535,7 @@ func (d *KustomizeDecryptor) loadKeyServiceServers() {
  serverOpts = append(serverOpts, intkeyservice.WithAzureToken{Token: d.azureToken})
  }
  server := intkeyservice.NewServer(serverOpts...)
- d.keyServices = append(make([]keyservice.KeyServiceClient, 0), intkeyservice.NewLocalClient(server))
+ d.keyServices = append(make([]keyservice.KeyServiceClient, 0), keyservice.NewCustomLocalClient(server))
 }
 
 // secureLoadKustomizationFile tries to securely load a Kustomization file from

go.mod

@@ -16,25 +16,24 @@ require (
  github.com/fluxcd/pkg/apis/acl v0.0.3
  github.com/fluxcd/pkg/apis/kustomize v0.3.3
  github.com/fluxcd/pkg/apis/meta v0.13.0
- github.com/fluxcd/pkg/kustomize v0.3.0
+ github.com/fluxcd/pkg/kustomize v0.4.0
  github.com/fluxcd/pkg/runtime v0.14.2
  github.com/fluxcd/pkg/ssa v0.15.2
  github.com/fluxcd/pkg/testserver v0.2.0
  github.com/fluxcd/pkg/untar v0.1.0
- github.com/fluxcd/source-controller/api v0.24.1
+ github.com/fluxcd/source-controller/api v0.24.4
  github.com/hashicorp/go-retryablehttp v0.7.1
  github.com/hashicorp/vault/api v1.5.0
  github.com/onsi/gomega v1.19.0
  github.com/ory/dockertest v3.3.5+incompatible
  github.com/spf13/pflag v1.0.5
- go.mozilla.org/sops/v3 v3.7.2
- golang.org/x/net v0.0.0-20220418201149-a630d4f3e7a2
- google.golang.org/grpc v1.45.0
+ go.mozilla.org/sops/v3 v3.7.3
+ golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4
  k8s.io/api v0.23.5
  k8s.io/apiextensions-apiserver v0.23.5
- k8s.io/apimachinery v0.23.5
+ k8s.io/apimachinery v0.23.6
  k8s.io/client-go v0.23.5
- sigs.k8s.io/cli-utils v0.29.4
+ sigs.k8s.io/cli-utils v0.30.0
  sigs.k8s.io/controller-runtime v0.11.2
  sigs.k8s.io/kustomize/api v0.11.4
  sigs.k8s.io/yaml v1.3.0
@@ -59,44 +58,44 @@ replace github.com/opencontainers/runc => github.com/opencontainers/runc v1.0.3
 replace github.com/opencontainers/image-spec => github.com/opencontainers/image-spec v1.0.2
 
 require (
- cloud.google.com/go v0.99.0 // indirect
- github.com/Azure/azure-sdk-for-go v31.2.0+incompatible // indirect
+ cloud.google.com/go/compute v1.5.0 // indirect
+ github.com/Azure/azure-sdk-for-go v63.3.0+incompatible // indirect
  github.com/Azure/azure-sdk-for-go/sdk/internal v0.9.1 // indirect
  github.com/Azure/azure-sdk-for-go/sdk/keyvault/internal v0.2.1 // indirect
  github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
  github.com/Azure/go-autorest v14.2.0+incompatible // indirect
- github.com/Azure/go-autorest/autorest v0.11.19 // indirect
- github.com/Azure/go-autorest/autorest/adal v0.9.14 // indirect
- github.com/Azure/go-autorest/autorest/azure/auth v0.1.0 // indirect
- github.com/Azure/go-autorest/autorest/azure/cli v0.4.2 // indirect
+ github.com/Azure/go-autorest/autorest v0.11.26 // indirect
+ github.com/Azure/go-autorest/autorest/adal v0.9.18 // indirect
+ github.com/Azure/go-autorest/autorest/azure/auth v0.5.11 // indirect
+ github.com/Azure/go-autorest/autorest/azure/cli v0.4.5 // indirect
  github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
- github.com/Azure/go-autorest/autorest/to v0.3.0 // indirect
- github.com/Azure/go-autorest/autorest/validation v0.2.0 // indirect
+ github.com/Azure/go-autorest/autorest/to v0.4.0 // indirect
+ github.com/Azure/go-autorest/autorest/validation v0.3.1 // indirect
  github.com/Azure/go-autorest/logger v0.2.1 // indirect
  github.com/Azure/go-autorest/tracing v0.6.0 // indirect
  github.com/AzureAD/microsoft-authentication-library-for-go v0.4.0 // indirect
  github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd // indirect
- github.com/Microsoft/go-winio v0.4.14 // indirect
+ github.com/Microsoft/go-winio v0.5.2 // indirect
  github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
+ github.com/ProtonMail/go-crypto v0.0.0-20220407094043-a94812496cf5 // indirect
  github.com/PuerkitoBio/purell v1.1.1 // indirect
  github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
  github.com/armon/go-metrics v0.3.10 // indirect
  github.com/armon/go-radix v1.0.0 // indirect
- github.com/aws/aws-sdk-go v1.37.18 // indirect
+ github.com/aws/aws-sdk-go v1.43.43 // indirect
  github.com/beorn7/perks v1.0.1 // indirect
  github.com/blang/semver v3.5.1+incompatible // indirect
  github.com/cenkalti/backoff v2.2.1+incompatible // indirect
- github.com/cenkalti/backoff/v3 v3.0.0 // indirect
+ github.com/cenkalti/backoff/v3 v3.2.2 // indirect
  github.com/cespare/xxhash/v2 v2.1.2 // indirect
  github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 // indirect
- github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc // indirect
+ github.com/containerd/continuity v0.2.2 // indirect
  github.com/davecgh/go-spew v1.1.1 // indirect
  github.com/docker/go-connections v0.4.0 // indirect
  github.com/docker/go-units v0.4.0 // indirect
  github.com/evanphx/json-patch v4.12.0+incompatible // indirect
  github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
  github.com/fatih/color v1.13.0 // indirect
- github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
  github.com/fsnotify/fsnotify v1.5.1 // indirect
  github.com/go-errors/errors v1.0.1 // indirect
  github.com/go-logr/logr v1.2.2 // indirect
@@ -106,6 +105,7 @@ require (
  github.com/go-openapi/swag v0.19.14 // indirect
  github.com/gogo/protobuf v1.3.2 // indirect
  github.com/golang-jwt/jwt v3.2.1+incompatible // indirect
+ github.com/golang-jwt/jwt/v4 v4.3.0 // indirect
  github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
  github.com/golang/protobuf v1.5.2 // indirect
  github.com/golang/snappy v0.0.4 // indirect
@@ -114,57 +114,57 @@ require (
  github.com/google/gofuzz v1.2.0 // indirect
  github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
  github.com/google/uuid v1.3.0 // indirect
- github.com/googleapis/gax-go/v2 v2.1.1 // indirect
+ github.com/googleapis/gax-go/v2 v2.2.0 // indirect
  github.com/googleapis/gnostic v0.5.5 // indirect
  github.com/goware/prefixer v0.0.0-20160118172347-395022866408 // indirect
  github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
  github.com/hashicorp/errwrap v1.1.0 // indirect
  github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
- github.com/hashicorp/go-hclog v1.0.0 // indirect
+ github.com/hashicorp/go-hclog v1.2.0 // indirect
  github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
  github.com/hashicorp/go-multierror v1.1.1 // indirect
  github.com/hashicorp/go-plugin v1.4.3 // indirect
  github.com/hashicorp/go-rootcerts v1.0.2 // indirect
- github.com/hashicorp/go-secure-stdlib/mlock v0.1.1 // indirect
- github.com/hashicorp/go-secure-stdlib/parseutil v0.1.1 // indirect
- github.com/hashicorp/go-secure-stdlib/strutil v0.1.1 // indirect
+ github.com/hashicorp/go-secure-stdlib/mlock v0.1.2 // indirect
+ github.com/hashicorp/go-secure-stdlib/parseutil v0.1.3 // indirect
+ github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
  github.com/hashicorp/go-sockaddr v1.0.2 // indirect
  github.com/hashicorp/go-uuid v1.0.2 // indirect
- github.com/hashicorp/go-version v1.2.0 // indirect
+ github.com/hashicorp/go-version v1.4.0 // indirect
  github.com/hashicorp/golang-lru v0.5.4 // indirect
  github.com/hashicorp/hcl v1.0.0 // indirect
  github.com/hashicorp/vault/sdk v0.4.1 // indirect
- github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d // indirect
- github.com/howeyc/gopass v0.0.0-20170109162249-bf9dde6d0d2c // indirect
+ github.com/hashicorp/yamux v0.0.0-20211028200310-0bc27b27de87 // indirect
+ github.com/howeyc/gopass v0.0.0-20210920133722-c8aef6fb66ef // indirect
  github.com/imdario/mergo v0.3.12 // indirect
  github.com/inconshreveable/mousetrap v1.0.0 // 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/kylelemons/godebug v1.1.0 // indirect
- github.com/lib/pq v1.2.0 // indirect
+ github.com/lib/pq v1.10.5 // indirect
  github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
  github.com/mailru/easyjson v0.7.6 // indirect
  github.com/mattn/go-colorable v0.1.12 // indirect
  github.com/mattn/go-isatty v0.0.14 // indirect
  github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
- github.com/mitchellh/copystructure v1.0.0 // indirect
+ github.com/mitchellh/copystructure v1.2.0 // indirect
  github.com/mitchellh/go-homedir v1.1.0 // indirect
- github.com/mitchellh/go-testing-interface v1.0.0 // indirect
- github.com/mitchellh/go-wordwrap v1.0.0 // indirect
+ github.com/mitchellh/go-testing-interface v1.14.1 // indirect
+ github.com/mitchellh/go-wordwrap v1.0.1 // indirect
  github.com/mitchellh/mapstructure v1.4.3 // indirect
- github.com/mitchellh/reflectwalk v1.0.0 // indirect
+ github.com/mitchellh/reflectwalk v1.0.2 // indirect
  github.com/moby/spdystream v0.2.0 // indirect
  github.com/moby/term v0.0.0-20210610120745-9d4ed1856297 // 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/oklog/run v1.0.0 // indirect
+ github.com/oklog/run v1.1.0 // indirect
  github.com/opencontainers/go-digest v1.0.0 // indirect
- github.com/opencontainers/image-spec v1.0.1 // indirect
- github.com/opencontainers/runc v0.1.1 // indirect
+ github.com/opencontainers/image-spec v1.0.2 // indirect
+ github.com/opencontainers/runc v1.1.0 // indirect
  github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
- github.com/pierrec/lz4 v2.5.2+incompatible // indirect
+ github.com/pierrec/lz4 v2.6.1+incompatible // indirect
  github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4 // indirect
  github.com/pkg/errors v0.9.1 // indirect
  github.com/pmezard/go-difflib v1.0.0 // indirect
@@ -185,19 +185,20 @@ require (
  go.uber.org/multierr v1.6.0 // indirect
  go.uber.org/zap v1.21.0 // indirect
  golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 // indirect
- golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
- golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect
+ golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
+ golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
  golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
  golang.org/x/text v0.3.7 // indirect
- golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
+ golang.org/x/time v0.0.0-20220224211638-0e9765cccd65 // indirect
  gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
- google.golang.org/api v0.62.0 // indirect
+ google.golang.org/api v0.74.0 // indirect
  google.golang.org/appengine v1.6.7 // indirect
- google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
- google.golang.org/protobuf v1.27.1 // indirect
+ google.golang.org/genproto v0.0.0-20220405205423-9d709892a2bf // indirect
+ google.golang.org/grpc v1.45.0 // indirect
+ google.golang.org/protobuf v1.28.0 // indirect
  gopkg.in/inf.v0 v0.9.1 // indirect
- gopkg.in/ini.v1 v1.66.2 // indirect
- gopkg.in/square/go-jose.v2 v2.5.1 // indirect
+ gopkg.in/ini.v1 v1.66.4 // indirect
+ gopkg.in/square/go-jose.v2 v2.6.0 // indirect
  gopkg.in/urfave/cli.v1 v1.20.0 // indirect
  gopkg.in/yaml.v2 v2.4.0 // indirect
  gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect