Skip to content

Commit a06d799

Browse files
deps(deps): update module github.com/validator-labs/validator-plugin-oci to v0.0.13 (#369)
[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [github.com/validator-labs/validator-plugin-oci](https://togithub.com/validator-labs/validator-plugin-oci) | `v0.0.12` -> `v0.0.13` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fvalidator-labs%2fvalidator-plugin-oci/v0.0.13?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fvalidator-labs%2fvalidator-plugin-oci/v0.0.13?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fvalidator-labs%2fvalidator-plugin-oci/v0.0.12/v0.0.13?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fvalidator-labs%2fvalidator-plugin-oci/v0.0.12/v0.0.13?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>validator-labs/validator-plugin-oci (github.com/validator-labs/validator-plugin-oci)</summary> ### [`v0.0.13`](https://togithub.com/validator-labs/validator-plugin-oci/releases/tag/v0.0.13) [Compare Source](https://togithub.com/validator-labs/validator-plugin-oci/compare/v0.0.12...v0.0.13) ##### Other - add hook to install validator crds in devspace ([#&#8203;237](https://togithub.com/validator-labs/validator-plugin-oci/issues/237)) ([4c51037](https://togithub.com/validator-labs/validator-plugin-oci/commit/4c51037c7527b5b207e7caedada476f775c2f359)) ##### Dependency Updates - **deps:** update github.com/awslabs/amazon-ecr-credential-helper/ecr-login digest to [`a8d7d3c`](https://togithub.com/validator-labs/validator-plugin-oci/commit/a8d7d3c) ([#&#8203;233](https://togithub.com/validator-labs/validator-plugin-oci/issues/233)) ([c422454](https://togithub.com/validator-labs/validator-plugin-oci/commit/c422454310fab330b2ca024b4fc3e5139f0e2ea9)) - **deps:** update module github.com/onsi/gomega to v1.34.1 ([#&#8203;232](https://togithub.com/validator-labs/validator-plugin-oci/issues/232)) ([253a725](https://togithub.com/validator-labs/validator-plugin-oci/commit/253a7250f84c74b5221fe19dfd8c138c185ecd6d)) - **deps:** update module github.com/validator-labs/validator to v0.0.50 ([#&#8203;230](https://togithub.com/validator-labs/validator-plugin-oci/issues/230)) ([febe051](https://togithub.com/validator-labs/validator-plugin-oci/commit/febe051a38bfa162ee01cef58001da82fcc3a966)) - **deps:** update module github.com/validator-labs/validator to v0.0.51 ([#&#8203;234](https://togithub.com/validator-labs/validator-plugin-oci/issues/234)) ([1f82f08](https://togithub.com/validator-labs/validator-plugin-oci/commit/1f82f08aabc579a303fa1224d7ef94dfe90a6934)) - **deps:** update module github.com/validator-labs/validator to v0.1.0 ([#&#8203;236](https://togithub.com/validator-labs/validator-plugin-oci/issues/236)) ([4a997be](https://togithub.com/validator-labs/validator-plugin-oci/commit/4a997be722b6f8661be75fa109442accc0fdf573)) ##### Refactoring - derive authn keychain from host ([#&#8203;238](https://togithub.com/validator-labs/validator-plugin-oci/issues/238)) ([a9a3fda](https://togithub.com/validator-labs/validator-plugin-oci/commit/a9a3fda957ef2035a7d188a8474a333ece4e4979)) - support direct rule evaluation ([#&#8203;240](https://togithub.com/validator-labs/validator-plugin-oci/issues/240)) ([9761384](https://togithub.com/validator-labs/validator-plugin-oci/commit/9761384be3bdef61060d28c1394bf8ab542ba69d)) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View the [repository job log](https://developer.mend.io/github/validator-labs/validator). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy40NDAuNyIsInVwZGF0ZWRJblZlciI6IjM3LjQ0MC43IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiLCJnbyJdfQ==--> --------- Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Signed-off-by: Tyler Gillson <[email protected]> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Tyler Gillson <[email protected]>
1 parent 254ee6b commit a06d799

File tree

4 files changed

+31
-30
lines changed

4 files changed

+31
-30
lines changed

go.mod

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require (
1111
github.com/onsi/gomega v1.34.1
1212
github.com/pkg/errors v0.9.1
1313
github.com/slack-go/slack v0.13.1
14-
github.com/validator-labs/validator-plugin-oci v0.0.12
14+
github.com/validator-labs/validator-plugin-oci v0.0.13
1515
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
1616
k8s.io/api v0.30.3
1717
k8s.io/apimachinery v0.30.3
@@ -49,21 +49,21 @@ require (
4949
github.com/aliyun/credentials-go v1.3.1 // indirect
5050
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
5151
github.com/aws/aws-sdk-go-v2 v1.30.3 // indirect
52-
github.com/aws/aws-sdk-go-v2/config v1.27.26 // indirect
53-
github.com/aws/aws-sdk-go-v2/credentials v1.17.26 // indirect
52+
github.com/aws/aws-sdk-go-v2/config v1.27.27 // indirect
53+
github.com/aws/aws-sdk-go-v2/credentials v1.17.27 // indirect
5454
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.11 // indirect
5555
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.15 // indirect
5656
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.15 // indirect
5757
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 // indirect
58-
github.com/aws/aws-sdk-go-v2/service/ecr v1.30.3 // indirect
59-
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.25.1 // indirect
58+
github.com/aws/aws-sdk-go-v2/service/ecr v1.31.0 // indirect
59+
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.25.3 // indirect
6060
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.3 // indirect
6161
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.17 // indirect
62-
github.com/aws/aws-sdk-go-v2/service/sso v1.22.3 // indirect
62+
github.com/aws/aws-sdk-go-v2/service/sso v1.22.4 // indirect
6363
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.4 // indirect
6464
github.com/aws/aws-sdk-go-v2/service/sts v1.30.3 // indirect
6565
github.com/aws/smithy-go v1.20.3 // indirect
66-
github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.0.0-20240708141356-efa334f881fc // indirect
66+
github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.0.0-20240730143543-a8d7d3c42ca1 // indirect
6767
github.com/beorn7/perks v1.0.1 // indirect
6868
github.com/blang/semver v3.5.1+incompatible // indirect
6969
github.com/blang/semver/v4 v4.0.0 // indirect

go.sum

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -137,10 +137,10 @@ github.com/aws/aws-sdk-go v1.54.19 h1:tyWV+07jagrNiCcGRzRhdtVjQs7Vy41NwsuOcl0IbV
137137
github.com/aws/aws-sdk-go v1.54.19/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU=
138138
github.com/aws/aws-sdk-go-v2 v1.30.3 h1:jUeBtG0Ih+ZIFH0F4UkmL9w3cSpaMv9tYYDbzILP8dY=
139139
github.com/aws/aws-sdk-go-v2 v1.30.3/go.mod h1:nIQjQVp5sfpQcTc9mPSr1B0PaWK5ByX9MOoDadSN4lc=
140-
github.com/aws/aws-sdk-go-v2/config v1.27.26 h1:T1kAefbKuNum/AbShMsZEro6eRkeOT8YILfE9wyjAYQ=
141-
github.com/aws/aws-sdk-go-v2/config v1.27.26/go.mod h1:ivWHkAWFrw/nxty5Fku7soTIVdqZaZ7dw+tc5iGW3GA=
142-
github.com/aws/aws-sdk-go-v2/credentials v1.17.26 h1:tsm8g/nJxi8+/7XyJJcP2dLrnK/5rkFp6+i2nhmz5fk=
143-
github.com/aws/aws-sdk-go-v2/credentials v1.17.26/go.mod h1:3vAM49zkIa3q8WT6o9Ve5Z0vdByDMwmdScO0zvThTgI=
140+
github.com/aws/aws-sdk-go-v2/config v1.27.27 h1:HdqgGt1OAP0HkEDDShEl0oSYa9ZZBSOmKpdpsDMdO90=
141+
github.com/aws/aws-sdk-go-v2/config v1.27.27/go.mod h1:MVYamCg76dFNINkZFu4n4RjDixhVr51HLj4ErWzrVwg=
142+
github.com/aws/aws-sdk-go-v2/credentials v1.17.27 h1:2raNba6gr2IfA0eqqiP2XiQ0UVOpGPgDSi0I9iAP+UI=
143+
github.com/aws/aws-sdk-go-v2/credentials v1.17.27/go.mod h1:gniiwbGahQByxan6YjQUMcW4Aov6bLC3m+evgcoN4r4=
144144
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.11 h1:KreluoV8FZDEtI6Co2xuNk/UqI9iwMrOx/87PBNIKqw=
145145
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.11/go.mod h1:SeSUYBLsMYFoRvHE0Tjvn7kbxaUhl75CJi1sbfhMxkU=
146146
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.15 h1:SoNJ4RlFEQEbtDcCEt+QG56MY4fm4W8rYirAmq+/DdU=
@@ -149,26 +149,26 @@ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.15 h1:C6WHdGnTDIYETAm5iE
149149
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.15/go.mod h1:ZQLZqhcu+JhSrA9/NXRm8SkDvsycE+JkV3WGY41e+IM=
150150
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 h1:hT8rVHwugYE2lEfdFE0QWVo81lF7jMrYJVDWI+f+VxU=
151151
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0/go.mod h1:8tu/lYfQfFe6IGnaOdrpVgEL2IrrDOf6/m9RQum4NkY=
152-
github.com/aws/aws-sdk-go-v2/service/ecr v1.30.3 h1:+v2hv29pWaVDASIScHuUhDC93nqJGVlGf6cujrJMHZE=
153-
github.com/aws/aws-sdk-go-v2/service/ecr v1.30.3/go.mod h1:RhaP7Wil0+uuuhiE4FzOOEFZwkmFAk1ZflXzK+O3ptU=
154-
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.25.1 h1:54/7zy+oA2ep9UzWjAtccawCj3ZAXhMXxwBg0yNRxTA=
155-
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.25.1/go.mod h1:2UjSvHCwdRoPF17osaRvfBXuo32KPSvTlGMii5YbjyU=
152+
github.com/aws/aws-sdk-go-v2/service/ecr v1.31.0 h1:vi/MwojjLGATEEUFn2GEdLiom7CFlB+qCIx4tDWqKfQ=
153+
github.com/aws/aws-sdk-go-v2/service/ecr v1.31.0/go.mod h1:RhaP7Wil0+uuuhiE4FzOOEFZwkmFAk1ZflXzK+O3ptU=
154+
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.25.3 h1:n2eqzO9VabUkd77b88Hos6OEtbGohB/TRrtXLTZi38Y=
155+
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.25.3/go.mod h1:Oy3yHBGkKtTmsn6iJGEZxytzZQrEvoFRWldB4XmzlO4=
156156
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.3 h1:dT3MqvGhSoaIhRseqw2I0yH81l7wiR2vjs57O51EAm8=
157157
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.3/go.mod h1:GlAeCkHwugxdHaueRr4nhPuY+WW+gR8UjlcqzPr1SPI=
158158
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.17 h1:HGErhhrxZlQ044RiM+WdoZxp0p+EGM62y3L6pwA4olE=
159159
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.17/go.mod h1:RkZEx4l0EHYDJpWppMJ3nD9wZJAa8/0lq9aVC+r2UII=
160160
github.com/aws/aws-sdk-go-v2/service/kms v1.35.1 h1:0gP2OJJT6HM2BYltZ9x+A87OE8LJL96DXeAAdLv3t1M=
161161
github.com/aws/aws-sdk-go-v2/service/kms v1.35.1/go.mod h1:hGONorZkQCfR5DW6l2xdy7zC8vfO0r9pJlwyg6gmGeo=
162-
github.com/aws/aws-sdk-go-v2/service/sso v1.22.3 h1:Fv1vD2L65Jnp5QRsdiM64JvUM4Xe+E0JyVsRQKv6IeA=
163-
github.com/aws/aws-sdk-go-v2/service/sso v1.22.3/go.mod h1:ooyCOXjvJEsUw7x+ZDHeISPMhtwI3ZCB7ggFMcFfWLU=
162+
github.com/aws/aws-sdk-go-v2/service/sso v1.22.4 h1:BXx0ZIxvrJdSgSvKTZ+yRBeSqqgPM89VPlulEcl37tM=
163+
github.com/aws/aws-sdk-go-v2/service/sso v1.22.4/go.mod h1:ooyCOXjvJEsUw7x+ZDHeISPMhtwI3ZCB7ggFMcFfWLU=
164164
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.4 h1:yiwVzJW2ZxZTurVbYWA7QOrAaCYQR72t0wrSBfoesUE=
165165
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.4/go.mod h1:0oxfLkpz3rQ/CHlx5hB7H69YUpFiI1tql6Q6Ne+1bCw=
166166
github.com/aws/aws-sdk-go-v2/service/sts v1.30.3 h1:ZsDKRLXGWHk8WdtyYMoGNO7bTudrvuKpDKgMVRlepGE=
167167
github.com/aws/aws-sdk-go-v2/service/sts v1.30.3/go.mod h1:zwySh8fpFyXp9yOr/KVzxOl8SRqgf/IDw5aUt9UKFcQ=
168168
github.com/aws/smithy-go v1.20.3 h1:ryHwveWzPV5BIof6fyDvor6V3iUL7nTfiTKXHiW05nE=
169169
github.com/aws/smithy-go v1.20.3/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E=
170-
github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.0.0-20240708141356-efa334f881fc h1:i/hSTHoe0WO1I7N5BCyB3Ei6PDtOXn82e3YSs9W4F4Y=
171-
github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.0.0-20240708141356-efa334f881fc/go.mod h1:vSzBu9U6tslAOAc0l7k5kx2ipWxrNezy0LZEWK3472A=
170+
github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.0.0-20240730143543-a8d7d3c42ca1 h1:KzgMB9L9rxpYY7TVVZLQCn2JUdJyRsIKVzxd6KzJSKY=
171+
github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.0.0-20240730143543-a8d7d3c42ca1/go.mod h1:yRvLJAL/+VxKEc103WbeojloNH9Da5YKkY72PCg/r4s=
172172
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
173173
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
174174
github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ=
@@ -642,8 +642,8 @@ github.com/tjfoc/gmsm v1.4.1 h1:aMe1GlZb+0bLjn+cKTPEvvn9oUEBlJitaZiiBwsbgho=
642642
github.com/tjfoc/gmsm v1.4.1/go.mod h1:j4INPkHWMrhJb38G+J6W4Tw0AbuN8Thu3PbdVYhVcTE=
643643
github.com/transparency-dev/merkle v0.0.2 h1:Q9nBoQcZcgPamMkGn7ghV8XiTZ/kRxn1yCG81+twTK4=
644644
github.com/transparency-dev/merkle v0.0.2/go.mod h1:pqSy+OXefQ1EDUVmAJ8MUhHB9TXGuzVAT58PqBoHz1A=
645-
github.com/validator-labs/validator-plugin-oci v0.0.12 h1:+mnmiztZDqSyhc2GTZj1yA4Tdax/RVWcimfvj/m+UAs=
646-
github.com/validator-labs/validator-plugin-oci v0.0.12/go.mod h1:kG1oxwR7ggn1coEF6LIeGPjirwsIjkMkYe0IxIu86pA=
645+
github.com/validator-labs/validator-plugin-oci v0.0.13 h1:KBiB1vPj+9LI1Kyy+1wW0+dHhp6BHrNCVcKm9/wqKO8=
646+
github.com/validator-labs/validator-plugin-oci v0.0.13/go.mod h1:ueXJoh4cnEUFz/V0JcBBOKjYSnMQ7gxOUPguznFd8sE=
647647
github.com/vbatts/tar-split v0.11.5 h1:3bHCTIheBm1qFTcgh9oPu+nNBtX+XJIupG/vacinCts=
648648
github.com/vbatts/tar-split v0.11.5/go.mod h1:yZbwRsSeGjusneWgA781EKej9HF8vme8okylkAeNKLk=
649649
github.com/xanzy/go-gitlab v0.107.0 h1:P2CT9Uy9yN9lJo3FLxpMZ4xj6uWcpnigXsjvqJ6nd2Y=

hauler-manifest.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,4 @@ metadata:
5757
spec:
5858
files:
5959
- name: validatorctl
60-
path: https://github.com/validator-labs/validatorctl/releases/download/v0.0.6/validator-linux-amd64
60+
path: https://github.com/validator-labs/validatorctl/releases/download/v0.1.0/validator-linux-amd64

internal/controller/validatorconfig_controller.go

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ import (
4343

4444
"buf.build/gen/go/spectrocloud/spectro-cleanup/connectrpc/go/cleanup/v1/cleanupv1connect"
4545
cleanv1 "buf.build/gen/go/spectrocloud/spectro-cleanup/protocolbuffers/go/cleanup/v1"
46-
"github.com/validator-labs/validator-plugin-oci/pkg/oci"
46+
ociauth "github.com/validator-labs/validator-plugin-oci/pkg/auth"
47+
ocic "github.com/validator-labs/validator-plugin-oci/pkg/ociclient"
4748

4849
v1alpha1 "github.com/validator-labs/validator/api/v1alpha1"
4950
"github.com/validator-labs/validator/pkg/helm"
@@ -184,25 +185,25 @@ func (r *ValidatorConfigReconciler) redeployIfNeeded(ctx context.Context, vc *v1
184185
}
185186

186187
var cleanupLocalChart bool
187-
if strings.HasPrefix(helmConfig.Registry, oci.Scheme) {
188+
if strings.HasPrefix(helmConfig.Registry, ocic.Scheme) {
188189
r.Log.V(0).Info("Pulling plugin Helm chart", "name", p.Chart.Name)
189190

190191
opts.Path = fmt.Sprintf("/charts/%s", opts.Chart)
191192
opts.Version = strings.TrimPrefix(opts.Version, "v")
192193

193194
// use OCI client instead of Helm client due to https://github.com/helm/helm/issues/12810
194-
ociClient, err := oci.NewOCIClient(
195-
oci.WithBasicAuth(opts.Username, opts.Password),
196-
oci.WithMultiAuth(),
197-
oci.WithTLSConfig(opts.InsecureSkipTLSVerify, "", opts.CaFile),
195+
ociClient, err := ocic.NewOCIClient(
196+
ocic.WithBasicAuth(opts.Username, opts.Password),
197+
ocic.WithMultiAuth(ociauth.GetKeychain(opts.Registry)),
198+
ocic.WithTLSConfig(opts.InsecureSkipTLSVerify, "", opts.CaFile),
198199
)
199200
if err != nil {
200201
r.Log.V(0).Error(err, "failed to create OCI client")
201202
conditions[i] = r.buildHelmChartCondition(p.Chart.Name, err)
202203
continue
203204
}
204-
ociOpts := oci.ImageOptions{
205-
Ref: fmt.Sprintf("%s/%s:%s", strings.TrimPrefix(opts.Registry, oci.Scheme), opts.Repo, opts.Version),
205+
ociOpts := ocic.ImageOptions{
206+
Ref: fmt.Sprintf("%s/%s:%s", strings.TrimPrefix(opts.Registry, ocic.Scheme), opts.Repo, opts.Version),
206207
OutDir: opts.Path,
207208
OutFile: opts.Chart,
208209
}

0 commit comments

Comments
 (0)