From 402e4d9e2e18a1dfda34a0b4f05e8cbc0cdc52ca Mon Sep 17 00:00:00 2001
From: Tom Runyon <tom@defenseunicorns.com>
Date: Tue, 27 Dec 2022 15:32:00 -0500
Subject: [PATCH] Add HTTP support for OCI artifacts

Signed-off-by: Tom Runyon <runyontr@gmail.com>
Signed-off-by: Tom Runyon <tom@defenseunicorns.com>
---
 cmd/helm/push.go                | 12 ------------
 pkg/registry/client_tls_test.go |  5 -----
 2 files changed, 17 deletions(-)

diff --git a/cmd/helm/push.go b/cmd/helm/push.go
index 4b25b3c1a..dffe8f4ea 100644
--- a/cmd/helm/push.go
+++ b/cmd/helm/push.go
@@ -35,16 +35,10 @@ it will also be uploaded.
 `
 
 type registryPushOptions struct {
-<<<<<<< HEAD
 	certFile              string
 	keyFile               string
 	caFile                string
 	insecureSkipTLSverify bool
-=======
-	certFile string
-	keyFile  string
-	caFile   string
->>>>>>> e676fd1c (Enable custom certificates option for OCI)
 }
 
 func newPushCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
@@ -77,10 +71,7 @@ func newPushCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 			remote := args[1]
 			client := action.NewPushWithOpts(action.WithPushConfig(cfg),
 				action.WithTLSClientConfig(o.certFile, o.keyFile, o.caFile),
-<<<<<<< HEAD
 				action.WithInsecureSkipTLSVerify(o.insecureSkipTLSverify),
-=======
->>>>>>> e676fd1c (Enable custom certificates option for OCI)
 				action.WithPushOptWriter(out))
 			client.Settings = settings
 			output, err := client.Run(chartRef, remote)
@@ -96,10 +87,7 @@ func newPushCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 	f.StringVar(&o.certFile, "cert-file", "", "identify registry client using this SSL certificate file")
 	f.StringVar(&o.keyFile, "key-file", "", "identify registry client using this SSL key file")
 	f.StringVar(&o.caFile, "ca-file", "", "verify certificates of HTTPS-enabled servers using this CA bundle")
-<<<<<<< HEAD
 	f.BoolVar(&o.insecureSkipTLSverify, "insecure-skip-tls-verify", false, "skip tls certificate checks for the chart upload")
-=======
->>>>>>> e676fd1c (Enable custom certificates option for OCI)
 
 	return cmd
 }
diff --git a/pkg/registry/client_tls_test.go b/pkg/registry/client_tls_test.go
index 9bf2a5775..f5e1a21b9 100644
--- a/pkg/registry/client_tls_test.go
+++ b/pkg/registry/client_tls_test.go
@@ -29,12 +29,7 @@ type TLSRegistryClientTestSuite struct {
 
 func (suite *TLSRegistryClientTestSuite) SetupSuite() {
 	// init test client
-<<<<<<< HEAD
 	dockerRegistry := setup(&suite.TestSuite, true, false)
-=======
-	dockerRegistry := setup(&suite.TestSuite, true)
->>>>>>> e676fd1c (Enable custom certificates option for OCI)
-
 	// Start Docker registry
 	go dockerRegistry.ListenAndServe()
 }