diff --git a/common/pkg/capi/clustertopology/handlers/mutation/meta_test.go b/common/pkg/capi/clustertopology/handlers/mutation/meta_test.go index 66c75b9c2..fba888c67 100644 --- a/common/pkg/capi/clustertopology/handlers/mutation/meta_test.go +++ b/common/pkg/capi/clustertopology/handlers/mutation/meta_test.go @@ -80,7 +80,7 @@ func (h *testHandler) Mutate( func machineVars() map[string]apiextensionsv1.JSON { return map[string]apiextensionsv1.JSON{ - "builtin": {Raw: []byte(`{"machineDeployment": {"class": "a-worker"}}`)}, + runtimehooksv1.BuiltinsName: {Raw: []byte(`{"machineDeployment": {"class": "a-worker"}}`)}, } } diff --git a/common/pkg/capi/clustertopology/patches/matchers/match_test.go b/common/pkg/capi/clustertopology/patches/matchers/match_test.go index 18916f67e..0b0d83614 100644 --- a/common/pkg/capi/clustertopology/patches/matchers/match_test.go +++ b/common/pkg/capi/clustertopology/patches/matchers/match_test.go @@ -225,7 +225,7 @@ func TestMatchesSelector(t *testing.T) { FieldPath: "spec.template.spec.bootstrap.configRef", }, templateVariables: map[string]apiextensionsv1.JSON{ - "builtin": {Raw: []byte(`{"machineDeployment":{"class":"classA"}}`)}, + runtimehooksv1.BuiltinsName: {Raw: []byte(`{"machineDeployment":{"class":"classA"}}`)}, }, selector: clusterv1.PatchSelector{ APIVersion: "bootstrap.cluster.x-k8s.io/v1beta1", @@ -253,7 +253,7 @@ func TestMatchesSelector(t *testing.T) { FieldPath: "spec.template.spec.bootstrap.configRef", }, templateVariables: map[string]apiextensionsv1.JSON{ - "builtin": {Raw: []byte(`{"machineDeployment":{"class":"classA"}}`)}, + runtimehooksv1.BuiltinsName: {Raw: []byte(`{"machineDeployment":{"class":"classA"}}`)}, }, selector: clusterv1.PatchSelector{ APIVersion: "bootstrap.cluster.x-k8s.io/v1beta1", @@ -281,7 +281,7 @@ func TestMatchesSelector(t *testing.T) { FieldPath: "spec.template.spec.bootstrap.configRef", }, templateVariables: map[string]apiextensionsv1.JSON{ - "builtin": {Raw: []byte(`{"machineDeployment":{"class":"class-A"}}`)}, + runtimehooksv1.BuiltinsName: {Raw: []byte(`{"machineDeployment":{"class":"class-A"}}`)}, }, selector: clusterv1.PatchSelector{ APIVersion: "bootstrap.cluster.x-k8s.io/v1beta1", @@ -309,7 +309,7 @@ func TestMatchesSelector(t *testing.T) { FieldPath: "spec.template.spec.bootstrap.configRef", }, templateVariables: map[string]apiextensionsv1.JSON{ - "builtin": {Raw: []byte(`{"machineDeployment":{"class":"class-A"}}`)}, + runtimehooksv1.BuiltinsName: {Raw: []byte(`{"machineDeployment":{"class":"class-A"}}`)}, }, selector: clusterv1.PatchSelector{ APIVersion: "bootstrap.cluster.x-k8s.io/v1beta1", @@ -337,7 +337,7 @@ func TestMatchesSelector(t *testing.T) { FieldPath: "spec.template.spec.bootstrap.configRef", }, templateVariables: map[string]apiextensionsv1.JSON{ - "builtin": {Raw: []byte(`{"machineDeployment":{"class":"classA"}}`)}, + runtimehooksv1.BuiltinsName: {Raw: []byte(`{"machineDeployment":{"class":"classA"}}`)}, }, selector: clusterv1.PatchSelector{ APIVersion: "bootstrap.cluster.x-k8s.io/v1beta1", @@ -365,7 +365,7 @@ func TestMatchesSelector(t *testing.T) { FieldPath: "spec.template.spec.bootstrap.configRef", }, templateVariables: map[string]apiextensionsv1.JSON{ - "builtin": {Raw: []byte(`{"machineDeployment":{"class":"classA"}}`)}, + runtimehooksv1.BuiltinsName: {Raw: []byte(`{"machineDeployment":{"class":"classA"}}`)}, }, selector: clusterv1.PatchSelector{ APIVersion: "bootstrap.cluster.x-k8s.io/v1beta1", @@ -391,7 +391,7 @@ func TestMatchesSelector(t *testing.T) { FieldPath: "spec.template.spec.bootstrap.configRef", }, templateVariables: map[string]apiextensionsv1.JSON{ - "builtin": {Raw: []byte(`{"machineDeployment":{"class":"classA"}}`)}, + runtimehooksv1.BuiltinsName: {Raw: []byte(`{"machineDeployment":{"class":"classA"}}`)}, }, selector: clusterv1.PatchSelector{ APIVersion: "bootstrap.cluster.x-k8s.io/v1beta1", @@ -415,7 +415,7 @@ func TestMatchesSelector(t *testing.T) { FieldPath: "spec.template.spec.bootstrap.configRef", }, templateVariables: map[string]apiextensionsv1.JSON{ - "builtin": {Raw: []byte(`{"machineDeployment":{"class":"classA"}}`)}, + runtimehooksv1.BuiltinsName: {Raw: []byte(`{"machineDeployment":{"class":"classA"}}`)}, }, selector: clusterv1.PatchSelector{ APIVersion: "bootstrap.cluster.x-k8s.io/v1beta1", @@ -443,7 +443,7 @@ func TestMatchesSelector(t *testing.T) { FieldPath: "spec.template.spec.infrastructureRef", }, templateVariables: map[string]apiextensionsv1.JSON{ - "builtin": {Raw: []byte(`{"machineDeployment":{"class":"classA"}}`)}, + runtimehooksv1.BuiltinsName: {Raw: []byte(`{"machineDeployment":{"class":"classA"}}`)}, }, selector: clusterv1.PatchSelector{ APIVersion: "infrastructure.cluster.x-k8s.io/v1beta1", diff --git a/pkg/handlers/aws/mutation/ami/inject_worker_test.go b/pkg/handlers/aws/mutation/ami/inject_worker_test.go index 01011eb47..015625a01 100644 --- a/pkg/handlers/aws/mutation/ami/inject_worker_test.go +++ b/pkg/handlers/aws/mutation/ami/inject_worker_test.go @@ -32,7 +32,7 @@ var _ = Describe("Generate AMI patches for Worker", func() { VariableName, ), capitest.VariableWithValue( - "builtin", + runtimehooksv1.BuiltinsName, apiextensionsv1.JSON{ Raw: []byte(`{"machineDeployment": {"class": "a-worker"}}`), }, @@ -63,7 +63,7 @@ var _ = Describe("Generate AMI patches for Worker", func() { VariableName, ), capitest.VariableWithValue( - "builtin", + runtimehooksv1.BuiltinsName, apiextensionsv1.JSON{ Raw: []byte(`{"machineDeployment": {"class": "a-worker"}}`), }, diff --git a/pkg/handlers/aws/mutation/iaminstanceprofile/inject_worker_test.go b/pkg/handlers/aws/mutation/iaminstanceprofile/inject_worker_test.go index 8795d72b2..9f68de792 100644 --- a/pkg/handlers/aws/mutation/iaminstanceprofile/inject_worker_test.go +++ b/pkg/handlers/aws/mutation/iaminstanceprofile/inject_worker_test.go @@ -35,7 +35,7 @@ var _ = Describe("Generate IAMInstanceProfile patches for Worker", func() { VariableName, ), capitest.VariableWithValue( - "builtin", + runtimehooksv1.BuiltinsName, apiextensionsv1.JSON{ Raw: []byte(`{"machineDeployment": {"class": "a-worker"}}`), }, diff --git a/pkg/handlers/aws/mutation/instancetype/inject_worker_test.go b/pkg/handlers/aws/mutation/instancetype/inject_worker_test.go index aa1a6f0ba..626b90caa 100644 --- a/pkg/handlers/aws/mutation/instancetype/inject_worker_test.go +++ b/pkg/handlers/aws/mutation/instancetype/inject_worker_test.go @@ -35,7 +35,7 @@ var _ = Describe("Generate InstanceType patches for Worker", func() { VariableName, ), capitest.VariableWithValue( - "builtin", + runtimehooksv1.BuiltinsName, apiextensionsv1.JSON{ Raw: []byte(`{"machineDeployment": {"class": "a-worker"}}`), }, diff --git a/pkg/handlers/aws/mutation/placementgroup/inject_worker_test.go b/pkg/handlers/aws/mutation/placementgroup/inject_worker_test.go index 969eb233f..0885ce3de 100644 --- a/pkg/handlers/aws/mutation/placementgroup/inject_worker_test.go +++ b/pkg/handlers/aws/mutation/placementgroup/inject_worker_test.go @@ -35,7 +35,7 @@ var _ = Describe("Generate PlacementGroup patches for Worker", func() { VariableName, ), capitest.VariableWithValue( - "builtin", + runtimehooksv1.BuiltinsName, apiextensionsv1.JSON{ Raw: []byte(`{"machineDeployment": {"class": "a-worker"}}`), }, diff --git a/pkg/handlers/aws/mutation/securitygroups/inject_worker_test.go b/pkg/handlers/aws/mutation/securitygroups/inject_worker_test.go index eeb07e180..96e89e5ff 100644 --- a/pkg/handlers/aws/mutation/securitygroups/inject_worker_test.go +++ b/pkg/handlers/aws/mutation/securitygroups/inject_worker_test.go @@ -39,7 +39,7 @@ var _ = Describe("Generate AWS SecurityGroups patches for Worker", func() { VariableName, ), capitest.VariableWithValue( - "builtin", + runtimehooksv1.BuiltinsName, apiextensionsv1.JSON{ Raw: []byte(`{"machineDeployment": {"class": "a-worker"}}`), }, diff --git a/pkg/handlers/docker/mutation/customimage/inject_control_plane.go b/pkg/handlers/docker/mutation/customimage/inject_control_plane.go index 5057f0300..dc596491c 100644 --- a/pkg/handlers/docker/mutation/customimage/inject_control_plane.go +++ b/pkg/handlers/docker/mutation/customimage/inject_control_plane.go @@ -95,7 +95,7 @@ func (h *customImageControlPlanePatchHandler) Mutate( ), log, func(obj *capdv1.DockerMachineTemplate) error { - variablePath := []string{"builtin", "controlPlane", "version"} + variablePath := []string{runtimehooksv1.BuiltinsName, "controlPlane", "version"} if customImageVar == "" { kubernetesVersion, err := variables.Get[string]( diff --git a/pkg/handlers/docker/mutation/customimage/inject_control_plane_test.go b/pkg/handlers/docker/mutation/customimage/inject_control_plane_test.go index 5c8a4eba1..8c21a415e 100644 --- a/pkg/handlers/docker/mutation/customimage/inject_control_plane_test.go +++ b/pkg/handlers/docker/mutation/customimage/inject_control_plane_test.go @@ -29,7 +29,7 @@ var _ = Describe("Docker CustomImage patches for ControlPlane", func() { Name: "image unset for control plane", Vars: []runtimehooksv1.Variable{ capitest.VariableWithValue( - "builtin", + runtimehooksv1.BuiltinsName, apiextensionsv1.JSON{Raw: []byte(`{"controlPlane": {"version": "v1.2.3"}}`)}, ), }, @@ -51,7 +51,7 @@ var _ = Describe("Docker CustomImage patches for ControlPlane", func() { VariableName, ), capitest.VariableWithValue( - "builtin", + runtimehooksv1.BuiltinsName, apiextensionsv1.JSON{ Raw: []byte(`{"machineDeployment": {"class": "a-worker"}}`), }, diff --git a/pkg/handlers/docker/mutation/customimage/inject_worker.go b/pkg/handlers/docker/mutation/customimage/inject_worker.go index 062e2a52d..da3eeddc6 100644 --- a/pkg/handlers/docker/mutation/customimage/inject_worker.go +++ b/pkg/handlers/docker/mutation/customimage/inject_worker.go @@ -87,7 +87,7 @@ func (h *customImageWorkerPatchHandler) Mutate( ), log, func(obj *capdv1.DockerMachineTemplate) error { - fieldPath := []string{"builtin", "machineDeployment", "version"} + fieldPath := []string{runtimehooksv1.BuiltinsName, "machineDeployment", "version"} if customImageVar == "" { kubernetesVersion, err := variables.Get[string]( diff --git a/pkg/handlers/docker/mutation/customimage/inject_worker_test.go b/pkg/handlers/docker/mutation/customimage/inject_worker_test.go index bdb7fa9d2..834ff96ce 100644 --- a/pkg/handlers/docker/mutation/customimage/inject_worker_test.go +++ b/pkg/handlers/docker/mutation/customimage/inject_worker_test.go @@ -26,7 +26,7 @@ var _ = Describe("Docker CustomImage patches for workers", func() { Name: "image unset for workers", Vars: []runtimehooksv1.Variable{ capitest.VariableWithValue( - "builtin", + runtimehooksv1.BuiltinsName, apiextensionsv1.JSON{ Raw: []byte( `{"machineDeployment": {"class": "a-worker", "version": "v1.2.3"}}`, @@ -51,7 +51,7 @@ var _ = Describe("Docker CustomImage patches for workers", func() { VariableName, ), capitest.VariableWithValue( - "builtin", + runtimehooksv1.BuiltinsName, apiextensionsv1.JSON{ Raw: []byte(`{"machineDeployment": {"class": "a-worker"}}`), }, diff --git a/pkg/handlers/generic/mutation/containerdapplypatchesandrestart/inject_test.go b/pkg/handlers/generic/mutation/containerdapplypatchesandrestart/inject_test.go index 35f366b61..22c4be5e8 100644 --- a/pkg/handlers/generic/mutation/containerdapplypatchesandrestart/inject_test.go +++ b/pkg/handlers/generic/mutation/containerdapplypatchesandrestart/inject_test.go @@ -60,7 +60,7 @@ var _ = Describe("Generate Containerd apply patches and restart patches", func() Name: "restart script and command added to worker node kubeadm config template", Vars: []runtimehooksv1.Variable{ capitest.VariableWithValue( - "builtin", + runtimehooksv1.BuiltinsName, map[string]any{ "machineDeployment": map[string]any{ "class": "*", diff --git a/pkg/handlers/generic/mutation/containerdmetrics/inject_test.go b/pkg/handlers/generic/mutation/containerdmetrics/inject_test.go index 06915ca27..b13bd1fe3 100644 --- a/pkg/handlers/generic/mutation/containerdmetrics/inject_test.go +++ b/pkg/handlers/generic/mutation/containerdmetrics/inject_test.go @@ -47,7 +47,7 @@ var _ = Describe("Generate containerd metrics patches", func() { Name: "containerd metrics config added to worker node kubeadm config template", Vars: []runtimehooksv1.Variable{ capitest.VariableWithValue( - "builtin", + runtimehooksv1.BuiltinsName, map[string]any{ "machineDeployment": map[string]any{ "class": "*", diff --git a/pkg/handlers/generic/mutation/containerdunprivilegedports/inject_test.go b/pkg/handlers/generic/mutation/containerdunprivilegedports/inject_test.go index 42ae646e3..d9cc45db0 100644 --- a/pkg/handlers/generic/mutation/containerdunprivilegedports/inject_test.go +++ b/pkg/handlers/generic/mutation/containerdunprivilegedports/inject_test.go @@ -47,7 +47,7 @@ var _ = Describe("Generate containerd unprivileged ports patches", func() { Name: "containerd unprivileged ports config added to worker node kubeadm config template", Vars: []runtimehooksv1.Variable{ capitest.VariableWithValue( - "builtin", + runtimehooksv1.BuiltinsName, map[string]any{ "machineDeployment": map[string]any{ "class": "*", diff --git a/pkg/handlers/generic/mutation/httpproxy/inject_test.go b/pkg/handlers/generic/mutation/httpproxy/inject_test.go index d36ff0c85..8dd4f7c7b 100644 --- a/pkg/handlers/generic/mutation/httpproxy/inject_test.go +++ b/pkg/handlers/generic/mutation/httpproxy/inject_test.go @@ -62,7 +62,7 @@ var _ = Describe("Generate HTTPProxy Patches", func() { VariableName, ), capitest.VariableWithValue( - "builtin", + runtimehooksv1.BuiltinsName, map[string]any{ "machineDeployment": map[string]any{ "class": names.SimpleNameGenerator.GenerateName("worker-"), diff --git a/pkg/handlers/generic/mutation/imageregistries/credentials/inject_test.go b/pkg/handlers/generic/mutation/imageregistries/credentials/inject_test.go index c25d103e1..28ad6b414 100644 --- a/pkg/handlers/generic/mutation/imageregistries/credentials/inject_test.go +++ b/pkg/handlers/generic/mutation/imageregistries/credentials/inject_test.go @@ -343,7 +343,7 @@ var _ = Describe("Generate Image registry patches", func() { v1alpha1.ImageRegistriesVariableName, ), capitest.VariableWithValue( - "builtin", + runtimehooksv1.BuiltinsName, map[string]any{ "machineDeployment": map[string]any{ "class": names.SimpleNameGenerator.GenerateName("worker-"), @@ -400,7 +400,7 @@ var _ = Describe("Generate Image registry patches", func() { v1alpha1.ImageRegistriesVariableName, ), capitest.VariableWithValue( - "builtin", + runtimehooksv1.BuiltinsName, map[string]any{ "machineDeployment": map[string]any{ "class": names.SimpleNameGenerator.GenerateName("worker-"), diff --git a/pkg/handlers/generic/mutation/mirrors/inject_test.go b/pkg/handlers/generic/mutation/mirrors/inject_test.go index 1f4a8eea7..04a09984f 100644 --- a/pkg/handlers/generic/mutation/mirrors/inject_test.go +++ b/pkg/handlers/generic/mutation/mirrors/inject_test.go @@ -198,7 +198,7 @@ var _ = Describe("Generate Global mirror patches", func() { v1alpha1.GlobalMirrorVariableName, ), capitest.VariableWithValue( - "builtin", + runtimehooksv1.BuiltinsName, map[string]any{ "machineDeployment": map[string]any{ "class": names.SimpleNameGenerator.GenerateName("worker-"), @@ -238,7 +238,7 @@ var _ = Describe("Generate Global mirror patches", func() { v1alpha1.GlobalMirrorVariableName, ), capitest.VariableWithValue( - "builtin", + runtimehooksv1.BuiltinsName, map[string]any{ "machineDeployment": map[string]any{ "class": names.SimpleNameGenerator.GenerateName("worker-"), @@ -281,7 +281,7 @@ var _ = Describe("Generate Global mirror patches", func() { v1alpha1.GlobalMirrorVariableName, ), capitest.VariableWithValue( - "builtin", + runtimehooksv1.BuiltinsName, map[string]any{ "machineDeployment": map[string]any{ "class": names.SimpleNameGenerator.GenerateName("worker-"), @@ -321,7 +321,7 @@ var _ = Describe("Generate Global mirror patches", func() { v1alpha1.ImageRegistriesVariableName, ), capitest.VariableWithValue( - "builtin", + runtimehooksv1.BuiltinsName, map[string]any{ "machineDeployment": map[string]any{ "class": names.SimpleNameGenerator.GenerateName("worker-"), @@ -382,7 +382,7 @@ var _ = Describe("Generate Global mirror patches", func() { []string{"addons", v1alpha1.RegistryAddonVariableName}..., ), capitest.VariableWithValue( - "builtin", + runtimehooksv1.BuiltinsName, map[string]any{ "machineDeployment": map[string]any{ "class": names.SimpleNameGenerator.GenerateName("worker-"), diff --git a/pkg/handlers/generic/mutation/noderegistration/inject_worker_test.go b/pkg/handlers/generic/mutation/noderegistration/inject_worker_test.go index e96525858..a05d7835a 100644 --- a/pkg/handlers/generic/mutation/noderegistration/inject_worker_test.go +++ b/pkg/handlers/generic/mutation/noderegistration/inject_worker_test.go @@ -36,7 +36,7 @@ var _ = Describe("Generate NodeRegistration patches for Worker", func() { VariableName, ), capitest.VariableWithValue( - "builtin", + runtimehooksv1.BuiltinsName, apiextensionsv1.JSON{ Raw: []byte(`{"machineDeployment": {"class": "a-worker"}}`), }, diff --git a/pkg/handlers/generic/mutation/ntp/inject_test.go b/pkg/handlers/generic/mutation/ntp/inject_test.go index 9dae4bcd0..21104c526 100644 --- a/pkg/handlers/generic/mutation/ntp/inject_test.go +++ b/pkg/handlers/generic/mutation/ntp/inject_test.go @@ -99,7 +99,7 @@ var _ = Describe("Generate NTP patches", func() { VariableName, ), capitest.VariableWithValue( - "builtin", + runtimehooksv1.BuiltinsName, map[string]any{ "machineDeployment": map[string]any{ "class": "worker-class", @@ -130,7 +130,7 @@ var _ = Describe("Generate NTP patches", func() { VariableName, ), capitest.VariableWithValue( - "builtin", + runtimehooksv1.BuiltinsName, map[string]any{ "machineDeployment": map[string]any{ "class": "worker-class", diff --git a/pkg/handlers/generic/mutation/taints/inject_worker_test.go b/pkg/handlers/generic/mutation/taints/inject_worker_test.go index ec6a19495..b701977e4 100644 --- a/pkg/handlers/generic/mutation/taints/inject_worker_test.go +++ b/pkg/handlers/generic/mutation/taints/inject_worker_test.go @@ -42,7 +42,7 @@ var _ = Describe("Generate taints patches for Worker", func() { VariableName, ), capitest.VariableWithValue( - "builtin", + runtimehooksv1.BuiltinsName, apiextensionsv1.JSON{ Raw: []byte(`{"machineDeployment": {"class": "a-worker"}}`), }, diff --git a/pkg/handlers/generic/mutation/users/inject_test.go b/pkg/handlers/generic/mutation/users/inject_test.go index 61711cd4f..3c888e360 100644 --- a/pkg/handlers/generic/mutation/users/inject_test.go +++ b/pkg/handlers/generic/mutation/users/inject_test.go @@ -177,7 +177,7 @@ var _ = Describe("Generate Users patches", func() { VariableName, ), capitest.VariableWithValue( - "builtin", + runtimehooksv1.BuiltinsName, map[string]any{ "machineDeployment": map[string]any{ "class": names.SimpleNameGenerator.GenerateName("worker-"), diff --git a/pkg/handlers/nutanix/mutation/machinedetails/inject_worker_test.go b/pkg/handlers/nutanix/mutation/machinedetails/inject_worker_test.go index ef9245efb..506b20309 100644 --- a/pkg/handlers/nutanix/mutation/machinedetails/inject_worker_test.go +++ b/pkg/handlers/nutanix/mutation/machinedetails/inject_worker_test.go @@ -34,7 +34,7 @@ var _ = Describe("Generate Nutanix Machine Details patches for Worker", func() { VariableName, ), capitest.VariableWithValue( - "builtin", + runtimehooksv1.BuiltinsName, apiextensionsv1.JSON{ Raw: []byte(`{"machineDeployment": {"class": "a-worker"}}`), },