Skip to content

Commit e2c6ece

Browse files
authored
Merge pull request #4371 from CharlesQQ/proxy-fix
fix(util/proxy): fix tls.config when secret.spec.caBundle is nil
2 parents fdbb322 + fca22c2 commit e2c6ece

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

pkg/util/proxy/proxy.go

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -137,13 +137,10 @@ func GetTlsConfigForCluster(ctx context.Context, cluster *clusterapis.Cluster, s
137137
if err != nil {
138138
return nil, err
139139
}
140-
caBundle, err := getClusterCABundle(cluster.Name, caSecret)
141-
if err != nil {
142-
return nil, fmt.Errorf("failed to get CA bundle for cluster %s: %v", cluster.Name, err)
143-
}
140+
caBundle := getClusterCABundle(caSecret)
144141

145142
caCertPool := x509.NewCertPool()
146-
caCertPool.AppendCertsFromPEM([]byte(caBundle))
143+
caCertPool.AppendCertsFromPEM(caBundle)
147144
return &tls.Config{
148145
RootCAs: caCertPool,
149146
MinVersion: tls.VersionTLS13,
@@ -221,12 +218,12 @@ func ImpersonateToken(clusterName string, secret *corev1.Secret) (string, error)
221218
return string(token), nil
222219
}
223220

224-
func getClusterCABundle(clusterName string, secret *corev1.Secret) (string, error) {
221+
func getClusterCABundle(secret *corev1.Secret) []byte {
225222
caBundle, found := secret.Data[clusterapis.SecretCADataKey]
226223
if !found {
227-
return "", fmt.Errorf("the CA bundle of cluster %s is empty", clusterName)
224+
return []byte{}
228225
}
229-
return string(caBundle), nil
226+
return caBundle
230227
}
231228

232229
// SkipGroup tells whether the input group can be skipped during impersonate.

0 commit comments

Comments
 (0)