Merge pull request openshift#8628 from r4f4/aws-capa-disable-eks

openshift-merge-bot[bot] · web-flow · commit 0115fda9a51a · 2024-07-02T16:49:34.000Z
OCPBUGS-35752: capi/aws: disable EKS controller in CAPA
diff --git a/pkg/clusterapi/system.go b/pkg/clusterapi/system.go
@@ -150,7 +150,7 @@ func (c *system) Run(ctx context.Context) error {
 				"--health-addr={{suggestHealthHostPort}}",
 				"--webhook-port={{.WebhookPort}}",
 				"--webhook-cert-dir={{.WebhookCertDir}}",
-				"--feature-gates=BootstrapFormatIgnition=true,ExternalResourceGC=true,TagUnmanagedNetworkResources=false",
+				"--feature-gates=BootstrapFormatIgnition=true,ExternalResourceGC=true,TagUnmanagedNetworkResources=false,EKS=false",
 			},
 			map[string]string{},
 		)

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ func (c *system) Run(ctx context.Context) error {`
`150`	`150`	`"--health-addr={{suggestHealthHostPort}}",`
`151`	`151`	`"--webhook-port={{.WebhookPort}}",`
`152`	`152`	`"--webhook-cert-dir={{.WebhookCertDir}}",`
`153`		`- "--feature-gates=BootstrapFormatIgnition=true,ExternalResourceGC=true,TagUnmanagedNetworkResources=false",`
	`153`	`+ "--feature-gates=BootstrapFormatIgnition=true,ExternalResourceGC=true,TagUnmanagedNetworkResources=false,EKS=false",`
`154`	`154`	`},`
`155`	`155`	`map[string]string{},`
`156`	`156`	`)`