Skip to content

Commit

Permalink
Lints
Browse files Browse the repository at this point in the history
Signed-off-by: Benjamin Leggett <benjamin.leggett@solo.io>
  • Loading branch information
bleggett committed May 2, 2024
1 parent 20e8bd9 commit ce49591
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion cni/pkg/util/podutil_test.go
Expand Up @@ -80,7 +80,7 @@ func TestGetPodIPsIfNoPodIPPresent(t *testing.T) {

func TestPodRedirectionEnabled(t *testing.T) {
var (
ambientEnabledLabel = map[string]string{constants.DataplaneMode: constants.DataplaneModeAmbient}
ambientEnabledLabel = map[string]string{constants.DataplaneModeLabel: constants.DataplaneModeAmbient}
ambientDisabledAnnotation = map[string]string{constants.AmbientRedirection: constants.AmbientRedirectionDisabled}
sidecarStatusAnnotation = map[string]string{annotation.SidecarStatus.Name: "test"}

Expand Down
2 changes: 1 addition & 1 deletion pkg/test/framework/components/echo/config.go
Expand Up @@ -320,7 +320,7 @@ func (c Config) IsAllNaked() bool {
// No subsets - default to not-naked.
return false
}
//if ANY subset has a sidecar, not naked.
// if ANY subset has a sidecar, not naked.
for _, s := range c.Subsets {
if s.Annotations == nil || s.Annotations[annotation.SidecarInject.Name] != "false" {
// Sidecar injection is enabled - it's not naked.
Expand Down
16 changes: 8 additions & 8 deletions tests/integration/ambient/main_test.go
Expand Up @@ -186,17 +186,17 @@ func SetupApps(t resource.Context, i istio.Instance, apps *EchoDeployments) erro
Replicas: 1,
Version: "v1",
Labels: map[string]string{
"app": WorkloadAddressedWaypoint,
"version": "v1",
"app": WorkloadAddressedWaypoint,
"version": "v1",
constants.AmbientUseWaypointLabel: "waypoint",
},
},
{
Replicas: 1,
Version: "v2",
Labels: map[string]string{
"app": WorkloadAddressedWaypoint,
"version": "v2",
"app": WorkloadAddressedWaypoint,
"version": "v2",
constants.AmbientUseWaypointLabel: "waypoint",
},
},
Expand All @@ -214,16 +214,16 @@ func SetupApps(t resource.Context, i istio.Instance, apps *EchoDeployments) erro
Replicas: 1,
Version: "v1",
Labels: map[string]string{
"app": ServiceAddressedWaypoint,
"version": "v1",
"app": ServiceAddressedWaypoint,
"version": "v1",
},
},
{
Replicas: 1,
Version: "v2",
Labels: map[string]string{
"app": ServiceAddressedWaypoint,
"version": "v2",
"app": ServiceAddressedWaypoint,
"version": "v2",
},
},
},
Expand Down

0 comments on commit ce49591

Please sign in to comment.