client-go : add http-proxy to the kubeconfig

Additional http-proxy field is added to the Cluster struct so that the kubeconfigs can have the proxy details to connect to the respective APIserver. fixes:kubernetes/client-go#351
aakp10 · Feb 13, 2018 · 230fb49 · mvanholsteijn · Dec 5, 2021 · 230fb49
1 parent 49bf442
commit 230fb49
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/staging/src/k8s.io/client-go/tools/clientcmd/api/types.go b/staging/src/k8s.io/client-go/tools/clientcmd/api/types.go
@@ -74,6 +74,9 @@ type Cluster struct {
 	// CertificateAuthorityData contains PEM-encoded certificate authority certificates. Overrides CertificateAuthority
 	// +optional
 	CertificateAuthorityData []byte `json:"certificate-authority-data,omitempty"`
+	//HttpProxy holds the proxy server details for the cluster
+	//+optional
+	HttpProxy string `json:"http-proxy"`
 	// Extensions holds additional information. This is useful for extenders so that reads and writes don't clobber unknown fields
 	// +optional
 	Extensions map[string]runtime.Object `json:"extensions,omitempty"`

diff --git a/staging/src/k8s.io/client-go/tools/clientcmd/client_config.go b/staging/src/k8s.io/client-go/tools/clientcmd/client_config.go
@@ -446,6 +446,7 @@ func (config *DirectClientConfig) getCluster() (clientcmdapi.Cluster, error) {
 		mergedClusterInfo.CertificateAuthority = ""
 		mergedClusterInfo.CertificateAuthorityData = nil
 	}
+	mergedClusterInfo.HttpProxy = os.Getenv("http_proxy")
 
 	return *mergedClusterInfo, nil
 }