[1.18] base-images: Update to kube-cross:v1.13.9-5

build/build-image/cross/VERSION

@@ -1 +1 @@
-v1.13.9-2
+v1.13.9-5

build/dependencies.yaml

@@ -1,44 +1,4 @@
 dependencies:
-  - name: "etcd"
-    version: 3.4.3
-    refPaths:
-    - path: cluster/gce/manifests/etcd.manifest
-      match: etcd_docker_tag|etcd_version
-    - path: build/workspace.bzl
-      match: ETCD_VERSION
-    - path: cluster/gce/manifests/etcd-empty-dir-cleanup.yaml
-      match: k8s.gcr.io/etcd-empty-dir-cleanup
-    - path: cluster/gce/upgrade-aliases.sh
-      match: ETCD_IMAGE|ETCD_VERSION
-    - path: cluster/images/etcd-empty-dir-cleanup/Makefile
-      match: ETCD_VERSION|TAG
-    - path: cluster/images/etcd/Makefile
-      match: BUNDLED_ETCD_VERSIONS\?|LATEST_ETCD_VERSION\?
-    - path: cluster/images/etcd/migrate-if-needed.sh
-      match: BUNDLED_VERSIONS=
-    - path: cmd/kubeadm/app/constants/constants.go
-    - path: hack/lib/etcd.sh
-      match: ETCD_VERSION=
-    - path: staging/src/k8s.io/sample-apiserver/artifacts/example/deployment.yaml
-      match: quay.io/coreos/etcd
-    - path: test/e2e/framework/nodes_util.go
-      match: const etcdImage
-
-  - name: "docker"
-    version: 19.03
-    refPaths:
-    - path: vendor/k8s.io/system-validators/validators/docker_validator.go
-      match: latestValidatedDockerVersion
-
-
-  - name: "golang"
-    version: 1.13.9
-    refPaths:
-    - path: build/build-image/cross/VERSION
-    - path: test/images/Makefile
-      match: GOLANG_VERSION
-
-
   - name: "cni"
     version: 0.8.5
     refPaths:
@@ -53,7 +13,6 @@ dependencies:
     - path: test/e2e_node/remote/utils.go
       match: cniVersion[\t\n\f\r ]*=
 
-
   - name: "coredns-kube-up"
     version: 1.6.5
     refPaths:
@@ -79,3 +38,48 @@ dependencies:
       match: DEFAULT_CRICTL_VERSION=
     - path: cluster/gce/windows/k8s-node-setup.psm1
       match: CRICTL_VERSION =
+
+  - name: "docker"
+    version: 19.03
+    refPaths:
+    - path: vendor/k8s.io/system-validators/validators/docker_validator.go
+      match: latestValidatedDockerVersion
+
+  - name: "etcd"
+    version: 3.4.3
+    refPaths:
+    - path: cluster/gce/manifests/etcd.manifest
+      match: etcd_docker_tag|etcd_version
+    - path: build/workspace.bzl
+      match: ETCD_VERSION
+    - path: cluster/gce/manifests/etcd-empty-dir-cleanup.yaml
+      match: k8s.gcr.io/etcd-empty-dir-cleanup
+    - path: cluster/gce/upgrade-aliases.sh
+      match: ETCD_IMAGE|ETCD_VERSION
+    - path: cluster/images/etcd-empty-dir-cleanup/Makefile
+      match: ETCD_VERSION|TAG
+    - path: cluster/images/etcd/Makefile
+      match: BUNDLED_ETCD_VERSIONS\?|LATEST_ETCD_VERSION\?
+    - path: cluster/images/etcd/migrate-if-needed.sh
+      match: BUNDLED_VERSIONS=
+    - path: cmd/kubeadm/app/constants/constants.go
+    - path: hack/lib/etcd.sh
+      match: ETCD_VERSION=
+    - path: staging/src/k8s.io/sample-apiserver/artifacts/example/deployment.yaml
+      match: quay.io/coreos/etcd
+    - path: test/e2e/framework/nodes_util.go
+      match: const etcdImage
+
+  - name: "golang"
+    version: 1.13.9
+    refPaths:
+    - path: build/build-image/cross/VERSION
+    - path: test/images/Makefile
+      match: GOLANG_VERSION
+
+  - name: "k8s.gcr.io/kube-cross: dependents"
+    version: v1.13.9-5
+    refPaths:
+    - path: build/build-image/cross/VERSION
+    - path: test/images/sample-apiserver/Dockerfile
+      match: us\.gcr\.io\/k8s-artifacts-prod\/build-image\/kube-cross:v\d+\.\d+\.\d+-\d+

test/images/sample-apiserver/Dockerfile

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 ARG BASEIMAGE
-FROM us.gcr.io/k8s-artifacts-prod/build-image/kube-cross:v1.13.9-2 as build_k8s_1_17_sample_apiserver
+FROM us.gcr.io/k8s-artifacts-prod/build-image/kube-cross:v1.13.9-5 as build_k8s_1_17_sample_apiserver
 
 ENV GOPATH /go
 RUN mkdir -p ${GOPATH}/src ${GOPATH}/bin