Clean up some install codes (#47007)

* clean up some codes * make gen
istio · Sep 15, 2023 · c1e5c31 · c1e5c31
1 parent 66e6440
commit c1e5c31
Showing 14 changed files with 1,695 additions and 2,236 deletions.
diff --git a/...tor/cmd/mesh/testdata/manifest-generate/output/all_on.golden-show-in-gh-pull-request.yaml b/...tor/cmd/mesh/testdata/manifest-generate/output/all_on.golden-show-in-gh-pull-request.yaml
diff --git a/operator/cmd/mesh/testdata/manifest-generate/output/pilot_default.golden.yaml b/operator/cmd/mesh/testdata/manifest-generate/output/pilot_default.golden.yaml
diff --git a/operator/pkg/name/name.go b/operator/pkg/name/name.go
@@ -50,35 +50,18 @@ const (
 	ValidatingWebhookConfigurationStr = "ValidatingWebhookConfiguration"
 )
 
-// Istio Kind strings
 const (
-	EnvoyFilterStr        = "EnvoyFilter"
-	GatewayStr            = "Gateway"
-	DestinationRuleStr    = "DestinationRule"
-	MeshPolicyStr         = "MeshPolicy"
-	PeerAuthenticationStr = "PeerAuthentication"
-	VirtualServiceStr     = "VirtualService"
-	IstioOperatorStr      = "IstioOperator"
-)
+	// IstioOperatorStr is the kind name of the IstioOperator CRD.
+	IstioOperatorStr = "IstioOperator"
 
-// Istio API Group Names
-const (
-	AuthenticationAPIGroupName = "authentication.istio.io"
-	ConfigAPIGroupName         = "config.istio.io"
-	NetworkingAPIGroupName     = "networking.istio.io"
-	OperatorAPIGroupName       = "operator.istio.io"
-	SecurityAPIGroupName       = "security.istio.io"
-)
-
-const (
 	// OperatorAPINamespace is the API namespace for operator config.
 	// TODO: move this to a base definitions file when one is created.
-	OperatorAPINamespace = OperatorAPIGroupName
+	OperatorAPINamespace = "operator.istio.io"
 
 	// DefaultProfileName is the name of the default profile.
 	DefaultProfileName = "default"
 
-	// installedSpecCRPrefix is the prefix of any IstioOperator CR stored in the cluster that is a copy of the CR used
+	// InstalledSpecCRPrefix is the prefix of any IstioOperator CR stored in the cluster that is a copy of the CR used
 	// in the last install operation.
 	InstalledSpecCRPrefix = "installed-state"
 )

diff --git a/operator/pkg/object/objects.go b/operator/pkg/object/objects.go
@@ -79,7 +79,7 @@ func NewK8sObject(u *unstructured.Unstructured, json, yaml []byte) *K8sObject {
 // Hash returns a unique, insecure hash based on kind, namespace and name.
 func Hash(kind, namespace, name string) string {
 	switch kind {
-	case names.ClusterRoleStr, names.ClusterRoleBindingStr, names.MeshPolicyStr:
+	case names.ClusterRoleStr, names.ClusterRoleBindingStr:
 		namespace = ""
 	}
 	return strings.Join([]string{kind, namespace, name}, ":")
@@ -415,17 +415,6 @@ func (o *K8sObject) Equal(other *K8sObject) bool {
 	return util.IsYAMLEqual(string(ay), string(by))
 }
 
-func istioCustomResources(group string) bool {
-	switch group {
-	case names.ConfigAPIGroupName,
-		names.SecurityAPIGroupName,
-		names.AuthenticationAPIGroupName,
-		names.NetworkingAPIGroupName:
-		return true
-	}
-	return false
-}
-
 // DefaultObjectOrder is default sorting function used to sort k8s objects.
 func DefaultObjectOrder() func(o *K8sObject) int {
 	return func(o *K8sObject) int {
@@ -447,9 +436,6 @@ func DefaultObjectOrder() func(o *K8sObject) int {
 		case gk == "admissionregistration.k8s.io/ValidatingWebhookConfiguration":
 			return 3
 
-		case istioCustomResources(o.Group):
-			return 4
-
 			// Pods might need configmap or secrets - avoid backoff by creating them first
 		case gk == "/ConfigMap" || gk == "/Secrets":
 			return 100

diff --git a/pkg/config/analysis/analyzers/testdata/mtls-exports.yaml b/pkg/config/analysis/analyzers/testdata/mtls-exports.yaml
diff --git a/pkg/config/analysis/analyzers/testdata/mtls-global-dr-no-meshpolicy.yaml b/pkg/config/analysis/analyzers/testdata/mtls-global-dr-no-meshpolicy.yaml
diff --git a/pkg/config/analysis/analyzers/testdata/mtls-ignores-istio-control-plane.yaml b/pkg/config/analysis/analyzers/testdata/mtls-ignores-istio-control-plane.yaml
diff --git a/pkg/config/analysis/analyzers/testdata/mtls-ignores-system-namespaces.yaml b/pkg/config/analysis/analyzers/testdata/mtls-ignores-system-namespaces.yaml
diff --git a/pkg/config/analysis/analyzers/testdata/mtls-meshpolicy-permissive.yaml b/pkg/config/analysis/analyzers/testdata/mtls-meshpolicy-permissive.yaml
diff --git a/pkg/config/analysis/analyzers/testdata/mtls-meshpolicy.yaml b/pkg/config/analysis/analyzers/testdata/mtls-meshpolicy.yaml
diff --git a/pkg/config/analysis/analyzers/testdata/mtls-no-dr.yaml b/pkg/config/analysis/analyzers/testdata/mtls-no-dr.yaml