Skip to content

Commit cbf6029

Browse files
khs1994khs1994
committed
[k8s] [lwpm] update gh actions
Signed-off-by: Kang Huaishuai <khs1994@khs1994.com>
1 parent c41a6fc commit cbf6029

File tree

19 files changed

+125
-176
lines changed

19 files changed

+125
-176
lines changed

‎.github/workflows/lwpm-dist-k8s-file.yaml‎

Lines changed: 23 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -23,102 +23,58 @@ jobs:
2323
LWPM_DOCKER_PASSWORD: ${{secrets.DOCKER_PASSWORD}}
2424
LWPM_DOCKER_REGISTRY: registry-1.docker.io
2525
LNMP_CN_ENV: "false"
26+
GHCR_DOCKER_USERNAME: khs1994
27+
GHCR_DOCKER_PASSWORD: ${{secrets.GHCR_IO_TOKEN}}
28+
GHCR_DOCKER_REGISTRY: ghcr.io
2629
strategy:
2730
matrix:
28-
os: ["windows","ubuntu"]
31+
include:
32+
- os: "windows"
33+
pkg: "kubectl"
34+
- os: "windows"
35+
pkg: "kubernetes-node"
36+
- os: "ubuntu"
37+
pkg: "kubernetes-server"
2938
fail-fast: false
3039
steps:
3140
- uses: actions/checkout@v3
3241
with:
3342
repository: khs1994-docker/lnmp
3443
fetch-depth: 1
3544
path: lnmp
36-
- name: handle-kubectl
45+
- name: handle-${{ matrix.pkg }}
3746
shell: pwsh
38-
if: matrix.os == 'windows'
3947
env:
4048
TENCENT_DOCKER_USERNAME: "906210846"
4149
TENCENT_DOCKER_REGISTRY: useccr.ccs.tencentyun.com
50+
PKG: ${{ matrix.pkg }}
4251
run: |
4352
echo $ErrorActionPreference
4453
$ErrorActionPreference = "Continue"
4554
. ./lnmp/windows/sdk/dockerhub/rootfs.ps1
4655
47-
./lnmp/windows/lnmp-windows-pm.ps1 dist kubectl@${env:LWPM_K8S_VERSION}
48-
./lnmp/windows/lnmp-windows-pm.ps1 push kubectl@${env:LWPM_K8S_VERSION}
56+
./lnmp/windows/lnmp-windows-pm.ps1 dist $PKG@${env:LWPM_K8S_VERSION}
57+
./lnmp/windows/lnmp-windows-pm.ps1 push $PKG@${env:LWPM_K8S_VERSION}
4958
5059
$env:DOCKER_USERNAME="khs1994"
51-
rootfs lwpm/kubectl ${env:LWPM_K8S_VERSION} -phase "manifest list"
60+
rootfs lwpm/$PKG ${env:LWPM_K8S_VERSION} -phase "manifest list"
5261
5362
$env:LWPM_DOCKER_USERNAME=$env:TENCENT_DOCKER_USERNAME
5463
$env:LWPM_DOCKER_REGISTRY=$env:TENCENT_DOCKER_REGISTRY
5564
$NS="khs1994"
56-
./lnmp/windows/lnmp-windows-pm.ps1 push $NS/kubectl@${env:LWPM_K8S_VERSION}
65+
./lnmp/windows/lnmp-windows-pm.ps1 push $NS/$PKG@${env:LWPM_K8S_VERSION}
5766
5867
$env:DOCKER_USERNAME=$env:TENCENT_DOCKER_USERNAME
59-
rootfs $NS/kubectl ${env:LWPM_K8S_VERSION} -registry $env:LWPM_DOCKER_REGISTRY -phase "manifest list"
68+
rootfs $NS/$PKG ${env:LWPM_K8S_VERSION} -registry $env:LWPM_DOCKER_REGISTRY -phase "manifest list"
6069
6170
$env:LWPM_DOCKER_USERNAME=$env:CODING_DOCKER_USERNAME
6271
$env:LWPM_DOCKER_PASSWORD=$env:CODING_DOCKER_PASSWORD
6372
$env:LWPM_DOCKER_REGISTRY=$env:CODING_DOCKER_REGISTRY
6473
$NS="khs1994-docker/lwpm"
65-
./lnmp/windows/lnmp-windows-pm.ps1 push $NS/kubectl@${env:LWPM_K8S_VERSION}
66-
- name: handle-kubernetes-server
67-
shell: pwsh
68-
env:
69-
TENCENT_DOCKER_USERNAME: "906210846"
70-
TENCENT_DOCKER_REGISTRY: useccr.ccs.tencentyun.com
71-
if: matrix.os == 'windows'
72-
run: |
73-
echo $ErrorActionPreference
74-
$ErrorActionPreference = "Continue"
75-
. ./lnmp/windows/sdk/dockerhub/rootfs.ps1
76-
77-
./lnmp/windows/lnmp-windows-pm.ps1 dist kubernetes-server@${env:LWPM_K8S_VERSION}
78-
./lnmp/windows/lnmp-windows-pm.ps1 push kubernetes-server@${env:LWPM_K8S_VERSION}
79-
80-
$env:DOCKER_USERNAME="khs1994"
81-
rootfs lwpm/kubernetes-server ${env:LWPM_K8S_VERSION} -phase "manifest list"
82-
83-
$env:LWPM_DOCKER_USERNAME=$env:TENCENT_DOCKER_USERNAME
84-
$env:LWPM_DOCKER_REGISTRY=$env:TENCENT_DOCKER_REGISTRY
85-
$NS="khs1994"
86-
./lnmp/windows/lnmp-windows-pm.ps1 push $NS/kubernetes-server@${env:LWPM_K8S_VERSION}
87-
88-
$env:DOCKER_USERNAME=$env:TENCENT_DOCKER_USERNAME
89-
rootfs $NS/kubernetes-server ${env:LWPM_K8S_VERSION} -registry $env:LWPM_DOCKER_REGISTRY -phase "manifest list"
90-
91-
$env:LWPM_DOCKER_USERNAME=$env:CODING_DOCKER_USERNAME
92-
$env:LWPM_DOCKER_PASSWORD=$env:CODING_DOCKER_PASSWORD
93-
$env:LWPM_DOCKER_REGISTRY=$env:CODING_DOCKER_REGISTRY
94-
$NS="khs1994-docker/lwpm"
95-
./lnmp/windows/lnmp-windows-pm.ps1 push $NS/kubernetes-server@${env:LWPM_K8S_VERSION}
96-
- name: handle-kubernetes-node
97-
shell: pwsh
98-
if: matrix.os == 'ubuntu'
99-
env:
100-
TENCENT_DOCKER_USERNAME: "906210846"
101-
TENCENT_DOCKER_REGISTRY: useccr.ccs.tencentyun.com
102-
run: |
103-
echo $ErrorActionPreference
104-
. ./lnmp/windows/sdk/dockerhub/rootfs.ps1
105-
106-
./lnmp/windows/lnmp-windows-pm.ps1 dist kubernetes-node@${env:LWPM_K8S_VERSION}
107-
./lnmp/windows/lnmp-windows-pm.ps1 push kubernetes-node@${env:LWPM_K8S_VERSION}
108-
109-
$env:DOCKER_USERNAME="khs1994"
110-
rootfs lwpm/kubernetes-node ${env:LWPM_K8S_VERSION} -phase "manifest list"
74+
./lnmp/windows/lnmp-windows-pm.ps1 push $NS/$PKG@${env:LWPM_K8S_VERSION}
11175
112-
$env:LWPM_DOCKER_USERNAME=$env:TENCENT_DOCKER_USERNAME
113-
$env:LWPM_DOCKER_REGISTRY=$env:TENCENT_DOCKER_REGISTRY
114-
$NS="khs1994"
115-
./lnmp/windows/lnmp-windows-pm.ps1 push $NS/kubernetes-node@${env:LWPM_K8S_VERSION}
116-
117-
$env:DOCKER_USERNAME=$env:TENCENT_DOCKER_USERNAME
118-
rootfs $NS/kubernetes-node ${env:LWPM_K8S_VERSION} -registry $env:LWPM_DOCKER_REGISTRY -phase "manifest list"
119-
120-
$env:LWPM_DOCKER_USERNAME=$env:CODING_DOCKER_USERNAME
121-
$env:LWPM_DOCKER_PASSWORD=$env:CODING_DOCKER_PASSWORD
122-
$env:LWPM_DOCKER_REGISTRY=$env:CODING_DOCKER_REGISTRY
123-
$NS="khs1994-docker/lwpm"
124-
./lnmp/windows/lnmp-windows-pm.ps1 push $NS/kubernetes-node@${env:LWPM_K8S_VERSION}
76+
$env:LWPM_DOCKER_USERNAME=$env:GHCR_DOCKER_USERNAME
77+
$env:LWPM_DOCKER_PASSWORD=$env:GHCR_DOCKER_PASSWORD
78+
$env:LWPM_DOCKER_REGISTRY=$env:GHCR_DOCKER_REGISTRY
79+
$NS="khs1994/lwpm"
80+
./lnmp/windows/lnmp-windows-pm.ps1 push $NS/$PKG@${env:LWPM_K8S_VERSION}

