Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions internal/gatewayapi/backendtlspolicy.go
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ func getCaCertsFromCARefs(namespace string, caCertificates []gwapiv1.LocalObject
case resource.KindConfigMap:
cm := resources.GetConfigMap(namespace, string(caRef.Name))
if cm != nil {
if crt, dataOk := cm.Data[caCertKey]; dataOk {
if crt, dataOk := getCaCertFromConfigMap(cm); dataOk {
if ca != "" {
ca += "\n"
}
Expand All @@ -305,7 +305,7 @@ func getCaCertsFromCARefs(namespace string, caCertificates []gwapiv1.LocalObject
case resource.KindSecret:
secret := resources.GetSecret(namespace, string(caRef.Name))
if secret != nil {
if crt, dataOk := secret.Data[caCertKey]; dataOk {
if crt, dataOk := getCaCertFromSecret(secret); dataOk {
if ca != "" {
ca += "\n"
}
Expand Down
4 changes: 2 additions & 2 deletions internal/gatewayapi/clienttrafficpolicy.go
Original file line number Diff line number Diff line change
Expand Up @@ -834,7 +834,7 @@ func (t *Translator) buildListenerTLSParameters(policy *egv1a1.ClientTrafficPoli
return irTLSConfig, err
}

secretBytes, ok := secret.Data[caCertKey]
secretBytes, ok := getCaCertFromSecret(secret)
if !ok || len(secretBytes) == 0 {
return irTLSConfig, fmt.Errorf(
"caCertificateRef not found in secret %s", caCertRef.Name)
Expand All @@ -853,7 +853,7 @@ func (t *Translator) buildListenerTLSParameters(policy *egv1a1.ClientTrafficPoli
return irTLSConfig, err
}

configMapBytes, ok := configMap.Data[caCertKey]
configMapBytes, ok := getCaCertFromConfigMap(configMap)
if !ok || len(configMapBytes) == 0 {
return irTLSConfig, fmt.Errorf(
"caCertificateRef not found in configMap %s", caCertRef.Name)
Expand Down
34 changes: 34 additions & 0 deletions internal/gatewayapi/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -674,3 +674,37 @@ func getPreserveRouteOrder(envoyProxy *egv1a1.EnvoyProxy) bool {
}
return false
}

func getCaCertFromConfigMap(cm *corev1.ConfigMap) (string, bool) {
var data string
data, exits := cm.Data[caCertKey]
switch {
case exits:
return data, true
case len(cm.Data) == 1: // Fallback to the first key if ca.crt is not found
for _, value := range cm.Data {
data = value
break
}
return data, true
default:
return "", false
}
}

func getCaCertFromSecret(s *corev1.Secret) ([]byte, bool) {
var data []byte
data, exits := s.Data[caCertKey]
switch {
case exits:
return data, true
case len(s.Data) == 1: // Fallback to the first key if ca.crt is not found
for _, value := range s.Data {
data = value
break
}
return data, true
default:
return nil, false
}
}
92 changes: 92 additions & 0 deletions internal/gatewayapi/helpers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -717,3 +717,95 @@ func TestGetServiceIPFamily(t *testing.T) {
})
}
}

func TestGetCaCertFromConfigMap(t *testing.T) {
cases := []struct {
name string
cm *corev1.ConfigMap
expectedFound bool
expected string
}{
{
name: "get from ca.crt",
cm: &corev1.ConfigMap{
Data: map[string]string{
"ca.crt": "fake-cert",
"root-cert.pem": "fake-root",
},
},
expectedFound: true,
expected: "fake-cert",
},
{
name: "get from first key",
cm: &corev1.ConfigMap{
Data: map[string]string{
"root-cert.pem": "fake-root",
},
},
expectedFound: true,
expected: "fake-root",
},
{
name: "not found",
cm: &corev1.ConfigMap{
Data: map[string]string{},
},
expectedFound: false,
},
}

for _, tc := range cases {
t.Run(tc.name, func(t *testing.T) {
got, found := getCaCertFromConfigMap(tc.cm)
require.Equal(t, tc.expectedFound, found)
require.Equal(t, tc.expected, got)
})
}
}

func TestGetCaCertFromSecret(t *testing.T) {
cases := []struct {
name string
s *corev1.Secret
expectedFound bool
expected string
}{
{
name: "get from ca.crt",
s: &corev1.Secret{
Data: map[string][]byte{
"ca.crt": []byte("fake-cert"),
"root-cert.pem": []byte("fake-root"),
},
},
expectedFound: true,
expected: "fake-cert",
},
{
name: "get from first key",
s: &corev1.Secret{
Data: map[string][]byte{
"root-cert.pem": []byte("fake-root"),
},
},
expectedFound: true,
expected: "fake-root",
},
{
name: "not found",
s: &corev1.Secret{
Data: map[string][]byte{},
},
expectedFound: false,
},
}

for _, tc := range cases {
t.Run(tc.name, func(t *testing.T) {
got, found := getCaCertFromSecret(tc.s)
require.Equal(t, tc.expectedFound, found)
require.Equal(t, tc.expected, string(got))
})
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -84,16 +84,6 @@ endpointSlices:
- "10.244.0.11"
conditions:
ready: true

configMaps:
- apiVersion: v1
kind: ConfigMap
metadata:
name: no-ca-cmap
namespace: backends
data:
garbage.crt: |
itsAllGarbage
backendTLSPolicies:
- apiVersion: gateway.networking.k8s.io/v1alpha2
kind: BackendTLSPolicy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ backendTLSPolicies:
sectionName: http
conditions:
- lastTransitionTime: null
message: No ca found in configmap no-ca-cmap.
message: Configmap no-ca-cmap not found in namespace backends.
reason: Invalid
status: "False"
type: Accepted
Expand Down Expand Up @@ -101,8 +101,8 @@ httpRoutes:
status: "True"
type: Accepted
- lastTransitionTime: null
message: 'Failed to process route rule 0 backendRef 0: no ca found in configmap
no-ca-cmap.'
message: 'Failed to process route rule 0 backendRef 0: configmap no-ca-cmap
not found in namespace backends.'
reason: InvalidBackendTLS
status: "False"
type: ResolvedRefs
Expand Down
1 change: 1 addition & 0 deletions release-notes/current.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ new features: |
Added support for configuring cluster stat name for HTTPRoute and GRPCRoute in EnvoyProxy CRD.
Added support for configuring `SameSite` attribute for Oauth cookies for OIDC authentication.
Added support for configuring the cache sync period for K8s provider.
Added support for fallback to first key when load ca certificate from Secret or ConfigMap.
Added support for configuring user provided name to generated HorizontalPodAutoscaler and PodDisruptionBudget resources.


Expand Down