Pick 5d2761a8 into 12.6
Cherry-picks !22560 (merged) to 12-6-stable-ee + fix a conflict (spec/finders/clusters/knative_serving_namespace_finder_spec.rb)
Edited by Thong Kuah
Cherry-picks !22560 (merged) to 12-6-stable-ee + fix a conflict (spec/finders/clusters/knative_serving_namespace_finder_spec.rb)