Skip to content

Commit 3cd839f

Browse files
jukiejukie
authored
Merge branch 'main' into wrr-locality-support
2 parents 7d1822a + 8e813bd commit 3cd839f

97 files changed

Lines changed: 1774 additions & 1846 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎api/v1alpha1/envoygateway_helpers.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -171,19 +171,19 @@ func (f *RuntimeFlags) IsEnabled(flag RuntimeFlag) bool {
171171
// DefaultLeaderElection returns a new LeaderElection with default configuration parameters.
172172
func DefaultLeaderElection() *LeaderElection {
173173
return &LeaderElection{
174-
RenewDeadline: ptr.To(gwapiv1.Duration("10s")),
175-
RetryPeriod: ptr.To(gwapiv1.Duration("2s")),
176-
LeaseDuration: ptr.To(gwapiv1.Duration("15s")),
177-
Disable: ptr.To(false),
174+
RenewDeadline: new(gwapiv1.Duration("10s")),
175+
RetryPeriod: new(gwapiv1.Duration("2s")),
176+
LeaseDuration: new(gwapiv1.Duration("15s")),
177+
Disable: new(false),
178178
}
179179
}
180180

181181
// DefaultKubernetesClient returns a new DefaultKubernetesClient with default parameters.
182182
func DefaultKubernetesClient() *KubernetesClient {
183183
return &KubernetesClient{
184184
RateLimit: &KubernetesClientRateLimit{
185-
QPS: ptr.To(DefaultKubernetesClientQPS),
186-
Burst: ptr.To(DefaultKubernetesClientBurst),
185+
QPS: new(DefaultKubernetesClientQPS),
186+
Burst: new(DefaultKubernetesClientBurst),
187187
},
188188
}
189189
}
@@ -335,7 +335,7 @@ func (r *EnvoyGatewayProvider) GetEnvoyGatewayKubeProvider() *EnvoyGatewayKubern
335335
}
336336

337337
if r.Kubernetes.ShutdownManager == nil {
338-
r.Kubernetes.ShutdownManager = &ShutdownManager{Image: ptr.To(DefaultShutdownManagerImage)}
338+
r.Kubernetes.ShutdownManager = &ShutdownManager{Image: new(DefaultShutdownManagerImage)}
339339
}
340340

341341
return r.Kubernetes

‎api/v1alpha1/envoyproxy_helpers.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313
autoscalingv2 "k8s.io/api/autoscaling/v2"
1414
corev1 "k8s.io/api/core/v1"
1515
"k8s.io/apimachinery/pkg/api/resource"
16-
"k8s.io/utils/ptr"
1716
)
1817

1918
// DefaultEnvoyProxyProvider returns a new EnvoyProxyProvider with default settings.
@@ -50,7 +49,7 @@ func DefaultEnvoyProxyHpaMetrics() []autoscalingv2.MetricSpec {
5049
Name: corev1.ResourceCPU,
5150
Target: autoscalingv2.MetricTarget{
5251
Type: autoscalingv2.UtilizationMetricType,
53-
AverageUtilization: ptr.To[int32](80),
52+
AverageUtilization: new(int32(80)),
5453
},
5554
},
5655
Type: autoscalingv2.ResourceMetricSourceType,

‎api/v1alpha1/kubernetes_helpers.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import (
1515
policyv1 "k8s.io/api/policy/v1"
1616
"k8s.io/apimachinery/pkg/api/resource"
1717
"k8s.io/apimachinery/pkg/util/strategicpatch"
18-
"k8s.io/utils/ptr"
1918
)
2019

