Skip to content

Commit

Permalink
sysdump: Detect if Gateway API support is enabled
Browse files Browse the repository at this point in the history 
Check if "enable-gateway-api" is set to "true" in cilium-config
ConfigMap, and collect resources related to Gateway API if and only if
the feature is enabled.

Signed-off-by: Michi Mutsuzaki <[email protected]>
  • Loading branch information
@michi-covalent
michi-covalent committed Oct 11, 2023
1 parent 408b445 commit 7bb30e6
Show file tree
Hide file tree
Showing 2 changed files with 133 additions and 120 deletions.
248 changes: 128 additions & 120 deletions sysdump/sysdump.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1274,126 +1274,6 @@ func (c *Collector) Run() error {
return nil
},
},
{
Description: "Collecting GatewayClass entries",
Quick: true,
Task: func(ctx context.Context) error {
n := corev1.NamespaceAll
v, err := c.Client.ListUnstructured(ctx, gatewayClass, &n, metav1.ListOptions{})
if err != nil {
return fmt.Errorf("failed to collect GatewayClass entries: %w", err)
}
if err := c.WriteYAML(gatewayClassesFileName, v); err != nil {
return fmt.Errorf("failed to collect GatewayClass entries: %w", err)
}
return nil
},
},
{
Description: "Collecting Gateway entries",
Quick: true,
Task: func(ctx context.Context) error {
n := corev1.NamespaceAll
v, err := c.Client.ListUnstructured(ctx, gateway, &n, metav1.ListOptions{})
if err != nil {
return fmt.Errorf("failed to collect Gateway entries: %w", err)
}
if err := c.WriteYAML(gatewaysFileName, v); err != nil {
return fmt.Errorf("failed to collect Gateway entries: %w", err)
}
return nil
},
},
{
Description: "Collecting ReferenceGrant entries",
Quick: true,
Task: func(ctx context.Context) error {
n := corev1.NamespaceAll
v, err := c.Client.ListUnstructured(ctx, referenceGrant, &n, metav1.ListOptions{})
if err != nil {
return fmt.Errorf("failed to collect ReferenceGrant entries: %w", err)
}
if err := c.WriteYAML(referenceGrantsFileName, v); err != nil {
return fmt.Errorf("failed to collect ReferenceGrant entries: %w", err)
}
return nil
},
},
{
Description: "Collecting HTTPRoute entries",
Quick: true,
Task: func(ctx context.Context) error {
n := corev1.NamespaceAll
v, err := c.Client.ListUnstructured(ctx, httpRoute, &n, metav1.ListOptions{})
if err != nil {
return fmt.Errorf("failed to collect HTTPRoute entries: %w", err)
}
if err := c.WriteYAML(httpRoutesFileName, v); err != nil {
return fmt.Errorf("failed to collect HTTPRoute entries: %w", err)
}
return nil
},
},
{
Description: "Collecting TLSRoute entries",
Quick: true,
Task: func(ctx context.Context) error {
n := corev1.NamespaceAll
v, err := c.Client.ListUnstructured(ctx, tlsRoute, &n, metav1.ListOptions{})
if err != nil {
return fmt.Errorf("failed to collect TLSRoute entries: %w", err)
}
if err := c.WriteYAML(tlsRoutesFileName, v); err != nil {
return fmt.Errorf("failed to collect TLSRoute entries: %w", err)
}
return nil
},
},
{
Description: "Collecting GRPCRoute entries",
Quick: true,
Task: func(ctx context.Context) error {
n := corev1.NamespaceAll
v, err := c.Client.ListUnstructured(ctx, grpcRoute, &n, metav1.ListOptions{})
if err != nil {
return fmt.Errorf("failed to collect GRPCRoute entries: %w", err)
}
if err := c.WriteYAML(grpcRoutesFileName, v); err != nil {
return fmt.Errorf("failed to collect GRPCRoute entries: %w", err)
}
return nil
},
},
{
Description: "Collecting TCPRoute entries",
Quick: true,
Task: func(ctx context.Context) error {
n := corev1.NamespaceAll
v, err := c.Client.ListUnstructured(ctx, tcpRoute, &n, metav1.ListOptions{})
if err != nil {
return fmt.Errorf("failed to collect TCPRoute entries: %w", err)
}
if err := c.WriteYAML(tcpRoutesFileName, v); err != nil {
return fmt.Errorf("failed to collect TCPRoute entries: %w", err)
}
return nil
},
},
{
Description: "Collecting UDPRoute entries",
Quick: true,
Task: func(ctx context.Context) error {
n := corev1.NamespaceAll
v, err := c.Client.ListUnstructured(ctx, udpRoute, &n, metav1.ListOptions{})
if err != nil {
return fmt.Errorf("failed to collect UDPRoute entries: %w", err)
}
if err := c.WriteYAML(udpRoutesFileName, v); err != nil {
return fmt.Errorf("failed to collect UDPRoute entries: %w", err)
}
return nil
},
},
}