‎.pcit.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ steps:
1212

1313
# https://hub.docker.com/_/microsoft-powershell?tab=description
1414
powershell:
15-
# image: mcr.microsoft.com/powershell:preview-alpine-3.12
16-
image: ccr.ccs.tencentyun.com/khs1994/powershell:preview-alpine-3.12
15+
# image: mcr.microsoft.com/powershell:preview-7.6-alpine-3.20
16+
image: ccr.ccs.tencentyun.com/khs1994/powershell:preview-7.6-alpine-3.20
1717
run:
1818
- pwsh ./lnmp-docker.ps1
1919

‎dockerfile/sync/docker-image-sync-by-docker.json‎

Lines changed: 0 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -63,22 +63,6 @@
6363
"source": "gcr.io/tekton-releases/github.com/tektoncd/triggers/cmd/eventlistenersink:v0.9.0@sha256:3d9cd3788c03ea6f9c85980d3b70ded295766f222e5d30fc1790249e88a10880",
6464
"dest": "tektoncd-triggers-eventlistenersink:v0.9.0@sha256:3d9cd3788c03ea6f9c85980d3b70ded295766f222e5d30fc1790249e88a10880"
6565
},
66-
{
67-
"source": "mcr.microsoft.com/powershell:preview-7.4-alpine-3.17",
68-
"dest": "powershell:preview-7.4-alpine-3.17",
69-
"registry": "mcr.microsoft.com",
70-
"image": "powershell",
71-
"ref": "preview-7.4-alpine-3.17",
72-
"$comment": "https://hub.docker.com/_/microsoft-powershell"
73-
},
74-
{
75-
"source": "mcr.microsoft.com/powershell:preview-alpine-3.17",
76-
"dest": "powershell:preview-alpine-3.17",
77-
"registry": "mcr.microsoft.com",
78-
"image": "powershell",
79-
"ref": "preview-alpine-3.17",
80-
"$comment": "https://hub.docker.com/_/microsoft-powershell"
81-
},
8266
{
8367
"source": "registry.k8s.io/ingress-nginx/controller:v1.7.0@sha256:7612338342a1e7b8090bef78f2a04fffcadd548ccaabe8a47bf7758ff549a5f7",
8468
"dest": "nginx-ingress-controller:v1.7.0@sha256:7612338342a1e7b8090bef78f2a04fffcadd548ccaabe8a47bf7758ff549a5f7"
@@ -91,10 +75,6 @@
9175
"source": "gcr.io/google_containers/git-sync:v3.1.6",
9276
"dest": "gcr-mirror/git-sync:v3.1.6"
9377
},
94-
{
95-
"source": "quay.io/coreos/etcd:v3.6.1",
96-
"dest": "quay-mirror/etcd:v3.6.1"
97-
},
9878
{
9979
"source": "quay.io/coreos/flannel:v0.12.0-amd64",
10080
"dest": "quay-mirror/flannel:v0.12.0",
@@ -120,55 +100,5 @@
120100
"ref": "v0.12.0-arm"
121101
}
122102
]
123-
},
124-
{
125-
"source": "registry.k8s.io/kube-proxy:v1.27.0",
126-
"dest": "gcr-mirror/kube-proxy:v1.27.0",
127-
"registry": "registry.k8s.io",
128-
"image": "kube-proxy",
129-
"ref": "v1.27.0"
130-
},
131-
{
132-
"source": "registry.k8s.io/kube-controller-manager:v1.27.0",
133-
"dest": "gcr-mirror/kube-controller-manager:v1.27.0",
134-
"registry": "registry.k8s.io",
135-
"image": "kube-controller-manager",
136-
"ref": "v1.27.0"
137-
},
138-
{
139-
"source": "registry.k8s.io/kube-apiserver:v1.27.0",
140-
"dest": "gcr-mirror/kube-apiserver:v1.27.0",
141-
"registry": "registry.k8s.io",
142-
"image": "kube-apiserver",
143-
"ref": "v1.27.0"
144-
},
145-
{
146-
"source": "registry.k8s.io/kube-scheduler:v1.27.0",
147-
"dest": "gcr-mirror/kube-scheduler:v1.27.0",
148-
"registry": "registry.k8s.io",
149-
"image": "kube-scheduler",
150-
"ref": "v1.27.0"
151-
},
152-
{
153-
"source": "registry.k8s.io/etcd:3.4.16-0",
154-
"dest": "gcr-mirror/etcd:3.4.16-0",
155-
"registry": "registry.k8s.io",
156-
"image": "etcd",
157-
"ref": "3.4.16-0"
158-
},
159-
{
160-
"source": "registry.k8s.io/pause:3.8",
161-
"dest": "gcr-mirror/pause:3.8",
162-
"registry": "registry.k8s.io",
163-
"image": "pause",
164-
"ref": "3.8"
165-
},
166-
{
167-
"source": "registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.3.0",
168-
"dest": "gcr-mirror/kube-state-metrics:v2.3.0"
169-
},
170-
{
171-
"source": "registry.k8s.io/prometheus-adapter/prometheus-adapter:v0.9.1",
172-
"dest": "gcr-mirror/prometheus-adapter:v0.9.1"
173103
}
174104
]

