Merge pull request #575 from wewark/master

Update distroless-iptables and base-debian11 images
kubernetes · Feb 13, 2023 · fe41fca · fe41fca
2 parents 94bc6b8 + 94574f3
commit fe41fca
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/images/dnsmasq/Makefile b/images/dnsmasq/Makefile
@@ -28,8 +28,8 @@ OUTPUT_DIR := _output/$(ARCH)
 export DOCKER_CLI_EXPERIMENTAL=enabled
 
 # Multiarch image
-# Uploaded: Sep 19, 2022, 1:53:32 PM
-BASEIMAGE ?= gcr.io/distroless/base-debian11@sha256:c06bf48fa67dab06db6027109d3d802aa5b7d213c86a9eabc4d83f806d18ce1c
+# Uploaded: Feb 10, 2023, 11:04:43 PM
+BASEIMAGE ?= gcr.io/distroless/base-debian11@sha256:5d40383d8cc15830334f30f4a19e2af16923e02ceeca275f0acc39bdf3a1c577
 ifeq ($(ARCH),amd64)
 	COMPILE_IMAGE := k8s.gcr.io/build-image/debian-base-$(ARCH):bullseye-v1.4.1
 else ifeq ($(ARCH),arm)

diff --git a/images/dnsmasq/validate_dynamic_deps.py b/images/dnsmasq/validate_dynamic_deps.py
@@ -28,6 +28,7 @@ def replace_img_special_chars(image_ref: str) -> str:
 
 
 def relative_to_root(path: pathlib.Path) -> pathlib.Path:
+    path = pathlib.Path(path)
     return path.relative_to(path.anchor)
 
 
@@ -37,6 +38,10 @@ def detect_architecture(cwd: pathlib.Path, target_binary: pathlib.Path) -> str:
                             capture_output=True,
                             text=True,
                             cwd=cwd)
+    if len(result.stdout.split(",")) <= 1:
+        # File not found
+        print("file %s not found" % target_binary)
+        return ""
     return result.stdout.split(",")[1].strip()
 
 
@@ -131,6 +136,9 @@ def main(image_ref: str, target_binary: str, clean=True):
                 dep_path = resolve_container_link(output_dir, dep_path)
 
             dep_arch = detect_architecture(output_dir, dep_path)
+            if dep_arch == "":
+                # Dependency not found
+                continue
 
             if dep_arch != target_binary_arch:
                 wrong_arch[dep_path] = dep_arch

diff --git a/rules.mk b/rules.mk
@@ -32,7 +32,7 @@ ALL_ARCH := amd64 arm arm64 ppc64le s390x
 # Multiarch image
 # Uploaded: Jun 6, 2022, 7:19:10 PM
 BASEIMAGE ?= gcr.io/distroless/static-debian11@sha256:d6fa9db9548b5772860fecddb11d84f9ebd7e0321c0cb3c02870402680cc315f
-IPTIMAGE ?= gcr.io/gke-release/distroless-iptables:v0.1.2-gke.1
+IPTIMAGE ?= gcr.io/gke-release/distroless-iptables:v0.2.0-gke.2@sha256:43929c06cad5cd1dcc91da5268160cfb6990f96409bc11f4f66891f0529dbc36
 
 # These rules MUST be expanded at reference time (hence '=') as BINARY
 # is dynamically scoped.