Remove in-cluster operator (istio#52090)

* Initial removal of operator * remove more * Remove verifier * remove more * misc cruft * remove cache * cleanup more * more * drop samples * more cleanup * cleanup commands * minor cleanup * cleanup more * cleanup readme * new rb
MorrisLaw · Jul 29, 2024 · c2b027c · c2b027c
1 parent 6a4a024
commit c2b027c
Show file tree

Hide file tree

Showing 105 changed files with 142 additions and 7,377 deletions.
diff --git a/Makefile.core.mk b/Makefile.core.mk
@@ -211,8 +211,7 @@ STANDARD_BINARIES:=./istioctl/cmd/istioctl \
   ./pilot/cmd/pilot-discovery \
   ./pkg/test/echo/cmd/client \
   ./pkg/test/echo/cmd/server \
-  ./samples/extauthz/cmd/extauthz \
-  ./operator/cmd/operator
+  ./samples/extauthz/cmd/extauthz
 
 # These are binaries that require Linux to build, and should
 # be skipped on other platforms. Notably this includes the current Linux-only Istio CNI plugin
@@ -341,7 +340,7 @@ gen: \
 
 gen-check: gen check-clean-repo
 
-CHARTS = gateway default ztunnel istio-operator base "gateways/istio-ingress" "gateways/istio-egress" "istio-control/istio-discovery" istiod-remote istio-cni
+CHARTS = gateway default ztunnel base "gateways/istio-ingress" "gateways/istio-egress" "istio-control/istio-discovery" istiod-remote istio-cni
 copy-templates:
 	rm manifests/charts/istiod-remote/templates/*
 	rm manifests/charts/gateways/istio-egress/templates/*

diff --git a/architecture/environments/operator.md b/architecture/environments/operator.md
@@ -199,10 +199,6 @@ Apart from validating the correctness of individual fields, the operator ensure
 different parts of the configuration tree are correct. For example, it's an error to enable a component while its
 parent feature is disabled.
 
-## K8s controller
-
-TODO(rcernich).
-
 ## Manifest creation
 
 Manifest rendering is a multi-step process, shown in the figure below. ![rendering

diff --git a/istioctl/cmd/root.go b/istioctl/cmd/root.go
@@ -187,7 +187,6 @@ debug and diagnose their Istio mesh.
 	rootCmd.AddCommand(admin.Cmd(ctx))
 	experimentalCmd.AddCommand(injector.Cmd(ctx))
 
-	rootCmd.AddCommand(mesh.NewVerifyCommand(ctx))
 	rootCmd.AddCommand(mesh.UninstallCmd(ctx))
 
 	experimentalCmd.AddCommand(authz.AuthZ(ctx))
@@ -215,10 +214,6 @@ debug and diagnose their Istio mesh.
 	hideInheritedFlags(manifestCmd, cli.FlagNamespace, cli.FlagIstioNamespace, FlagCharts)
 	rootCmd.AddCommand(manifestCmd)
 
-	operatorCmd := mesh.OperatorCmd(ctx)
-	hideInheritedFlags(operatorCmd, cli.FlagNamespace, cli.FlagIstioNamespace, FlagCharts)
-	rootCmd.AddCommand(operatorCmd)
-
 	installCmd := mesh.InstallCmd(ctx)
 	hideInheritedFlags(installCmd, cli.FlagNamespace, cli.FlagIstioNamespace, FlagCharts)
 	rootCmd.AddCommand(installCmd)

diff --git a/istioctl/pkg/validate/validate.go b/istioctl/pkg/validate/validate.go
@@ -157,7 +157,7 @@ func (v *validator) validateResource(istioNamespace, defaultNamespace string, un
 			if err != nil {
 				return nil, err
 			}
-			return nil, operatorvalidate.CheckIstioOperator(iop, true)
+			return nil, operatorvalidate.CheckIstioOperator(iop)
 		}
 	}
 

diff --git a/istioctl/pkg/version/version.go b/istioctl/pkg/version/version.go
@@ -31,18 +31,17 @@ import (
 	"istio.io/istio/istioctl/pkg/cli"
 	"istio.io/istio/istioctl/pkg/clioptions"
 	"istio.io/istio/istioctl/pkg/multixds"
-	"istio.io/istio/operator/cmd/mesh"
 	"istio.io/istio/pilot/pkg/model"
 	"istio.io/istio/pilot/pkg/xds"
 	"istio.io/istio/pkg/proxy"
 	istioVersion "istio.io/istio/pkg/version"
 )
 
 func NewVersionCommand(ctx cli.Context) *cobra.Command {
-	profileCmd := mesh.ProfileCmd(ctx)
 	var opts clioptions.ControlPlaneOptions
-	versionCmd := istioVersion.CobraCommandWithOptions(istioVersion.CobraOptions{
-		GetRemoteVersion: getRemoteInfoWrapper(ctx, &profileCmd, &opts),
+	var versionCmd *cobra.Command
+	versionCmd = istioVersion.CobraCommandWithOptions(istioVersion.CobraOptions{
+		GetRemoteVersion: getRemoteInfoWrapper(ctx, &versionCmd, &opts),
 		GetProxyVersions: getProxyInfoWrapper(ctx, &opts),
 	})
 	opts.AttachControlPlaneFlags(versionCmd)

diff --git a/manifests/charts/istio-operator/Chart.yaml b/manifests/charts/istio-operator/Chart.yaml
diff --git a/manifests/charts/istio-operator/crds/crd-operator.yaml b/manifests/charts/istio-operator/crds/crd-operator.yaml
diff --git a/manifests/charts/istio-operator/files/profile-ambient.yaml b/manifests/charts/istio-operator/files/profile-ambient.yaml
diff --git a/manifests/charts/istio-operator/files/profile-compatibility-version-1.20.yaml b/manifests/charts/istio-operator/files/profile-compatibility-version-1.20.yaml
diff --git a/manifests/charts/istio-operator/files/profile-compatibility-version-1.21.yaml b/manifests/charts/istio-operator/files/profile-compatibility-version-1.21.yaml
diff --git a/manifests/charts/istio-operator/files/profile-compatibility-version-1.22.yaml b/manifests/charts/istio-operator/files/profile-compatibility-version-1.22.yaml
diff --git a/manifests/charts/istio-operator/files/profile-compatibility-version-1.23.yaml b/manifests/charts/istio-operator/files/profile-compatibility-version-1.23.yaml
diff --git a/manifests/charts/istio-operator/files/profile-demo.yaml b/manifests/charts/istio-operator/files/profile-demo.yaml
diff --git a/manifests/charts/istio-operator/files/profile-openshift-ambient.yaml b/manifests/charts/istio-operator/files/profile-openshift-ambient.yaml
diff --git a/manifests/charts/istio-operator/files/profile-openshift.yaml b/manifests/charts/istio-operator/files/profile-openshift.yaml