Skip to content

chore: port forward tls client server name #296

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 4 commits into from
Jun 17, 2025
Merged

chore: port forward tls client server name #296

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d1829bd
chore-port-forward-debug
Shivam-nagar23 Jun 16, 2025
95c7963
Merge branch 'develop' into chore-port-forward-debug
Shivam-nagar23 Jun 16, 2025
c1d38aa
review comments resolved
Shivam-nagar23 Jun 17, 2025
98bfe02
Merge branch 'release-candidate-v0.38.0' into chore-port-forward-debug
Shivam-nagar23 Jun 17, 2025
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
11 changes: 9 additions & 2 deletions common-lib/utils/k8s/bean.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"errors"
"fmt"
"github.com/caarlos0/env"
"github.com/devtron-labs/common-lib/utils"
"github.com/devtron-labs/common-lib/utils/k8sObjectsUtil"
"github.com/devtron-labs/common-lib/utils/remoteConnection/bean"
v1 "k8s.io/api/core/v1"
Expand All @@ -43,10 +44,16 @@ type ClusterConfig struct {
RemoteConnectionConfig *bean.RemoteConnectionConfigBean
}

var logger, _ = utils.NewSugardLogger()

func (clusterConfig *ClusterConfig) PopulateTlsConfigurationsInto(restConfig *rest.Config) {
restConfig.TLSClientConfig = rest.TLSClientConfig{Insecure: clusterConfig.InsecureSkipTLSVerify}
serverName, err := GetServerNameFromServerUrl(clusterConfig.Host)
if err != nil {
// making it non-blocking to avoid blocking the flow
logger.Errorw("Error parsing server URL:", "err", err, "clusterConfig.Host", clusterConfig.Host)
}
restConfig.TLSClientConfig = rest.TLSClientConfig{Insecure: clusterConfig.InsecureSkipTLSVerify, ServerName: serverName}
if clusterConfig.InsecureSkipTLSVerify == false {
restConfig.TLSClientConfig.ServerName = restConfig.ServerName
restConfig.TLSClientConfig.KeyData = []byte(clusterConfig.KeyData)
restConfig.TLSClientConfig.CertData = []byte(clusterConfig.CertData)
restConfig.TLSClientConfig.CAData = []byte(clusterConfig.CAData)
Expand Down
18 changes: 18 additions & 0 deletions common-lib/utils/k8s/helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ import (
"k8s.io/client-go/discovery"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/rest"
"net"
"net/http"
"net/url"
"strings"
)

Expand Down Expand Up @@ -226,3 +228,19 @@ func OverrideK8sHttpClientWithTracer(restConfig *rest.Config) (*http.Client, err
httpClientFor.Transport = otelhttp.NewTransport(httpClientFor.Transport)
return httpClientFor, nil
}

func GetServerNameFromServerUrl(serverURL string) (string, error) {
u, err := url.Parse(serverURL)
if err != nil {
return "", err
}

host := u.Host
if strings.Contains(host, ":") {
host, _, err = net.SplitHostPort(u.Host)
if err != nil {
return "", err
}
}
return host, nil
}