Skip to content

Commit 9008d80

Browse files
committed
Change to be compatible with 0.15
Signed-off-by: Xavi Garcia <xavi.garcia@suse.com>
1 parent 40a18fc commit 9008d80

1 file changed

Lines changed: 2 additions & 3 deletions

File tree

internal/ocistorage/ociwrapper.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import (
2525
"oras.land/oras-go/v2/registry/remote/retry"
2626

2727
"github.com/rancher/fleet/internal/manifest"
28-
fleetgit "github.com/rancher/fleet/pkg/git"
2928
)
3029

3130
const (
@@ -81,11 +80,11 @@ func getHTTPClient(insecureSkipTLS bool, caBundle []byte) *http.Client {
8180
caBundle = append([]byte(nil), caBundle...)
8281

8382
// Merge proxy CA bundle if present
84-
if proxyCAPEM, ok := os.LookupEnv(fleetgit.ProxyCABundleEnvVar); ok && proxyCAPEM != "" {
83+
if proxyCAPEM, ok := os.LookupEnv("PROXY_CA_BUNDLE"); ok && proxyCAPEM != "" {
8584
proxyBytes := []byte(proxyCAPEM)
8685
tmpPool := x509.NewCertPool()
8786
if !tmpPool.AppendCertsFromPEM(proxyBytes) {
88-
logrus.Warnf("%s is set but contains no valid PEM certificates; ignoring proxy CA bundle", fleetgit.ProxyCABundleEnvVar)
87+
logrus.Warnf("%s is set but contains no valid PEM certificates; ignoring proxy CA bundle", "PROXY_CA_BUNDLE")
8988
} else {
9089
if len(caBundle) > 0 && caBundle[len(caBundle)-1] != '\n' {
9190
caBundle = append(caBundle, '\n')

0 commit comments

Comments
 (0)