‎dockerfile/sync/docker-image-sync-ghcr-mcr.microsoft.com.json‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,20 @@
11
[
22
{
3-
"source": "powershell:preview-7.4-alpine-3.17",
4-
"dest": "powershell:preview-7.4-alpine-3.17",
3+
"source": "powershell:preview-alpine-3.20",
4+
"dest": "powershell:preview-alpine-3.20",
55
"registry": "mcr.microsoft.com",
66
"image": "powershell",
7-
"ref": "preview-7.4-alpine-3.17",
7+
"ref": "preview-alpine-3.20",
88
"$comment": "https://hub.docker.com/_/microsoft-powershell",
99
"append": true
10+
},
11+
{
12+
"source": "powershell:preview-7.6-alpine-3.20",
13+
"dest": "powershell:preview-7.6-alpine-3.20",
14+
"registry": "mcr.microsoft.com",
15+
"image": "powershell",
16+
"ref": "preview-7.6-alpine-3.20",
17+
"$comment": "https://mcr.microsoft.com/en-us/artifact/mar/powershell/tags",
18+
"append": true
1019
}
1120
]

‎dockerfile/sync/docker-image-sync-ghcr-quay.io.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,9 @@
22
{
33
"source": "fluentd_elasticsearch/elasticsearch:v7.16.2",
44
"append": true
5+
},
6+
{
7+
"source": "coreos/etcd:v3.6.1",
8+
"append": true
59
}
610
]

