Add watchedNamespaces for istioctl operator dump (istio#35453)

* Add watchedNamespaces for istioctl operator dump Signed-off-by: Arko Dasgupta <[email protected]> * release note Signed-off-by: Arko Dasgupta <[email protected]>
caitui · Oct 6, 2021 · 17085ed · 17085ed
1 parent 3ea4bdd
commit 17085ed
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/operator/cmd/mesh/operator-dump.go b/operator/cmd/mesh/operator-dump.go
@@ -32,6 +32,8 @@ func addOperatorDumpFlags(cmd *cobra.Command, args *operatorDumpArgs) {
 	cmd.PersistentFlags().StringVar(&args.common.hub, "hub", hub, HubFlagHelpStr)
 	cmd.PersistentFlags().StringVar(&args.common.tag, "tag", tag, TagFlagHelpStr)
 	cmd.PersistentFlags().StringSliceVar(&args.common.imagePullSecrets, "imagePullSecrets", nil, ImagePullSecretsHelpStr)
+	cmd.PersistentFlags().StringVar(&args.common.watchedNamespaces, "watchedNamespaces", istioDefaultNamespace,
+		"The namespaces the operator controller watches, could be namespace list separated by comma, eg. 'ns1,ns2'")
 	cmd.PersistentFlags().StringVar(&args.common.operatorNamespace, "operatorNamespace", operatorDefaultNamespace, OperatorNamespaceHelpstr)
 	cmd.PersistentFlags().StringVarP(&args.common.manifestsPath, "charts", "", "", ChartsDeprecatedStr)
 	cmd.PersistentFlags().StringVarP(&args.common.manifestsPath, "manifests", "d", "", ManifestsFlagHelpStr)

diff --git a/operator/cmd/mesh/operator_test.go b/operator/cmd/mesh/operator_test.go
@@ -43,6 +43,7 @@ func TestOperatorDump(t *testing.T) {
 	cmd += " --tag " + odArgs.common.tag
 	cmd += " --imagePullSecrets " + strings.Join(odArgs.common.imagePullSecrets, ",")
 	cmd += " --operatorNamespace " + odArgs.common.operatorNamespace
+	cmd += " --watchedNamespaces " + odArgs.common.watchedNamespaces
 	cmd += " --manifests=" + string(snapshotCharts)
 
 	gotYAML, err := runCommand(cmd)

diff --git a/operator/cmd/mesh/testdata/operator/output/operator-dump.yaml b/operator/cmd/mesh/testdata/operator/output/operator-dump.yaml
@@ -171,7 +171,7 @@ spec:
               memory: 128Mi
           env:
             - name: WATCH_NAMESPACE
-              value: 
+              value: "istio-test-namespace1,istio-test-namespace2"
             - name: LEADER_ELECTION_NAMESPACE
               value: "operator-test-namespace"
             - name: POD_NAME

diff --git a/releasenotes/notes/35485.yaml b/releasenotes/notes/35485.yaml
@@ -0,0 +1,9 @@
+apiVersion: release-notes/v2
+kind: feature
+area: istioctl
+issue:
+  - 35485
+
+releaseNotes:
+- |
+  **Added** `istioctl operator dump` now supports the `watchedNamespaces` argument to specify the namespaces the operator controller watches.