From 2ee6a05a168d9b46fa6e57a9c30ea899c1aa103d Mon Sep 17 00:00:00 2001 From: ajithu Date: Thu, 14 Apr 2022 11:42:21 +0530 Subject: [PATCH 01/10] Update push.bzl Removing `tag` as well. On Bazel 5.0, tag also became obsolete. --- skylib/push.bzl | 1 - 1 file changed, 1 deletion(-) diff --git a/skylib/push.bzl b/skylib/push.bzl index 5a0e1dba..74c3816a 100644 --- a/skylib/push.bzl +++ b/skylib/push.bzl @@ -131,7 +131,6 @@ def _impl(ctx): PushInfo( registry = registry, repository = repository, - tag = tag, digest = image["digest"], ), K8sPushInfo( From f909bb868cedff61c43cb3c7d9cacc99ba331816 Mon Sep 17 00:00:00 2001 From: ajithu Date: Mon, 18 Apr 2022 11:41:56 +0530 Subject: [PATCH 02/10] Update kustomize.bzl --- skylib/kustomize/kustomize.bzl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/skylib/kustomize/kustomize.bzl b/skylib/kustomize/kustomize.bzl index d6d05f4e..9ea311a2 100644 --- a/skylib/kustomize/kustomize.bzl +++ b/skylib/kustomize/kustomize.bzl @@ -364,7 +364,7 @@ def _push_all_impl(ctx): template = ctx.file._tpl, substitutions = { "%{statements}": "\n".join([ - "echo pushing {}/{}:{}".format(exe[PushInfo].registry, exe[PushInfo].repository, exe[PushInfo].tag) + "echo pushing {}/{}:{}".format(exe[PushInfo].registry, exe[PushInfo].repository) for exe in trans_img_pushes ]) + "\n" + "\n".join([ @@ -415,7 +415,7 @@ def imagePushStatements( statements = "" trans_img_pushes = depset(transitive = [obj[KustomizeInfo].image_pushes for obj in kustomize_objs]).to_list() statements += "\n".join([ - "echo pushing {}/{}:{}".format(exe[PushInfo].registry, exe[PushInfo].repository, exe[PushInfo].tag) + "echo pushing {}/{}:{}".format(exe[PushInfo].registry, exe[PushInfo].repository) for exe in trans_img_pushes ]) + "\n" statements += "\n".join([ @@ -527,7 +527,7 @@ def _kubectl_impl(ctx): if ctx.attr.push: trans_img_pushes = depset(transitive = [obj[KustomizeInfo].image_pushes for obj in ctx.attr.srcs]).to_list() statements += "\n".join([ - "echo pushing {}/{}:{}".format(exe[PushInfo].registry, exe[PushInfo].repository, exe[PushInfo].tag) + "echo pushing {}/{}:{}".format(exe[PushInfo].registry, exe[PushInfo].repository) for exe in trans_img_pushes ]) + "\n" statements += "\n".join([ From 1ff67f5085ae9139e303b16167c6cc245ff12fb2 Mon Sep 17 00:00:00 2001 From: ajithu Date: Mon, 18 Apr 2022 11:42:42 +0530 Subject: [PATCH 03/10] Update config.yaml --- .fasterci/config.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.fasterci/config.yaml b/.fasterci/config.yaml index d124bf23..9111ee59 100644 --- a/.fasterci/config.yaml +++ b/.fasterci/config.yaml @@ -35,3 +35,8 @@ workflows: name: Faster CI / build (4.2.1) env: USE_BAZEL_VERSION: "4.2.1" + + - <<: *build_workflow + name: Faster CI / build (5.0.0) + env: + USE_BAZEL_VERSION: "5.0.0" From 044bf6705f44a6917374ff11e900aeddde544def Mon Sep 17 00:00:00 2001 From: ajithu Date: Mon, 18 Apr 2022 12:28:22 +0530 Subject: [PATCH 04/10] Update kustomize.bzl --- skylib/kustomize/kustomize.bzl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/skylib/kustomize/kustomize.bzl b/skylib/kustomize/kustomize.bzl index 9ea311a2..c4ca021f 100644 --- a/skylib/kustomize/kustomize.bzl +++ b/skylib/kustomize/kustomize.bzl @@ -364,7 +364,7 @@ def _push_all_impl(ctx): template = ctx.file._tpl, substitutions = { "%{statements}": "\n".join([ - "echo pushing {}/{}:{}".format(exe[PushInfo].registry, exe[PushInfo].repository) + "echo pushing {}/{}:{}".format(exe[PushInfo].registry, exe[PushInfo].repository, exe[PushInfo].repository) for exe in trans_img_pushes ]) + "\n" + "\n".join([ @@ -415,7 +415,7 @@ def imagePushStatements( statements = "" trans_img_pushes = depset(transitive = [obj[KustomizeInfo].image_pushes for obj in kustomize_objs]).to_list() statements += "\n".join([ - "echo pushing {}/{}:{}".format(exe[PushInfo].registry, exe[PushInfo].repository) + "echo pushing {}/{}:{}".format(exe[PushInfo].registry, exe[PushInfo].repository, exe[PushInfo].repository) for exe in trans_img_pushes ]) + "\n" statements += "\n".join([ @@ -527,7 +527,7 @@ def _kubectl_impl(ctx): if ctx.attr.push: trans_img_pushes = depset(transitive = [obj[KustomizeInfo].image_pushes for obj in ctx.attr.srcs]).to_list() statements += "\n".join([ - "echo pushing {}/{}:{}".format(exe[PushInfo].registry, exe[PushInfo].repository) + "echo pushing {}/{}:{}".format(exe[PushInfo].registry, exe[PushInfo].repository, exe[PushInfo].repository) for exe in trans_img_pushes ]) + "\n" statements += "\n".join([ From 1906938262107343b770c54462e35a326c906484 Mon Sep 17 00:00:00 2001 From: ajithu Date: Mon, 18 Apr 2022 14:12:44 +0530 Subject: [PATCH 05/10] Update kustomize.bzl --- skylib/kustomize/kustomize.bzl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/skylib/kustomize/kustomize.bzl b/skylib/kustomize/kustomize.bzl index c4ca021f..d88a915e 100644 --- a/skylib/kustomize/kustomize.bzl +++ b/skylib/kustomize/kustomize.bzl @@ -364,7 +364,7 @@ def _push_all_impl(ctx): template = ctx.file._tpl, substitutions = { "%{statements}": "\n".join([ - "echo pushing {}/{}:{}".format(exe[PushInfo].registry, exe[PushInfo].repository, exe[PushInfo].repository) + "echo pushing {}/{}:{}".format(exe[PushInfo].registry, exe[PushInfo].repository, exe[PushInfo].digest) for exe in trans_img_pushes ]) + "\n" + "\n".join([ @@ -415,7 +415,7 @@ def imagePushStatements( statements = "" trans_img_pushes = depset(transitive = [obj[KustomizeInfo].image_pushes for obj in kustomize_objs]).to_list() statements += "\n".join([ - "echo pushing {}/{}:{}".format(exe[PushInfo].registry, exe[PushInfo].repository, exe[PushInfo].repository) + "echo pushing {}/{}:{}".format(exe[PushInfo].registry, exe[PushInfo].repository, exe[PushInfo].digest) for exe in trans_img_pushes ]) + "\n" statements += "\n".join([ @@ -527,7 +527,7 @@ def _kubectl_impl(ctx): if ctx.attr.push: trans_img_pushes = depset(transitive = [obj[KustomizeInfo].image_pushes for obj in ctx.attr.srcs]).to_list() statements += "\n".join([ - "echo pushing {}/{}:{}".format(exe[PushInfo].registry, exe[PushInfo].repository, exe[PushInfo].repository) + "echo pushing {}/{}:{}".format(exe[PushInfo].registry, exe[PushInfo].repository, exe[PushInfo].digest) for exe in trans_img_pushes ]) + "\n" statements += "\n".join([ From 78f87dcd8f6807a5682ddbc02b25fbec9b666fab Mon Sep 17 00:00:00 2001 From: ajithu Date: Mon, 18 Apr 2022 14:31:44 +0530 Subject: [PATCH 06/10] Update kustomize.bzl --- skylib/kustomize/kustomize.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skylib/kustomize/kustomize.bzl b/skylib/kustomize/kustomize.bzl index d88a915e..8e59c1d7 100644 --- a/skylib/kustomize/kustomize.bzl +++ b/skylib/kustomize/kustomize.bzl @@ -364,7 +364,7 @@ def _push_all_impl(ctx): template = ctx.file._tpl, substitutions = { "%{statements}": "\n".join([ - "echo pushing {}/{}:{}".format(exe[PushInfo].registry, exe[PushInfo].repository, exe[PushInfo].digest) + "echo pushing {}/{}:{}".format(exe[PushInfo].registry, exe[PushInfo].repository, exe[PushInfo].repository) for exe in trans_img_pushes ]) + "\n" + "\n".join([ From fcc2595781d7d7017e687842672b7e031b5d887d Mon Sep 17 00:00:00 2001 From: ajithu Date: Mon, 18 Apr 2022 14:38:21 +0530 Subject: [PATCH 07/10] Update kustomize.bzl --- skylib/kustomize/kustomize.bzl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/skylib/kustomize/kustomize.bzl b/skylib/kustomize/kustomize.bzl index 8e59c1d7..c4ca021f 100644 --- a/skylib/kustomize/kustomize.bzl +++ b/skylib/kustomize/kustomize.bzl @@ -415,7 +415,7 @@ def imagePushStatements( statements = "" trans_img_pushes = depset(transitive = [obj[KustomizeInfo].image_pushes for obj in kustomize_objs]).to_list() statements += "\n".join([ - "echo pushing {}/{}:{}".format(exe[PushInfo].registry, exe[PushInfo].repository, exe[PushInfo].digest) + "echo pushing {}/{}:{}".format(exe[PushInfo].registry, exe[PushInfo].repository, exe[PushInfo].repository) for exe in trans_img_pushes ]) + "\n" statements += "\n".join([ @@ -527,7 +527,7 @@ def _kubectl_impl(ctx): if ctx.attr.push: trans_img_pushes = depset(transitive = [obj[KustomizeInfo].image_pushes for obj in ctx.attr.srcs]).to_list() statements += "\n".join([ - "echo pushing {}/{}:{}".format(exe[PushInfo].registry, exe[PushInfo].repository, exe[PushInfo].digest) + "echo pushing {}/{}:{}".format(exe[PushInfo].registry, exe[PushInfo].repository, exe[PushInfo].repository) for exe in trans_img_pushes ]) + "\n" statements += "\n".join([ From e7d3151f3289d17b4b215edd40481769783fcd87 Mon Sep 17 00:00:00 2001 From: ajithu Date: Thu, 21 Apr 2022 19:04:13 +0530 Subject: [PATCH 08/10] Update kustomize.bzl --- skylib/kustomize/kustomize.bzl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/skylib/kustomize/kustomize.bzl b/skylib/kustomize/kustomize.bzl index c4ca021f..df5fe49f 100644 --- a/skylib/kustomize/kustomize.bzl +++ b/skylib/kustomize/kustomize.bzl @@ -364,7 +364,7 @@ def _push_all_impl(ctx): template = ctx.file._tpl, substitutions = { "%{statements}": "\n".join([ - "echo pushing {}/{}:{}".format(exe[PushInfo].registry, exe[PushInfo].repository, exe[PushInfo].repository) + "echo pushing {}/{}:tag@{}".format(exe[PushInfo].registry, exe[PushInfo].repository, exe[PushInfo].digest) for exe in trans_img_pushes ]) + "\n" + "\n".join([ @@ -415,7 +415,7 @@ def imagePushStatements( statements = "" trans_img_pushes = depset(transitive = [obj[KustomizeInfo].image_pushes for obj in kustomize_objs]).to_list() statements += "\n".join([ - "echo pushing {}/{}:{}".format(exe[PushInfo].registry, exe[PushInfo].repository, exe[PushInfo].repository) + "echo pushing {}/{}:tag@{}".format(exe[PushInfo].registry, exe[PushInfo].repository, exe[PushInfo].digest) for exe in trans_img_pushes ]) + "\n" statements += "\n".join([ @@ -527,7 +527,7 @@ def _kubectl_impl(ctx): if ctx.attr.push: trans_img_pushes = depset(transitive = [obj[KustomizeInfo].image_pushes for obj in ctx.attr.srcs]).to_list() statements += "\n".join([ - "echo pushing {}/{}:{}".format(exe[PushInfo].registry, exe[PushInfo].repository, exe[PushInfo].repository) + "echo pushing {}/{}:tag@{}".format(exe[PushInfo].registry, exe[PushInfo].repository, exe[PushInfo].digest) for exe in trans_img_pushes ]) + "\n" statements += "\n".join([ From 462f2c95490eeab41b9580191514a8eaad21e311 Mon Sep 17 00:00:00 2001 From: ajithu Date: Thu, 21 Apr 2022 19:10:53 +0530 Subject: [PATCH 09/10] Update kustomize.bzl --- skylib/kustomize/kustomize.bzl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/skylib/kustomize/kustomize.bzl b/skylib/kustomize/kustomize.bzl index df5fe49f..b84128ce 100644 --- a/skylib/kustomize/kustomize.bzl +++ b/skylib/kustomize/kustomize.bzl @@ -364,7 +364,7 @@ def _push_all_impl(ctx): template = ctx.file._tpl, substitutions = { "%{statements}": "\n".join([ - "echo pushing {}/{}:tag@{}".format(exe[PushInfo].registry, exe[PushInfo].repository, exe[PushInfo].digest) + "echo -n pushing {}/{}:tag@{}".format(exe[PushInfo].registry, exe[PushInfo].repository, exe[PushInfo].digest) for exe in trans_img_pushes ]) + "\n" + "\n".join([ @@ -415,7 +415,7 @@ def imagePushStatements( statements = "" trans_img_pushes = depset(transitive = [obj[KustomizeInfo].image_pushes for obj in kustomize_objs]).to_list() statements += "\n".join([ - "echo pushing {}/{}:tag@{}".format(exe[PushInfo].registry, exe[PushInfo].repository, exe[PushInfo].digest) + "echo -n pushing {}/{}:tag@{}".format(exe[PushInfo].registry, exe[PushInfo].repository, exe[PushInfo].digest) for exe in trans_img_pushes ]) + "\n" statements += "\n".join([ @@ -527,7 +527,7 @@ def _kubectl_impl(ctx): if ctx.attr.push: trans_img_pushes = depset(transitive = [obj[KustomizeInfo].image_pushes for obj in ctx.attr.srcs]).to_list() statements += "\n".join([ - "echo pushing {}/{}:tag@{}".format(exe[PushInfo].registry, exe[PushInfo].repository, exe[PushInfo].digest) + "echo -n pushing {}/{}:tag@{}".format(exe[PushInfo].registry, exe[PushInfo].repository, exe[PushInfo].digest) for exe in trans_img_pushes ]) + "\n" statements += "\n".join([ From 8311d980c8e087f5bd4821f4ffc86ad82c14c094 Mon Sep 17 00:00:00 2001 From: ajithu Date: Thu, 21 Apr 2022 19:15:26 +0530 Subject: [PATCH 10/10] Update kustomize.bzl --- skylib/kustomize/kustomize.bzl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/skylib/kustomize/kustomize.bzl b/skylib/kustomize/kustomize.bzl index b84128ce..42c4556d 100644 --- a/skylib/kustomize/kustomize.bzl +++ b/skylib/kustomize/kustomize.bzl @@ -364,7 +364,7 @@ def _push_all_impl(ctx): template = ctx.file._tpl, substitutions = { "%{statements}": "\n".join([ - "echo -n pushing {}/{}:tag@{}".format(exe[PushInfo].registry, exe[PushInfo].repository, exe[PushInfo].digest) + "echo pushing {}/{}".format(exe[PushInfo].registry, exe[PushInfo].repository) for exe in trans_img_pushes ]) + "\n" + "\n".join([ @@ -415,7 +415,7 @@ def imagePushStatements( statements = "" trans_img_pushes = depset(transitive = [obj[KustomizeInfo].image_pushes for obj in kustomize_objs]).to_list() statements += "\n".join([ - "echo -n pushing {}/{}:tag@{}".format(exe[PushInfo].registry, exe[PushInfo].repository, exe[PushInfo].digest) + "echo pushing {}/{}".format(exe[PushInfo].registry, exe[PushInfo].repository) for exe in trans_img_pushes ]) + "\n" statements += "\n".join([ @@ -527,7 +527,7 @@ def _kubectl_impl(ctx): if ctx.attr.push: trans_img_pushes = depset(transitive = [obj[KustomizeInfo].image_pushes for obj in ctx.attr.srcs]).to_list() statements += "\n".join([ - "echo -n pushing {}/{}:tag@{}".format(exe[PushInfo].registry, exe[PushInfo].repository, exe[PushInfo].digest) + "echo pushing {}/{}".format(exe[PushInfo].registry, exe[PushInfo].repository) for exe in trans_img_pushes ]) + "\n" statements += "\n".join([