Skip to content

Commit ca3f501

Browse files
arkodgarkodg
authored
Merge branch 'main' into adds-new-field-to-remotejwks-securitypolicy
2 parents ab1467d + 8fdebee commit ca3f501

File tree

96 files changed

+565
-426
lines changed

Some content is hidden

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

96 files changed

+565
-426
lines changed

‎internal/cmd/certgen.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,8 @@ func patchTopologyInjectorWebhook(ctx context.Context, cli client.Client, cfg *c
137137

138138
var updated bool
139139
desiredBundle := current.Data["ca.crt"]
140-
for i, webhook := range webhookCfg.Webhooks {
141-
if !bytes.Equal(desiredBundle, webhook.ClientConfig.CABundle) {
140+
for i := range webhookCfg.Webhooks {
141+
if !bytes.Equal(desiredBundle, webhookCfg.Webhooks[i].ClientConfig.CABundle) {
142142
webhookCfg.Webhooks[i].ClientConfig.CABundle = desiredBundle
143143
updated = true
144144
}

‎internal/cmd/egctl/config.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -125,10 +125,10 @@ func fetchRunningEnvoyPods(c kube.CLIClient, nn types.NamespacedName, labelSelec
125125
if err != nil {
126126
return nil, err
127127
}
128-
for _, i := range namespaces.Items {
129-
podList, err := c.PodsForSelector(i.Name, proxy.EnvoyAppLabelSelector()...)
128+
for i := range namespaces.Items {
129+
podList, err := c.PodsForSelector(namespaces.Items[i].Name, proxy.EnvoyAppLabelSelector()...)
130130
if err != nil {
131-
return nil, fmt.Errorf("list pods failed in ns %s: %w", i.Name, err)
131+
return nil, fmt.Errorf("list pods failed in ns %s: %w", namespaces.Items[i].Name, err)
132132
}
133133

134134
if len(podList.Items) == 0 {
@@ -170,9 +170,9 @@ func fetchRunningEnvoyPods(c kube.CLIClient, nn types.NamespacedName, labelSelec
170170
}
171171

172172
podsNamespacedNames := make([]types.NamespacedName, 0, len(pods))
173-
for _, pod := range pods {
174-
podNsName := utils.NamespacedName(&pod)
175-
if pod.Status.Phase != "Running" {
173+
for i := range pods {
174+
podNsName := utils.NamespacedName(&pods[i])
175+
if pods[i].Status.Phase != "Running" {
176176
return podsNamespacedNames, fmt.Errorf("pod %s is not running", podNsName)
177177
}
178178

‎internal/cmd/egctl/config_ratelimit.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -106,14 +106,14 @@ func fetchRunningRateLimitPods(cli kubernetes.CLIClient, namespace string, label
106106
}
107107

108108
rlNN := []types.NamespacedName{}
109-
for _, rlPod := range rlPods.Items {
109+
for i := range rlPods.Items {
110110
rlPodNsName := types.NamespacedName{
111-
Namespace: rlPod.Namespace,
112-
Name: rlPod.Name,
111+
Namespace: rlPods.Items[i].Namespace,
112+
Name: rlPods.Items[i].Name,
113113
}
114114

115115
// Check that the rate limit pod is ready properly and can accept external traffic
116-
if !checkRateLimitPodStatusReady(rlPod.Status) {
116+
if !checkRateLimitPodStatusReady(&rlPods.Items[i].Status) {
117117
continue
118118
}
119119

@@ -127,7 +127,7 @@ func fetchRunningRateLimitPods(cli kubernetes.CLIClient, namespace string, label
127127
}
128128

129129
// checkRateLimitPodStatusReady Check that the rate limit pod is ready
130-
func checkRateLimitPodStatusReady(status corev1.PodStatus) bool {
130+
func checkRateLimitPodStatusReady(status *corev1.PodStatus) bool {
131131
if status.Phase != corev1.PodRunning {
132132
return false
133133
}

‎internal/cmd/egctl/config_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,7 @@ func TestCheckRateLimitPodStatusReady(t *testing.T) {
520520

521521
for _, tc := range cases {
522522
t.Run(tc.caseName, func(t *testing.T) {
523-
actual := checkRateLimitPodStatusReady(tc.status)
523+
actual := checkRateLimitPodStatusReady(&tc.status)
524524
require.Equal(t, tc.expect, actual)
525525
})
526526
}

‎internal/cmd/egctl/status.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ func fetchConditions(parent reflect.Value, quiet, verbose bool) [][]string {
421421

422422
// All conditions are sorted in descending order by time.
423423
for i := len(conditions) - 1; i >= 0; i-- {
424-
row := fetchCondition(conditions[i], verbose)
424+
row := fetchCondition(&conditions[i], verbose)
425425
rows = append(rows, row)
426426

427427
if quiet {
@@ -433,7 +433,7 @@ func fetchConditions(parent reflect.Value, quiet, verbose bool) [][]string {
433433
}
434434

435435
// fetchCondition fetches the Type, Status, Reason of one condition, and more if verbose.
436-
func fetchCondition(condition metav1.Condition, verbose bool) []string {
436+
func fetchCondition(condition *metav1.Condition, verbose bool) []string {
437437
row := []string{condition.Type, string(condition.Status), condition.Reason}
438438

439439
// Write more details about this condition if verbose is on.

‎internal/cmd/egctl/translate.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ func translate(w io.Writer, inFile, inType string, outTypes []string, output, re
256256
}
257257
}
258258
// Print
259-
if err = printOutput(w, result, output); err != nil {
259+
if err = printOutput(w, &result, output); err != nil {
260260
return fmt.Errorf("failed to print result, error:%w", err)
261261
}
262262

@@ -406,7 +406,7 @@ func TranslateGatewayAPIToXds(namespace, dnsDomain, resourceType string, resourc
406406
}
407407

408408
// printOutput prints the echo-backed gateway API and xDS output
409-
func printOutput(w io.Writer, result TranslationResult, output string) error {
409+
func printOutput(w io.Writer, result *TranslationResult, output string) error {
410410
var (
411411
out []byte
412412
err error

‎internal/cmd/egctl/version.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,14 +98,14 @@ func versions(w io.Writer, containerName, output string, remote bool) error {
9898
return fmt.Errorf("list EG pods failed: %w", err)
9999
}
100100

101-
for _, pod := range pods.Items {
102-
if pod.Status.Phase != "Running" {
101+
for i := range pods.Items {
102+
if pods.Items[i].Status.Phase != "Running" {
103103

104-
fmt.Fprintf(w, "WARN: pod %s/%s is not running, skipping it.", pod.Namespace, pod.Name)
104+
fmt.Fprintf(w, "WARN: pod %s/%s is not running, skipping it.", pods.Items[i].Namespace, pods.Items[i].Name)
105105
continue
106106
}
107107

108-
nn := utils.NamespacedName(&pod)
108+
nn := utils.NamespacedName(&pods.Items[i])
109109
stdout, _, err := c.PodExec(nn, containerName, "envoy-gateway version -ojson")
110110
if err != nil {
111111
return fmt.Errorf("pod exec on %s/%s failed: %w", nn.Namespace, nn.Name, err)

‎internal/cmd/server_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func TestGetConfigValidate(t *testing.T) {
5757
require.NoError(t, err)
5858
defer os.Remove(file.Name())
5959

60-
_, err = file.Write([]byte(test.input))
60+
_, err = file.WriteString(test.input)
6161
require.NoError(t, err)
6262

6363
_, err = getConfigByPath(os.Stderr, file.Name())

‎internal/extension/registry/extension_manager.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ func NewManager(cfg *config.Server, inK8s bool) (extTypes.Manager, error) {
8787
}, nil
8888
}
8989

90-
func NewInMemoryManager(cfg egv1a1.ExtensionManager, server extension.EnvoyGatewayExtensionServer) (extTypes.Manager, func(), error) {
90+
func NewInMemoryManager(cfg *egv1a1.ExtensionManager, server extension.EnvoyGatewayExtensionServer) (extTypes.Manager, func(), error) {
9191
if server == nil {
9292
return nil, nil, fmt.Errorf("in-memory manager must be passed a server")
9393
}
@@ -109,7 +109,7 @@ func NewInMemoryManager(cfg egv1a1.ExtensionManager, server extension.EnvoyGatew
109109
}
110110

111111
if cfg.Service != nil {
112-
opts, err := setupGRPCOpts(context.Background(), nil, &cfg, "")
112+
opts, err := setupGRPCOpts(context.Background(), nil, cfg, "")
113113
if err != nil {
114114
return nil, nil, err
115115
}
@@ -127,7 +127,7 @@ func NewInMemoryManager(cfg egv1a1.ExtensionManager, server extension.EnvoyGatew
127127

128128
return &Manager{
129129
extensionConnCache: conn,
130-
extension: cfg,
130+
extension: *cfg,
131131
}, c, nil
132132
}
133133

‎internal/extension/registry/extension_manager_test.go‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -656,7 +656,7 @@ func Test_Integration_RetryPolicy_MaxAttempts(t *testing.T) {
656656
},
657657
}
658658

659-
mgr, _, err := NewInMemoryManager(extManager, &retryTestServer{})
659+
mgr, _, err := NewInMemoryManager(&extManager, &retryTestServer{})
660660
require.NoError(t, err)
661661

662662
hook, err := mgr.GetPostXDSHookClient(egv1a1.XDSRoute)
@@ -840,7 +840,7 @@ func Test_Integration_ClusterUpdateExtensionServer(t *testing.T) {
840840
},
841841
}
842842

843-
mgr, _, err := NewInMemoryManager(extManager, &clusterUpdateTestServer{})
843+
mgr, _, err := NewInMemoryManager(&extManager, &clusterUpdateTestServer{})
844844
require.NoError(t, err)
845845

846846
hook, err := mgr.GetPostXDSHookClient(egv1a1.XDSTranslation)
@@ -917,7 +917,7 @@ func TestPostTranslateModifyHookWithListenersAndRoutes(t *testing.T) {
917917
},
918918
}
919919

920-
mgr, _, err := NewInMemoryManager(extManager, &testServer{})
920+
mgr, _, err := NewInMemoryManager(&extManager, &testServer{})
921921
require.NoError(t, err)
922922

923923
hook, err := mgr.GetPostXDSHookClient(egv1a1.XDSTranslation)
@@ -1047,9 +1047,10 @@ func TestGetTranslationHookConfig(t *testing.T) {
10471047
var err error
10481048

10491049
if tt.config == nil {
1050-
mgr, _, err = NewInMemoryManager(egv1a1.ExtensionManager{}, &testServer{})
1050+
defaultExt := egv1a1.ExtensionManager{}
1051+
mgr, _, err = NewInMemoryManager(&defaultExt, &testServer{})
10511052
} else {
1052-
mgr, _, err = NewInMemoryManager(*tt.config, &testServer{})
1053+
mgr, _, err = NewInMemoryManager(tt.config, &testServer{})
10531054
}
10541055

10551056
require.NoError(t, err)

0 commit comments

Comments
 (0)