Support empty value for core Kubernetes API group
This commit is contained in:
parent
e20409676a
commit
139f929ec8
4 changed files with 17 additions and 4 deletions
|
@ -757,7 +757,7 @@ func (c *clientWrapper) ListBackendTLSPoliciesForService(namespace, serviceName
|
||||||
for _, policy := range policies {
|
for _, policy := range policies {
|
||||||
for _, ref := range policy.Spec.TargetRefs {
|
for _, ref := range policy.Spec.TargetRefs {
|
||||||
// The policy does not target the service.
|
// The policy does not target the service.
|
||||||
if ref.Group != groupCore || ref.Kind != kindService || string(ref.Name) != serviceName {
|
if (ref.Group != "" && ref.Group != groupCore) || ref.Kind != kindService || string(ref.Name) != serviceName {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -58,15 +58,18 @@ metadata:
|
||||||
namespace: default
|
namespace: default
|
||||||
spec:
|
spec:
|
||||||
targetRefs:
|
targetRefs:
|
||||||
- group: core
|
- group: ""
|
||||||
kind: Service
|
kind: Service
|
||||||
name: whoami
|
name: whoami
|
||||||
validation:
|
validation:
|
||||||
hostname: whoami
|
hostname: whoami
|
||||||
caCertificateRefs:
|
caCertificateRefs:
|
||||||
- group: core
|
- group: ""
|
||||||
kind: ConfigMap
|
kind: ConfigMap
|
||||||
name: ca-file
|
name: ca-file
|
||||||
|
- group: core
|
||||||
|
kind: ConfigMap
|
||||||
|
name: ca-file-2
|
||||||
|
|
||||||
---
|
---
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
|
@ -76,3 +79,12 @@ metadata:
|
||||||
namespace: default
|
namespace: default
|
||||||
data:
|
data:
|
||||||
ca.crt: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0="
|
ca.crt: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0="
|
||||||
|
|
||||||
|
---
|
||||||
|
apiVersion: v1
|
||||||
|
kind: ConfigMap
|
||||||
|
metadata:
|
||||||
|
name: ca-file-2
|
||||||
|
namespace: default
|
||||||
|
data:
|
||||||
|
ca.crt: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0="
|
||||||
|
|
|
@ -519,7 +519,7 @@ func (p *Provider) loadServersTransport(namespace string, policy gatev1alpha3.Ba
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, caCertRef := range policy.Spec.Validation.CACertificateRefs {
|
for _, caCertRef := range policy.Spec.Validation.CACertificateRefs {
|
||||||
if caCertRef.Group != groupCore || caCertRef.Kind != "ConfigMap" {
|
if (caCertRef.Group != "" && caCertRef.Group != groupCore) || caCertRef.Kind != "ConfigMap" {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -2303,6 +2303,7 @@ func TestLoadHTTPRoutes(t *testing.T) {
|
||||||
ServerName: "whoami",
|
ServerName: "whoami",
|
||||||
RootCAs: []types.FileOrContent{
|
RootCAs: []types.FileOrContent{
|
||||||
"LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0=",
|
"LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0=",
|
||||||
|
"LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0=",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue