Add namespace labels to test framework diff snapshots (istio#14773)

* Add namespace labels to test framework diff snapshots

* fix lint

* failing tests

* more failed tests

* more failures

* more fixes

* one more

* fix fault injection

Author: frankbu

content/en/docs/examples/bookinfo/gtwapi_test.sh

@@ -24,4 +24,5 @@ source "content/en/docs/examples/bookinfo/test.sh"
 # TODO fix cleanup approach and remove this temporary hack
 # @cleanup
 snip_cleanup_1
+kubectl label namespace default istio-injection-
 remove_gateway_api_crds

content/en/docs/examples/bookinfo/test.sh

@@ -78,4 +78,5 @@ fi
 # @cleanup
 if [ "$GATEWAY_API" != "true" ]; then
     snip_cleanup_1
+    kubectl label namespace default istio-injection-
 fi

content/en/docs/ops/configuration/telemetry/envoy-stats/test.sh

@@ -83,3 +83,4 @@ cleanup_httpbin_sample
 cleanup_sleep_sample
 echo y | istioctl uninstall --revision=default
 kubectl delete ns istio-system
+kubectl label namespace default istio-injection-

content/en/docs/ops/configuration/traffic-management/dns-proxy/index.md

@@ -166,4 +166,5 @@ kubectl -n external-2 delete -f samples/tcp-echo/tcp-echo.yaml
 kubectl delete -f samples/sleep/sleep.yaml
 istioctl uninstall --purge -y
 kubectl delete ns istio-system external-1 external-2
+kubectl label namespace default istio-injection-
 }

content/en/docs/ops/configuration/traffic-management/dns-proxy/snips.sh

@@ -46,4 +46,3 @@ _verify_lines snip_external_tcp_services_without_vips_5 "
 # @cleanup
 
 snip_cleanup_1
-

content/en/docs/ops/configuration/traffic-management/dns-proxy/test.sh

@@ -39,4 +39,5 @@ _verify_like snip_verification_6 "$snip_verification_6_out"
 _verify_like snip_verification_7 "$snip_verification_7_out"
 
 # @cleanup
-snip_cleanup_1
+snip_cleanup_1
+kubectl label namespace default istio-injection-

content/en/docs/setup/additional-setup/dual-stack/test.sh

@@ -79,6 +79,7 @@ _verify_contains snip_view_the_dashboard_1 'deployment "kiali" successfully roll
 # @cleanup
 samples/bookinfo/platform/kube/cleanup.sh
 snip_uninstall_1
-kubectl delete ns istio-system --ignore-not-found=true
+snip_uninstall_2
+snip_uninstall_3
 
 remove_gateway_api_crds

content/en/docs/setup/additional-setup/getting-started/test.sh

@@ -84,4 +84,5 @@ _verify_contains snip_view_the_dashboard_1 'deployment "kiali" successfully roll
 # @cleanup
 cleanup_bookinfo_sample
 snip_uninstall_1
-kubectl delete ns istio-system --ignore-not-found=true
+snip_uninstall_2
+snip_uninstall_3

content/en/docs/setup/getting-started/test.sh

@@ -50,3 +50,4 @@ pgrep istioctl | xargs kill
 pgrep istioctl | xargs kill
 cleanup_bookinfo_sample
 _undeploy_addons jaeger
+kubectl label namespace default istio-injection-

content/en/docs/tasks/observability/distributed-tracing/jaeger/test.sh

@@ -69,3 +69,4 @@ _undeploy_addons zipkin
 
 istioctl uninstall --purge -y
 kubectl delete ns istio-system
+kubectl label namespace default istio-injection-

content/en/docs/tasks/observability/distributed-tracing/telemetry-api/test.sh

@@ -55,3 +55,4 @@ cleanup_bookinfo_sample
 # TODO: Fix issue with using killall. Also why do we need to do this in setup and cleanup?
 pgrep istioctl | xargs kill
 _undeploy_addons zipkin
+kubectl label namespace default istio-injection-

content/en/docs/tasks/observability/distributed-tracing/zipkin/test.sh

@@ -50,5 +50,6 @@ _verify_contains snip_test_the_access_log_3 "outbound_.8000_._.httpbin.default.s
 
 # @cleanup
 snip_cleanup_1
+kubectl label namespace default istio-injection-
 #snip_disable_envoys_access_logging_1
 #_wait_for_deployment istio-system istiod

content/en/docs/tasks/observability/logs/access-log/test.sh

@@ -49,3 +49,4 @@ _verify_contains snip_test_the_access_log_2 "outbound|8000||httpbin.default.svc.
 # @cleanup
 
 snip_cleanup_1
+kubectl label namespace default istio-injection-

content/en/docs/tasks/observability/logs/otel-provider/test.sh

@@ -151,3 +151,4 @@ snip_cleanup_2
 snip_cleanup_3
 
 kubectl delete ns istio-system
+kubectl label namespace default istio-injection-

content/en/docs/tasks/observability/logs/telemetry-api/test.sh

@@ -67,3 +67,4 @@ cleanup_bookinfo_sample
 # TODO: find out why?
 echo y | istioctl uninstall --revision=default
 kubectl delete ns istio-system
+kubectl label namespace default istio-injection-

content/en/docs/tasks/observability/metrics/customize-metrics/test.sh

@@ -76,4 +76,5 @@ pgrep istioctl | xargs kill
 # @cleanup
 pgrep istioctl | xargs kill
 kubectl delete -f samples/addons/prometheus.yaml -n istio-system
-cleanup_bookinfo_sample
+cleanup_bookinfo_sample
+kubectl label namespace default istio-injection-

content/en/docs/tasks/observability/metrics/querying-metrics/test.sh

@@ -77,4 +77,5 @@ kubectl delete -f samples/bookinfo/networking/destination-rule-all.yaml
 kubectl delete -f samples/bookinfo/platform/kube/bookinfo-db.yaml
 kubectl delete -f samples/bookinfo/platform/kube/bookinfo-ratings-v2.yaml
 kubectl delete -f samples/addons/prometheus.yaml -n istio-system
-cleanup_bookinfo_sample
+cleanup_bookinfo_sample
+kubectl label namespace default istio-injection-

content/en/docs/tasks/observability/metrics/tcp-metrics/test.sh

@@ -107,3 +107,4 @@ cleanup_telemetry_api
 
 # @cleanup
 cleanup_bookinfo_sample
+kubectl label namespace default istio-injection-

content/en/docs/tasks/observability/metrics/telemetry-api/test.sh

@@ -99,3 +99,4 @@ pgrep istioctl | xargs kill
 pgrep istioctl | xargs kill
 cleanup_bookinfo_sample
 _undeploy_addons prometheus grafana
+kubectl label namespace default istio-injection-

content/en/docs/tasks/observability/metrics/using-istio-dashboard/test.sh

@@ -62,4 +62,5 @@ _verify_same snip_verify_local_rate_limit_1 "$snip_verify_local_rate_limit_1_out
 
 # @cleanup
 snip_cleanup_1
-cleanup_bookinfo_sample
+cleanup_bookinfo_sample
+kubectl label namespace default istio-injection-

content/en/docs/tasks/policy-enforcement/rate-limit/test.sh

@@ -125,3 +125,4 @@ snip_clean_up_1
 cleanup_bookinfo_sample
 cleanup_sleep_sample
 kubectl delete -f samples/bookinfo/networking/virtual-service-reviews-v3.yaml
+kubectl label namespace default istio-injection-

content/en/docs/tasks/security/authorization/authz-http/test.sh

@@ -67,3 +67,4 @@ _verify_same snip_migrate_trust_domain_with_trust_domain_aliases_3 "$snip_migrat
 
 # @cleanup
 echo y | snip_clean_up_1
+kubectl label namespace default istio-injection-

content/en/docs/tasks/security/authorization/authz-td-migration/test.sh

@@ -82,3 +82,4 @@ _verify_like snip_tripping_the_circuit_breaker_5 "$expected"
 # @cleanup
 snip_cleaning_up_1
 snip_cleaning_up_2
+kubectl label namespace default istio-injection-

content/en/docs/tasks/traffic-management/circuit-breaking/test.sh

@@ -29,6 +29,7 @@ snip_cleanup_http_gateway_2
 snip_cleanup_https_gateway_2
 snip_cleanup_network_policies_2
 snip_cleanup_1
+kubectl label namespace default istio-injection-
 
 istioctl uninstall --purge -y
 kubectl delete ns istio-system

content/en/docs/tasks/traffic-management/egress/egress-gateway/gtwapi_test.sh

@@ -173,4 +173,5 @@ if [ "$GATEWAY_API" != "true" ]; then
     snip_cleanup_https_gateway_1
     snip_cleanup_network_policies_1
     snip_cleanup_1
+    kubectl label namespace default istio-injection-
 fi

content/en/docs/tasks/traffic-management/egress/egress-gateway/test.sh

@@ -71,3 +71,4 @@ snip_cleanup_1
 snip_cleanup_2
 snip_cleanup_3
 snip_cleanup_4
+kubectl label namespace default istio-injection-

content/en/docs/tasks/traffic-management/egress/egress-kubernetes-services/test.sh

@@ -74,3 +74,4 @@ snip_cleanup_the_mutual_tls_origination_configuration_1
 snip_cleanup_the_mutual_tls_origination_configuration_2
 snip_cleanup_the_mutual_tls_origination_configuration_3
 cleanup_sleep_sample
+kubectl label namespace default istio-injection-

content/en/docs/tasks/traffic-management/egress/egress-tls-origination/mtls_test-disable.sh

@@ -49,3 +49,4 @@ _verify_elided snip_curl_origination_https "$snip_curl_origination_https_out"
 # @cleanup
 snip_cleanup_the_tls_origination_configuration_1
 cleanup_sleep_sample
+kubectl label namespace default istio-injection-

content/en/docs/tasks/traffic-management/egress/egress-tls-origination/tls_test.sh

@@ -64,3 +64,4 @@ snip_cleanup_2
 snip_cleanup_3
 snip_cleanup_4
 snip_cleanup_5
+kubectl label namespace default istio-injection-

content/en/docs/tasks/traffic-management/egress/http-proxy/test.sh

@@ -72,3 +72,4 @@ _verify_not_contains get_bookinfo_productpage "Ratings service is currently unav
 snip_cleanup_1
 cleanup_bookinfo_sample
 cleanup_sleep_sample
+kubectl label namespace default istio-injection-

content/en/docs/tasks/traffic-management/fault-injection/test.sh

@@ -25,4 +25,5 @@ source "content/en/docs/tasks/traffic-management/ingress/ingress-control/test.sh
 # @cleanup
 snip_cleanup_2
 sleep 10s # TODO proper wait
+kubectl label namespace default istio-injection-
 remove_gateway_api_crds

content/en/docs/tasks/traffic-management/ingress/ingress-control/gtwapi_test.sh

@@ -85,4 +85,5 @@ _verify_contains curl_httpbin_headers "HTTP/1.1 200 OK"
 # @cleanup
 if [ "$GATEWAY_API" != "true" ]; then
     snip_cleanup_1
+    kubectl label namespace default istio-injection-
 fi

content/en/docs/tasks/traffic-management/ingress/ingress-control/test.sh

@@ -30,4 +30,5 @@ snip_cleanup_4
 
 istioctl uninstall --purge -y
 kubectl delete ns istio-system
+kubectl label namespace default istio-injection-
 remove_gateway_api_crds

content/en/docs/tasks/traffic-management/ingress/ingress-sni-passthrough/gtwapi_test.sh

@@ -72,4 +72,5 @@ if [ "$GATEWAY_API" != "true" ]; then
     snip_cleanup_1
     snip_cleanup_3
     snip_cleanup_4
+    kubectl label namespace default istio-injection-
 fi

content/en/docs/tasks/traffic-management/ingress/ingress-sni-passthrough/test.sh

@@ -50,3 +50,4 @@ _verify_contains get_headers '"Foo": "bar"'
 
 # @cleanup
 snip_cleanup_1
+kubectl label namespace default istio-injection-

content/en/docs/tasks/traffic-management/ingress/kubernetes-ingress/test.sh

@@ -26,5 +26,6 @@ source "content/en/docs/tasks/traffic-management/ingress/secure-ingress/test.sh"
 snip_cleanup_2
 snip_cleanup_3
 snip_cleanup_4
+kubectl label namespace default istio-injection-
 
 remove_gateway_api_crds

content/en/docs/tasks/traffic-management/ingress/secure-ingress/gtwapi_test.sh

@@ -119,4 +119,5 @@ if [ "$GATEWAY_API" != "true" ]; then
     snip_cleanup_1
     snip_cleanup_3
     snip_cleanup_4
+    kubectl label namespace default istio-injection-
 fi

content/en/docs/tasks/traffic-management/ingress/secure-ingress/test.sh

@@ -26,4 +26,5 @@ source "tests/util/samples.sh"
 snip_cleanup_2
 cleanup_bookinfo_sample
 cleanup_sleep_sample
+kubectl label namespace default istio-injection-
 remove_gateway_api_crds

content/en/docs/tasks/traffic-management/request-routing/gtwapi_test.sh

@@ -92,4 +92,5 @@ if [ "$GATEWAY_API" != "true" ]; then
     snip_cleanup_1
     cleanup_bookinfo_sample
     cleanup_sleep_sample
+    kubectl label namespace default istio-injection-
 fi

content/en/docs/tasks/traffic-management/request-routing/test.sh

@@ -26,4 +26,5 @@ source "tests/util/samples.sh"
 snip_cleanup_2
 cleanup_bookinfo_sample
 cleanup_sleep_sample
+kubectl label namespace default istio-injection-
 remove_gateway_api_crds

content/en/docs/tasks/traffic-management/request-timeouts/gtwapi_test.sh

@@ -75,4 +75,5 @@ if [ "$GATEWAY_API" != "true" ]; then
     snip_cleanup_1
     cleanup_bookinfo_sample
     cleanup_sleep_sample
+    kubectl label namespace default istio-injection-
 fi

content/en/docs/tasks/traffic-management/request-timeouts/test.sh

@@ -26,4 +26,5 @@ source "tests/util/samples.sh"
 snip_gtw_cleanup
 cleanup_bookinfo_sample
 cleanup_sleep_sample
+kubectl label namespace default istio-injection-
 remove_gateway_api_crds

content/en/docs/tasks/traffic-management/traffic-shifting/gtwapi_test.sh

@@ -128,4 +128,5 @@ if [ "$GATEWAY_API" != "true" ]; then
     snip_cleanup
     cleanup_bookinfo_sample
     cleanup_sleep_sample
+    kubectl label namespace default istio-injection-
 fi

content/en/docs/tasks/traffic-management/traffic-shifting/test.sh

@@ -132,6 +132,14 @@ func newClusterSnapshot(client kube.Client, contextName string) (ClusterSnapshot
 			}
 
 			if includeKubeResources {
+				// Labels
+				labels := ns.GetLabels()
+				nsSnapshot.Labels = make([]string, 0, len(labels))
+				for label := range labels {
+					nsSnapshot.Labels = append(nsSnapshot.Labels, label)
+				}
+				sort.Strings(nsSnapshot.Labels)
+
 				// Service
 				if services, err := client.Kube().CoreV1().Services(namespace).List(context.TODO(), metav1.ListOptions{}); err != nil {
 					scopes.Framework.Debugf("failed listing services in namespace %s: %v", namespace, err)
@@ -311,6 +319,7 @@ type ClusterSnapshot struct {
 
 type NamespaceSnapshot struct {
 	Namespace              string   `json:"namespace"`
+	Labels                 []string `json:"labels"`
 	Services               []string `json:"services"`
 	Deployments            []string `json:"deployments"`
 	Pods                   []string `json:"pods"`