Skip to content

Commit 50f4de5

Browse files
authored
start code clean up and remove unused code (#939)
1 parent 17f2688 commit 50f4de5

36 files changed

Lines changed: 3 additions & 2858 deletions

Dockerfile

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -126,12 +126,7 @@ RUN zypper update -y && \
126126
net-tools && \
127127
zypper clean --all
128128
COPY --from=builder /ecm-distro-tools/cmd/backport/bin/backport-${OS}-${ARCH} /usr/local/bin/backport
129-
COPY --from=builder /ecm-distro-tools/cmd/gen_release_report/bin/gen_release_report-${OS}-${ARCH} /usr/local/bin/gen_release_report
130129
COPY --from=builder /ecm-distro-tools/cmd/release/bin/release-${OS}-${ARCH} /usr/local/bin/release
131-
COPY --from=builder /ecm-distro-tools/cmd/rke2_release/bin/rke2_release-${OS}-${ARCH} /usr/local/bin/rke2_release
132-
COPY --from=builder /ecm-distro-tools/cmd/semv/bin/semv-${OS}-${ARCH} /usr/local/bin/semv
133-
COPY --from=builder /ecm-distro-tools/cmd/test_coverage/bin/test_coverage-${OS}-${ARCH} /usr/local/bin/test_coverage
134-
COPY --from=builder /ecm-distro-tools/cmd/upstream_go_version/bin/upstream_go_version-${OS}-${ARCH} /usr/local/bin/upstream_go_version
135130
COPY --from=builder /usr/local/bin/etcdctl /usr/local/bin
136131
COPY --from=builder /usr/local/bin/trivy /usr/local/bin
137132
COPY --from=builder /usr/local/bin/gh /usr/local/bin

Makefile

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@ endif
1616
.PHONY: all
1717
all: $(BINARIES)
1818

19-
.PHONY: gen_release_report
20-
gen_release_report:
21-
cd cmd/$@ && $(MAKE)
22-
2319
.PHONY: rke2_release
2420
rke2_release:
2521
cd cmd/$@ && $(MAKE)
@@ -32,18 +28,6 @@ release:
3228
backport:
3329
cd cmd/$@ && $(MAKE)
3430

35-
.PHONY: test_coverage
36-
test_coverage:
37-
cd cmd/$@ && $(MAKE)
38-
39-
.PHONY: upstream_go_version
40-
upstream_go_version:
41-
cd cmd/$@ && $(MAKE)
42-
43-
.PHONY: semv
44-
semv:
45-
cd cmd/$@ && $(MAKE)
46-
4731
.PHONY: test
4832
test:
4933
go test -v -cover -race ./...

README.md

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,6 @@ ECM Distro Tools is a collection of utilities that provide for easier administra
66

77
The easiest way to install a single utility is to go to the release page, choose the release you want, and download the utility for your operation system and architecture.
88

9-
### Install Script
10-
11-
To install all executables and shell libraries, run the install script as follows:
12-
13-
**Install the latest version**
14-
```sh
15-
curl -sfL https://raw.githubusercontent.com/rancher/ecm-distro-tools/master/install.sh | sh -
16-
```
17-
**Install a specific version**
18-
```sh
19-
curl -sfL https://raw.githubusercontent.com/rancher/ecm-distro-tools/master/install.sh | ECM_VERSION=v0.31.2 sh -
20-
```
21-
22-
This will download all binaries and shell libraries and install them to `/usr/local/bin/ecm-distro-tools`. You'll need to add that directory to your path after installation.
23-
24-
259
## Release CLI
2610
### Configuration
2711
**New Configuration File**
@@ -37,7 +21,6 @@ release config view -c ./config.json
3721
release generate rancher missing-images-list v2.7.15 -C '{"rancher": { "versions": {"v2.7.15": {"check_images": ["rancher/rancher:v2.7.15"]}}}}' -i "https://prime.ribs.rancher.io/rancher/v2.7.15/rancher-images.txt" --ignore-validate
3822
```
3923

40-
4124
## Building
4225

4326
There's a mix of code in this repository. The shell scripts and shell libraries reside in the `bin` directory and are ready to use. The Go programs are rooted in the `cmd` directory and need to be compiled.

bin/bootstrap_hash

Lines changed: 0 additions & 65 deletions
This file was deleted.

bin/check_for_k8s_release

Lines changed: 0 additions & 46 deletions
This file was deleted.

bin/cut_k3s_release_issue

Lines changed: 0 additions & 88 deletions
This file was deleted.

bin/cut_rke2_release_issue

Lines changed: 0 additions & 111 deletions
This file was deleted.

bin/libstd-ecm.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,6 @@ has_awk() {
7979
__cmd_check "${AWK}"
8080
}
8181

82-
has_drone() {
83-
DRONE="$(command -v drone)"
84-
__cmd_check "${DRONE}"
85-
}
86-
8782
# setup_verify_arch set arch and suffix,
8883
# fatal if architecture not supported.
8984
setup_verify_arch() {

0 commit comments

Comments
 (0)