@@ -4,12 +4,15 @@ import (
44 "context"
55 "errors"
66
7- "github.com/cloudflare/cloudflare-go"
7+ "github.com/cloudflare/cloudflare-go/v2"
8+ "github.com/cloudflare/cloudflare-go/v2/shared"
9+ "github.com/cloudflare/cloudflare-go/v2/zero_trust"
810 apps "k8s.io/api/apps/v1"
911 core "k8s.io/api/core/v1"
1012 v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1113 "k8s.io/apimachinery/pkg/runtime"
1214 "k8s.io/apimachinery/pkg/types"
15+ "k8s.io/apimachinery/pkg/util/intstr"
1316 ctrl "sigs.k8s.io/controller-runtime"
1417 "sigs.k8s.io/controller-runtime/pkg/client"
1518 "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
@@ -109,18 +112,19 @@ func (r *GatewayReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
109112 log .Error (err , "Failed to delete Deployment" )
110113 }
111114
112- tunnel , tunnelInfo , err := api .ListTunnels (ctx , account , cloudflare.TunnelListParams {
113- IsDeleted : cloudflare .BoolPtr (false ),
114- Name : gateway .Name ,
115+ tunnel , err := api .ZeroTrust .Tunnels .List (ctx , zero_trust.TunnelListParams {
116+ AccountID : cloudflare .String (account ),
117+ IsDeleted : cloudflare .Bool (false ),
118+ Name : cloudflare .String (gateway .Name ),
115119 })
116120 if err != nil {
117121 log .Error (err , "Failed to get tunnel from Cloudflare API" )
118122 return ctrl.Result {}, err
119123 }
120124
121- if tunnelInfo . Count > 0 {
125+ if len ( tunnel . Result ) > 0 {
122126 log .Info ("Deleting Tunnel" )
123- if err := api .DeleteTunnel (ctx , account , tunnel [0 ].ID ); err != nil {
127+ if _ , err := api .ZeroTrust . Tunnels . Delete (ctx , tunnel . Result [0 ].ID , zero_trust. TunnelDeleteParams {} ); err != nil {
124128 log .Error (err , "Failed to delete tunnel Deployment" )
125129 return ctrl.Result {}, err
126130 }
@@ -150,25 +154,30 @@ func (r *GatewayReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
150154 return ctrl.Result {}, nil
151155 }
152156
153- tunnels , info , err := api .ListTunnels (ctx , account , cloudflare.TunnelListParams {IsDeleted : cloudflare .BoolPtr (false ), Name : gateway .Name })
157+ tunnels , err := api .ZeroTrust .Tunnels .List (ctx , zero_trust.TunnelListParams {
158+ AccountID : cloudflare .String (account ),
159+ IsDeleted : cloudflare .Bool (false ),
160+ Name : cloudflare .String (gateway .Name ),
161+ })
154162 if err != nil {
155163 log .Error (err , "Failed to get Tunnel from Cloudflare API" )
156164 return ctrl.Result {}, err
157165 }
158166
159- tunnel := cloudflare. Tunnel {}
160- if info . Count == 0 {
167+ tunnelID := ""
168+ if len ( tunnels . Result ) == 0 {
161169 log .Info ("Creating tunnel" )
162170 // secret is required, despite optional in docs and seemingly only needed for ConfigSrc=local
163- tunnel , err = api .CreateTunnel (ctx , account , cloudflare. TunnelCreateParams {
164- Name : gateway . Name ,
165- ConfigSrc : " cloudflare"
166- Secret : "AQIDBAUGBwgBAgMEBQYHCAECAwQFBgcIAQIDBAUGBwg=" ,
171+ tunnel , err : =api .ZeroTrust . Tunnels . New (ctx , zero_trust. TunnelNewParams {
172+ AccountID : cloudflare . String ( account ) ,
173+ Name : cloudflare . String ( gateway . Name ) ,
174+ TunnelSecret : cloudflare . String ( "AQIDBAUGBwgBAgMEBQYHCAECAwQFBgcIAQIDBAUGBwg=" ) ,
167175 })
168176 if err != nil {
169177 log .Error (err , "Failed to create tunnel" )
170178 return ctrl.Result {}, err
171179 }
180+ tunnelID = tunnel .ID
172181 } else {
173182 // patch unsupported with api_token
174183 // if tunnels[0].Name != gateway.Name {
@@ -181,47 +190,60 @@ func (r *GatewayReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
181190 // }
182191 // }
183192 log .Info ("Tunnel exists" )
184- tunnel = tunnels [0 ]
193+ tunnelID = tunnels . Result [0 ]. ID
185194 }
186195
187- token , err := api .GetTunnelToken (ctx , account , tunnel .ID )
196+ res , err := api .ZeroTrust .Tunnels .Token .Get (ctx , tunnelID , zero_trust.TunnelTokenGetParams {
197+ AccountID : cloudflare .String (account ),
198+ })
188199 if err != nil {
189200 log .Error (err , "Failed to get tunnel token" )
190201 return ctrl.Result {}, err
191202 }
203+ token := string ((* res ).(shared.UnionString ))
192204
193- if err := r .Get (ctx , types.NamespacedName {
194- Namespace : gateway .Namespace ,
195- Name : gateway .Name ,
196- }, & apps.Deployment {}); err == nil {
197- log .Info ("Tunnel deployment exists" )
198- return ctrl.Result {}, nil
199- }
200-
201- labels := map [string ]string {"cfargotunnel.com/name" : gateway .Name }
202- deployment := apps.Deployment {
205+ deployment := & apps.Deployment {
203206 ObjectMeta : v1.ObjectMeta {
204207 Namespace : gateway .Namespace ,
205208 Name : gateway .Name ,
206209 },
207- Spec : apps.DeploymentSpec {
210+ }
211+ if _ , err := controllerutil .CreateOrUpdate (ctx , r .Client , deployment , func () error {
212+ labels := map [string ]string {"cfargotunnel.com/name" : gateway .Name }
213+ deployment .Spec = apps.DeploymentSpec {
208214 Selector : & v1.LabelSelector {MatchLabels : labels },
209215 Template : core.PodTemplateSpec {
210216 ObjectMeta : v1.ObjectMeta {Labels : labels },
211217 Spec : core.PodSpec {Containers : []core.Container {{
212- Name : "main" ,
218+ Name : "main" ,
213219 // renovate: datasource=docker
214220 Image : "cloudflare/cloudflared:2024.5.0" ,
215- Args : []string {"tunnel" , "--no-autoupdate" , "run" , "--token" , token },
221+ Args : []string {"tunnel" , "--no-autoupdate" , "--metrics" , "0.0.0.0:2000" , "run" , "--token" , token },
222+ LivenessProbe : & core.Probe {
223+ FailureThreshold : 5 ,
224+ InitialDelaySeconds : 10 ,
225+ PeriodSeconds : 10 ,
226+ ProbeHandler : core.ProbeHandler {
227+ HTTPGet : & core.HTTPGetAction {
228+ Path : "/ready" ,
229+ Port : intstr .FromInt (2000 ),
230+ },
231+ },
232+ },
216233 }}},
217234 },
218- },
219- }
220-
221- if err := r .Create (ctx , & deployment ); err != nil {
222- log .Error (err , "Failed to create tunnel deployment" )
235+ Strategy : apps.DeploymentStrategy {
236+ RollingUpdate : & apps.RollingUpdateDeployment {
237+ MaxUnavailable : & intstr.IntOrString {IntVal : 0 },
238+ },
239+ },
240+ }
241+ return nil
242+ }); err != nil {
243+ log .Error (err , "Failed to reconcile tunnel deployment" )
223244 return ctrl.Result {}, err
224245 }
246+ log .Info ("Reconciled tunnel deployment" )
225247
226248 return ctrl.Result {}, nil
227249}
![renovate[bot]](https://avatars.githubusercontent.com/in/2740?v=4&size=40){kind=avatar}
0 commit comments