Skip to content

Commit b355080

Browse files
committed
[k8s] Test k8s on arm [lwpm dist] [sync git]
Signed-off-by: Kang Huaishuai <khs1994@khs1994.com>
1 parent c9da282 commit b355080

File tree

13 files changed

+7166
-1740
lines changed

13 files changed

+7166
-1740
lines changed

.github/actions/setup-docker/lib/setup-docker.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -382,11 +382,7 @@ system_profiler SPHardwareDataType || true
382382

383383
// /etc/docker/daemon.json
384384
core.debug('set /etc/docker/daemon.json');
385-
core.startGroup('show default daemon json content');
386-
await exec.exec('sudo', [
387-
'cat',
388-
'/etc/docker/daemon.json',
389-
]);
385+
core.startGroup('show default daemon json content_');
390386
core.endGroup();
391387

392388
await shell(`echo '${DOCKER_DAEMON_JSON}' | sudo tee /etc/docker/daemon.json`);

dockerfile/sync/.cnb.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: sync docker image
2+
main:
3+
push:
4+
- stages:
5+
- name: sync docker image
6+
script: |
7+
cd /root/lnmp/windows/
8+
./docker-image-sync.ps1
9+
docker:
10+
image: ghcr.io/khs1994/docker-image-sync
11+
env:
12+
DEST_DOCKER_USERNAME: ${DOCKER_USERNAME}
13+
DEST_DOCKER_PASSWORD: ${DOCKER_PASSWORD}
14+
DEST_DOCKER_REGISTRY: ccr.ccs.tencentyun.com
15+
DEST_NAMESPACE: dpsigs
16+
CI: true
17+
LNMP_CN_ENV: false
18+
SOURCE_DOCKER_USERNAME:
19+
SOURCE_DOCKER_PASSWORD:
20+
SOURCE_DOCKER_REGISTRY:
21+
CONFIG_URL: https://gitee.com/khs1994-docker/lnmp/raw/23.11/dockerfile/sync/docker-image-sync.json

dockerfile/sync/docker-image-sync.json

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
"dest": "library-mirror/node:18.17.1-alpine"
1717
},
1818
{
19-
"source": "golang:1.23.3-alpine",
20-
"dest": "library-mirror/golang:1.23.3-alpine"
19+
"source": "golang:1.24.4-alpine",
20+
"dest": "library-mirror/golang:1.24.4-alpine"
2121
},
2222
{
2323
"source": "golang:alpine",
@@ -40,20 +40,12 @@
4040
"dest": "library-mirror/docker:test-dind-rootless"
4141
},
4242
{
43-
"source": "library/alpine:3.20",
44-
"dest": "library-mirror/alpine:3.20"
45-
},
46-
{
47-
"source": "library/alpine:3.17",
48-
"dest": "library-mirror/alpine:3.17"
49-
},
50-
{
51-
"source": "library/alpine:3.18",
52-
"dest": "library-mirror/alpine:3.18"
43+
"source": "library/alpine:3.21",
44+
"dest": "library-mirror/alpine:3.19"
5345
},
5446
{
55-
"source": "library/alpine:3.19",
56-
"dest": "library-mirror/alpine:3.19"
47+
"source": "library/alpine:3.22",
48+
"dest": "library-mirror/alpine:3.20"
5749
},
5850
{
5951
"source": "library/alpine:edge",
@@ -108,8 +100,8 @@
108100
"dest": "library-mirror/registry:latest"
109101
},
110102
{
111-
"source": "library/registry:2.8.2",
112-
"dest": "library-mirror/registry:2.8.2"
103+
"source": "library/registry:3.0.0",
104+
"dest": "library-mirror/registry:3.0.0"
113105
},
114106
{
115107
"source": "library/mongo:latest",

kubernetes/addons/cni/calico-custom/kustomization.yaml

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,25 @@ patches:
1818
name: calico-node
1919
namespace: kube-system
2020
path: custom.patch.json
21+
# images:
22+
# - name: docker.io/calico/cni
23+
# newName: swr.cn-north-4.myhuaweicloud.com/ddn-k8s/docker.io/calico/cni
24+
# - name: docker.io/calico/node
25+
# newName: swr.cn-north-4.myhuaweicloud.com/ddn-k8s/docker.io/calico/node
26+
# - name: docker.io/calico/kube-controllers
27+
# newName: swr.cn-north-4.myhuaweicloud.com/ddn-k8s/docker.io/calico/kube-controllers
28+
# - name: calico/csi
29+
# newName: swr.cn-north-4.myhuaweicloud.com/ddn-k8s/docker.io/calico/csi
30+
# - name: calico/node-driver-registrar
31+
# newName: swr.cn-north-4.myhuaweicloud.com/ddn-k8s/docker.io/calico/node-driver-registrar
2132
images:
2233
- name: docker.io/calico/cni
23-
newName: swr.cn-north-4.myhuaweicloud.com/ddn-k8s/docker.io/calico/cni
34+
newName: ccr.ccs.tencentyun.com/library-mirror/calico-cni
2435
- name: docker.io/calico/node
25-
newName: swr.cn-north-4.myhuaweicloud.com/ddn-k8s/docker.io/calico/node
36+
newName: ccr.ccs.tencentyun.com/library-mirror/calico-node
2637
- name: docker.io/calico/kube-controllers
27-
newName: swr.cn-north-4.myhuaweicloud.com/ddn-k8s/docker.io/calico/kube-controllers
38+
newName: ccr.ccs.tencentyun.com/library-mirror/calico-kube-controllers
2839
- name: calico/csi
29-
newName: swr.cn-north-4.myhuaweicloud.com/ddn-k8s/docker.io/calico/csi
40+
newName: ccr.ccs.tencentyun.com/library-mirror/calico-csi
3041
- name: calico/node-driver-registrar
31-
newName: swr.cn-north-4.myhuaweicloud.com/ddn-k8s/docker.io/calico/node-driver-registrar
42+
newName: ccr.ccs.tencentyun.com/library-mirror/calico-node-driver-registrar

0 commit comments

Comments
 (0)