‎dockerfile/sync/docker-image-sync-ghcr-registry.k8s.io.json‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,55 @@
66
{
77
"source": "metrics-server/metrics-server:v0.8.0",
88
"append": true
9+
},
10+
{
11+
"source": "kube-proxy:v1.34.0",
12+
"registry": "registry.k8s.io",
13+
"image": "kube-proxy",
14+
"ref": "v1.34.0",
15+
"append": true
16+
},
17+
{
18+
"source": "kube-controller-manager:v1.34.0",
19+
"registry": "registry.k8s.io",
20+
"image": "kube-controller-manager",
21+
"ref": "v1.34.0",
22+
"append": true
23+
},
24+
{
25+
"source": "kube-apiserver:v1.34.0",
26+
"registry": "registry.k8s.io",
27+
"image": "kube-apiserver",
28+
"ref": "v1.34.0",
29+
"append": true
30+
},
31+
{
32+
"source": "kube-scheduler:v1.34.0",
33+
"registry": "registry.k8s.io",
34+
"image": "kube-scheduler",
35+
"ref": "v1.34.0",
36+
"append": true
37+
},
38+
{
39+
"source": "etcd:3.4.16-0",
40+
"registry": "registry.k8s.io",
41+
"image": "etcd",
42+
"ref": "3.4.16-0",
43+
"append": true
44+
},
45+
{
46+
"source": "pause:3.8",
47+
"registry": "registry.k8s.io",
48+
"image": "pause",
49+
"ref": "3.8",
50+
"append": true
51+
},
52+
{
53+
"source": "kube-state-metrics/kube-state-metrics:v2.3.0",
54+
"append": true
55+
},
56+
{
57+
"source": "prometheus-adapter/prometheus-adapter:v0.9.1",
58+
"append": true
959
}
1060
]

