Skip to content

Commit bffedd5

Browse files
Merge pull request #317 from haarchri/feature/registry-auth
2 parents e55bb3d + cfb76c7 commit bffedd5

File tree

10 files changed

+790
-162
lines changed

10 files changed

+790
-162
lines changed

apis/cluster/release/v1beta1/types.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@ type ChartSpec struct {
3535
Version string `json:"version,omitempty"`
3636
// URL to chart package (typically .tgz), optional and overrides others fields in the spec
3737
URL string `json:"url,omitempty"`
38-
// PullSecretRef is reference to the secret containing credentials to helm repository
38+
// PullSecretRef is reference to the secret containing credentials to helm repository.
39+
// The secret must contain 'username' and 'password' keys. Optional - if not provided,
40+
// the default credential chain is used (AWS IRSA, Azure/GCP Workload Identity, etc.).
3941
PullSecretRef xpv1.SecretReference `json:"pullSecretRef,omitempty"`
4042
}
4143

apis/namespaced/release/v1beta1/types.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@ type ChartSpec struct {
3636
Version string `json:"version,omitempty"`
3737
// URL to chart package (typically .tgz), optional and overrides others fields in the spec
3838
URL string `json:"url,omitempty"`
39-
// PullSecretRef is reference to the secret containing credentials to helm repository
39+
// PullSecretRef is reference to the secret containing credentials to helm repository.
40+
// The secret must contain 'username' and 'password' keys. Optional - if not provided,
41+
// the default credential chain is used (AWS IRSA, Azure/GCP Workload Identity, etc.).
4042
PullSecretRef xpv1.LocalSecretReference `json:"pullSecretRef,omitempty"`
4143
}
4244

go.mod

Lines changed: 62 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -6,38 +6,44 @@ tool golang.org/x/tools/cmd/goimports
66

77
require (
88
github.com/alecthomas/kingpin/v2 v2.4.0
9+
github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.11.0
10+
github.com/chrismellard/docker-credential-acr-env v0.0.0-20230304212654-82a0ddb27589
911
github.com/crossplane-contrib/provider-kubernetes v1.2.0
1012
github.com/crossplane/crossplane-runtime/v2 v2.0.0-rc.1
1113
github.com/crossplane/crossplane-tools v0.0.0-20250731192036-00d407d8b7ec
1214
github.com/google/go-cmp v0.7.0
15+
github.com/google/go-containerregistry v0.20.7
1316
github.com/pkg/errors v0.9.1
1417
go.uber.org/zap v1.27.0
1518
google.golang.org/grpc v1.68.1
1619
helm.sh/helm/v3 v3.18.5
17-
k8s.io/api v0.33.3
20+
k8s.io/api v0.34.2
1821
k8s.io/apiextensions-apiserver v0.33.3
19-
k8s.io/apimachinery v0.33.3
20-
k8s.io/client-go v0.33.3
22+
k8s.io/apimachinery v0.34.2
23+
k8s.io/client-go v0.34.2
2124
sigs.k8s.io/controller-runtime v0.19.1
2225
sigs.k8s.io/controller-tools v0.18.0
2326
sigs.k8s.io/kustomize/api v0.19.0
2427
sigs.k8s.io/kustomize/kyaml v0.19.0
25-
sigs.k8s.io/yaml v1.5.0
28+
sigs.k8s.io/yaml v1.6.0
2629
)
2730