if c.Options.HubbleFlowsCount > 0 {
Expand Down Expand Up @@ -1520,6 +1400,9 @@ func (c *Collector) Run() error {
if c.FeatureSet[features.AuthSpiffe].Enabled {
tasks = append(tasks, c.getSPIRETasks()...)
}
if c.FeatureSet[features.GatewayAPI].Enabled {
tasks = append(tasks, c.getGatewayAPITasks()...)
}

// Adjust the worker count to make enough headroom for tasks that submit sub-tasks.
// This is necessary because 'Submit' is blocking.
Expand Down Expand Up @@ -1714,6 +1597,131 @@ func (c *Collector) getSPIRETasks() []Task {
}
}

func (c *Collector) getGatewayAPITasks() []Task {
return []Task{
{
Description: "Collecting GatewayClass entries",
Quick: true,
Task: func(ctx context.Context) error {
n := corev1.NamespaceAll
v, err := c.Client.ListUnstructured(ctx, gatewayClass, &n, metav1.ListOptions{})
if err != nil {
return fmt.Errorf("failed to collect GatewayClass entries: %w", err)
}
if err := c.WriteYAML(gatewayClassesFileName, v); err != nil {
return fmt.Errorf("failed to collect GatewayClass entries: %w", err)
}
return nil
},
},
{
Description: "Collecting Gateway entries",
Quick: true,
Task: func(ctx context.Context) error {
n := corev1.NamespaceAll
v, err := c.Client.ListUnstructured(ctx, gateway, &n, metav1.ListOptions{})
if err != nil {
return fmt.Errorf("failed to collect Gateway entries: %w", err)
}
if err := c.WriteYAML(gatewaysFileName, v); err != nil {
return fmt.Errorf("failed to collect Gateway entries: %w", err)
}
return nil
},
},
{
Description: "Collecting ReferenceGrant entries",
Quick: true,
Task: func(ctx context.Context) error {
n := corev1.NamespaceAll
v, err := c.Client.ListUnstructured(ctx, referenceGrant, &n, metav1.ListOptions{})
if err != nil {
return fmt.Errorf("failed to collect ReferenceGrant entries: %w", err)
}
if err := c.WriteYAML(referenceGrantsFileName, v); err != nil {
return fmt.Errorf("failed to collect ReferenceGrant entries: %w", err)
}
return nil
},
},
{
Description: "Collecting HTTPRoute entries",
Quick: true,
Task: func(ctx context.Context) error {
n := corev1.NamespaceAll
v, err := c.Client.ListUnstructured(ctx, httpRoute, &n, metav1.ListOptions{})
if err != nil {
return fmt.Errorf("failed to collect HTTPRoute entries: %w", err)
}
if err := c.WriteYAML(httpRoutesFileName, v); err != nil {
return fmt.Errorf("failed to collect HTTPRoute entries: %w", err)
}
return nil
},
},
{
Description: "Collecting TLSRoute entries",
Quick: true,
Task: func(ctx context.Context) error {
n := corev1.NamespaceAll
v, err := c.Client.ListUnstructured(ctx, tlsRoute, &n, metav1.ListOptions{})
if err != nil {
return fmt.Errorf("failed to collect TLSRoute entries: %w", err)
}
if err := c.WriteYAML(tlsRoutesFileName, v); err != nil {
return fmt.Errorf("failed to collect TLSRoute entries: %w", err)
}
return nil
},
},
{
Description: "Collecting GRPCRoute entries",
Quick: true,
Task: func(ctx context.Context) error {
n := corev1.NamespaceAll
v, err := c.Client.ListUnstructured(ctx, grpcRoute, &n, metav1.ListOptions{})
if err != nil {
return fmt.Errorf("failed to collect GRPCRoute entries: %w", err)
}
if err := c.WriteYAML(grpcRoutesFileName, v); err != nil {
return fmt.Errorf("failed to collect GRPCRoute entries: %w", err)
}
return nil
},
},
{
Description: "Collecting TCPRoute entries",
Quick: true,
Task: func(ctx context.Context) error {
n := corev1.NamespaceAll
v, err := c.Client.ListUnstructured(ctx, tcpRoute, &n, metav1.ListOptions{})
if err != nil {
return fmt.Errorf("failed to collect TCPRoute entries: %w", err)
}
if err := c.WriteYAML(tcpRoutesFileName, v); err != nil {
return fmt.Errorf("failed to collect TCPRoute entries: %w", err)
}
return nil
},
},
{
Description: "Collecting UDPRoute entries",
Quick: true,
Task: func(ctx context.Context) error {
n := corev1.NamespaceAll
v, err := c.Client.ListUnstructured(ctx, udpRoute, &n, metav1.ListOptions{})
if err != nil {
return fmt.Errorf("failed to collect UDPRoute entries: %w", err)
}
if err := c.WriteYAML(udpRoutesFileName, v); err != nil {
return fmt.Errorf("failed to collect UDPRoute entries: %w", err)
}
return nil
},
},
}
}

func (c *Collector) log(msg string, args ...interface{}) {
fmt.Fprintf(c.logWriter, msg+"\n", args...)
}
Expand Down
5 changes: 5 additions & 0 deletions utils/features/features.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ const (
IngressController Feature = "ingress-controller"

EgressGateway Feature = "enable-ipv4-egress-gateway"
GatewayAPI Feature = "enable-gateway-api"
)

// Feature is the name of a Cilium Feature (e.g. l7-proxy, cni chaining mode etc)
Expand Down Expand Up @@ -246,6 +247,10 @@ func (fs Set) ExtractFromConfigMap(ciliumVersion semver.Version, cm *v1.ConfigMa
fs[CIDRMatchNodes] = Status{
Enabled: strings.Contains(cm.Data["policy-cidr-match-mode"], "nodes"),
}

fs[GatewayAPI] = Status{
Enabled: cm.Data[string(GatewayAPI)] == "true",
}
}

func (fs Set) ExtractFromNodes(nodesWithoutCilium map[string]struct{}) {
Expand Down

0 comments on commit 7bb30e6

Please sign in to comment.