Skip to content

Commit

Permalink
Update domain of k8s (DaoCloud#170)
Browse files Browse the repository at this point in the history
* Update domain of k8s

* Update mirror

* Remove registry.k8s.io/kube-registry-proxy-amd64
  • Loading branch information
wzshiming authored Aug 3, 2022
1 parent d0bd4fd commit 54956dc
Show file tree
Hide file tree
Showing 3 changed files with 70 additions and 45 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/verify-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ jobs:
- name: Verify docker prefix
run: |
./hack/verify-docker-prefix.sh mirror.txt
- name: Verify k8s prefix
run: |
./hack/verify-k8s-prefix.sh mirror.txt
- name: Verify Image Exists
run: |
./hack/verify-image.sh mirror.txt https://github.com/${{ github.repository }}/pull/${{ github.event.pull_request.number }}.patch
23 changes: 23 additions & 0 deletions hack/verify-k8s-prefix.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#!/usr/bin/env bash

file=$1

cp ${file} ${file}.bak

cat ${file} | grep k8s.gcr.io/ | sed 's#k8s.gcr.io/#registry.k8s.io/#' >>${file}.bak

$(dirname "${BASH_SOURCE}")/fmt.sh ${file}.bak

result=$(diff ${file} ${file}.bak)

if [[ "${result}" != "" ]]; then
echo "Usually registry.k8s.io/* instead of k8s.gcr.io/*"
echo "Please run following command to fix the issue:"
echo "cat ${file} | sed 's#k8s.gcr.io/#registry.k8s.io/#' >${file}.bak"
echo "mv ${file}.bak ${file}"
echo "./hack/fmt.sh ${file}"

exit 1
fi

rm ${file}.bak
89 changes: 44 additions & 45 deletions mirror.txt
Original file line number Diff line number Diff line change
Expand Up @@ -358,51 +358,6 @@ ghcr.io/spidernet-io/spiderpool/spiderpool-controller-beta
ghcr.io/spidernet-io/spiderpool/spiderpool-controller-ci
ghcr.io/sumologic/tailing-sidecar
ghcr.io/sumologic/tailing-sidecar-operator
k8s.gcr.io/addon-resizer
k8s.gcr.io/build-image/debian-iptables
k8s.gcr.io/build-image/go-runner
k8s.gcr.io/build-image/kube-cross
k8s.gcr.io/conformance
k8s.gcr.io/coredns
k8s.gcr.io/coredns/coredns
k8s.gcr.io/cpa/cluster-proportional-autoscaler
k8s.gcr.io/cpa/cluster-proportional-autoscaler-amd64
k8s.gcr.io/debian-base
k8s.gcr.io/dns/k8s-dns-node-cache
k8s.gcr.io/etcd
k8s.gcr.io/ingress-nginx/controller
k8s.gcr.io/ingress-nginx/e2e-test-runner
k8s.gcr.io/ingress-nginx/kube-webhook-certgen
k8s.gcr.io/kube-apiserver
k8s.gcr.io/kube-apiserver-amd64
k8s.gcr.io/kube-controller-manager
k8s.gcr.io/kube-controller-manager-amd64
k8s.gcr.io/kube-proxy
k8s.gcr.io/kube-proxy-amd64
k8s.gcr.io/kube-registry-proxy
k8s.gcr.io/kube-registry-proxy-amd64
k8s.gcr.io/kube-scheduler
k8s.gcr.io/kube-scheduler-amd64
k8s.gcr.io/kube-state-metrics/kube-state-metrics
k8s.gcr.io/kueue/kueue
k8s.gcr.io/metrics-server
k8s.gcr.io/metrics-server-amd64
k8s.gcr.io/metrics-server/metrics-server
k8s.gcr.io/metrics-server/metrics-server-amd64
k8s.gcr.io/nfd/node-feature-discovery
k8s.gcr.io/node-problem-detector/node-problem-detector
k8s.gcr.io/node-test
k8s.gcr.io/node-test-amd64
k8s.gcr.io/pause
k8s.gcr.io/prometheus-adapter/prometheus-adapter
k8s.gcr.io/sig-storage/csi-attacher
k8s.gcr.io/sig-storage/csi-node-driver-registrar
k8s.gcr.io/sig-storage/csi-provisioner
k8s.gcr.io/sig-storage/csi-resizer
k8s.gcr.io/sig-storage/csi-snapshotter
k8s.gcr.io/sig-storage/livenessprobe
k8s.gcr.io/sig-storage/local-volume-provisioner
k8s.gcr.io/sig-storage/snapshot-controller
mcr.microsoft.com/vscode/devcontainers/java
nvcr.io/nvidia/gpu-operator
nvcr.io/nvidia/k8s-device-plugin
Expand Down Expand Up @@ -485,4 +440,48 @@ quay.io/submariner/submariner-operator
quay.io/submariner/submariner-operator-index
quay.io/submariner/submariner-route-agent
quay.io/tigera/operator
registry.k8s.io/addon-resizer
registry.k8s.io/build-image/debian-iptables
registry.k8s.io/build-image/go-runner
registry.k8s.io/build-image/kube-cross
registry.k8s.io/conformance
registry.k8s.io/coredns
registry.k8s.io/coredns/coredns
registry.k8s.io/cpa/cluster-proportional-autoscaler
registry.k8s.io/cpa/cluster-proportional-autoscaler-amd64
registry.k8s.io/debian-base
registry.k8s.io/dns/k8s-dns-node-cache
registry.k8s.io/etcd
registry.k8s.io/ingress-nginx/controller
registry.k8s.io/ingress-nginx/e2e-test-runner
registry.k8s.io/ingress-nginx/kube-webhook-certgen
registry.k8s.io/kube-apiserver
registry.k8s.io/kube-apiserver-amd64
registry.k8s.io/kube-controller-manager
registry.k8s.io/kube-controller-manager-amd64
registry.k8s.io/kube-proxy
registry.k8s.io/kube-proxy-amd64
registry.k8s.io/kube-registry-proxy
registry.k8s.io/kube-scheduler
registry.k8s.io/kube-scheduler-amd64
registry.k8s.io/kube-state-metrics/kube-state-metrics
registry.k8s.io/kueue/kueue
registry.k8s.io/metrics-server
registry.k8s.io/metrics-server-amd64
registry.k8s.io/metrics-server/metrics-server
registry.k8s.io/metrics-server/metrics-server-amd64
registry.k8s.io/nfd/node-feature-discovery
registry.k8s.io/node-problem-detector/node-problem-detector
registry.k8s.io/node-test
registry.k8s.io/node-test-amd64
registry.k8s.io/pause
registry.k8s.io/prometheus-adapter/prometheus-adapter
registry.k8s.io/sig-storage/csi-attacher
registry.k8s.io/sig-storage/csi-node-driver-registrar
registry.k8s.io/sig-storage/csi-provisioner
registry.k8s.io/sig-storage/csi-resizer
registry.k8s.io/sig-storage/csi-snapshotter
registry.k8s.io/sig-storage/livenessprobe
registry.k8s.io/sig-storage/local-volume-provisioner
registry.k8s.io/sig-storage/snapshot-controller
rocks.canonical.com/mariadb/server

0 comments on commit 54956dc

Please sign in to comment.