Skip to content

Add skip-tls-verify and use-http flag support to opm render #908 #909

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 25, 2022
Merged

Add skip-tls-verify and use-http flag support to opm render #908 #909

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions cmd/opm/render/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ import (

"github.com/operator-framework/operator-registry/alpha/action"
"github.com/operator-framework/operator-registry/alpha/declcfg"
"github.com/operator-framework/operator-registry/cmd/opm/internal/util"
containerd "github.com/operator-framework/operator-registry/pkg/image/containerdregistry"
"github.com/operator-framework/operator-registry/pkg/sqlite"
)

Expand Down Expand Up @@ -44,6 +46,29 @@ func NewCmd() *cobra.Command {
// returned from render.Run and logged as fatal errors.
logrus.SetOutput(ioutil.Discard)

skipTLSVerify, useHTTP, err := util.GetTLSOptions(cmd)
if err != nil {
log.Fatal(err)
}

cacheDir, err := os.MkdirTemp("", "render-registry-")
if err != nil {
log.Fatal(err)
}

reg, err := containerd.NewRegistry(
containerd.WithCacheDir(cacheDir),
containerd.SkipTLSVerify(skipTLSVerify),
containerd.WithPlainHTTP(useHTTP),
containerd.WithLog(nullLogger()),
)
if err != nil {
log.Fatalf("creating containerd registry: %v", err)
}
defer reg.Destroy()

render.Registry = reg

cfg, err := render.Run(cmd.Context())
if err != nil {
log.Fatal(err)
Expand All @@ -55,5 +80,13 @@ func NewCmd() *cobra.Command {
},
}
cmd.Flags().StringVarP(&output, "output", "o", "json", "Output format (json|yaml)")
cmd.Flags().Bool("skip-tls-verify", false, "disable TLS verification")
cmd.Flags().Bool("use-http", false, "use plain HTTP")
return cmd
}

func nullLogger() *logrus.Entry {
logger := logrus.New()
logger.SetOutput(ioutil.Discard)
return logrus.NewEntry(logger)
}