-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: separate handlers for control-plane and workers
- Loading branch information
Showing
11 changed files
with
328 additions
and
123 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
157 changes: 157 additions & 0 deletions
157
pkg/handlers/docker/mutation/customimage/inject_control_plane.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,157 @@ | ||
| // Copyright 2023 D2iQ, Inc. All rights reserved. | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| package customimage | ||
|
|
||
| import ( | ||
| "context" | ||
| _ "embed" | ||
| "fmt" | ||
| "strings" | ||
|
|
||
| apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" | ||
| "k8s.io/apimachinery/pkg/runtime" | ||
| runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1" | ||
| ctrl "sigs.k8s.io/controller-runtime" | ||
| "sigs.k8s.io/controller-runtime/pkg/client" | ||
|
|
||
| "github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1" | ||
| "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/apis" | ||
| commonhandlers "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers" | ||
| "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers/mutation" | ||
| "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches" | ||
| "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches/selectors" | ||
| "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" | ||
| "github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/clusterconfig" | ||
| ) | ||
|
|
||
| const ( | ||
| // HandlerNamePatch is the name of the inject handler. | ||
| HandlerNamePatch = "DockerCustomImagePatch" | ||
|
|
||
| defaultKinDImageRepository = "ghcr.io/mesosphere/kind-node" | ||
| ) | ||
|
|
||
| type customImageControlPlanePatchHandler struct { | ||
| variableName string | ||
| variableFieldPath []string | ||
| } | ||
|
|
||
| var ( | ||
| _ commonhandlers.Named = &customImageControlPlanePatchHandler{} | ||
| _ mutation.GeneratePatches = &customImageControlPlanePatchHandler{} | ||
| _ mutation.MetaMutator = &customImageControlPlanePatchHandler{} | ||
| ) | ||
|
|
||
| func NewControlPlanePatch() *customImageControlPlanePatchHandler { | ||
| return newCustomImageControlPlanePatchHandler(VariableName) | ||
| } | ||
|
|
||
| func NewControlPlaneMetaPatch() *customImageControlPlanePatchHandler { | ||
| return newCustomImageControlPlanePatchHandler( | ||
| clusterconfig.MetaVariableName, | ||
| clusterconfig.MetaControlPlaneConfigName, | ||
| dockerclusterconfig.DockerVariableName, | ||
| VariableName, | ||
| ) | ||
| } | ||
|
|
||
| func newCustomImageControlPlanePatchHandler( | ||
| variableName string, | ||
| variableFieldPath ...string, | ||
| ) *customImageControlPlanePatchHandler { | ||
| return &customImageControlPlanePatchHandler{ | ||
| variableName: variableName, | ||
| variableFieldPath: variableFieldPath, | ||
| } | ||
| } | ||
|
|
||
| func (h *customImageControlPlanePatchHandler) Name() string { | ||
| return HandlerNamePatch | ||
| } | ||
|
|
||
| func (h *customImageControlPlanePatchHandler) Mutate( | ||
| ctx context.Context, | ||
| obj runtime.Object, | ||
| vars map[string]apiextensionsv1.JSON, | ||
| holderRef runtimehooksv1.HolderReference, | ||
| _ client.ObjectKey, | ||
| ) error { | ||
| log := ctrl.LoggerFrom(ctx).WithValues( | ||
| "holderRef", holderRef, | ||
| ) | ||
|
|
||
| customImageVar, found, err := variables.Get[v1alpha1.OCIImage]( | ||
| vars, | ||
| h.variableName, | ||
| h.variableFieldPath..., | ||
| ) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| if !found { | ||
| log.V(5). | ||
| Info("Docker customImage variable not defined for control-plane, using default KinD node image") | ||
| } | ||
|
|
||
| log = log.WithValues( | ||
| "variableName", | ||
| h.variableName, | ||
| "variableFieldPath", | ||
| h.variableFieldPath, | ||
| "variableValue", | ||
| customImageVar, | ||
| ) | ||
|
|
||
| return patches.Generate( | ||
| obj, | ||
| vars, | ||
| &holderRef, | ||
| selectors.InfrastructureControlPlaneMachines("v1beta1", "DockerMachineTemplate"), | ||
| log, | ||
| func(obj *capdv1.DockerMachineTemplate) error { | ||
| variablePath := []string{"builtin", "controlPlane", "version"} | ||
|
|
||
| if customImageVar == "" { | ||
| kubernetesVersion, found, err := variables.Get[string]( | ||
| vars, | ||
| variablePath[0], | ||
| variablePath[1:]...) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| if !found { | ||
| return fmt.Errorf( | ||
| "missing required variable: %s", | ||
| strings.Join(variablePath, "."), | ||
| ) | ||
| } | ||
|
|
||
| customImageVar = v1alpha1.OCIImage( | ||
| defaultKinDImageRepository + ":" + kubernetesVersion, | ||
| ) | ||
| } | ||
|
|
||
| log.WithValues( | ||
| "patchedObjectKind", obj.GetObjectKind().GroupVersionKind().String(), | ||
| "patchedObjectName", client.ObjectKeyFromObject(obj), | ||
| "customImage", customImageVar, | ||
| ).Info("setting customImage in control plane DockerMachineTemplate spec") | ||
|
|
||
| obj.Spec.Template.Spec.CustomImage = string(customImageVar) | ||
|
|
||
| return nil | ||
| }, | ||
| ) | ||
| } | ||
|
|
||
| func (h *customImageControlPlanePatchHandler) GeneratePatches( | ||
| ctx context.Context, | ||
| req *runtimehooksv1.GeneratePatchesRequest, | ||
| resp *runtimehooksv1.GeneratePatchesResponse, | ||
| ) { | ||
| handlers.GeneratePatches(ctx, req, resp, apis.CAPDDecoder(), h.Mutate) | ||
| } |
21 changes: 21 additions & 0 deletions
21
pkg/handlers/docker/mutation/customimage/inject_control_plane_test.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| // Copyright 2023 D2iQ, Inc. All rights reserved. | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| package customimage | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers/mutation" | ||
| "github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/docker/mutation/customimage/tests" | ||
| ) | ||
|
|
||
| func TestControlPlaneGeneratePatches(t *testing.T) { | ||
| t.Parallel() | ||
|
|
||
| tests.TestControlPlaneGeneratePatches( | ||
| t, | ||
| func() mutation.GeneratePatches { return NewControlPlanePatch() }, | ||
| VariableName, | ||
| ) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.