‎kubernetes/addons/cni/calico-coreos/cn/kustomization.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ resources:
1313
# newName: swr.cn-north-4.myhuaweicloud.com/ddn-k8s/docker.io/calico/node-driver-registrar
1414
images:
1515
- name: ghcr.io/khs1994-docker/docker.io/calico/cni
16-
newName: docker.cnb.cool/khs1994-docker/khs1994/calico-cni
16+
newName: docker.cnb.cool/khs1994-docker/docker.io/calico-cni
1717
- name: ghcr.io/khs1994-docker/docker.io/calico/node
18-
newName: docker.cnb.cool/khs1994-docker/khs1994/calico-node
18+
newName: docker.cnb.cool/khs1994-docker/docker.io/calico-node
1919
- name: ghcr.io/khs1994-docker/docker.io/calico/kube-controllers
20-
newName: docker.cnb.cool/khs1994-docker/khs1994/calico-kube-controllers
20+
newName: docker.cnb.cool/khs1994-docker/docker.io/calico-kube-controllers
2121
- name: ghcr.io/khs1994-docker/docker.io/calico/csi
22-
newName: docker.cnb.cool/khs1994-docker/khs1994/calico-csi
22+
newName: docker.cnb.cool/khs1994-docker/docker.io/calico-csi
2323
- name: ghcr.io/khs1994-docker/docker.io/calico/node-driver-registrar
24-
newName: docker.cnb.cool/khs1994-docker/khs1994/calico-node-driver-registrar
24+
newName: docker.cnb.cool/khs1994-docker/docker.io/calico-node-driver-registrar

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ resources:
1313
# newName: swr.cn-north-4.myhuaweicloud.com/ddn-k8s/docker.io/calico/node-driver-registrar
1414
images:
1515
- name: ghcr.io/khs1994-docker/docker.io/calico/cni
16-
newName: docker.cnb.cool/khs1994-docker/khs1994/calico-cni
16+
newName: docker.cnb.cool/khs1994-docker/docker.io/calico-cni
1717
- name: ghcr.io/khs1994-docker/docker.io/calico/node
18-
newName: docker.cnb.cool/khs1994-docker/khs1994/calico-node
18+
newName: docker.cnb.cool/khs1994-docker/docker.io/calico-node
1919
- name: ghcr.io/khs1994-docker/docker.io/calico/kube-controllers
20-
newName: docker.cnb.cool/khs1994-docker/khs1994/calico-kube-controllers
20+
newName: docker.cnb.cool/khs1994-docker/docker.io/calico-kube-controllers
2121
- name: ghcr.io/khs1994-docker/docker.io/calico/csi
22-
newName: docker.cnb.cool/khs1994-docker/khs1994/calico-csi
22+
newName: docker.cnb.cool/khs1994-docker/docker.io/calico-csi
2323
- name: ghcr.io/khs1994-docker/docker.io/calico/node-driver-registrar
24-
newName: docker.cnb.cool/khs1994-docker/khs1994/calico-node-driver-registrar
24+
newName: docker.cnb.cool/khs1994-docker/docker.io/calico-node-driver-registrar

