From b62165f4453e48c7b2759ce70f54a7a9be07d651 Mon Sep 17 00:00:00 2001
From: Stephen Kitt <skitt@redhat.com>
Date: Mon, 13 Feb 2023 18:06:59 +0100
Subject: [PATCH] Drop cp from the etcd images

This was used by migrate-if-needed.sh, but that has been replaced by
the migrate Go program which doesn't need external cp.

Signed-off-by: Stephen Kitt <skitt@redhat.com>
---
 cluster/images/etcd/Dockerfile         |  1 -
 cluster/images/etcd/Dockerfile.windows |  1 -
 cluster/images/etcd/Makefile           |  7 +--
 cluster/images/etcd/cp/cp.go           | 62 --------------------------
 4 files changed, 2 insertions(+), 69 deletions(-)
 delete mode 100644 cluster/images/etcd/cp/cp.go

diff --git a/cluster/images/etcd/Dockerfile b/cluster/images/etcd/Dockerfile
index 497cd6ddfab..36dc86256d4 100644
--- a/cluster/images/etcd/Dockerfile
+++ b/cluster/images/etcd/Dockerfile
@@ -34,5 +34,4 @@ COPY --from=builder /sh /bin/
 EXPOSE 2379 2380 4001 7001
 # etcdctl is used by etcd.manifest for livenessProbe.
 COPY etcd* etcdctl* /usr/local/bin/
-COPY cp* /bin/
 COPY migrate-if-needed.sh migrate /usr/local/bin/
diff --git a/cluster/images/etcd/Dockerfile.windows b/cluster/images/etcd/Dockerfile.windows
index 1c35d62d32e..a9c5b0ae23f 100644
--- a/cluster/images/etcd/Dockerfile.windows
+++ b/cluster/images/etcd/Dockerfile.windows
@@ -18,7 +18,6 @@ FROM ${RUNNERIMAGE}
 EXPOSE 2379 2380 4001 7001
 
 COPY etcd* etcdctl* /usr/local/bin/
-COPY cp* /usr/local/bin/
 COPY migrate-if-needed.bat /usr/local/bin/
 COPY migrate /usr/local/bin/migrate.exe
 
diff --git a/cluster/images/etcd/Makefile b/cluster/images/etcd/Makefile
index 5ca8246248b..62568d640f5 100644
--- a/cluster/images/etcd/Makefile
+++ b/cluster/images/etcd/Makefile
@@ -34,7 +34,7 @@ LATEST_ETCD_VERSION?=3.5.7
 # REVISION provides a version number for this image and all it's bundled
 # artifacts. It should start at zero for each LATEST_ETCD_VERSION and increment
 # for each revision of this image at that etcd version.
-REVISION?=0
+REVISION?=1
 
 # IMAGE_TAG Uniquely identifies registry.k8s.io/etcd docker image with a tag of the form "<etcd-version>-<revision>".
 IMAGE_TAG=$(LATEST_ETCD_VERSION)-$(REVISION)
@@ -125,10 +125,7 @@ build:
 	migrate_tmp_dir=$(shell mktemp -d); \
 	docker run --rm --interactive -v $(shell pwd)/../../../:/go/src/k8s.io/kubernetes$(DOCKER_VOL_OPTS) -v $${migrate_tmp_dir}:/build$(DOCKER_VOL_OPTS) -e GOOS=$(OS) -e GOARCH=$(ARCH) golang:$(GOLANG_VERSION) \
 		/bin/bash -c "CGO_ENABLED=0 GO111MODULE=off go build -o /build/migrate k8s.io/kubernetes/cluster/images/etcd/migrate"; \
-	$(BIN_INSTALL) $${migrate_tmp_dir}/migrate $(TEMP_DIR); \
-	docker run --rm --interactive -v $(shell pwd)/../../../:/go/src/k8s.io/kubernetes$(DOCKER_VOL_OPTS) -v $${migrate_tmp_dir}:/build$(DOCKER_VOL_OPTS) -e GOOS=$(OS) -e GOARCH=$(ARCH) golang:$(GOLANG_VERSION) \
-		/bin/bash -c "CGO_ENABLED=0 GO111MODULE=off go build -o /build/cp k8s.io/kubernetes/cluster/images/etcd/cp"; \
-	$(BIN_INSTALL) $${migrate_tmp_dir}/cp $(TEMP_DIR);
+	$(BIN_INSTALL) $${migrate_tmp_dir}/migrate $(TEMP_DIR);
 
 ifeq ($(ARCH),amd64)
 
diff --git a/cluster/images/etcd/cp/cp.go b/cluster/images/etcd/cp/cp.go
deleted file mode 100644
index 693b4834e75..00000000000
--- a/cluster/images/etcd/cp/cp.go
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-Copyright 2020 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.
-*/
-
-package main
-
-import (
-	"io"
-	"log"
-	"os"
-	"path/filepath"
-)
-
-func main() {
-	if len(os.Args) != 3 {
-		log.Fatal("Usage: cp SOURCE DEST")
-	}
-
-	sf, err := os.Open(os.Args[1])
-	if err != nil {
-		log.Fatalf("unable to open source file [%s]: %q", os.Args[1], err)
-	}
-	defer sf.Close()
-	fi, err := sf.Stat()
-	if err != nil {
-		log.Fatalf("unable to stat source file [%s]: %q", os.Args[1], err)
-	}
-
-	dir := filepath.Dir(os.Args[2])
-	if err := os.MkdirAll(dir, 0755); err != nil {
-		log.Fatalf("unable to create directory [%s]: %q", dir, err)
-	}
-	df, err := os.Create(os.Args[2])
-	if err != nil {
-		log.Fatalf("unable to create destination file [%s]: %q", os.Args[1], err)
-	}
-	defer df.Close()
-
-	_, err = io.Copy(df, sf)
-	if err != nil {
-		log.Fatalf("unable to copy [%s] to [%s]: %q", os.Args[1], os.Args[2], err)
-	}
-
-	if err := df.Close(); err != nil {
-		log.Fatalf("unable to close destination file: %q", err)
-	}
-	if err := os.Chmod(os.Args[2], fi.Mode()); err != nil {
-		log.Fatalf("unable to close destination file: %q", err)
-	}
-}