Skip to content

Create a dummy tunnelBinding for tracking #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
adyanth wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Create a dummy tunnelBinding for tracking #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions config/rbac/role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,7 @@ rules:
- networking.cfargotunnel.com
resources:
- accesstunnels/status
- clustertunnels/status
- tunnelbindings/status
- tunnels/status
verbs:
- get
- patch
Expand All @@ -81,3 +79,14 @@ rules:
- tunnels/finalizers
verbs:
- update
- apiGroups:
- networking.cfargotunnel.com
resources:
- clustertunnels/status
- tunnels/status
verbs:
- get
- list
- patch
- update
- watch
2 changes: 2 additions & 0 deletions internal/controller/clustertunnel_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ func (r *ClusterTunnelReconciler) initStruct(ctx context.Context, tunnel Tunnel)
//+kubebuilder:rbac:groups=networking.cfargotunnel.com,resources=clustertunnels,verbs=get;list;watch;create;update;patch;delete
//+kubebuilder:rbac:groups=networking.cfargotunnel.com,resources=clustertunnels/status,verbs=get;update;patch
//+kubebuilder:rbac:groups=networking.cfargotunnel.com,resources=clustertunnels/finalizers,verbs=update
//+kubebuilder:rbac:groups=networking.cfargotunnel.com,resources=tunnelbindings,verbs=create;update;patch
//+kubebuilder:rbac:groups=core,resources=configmaps,verbs=get;list;watch;create;update;patch;delete
//+kubebuilder:rbac:groups=core,resources=secrets,verbs=get;list;watch;create;update;patch;delete
//+kubebuilder:rbac:groups=apps,resources=deployments,verbs=get;list;watch;create;update;patch;delete
Expand Down Expand Up @@ -178,6 +179,7 @@ func (r *ClusterTunnelReconciler) SetupWithManager(mgr ctrl.Manager) error {
r.Recorder = mgr.GetEventRecorderFor("cloudflare-operator")
return ctrl.NewControllerManagedBy(mgr).
For(&networkingv1alpha1.ClusterTunnel{}).
Owns(&networkingv1alpha1.TunnelBinding{}).
Owns(&corev1.ConfigMap{}).
Owns(&corev1.Secret{}).
Owns(&appsv1.Deployment{}).
Expand Down
29 changes: 29 additions & 0 deletions internal/controller/generic_tunnel_reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,10 +254,17 @@ func createManagedResources(r GenericTunnelReconciler) (ctrl.Result, error) {
return ctrl.Result{}, err
}

// Create Deployment if it does not exist and scale it
if err := k8s.Apply(r, deploymentForTunnel(r)); err != nil {
return ctrl.Result{}, err
}

// Create dummy TunnelBinding
tunnelBinding := dummyTunnelBindingForTunnel(r)
if err := k8s.Apply(r, tunnelBinding); err != nil {
return ctrl.Result{}, err
}

return ctrl.Result{}, nil
}

Expand Down Expand Up @@ -474,3 +481,25 @@ func deploymentForTunnel(r GenericTunnelReconciler) *appsv1.Deployment {
ctrl.SetControllerReference(r.GetTunnel().GetObject(), dep, r.GetScheme())
return dep
}