2120
// DefaultKubernetesDeploymentStrategy returns the default deployment strategy settings.
@@ -34,7 +33,7 @@ func DefaultKubernetesDaemonSetStrategy() *appsv1.DaemonSetUpdateStrategy {
3433

3534
// DefaultKubernetesContainerImage returns the default envoyproxy image.
3635
func DefaultKubernetesContainerImage(image string) *string {
37-
return ptr.To(image)
36+
return new(image)
3837
}
3938

4039
// DefaultKubernetesDeployment returns a new KubernetesDeploymentSpec with default settings.

‎api/v1alpha1/validation/envoyproxy_validate_test.go‎

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import (
1515
corev1 "k8s.io/api/core/v1"
1616
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
1717
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
18-
"k8s.io/utils/ptr"
1918

2019
egv1a1 "github.com/envoyproxy/gateway/api/v1alpha1"
2120
)
@@ -201,7 +200,7 @@ func TestValidateEnvoyProxy(t *testing.T) {
201200
Kubernetes: &egv1a1.EnvoyProxyKubernetesProvider{
202201
EnvoyService: &egv1a1.KubernetesServiceSpec{
203202
Type: egv1a1.GetKubernetesServiceType(egv1a1.ServiceTypeLoadBalancer),
204-
AllocateLoadBalancerNodePorts: ptr.To(false),
203+
AllocateLoadBalancerNodePorts: new(false),
205204
},
206205
},
207206
},
@@ -222,7 +221,7 @@ func TestValidateEnvoyProxy(t *testing.T) {
222221
Kubernetes: &egv1a1.EnvoyProxyKubernetesProvider{
223222
EnvoyService: &egv1a1.KubernetesServiceSpec{
224223
Type: egv1a1.GetKubernetesServiceType(egv1a1.ServiceTypeClusterIP),
225-
AllocateLoadBalancerNodePorts: ptr.To(false),
224+
AllocateLoadBalancerNodePorts: new(false),
226225
},
227226
},
228227
},
@@ -286,7 +285,7 @@ func TestValidateEnvoyProxy(t *testing.T) {
286285
Kubernetes: &egv1a1.EnvoyProxyKubernetesProvider{
287286
EnvoyService: &egv1a1.KubernetesServiceSpec{
288287
Type: egv1a1.GetKubernetesServiceType(egv1a1.ServiceTypeLoadBalancer),
289-
LoadBalancerIP: ptr.To("10.11.12.13"),
288+
LoadBalancerIP: new("10.11.12.13"),
290289
},
291290
},
292291
},
@@ -307,7 +306,7 @@ func TestValidateEnvoyProxy(t *testing.T) {
307306
Kubernetes: &egv1a1.EnvoyProxyKubernetesProvider{
308307
EnvoyService: &egv1a1.KubernetesServiceSpec{
309308
Type: egv1a1.GetKubernetesServiceType(egv1a1.ServiceTypeLoadBalancer),
310-
LoadBalancerIP: ptr.To("invalid-ip"),
309+
LoadBalancerIP: new("invalid-ip"),
311310
},
312311
},
313312
},
@@ -328,7 +327,7 @@ func TestValidateEnvoyProxy(t *testing.T) {
328327
Kubernetes: &egv1a1.EnvoyProxyKubernetesProvider{
329328
EnvoyService: &egv1a1.KubernetesServiceSpec{
330329
Type: egv1a1.GetKubernetesServiceType(egv1a1.ServiceTypeLoadBalancer),
331-
LoadBalancerIP: ptr.To("2001:db8::68"),
330+
LoadBalancerIP: new("2001:db8::68"),
332331
},
333332
},
334333
},
@@ -349,7 +348,7 @@ func TestValidateEnvoyProxy(t *testing.T) {
349348
Settings: []egv1a1.ProxyAccessLogSetting{
350349
{
351350
Format: &egv1a1.ProxyAccessLogFormat{
352-
Type: ptr.To(egv1a1.ProxyAccessLogFormatTypeText),
351+
Type: new(egv1a1.ProxyAccessLogFormatTypeText),
353352
},
354353
},
355354
},
@@ -372,8 +371,8 @@ func TestValidateEnvoyProxy(t *testing.T) {
372371
Settings: []egv1a1.ProxyAccessLogSetting{
373372
{
374373
Format: &egv1a1.ProxyAccessLogFormat{
375-
Type: ptr.To(egv1a1.ProxyAccessLogFormatTypeText),
376-
Text: ptr.To("[%START_TIME%]"),
374+
Type: new(egv1a1.ProxyAccessLogFormatTypeText),
375+
Text: new("[%START_TIME%]"),
377376
},
378377
Sinks: []egv1a1.ProxyAccessLogSink{
379378
{
@@ -423,7 +422,7 @@ func TestValidateEnvoyProxy(t *testing.T) {
423422
{
424423
Type: egv1a1.MetricSinkTypeOpenTelemetry,
425424
OpenTelemetry: &egv1a1.ProxyOpenTelemetrySink{
426-
Host: ptr.To("0.0.0.0"),
425+
Host: new("0.0.0.0"),
427426
Port: 3217,
428427
},
429428
},
@@ -519,7 +518,7 @@ func TestValidateEnvoyProxy(t *testing.T) {
519518
Kubernetes: &egv1a1.EnvoyProxyKubernetesProvider{
520519
EnvoyPDB: &egv1a1.KubernetesPodDisruptionBudgetSpec{
521520
Patch: &egv1a1.KubernetesPatchSpec{
522-
Type: ptr.To(egv1a1.StrategicMerge),
521+
Type: new(egv1a1.StrategicMerge),
523522
Value: apiextensionsv1.JSON{
524523
Raw: []byte("{}"),
525524
},
@@ -544,7 +543,7 @@ func TestValidateEnvoyProxy(t *testing.T) {
544543
Kubernetes: &egv1a1.EnvoyProxyKubernetesProvider{
545544
EnvoyPDB: &egv1a1.KubernetesPodDisruptionBudgetSpec{
546545
Patch: &egv1a1.KubernetesPatchSpec{
547-
Type: ptr.To(egv1a1.StrategicMerge),
546+
Type: new(egv1a1.StrategicMerge),
548547
},
549548
},
550549
},
@@ -614,7 +613,7 @@ func TestValidateEnvoyProxy(t *testing.T) {
614613
Kubernetes: &egv1a1.EnvoyProxyKubernetesProvider{
615614
EnvoyHpa: &egv1a1.KubernetesHorizontalPodAutoscalerSpec{
616615
Patch: &egv1a1.KubernetesPatchSpec{
617-
Type: ptr.To(egv1a1.StrategicMerge),
616+
Type: new(egv1a1.StrategicMerge),
618617
Value: apiextensionsv1.JSON{
619618
Raw: []byte("{}"),
620619
},
@@ -639,7 +638,7 @@ func TestValidateEnvoyProxy(t *testing.T) {
639638
Kubernetes: &egv1a1.EnvoyProxyKubernetesProvider{
640639
EnvoyHpa: &egv1a1.KubernetesHorizontalPodAutoscalerSpec{
641640
Patch: &egv1a1.KubernetesPatchSpec{
642-
Type: ptr.To(egv1a1.StrategicMerge),
641+
Type: new(egv1a1.StrategicMerge),
643642
},
644643
},
645644
},
@@ -685,7 +684,7 @@ func TestValidateEnvoyProxy(t *testing.T) {
685684
Kubernetes: &egv1a1.EnvoyProxyKubernetesProvider{
686685
EnvoyDeployment: &egv1a1.KubernetesDeploymentSpec{
687686
Patch: &egv1a1.KubernetesPatchSpec{
688-
Type: ptr.To(egv1a1.StrategicMerge),
687+
Type: new(egv1a1.StrategicMerge),
689688
},
690689
},
691690
},
@@ -707,7 +706,7 @@ func TestValidateEnvoyProxy(t *testing.T) {
707706
Kubernetes: &egv1a1.EnvoyProxyKubernetesProvider{
708707
EnvoyDeployment: &egv1a1.KubernetesDeploymentSpec{
709708
Patch: &egv1a1.KubernetesPatchSpec{
710-
Type: ptr.To(egv1a1.StrategicMerge),
709+
Type: new(egv1a1.StrategicMerge),
711710
Value: apiextensionsv1.JSON{
712711
Raw: []byte("{}"),
713712
},
@@ -754,11 +753,11 @@ func TestValidateEnvoyProxy(t *testing.T) {
754753
FilterOrder: []egv1a1.FilterPosition{
755754
{
756755
Name: egv1a1.EnvoyFilterOAuth2,
757-
Before: ptr.To(egv1a1.EnvoyFilterJWTAuthn),
756+
Before: new(egv1a1.EnvoyFilterJWTAuthn),
758757
},
759758
{
760759
Name: egv1a1.EnvoyFilterExtProc,
761-
After: ptr.To(egv1a1.EnvoyFilterJWTAuthn),
760+
After: new(egv1a1.EnvoyFilterJWTAuthn),
762761
},
763762
},
764763
},
@@ -776,15 +775,15 @@ func TestValidateEnvoyProxy(t *testing.T) {
776775
FilterOrder: []egv1a1.FilterPosition{
777776
{
778777
Name: egv1a1.EnvoyFilterOAuth2,
779-
Before: ptr.To(egv1a1.EnvoyFilterJWTAuthn),
778+
Before: new(egv1a1.EnvoyFilterJWTAuthn),
780779
},
781780
{
782781
Name: egv1a1.EnvoyFilterJWTAuthn,
783-
Before: ptr.To(egv1a1.EnvoyFilterExtProc),
782+
Before: new(egv1a1.EnvoyFilterExtProc),
784783
},
785784
{
786785
Name: egv1a1.EnvoyFilterExtProc,
787-
Before: ptr.To(egv1a1.EnvoyFilterOAuth2),
786+
Before: new(egv1a1.EnvoyFilterOAuth2),
788787
},
789788
},
790789
},
@@ -801,7 +800,7 @@ func TestValidateEnvoyProxy(t *testing.T) {
801800
Spec: egv1a1.EnvoyProxySpec{
802801
Telemetry: &egv1a1.ProxyTelemetry{
803802
Metrics: &egv1a1.ProxyMetrics{
804-
ClusterStatName: ptr.To(fmt.Sprintf("%s/%s/%s/%s/%s/%s/%s", egv1a1.StatFormatterRouteName,
803+
ClusterStatName: new(fmt.Sprintf("%s/%s/%s/%s/%s/%s/%s", egv1a1.StatFormatterRouteName,
805804
egv1a1.StatFormatterRouteName, egv1a1.StatFormatterRouteNamespace, egv1a1.StatFormatterRouteKind,
806805
egv1a1.StatFormatterRouteRuleName, egv1a1.StatFormatterRouteRuleNumber, egv1a1.StatFormatterBackendRefs)),
807806
},
@@ -820,7 +819,7 @@ func TestValidateEnvoyProxy(t *testing.T) {
820819
Spec: egv1a1.EnvoyProxySpec{
821820
Telemetry: &egv1a1.ProxyTelemetry{
822821
Metrics: &egv1a1.ProxyMetrics{
823-
ClusterStatName: ptr.To("%ROUTE_NAME%.%FOO%.%BAR%/my/%BACKEND_REFS%/%FOOBAR%"),
822+
ClusterStatName: new("%ROUTE_NAME%.%FOO%.%BAR%/my/%BACKEND_REFS%/%FOOBAR%"),
824823
},
825824
},
826825
},
@@ -1018,7 +1017,7 @@ func TestValidateProxyAccessLog(t *testing.T) {
10181017
Settings: []egv1a1.ProxyAccessLogSetting{
10191018
{
10201019
Format: &egv1a1.ProxyAccessLogFormat{
1021-
Text: ptr.To("[%START_TIME%]"),
1020+
Text: new("[%START_TIME%]"),
10221021
},
10231022
Sinks: []egv1a1.ProxyAccessLogSink{
10241023
{
@@ -1054,7 +1053,7 @@ func TestValidateProxyAccessLog(t *testing.T) {
10541053
Settings: []egv1a1.ProxyAccessLogSetting{
10551054
{
10561055
Format: &egv1a1.ProxyAccessLogFormat{
1057-
Text: ptr.To("[%START_TIME%]"),
1056+
Text: new("[%START_TIME%]"),
10581057
JSON: map[string]string{"start_time": "%START_TIME%"},
10591058
},
10601059
Sinks: []egv1a1.ProxyAccessLogSink{
@@ -1073,7 +1072,7 @@ func TestValidateProxyAccessLog(t *testing.T) {
10731072
Settings: []egv1a1.ProxyAccessLogSetting{
10741073
{
10751074
Format: &egv1a1.ProxyAccessLogFormat{
1076-
Type: ptr.To(egv1a1.ProxyAccessLogFormatTypeText),
1075+
Type: new(egv1a1.ProxyAccessLogFormatTypeText),
10771076
},
10781077
Sinks: []egv1a1.ProxyAccessLogSink{
10791078
{
@@ -1092,8 +1091,8 @@ func TestValidateProxyAccessLog(t *testing.T) {
10921091
Settings: []egv1a1.ProxyAccessLogSetting{
10931092
{
10941093
Format: &egv1a1.ProxyAccessLogFormat{
1095-
Type: ptr.To(egv1a1.ProxyAccessLogFormatTypeText),
1096-
Text: ptr.To("[%START_TIME%]"),
1094+
Type: new(egv1a1.ProxyAccessLogFormatTypeText),
1095+
Text: new("[%START_TIME%]"),
10971096
},
10981097
Sinks: []egv1a1.ProxyAccessLogSink{
10991098
{

‎internal/cmd/envoy/shutdown_manager_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import (
1717
"time"
1818

1919
"github.com/stretchr/testify/require"
20-
"k8s.io/utils/ptr"
2120
)
2221

2322
// setupFakeEnvoyStats set up an HTTP server return content
@@ -202,7 +201,7 @@ func TestGetTotalConnections(t *testing.T) {
202201
}
203202
]
204203
}`,
205-
expectedCount: ptr.To(1),
204+
expectedCount: new(1),
206205
},
207206
{
208207
name: "invalid",

‎internal/envoygateway/config/decoder_test.go‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212
"github.com/stretchr/testify/require"
1313
corev1 "k8s.io/api/core/v1"
1414
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
15-
"k8s.io/utils/ptr"
1615
gwapiv1 "sigs.k8s.io/gateway-api/apis/v1"
1716

1817
egv1a1 "github.com/envoyproxy/gateway/api/v1alpha1"
@@ -145,11 +144,11 @@ func TestDecode(t *testing.T) {
145144
Value: "env_b_value",
146145
},
147146
},
148-
Image: ptr.To("envoyproxy/ratelimit:latest"),
147+
Image: new("envoyproxy/ratelimit:latest"),
149148
Resources: egv1a1.DefaultResourceRequirements(),
150149
SecurityContext: &corev1.SecurityContext{
151-
RunAsUser: ptr.To[int64](2000),
152-
AllowPrivilegeEscalation: ptr.To(false),
150+
RunAsUser: new(int64(2000)),
151+
AllowPrivilegeEscalation: new(false),
153152
},
154153
},
155154
Pod: &egv1a1.KubernetesPodSpec{
@@ -158,9 +157,9 @@ func TestDecode(t *testing.T) {
158157
"key2": "val2",
159158
},
160159
SecurityContext: &corev1.PodSecurityContext{
161-
RunAsUser: ptr.To[int64](1000),
162-
RunAsGroup: ptr.To[int64](3000),
163-
FSGroup: ptr.To[int64](2000),
160+
RunAsUser: new(int64(1000)),
161+
RunAsGroup: new(int64(3000)),
162+
FSGroup: new(int64(2000)),
164163
FSGroupChangePolicy: func(s corev1.PodFSGroupChangePolicy) *corev1.PodFSGroupChangePolicy { return &s }(corev1.FSGroupChangeOnRootMismatch),
165164
},
166165
},
@@ -195,7 +194,7 @@ func TestDecode(t *testing.T) {
195194
Provider: egv1a1.DefaultEnvoyGatewayProvider(),
196195
Gateway: egv1a1.DefaultGateway(),
197196
RateLimit: &egv1a1.RateLimit{
198-
Timeout: ptr.To(gwapiv1.Duration("10ms")),
197+
Timeout: new(gwapiv1.Duration("10ms")),
199198
FailClosed: true,
200199
Backend: egv1a1.RateLimitDatabaseBackend{
201200
Type: egv1a1.RedisBackendType,
@@ -331,10 +330,10 @@ func TestDecode(t *testing.T) {
331330
Type: egv1a1.ProviderTypeKubernetes,
332331
Kubernetes: &egv1a1.EnvoyGatewayKubernetesProvider{
333332
LeaderElection: &egv1a1.LeaderElection{
334-
Disable: ptr.To(true),
335-
LeaseDuration: ptr.To(gwapiv1.Duration("1s")),
336-
RenewDeadline: ptr.To(gwapiv1.Duration("2s")),
337-
RetryPeriod: ptr.To(gwapiv1.Duration("3s")),
333+
Disable: new(true),
334+
LeaseDuration: new(gwapiv1.Duration("1s")),
335+
RenewDeadline: new(gwapiv1.Duration("2s")),
336+
RetryPeriod: new(gwapiv1.Duration("3s")),
338337
},
339338
},
340339
},
@@ -356,8 +355,8 @@ func TestDecode(t *testing.T) {
356355
Kubernetes: &egv1a1.EnvoyGatewayKubernetesProvider{
357356
Client: &egv1a1.KubernetesClient{
358357
RateLimit: &egv1a1.KubernetesClientRateLimit{
359-
QPS: ptr.To[int32](500),
360-
Burst: ptr.To[int32](1000),
358+
QPS: new(int32(500)),
359+
Burst: new(int32(1000)),
361360
},
362361
},
363362
},

0 commit comments

Comments
 (0)