Fixup

istio · Apr 26, 2024 · b237453 · b237453
1 parent 64a633a
commit b237453
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/tests/integration/ambient/cnirepair/main_test.go b/tests/integration/ambient/cnirepair/main_test.go
@@ -109,7 +109,7 @@ func SetupApps(t resource.Context, i istio.Instance, apps *EchoDeployments) erro
 		Prefix: "echo",
 		Inject: false,
 		Labels: map[string]string{
-			constants.DataplaneMode: "ambient",
+			constants.DataplaneModeLabel: "ambient",
 		},
 	})
 	if err != nil {
@@ -143,12 +143,12 @@ func SetupApps(t resource.Context, i istio.Instance, apps *EchoDeployments) erro
 				{
 					Replicas:    1,
 					Version:     "v1",
-					Annotations: echo.NewAnnotations().Set(echo.AmbientType, constants.AmbientRedirectionDisabled),
+					Annotations: map[string]string{constants.AmbientRedirection: constants.AmbientRedirectionDisabled},
 				},
 				{
 					Replicas:    1,
 					Version:     "v2",
-					Annotations: echo.NewAnnotations().Set(echo.AmbientType, constants.AmbientRedirectionDisabled),
+					Annotations: map[string]string{constants.AmbientRedirection: constants.AmbientRedirectionDisabled},
 				},
 			},
 		}).
@@ -161,15 +161,15 @@ func SetupApps(t resource.Context, i istio.Instance, apps *EchoDeployments) erro
 				{
 					Replicas:    1,
 					Version:     "v1",
-					Annotations: echo.NewAnnotations().Set(echo.AmbientType, constants.AmbientRedirectionDisabled),
+					Annotations: map[string]string{constants.AmbientRedirection: constants.AmbientRedirectionDisabled},
 					Labels: map[string]string{
 						"sidecar.istio.io/inject": "true",
 					},
 				},
 				{
 					Replicas:    1,
 					Version:     "v2",
-					Annotations: echo.NewAnnotations().Set(echo.AmbientType, constants.AmbientRedirectionDisabled),
+					Annotations: map[string]string{constants.AmbientRedirection: constants.AmbientRedirectionDisabled},
 					Labels: map[string]string{
 						"sidecar.istio.io/inject": "true",
 					},

diff --git a/tests/integration/security/file_mounted_certs/main_test.go b/tests/integration/security/file_mounted_certs/main_test.go
@@ -368,7 +368,7 @@ func setupApps(ctx resource.Context, customNs namespace.Getter, customCfg *[]ech
 				annotation.SidecarUserVolumeMount.Name: sidecarVolumeMounts,
 				// the default bootstrap template does not support reusing values from the `ISTIO_META_TLS_CLIENT_*` environment variables
 				// see security/pkg/nodeagent/cache/secretcache.go:generateFileSecret() for details
-				annotation.ProxyConfig.Name: `{"controlPlaneAuthPolicy":"MUTUAL_TLS","proxyMetadata":` + strings.Replace(ProxyMetadataJSON, "\n", "", -1)+`}`,
+				annotation.ProxyConfig.Name: `{"controlPlaneAuthPolicy":"MUTUAL_TLS","proxyMetadata":` + strings.Replace(ProxyMetadataJSON, "\n", "", -1) + `}`,
 			},
 		}},
 	}
@@ -393,7 +393,7 @@ func setupApps(ctx resource.Context, customNs namespace.Getter, customCfg *[]ech
 				annotation.SidecarUserVolumeMount.Name: sidecarVolumeMounts,
 				// the default bootstrap template does not support reusing values from the `ISTIO_META_TLS_CLIENT_*` environment variables
 				// see security/pkg/nodeagent/cache/secretcache.go:generateFileSecret() for details
-				annotation.ProxyConfig.Name: `{"controlPlaneAuthPolicy":"MUTUAL_TLS","proxyMetadata":` + strings.Replace(ProxyMetadataJSON, "\n", "", -1)+`}`,
+				annotation.ProxyConfig.Name: `{"controlPlaneAuthPolicy":"MUTUAL_TLS","proxyMetadata":` + strings.Replace(ProxyMetadataJSON, "\n", "", -1) + `}`,
 			},
 		}},
 	}