func dummyTunnelBindingForTunnel(r GenericTunnelReconciler) *networkingv1alpha1.TunnelBinding {
tunnelBinding := &networkingv1alpha1.TunnelBinding{
TypeMeta: metav1.TypeMeta{
APIVersion: networkingv1alpha1.GroupVersion.String(),
Kind: "TunnelBinding",
},
ObjectMeta: metav1.ObjectMeta{
Name: r.GetTunnel().GetName(),
Namespace: r.GetTunnel().GetNamespace(),
},
Subjects: []networkingv1alpha1.TunnelBindingSubject{},
TunnelRef: networkingv1alpha1.TunnelRef{
Kind: r.GetTunnel().GetObject().GetObjectKind().GroupVersionKind().Kind,
Name: r.GetTunnel().GetName(),
DisableDNSUpdates: true, // Nothing to update
},
}
tunnelBinding.SetLabels(labelsForBinding(*tunnelBinding))
ctrl.SetControllerReference(r.GetTunnel().GetObject(), tunnelBinding, r.GetScheme())
return tunnelBinding
}
2 changes: 2 additions & 0 deletions internal/controller/tunnel_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ func (r *TunnelReconciler) initStruct(ctx context.Context, tunnel Tunnel) error
//+kubebuilder:rbac:groups=networking.cfargotunnel.com,resources=tunnels,verbs=get;list;watch;create;update;patch;delete
//+kubebuilder:rbac:groups=networking.cfargotunnel.com,resources=tunnels/status,verbs=get;update;patch
//+kubebuilder:rbac:groups=networking.cfargotunnel.com,resources=tunnels/finalizers,verbs=update
//+kubebuilder:rbac:groups=networking.cfargotunnel.com,resources=tunnelbindings,verbs=create;update;patch
//+kubebuilder:rbac:groups=core,resources=configmaps,verbs=get;list;watch;create;update;patch;delete
//+kubebuilder:rbac:groups=core,resources=secrets,verbs=get;list;watch;create;update;patch;delete
//+kubebuilder:rbac:groups=apps,resources=deployments,verbs=get;list;watch;create;update;patch;delete
Expand Down Expand Up @@ -173,6 +174,7 @@ func (r *TunnelReconciler) SetupWithManager(mgr ctrl.Manager) error {
r.Recorder = mgr.GetEventRecorderFor("cloudflare-operator")
return ctrl.NewControllerManagedBy(mgr).
For(&networkingv1alpha1.Tunnel{}).
Owns(&networkingv1alpha1.TunnelBinding{}).
Owns(&corev1.ConfigMap{}).
Owns(&corev1.Secret{}).
Owns(&appsv1.Deployment{}).
Expand Down
10 changes: 6 additions & 4 deletions internal/controller/tunnelbinding_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,10 +129,10 @@ func (r *TunnelBindingReconciler) initStruct(ctx context.Context, tunnelBinding
//+kubebuilder:rbac:groups=networking.cfargotunnel.com,resources=tunnelbindings,verbs=get;list;watch;create;update;patch;delete
//+kubebuilder:rbac:groups=networking.cfargotunnel.com,resources=tunnelbindings/status,verbs=get;update;patch
//+kubebuilder:rbac:groups=networking.cfargotunnel.com,resources=tunnelbindings/finalizers,verbs=update
//+kubebuilder:rbac:groups=networking.cfargotunnel.com,resources=tunnels,verbs=get
//+kubebuilder:rbac:groups=networking.cfargotunnel.com,resources=tunnels/status,verbs=get
//+kubebuilder:rbac:groups=networking.cfargotunnel.com,resources=clustertunnels,verbs=get
//+kubebuilder:rbac:groups=networking.cfargotunnel.com,resources=clustertunnels/status,verbs=get
//+kubebuilder:rbac:groups=networking.cfargotunnel.com,resources=tunnels,verbs=get;list;watch
//+kubebuilder:rbac:groups=networking.cfargotunnel.com,resources=tunnels/status,verbs=get;list;watch
//+kubebuilder:rbac:groups=networking.cfargotunnel.com,resources=clustertunnels,verbs=get;list;watch
//+kubebuilder:rbac:groups=networking.cfargotunnel.com,resources=clustertunnels/status,verbs=get;list;watch
//+kubebuilder:rbac:groups=core,resources=configmaps,verbs=get;list;watch;update;patch
//+kubebuilder:rbac:groups=apps,resources=deployments,verbs=get;update;patch
//+kubebuilder:rbac:groups=core,resources=services,verbs=get;list;watch
Expand Down Expand Up @@ -609,5 +609,7 @@ func (r *TunnelBindingReconciler) SetupWithManager(mgr ctrl.Manager) error {
r.Recorder = mgr.GetEventRecorderFor("cloudflare-operator")
return ctrl.NewControllerManagedBy(mgr).
For(&networkingv1alpha1.TunnelBinding{}).
Owns(&networkingv1alpha1.ClusterTunnel{}).
Owns(&networkingv1alpha1.Tunnel{}).
Complete(r)
}