Merge branch 'main' into main

Makefile

@@ -22,7 +22,7 @@ verify: test build ## tests and builds version-checker
 
 image: ## build docker image
 	GOARCH=$(ARCH) GOOS=linux CGO_ENABLED=0 go build -o ./bin/version-checker-linux ./cmd/.
-	docker build -t quay.io/jetstack/version-checker:v0.4.0 .
+	docker build -t quay.io/jetstack/version-checker:v0.5.0 .
 
 clean: ## clean up created files
 	rm -rf \

deploy/charts/version-checker/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
-appVersion: "v0.4.0"
-version: "v0.4.0"
+appVersion: "v0.5.0"
+version: "v0.5.0"
 description: A Helm chart for version-checker
 home: https://github.com/jetstack/version-checker
 name: version-checker

deploy/yaml/deploy.yaml

@@ -49,7 +49,7 @@ spec:
     spec:
       serviceAccountName: version-checker
       containers:
-      - image: quay.io/jetstack/version-checker:v0.4.0
+      - image: quay.io/jetstack/version-checker:v0.5.0
         imagePullPolicy: Always
         ports:
         - containerPort: 8080

pkg/client/acr/acr.go

@@ -55,7 +55,8 @@ type ACRManifestResponse struct {
 
 func New(opts Options) (*Client, error) {
 	client := &http.Client{
-		Timeout: time.Second * 5,
+		Timeout:   time.Second * 5,
+		Transport: &http.Transport{Proxy: http.ProxyFromEnvironment},
 	}
 
 	if len(opts.RefreshToken) > 0 &&

pkg/client/docker/docker.go

@@ -52,7 +52,8 @@ type Image struct {
 
 func New(ctx context.Context, opts Options) (*Client, error) {
 	client := &http.Client{
-		Timeout: time.Second * 10,
+		Timeout:   time.Second * 10,
+		Transport: &http.Transport{Proxy: http.ProxyFromEnvironment},
 	}
 
 	// Setup Auth if username and password used.

pkg/client/ecr/ecr.go

@@ -3,6 +3,7 @@ package ecr
 import (
 	"context"
 	"fmt"
+	"net/http"
 	"sync"
 
 	"github.com/aws/aws-sdk-go/aws"
@@ -102,6 +103,8 @@ func (c *Client) getClient(region string) (*ecr.ECR, error) {
 			return nil, err
 		}
 	}
+	// Try and use an HTTP(S) Proxies defined within Environment variables.
+	client.Config.WithHTTPClient(&http.Client{Transport: &http.Transport{Proxy: http.ProxyFromEnvironment}})
 
 	c.cachedRegionClients[region] = client
 	return client, nil

pkg/client/gcr/gcr.go

@@ -35,11 +35,14 @@ type ManifestItem struct {
 }
 
 func New(opts Options) *Client {
+	client := &http.Client{
+		Timeout:   time.Second * 5,
+		Transport: &http.Transport{Proxy: http.ProxyFromEnvironment},
+	}
+
 	return &Client{
 		Options: opts,
-		Client: &http.Client{
-			Timeout: time.Second * 5,
-		},
+		Client:  client,
 	}
 }
 

pkg/client/ghcr/ghcr.go

@@ -25,7 +25,8 @@ func New(opts Options) *Client {
 	return &Client{
 		Options: opts,
 		Client: &http.Client{
-			Timeout: time.Second * 5,
+			Timeout:   time.Second * 5,
+			Transport: &http.Transport{Proxy: http.ProxyFromEnvironment},
 		},
 	}
 }

pkg/client/quay/quay.go

@@ -59,6 +59,7 @@ type responseManifestDataItem struct {
 
 func New(opts Options) *Client {
 	client := retryablehttp.NewClient()
+	client.HTTPClient.Transport = &http.Transport{Proxy: http.ProxyFromEnvironment}
 	client.RetryMax = 10
 	client.Logger = nil