‎kubernetes/addons/cni/calico-eBPF-nft/cn/kustomization.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ resources:
1313
# newName: swr.cn-north-4.myhuaweicloud.com/ddn-k8s/docker.io/calico/node-driver-registrar
1414
images:
1515
- name: ghcr.io/khs1994-docker/docker.io/calico/cni
16-
newName: docker.cnb.cool/khs1994-docker/khs1994/calico-cni
16+
newName: docker.cnb.cool/khs1994-docker/docker.io/calico-cni
1717
- name: ghcr.io/khs1994-docker/docker.io/calico/node
18-
newName: docker.cnb.cool/khs1994-docker/khs1994/calico-node
18+
newName: docker.cnb.cool/khs1994-docker/docker.io/calico-node
1919
- name: ghcr.io/khs1994-docker/docker.io/calico/kube-controllers
20-
newName: docker.cnb.cool/khs1994-docker/khs1994/calico-kube-controllers
20+
newName: docker.cnb.cool/khs1994-docker/docker.io/calico-kube-controllers
2121
- name: ghcr.io/khs1994-docker/docker.io/calico/csi
22-
newName: docker.cnb.cool/khs1994-docker/khs1994/calico-csi
22+
newName: docker.cnb.cool/khs1994-docker/docker.io/calico-csi
2323
- name: ghcr.io/khs1994-docker/docker.io/calico/node-driver-registrar
24-
newName: docker.cnb.cool/khs1994-docker/khs1994/calico-node-driver-registrar
24+
newName: docker.cnb.cool/khs1994-docker/docker.io/calico-node-driver-registrar

‎kubernetes/addons/cni/calico-eBPF/cn/kustomization.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ resources:
1313
# newName: swr.cn-north-4.myhuaweicloud.com/ddn-k8s/docker.io/calico/node-driver-registrar
1414
images:
1515
- name: ghcr.io/khs1994-docker/docker.io/calico/cni
16-
newName: docker.cnb.cool/khs1994-docker/khs1994/calico-cni
16+
newName: docker.cnb.cool/khs1994-docker/docker.io/calico-cni
1717
- name: ghcr.io/khs1994-docker/docker.io/calico/node
18-
newName: docker.cnb.cool/khs1994-docker/khs1994/calico-node
18+
newName: docker.cnb.cool/khs1994-docker/docker.io/calico-node
1919
- name: ghcr.io/khs1994-docker/docker.io/calico/kube-controllers
20-
newName: docker.cnb.cool/khs1994-docker/khs1994/calico-kube-controllers
20+
newName: docker.cnb.cool/khs1994-docker/docker.io/calico-kube-controllers
2121
- name: ghcr.io/khs1994-docker/docker.io/calico/csi
22-
newName: docker.cnb.cool/khs1994-docker/khs1994/calico-csi
22+
newName: docker.cnb.cool/khs1994-docker/docker.io/calico-csi
2323
- name: ghcr.io/khs1994-docker/docker.io/calico/node-driver-registrar
24-
newName: docker.cnb.cool/khs1994-docker/khs1994/calico-node-driver-registrar
24+
newName: docker.cnb.cool/khs1994-docker/docker.io/calico-node-driver-registrar

0 commit comments

Comments
 (0)