-
Notifications
You must be signed in to change notification settings - Fork 331
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(gateway) add initial gatewayapi.Gateway controller
Signed-off-by: Mike Beaumont <[email protected]>
- Loading branch information
1 parent
7c6fed9
commit f9c8332
Showing
19 changed files
with
1,077 additions
and
33 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
113 changes: 113 additions & 0 deletions
113
pkg/plugins/runtime/k8s/controllers/gateway_converter.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,113 @@ | ||
| //go:build gateway | ||
| // +build gateway | ||
|
|
||
| package controllers | ||
|
|
||
| import ( | ||
| "context" | ||
|
|
||
| kube_core "k8s.io/api/core/v1" | ||
| kube_apierrs "k8s.io/apimachinery/pkg/api/errors" | ||
| kube_meta "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| kube_types "k8s.io/apimachinery/pkg/types" | ||
| kube_client "sigs.k8s.io/controller-runtime/pkg/client" | ||
| kube_controllerutil "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" | ||
|
|
||
| mesh_proto "github.com/kumahq/kuma/api/mesh/v1alpha1" | ||
| core_mesh "github.com/kumahq/kuma/pkg/core/resources/apis/mesh" | ||
| mesh_k8s "github.com/kumahq/kuma/pkg/plugins/resources/k8s/native/api/v1alpha1" | ||
| "github.com/kumahq/kuma/pkg/plugins/runtime/k8s/metadata" | ||
| util_proto "github.com/kumahq/kuma/pkg/util/proto" | ||
| "github.com/pkg/errors" | ||
| ) | ||
|
|
||
| // createorUpdateBuiltinGatewayDataplane manages the dataplane for a pod | ||
| // belonging to a built-in Kuma gateway. | ||
| func (r *PodReconciler) createorUpdateBuiltinGatewayDataplane(ctx context.Context, pod *kube_core.Pod) error { | ||
| dataplane := &mesh_k8s.Dataplane{ | ||
| ObjectMeta: kube_meta.ObjectMeta{ | ||
| Namespace: pod.Namespace, | ||
| Name: pod.Name, | ||
| }, | ||
| Mesh: MeshFor(pod.Annotations), | ||
| } | ||
|
|
||
| builtinName, exists := metadata.Annotations(pod.Annotations).GetString(metadata.KumaBuiltinGatewayAnnotation) | ||
| if !exists || builtinName == "" { | ||
| return nil | ||
| } | ||
|
|
||
| dataplaneProto, err := r.PodConverter.BuiltinGatewayDataplane(pod, builtinName) | ||
| if err != nil { | ||
| return errors.Wrap(err, "unable to translate a Pod into a Dataplane") | ||
| } else if dataplaneProto == nil { | ||
| // we don't want a dataplane, the existing object will be deleted | ||
| // through owner refs | ||
| return nil | ||
| } | ||
|
|
||
| spec, err := util_proto.ToMap(dataplaneProto) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| operationResult, err := kube_controllerutil.CreateOrUpdate(ctx, r.Client, dataplane, func() error { | ||
| dataplane.Spec = spec | ||
|
|
||
| if err := kube_controllerutil.SetControllerReference(pod, dataplane, r.Scheme); err != nil { | ||
| return errors.Wrap(err, "unable to set Dataplane's controller reference to Pod") | ||
| } | ||
| return nil | ||
| }) | ||
|
|
||
| if err != nil { | ||
| log := r.Log.WithValues("pod", kube_types.NamespacedName{Namespace: pod.Namespace, Name: pod.Name}) | ||
| log.Error(err, "unable to create/update Dataplane", "operationResult", operationResult) | ||
| r.EventRecorder.Eventf(pod, kube_core.EventTypeWarning, FailedToGenerateKumaDataplaneReason, "Failed to generate Kuma Dataplane: %s", err.Error()) | ||
| return err | ||
| } | ||
|
|
||
| switch operationResult { | ||
| case kube_controllerutil.OperationResultCreated: | ||
| r.EventRecorder.Eventf(pod, kube_core.EventTypeNormal, CreatedKumaDataplaneReason, "Created Kuma Dataplane: %s", dataplane.Name) | ||
| case kube_controllerutil.OperationResultUpdated: | ||
| r.EventRecorder.Eventf(pod, kube_core.EventTypeNormal, UpdatedKumaDataplaneReason, "Updated Kuma Dataplane: %s", dataplane.Name) | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func (p *PodConverter) BuiltinGatewayDataplane( | ||
| pod *kube_core.Pod, | ||
| name string, | ||
| ) (*mesh_proto.Dataplane, error) { | ||
| gateway := &mesh_k8s.Gateway{} | ||
| gatewayKey := kube_client.ObjectKey{Namespace: pod.Namespace, Name: name} | ||
|
|
||
| if err := p.GatewayGetter.Get(context.Background(), gatewayKey, gateway); err != nil { | ||
| // Our pods should eventually be deleted if this is the case | ||
| if kube_apierrs.IsNotFound(err) { | ||
| return nil, nil | ||
| } | ||
| return nil, errors.Wrapf(err, "failed to get Gateway %q", gatewayKey) | ||
| } | ||
|
|
||
| resource := core_mesh.NewGatewayResource() | ||
| p.ResourceConverter.ToCoreResource(gateway, resource) | ||
|
|
||
| selectors := resource.Selectors() | ||
| if len(selectors) == 0 { | ||
| return nil, nil | ||
| } | ||
|
|
||
| dataplaneProto := mesh_proto.Dataplane{ | ||
| Networking: &mesh_proto.Dataplane_Networking{ | ||
| Address: pod.Status.PodIP, | ||
| Gateway: &mesh_proto.Dataplane_Networking_Gateway{ | ||
| Tags: selectors[0].Match, | ||
| Type: mesh_proto.Dataplane_Networking_Gateway_BUILTIN, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| return &dataplaneProto, nil | ||
| } |
14 changes: 14 additions & 0 deletions
14
pkg/plugins/runtime/k8s/controllers/gateway_stub_converter.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| //go:build !gateway | ||
| // +build !gateway | ||
|
|
||
| package controllers | ||
|
|
||
| import ( | ||
| "context" | ||
|
|
||
| kube_core "k8s.io/api/core/v1" | ||
| ) | ||
|
|
||
| func (r *PodReconciler) createorUpdateBuiltinGatewayDataplane(ctx context.Context, pod *kube_core.Pod) error { | ||
| return nil | ||
| } |
54 changes: 54 additions & 0 deletions
54
pkg/plugins/runtime/k8s/controllers/gatewayapi/condition.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| //go:build gateway | ||
| // +build gateway | ||
|
|
||
| package controllers | ||
|
|
||
| import ( | ||
| kube_apps "k8s.io/api/apps/v1" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| kube_client "sigs.k8s.io/controller-runtime/pkg/client" | ||
| gatewayapi "sigs.k8s.io/gateway-api/apis/v1alpha2" | ||
| ) | ||
|
|
||
| func conditionOn( | ||
| obj kube_client.Object, typ gatewayapi.GatewayConditionType, status metav1.ConditionStatus, reason gatewayapi.GatewayConditionReason, | ||
| ) metav1.Condition { | ||
| return metav1.Condition{ | ||
| Type: string(typ), Status: status, Reason: string(reason), LastTransitionTime: metav1.Now(), ObservedGeneration: obj.GetGeneration(), | ||
| } | ||
| } | ||
|
|
||
| func getCondition(deployment *kube_apps.Deployment, typ kube_apps.DeploymentConditionType) *metav1.ConditionStatus { | ||
| for _, c := range deployment.Status.Conditions { | ||
| if c.Type == typ { | ||
| status := metav1.ConditionStatus(string(c.Status)) | ||
| return &status | ||
| } | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func setConditions(gateway *gatewayapi.Gateway, deployment *kube_apps.Deployment) { | ||
| conditions := []metav1.Condition{ | ||
| conditionOn(gateway, gatewayapi.GatewayConditionScheduled, metav1.ConditionTrue, gatewayapi.GatewayReasonScheduled), | ||
| } | ||
|
|
||
| // TODO(michaelbeaumont) it'd be nice to get more up to date info from the | ||
| // kuma-dp instance to tell whether listeners are _really_ ready | ||
| if len(gateway.Status.Addresses) == 0 { | ||
| conditions = append(conditions, | ||
| conditionOn(gateway, gatewayapi.GatewayConditionReady, metav1.ConditionFalse, gatewayapi.GatewayReasonAddressNotAssigned), | ||
| ) | ||
| } else if condition := getCondition(deployment, kube_apps.DeploymentAvailable); condition == nil && *condition != metav1.ConditionTrue { | ||
| conditions = append(conditions, | ||
| conditionOn(gateway, gatewayapi.GatewayConditionReady, metav1.ConditionFalse, gatewayapi.GatewayReasonListenersNotReady), | ||
| ) | ||
| } else { | ||
| conditions = append(conditions, | ||
| conditionOn(gateway, gatewayapi.GatewayConditionReady, metav1.ConditionTrue, gatewayapi.GatewayReasonReady), | ||
| ) | ||
| } | ||
|
|
||
| gateway.Status.Conditions = conditions | ||
| } |
Oops, something went wrong.