Skip to content

Commit fed4677

Browse files
khs1994khs1994
committed
[Etcd] Update to v3.4.14 [sync git]
Signed-off-by: Kang Huaishuai <khs1994@khs1994.com>
1 parent a52d8ce commit fed4677

File tree

12 files changed

+32
-25
lines changed

12 files changed

+32
-25
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
if: endsWith('a', 'b')
6060
shell: pwsh
6161
env:
62-
VERSION: 3.4.13
62+
VERSION: 3.4.14
6363
run: |
6464
./lnmp/windows/lnmp-windows-pm.ps1 dist etcd@${env:VERSION}
6565
./lnmp/windows/lnmp-windows-pm.ps1 push etcd@${env:VERSION}

‎app/demo/.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
run: |
6161
set -x
6262
mysql -uroot --password=mytest -h 127.0.0.1 -P 13306 -e "show databases"
63-
bash <(curl -s https://codecov.io/bash) --help
63+
bash <(curl -s https://codecov.io/bash) -h
6464
bash <(curl -s https://codecov.io/bash) -e PHP_VERSION -n "GitHub Actions"
6565
if: success()
6666
- name: after_failure

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -103,18 +103,18 @@
103103
"dest": "gcr-mirror/git-sync:v3.1.6"
104104
},
105105
{
106-
"source": "quay.io/coreos/etcd:v3.4.13",
107-
"dest": "quay-mirror/etcd:v3.4.13",
106+
"source": "quay.io/coreos/etcd:v3.4.14",
107+
"dest": "quay-mirror/etcd:v3.4.14",
108108
"platforms": [
109109
{
110-
"source": "quay.io/coreos/etcd:v3.4.13"
110+
"source": "quay.io/coreos/etcd:v3.4.14"
111111
},
112112
{
113113
"os": "linux",
114114
"architecture": "arm64",
115115
"variant": "v8",
116-
"source": "quay.io/coreos/etcd:v3.4.13-arm64",
117-
"dest": "quay-mirror/etcd:v3.4.13-arm64"
116+
"source": "quay.io/coreos/etcd:v3.4.14-arm64",
117+
"dest": "quay-mirror/etcd:v3.4.14-arm64"
118118
}
119119
]
120120
},
@@ -173,11 +173,11 @@
173173
"ref": "v1.19.2"
174174
},
175175
{
176-
"source": "k8s.gcr.io/etcd:3.4.13-0",
177-
"dest": "gcr-mirror/etcd:3.4.13-0",
176+
"source": "k8s.gcr.io/etcd:3.4.14-0",
177+
"dest": "gcr-mirror/etcd:3.4.14-0",
178178
"registry": "k8s.gcr.io",
179179
"image": "etcd",
180-
"ref": "3.4.13-0"
180+
"ref": "3.4.14-0"
181181
},
182182
{
183183
"source": "k8s.gcr.io/coredns:1.7.0",

‎kubernetes/.env.example‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ LNMP_HTTPS_PORT=443
1010

1111
# soft version
1212

13-
ETCD_VERSION=3.4.13
13+
ETCD_VERSION=3.4.14
1414
HELM_VERSION=3.3.0
1515
CNI_VERSION=0.8.7
1616
CRICTL_VERSION=1.19.0

‎kubernetes/.github/workflows/setup-k8s.yaml‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -436,8 +436,13 @@ jobs:
436436
echo ::group::kubectl get node
437437
kubectl get node -o yaml
438438
echo ::endgroup::
439-
- run:
439+
- run: |
440+
git config --global user.email "gh-bot@khs1994.com"
441+
git config --global user.name "gh-bot"
442+
- name: Update k8s cli help info
443+
run:
440444
|
445+
export PATH=${K8S_ROOT:-/opt/k8s}/bin:$PATH
441446
BASE_BRANCH=master
442447
if [ $CI_KUBERNETES_VERSION = '1.19.0' -a "$GENERATE_CLI_HELP" = "true" ];then
443448
set -x
@@ -452,14 +457,16 @@ jobs:
452457
cd cli ; (COLUMNS=200 sh generate.sh || true); cd ..
453458

454459
git add .
455-
git commit -m "Update v$CI_KUBERNETES_VERSION config"
460+
git commit -m "Update v$CI_KUBERNETES_VERSION config" -s
456461
git push origin ${BASE_BRANCH}:v$CI_KUBERNETES_VERSION-config -f
457462

458463
cd /tmp
459464
rm -rf lnmp-k8s
460465
fi
461-
- run:
466+
- name: Update k8s beta cli help info
467+
run:
462468
|
469+
export PATH=${K8S_ROOT:-/opt/k8s}/bin:$PATH
463470
BASE_BRANCH=v1.19.0-config
464471
BASE_BRANCH=master
465472
if [ $CI_KUBERNETES_VERSION = '1.20.0-beta.2' ];then
@@ -476,7 +483,7 @@ jobs:
476483
cd cli ; (COLUMNS=200 sh generate.sh || true); cd ..
477484

478485
git add .
479-
git commit -m "Update v$CI_KUBERNETES_VERSION config"
486+
git commit -m "Update v$CI_KUBERNETES_VERSION config" -s
480487
git push origin ${BASE_BRANCH}:v$CI_KUBERNETES_VERSION-config -f
481488
fi
482489
# - name: Setup tmate session

‎kubernetes/bin/fcos-etcdctl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
exec podman run --rm --network host --privileged \
44
-v ${K8S_ROOT:-/opt/k8s}/etc/kubernetes/pki:${K8S_ROOT:-/opt/k8s}/etc/kubernetes/pki \
55
-e ETCDCTL_API \
6-
quay.io/coreos/etcd:v${ETCD_VERSION:-3.4.13} \
6+
quay.io/coreos/etcd:v${ETCD_VERSION:-3.4.14} \
77
etcdctl \
88
--endpoints=$etcd_endpoints \
99
--cacert="${K8S_ROOT:-/opt/k8s}/etc/kubernetes/pki/etcd-ca.pem" \

‎scripts/docker-compose.bump.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ services:
3838
image: httpd:2.4.46-alpine
3939

4040
etcd:
41-
image: quay.io/coreos/etcd:v3.4.13
41+
image: quay.io/coreos/etcd:v3.4.14
4242

4343
minio:
4444
image: minio/minio:RELEASE.2020-09-26T03-44-56Z

‎windows/lnmp-windows-pm-repo/deno/lwpm.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"name": "deno",
33
"description": "A secure runtime for JavaScript and TypeScript built with V8, Rust, and Tokio",
4-
"version": "1.5.3",
5-
"pre-version": "1.5.3",
4+
"version": "1.5.4",
5+
"pre-version": "1.5.4",
66
"homepage": "https://deno.land/",
77
"bug": "https://github.com/denoland/deno/issues",
88
"github": "denoland/deno",

‎windows/lnmp-windows-pm-repo/etcher/lwpm.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
},
88
"url": "https://github.com/balena-io/etcher/releases/download/v${VERSION}/balenaEtcher-$(if($env:lwpm_os -eq 'windows'){echo Setup-${VERSION}.exe}else{echo ${VERSION.dmg}})",
99
"url-mirror": "https://download.fastgit.org/balena-io/etcher/releases/download/v${VERSION}/balenaEtcher-$(if($env:lwpm_os -eq 'windows'){echo Setup-${VERSION}.exe}else{echo ${VERSION.dmg}})",
10-
"version": "1.5.104"
10+
"version": "1.5.111"
1111
}

‎windows/lnmp-windows-pm-repo/etcher/lwpm.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ scripts:
55
install: Start-Process -FilePath $filename -wait
66
url: https://github.com/balena-io/etcher/releases/download/v${VERSION}/balenaEtcher-$(if($env:lwpm_os -eq 'windows'){echo Setup-${VERSION}.exe}else{echo ${VERSION.dmg}})
77
url-mirror: https://download.fastgit.org/balena-io/etcher/releases/download/v${VERSION}/balenaEtcher-$(if($env:lwpm_os -eq 'windows'){echo Setup-${VERSION}.exe}else{echo ${VERSION.dmg}})
8-
version: 1.5.104
8+
version: 1.5.111

0 commit comments

Comments
 (0)