Skip to content

Commit d828db2

Browse files
authored
Bump operator-manifest-tools dependency (#6316)
- generate bundle now specifies default auth when pulling images Signed-off-by: jberkhahn <jaberkha@us.ibm.com>
1 parent 5edb430 commit d828db2

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ require (
1717
github.com/operator-framework/helm-operator-plugins v0.0.12-0.20230109213218-ebfbea851192
1818
github.com/operator-framework/java-operator-plugins v0.7.1-0.20221007075838-2e24140314fb
1919
github.com/operator-framework/operator-lib v0.11.1-0.20220921174810-791cc547e6c5
20-
github.com/operator-framework/operator-manifest-tools v0.2.3-0.20220901033859-2a7ce32ef673
20+
github.com/operator-framework/operator-manifest-tools v0.2.3-0.20230213223805-9262eb48b716
2121
github.com/operator-framework/operator-registry v1.26.3-0.20220930210947-614d6a955dc0
2222
github.com/prometheus/client_golang v1.13.0
2323
github.com/prometheus/client_model v0.2.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -826,8 +826,8 @@ github.com/operator-framework/java-operator-plugins v0.7.1-0.20221007075838-2e24
826826
github.com/operator-framework/java-operator-plugins v0.7.1-0.20221007075838-2e24140314fb/go.mod h1:OpTW9khbip8t1urqW1siXHIaq397P1aOAi/4BbWdgXo=
827827
github.com/operator-framework/operator-lib v0.11.1-0.20220921174810-791cc547e6c5 h1:j5gsormB+r0rc/aH+VNVIBOb39VAy7TGvJz2MXAWrQQ=
828828
github.com/operator-framework/operator-lib v0.11.1-0.20220921174810-791cc547e6c5/go.mod h1:oXEeSsDYG40pXJtj5CIEsZW8aLLLQ4xB0AmrsB/tKqg=
829-
github.com/operator-framework/operator-manifest-tools v0.2.3-0.20220901033859-2a7ce32ef673 h1:D4yF9mVC3JmpBpLVEMSzBlaJqN8D6WeJ0e/+Szv4l5A=
830-
github.com/operator-framework/operator-manifest-tools v0.2.3-0.20220901033859-2a7ce32ef673/go.mod h1:pYXBtryqeokM8MiCtSsGxQUI/vZgcFLMhEI0gkt9KFI=
829+
github.com/operator-framework/operator-manifest-tools v0.2.3-0.20230213223805-9262eb48b716 h1:PXoHF/J5VFD1OGeY47x+HjL1RKsqW1gaV0w8nt2OAe0=
830+
github.com/operator-framework/operator-manifest-tools v0.2.3-0.20230213223805-9262eb48b716/go.mod h1:pYXBtryqeokM8MiCtSsGxQUI/vZgcFLMhEI0gkt9KFI=
831831
github.com/operator-framework/operator-registry v1.26.3-0.20220930210947-614d6a955dc0 h1:dOC9sDcQwAxMk9BnL9uacOAE+7LpdrOruckovzlzVj0=
832832
github.com/operator-framework/operator-registry v1.26.3-0.20220930210947-614d6a955dc0/go.mod h1:yCJaYiwRDd+Vi+ACtN1QlwRfJB/moStJvtlW+VOyx9o=
833833
github.com/otiai10/copy v1.2.0 h1:HvG945u96iNadPoG2/Ja2+AUJeW5YuFQMixq9yirC+k=

internal/cmd/operator-sdk/generate/bundle/bundle.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,9 @@ func (c bundleCmd) pinImages(manifestPath string) error {
311311
if err != nil {
312312
return err
313313
}
314-
resolver, err := imageresolver.GetResolver(imageresolver.ResolverCrane, nil)
314+
resolverArgs := make(map[string]string)
315+
resolverArgs["usedefault"] = "true"
316+
resolver, err := imageresolver.GetResolver(imageresolver.ResolverCrane, resolverArgs)
315317
if err != nil {
316318
return err
317319
}

0 commit comments

Comments
 (0)