fix: use a separate workerConfig variable even at the top level

Author: dkoshkin

api/v1alpha1/clusterconfig_types.go

@@ -40,9 +40,6 @@ type ClusterConfigSpec struct {
 
 	//+optional
 	ControlPlane *NodeConfigSpec `json:"controlPlane,omitempty"`
-
-	//+optional
-	Workers *NodeConfigSpec `json:"workers,omitempty"`
 }
 
 func (s ClusterConfigSpec) VariableSchema() clusterv1.VariableSchema { //nolint:gocritic,lll // Passed by value for no potential side-effect.
@@ -57,9 +54,6 @@ func (s ClusterConfigSpec) VariableSchema() clusterv1.VariableSchema { //nolint:
 				"controlPlane": NodeConfigSpec{
 					AWS: &AWSNodeSpec{},
 				}.VariableSchema().OpenAPIV3Schema,
-				"workers": NodeConfigSpec{
-					AWS: &AWSNodeSpec{},
-				}.VariableSchema().OpenAPIV3Schema,
 			},
 		)
 	case s.Docker != nil:
@@ -70,9 +64,6 @@ func (s ClusterConfigSpec) VariableSchema() clusterv1.VariableSchema { //nolint:
 				"controlPlane": NodeConfigSpec{
 					Docker: &DockerNodeSpec{},
 				}.VariableSchema().OpenAPIV3Schema,
-				"workers": NodeConfigSpec{
-					Docker: &DockerNodeSpec{},
-				}.VariableSchema().OpenAPIV3Schema,
 			},
 		)
 	}
@@ -116,8 +107,6 @@ func (s GenericClusterConfig) VariableSchema() clusterv1.VariableSchema {
 				).VariableSchema().
 					OpenAPIV3Schema,
 				"imageRegistries": ImageRegistries{}.VariableSchema().OpenAPIV3Schema,
-				"controlPlane":    NodeConfigSpec{}.VariableSchema().OpenAPIV3Schema,
-				"workers":         NodeConfigSpec{}.VariableSchema().OpenAPIV3Schema,
 			},
 		},
 	}

api/v1alpha1/zz_generated.deepcopy.go

@@ -24,9 +24,10 @@ spec:
           controlPlane:
             docker:
               customImage: ghcr.io/mesosphere/kind-node:v1.2.3-cp
-          workers:
-            docker:
-              customImage: ghcr.io/mesosphere/kind-node:v1.2.3-worker
+      - name: workerConfig
+        value:
+          docker:
+            customImage: ghcr.io/mesosphere/kind-node:v1.2.3-worker
 ```
 
 The configuration above will apply customImage to all workers.

docs/content/customization/docker/custom-image.md

@@ -24,9 +24,7 @@ import (
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/variables"
 	capdv1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1"
 	"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers"
-	dockerclusterconfig "github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/docker/clusterconfig"
 	dockerworkerconfig "github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/docker/workerconfig"
-	"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/clusterconfig"
 	"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/workerconfig"
 )
 
@@ -50,15 +48,6 @@ func NewWorkerPatch() *customImageWorkerPatchHandler {
 	return newcustomImageWorkerPatchHandler(VariableName)
 }
 
-func NewWorkerInClusterConfigMetaPatch() *customImageControlPlanePatchHandler {
-	return newCustomImageControlPlanePatchHandler(
-		clusterconfig.MetaVariableName,
-		clusterconfig.MetaWorkerConfigName,
-		dockerclusterconfig.DockerVariableName,
-		VariableName,
-	)
-}
-
 func NewMetaWorkerPatch() *customImageWorkerPatchHandler {
 	return newcustomImageWorkerPatchHandler(
 		workerconfig.MetaVariableName,

pkg/handlers/docker/mutation/customimage/inject_worker.go

@@ -18,7 +18,6 @@ func MetaPatchHandler(mgr manager.Manager) handlers.Named {
 	patchHandlers := append(
 		[]mutation.MetaMutator{
 			customimage.NewControlPlaneMetaPatch(),
-			customimage.NewWorkerInClusterConfigMetaPatch(),
 		},
 		genericmutation.MetaMutators(mgr)...,
 	)

pkg/handlers/docker/mutation/metapatch_handler.go

@@ -64,15 +64,6 @@ func TestGeneratePatches(t *testing.T) {
 		customimage.VariableName,
 	)
 
-	customimagetests.TestWorkerGeneratePatches(
-		t,
-		metaPatchGeneratorFunc(mgr),
-		clusterconfig.MetaVariableName,
-		"workers",
-		dockerclusterconfig.DockerVariableName,
-		customimage.VariableName,
-	)
-
 	customimagetests.TestWorkerGeneratePatches(
 		t,
 		workerPatchGeneratorFunc(),