bazel: Expand make variables in stateful_set_patch

.bazelrc

@@ -1,7 +1,6 @@
 build --define=MANAGER_IMAGE_NAME=cluster-api-aws-controller
 build --define=MANAGER_IMAGE_TAG=0.1.0
 build --define=REGISTRY_STABLE=gcr.io/cluster-api-provider-aws
-build --define=REGISTRY_TEST_SHIM=bazel/cmd
 
 build --workspace_status_command=./hack/print-workspace-status.sh
 build --verbose_failures

build/stateful_set_patch.bzl

@@ -24,10 +24,10 @@ def _stateful_set_patch_impl(ctx):
         template = ctx.file._template,
         output = ctx.outputs.source_file,
         substitutions = {
-            "<registry>": ctx.attr.registry,
-            "<image_name>": ctx.attr.image_name,
-            "<tag>": ctx.attr.tag,
-            "<pull_policy>": ctx.attr.pull_policy,
+            "<registry>": ctx.expand_make_variables("registry", ctx.attr.registry, {}),
+            "<image_name>": ctx.expand_make_variables("image_name",ctx.attr.image_name, {}),
+            "<tag>": ctx.expand_make_variables("tag", ctx.attr.tag, {}),
+            "<pull_policy>": ctx.expand_make_variables("pull_policy",ctx.attr.pull_policy, {}),
         },
     )
 

test/BUILD.bazel

@@ -18,7 +18,7 @@ stateful_set_patch(
     name = "manager-version-patch",
     image_name = "manager",
     pull_policy = "Never",
-    registry = "$(REGISTRY_TEST_SHIM)",
+    registry = "bazel/cmd",
     tag = "manager-amd64",
     visibility = ["//visibility:public"],
 )