Remvoes the creation of an unused HTTPRoute in tests
Signed-off-by: irbekrm <irbekrm@gmail.com>
This commit is contained in:
irbekrm
parent
cdaeb0599a
commit
e1e416aa6f
@ -795,7 +795,7 @@ func (s *Suite) Define() {
|
||||
renewBefore := time.Hour * 111
|
||||
|
||||
By("Creating a Gateway with annotations for issuerRef and other Certificate fields")
|
||||
gw, route := e2eutil.NewGateway(name, f.Namespace.Name, secretName, map[string]string{
|
||||
gw := e2eutil.NewGateway(name, f.Namespace.Name, secretName, map[string]string{
|
||||
"cert-manager.io/issuer": issuerRef.Name,
|
||||
"cert-manager.io/issuer-kind": issuerRef.Kind,
|
||||
"cert-manager.io/issuer-group": issuerRef.Group,
|
||||
@ -806,8 +806,6 @@ func (s *Suite) Define() {
|
||||
|
||||
gw, err := f.GWClientSet.GatewayV1alpha2().Gateways(f.Namespace.Name).Create(context.TODO(), gw, metav1.CreateOptions{})
|
||||
Expect(err).NotTo(HaveOccurred())
|
||||
_, err = f.GWClientSet.GatewayV1alpha2().HTTPRoutes(f.Namespace.Name).Create(context.TODO(), route, metav1.CreateOptions{})
|
||||
Expect(err).NotTo(HaveOccurred())
|
||||
|
||||
// XXX(Mael): the CertificateRef seems to contain the Gateway name
|
||||
// "testcert-gateway" instead of the secretName
|
||||
@ -822,7 +820,7 @@ func (s *Suite) Define() {
|
||||
cert, err = f.Helper().WaitForCertificateReadyAndDoneIssuing(cert, time.Minute*5)
|
||||
Expect(err).NotTo(HaveOccurred())
|
||||
|
||||
// Verify that the ingres-shim has translated all the supplied
|
||||
// Verify that the gateway-shim has translated all the supplied
|
||||
// annotations into equivalent Certificate field values
|
||||
By("Validating the created Certificate")
|
||||
Expect(cert.Spec.DNSNames).To(ConsistOf(domain))
|
||||
|
||||
@ -26,7 +26,6 @@ go_library(
|
||||
"@io_k8s_apimachinery//pkg/util/wait:go_default_library",
|
||||
"@io_k8s_client_go//discovery:go_default_library",
|
||||
"@io_k8s_sigs_gateway_api//apis/v1alpha2:go_default_library",
|
||||
"@io_k8s_utils//pointer:go_default_library",
|
||||
],
|
||||
)
|
||||
|
||||
|
||||
@ -38,7 +38,6 @@ import (
|
||||
"k8s.io/apimachinery/pkg/util/intstr"
|
||||
"k8s.io/apimachinery/pkg/util/wait"
|
||||
"k8s.io/client-go/discovery"
|
||||
"k8s.io/utils/pointer"
|
||||
gwapiv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2"
|
||||
|
||||
apiutil "github.com/cert-manager/cert-manager/pkg/api/util"
|
||||
@ -371,95 +370,46 @@ func pathTypePrefix() *networkingv1.PathType {
|
||||
return &p
|
||||
}
|
||||
|
||||
func NewGateway(gatewayName, ns, secretName string, annotations map[string]string, dnsNames ...string) (*gwapiv1alpha2.Gateway, *gwapiv1alpha2.HTTPRoute) {
|
||||
var hostnames []gwapiv1alpha2.Hostname
|
||||
for _, dnsName := range dnsNames {
|
||||
hostnames = append(hostnames, gwapiv1alpha2.Hostname(dnsName))
|
||||
}
|
||||
// NewGateway creates a new test Gateway. There is no Gateway controller
|
||||
// watching the 'foo' gateway class, so this Gateway will not be used to
|
||||
// actually route traffic, but can be used to test cert-manager controllers that
|
||||
// sync Gateways, such as gateway-shim.
|
||||
func NewGateway(gatewayName, ns, secretName string, annotations map[string]string, dnsNames ...string) *gwapiv1alpha2.Gateway {
|
||||
|
||||
return &gwapiv1alpha2.Gateway{
|
||||
ObjectMeta: metav1.ObjectMeta{
|
||||
Name: gatewayName,
|
||||
Annotations: annotations,
|
||||
},
|
||||
Spec: gwapiv1alpha2.GatewaySpec{
|
||||
GatewayClassName: "istio",
|
||||
Listeners: []gwapiv1alpha2.Listener{{
|
||||
AllowedRoutes: &gwapiv1alpha2.AllowedRoutes{
|
||||
Namespaces: &gwapiv1alpha2.RouteNamespaces{
|
||||
From: func() *gwapiv1alpha2.FromNamespaces { f := gwapiv1alpha2.NamespacesFromSame; return &f }(),
|
||||
Selector: &metav1.LabelSelector{MatchLabels: map[string]string{
|
||||
"gw": gatewayName,
|
||||
}},
|
||||
},
|
||||
Kinds: nil,
|
||||
},
|
||||
Name: "acme-solver",
|
||||
Protocol: gwapiv1alpha2.TCPProtocolType,
|
||||
Port: gwapiv1alpha2.PortNumber(80),
|
||||
Hostname: (*gwapiv1alpha2.Hostname)(&dnsNames[0]),
|
||||
TLS: &gwapiv1alpha2.GatewayTLSConfig{
|
||||
CertificateRefs: []*gwapiv1alpha2.SecretObjectReference{
|
||||
{
|
||||
Kind: func() *gwapiv1alpha2.Kind { k := gwapiv1alpha2.Kind("Secret"); return &k }(),
|
||||
Name: gwapiv1alpha2.ObjectName(secretName),
|
||||
Group: func() *gwapiv1alpha2.Group { g := gwapiv1alpha2.Group(corev1.GroupName); return &g }(),
|
||||
Namespace: (*gwapiv1alpha2.Namespace)(&ns),
|
||||
},
|
||||
},
|
||||
},
|
||||
}},
|
||||
},
|
||||
ObjectMeta: metav1.ObjectMeta{
|
||||
Name: gatewayName,
|
||||
Annotations: annotations,
|
||||
},
|
||||
&gwapiv1alpha2.HTTPRoute{
|
||||
ObjectMeta: metav1.ObjectMeta{
|
||||
Name: gatewayName,
|
||||
Annotations: annotations,
|
||||
Labels: map[string]string{
|
||||
"gw": gatewayName,
|
||||
Spec: gwapiv1alpha2.GatewaySpec{
|
||||
GatewayClassName: "foo",
|
||||
Listeners: []gwapiv1alpha2.Listener{{
|
||||
AllowedRoutes: &gwapiv1alpha2.AllowedRoutes{
|
||||
Namespaces: &gwapiv1alpha2.RouteNamespaces{
|
||||
From: func() *gwapiv1alpha2.FromNamespaces { f := gwapiv1alpha2.NamespacesFromSame; return &f }(),
|
||||
Selector: &metav1.LabelSelector{MatchLabels: map[string]string{
|
||||
"gw": gatewayName,
|
||||
}},
|
||||
},
|
||||
Kinds: nil,
|
||||
},
|
||||
},
|
||||
Spec: gwapiv1alpha2.HTTPRouteSpec{
|
||||
CommonRouteSpec: gwapiv1alpha2.CommonRouteSpec{
|
||||
ParentRefs: []gwapiv1alpha2.ParentRef{
|
||||
Name: "acme-solver",
|
||||
Protocol: gwapiv1alpha2.TCPProtocolType,
|
||||
Port: gwapiv1alpha2.PortNumber(80),
|
||||
Hostname: (*gwapiv1alpha2.Hostname)(&dnsNames[0]),
|
||||
TLS: &gwapiv1alpha2.GatewayTLSConfig{
|
||||
CertificateRefs: []*gwapiv1alpha2.SecretObjectReference{
|
||||
{
|
||||
Kind: func() *gwapiv1alpha2.Kind { k := gwapiv1alpha2.Kind("Secret"); return &k }(),
|
||||
Name: gwapiv1alpha2.ObjectName(secretName),
|
||||
Group: func() *gwapiv1alpha2.Group { g := gwapiv1alpha2.Group(corev1.GroupName); return &g }(),
|
||||
Namespace: (*gwapiv1alpha2.Namespace)(&ns),
|
||||
Name: gwapiv1alpha2.ObjectName(gatewayName),
|
||||
},
|
||||
},
|
||||
},
|
||||
Hostnames: hostnames,
|
||||
Rules: []gwapiv1alpha2.HTTPRouteRule{{
|
||||
Matches: []gwapiv1alpha2.HTTPRouteMatch{{
|
||||
Path: &gwapiv1alpha2.HTTPPathMatch{
|
||||
Type: ptrPathMatch(gwapiv1alpha2.PathMatchExact),
|
||||
Value: ptrStr("/"),
|
||||
},
|
||||
}},
|
||||
BackendRefs: []gwapiv1alpha2.HTTPBackendRef{{
|
||||
BackendRef: gwapiv1alpha2.BackendRef{
|
||||
BackendObjectReference: gwapiv1alpha2.BackendObjectReference{
|
||||
Name: "dummy-service",
|
||||
Port: ptrPort(80),
|
||||
},
|
||||
Weight: pointer.Int32(1),
|
||||
},
|
||||
}},
|
||||
}},
|
||||
},
|
||||
}
|
||||
}
|
||||
func ptrPathMatch(p gwapiv1alpha2.PathMatchType) *gwapiv1alpha2.PathMatchType {
|
||||
return &p
|
||||
}
|
||||
|
||||
func ptrStr(s string) *string {
|
||||
return &s
|
||||
}
|
||||
|
||||
func ptrPort(port int32) *gwapiv1alpha2.PortNumber {
|
||||
p := gwapiv1alpha2.PortNumber(port)
|
||||
return &p
|
||||
}},
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
// HasIngresses lets you know if an API exists in the discovery API
|
||||
|
||||
Loading…
Reference in New Issue
Block a user