2831
require (
29-
cloud.google.com/go/compute/metadata v0.5.0 // indirect
32+
cloud.google.com/go/compute/metadata v0.7.0 // indirect
3033
dario.cat/mergo v1.0.1 // indirect
34+
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible // indirect
3135
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.12.0 // indirect
3236
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.6.0 // indirect
3337
github.com/Azure/azure-sdk-for-go/sdk/internal v1.9.0 // indirect
3438
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
3539
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
36-
github.com/Azure/go-autorest/autorest v0.11.29 // indirect
37-
github.com/Azure/go-autorest/autorest/adal v0.9.23 // indirect
38-
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
39-
github.com/Azure/go-autorest/logger v0.2.1 // indirect
40-
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
40+
github.com/Azure/go-autorest/autorest v0.11.30 // indirect
41+
github.com/Azure/go-autorest/autorest/adal v0.9.24 // indirect
42+
github.com/Azure/go-autorest/autorest/azure/auth v0.5.13 // indirect
43+
github.com/Azure/go-autorest/autorest/azure/cli v0.4.7 // indirect
44+
github.com/Azure/go-autorest/autorest/date v0.3.1 // indirect
45+
github.com/Azure/go-autorest/logger v0.2.2 // indirect
46+
github.com/Azure/go-autorest/tracing v0.6.1 // indirect
4147
github.com/Azure/kubelogin v0.1.4 // indirect
4248
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
4349
github.com/BurntSushi/toml v1.5.0 // indirect
@@ -48,52 +54,58 @@ require (
4854
github.com/Masterminds/squirrel v1.5.4 // indirect
4955
github.com/alecthomas/units v0.0.0-20240927000941-0f3dac36c52b // indirect
5056
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
51-
github.com/aws/aws-sdk-go-v2 v1.39.4 // indirect
52-
github.com/aws/aws-sdk-go-v2/config v1.31.15 // indirect
53-
github.com/aws/aws-sdk-go-v2/credentials v1.18.19 // indirect
54-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.11 // indirect
55-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.11 // indirect
56-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.11 // indirect
57+
github.com/aws/aws-sdk-go-v2 v1.39.6 // indirect
58+
github.com/aws/aws-sdk-go-v2/config v1.31.17 // indirect
59+
github.com/aws/aws-sdk-go-v2/credentials v1.18.21 // indirect
60+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.13 // indirect
61+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.13 // indirect
62+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.13 // indirect
5763
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 // indirect
58-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.2 // indirect
59-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.11 // indirect
60-
github.com/aws/aws-sdk-go-v2/service/sso v1.29.8 // indirect
61-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.3 // indirect
62-
github.com/aws/aws-sdk-go-v2/service/sts v1.38.9 // indirect
63-
github.com/aws/smithy-go v1.23.1 // indirect
64+
github.com/aws/aws-sdk-go-v2/service/ecr v1.51.2 // indirect
65+
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.38.2 // indirect
66+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.3 // indirect
67+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.13 // indirect
68+
github.com/aws/aws-sdk-go-v2/service/sso v1.30.1 // indirect
69+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.5 // indirect
70+
github.com/aws/aws-sdk-go-v2/service/sts v1.39.1 // indirect
71+
github.com/aws/smithy-go v1.23.2 // indirect
6472
github.com/beorn7/perks v1.0.1 // indirect
6573
github.com/blang/semver/v4 v4.0.0 // indirect
6674
github.com/cespare/xxhash/v2 v2.3.0 // indirect
6775
github.com/chai2010/gettext-go v1.0.2 // indirect
6876
github.com/containerd/containerd v1.7.29 // indirect
69-
github.com/containerd/errdefs v0.3.0 // indirect
77+
github.com/containerd/errdefs v1.0.0 // indirect
7078
github.com/containerd/log v0.1.0 // indirect
7179
github.com/containerd/platforms v0.2.1 // indirect
7280
github.com/crossplane/crossplane-runtime v1.20.0 // indirect
7381
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
7482
github.com/dave/jennifer v1.7.1 // indirect
7583
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
76-
github.com/emicklei/go-restful/v3 v3.11.2 // indirect
84+
github.com/dimchansky/utfbom v1.1.1 // indirect
85+
github.com/docker/cli v29.0.3+incompatible // indirect
86+
github.com/docker/distribution v2.8.3+incompatible // indirect
87+
github.com/docker/docker-credential-helpers v0.9.4 // indirect
88+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
7789
github.com/evanphx/json-patch v5.9.11+incompatible // indirect
7890
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
7991
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
8092
github.com/fatih/color v1.18.0 // indirect
8193
github.com/fsnotify/fsnotify v1.7.0 // indirect
82-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
94+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
8395
github.com/go-errors/errors v1.4.2 // indirect
8496
github.com/go-gorp/gorp/v3 v3.1.0 // indirect
85-
github.com/go-logr/logr v1.4.2 // indirect
97+
github.com/go-logr/logr v1.4.3 // indirect
8698
github.com/go-logr/zapr v1.3.0 // indirect
87-
github.com/go-openapi/jsonpointer v0.21.0 // indirect
88-
github.com/go-openapi/jsonreference v0.20.4 // indirect
89-
github.com/go-openapi/swag v0.23.0 // indirect
99+
github.com/go-openapi/jsonpointer v0.21.1 // indirect
100+
github.com/go-openapi/jsonreference v0.21.0 // indirect
101+
github.com/go-openapi/swag v0.23.1 // indirect
90102
github.com/gobuffalo/flect v1.0.3 // indirect
91103
github.com/gobwas/glob v0.2.3 // indirect
92104
github.com/gogo/protobuf v1.3.2 // indirect
93105
github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
94106
github.com/golang-jwt/jwt/v5 v5.2.2 // indirect
95107
github.com/google/btree v1.1.3 // indirect
96-
github.com/google/gnostic-models v0.6.9 // indirect
108+
github.com/google/gnostic-models v0.7.0 // indirect
97109
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
98110
github.com/google/uuid v1.6.0 // indirect
99111
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
@@ -106,30 +118,32 @@ require (
106118
github.com/jmoiron/sqlx v1.4.0 // indirect
107119
github.com/josharian/intern v1.0.0 // indirect
108120
github.com/json-iterator/go v1.1.12 // indirect
109-
github.com/klauspost/compress v1.18.0 // indirect
121+
github.com/klauspost/compress v1.18.1 // indirect
110122
github.com/kylelemons/godebug v1.1.0 // indirect
111123
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
112124
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
113125
github.com/lib/pq v1.10.9 // indirect
114126
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
115-
github.com/mailru/easyjson v0.7.7 // indirect
127+
github.com/mailru/easyjson v0.9.0 // indirect
116128
github.com/mattn/go-colorable v0.1.13 // indirect
117129
github.com/mattn/go-isatty v0.0.20 // indirect
118130
github.com/mattn/go-runewidth v0.0.13 // indirect
119131
github.com/mitchellh/copystructure v1.2.0 // indirect
132+
github.com/mitchellh/go-homedir v1.1.0 // indirect
120133
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
121134
github.com/mitchellh/reflectwalk v1.0.2 // indirect
122135
github.com/moby/spdystream v0.5.0 // indirect
123136
github.com/moby/term v0.5.2 // indirect
124137
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
125-
github.com/modern-go/reflect2 v1.0.2 // indirect
138+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
126139
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
127140
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
128141
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
129142
github.com/opencontainers/go-digest v1.0.0 // indirect
130143
github.com/opencontainers/image-spec v1.1.1 // indirect
131144
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
132145
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
146+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
133147
github.com/prometheus/client_golang v1.22.0 // indirect
134148
github.com/prometheus/client_model v0.6.1 // indirect
135149
github.com/prometheus/common v0.62.0 // indirect
@@ -142,49 +156,50 @@ require (
142156
github.com/sirupsen/logrus v1.9.3 // indirect
143157
github.com/spf13/afero v1.11.0 // indirect
144158
github.com/spf13/cast v1.7.0 // indirect
145-
github.com/spf13/cobra v1.9.1 // indirect
146-
github.com/spf13/pflag v1.0.7 // indirect
159+
github.com/spf13/cobra v1.10.1 // indirect
160+
github.com/spf13/pflag v1.0.9 // indirect
147161
github.com/upbound/up-sdk-go v1.13.0 // indirect
148162
github.com/x448/float16 v0.8.4 // indirect
149163
github.com/xhit/go-str2duration/v2 v2.1.0 // indirect
150164
github.com/xlab/treeprint v1.2.0 // indirect
151-
go.opentelemetry.io/otel v1.33.0 // indirect
152-
go.opentelemetry.io/otel/trace v1.33.0 // indirect
165+
go.opentelemetry.io/otel v1.36.0 // indirect
166+
go.opentelemetry.io/otel/trace v1.36.0 // indirect
153167
go.uber.org/multierr v1.11.0 // indirect
154168
go.yaml.in/yaml/v2 v2.4.2 // indirect
155-
go.yaml.in/yaml/v3 v3.0.3 // indirect
169+
go.yaml.in/yaml/v3 v3.0.4 // indirect
156170
golang.org/x/crypto v0.45.0 // indirect
157171
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
158-
golang.org/x/mod v0.29.0 // indirect
172+
golang.org/x/mod v0.30.0 // indirect
159173
golang.org/x/net v0.47.0 // indirect
160-
golang.org/x/oauth2 v0.30.0 // indirect
174+
golang.org/x/oauth2 v0.33.0 // indirect
161175
golang.org/x/sync v0.18.0 // indirect
162176
golang.org/x/sys v0.38.0 // indirect
163-
golang.org/x/telemetry v0.0.0-20251008203120-078029d740a8 // indirect
177+
golang.org/x/telemetry v0.0.0-20251111182119-bc8e575c7b54 // indirect
164178
golang.org/x/term v0.37.0 // indirect
165179
golang.org/x/text v0.31.0 // indirect
166180
golang.org/x/time v0.12.0 // indirect
167-
golang.org/x/tools v0.38.0 // indirect
181+
golang.org/x/tools v0.39.0 // indirect
168182
golang.org/x/tools/go/expect v0.1.0-deprecated // indirect
169183
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
170184
google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
171-
google.golang.org/protobuf v1.36.5 // indirect
185+
google.golang.org/protobuf v1.36.6 // indirect
172186
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
173187
gopkg.in/inf.v0 v0.9.1 // indirect
174188
gopkg.in/retry.v1 v1.0.3 // indirect
175189
gopkg.in/yaml.v2 v2.4.0 // indirect
176190
gopkg.in/yaml.v3 v3.0.1 // indirect
191+
gotest.tools/v3 v3.1.0 // indirect
177192
k8s.io/apiserver v0.33.3 // indirect
178193
k8s.io/cli-runtime v0.33.3 // indirect
179194
k8s.io/code-generator v0.33.3 // indirect
180195
k8s.io/component-base v0.33.3 // indirect
181-
k8s.io/gengo/v2 v2.0.0-20250207200755-1244d31929d7 // indirect
196+
k8s.io/gengo/v2 v2.0.0-20250604051438-85fd79dbfd9f // indirect
182197
k8s.io/klog/v2 v2.130.1 // indirect
183-
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
198+
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
184199
k8s.io/kubectl v0.33.3 // indirect
185-
k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e // indirect
200+
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
186201
oras.land/oras-go/v2 v2.6.0 // indirect
187202
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
188203
sigs.k8s.io/randfill v1.0.0 // indirect
189-
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
204+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
190205
)

0 commit comments

Comments
 (0)