Skip to content

Commit

Permalink
cleanup cilium ingress class
Browse files Browse the repository at this point in the history
  • Loading branch information
louiseschmidtgen committed Jun 13, 2024
1 parent 4717538 commit 22b30f7
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 67 deletions.
23 changes: 0 additions & 23 deletions k8s/manifests/charts/ck-ingress-cilium/.helmignore

This file was deleted.

24 changes: 0 additions & 24 deletions k8s/manifests/charts/ck-ingress-cilium/Chart.yaml

This file was deleted.

This file was deleted.

6 changes: 0 additions & 6 deletions src/k8s/pkg/k8sd/features/cilium/chart.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,6 @@ var (
ManifestPath: path.Join("charts", "ck-gateway-cilium"),
}

// chartIngressClass represents a manifest to deploy a IngressClass called ck-ingress.
chartIngressClass = helm.InstallableChart{
Name: "ck-ingress-class",
Namespace: "default",
ManifestPath: path.Join("charts", "ck-ingress-cilium"),
}
// ciliumAgentImageRepo represents the image to use for cilium-agent.
ciliumAgentImageRepo = "ghcr.io/canonical/cilium"

Expand Down
8 changes: 0 additions & 8 deletions src/k8s/pkg/k8sd/features/cilium/ingress.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@ func ApplyIngress(ctx context.Context, snap snap.Snap, ingress types.Ingress, ne

var values map[string]any
if ingress.GetEnabled() {
// Apply IngressClass
if _, err := m.Apply(ctx, chartIngressClass, helm.StatePresent, nil); err != nil {
return fmt.Errorf("failed to install the cilium ingress class chart: %w", err)
}

values = map[string]any{
"ingressController": map[string]any{
Expand All @@ -38,10 +34,6 @@ func ApplyIngress(ctx context.Context, snap snap.Snap, ingress types.Ingress, ne
},
}
} else {
// Uninstall IngressClass
if _, err := m.Apply(ctx, chartIngressClass, helm.StateDeleted, nil); err != nil {
return fmt.Errorf("failed to uninstall the cilium ingress class chart: %w", err)
}
values = map[string]any{
"ingressController": map[string]any{
"enabled": false,
Expand Down

0 comments on commit 22b30f7

Please sign in to comment.