Remove python resolver (#459)

Author: smukherj1

k8s/BUILD

@@ -29,44 +29,6 @@ exports_files([
     "describe.sh.tpl",
 ])
 
-py_library(
-    name = "resolver_lib",
-    srcs = [
-        "__init__.py",
-        "resolver.py",
-        "//:__init__.py",
-    ],
-    deps = [
-        "@com_github_yaml_pyyaml//:yaml",
-        "@containerregistry",
-    ],
-)
-
-py_test(
-    name = "resolver_test",
-    srcs = ["resolver_test.py"],
-    data = [
-        "//examples/hellogrpc/cc/server:server.tar",
-    ],
-    python_version = "PY2",
-    deps = [
-        ":resolver_lib",
-        "@mock",
-    ],
-)
-
-par_binary(
-    name = "resolver",
-    srcs = ["resolver.py"],
-    main = "resolver.py",
-    python_version = "PY2",
-    visibility = ["//visibility:public"],
-    deps = [
-        "@com_github_yaml_pyyaml//:yaml",
-        "@containerregistry",
-    ],
-)
-
 par_binary(
     name = "stamper",
     srcs = ["stamper.py"],

k8s/k8s.bzl

@@ -67,9 +67,9 @@ py_library(
     if "io_bazel_rules_docker" not in excludes:
         http_archive(
             name = "io_bazel_rules_docker",
-            sha256 = "5fcad5748a03d961c457ae15348684aa6eceb8f1cd6ae5fd7271fb5a271acdaf",
-            strip_prefix = "rules_docker-7476c25fcf188dbfc4eb154ad309eda7df24652c",
-            urls = ["https://github.com/bazelbuild/rules_docker/archive/7476c25fcf188dbfc4eb154ad309eda7df24652c.tar.gz"],
+            sha256 = "14ac30773fdb393ddec90e158c9ec7ebb3f8a4fd533ec2abbfd8789ad81a284b",
+            strip_prefix = "rules_docker-0.12.1",
+            urls = ["https://github.com/bazelbuild/rules_docker/releases/download/v0.12.1/rules_docker-v0.12.1.tar.gz"],
         )
     if "bazel_skylib" not in excludes:
         http_archive(

k8s/object.bzl

@@ -76,24 +76,17 @@ def _impl(ctx):
             image_spec["digest"] = ",".join([_runfiles(ctx, f) for f in blobsums])
             all_inputs += blobsums
 
-            if not ctx.attr.use_legacy_resolver:
-                # Add additional files about the image used by the Go resolver
-                # to load the image more efficiently.
-                diff_ids = image.get("diff_id", [])
-                image_spec["diff_id"] = ",".join([_runfiles(ctx, f) for f in diff_ids])
-                all_inputs += diff_ids
-
-                blobs = image.get("zipped_layer", [])
-                image_spec["compressed_layer"] = ",".join([_runfiles(ctx, f) for f in blobs])
-                all_inputs += blobs
-
-                uncompressed_blobs = image.get("unzipped_layer", [])
-                image_spec["uncompressed_layer"] = ",".join([_runfiles(ctx, f) for f in uncompressed_blobs])
-                all_inputs += uncompressed_blobs
-            else:
-                blobs = image.get("zipped_layer", [])
-                image_spec["layer"] = ",".join([_runfiles(ctx, f) for f in blobs])
-                all_inputs += blobs
+            diff_ids = image.get("diff_id", [])
+            image_spec["diff_id"] = ",".join([_runfiles(ctx, f) for f in diff_ids])
+            all_inputs += diff_ids
+
+            blobs = image.get("zipped_layer", [])
+            image_spec["compressed_layer"] = ",".join([_runfiles(ctx, f) for f in blobs])
+            all_inputs += blobs
+
+            uncompressed_blobs = image.get("unzipped_layer", [])
+            image_spec["uncompressed_layer"] = ",".join([_runfiles(ctx, f) for f in uncompressed_blobs])
+            all_inputs += uncompressed_blobs
 
             image_spec["config"] = _runfiles(ctx, image["config"])
             all_inputs += [image["config"]]
@@ -136,7 +129,7 @@ def _impl(ctx):
                 for spec in image_specs
             ]),
             "%{resolver_args}": " ".join(ctx.attr.resolver_args or []),
-            "%{resolver}": _runfiles(ctx, ctx.executable.resolver if ctx.attr.use_legacy_resolver else ctx.executable.go_resolver),
+            "%{resolver}": _runfiles(ctx, ctx.executable.resolver),
             "%{stamp_args}": stamp_args,
             "%{yaml}": _runfiles(ctx, ctx.outputs.substituted),
         },
@@ -148,7 +141,6 @@ def _impl(ctx):
             runfiles = ctx.runfiles(
                 files = [
                     ctx.executable.resolver,
-                    ctx.executable.go_resolver,
                     ctx.outputs.substituted,
                 ] + all_inputs,
                 transitive_files = ctx.attr.resolver[DefaultInfo].default_runfiles.files,
@@ -172,7 +164,7 @@ def _resolve(ctx, string, output):
     )
 
 def _common_impl(ctx):
-    files = [ctx.executable.resolver, ctx.executable.go_resolver]
+    files = [ctx.executable.resolver]
 
     cluster_arg = ctx.attr.cluster
     cluster_arg = ctx.expand_make_variables("cluster", cluster_arg, {})
@@ -272,12 +264,6 @@ _common_attrs = {
     # don't expose the extra actions.
     "cluster": attr.string(),
     "context": attr.string(),
-    "go_resolver": attr.label(
-        default = Label("//k8s/go/cmd/resolver"),
-        cfg = "host",
-        executable = True,
-        allow_files = True,
-    ),
     "image_chroot": attr.string(),
     # This is only needed for describe.
     "kind": attr.string(),
@@ -286,18 +272,13 @@ _common_attrs = {
     ),
     "namespace": attr.string(),
     "resolver": attr.label(
-        default = Label("//k8s:resolver"),
+        default = Label("//k8s/go/cmd/resolver"),
         cfg = "host",
         executable = True,
         allow_files = True,
     ),
     # Extra arguments to pass to the resolver.
     "resolver_args": attr.string_list(),
-    "use_legacy_resolver": attr.bool(
-        default = False,
-        doc = "Use the legacy python resolver if True. Use the experimental" +
-              " Go resolver if false.",
-    ),
     "user": attr.string(),
     "_stamper": attr.label(
         default = Label("//k8s:stamper"),