From 724b878392f7abb16840b643caf537d750631a7b Mon Sep 17 00:00:00 2001 From: Aaron Crickenberger Date: Mon, 13 Sep 2021 14:08:12 -0700 Subject: [PATCH] images: remove cluster-api Jobs that used it were gradually replaced with jobs that used kubekins-e2e instead, around 2019. See: - d48d7f5d1d55e4c82e9117bb677f67fae3dc5252 - 5b845a661a20cbcce85bee54fc23a92dc29aef06 - 04a23a4b80ec28a0007a0ee5be81d6b771bb439c --- images/cluster-api/Dockerfile | 30 ------------------------------ images/cluster-api/Makefile | 21 --------------------- images/cluster-api/cloudbuild.yaml | 10 ---------- 3 files changed, 61 deletions(-) delete mode 100644 images/cluster-api/Dockerfile delete mode 100644 images/cluster-api/Makefile delete mode 100644 images/cluster-api/cloudbuild.yaml diff --git a/images/cluster-api/Dockerfile b/images/cluster-api/Dockerfile deleted file mode 100644 index 97aaf9282128..000000000000 --- a/images/cluster-api/Dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 2018 The Kubernetes Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Includes go, gcloud, and etcd -FROM gcr.io/k8s-testimages/gcloud-in-go:v20180927-6b4facbe6 - -# add env we can debug with the image name:tag -ARG IMAGE_ARG -ENV IMAGE=${IMAGE_ARG} - -ENV DEP_VER=v0.5.0 -ENV DEP_CHECKSUM=287b08291e14f1fae8ba44374b26a2b12eb941af3497ed0ca649253e21ba2f83 - -RUN wget https://github.com/golang/dep/releases/download/${DEP_VER}/dep-linux-amd64 && \ - bash -c "sha256sum -c <(echo ${DEP_CHECKSUM} dep-linux-amd64)" && \ - mv dep-linux-amd64 /usr/local/bin/dep && \ - chmod +x /usr/local/bin/dep - -ENV PATH "/etcd:${PATH}" diff --git a/images/cluster-api/Makefile b/images/cluster-api/Makefile deleted file mode 100644 index 47e8c9934661..000000000000 --- a/images/cluster-api/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 2018 The Kubernetes Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -push-prod: - bazel run //images/builder -- --project=k8s-testimages --scratch-bucket=gs://k8s-testimages-scratch images/cluster-api - -push: - bazel run //images/builder -- --allow-dirty images/cluster-api - -.PHONY: push push-prod diff --git a/images/cluster-api/cloudbuild.yaml b/images/cluster-api/cloudbuild.yaml deleted file mode 100644 index 65f4d800a6c5..000000000000 --- a/images/cluster-api/cloudbuild.yaml +++ /dev/null @@ -1,10 +0,0 @@ -steps: - - name: gcr.io/cloud-builders/docker - args: ['build', '-t', 'gcr.io/$PROJECT_ID/cluster-api:$_GIT_TAG', - '--build-arg', 'IMAGE_ARG=gcr.io/$PROJECT_ID/cluster-api:$_GIT_TAG', - '.'] - dir: images/cluster-api/ -substitutions: - _GIT_TAG: '12345' -images: - - 'gcr.io/$PROJECT_ID/cluster-api:$_GIT_TAG'