Merge pull request #364 from ngrok/del/28005-policy-controller

initial policy controller update

Makefile

@@ -106,14 +106,6 @@ ifndef ignore-not-found
   ignore-not-found = false
 endif
 
-.PHONY: install
-install: manifests kustomize ## Install CRDs into the K8s cluster specified in ~/.kube/config.
-	$(KUSTOMIZE) build config/crd | kubectl apply -f -
-
-.PHONY: uninstall
-uninstall: manifests kustomize ## Uninstall CRDs from the K8s cluster specified in ~/.kube/config. Call with ignore-not-found=true to ignore resource not found errors during deletion.
-	$(KUSTOMIZE) build config/crd | kubectl delete --ignore-not-found=$(ignore-not-found) -f -
-
 .PHONY: deploy
 deploy: _deploy-check-env-vars docker-build manifests kustomize _helm_setup ## Deploy controller to the K8s cluster specified in ~/.kube/config.
 	helm upgrade ngrok-ingress-controller $(HELM_CHART_DIR) --install \

api/ngrok/v1alpha1/ngroktrafficpolicy_types.go

@@ -38,13 +38,20 @@ type NgrokTrafficPolicySpec struct {
 	// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
 
+	// The raw json encoded policy that was applied to the ngrok API
+	// +kubebuilder:validation:Schemaless
+	// +kubebuilder:pruning:PreserveUnknownFields
+	// +kubebuilder:validation:Type=object
 	Policy json.RawMessage `json:"policy,omitempty"`
 }
 
 // NgrokTrafficPolicyStatus defines the observed state of NgrokTrafficPolicy
 type NgrokTrafficPolicyStatus struct {
-	// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
-	// Important: Run "make" to regenerate code after modifying this file
+
+	// The raw json encoded policy that was applied to the ngrok API
+	// +kubebuilder:validation:Schemaless
+	// +kubebuilder:pruning:PreserveUnknownFields
+	// +kubebuilder:validation:Type=object
 	Policy json.RawMessage `json:"policy,omitempty"`
 }
 

cmd/main.go

@@ -51,6 +51,7 @@ import (
 	"github.com/ngrok/kubernetes-ingress-controller/internal/annotations"
 	gatewaycontroller "github.com/ngrok/kubernetes-ingress-controller/internal/controller/gateway"
 	controllers "github.com/ngrok/kubernetes-ingress-controller/internal/controller/ingress"
+	ngrokctr "github.com/ngrok/kubernetes-ingress-controller/internal/controller/ngrok"
 	"github.com/ngrok/kubernetes-ingress-controller/internal/ngrokapi"
 	"github.com/ngrok/kubernetes-ingress-controller/internal/store"
 	"github.com/ngrok/kubernetes-ingress-controller/internal/version"
@@ -318,6 +319,17 @@ func runController(ctx context.Context, opts managerOpts) error {
 			os.Exit(1)
 		}
 	}
+
+	if err = (&ngrokctr.NgrokTrafficPolicyReconciler{
+		Client:   mgr.GetClient(),
+		Log:      ctrl.Log.WithName("controllers").WithName("Policy"),
+		Scheme:   mgr.GetScheme(),
+		Recorder: mgr.GetEventRecorderFor("policy-controller"),
+		Driver:   driver,
+	}).SetupWithManager(mgr); err != nil {
+		setupLog.Error(err, "unable to create controller", "controller", "Policy")
+		os.Exit(1)
+	}
 	//+kubebuilder:scaffold:builder
 
 	if err := mgr.AddReadyzCheck("readyz", func(req *http.Request) error {

internal/controller/ngrok/ngroktrafficpolicy_controller.go

@@ -27,18 +27,23 @@ package ngrok
 import (
 	"context"
 
+	"github.com/go-logr/logr"
+	ngrokv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ngrok/v1alpha1"
+	"github.com/ngrok/kubernetes-ingress-controller/internal/store"
 	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/client-go/tools/record"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/log"
-
-	ngrokv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ngrok/v1alpha1"
 )
 
 // NgrokTrafficPolicyReconciler reconciles a NgrokTrafficPolicy object
 type NgrokTrafficPolicyReconciler struct {
 	client.Client
-	Scheme *runtime.Scheme
+	Log      logr.Logger
+	Scheme   *runtime.Scheme
+	Recorder record.EventRecorder
+	Driver   *store.Driver
 }
 
 //+kubebuilder:rbac:groups=ngrok.k8s.ngrok.com,resources=ngroktrafficpolicies,verbs=get;list;watch;create;update;patch;delete
@@ -57,14 +62,14 @@ type NgrokTrafficPolicyReconciler struct {
 func (r *NgrokTrafficPolicyReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
 	_ = log.FromContext(ctx)
 
-	// TODO(user): your logic here
-
-	return ctrl.Result{}, nil
+	err := r.Driver.SyncEdges(ctx, r.Client)
+	return ctrl.Result{}, err
 }
 
 // SetupWithManager sets up the controller with the Manager.
 func (r *NgrokTrafficPolicyReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewControllerManagedBy(mgr).
 		For(&ngrokv1alpha1.NgrokTrafficPolicy{}).
+		WithEventFilter(commonPredicateFilters).
 		Complete(r)
 }

internal/controller/ngrok/policy_predicates.go

@@ -0,0 +1,24 @@
+package ngrok
+
+import (
+	"sigs.k8s.io/controller-runtime/pkg/event"
+	"sigs.k8s.io/controller-runtime/pkg/predicate"
+)
+
+// common update func predicate filter
+func updateFuncPredicateFilter(ue event.UpdateEvent) bool {
+	// First check if there are any annotations present that aren't in the old version
+	oldAnnotations := ue.ObjectOld.GetAnnotations()
+	for newKey, newValue := range ue.ObjectNew.GetAnnotations() {
+		if oldAnnotations[newKey] != newValue {
+			return true
+		}
+	}
+	// No change to spec, so we can ignore.  This does not filter out updates
+	// that set metadata.deletionTimestamp, so this won't undermine finalizer.
+	return ue.ObjectNew.GetGeneration() != ue.ObjectOld.GetGeneration()
+}
+
+var commonPredicateFilters = predicate.Funcs{
+	UpdateFunc: updateFuncPredicateFilter,
+}