From 0c5d678f1257e0628787a7c17e571775267c222f Mon Sep 17 00:00:00 2001
From: Shiming Zhang <wzshiming@hotmail.com>
Date: Wed, 8 Jan 2025 14:56:35 +0800
Subject: [PATCH] Clean up
---
.github/workflows/verify-pr.yml | 9 --
README.md | 10 --
exclude.txt | 11 --
hack/image-filter.sh | 201 --------------------------------
4 files changed, 231 deletions(-)
delete mode 100644 exclude.txt
delete mode 100755 hack/image-filter.sh
diff --git a/.github/workflows/verify-pr.yml b/.github/workflows/verify-pr.yml
index f90d7cf..0d60572 100644
--- a/.github/workflows/verify-pr.yml
+++ b/.github/workflows/verify-pr.yml
@@ -4,7 +4,6 @@ on:
pull_request_target:
branches: [main]
paths:
- - 'domain.txt'
- 'mirror.txt'
- 'allows.txt'
@@ -28,14 +27,6 @@ jobs:
git am -3 pr.patch &&
rm -rf pr.patch
- - name: Verify domain.txt
- run: |
- ./hack/verify-fmt.sh domain.txt || {
- echo "Please run './hack/fmt.sh domain.txt'"
- gh pr comment "${{ github.event.pull_request.number }}" --body '请运行 `./hack/fmt.sh domain.txt` 对内容进行排序'
- exit 1
- }
-
- name: Verify mirror.txt image
run: |
./hack/verify-fmt-image.sh mirror.txt || {
diff --git a/README.md b/README.md
index 29f5791..792260a 100644
--- a/README.md
+++ b/README.md
@@ -102,16 +102,6 @@ kubeadm config images pull --image-repository k8s-gcr.m.daocloud.io
kind create cluster --name kind --image m.daocloud.io/docker.io/kindest/node:v1.22.1
```
-* 通过 加速 部署 应用(这里以 Ingress 为例)
-
-``` bash
-wget -O image-filter.sh https://github.com/DaoCloud/public-image-mirror/raw/main/hack/image-filter.sh && chmod +x image-filter.sh
-
-wget -O deploy.yaml https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.1.0/deploy/static/provider/baremetal/deploy.yaml
-
-cat ./deploy.yaml | ./image-filter.sh | kubectl apply -f -
-```
-
* Docker 加速
添加到 `/etc/docker/daemon.json`
diff --git a/exclude.txt b/exclude.txt
deleted file mode 100644
index 5bc3d14..0000000
--- a/exclude.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-.*[0-9a-f]{10,}.*
-.*-g[0-9a-f]{7,}.*
-.*SNAPSHOT.*
-.*dev-.*
-.*sha256-.*
-.*sha-.*
-.*distroless.*
-.*alpha.*
-.*beta.*
-.*unstable.*
-.*nightly.*
diff --git a/hack/image-filter.sh b/hack/image-filter.sh
deleted file mode 100755
index 9756824..0000000
--- a/hack/image-filter.sh
+++ /dev/null
@@ -1,201 +0,0 @@
-#!/usr/bin/env bash
-
-SITE="https://github.com/DaoCloud/public-image-mirror"
-URL_PREFIX="https://raw.githubusercontent.com/DaoCloud/public-image-mirror/main"
-DOMAIN_SUFFIX="m.daocloud.io"
-TMPDIR="${TMPDIR:-/tmp}/public-image-mirror"
-
-# show the usage if arguments are provided
-function usage() {
- echo "Usage: $0"
- echo " cat <resource-file.yaml> | $0 | kubectl apply -f -"
- echo " kubectl kustomize <kustomize-dir> | $0 | kubectl apply -f -"
- echo
- echo "For more information, please visit ${SITE}"
-}
-
-if [[ $# -ne 0 ]]; then
- usage >&2
- exit 1
-fi
-
-# output the log to stderr
-function log() {
- local message="${*}"
- echo "# $0: ${message}" >&2
-}
-
-# check the command exists
-function command_exists() {
- local cmd="$1"
- type "${cmd}" >/dev/null 2>&1
-}
-
-mkdir -p "${TMPDIR}"
-
-# fetch the file or download the file if it does not exist
-function fetch() {
- local file="${1}"
-
- # check local directory first
- if [[ -f "${file}" ]]; then
- cat "${file}"
- return 0
- fi
-
- # check the cache directory
- if [[ -s "${TMPDIR}/${file}" ]]; then
- cat "${TMPDIR}/${file}"
- return 0
- fi
-
- # download the file
- local url="${2}"
- log "Fetching ${file} from ${url} cache to ${TMPDIR}"
- if command_exists wget; then
- log wget "${url}" -c -O "${TMPDIR}/${file}"
- wget "${url}" -c -O "${TMPDIR}/${file}" >&2
- cat "${TMPDIR}/${file}"
- elif command_exists curl; then
- log curl "${url}" -L -o "${TMPDIR}/${file}"
- curl "${url}" -L -o "${TMPDIR}/${file}" >&2
- cat "${TMPDIR}/${file}"
- else
- log "Please install wget or curl to download the file and retry"
- log "Or you can manually download the file ${url} and put it to ${TMPDIR}/${file}"
- exit 1
- fi
-}
-
-# take the first column
-function first_column() {
- cat | grep -v '^#' | awk '{print $1}'
-}
-
-DOMAIN_LIST="$(fetch "domain.txt" "${URL_PREFIX}/domain.txt" | first_column)"
-MIRROR_LIST="$(fetch "mirror.txt" "${URL_PREFIX}/mirror.txt" | first_column)"
-EXCLUDE_LIST="$(fetch "exclude.txt" "${URL_PREFIX}/exclude.txt" | first_column)"
-
-# check the tag are excluded
-function is_exclude() {
- local tag="${1}"
- for exclude in ${EXCLUDE_LIST}; do
- if [[ "${tag}" =~ ${exclude} ]]; then
- return 0
- fi
- done
- return 1
-}
-
-# check the image is mirrored
-function is_mirror() {
- local name="${1}"
- for mirror in ${MIRROR_LIST}; do
- if [[ "${name}" == "${mirror}" ]]; then
- return 0
- fi
- done
- return 1
-}
-
-# replace the prefix of the image
-function replace_image() {
- local name="${1}"
- for domain in ${DOMAIN_LIST}; do
- old_prefix="${domain%%=*}"
- new_prefix="${domain#*=}"
- if [[ "${name}" =~ ^"${old_prefix}" ]]; then
- echo "${name}" | sed "s#${old_prefix}#${new_prefix}#"
- return
- fi
- done
- echo "${name}"
-}
-
-# completion the docker.io prefix
-function completion_for_docker_io() {
- local name="${1}"
- if [[ "${name}" =~ "." ]]; then
- echo "${name}"
- else
- echo "docker.io/${name}"
- fi
-}
-
-# replace image prefix on the line
-function replace_line() {
- local line="${1}"
-
- # get the image full name
- local raw_image="$(echo "${line#*: }" | awk '{print $1}' | sed 's/"//g' | sed "s/'//g")"
- local image="${raw_image}"
- local image_name=""
- local image_tag=""
-
- # remove the sha256 suffix
- if [[ "${image}" =~ "@" ]]; then
- image="${image%%@*}"
- fi
-
- # split the image name and tag
- if [[ "${image}" =~ ":" ]]; then
- image_tag="${image#*:}"
- image_name="${image%%:*}"
- else
- image_name="${image}"
- fi
-
- # check the image is replaced
- if [[ "${image_name}" =~ "${DOMAIN_SUFFIX}" ]]; then
- return 1
- fi
-
- # completion the docker.io prefix
- image_name="$(completion_for_docker_io "${image_name}")"
-
- # check the image is mirrored
- if ! is_mirror "${image_name}"; then
- log "Image '${image}' is not synchronized yet, if you want please send a PR to add it on ${SITE}"
- return 1
- fi
-
- # check the tag is empty
- if [[ "${image_tag}" == "" ]]; then
- log "Image '${image}' must have a tag"
- return 1
- fi
-
- # check the tag is excluded
- if is_exclude "${image_tag}"; then
- log "Image '${image}' tag excludes out of synchronize"
- return 1
- fi
-
- # replace the prefix of the image
- local new_image="$(replace_image "${image_name}"):${image_tag}"
- local new_line=$(echo "${line}" | sed "s|${raw_image}|${new_image}|")
-
- log "Replace '${raw_image}' with '${new_image}'"
-
- echo "${new_line}"
-}
-
-function main() {
- local new_line
- cat | while read line; do
- if [[ "${line}" =~ "image: " || "${line}" =~ "image': " || "${line}" =~ 'image": ' ]]; then
- new_line="$(replace_line "${line}")"
- if [[ $? -eq 0 ]]; then
- echo "${new_line}"
- else
- echo "${line}"
- fi
- else
- echo "${line}"
- fi
- done
-}
-
-IFS=$'\n'
-
-main