replace deprecated functions

six-group · Jan 16, 2024 · 179419f · 179419f
1 parent feab745
commit 179419f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/apis/proxy/v1alpha1/instance_types.go b/apis/proxy/v1alpha1/instance_types.go
@@ -238,12 +238,12 @@ func (g *GlobalConfiguration) Model() (models.Global, error) {
 		if err != nil {
 			return global, err
 		}
-		ptr, err := configuration.ParseGlobalSection(p)
+		ptrr, err := configuration.ParseGlobalSection(p)
 		if err != nil {
 			return global, err
 		}
-		if ptr != nil {
-			global = *ptr
+		if ptrr != nil {
+			global = *ptrr
 		}
 	}
 

diff --git a/controllers/instance/route.go b/controllers/instance/route.go
@@ -63,7 +63,7 @@ func (r *Reconciler) createOrUpdateRouteForFrontend(ctx context.Context, instanc
 			}
 
 			route.Spec.Port = &routev1.RoutePort{
-				TargetPort: intstr.FromInt(int(bind.Port)),
+				TargetPort: intstr.FromInt32(int32(bind.Port)),
 			}
 
 			route.Spec.TLS = instance.Spec.Network.Route.TLS

diff --git a/controllers/instance/service.go b/controllers/instance/service.go
@@ -47,7 +47,7 @@ func (r *Reconciler) reconcileService(ctx context.Context, instance *proxyv1alph
 				service.Spec.Ports = append(service.Spec.Ports, corev1.ServicePort{
 					Name:       fmt.Sprintf("tcp-%d", bind.Port),
 					Port:       int32(bind.Port),
-					TargetPort: intstr.FromInt(int(bind.Port)),
+					TargetPort: intstr.FromInt32(int32(bind.Port)),
 					Protocol:   corev1.ProtocolTCP,
 				})
 			}
@@ -62,7 +62,7 @@ func (r *Reconciler) reconcileService(ctx context.Context, instance *proxyv1alph
 				service.Spec.Ports = append(service.Spec.Ports, corev1.ServicePort{
 					Name:       fmt.Sprintf("tcp-%d", bind.Port),
 					Port:       int32(bind.Port),
-					TargetPort: intstr.FromInt(int(bind.Port)),
+					TargetPort: intstr.FromInt32(int32(bind.Port)),
 					Protocol:   corev1.ProtocolTCP,
 				})
 			}
@@ -72,7 +72,7 @@ func (r *Reconciler) reconcileService(ctx context.Context, instance *proxyv1alph
 			service.Spec.Ports = append(service.Spec.Ports, corev1.ServicePort{
 				Name:       "metrics",
 				Port:       int32(instance.Spec.Metrics.Port),
-				TargetPort: intstr.FromInt(int(instance.Spec.Metrics.Port)),
+				TargetPort: intstr.FromInt32(int32(instance.Spec.Metrics.Port)),
 				Protocol:   corev1.ProtocolTCP,
 			})
 		}